From 01e4cb1464d07afb22d22bf98116a3ed9126612b Mon Sep 17 00:00:00 2001
From: Will Uther <http://www.cse.unsw.edu.au/~willu/>
Date: Sun, 26 Jul 2009 16:22:56 +0100
Subject: Add getsource plugin

---
 IkiWiki/Plugin/getsource.pm | 79 +++++++++++++++++++++++++++++++++++++++++++++
 templates/page.tmpl         |  3 ++
 2 files changed, 82 insertions(+)
 create mode 100644 IkiWiki/Plugin/getsource.pm

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
new file mode 100644
index 000000000..4e74eaea0
--- /dev/null
+++ b/IkiWiki/Plugin/getsource.pm
@@ -0,0 +1,79 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::getsource;
+
+use warnings;
+use strict;
+use IkiWiki;
+use open qw{:utf8 :std};
+
+sub import {
+	hook(type => "getsetup", id => "getsource", call => \&getsetup);
+	hook(type => "pagetemplate", id => "getsource", call => \&pagetemplate);
+	hook(type => "sessioncgi", id => "getsource", call => \&cgi_getsource);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+		getsource_mimetype => {
+			type => "string",
+			example => "application/octet-stream",
+			description => "Mime type for returned source.",
+			safe => 1,
+			rebuild => 0,
+		},
+}
+
+sub pagetemplate (@) {
+	my %params=@_;
+
+	my $page=$params{page};
+	my $template=$params{template};
+
+	if (length $config{cgiurl}) {
+		$template->param(getsourceurl => IkiWiki::cgiurl(do => "getsource", page => $page));
+		$template->param(have_actions => 1);
+	}
+}
+
+sub cgi_getsource ($$) {
+	my $cgi=shift;
+	my $session=shift;
+
+	# Note: we use sessioncgi rather than just cgi
+	# because we need $IkiWiki::pagesources{} to be
+	# populated.
+
+	return unless (defined $cgi->param('do') &&
+					$cgi->param("do") eq "getsource");
+
+	IkiWiki::decode_cgi_utf8($cgi);
+
+	my $page=$cgi->param('page');
+
+	if ($IkiWiki::pagesources{$page}) {
+		
+		my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
+		
+		if (! $config{getsource_mimetype}) {
+			$config{getsource_mimetype} = "text/plain";
+		}
+		
+		print "Content-Type: $config{getsource_mimetype}\r\n";
+		
+		print ("\r\n");
+		
+		print $data;
+		
+		exit 0;
+	}
+	
+	error("Unable to find page source for page: $page");
+
+	exit 0;
+}
+
+1
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 8622d1a01..599758cc7 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -50,6 +50,9 @@
 <TMPL_IF NAME="HISTORYURL">
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
+<TMPL_IF NAME="GETSOURCEURL">
+<li><a href="<TMPL_VAR GETSOURCEURL>">Get Source</a></li>
+</TMPL_IF>
 <TMPL_IF NAME="PREFSURL">
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
-- 
cgit v1.2.3


From eaf59e5ba940b883814c19ae64e68dea4530d992 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 26 Jul 2009 16:33:12 +0100
Subject: getsource: run as plain CGI, rather than sessioncgi

As I suggested when reviewing Will's code, calling loadindex() should be
sufficient.
---
 IkiWiki/Plugin/getsource.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index 4e74eaea0..2e65df950 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -9,7 +9,7 @@ use open qw{:utf8 :std};
 sub import {
 	hook(type => "getsetup", id => "getsource", call => \&getsetup);
 	hook(type => "pagetemplate", id => "getsource", call => \&pagetemplate);
-	hook(type => "sessioncgi", id => "getsource", call => \&cgi_getsource);
+	hook(type => "cgi", id => "getsource", call => \&cgi_getsource);
 }
 
 sub getsetup () {
@@ -39,9 +39,8 @@ sub pagetemplate (@) {
 	}
 }
 
-sub cgi_getsource ($$) {
+sub cgi_getsource ($) {
 	my $cgi=shift;
-	my $session=shift;
 
 	# Note: we use sessioncgi rather than just cgi
 	# because we need $IkiWiki::pagesources{} to be
@@ -54,6 +53,8 @@ sub cgi_getsource ($$) {
 
 	my $page=$cgi->param('page');
 
+	IkiWiki::loadindex();
+
 	if ($IkiWiki::pagesources{$page}) {
 		
 		my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
-- 
cgit v1.2.3


From 3f520da78aeda38e47b43b28023b52f321f71291 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 26 Jul 2009 16:36:17 +0100
Subject: getsource: default to saying page source is in UTF-8, and make the
 example match the default

IkiWiki mostly assumes that pages are in UTF-8; anyone this doesn't work
for can override it in the setup file.
---
 IkiWiki/Plugin/getsource.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index 2e65df950..08d9d110c 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -20,7 +20,7 @@ sub getsetup () {
 		},
 		getsource_mimetype => {
 			type => "string",
-			example => "application/octet-stream",
+			example => "text/plain; charset=utf-8",
 			description => "Mime type for returned source.",
 			safe => 1,
 			rebuild => 0,
@@ -60,7 +60,7 @@ sub cgi_getsource ($) {
 		my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
 		
 		if (! $config{getsource_mimetype}) {
-			$config{getsource_mimetype} = "text/plain";
+			$config{getsource_mimetype} = "text/plain; charset=utf-8";
 		}
 		
 		print "Content-Type: $config{getsource_mimetype}\r\n";
-- 
cgit v1.2.3


From 0afcec734622811b8910d3df5d102df58d429a51 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 26 Jul 2009 16:45:01 +0100
Subject: getsource: turn missing pages into a 404

Also restructure so we return early on missing pages.
---
 IkiWiki/Plugin/getsource.pm | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index 08d9d110c..6a208f1e7 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -55,25 +55,29 @@ sub cgi_getsource ($) {
 
 	IkiWiki::loadindex();
 
-	if ($IkiWiki::pagesources{$page}) {
-		
-		my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
-		
-		if (! $config{getsource_mimetype}) {
-			$config{getsource_mimetype} = "text/plain; charset=utf-8";
-		}
-		
-		print "Content-Type: $config{getsource_mimetype}\r\n";
-		
-		print ("\r\n");
-		
-		print $data;
-		
-		exit 0;
+	if (! exists $IkiWiki::pagesources{$page}) {
+		IkiWiki::cgi_custom_failure(
+			$cgi->header(-status => "404 Not Found"),
+			IkiWiki::misctemplate(gettext("missing page"),
+				"<p>".
+				sprintf(gettext("The page %s does not exist."),
+					htmllink("", "", $page)).
+				"</p>"));
+		exit;
+	}
+
+	my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
+
+	if (! $config{getsource_mimetype}) {
+		$config{getsource_mimetype} = "text/plain; charset=utf-8";
 	}
-	
-	error("Unable to find page source for page: $page");
 
+	print "Content-Type: $config{getsource_mimetype}\r\n";
+
+	print ("\r\n");
+
+	print $data;
+	
 	exit 0;
 }
 
-- 
cgit v1.2.3


From ea244ab7b53afbd710dab267ca9a8fb9f17cfb00 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 26 Jul 2009 16:48:25 +0100
Subject: getsource: don't allow getting the source of an attachment

Serving up images etc. as text/plain; charset=utf-8 is unlikely to work
very well, and there's no point in having this CGI action for attachments
(since they're copied into the output as-is anyway).
---
 IkiWiki/Plugin/getsource.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index 6a208f1e7..1b7eb56c6 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -66,6 +66,17 @@ sub cgi_getsource ($) {
 		exit;
 	}
 
+	if (! defined pagetype($IkiWiki::pagesources{$page})) {
+		IkiWiki::cgi_custom_failure(
+			$cgi->header(-status => "403 Forbidden"),
+			IkiWiki::misctemplate(gettext("not a page"),
+				"<p>".
+				sprintf(gettext("%s is an attachment, not a page."),
+					htmllink("", "", $page)).
+				"</p>"));
+		exit;
+	}
+
 	my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
 
 	if (! $config{getsource_mimetype}) {
-- 
cgit v1.2.3


From b1f31ab7cbc87a572886673e7809d5e2fc5ee491 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 26 Jul 2009 16:49:48 +0100
Subject: getsource: in the default template, just say "Source"

All the other actions are single words (apart from RecentChanges), and
are nouns (apart from Edit); saying "Source" is consistent with "History",
for instance.
---
 templates/page.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 599758cc7..653179e5d 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -51,7 +51,7 @@
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
 <TMPL_IF NAME="GETSOURCEURL">
-<li><a href="<TMPL_VAR GETSOURCEURL>">Get Source</a></li>
+<li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
 </TMPL_IF>
 <TMPL_IF NAME="PREFSURL">
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
-- 
cgit v1.2.3


From 2ef53b128d9f40fa998215b2809e676207050902 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 26 Jul 2009 16:59:26 +0100
Subject: getsource: remove unnecessary IkiWiki:: prefixes

Many variables and functions are exported.
---
 IkiWiki/Plugin/getsource.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index 1b7eb56c6..db5614ec1 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -43,7 +43,7 @@ sub cgi_getsource ($) {
 	my $cgi=shift;
 
 	# Note: we use sessioncgi rather than just cgi
-	# because we need $IkiWiki::pagesources{} to be
+	# because we need %pagesources to be
 	# populated.
 
 	return unless (defined $cgi->param('do') &&
@@ -55,7 +55,7 @@ sub cgi_getsource ($) {
 
 	IkiWiki::loadindex();
 
-	if (! exists $IkiWiki::pagesources{$page}) {
+	if (! exists $pagesources{$page}) {
 		IkiWiki::cgi_custom_failure(
 			$cgi->header(-status => "404 Not Found"),
 			IkiWiki::misctemplate(gettext("missing page"),
@@ -66,7 +66,7 @@ sub cgi_getsource ($) {
 		exit;
 	}
 
-	if (! defined pagetype($IkiWiki::pagesources{$page})) {
+	if (! defined pagetype($pagesources{$page})) {
 		IkiWiki::cgi_custom_failure(
 			$cgi->header(-status => "403 Forbidden"),
 			IkiWiki::misctemplate(gettext("not a page"),
@@ -77,7 +77,7 @@ sub cgi_getsource ($) {
 		exit;
 	}
 
-	my $data = IkiWiki::readfile(IkiWiki::srcfile($IkiWiki::pagesources{$page}));
+	my $data = readfile(srcfile($pagesources{$page}));
 
 	if (! $config{getsource_mimetype}) {
 		$config{getsource_mimetype} = "text/plain; charset=utf-8";
-- 
cgit v1.2.3


From 70b1c2aabd0d591cbdb30765c5a7e000e993f343 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 27 Jul 2009 11:58:36 +0100
Subject: getsource: remove temporary variable

---
 IkiWiki/Plugin/getsource.pm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index db5614ec1..e8aea2c39 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -77,18 +77,14 @@ sub cgi_getsource ($) {
 		exit;
 	}
 
-	my $data = readfile(srcfile($pagesources{$page}));
-
 	if (! $config{getsource_mimetype}) {
 		$config{getsource_mimetype} = "text/plain; charset=utf-8";
 	}
 
 	print "Content-Type: $config{getsource_mimetype}\r\n";
-
 	print ("\r\n");
+	print readfile(srcfile($pagesources{$page}));
 
-	print $data;
-	
 	exit 0;
 }
 
-- 
cgit v1.2.3


From 3f39e69b13851d3bed8e1cae0525d6ad8ac768cf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 1 Aug 2009 12:31:34 +0100
Subject: Document the getsource plugin

---
 doc/plugins/getsource.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 doc/plugins/getsource.mdwn

diff --git a/doc/plugins/getsource.mdwn b/doc/plugins/getsource.mdwn
new file mode 100644
index 000000000..4fbf4be98
--- /dev/null
+++ b/doc/plugins/getsource.mdwn
@@ -0,0 +1,13 @@
+[[!template id=plugin name=getsource author="[[Will_Uther|Will]]"]]
+
+This plugin adds a `getsource` action to the IkiWiki CGI, and a "Source" link
+that uses it to display pages' source.
+
+Configuration for this plugin in the setup file:
+
+* `getsource_mimetype => "text/plain; charset=utf-8"`
+
+  Sets the MIME type used when page source is requested. The default is
+  usually appropriate, but you could set this to `application/octet-stream`
+  to encourage browsers to download the source to a file rather than showing
+  it in the browser.
-- 
cgit v1.2.3


From f5322fa912250cb2859bb63aeae419a405f74544 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 1 Aug 2009 12:31:53 +0100
Subject: Mark todo/source_link as done

---
 debian/changelog          | 1 +
 doc/todo/source_link.mdwn | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 565f19c7c..90ec2ddac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.15) UNRELEASED; urgency=low
   * Add further build machinery to generate translated underlays from
     the po file, for use by wikis whose primary language is not English.
   * Add Danish basewiki translation by Jonas Smedegaard.
+  * Add getsource plugin (Will, smcv)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 
diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index 9d9ec9697..a7203d06c 100644
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -107,3 +107,5 @@ I just implemented this.  There is one [[patch]] to the default page template, a
     }
     
     1
+
+[[done]] --[[smcv]]
-- 
cgit v1.2.3


From 81ad4377e90961a46d97248844f5fa7f26be3f24 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Sun, 2 Aug 2009 10:22:39 -0400
Subject: response

---
 doc/forum/ikiwiki_over_database__63__.wiki | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/forum/ikiwiki_over_database__63__.wiki b/doc/forum/ikiwiki_over_database__63__.wiki
index ff123e98d..fb4d41763 100644
--- a/doc/forum/ikiwiki_over_database__63__.wiki
+++ b/doc/forum/ikiwiki_over_database__63__.wiki
@@ -1 +1,21 @@
 Is there here any possibility to modifying ikiwiki (via plugin) for store pages in database. I'm thinking about storing pages in sqlite or mysql for serving it much faster. The idea is from sputnik.org [http://sputnik.freewisdom.org/] but with perl ;-). Could we integrate the sputnik code in ikiwiki as a solution?
+
+> ikiwiki generates static pages in a filesystem. It's responsible
+> for editing and regenerating them, but they're served by any old
+> web server. If you go to the trouble of stuffing the generated pages
+> into a database, you'll need to go to further trouble to serve them
+> back out somehow: write your own web server, perhaps, or a module
+> for a particular web server. Either way you'll have sacrificed
+> ikiwiki's interoperability, and it's not at all clear (since you're
+> adding, in the best case, one layer of indirection reading the
+> generated files) you'll have gained any improved page-serving
+> performance. If it's source pages you want to store in a database,
+> then you lose the ability to do random Unixy things to source pages,
+> including managing them in a revision control system.
+>
+> Static HTML pages in a filesystem and the ability to do random
+> Unixy things are two of the uniquely awesome features of ikiwiki.
+> It's probably possible to do what you want, but it's unlikely that
+> you really want it. I'd suggest you either get to know ikiwiki better,
+> or choose one of the many wiki implementations that already works
+> as you describe. --[[Schmonz]]
-- 
cgit v1.2.3


From 4c21c5d1fa16972cf08583d96a05af87758e0936 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Sun, 2 Aug 2009 10:29:15 -0400
Subject: ugh, this is not a Markdown page

---
 doc/forum/ikiwiki_over_database__63__.wiki | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/doc/forum/ikiwiki_over_database__63__.wiki b/doc/forum/ikiwiki_over_database__63__.wiki
index fb4d41763..b6e7266e3 100644
--- a/doc/forum/ikiwiki_over_database__63__.wiki
+++ b/doc/forum/ikiwiki_over_database__63__.wiki
@@ -1,21 +1,7 @@
 Is there here any possibility to modifying ikiwiki (via plugin) for store pages in database. I'm thinking about storing pages in sqlite or mysql for serving it much faster. The idea is from sputnik.org [http://sputnik.freewisdom.org/] but with perl ;-). Could we integrate the sputnik code in ikiwiki as a solution?
 
-> ikiwiki generates static pages in a filesystem. It's responsible
-> for editing and regenerating them, but they're served by any old
-> web server. If you go to the trouble of stuffing the generated pages
-> into a database, you'll need to go to further trouble to serve them
-> back out somehow: write your own web server, perhaps, or a module
-> for a particular web server. Either way you'll have sacrificed
-> ikiwiki's interoperability, and it's not at all clear (since you're
-> adding, in the best case, one layer of indirection reading the
-> generated files) you'll have gained any improved page-serving
-> performance. If it's source pages you want to store in a database,
-> then you lose the ability to do random Unixy things to source pages,
-> including managing them in a revision control system.
->
-> Static HTML pages in a filesystem and the ability to do random
-> Unixy things are two of the uniquely awesome features of ikiwiki.
-> It's probably possible to do what you want, but it's unlikely that
-> you really want it. I'd suggest you either get to know ikiwiki better,
-> or choose one of the many wiki implementations that already works
-> as you describe. --[[Schmonz]]
+-----
+
+ikiwiki generates static pages in a filesystem. It's responsible for editing and regenerating them, but they're served by any old web server. If you go to the trouble of stuffing the generated pages into a database, you'll need to go to further trouble to serve them back out somehow: write your own web server, perhaps, or a module for a particular web server. Either way you'll have sacrificed ikiwiki's interoperability, and it's not at all clear (since you're adding, in the best case, one layer of indirection reading the generated files) you'll have gained any improved page-serving performance. If it's source pages you want to store in a database, then you lose the ability to do random Unixy things to source pages, including managing them in a revision control system.
+
+Static HTML pages in a filesystem and the ability to do random Unixy things are two of the uniquely awesome features of ikiwiki.  It's probably possible to do what you want, but it's unlikely that you really want it. I'd suggest you either get to know ikiwiki better, or choose one of the many wiki implementations that already works as you describe. --[[Schmonz]]
-- 
cgit v1.2.3


From acc3a2b53f346ea22ec4ba097bcf718f8df2460f Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Sun, 2 Aug 2009 10:44:17 -0400
Subject: sure maybe, but not with ikiwiki itself

---
 doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
index e50eb4e1c..51b91d30d 100644
--- a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
+++ b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
@@ -3,3 +3,12 @@ Hi,
 Can you give me a hint for showing if one user is logged or not. If user is logged, then I want to display the user name, as wikipedia or dokuwiki for example.
 Regards,
 Xan.
+
+> ikiwiki doesn't serve pages, so this can't be done inside ikiwiki.
+> For certain kinds of authentication it might be possible anyway.
+> For instance, if you're using [[plugins/httpauth]] exclusively and
+> your server has PHP, you could put `<?php print("$REMOTE_USER");
+> ?>` in all the relevant ikiwiki [[templates]] and arrange for the
+> generated HTML pages to get run through the PHP interpreter. The trick
+> would work differently with other [[plugins/type/auth]] plugins,
+> if at all.
-- 
cgit v1.2.3


From e34f3dc8e61ef53adb83879608a3a552887666a3 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Sun, 2 Aug 2009 10:46:27 -0400
Subject: love, me

---
 doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
index 51b91d30d..5ebde2cce 100644
--- a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
+++ b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
@@ -11,4 +11,4 @@ Xan.
 > ?>` in all the relevant ikiwiki [[templates]] and arrange for the
 > generated HTML pages to get run through the PHP interpreter. The trick
 > would work differently with other [[plugins/type/auth]] plugins,
-> if at all.
+> if at all. --[[Schmonz]]
-- 
cgit v1.2.3


From efd0a66a70ca09241d11360855b0aab904bfb524 Mon Sep 17 00:00:00 2001
From: xan <xan@web>
Date: Sun, 2 Aug 2009 10:50:16 -0400
Subject:

---
 doc/forum/ikiwiki_over_database__63__.wiki | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/ikiwiki_over_database__63__.wiki b/doc/forum/ikiwiki_over_database__63__.wiki
index b6e7266e3..a70f9c989 100644
--- a/doc/forum/ikiwiki_over_database__63__.wiki
+++ b/doc/forum/ikiwiki_over_database__63__.wiki
@@ -5,3 +5,7 @@ Is there here any possibility to modifying ikiwiki (via plugin) for store pages
 ikiwiki generates static pages in a filesystem. It's responsible for editing and regenerating them, but they're served by any old web server. If you go to the trouble of stuffing the generated pages into a database, you'll need to go to further trouble to serve them back out somehow: write your own web server, perhaps, or a module for a particular web server. Either way you'll have sacrificed ikiwiki's interoperability, and it's not at all clear (since you're adding, in the best case, one layer of indirection reading the generated files) you'll have gained any improved page-serving performance. If it's source pages you want to store in a database, then you lose the ability to do random Unixy things to source pages, including managing them in a revision control system.
 
 Static HTML pages in a filesystem and the ability to do random Unixy things are two of the uniquely awesome features of ikiwiki.  It's probably possible to do what you want, but it's unlikely that you really want it. I'd suggest you either get to know ikiwiki better, or choose one of the many wiki implementations that already works as you describe. --[[Schmonz]]
+
+---
+
+Thanks, [[Schmonz]]. You clarify me much things,.... Xan.
-- 
cgit v1.2.3


From d819fd6b04615adb1ccf40a5d49eb75178245c3a Mon Sep 17 00:00:00 2001
From: xan <xan@web>
Date: Sun, 2 Aug 2009 10:51:31 -0400
Subject:

---
 doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
index 5ebde2cce..04f6cc9b8 100644
--- a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
+++ b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
@@ -12,3 +12,5 @@ Xan.
 > generated HTML pages to get run through the PHP interpreter. The trick
 > would work differently with other [[plugins/type/auth]] plugins,
 > if at all. --[[Schmonz]]
+
+>> Thanks a lot, Xan.
-- 
cgit v1.2.3


From baee2aa36b987ec6f75738570fa3f46030484f76 Mon Sep 17 00:00:00 2001
From: dave <dave@web>
Date: Sun, 2 Aug 2009 13:35:04 -0400
Subject:

---
 doc/tips/mathopd.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/tips/mathopd.mdwn

diff --git a/doc/tips/mathopd.mdwn b/doc/tips/mathopd.mdwn
new file mode 100644
index 000000000..ebcff995e
--- /dev/null
+++ b/doc/tips/mathopd.mdwn
@@ -0,0 +1,10 @@
+When using [mathopd](http://www.mathopd.org) to serve ikiwiki, be careful of your Umask settings in the mathopd.conf.
+
+With `Umask 026` in mathopd.conf, editing pages would result in the following errors and a 404 page when the wiki tried to take me to the updated page.
+
+    append_indexes: cannot open .../[destdir]/[outputfile].html
+    open: Permission denied
+
+With `Umask 022` in mathopd.conf, editing pages works.
+
+Hopefully this prevents someone else from spending ~2 hours figuring out why this wouldn't work. ;)
-- 
cgit v1.2.3


From 6810e5feaa072755bc2beebc80b923f2420004cf Mon Sep 17 00:00:00 2001
From: dave <dave@web>
Date: Sun, 2 Aug 2009 13:37:17 -0400
Subject: rename tips/mathopd.mdwn to tips/mathopd_permissions.mdwn

---
 doc/tips/mathopd.mdwn             | 10 ----------
 doc/tips/mathopd_permissions.mdwn | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 doc/tips/mathopd.mdwn
 create mode 100644 doc/tips/mathopd_permissions.mdwn

diff --git a/doc/tips/mathopd.mdwn b/doc/tips/mathopd.mdwn
deleted file mode 100644
index ebcff995e..000000000
--- a/doc/tips/mathopd.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-When using [mathopd](http://www.mathopd.org) to serve ikiwiki, be careful of your Umask settings in the mathopd.conf.
-
-With `Umask 026` in mathopd.conf, editing pages would result in the following errors and a 404 page when the wiki tried to take me to the updated page.
-
-    append_indexes: cannot open .../[destdir]/[outputfile].html
-    open: Permission denied
-
-With `Umask 022` in mathopd.conf, editing pages works.
-
-Hopefully this prevents someone else from spending ~2 hours figuring out why this wouldn't work. ;)
diff --git a/doc/tips/mathopd_permissions.mdwn b/doc/tips/mathopd_permissions.mdwn
new file mode 100644
index 000000000..ebcff995e
--- /dev/null
+++ b/doc/tips/mathopd_permissions.mdwn
@@ -0,0 +1,10 @@
+When using [mathopd](http://www.mathopd.org) to serve ikiwiki, be careful of your Umask settings in the mathopd.conf.
+
+With `Umask 026` in mathopd.conf, editing pages would result in the following errors and a 404 page when the wiki tried to take me to the updated page.
+
+    append_indexes: cannot open .../[destdir]/[outputfile].html
+    open: Permission denied
+
+With `Umask 022` in mathopd.conf, editing pages works.
+
+Hopefully this prevents someone else from spending ~2 hours figuring out why this wouldn't work. ;)
-- 
cgit v1.2.3


From 595c1d2a742a141db797a80b9643aa364e66ee8a Mon Sep 17 00:00:00 2001
From: dave <dave@web>
Date: Sun, 2 Aug 2009 13:40:06 -0400
Subject:

---
 doc/tips/mathopd_permissions.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/mathopd_permissions.mdwn b/doc/tips/mathopd_permissions.mdwn
index ebcff995e..52a8767cc 100644
--- a/doc/tips/mathopd_permissions.mdwn
+++ b/doc/tips/mathopd_permissions.mdwn
@@ -1,6 +1,6 @@
 When using [mathopd](http://www.mathopd.org) to serve ikiwiki, be careful of your Umask settings in the mathopd.conf.
 
-With `Umask 026` in mathopd.conf, editing pages would result in the following errors and a 404 page when the wiki tried to take me to the updated page.
+With `Umask 026` in mathopd.conf, editing pages resulted in the following errors and a 404 page when the wiki tried to take me to the updated page.
 
     append_indexes: cannot open .../[destdir]/[outputfile].html
     open: Permission denied
-- 
cgit v1.2.3


From 91ec7b17208d7aa58408ad765231e2b62337f232 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Sun, 2 Aug 2009 14:36:56 -0400
Subject: new CVS locking weirdness and workaround

---
 doc/post-commit/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/post-commit/discussion.mdwn b/doc/post-commit/discussion.mdwn
index 6ae0d9bcb..c78709e94 100644
--- a/doc/post-commit/discussion.mdwn
+++ b/doc/post-commit/discussion.mdwn
@@ -116,3 +116,8 @@ Can you offer an educated guess what's going wrong here? --[[Schmonz]]
 >> process, so you could just use a temporary list of things to add.
 >> --[[Joey]] 
 
+>>> Thanks for the comments. Attempting to set up a wiki on a different system with a different version of `cvs`, I've encountered a new locking problem within CVS: `cvs commit` takes a write lock, post-commit ikiwiki calls `rcs_update()`, `cvs update` wants a read lock and blocks. The easiest fix I can think of is to make `cvs commit` return and relinquish its lock -- so instead of my wrapper script `exec`ing ikiwiki's post-commit hook, I amp it off and exit 0. Seems to do the trick and, if I grok ikiwiki's behavior here, is not dangerous. (Beats me why my development `cvs` doesn't behave the same WRT locking.)
+
+>>> I was all set to take your third suggestion, but now that there's more than one CVS oddity fixed trivially in a wrapper script, I think I prefer doing it that way.
+
+>>> I'd be glad for the CVS plugin to be included in ikiwiki, if and when you deem it ready. Please let me know what needs to be done for that to happen. --[[Schmonz]]
-- 
cgit v1.2.3


From cf3ab205e8104035bdea74d380bd6c5670fb0036 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Mon, 3 Aug 2009 02:56:42 -0400
Subject: note Perl module dependencies

---
 doc/plugins/contrib/cvs.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index 1ff71d274..727c3524a 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -10,6 +10,7 @@ This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions Sy
  * creates a small post-commit wrapper to prevent `cvs add <directory>` from being seen by ikiwiki's [[post-commit]] hook,
  * configures the wrapper itself as a post-commit hook in `CVSROOT/loginfo`.
 * [`cvsps`](http://www.cobite.com/cvsps/) is required (`rcs_recentchanges()` and `rcs_diff()` need it to work).
+* [[!cpan IPC::Cmd]] and [[!cpan String::ShellQuote]] are required (to safely keep `cvs` quiet and to safely escape commit messages, respectively).
 * CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It might be possible to solve this problem with scripts like `commit_prep` and `log_accum` from CVS contrib.
 * Due to the name of CVS's metadata directories, it's impossible to create `.../CVS/foo.mdwn`. On case-insensitive filesystems it's also impossible to create `.../cvs/foo.mdwn`.
 * No testing or special-casing has been done with [[attachments|plugins/attachment]], but they'll probably need `cvs add -kb`.
-- 
cgit v1.2.3


From 9468c553e1ee8d484e896bef4c5abbeda775cabf Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Mon, 3 Aug 2009 03:23:42 -0400
Subject: maybe prevent trying to create .../CVS/whatever.mdwn

---
 doc/plugins/contrib/cvs.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index 727c3524a..fc5afebfd 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -12,7 +12,7 @@ This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions Sy
 * [`cvsps`](http://www.cobite.com/cvsps/) is required (`rcs_recentchanges()` and `rcs_diff()` need it to work).
 * [[!cpan IPC::Cmd]] and [[!cpan String::ShellQuote]] are required (to safely keep `cvs` quiet and to safely escape commit messages, respectively).
 * CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It might be possible to solve this problem with scripts like `commit_prep` and `log_accum` from CVS contrib.
-* Due to the name of CVS's metadata directories, it's impossible to create `.../CVS/foo.mdwn`. On case-insensitive filesystems it's also impossible to create `.../cvs/foo.mdwn`.
+* Due to the name of CVS's metadata directories, it's impossible to create `.../CVS/foo.mdwn`. On case-insensitive filesystems it's also impossible to create `.../cvs/foo.mdwn`. Since the failure can have confusing effects on one's CVS checkout, perhaps the web interface should prevent the attempt.
 * No testing or special-casing has been done with [[attachments|plugins/attachment]], but they'll probably need `cvs add -kb`.
 
 Having a `$HOME/.cvsrc` isn't necessary. Sure does make using CVS more livable, though. Here's a good general-purpose one:
-- 
cgit v1.2.3


From b188a25e152dec8e0515b1f69bcafe67f540ca0a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 3 Aug 2009 06:01:50 -0400
Subject: can be done with Javascript?

---
 doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
index 04f6cc9b8..ec3ca4138 100644
--- a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
+++ b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
@@ -14,3 +14,11 @@ Xan.
 > if at all. --[[Schmonz]]
 
 >> Thanks a lot, Xan.
+
+>>> Another possible trick would be to use some Javascript to make a
+>>> "who am I?" AJAX request to the CGI (the CGI would receive the
+>>> session cookie, if any, and be able to answer). Obviously, this
+>>> wouldn't work for users who've disabled Javascript, but since it's
+>>> non-essential, that's not so bad. You'd need to
+>>> [[write_a_plugin|plugins/write]] to add a suitable CGI action,
+>>> perhaps ?do=whoami, and insert the Javascript. --[[smcv]]
-- 
cgit v1.2.3


From d55fbc812bbf4a167dcb92b10895fa38033af958 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Mon, 3 Aug 2009 12:54:13 -0400
Subject: response

---
 doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
index ec3ca4138..239f78f5d 100644
--- a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
+++ b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
@@ -22,3 +22,8 @@ Xan.
 >>> non-essential, that's not so bad. You'd need to
 >>> [[write_a_plugin|plugins/write]] to add a suitable CGI action,
 >>> perhaps ?do=whoami, and insert the Javascript. --[[smcv]]
+
+>>>> Cool idea. A similar trick (I first saw it
+>>>> [here](http://www.peej.co.uk/articles/http-auth-with-html-forms.html))
+>>>> could be used to provide a [[plugins/passwordauth]]-like login form
+>>>> for [[plugins/httpauth]].
-- 
cgit v1.2.3


From 71f403a438b9b1e9e57bca55a02fe0fe5f4692e4 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Mon, 3 Aug 2009 13:27:11 -0400
Subject: whoops, resolve

---
 doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
index 239f78f5d..83061cdab 100644
--- a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
+++ b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
@@ -26,4 +26,4 @@ Xan.
 >>>> Cool idea. A similar trick (I first saw it
 >>>> [here](http://www.peej.co.uk/articles/http-auth-with-html-forms.html))
 >>>> could be used to provide a [[plugins/passwordauth]]-like login form
->>>> for [[plugins/httpauth]].
+>>>> for [[plugins/httpauth]]. --[[Schmonz]]
-- 
cgit v1.2.3


From bc0eec4633828e69f0c03a5c3befbf34898deba3 Mon Sep 17 00:00:00 2001
From: j-ali <j-ali@web>
Date: Tue, 4 Aug 2009 05:28:45 -0400
Subject:

---
 doc/bugs/post-commit_hangs.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/bugs/post-commit_hangs.mdwn

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
new file mode 100644
index 000000000..d6ea841ff
--- /dev/null
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -0,0 +1 @@
+I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older version). Having done so, and used ikiwiki-transition to update setup file, the post commit hook is now blocking in flock (as seen by ps). I should also mention that I added the goodstuff, attachment and remove plugins (which was the purpose of upgrading to v3). Any clues as how to debug/fix gratefully received. The wiki is publically viewable at wiki.sgcm.org.uk if that helps.
-- 
cgit v1.2.3


From c3a66316e0e44921439d98258f945a2fd2d679ca Mon Sep 17 00:00:00 2001
From: j-ali <j-ali@web>
Date: Tue, 4 Aug 2009 05:41:07 -0400
Subject:

---
 doc/bugs/post-commit_hangs.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index d6ea841ff..b6245bcd8 100644
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -1 +1,3 @@
+# post-commit hangs
+
 I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older version). Having done so, and used ikiwiki-transition to update setup file, the post commit hook is now blocking in flock (as seen by ps). I should also mention that I added the goodstuff, attachment and remove plugins (which was the purpose of upgrading to v3). Any clues as how to debug/fix gratefully received. The wiki is publically viewable at wiki.sgcm.org.uk if that helps.
-- 
cgit v1.2.3


From cae559f677c915519770e20888186cd6ad186931 Mon Sep 17 00:00:00 2001
From: "http://velmont.no/" <http://velmont.no/@web>
Date: Tue, 4 Aug 2009 08:18:06 -0400
Subject:

---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 93526c42c..d8d90e508 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,4 +1,4 @@
-Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+Ikiwiki is a **wiki compiler** written in Perl. It converts wiki pages into HTML pages
 suitable for publishing on a website. Ikiwiki stores pages and history in a
 [[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
 There are many other [[features]], including support for
-- 
cgit v1.2.3


From e3c944ae00f7250bdff9e8d2bf07a55b1d72a0e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 13:33:27 -0400
Subject: Revert "written in perl"

This reverts commit cae559f677c915519770e20888186cd6ad186931.

Ikiwiki's implementation language is not so important as to appear in the
first, key sentence of its website. The language is already documented
elsewhere, as in the install page.
---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index d8d90e508..93526c42c 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,4 +1,4 @@
-Ikiwiki is a **wiki compiler** written in Perl. It converts wiki pages into HTML pages
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
 suitable for publishing on a website. Ikiwiki stores pages and history in a
 [[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
 There are many other [[features]], including support for
-- 
cgit v1.2.3


From a3959743b6b4e1b143d227aef8508f1606a59cff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 13:37:14 -0400
Subject: more info needed

---
 doc/bugs/post-commit_hangs.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index b6245bcd8..a091446de 100644
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -1,3 +1,7 @@
 # post-commit hangs
 
 I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older version). Having done so, and used ikiwiki-transition to update setup file, the post commit hook is now blocking in flock (as seen by ps). I should also mention that I added the goodstuff, attachment and remove plugins (which was the purpose of upgrading to v3). Any clues as how to debug/fix gratefully received. The wiki is publically viewable at wiki.sgcm.org.uk if that helps.
+
+> It's blocking when you do what? Save a page from the web? Make a commit
+> to the underlaying VCS? Which VCS? These are all different code paths..
+> --[[Joey]] 
-- 
cgit v1.2.3


From 733d1773adfd5146cdf8ddf90338979a41665f24 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 13:40:22 -0400
Subject: responses

---
 doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
index 83061cdab..be9854a08 100644
--- a/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
+++ b/doc/forum/appear_if_you_are_login_or_not_in_a_page.mdwn
@@ -23,7 +23,14 @@ Xan.
 >>> [[write_a_plugin|plugins/write]] to add a suitable CGI action,
 >>> perhaps ?do=whoami, and insert the Javascript. --[[smcv]]
 
+>>>> It's an idea, but you're trading off a serious speed hit for a very
+>>>> minor thing. --[[Joey]]
+
 >>>> Cool idea. A similar trick (I first saw it
 >>>> [here](http://www.peej.co.uk/articles/http-auth-with-html-forms.html))
 >>>> could be used to provide a [[plugins/passwordauth]]-like login form
 >>>> for [[plugins/httpauth]]. --[[Schmonz]]
+
+>>>>> I always assumed the entire reason someone might want to use the
+>>>>> httpauth plugin is to avoid nasty site-specific login forms..
+>>>>> --[[Joey]] 
-- 
cgit v1.2.3


From e98e85ad751df94ff821c40f0dbd6d52e8fa64ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 13:46:02 -0400
Subject: update with a few of out newer features

---
 doc/features.mdwn | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/features.mdwn b/doc/features.mdwn
index ff341d2cc..3925d78ef 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -16,6 +16,10 @@ changes via [[Subversion|rcs/svn]], [[rcs/git]], or any of a number of other
 ikiwiki can be run from a [[post-commit]] hook to update your wiki
 immediately whenever you commit a change using the RCS.
 
+It's even possible to securely let
+[[anonymous_users_git_push_changes|tips/untrusted_git_push]]
+to the wiki.
+
 Note that ikiwiki does not require a RCS to function. If you want to
 run a simple wiki without page history, it can do that too.
 
@@ -142,7 +146,8 @@ authentication, or other methods implemented via plugins.
 
 Thanks to subpages, every page can easily and automatically have a
 /Discussion subpage. By default, these links are included in the
-[[templates]] for each page.
+[[templates]] for each page. If you prefer blog-syle
+[[plugins/comments]], that is available too.
 
 ### Edit controls
 
@@ -161,6 +166,11 @@ Well, sorta. Rather than implementing YA history browser, it can link to
 ikiwiki can use the xapian search engine to add powerful
 full text [[plugins/search]] capabilities to your wiki.
 
+### Translation via po files
+
+The [[plugins/po]] plugin allows translating individual wiki pages using
+standard `po` files.
+
 ### [[w3mmode]]
 
 Can be set up so that w3m can be used to browse a wiki and edit pages
-- 
cgit v1.2.3


From a7dae30074f2918893e23af103658a8594621158 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 13:48:38 -0400
Subject: thought 2

---
 doc/bugs/post-commit_hangs.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index a091446de..af40a3cee 100644
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -5,3 +5,6 @@ I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older
 > It's blocking when you do what? Save a page from the web? Make a commit
 > to the underlaying VCS? Which VCS? These are all different code paths..
 > --[[Joey]] 
+
+> Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
+> modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]] 
-- 
cgit v1.2.3


From ba64c720fe57b4c49e3a0757facd1ca2c85eb2e2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 13:50:52 -0400
Subject: mention ikiwiki's own umask setting

---
 doc/tips/mathopd_permissions.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/tips/mathopd_permissions.mdwn b/doc/tips/mathopd_permissions.mdwn
index 52a8767cc..c0425b9ca 100644
--- a/doc/tips/mathopd_permissions.mdwn
+++ b/doc/tips/mathopd_permissions.mdwn
@@ -8,3 +8,8 @@ With `Umask 026` in mathopd.conf, editing pages resulted in the following errors
 With `Umask 022` in mathopd.conf, editing pages works.
 
 Hopefully this prevents someone else from spending ~2 hours figuring out why this wouldn't work. ;)
+
+> More generally, if your web server uses a nonstandard umask
+> or you're getting permissions related problems in the cgi log
+> when using ikiwiki, you can force ikiwiki to use a sane umask
+> via the `umask` setting in ikiwiki's own setup file. --[[Joey]] 
-- 
cgit v1.2.3


From 264e82fc677a58a288fa9ab004bcdfe9e5bfc1d5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 13:53:50 -0400
Subject: ikiwiki is so sexy it doesn't have to say that it is

---
 doc/ikiwiki_is_so_sexy__33__.mdwn | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 doc/ikiwiki_is_so_sexy__33__.mdwn

diff --git a/doc/ikiwiki_is_so_sexy__33__.mdwn b/doc/ikiwiki_is_so_sexy__33__.mdwn
deleted file mode 100644
index f59b664c2..000000000
--- a/doc/ikiwiki_is_so_sexy__33__.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Yes it is!
-- 
cgit v1.2.3


From 3f33d3979c89610e1c8514c71c887acfa1c3ccac Mon Sep 17 00:00:00 2001
From: j-ali <j-ali@web>
Date: Tue, 4 Aug 2009 16:18:49 -0400
Subject:

---
 doc/bugs/post-commit_hangs.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index af40a3cee..c28a34040 100644
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -6,5 +6,11 @@ I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older
 > to the underlaying VCS? Which VCS? These are all different code paths..
 > --[[Joey]] 
 
+>> It's blocking when I run "ikiwiki --setup ikiwiki.setup" (which calls hg update, which calls ikiwiki --post-commit).
+>> Hmm, maybe it's the recursive call to ikiwiki which is the problem.
+>> The underlying VCS is mercurial. --Ali
+
 > Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
 > modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]] 
+
+>> Good point. Not knowing perl, I just assumed /usr/local would take precedence. I've now used "dpkg -r ikiwiki" to remove the problem. --Ali
-- 
cgit v1.2.3


From a41d8177d4769daf20ea88baddedcc3cbcd56c21 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 16:27:28 -0400
Subject: response

---
 doc/bugs/post-commit_hangs.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index c28a34040..a19441b92 100644
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -10,6 +10,16 @@ I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older
 >> Hmm, maybe it's the recursive call to ikiwiki which is the problem.
 >> The underlying VCS is mercurial. --Ali
 
+>>> You're not supposed to run ikiwiki -setup manually in your post commit hook.
+>>> Doing so will certianly lead to a locking problem; it also forces ikiwiki to rebuild
+>>> the entire wiki anytime a single page changes, which is very inefficient!
+>>>
+>>> Instead, you should use the `mercurial_wrapper` setting
+>>> in the setup file, which will make ikiwiki generate a small
+>>> executable expressly designed to be run at post commit time.
+>>> Or, you can use the `--post-commit` option, as documented
+>>> in [[rcs/mecurial]] --[[Joey]] 
+
 > Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
 > modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]] 
 
-- 
cgit v1.2.3


From 7096ffaa529a0c26490770c5a882b0f96af8ecd2 Mon Sep 17 00:00:00 2001
From: j-ali <j-ali@web>
Date: Tue, 4 Aug 2009 16:34:52 -0400
Subject:

---
 doc/bugs/post-commit_hangs.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index a19441b92..1e16bc097 100644
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -20,6 +20,10 @@ I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older
 >>> Or, you can use the `--post-commit` option, as documented
 >>> in [[rcs/mecurial]] --[[Joey]] 
 
+>>>> I don't run ikiwiki --setup in the commit hook; I run ikiwiki --post-commit (as mentioned above).
+>>>> I'm trying to run ikiwiki --setup from the command line after modifying the setup file.
+>>>> ikiwiki --setup is calling hg update, which is calling ikiwiki --post-commit. Am I not supposed to do that? --Ali
+
 > Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
 > modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]] 
 
-- 
cgit v1.2.3


From e46ea2a687b97e96c54e21169f41f14f9b21728c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 16:38:22 -0400
Subject: response

---
 doc/bugs/post-commit_hangs.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index 1e16bc097..ee7f881d5 100644
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -24,6 +24,9 @@ I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older
 >>>> I'm trying to run ikiwiki --setup from the command line after modifying the setup file.
 >>>> ikiwiki --setup is calling hg update, which is calling ikiwiki --post-commit. Am I not supposed to do that? --Ali
 
+>>>>> No, I don't think that hg update should call ikiwiki anything. The
+>>>>> [[hgrc_example|rcs/mercurial]] doesn't seem to configure it to do that? --[[Joey]] 
+
 > Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
 > modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]] 
 
-- 
cgit v1.2.3


From 2b98b1a0c1075a28ae43259b6591df25a4b2029c Mon Sep 17 00:00:00 2001
From: j-ali <j-ali@web>
Date: Tue, 4 Aug 2009 16:45:30 -0400
Subject:

---
 doc/bugs/post-commit_hangs.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index ee7f881d5..a013f7919 100644
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -27,6 +27,18 @@ I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older
 >>>>> No, I don't think that hg update should call ikiwiki anything. The
 >>>>> [[hgrc_example|rcs/mercurial]] doesn't seem to configure it to do that? --[[Joey]] 
 
+>>>>>> Ok, I'm not sure I understand what's going on, but my problem is solved.
+>>>>>>
+>>>>>> My hgrc used to say:
+>>>>>>
+>>>>>> [hooks]
+>>>>>>
+>>>>>> incoming.update = hg up
+>>>>>>
+>>>>>> update.ikiwiki = ikiwiki --setup /home/ikiwiki/ikiwiki.setup --post-commit
+>>>>>>
+>>>>>> I've now changed it to match the example page and it works. Thanks --Ali.
+
 > Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
 > modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]] 
 
-- 
cgit v1.2.3


From 4a2a37e02e2a07de0d3c22265392776f4fdb7676 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 16:52:12 -0400
Subject: close

---
 doc/bugs/post-commit_hangs.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index a013f7919..32820d886 100644
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -39,6 +39,8 @@ I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older
 >>>>>>
 >>>>>> I've now changed it to match the example page and it works. Thanks --Ali.
 
+>>>>>>> [[done]]
+
 > Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
 > modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]] 
 
-- 
cgit v1.2.3


From 08d8c36a0bc6aa55df2df9341ddca42fc25f09a3 Mon Sep 17 00:00:00 2001
From: "http://adam.shand.net/" <http://adam.shand.net/@web>
Date: Wed, 5 Aug 2009 06:02:00 -0400
Subject:

---
 .../HTML_for_parentlinks_makes_theming_hard.mdwn   | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 doc/bugs/HTML_for_parentlinks_makes_theming_hard.mdwn

diff --git a/doc/bugs/HTML_for_parentlinks_makes_theming_hard.mdwn b/doc/bugs/HTML_for_parentlinks_makes_theming_hard.mdwn
new file mode 100644
index 000000000..523042842
--- /dev/null
+++ b/doc/bugs/HTML_for_parentlinks_makes_theming_hard.mdwn
@@ -0,0 +1,42 @@
+I'm trying to make a pretty theme for ikiwiki and I'm making progress (or at least I think I am :-).  However I've noticed an issue when it comes to theming.  On the front page the wiki name is put inside the "title" span and on all the other pages, it's put in the "parentlinks" span.  See here:
+
+From [my dev home page](http://adam.shand.net/iki-dev/):
+
+<code>
+&lt;div class="header">  
+&lt;span>  
+&lt;span class="parentlinks">  
+ 
+&lt;/span>  
+&lt;span class="title">  
+adam.shand.net/iki-dev  
+&lt;/span>  
+&lt;/span>&lt;!--.header-->  
+ 
+&lt;/div>  
+</code>
+
+From a sub-page of [my dev home page](http://adam.shand.net/iki-dev/recipes/navajo_fry_bread/):
+
+<code>
+&lt;div class="header">  
+&lt;span>  
+&lt;span class="parentlinks">  
+ 
+&lt;a href="../">adam.shand.net/iki-dev</a>/  
+ 
+&lt;/span>  
+&lt;span class="title">  
+recipes 
+&lt;/span>   
+&lt;/span>&lt;!--.header-->  
+ 
+&lt;/div>  
+</code>
+
+I understand the logic behind doing this (on the front page it is the title as well as the name of the wiki) however if you want to do something different with the title of a page vs. the name of the wiki it makes things pretty tricky.
+
+I'll just modify the templates for my own site but I thought I'd report it as a bug in the hopes that it will be useful to others.
+
+Cheers,  
+Adam.
-- 
cgit v1.2.3


From 389367854bce16f3f63d47262c594ed4d31373a3 Mon Sep 17 00:00:00 2001
From: "http://adam.shand.net/" <http://adam.shand.net/@web>
Date: Wed, 5 Aug 2009 06:06:18 -0400
Subject:

---
 doc/bugs/HTML_for_parentlinks_makes_theming_hard.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/HTML_for_parentlinks_makes_theming_hard.mdwn b/doc/bugs/HTML_for_parentlinks_makes_theming_hard.mdwn
index 523042842..0cbef403d 100644
--- a/doc/bugs/HTML_for_parentlinks_makes_theming_hard.mdwn
+++ b/doc/bugs/HTML_for_parentlinks_makes_theming_hard.mdwn
@@ -40,3 +40,6 @@ I'll just modify the templates for my own site but I thought I'd report it as a
 
 Cheers,  
 Adam.
+
+----
+> I just noticed that it's also different on the comments, preferences and edit pages.  I'll come up with a diff and see what you guys think.  -- Adam.
-- 
cgit v1.2.3


From 34e5f5eba3411855c9d3c733b6f11aa935f3d435 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Thu, 6 Aug 2009 08:43:45 -0400
Subject:

---
 doc/plugins/contrib/linguas.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/linguas.mdwn b/doc/plugins/contrib/linguas.mdwn
index bf502606e..84ece042e 100644
--- a/doc/plugins/contrib/linguas.mdwn
+++ b/doc/plugins/contrib/linguas.mdwn
@@ -10,7 +10,7 @@ Download: [linguas.pm](http://ettin.org/pub/ikiwiki/linguas.pm) (2006-08-21).
 
 Note that even though it is still available for download, this plugin is no
 longer actively maintained. If you are interested in multilingual wiki pages, you
-can also take a look at other approaches such as [[todo/l10n]], [[plugins/contrib/po]],
+can also take a look at other approaches such as [[todo/l10n]], [[plugins/po]],
 or Lars Wirzenius's
 [Static website, with translations, using IkiWiki](http://liw.iki.fi/liw/log/2007-05.html#20070528b).
 
-- 
cgit v1.2.3


From 0b2100727b3e9288ff9c6587924ff5390c61f19a Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Thu, 6 Aug 2009 09:42:56 -0400
Subject:

---
 doc/plugins/contrib/navbar/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/plugins/contrib/navbar/discussion.mdwn

diff --git a/doc/plugins/contrib/navbar/discussion.mdwn b/doc/plugins/contrib/navbar/discussion.mdwn
new file mode 100644
index 000000000..0bbec743c
--- /dev/null
+++ b/doc/plugins/contrib/navbar/discussion.mdwn
@@ -0,0 +1,2 @@
+Where can I download this plugin ?
+-- [[jogo]]
-- 
cgit v1.2.3


From 4a331d8afc75f9c9fbfb1ef8d592fa1bfb4e2874 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Thu, 6 Aug 2009 13:07:22 -0400
Subject:

---
 doc/plugins/contrib/unixrelpagespec.mdwn | 42 ++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 doc/plugins/contrib/unixrelpagespec.mdwn

diff --git a/doc/plugins/contrib/unixrelpagespec.mdwn b/doc/plugins/contrib/unixrelpagespec.mdwn
new file mode 100644
index 000000000..a35f76c30
--- /dev/null
+++ b/doc/plugins/contrib/unixrelpagespec.mdwn
@@ -0,0 +1,42 @@
+[[!template id=plugin name=unixrelpagespec core=0 author="[[Jogo]]"]]
+
+I don't understand why `./*` correspond to siblings and not subpages.
+This is probably only meaningfull with [[plugins/autoindex]] turned on.
+
+Here is a small plugin wich follow usual Unix convention :
+
+- `./*` expand to subpages
+- `../*` expand to siblings
+
+---
+    #!/usr/bin/perl
+    # UnixRelPageSpec plugin.
+    # by Joseph Boudou <jogo at matabio dot net>
+    
+    package IkiWiki::Plugin::unixrelpagespec;
+    
+    use warnings;
+    use strict;
+    use IkiWiki 3.00;
+    
+    sub import {
+        inject(
+            name => 'IkiWiki::PageSpec::derel',
+            call => \&unix_derel
+        );
+    }
+    
+    sub unix_derel ($$) {
+        my $path = shift;
+        my $from = shift;
+    
+        if ($path =~ m!^\.{1,2}/!) {
+            $from =~ s#/?[^/]+$## if (defined $from and $path =~ m/^\.{2}/);
+            $path =~ s#^\.{1,2}/##;
+            $path = "$from/$path" if length $from;
+        }
+    
+        return $path;
+    }
+    
+    1;
-- 
cgit v1.2.3


From bb4a121222436473f3136064ba89d31995e40691 Mon Sep 17 00:00:00 2001
From: buo <buo@web>
Date: Thu, 6 Aug 2009 13:40:26 -0400
Subject:

---
 doc/forum/Sidebar_with_links__63__.mdwn | 41 +++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 doc/forum/Sidebar_with_links__63__.mdwn

diff --git a/doc/forum/Sidebar_with_links__63__.mdwn b/doc/forum/Sidebar_with_links__63__.mdwn
new file mode 100644
index 000000000..c3252062a
--- /dev/null
+++ b/doc/forum/Sidebar_with_links__63__.mdwn
@@ -0,0 +1,41 @@
+I'm trying to create a template to use as a sidebar with links. The template will be static
+(no variables are used). I first created a page with this directive: \[[!template id=sidebar]],
+and then created the template with the web interface.
+
+This is the code I put in the template:
+
+    <div class="infobox">
+    <ul>
+    <li>\[[Existing internal link|exists]]</li>
+    <li>\[[Non-existing internal link|doesnotexist]]</li>
+    <li>[External link](http://google.com/)</li>
+    </ul>
+    <http://google.com/>
+    </div>
+
+This is the relevant part of the resulting html file `template/sidebar.html`:
+
+    <div class="infobox">
+    <ul>
+    <li><a href="../exists.html">Existing internal link</a></li>
+    <li><span class="createlink"><a href="http://localhost/cgi-bin/itesohome.cgi?page=doesnotexist&amp;from=templates%2Fsidebar&amp;do=create" rel="nofollow">?</a>Non-existing internal link</span></li>
+    <li>[External link](http://google.com/)</li>
+    </ul>
+    </div>
+
+Note that the `<http://google.com/>` link has disappeared, and that `[External link](http://google.com/)`
+has been copied literally instead of being converted to a link, as I expected.
+
+Worse, this is the relevant part of the html file of the page that includes the template:
+
+    <div class="infobox">
+    <ul>
+    <li><span class="selflink">Existing internal link</span></li>
+    <li><span class="createlink"><a href="http://localhost/cgi-bin/itesohome.cgi?page=doesnotexist&amp;from=research&amp;do=create" rel="nofollow">?</a>Non-existing internal link</span></li>
+    <li>[External link](http://google.com/)</li>
+    </ul>
+    </div>
+
+Note that the `Existing internal link` is no longer a link. It is only text.
+
+What am I doing wrong? Any help or pointers will be appreciated. --[[buo]]
-- 
cgit v1.2.3


From fc60d256ddf6ee60f2d3f4965ba6e4cc365323b4 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Thu, 6 Aug 2009 15:51:24 -0400
Subject:

---
 doc/forum/Sidebar_with_links__63__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/Sidebar_with_links__63__.mdwn b/doc/forum/Sidebar_with_links__63__.mdwn
index c3252062a..7bc94242a 100644
--- a/doc/forum/Sidebar_with_links__63__.mdwn
+++ b/doc/forum/Sidebar_with_links__63__.mdwn
@@ -26,6 +26,8 @@ This is the relevant part of the resulting html file `template/sidebar.html`:
 Note that the `<http://google.com/>` link has disappeared, and that `[External link](http://google.com/)`
 has been copied literally instead of being converted to a link, as I expected.
 
+> Templates aren't Markdown page. [[ikiwiki/WikiLink]] only are expanded. --[[Jogo]]
+
 Worse, this is the relevant part of the html file of the page that includes the template:
 
     <div class="infobox">
-- 
cgit v1.2.3


From e6add3a196cbdb86e88a2f29b6a79ab7f250b8f6 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Thu, 6 Aug 2009 16:09:08 -0400
Subject:

---
 doc/users/jogo.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/users/jogo.mdwn

diff --git a/doc/users/jogo.mdwn b/doc/users/jogo.mdwn
new file mode 100644
index 000000000..2a6577990
--- /dev/null
+++ b/doc/users/jogo.mdwn
@@ -0,0 +1,3 @@
+I'm looking at Ikiwiki, searching the best Wiki. The only other one I've found is [werc](http://werc.cat-v.org/).
+
+email: `jogo matabio net`.
-- 
cgit v1.2.3


From 2162b6fd20ff1e4a06b734692719b2278b4ef5ad Mon Sep 17 00:00:00 2001
From: "http://tlavoie.pip.verisignlabs.com/"
 <http://tlavoie.pip.verisignlabs.com/@web>
Date: Thu, 6 Aug 2009 17:36:37 -0400
Subject:

---
 doc/news/openid/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn
index aa9f3f0be..58bac1ae4 100644
--- a/doc/news/openid/discussion.mdwn
+++ b/doc/news/openid/discussion.mdwn
@@ -15,6 +15,8 @@ as well. Also have I just created an account on this wiki as well?
 > can configure it to eg, subscribe your email address to changes to pages.
 > --[[Joey]]
 
+OK, my openid login works too. One question though, is there a setup parameter which controls whether new registrations are permitted at all? For instance, I'm thinking that I'd like to use the wiki format for content, but I don't want it editable by anyone who isn't already set up. Does this work?
+
 ----
 
 # How to ban an IP address?
-- 
cgit v1.2.3


From c121f182dcfbb9b422cae020131a85dd02506db7 Mon Sep 17 00:00:00 2001
From: "http://tlavoie.pip.verisignlabs.com/"
 <http://tlavoie.pip.verisignlabs.com/@web>
Date: Thu, 6 Aug 2009 17:45:34 -0400
Subject:

---
 doc/users/Tim_Lavoie.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/Tim_Lavoie.mdwn

diff --git a/doc/users/Tim_Lavoie.mdwn b/doc/users/Tim_Lavoie.mdwn
new file mode 100644
index 000000000..90df011c6
--- /dev/null
+++ b/doc/users/Tim_Lavoie.mdwn
@@ -0,0 +1 @@
+Hey... I'm just starting to use ikiwiki, but am happy to find it repeatedly doing the sorts of things in a way which makes sense to me. (e.g. most pages are static, DVCS for file store etc.)
-- 
cgit v1.2.3


From 52da709fd819d73b5e245a3154848969a9ef7c16 Mon Sep 17 00:00:00 2001
From: "http://tlavoie.pip.verisignlabs.com/"
 <http://tlavoie.pip.verisignlabs.com/@web>
Date: Thu, 6 Aug 2009 17:47:43 -0400
Subject:

---
 doc/news/openid/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn
index 58bac1ae4..e611fa77b 100644
--- a/doc/news/openid/discussion.mdwn
+++ b/doc/news/openid/discussion.mdwn
@@ -15,7 +15,7 @@ as well. Also have I just created an account on this wiki as well?
 > can configure it to eg, subscribe your email address to changes to pages.
 > --[[Joey]]
 
-OK, my openid login works too. One question though, is there a setup parameter which controls whether new registrations are permitted at all? For instance, I'm thinking that I'd like to use the wiki format for content, but I don't want it editable by anyone who isn't already set up. Does this work?
+OK, my openid login works too. One question though, is there a setup parameter which controls whether new registrations are permitted at all? For instance, I'm thinking that I'd like to use the wiki format for content, but I don't want it editable by anyone who isn't already set up. Does this work? --[[Tim Lavoie]]
 
 ----
 
-- 
cgit v1.2.3


From c7ad7482f4357c43729214acc04901fa7fcf501e Mon Sep 17 00:00:00 2001
From: "http://bob-bernstein.myopenid.com/"
 <http://bob-bernstein.myopenid.com/@web>
Date: Thu, 6 Aug 2009 22:20:15 -0400
Subject:

---
 doc/plugins/htmlscrubber/discussion.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/plugins/htmlscrubber/discussion.mdwn

diff --git a/doc/plugins/htmlscrubber/discussion.mdwn b/doc/plugins/htmlscrubber/discussion.mdwn
new file mode 100644
index 000000000..46697f6bd
--- /dev/null
+++ b/doc/plugins/htmlscrubber/discussion.mdwn
@@ -0,0 +1,7 @@
+**Ok, I have yet to post a big dummy wiki-noobie question around here, so here goes:**
+
+Yes, I want to play around with *gulp* Google Ads on an ikiwiki blog, namely, in the *sidebar*. 
+
+No, I do not want to turn htmlscrubber off, but apart from that I have not been able to allow &lt;script&gt; elements as required by Google.
+
+Thoughts?
-- 
cgit v1.2.3


From 69d26eb5739fac2bac81554e3c31288011a57a48 Mon Sep 17 00:00:00 2001
From: "http://bob-bernstein.myopenid.com/"
 <http://bob-bernstein.myopenid.com/@web>
Date: Fri, 7 Aug 2009 01:09:03 -0400
Subject:

---
 doc/plugins/htmlscrubber/discussion.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/plugins/htmlscrubber/discussion.mdwn b/doc/plugins/htmlscrubber/discussion.mdwn
index 46697f6bd..5e8b637b7 100644
--- a/doc/plugins/htmlscrubber/discussion.mdwn
+++ b/doc/plugins/htmlscrubber/discussion.mdwn
@@ -5,3 +5,14 @@ Yes, I want to play around with *gulp* Google Ads on an ikiwiki blog, namely, in
 No, I do not want to turn htmlscrubber off, but apart from that I have not been able to allow &lt;script&gt; elements as required by Google.
 
 Thoughts?
+
+---
+
+***Fixed!***
+
+Did some more reading, did some searching on the wiki, and found, under *embed*, these
+
+    htmlscrubber_skip => '!*/Discussion',
+    locked_pages => '!*/Discussion',
+
+Thanks!
-- 
cgit v1.2.3


From 9637e66932c72381adba4c56bb4d23d2539db717 Mon Sep 17 00:00:00 2001
From: buo <buo@web>
Date: Fri, 7 Aug 2009 08:56:07 -0400
Subject:

---
 doc/forum/Sidebar_with_links__63__.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/Sidebar_with_links__63__.mdwn b/doc/forum/Sidebar_with_links__63__.mdwn
index 7bc94242a..f3deb29c0 100644
--- a/doc/forum/Sidebar_with_links__63__.mdwn
+++ b/doc/forum/Sidebar_with_links__63__.mdwn
@@ -28,6 +28,10 @@ has been copied literally instead of being converted to a link, as I expected.
 
 > Templates aren't Markdown page. [[ikiwiki/WikiLink]] only are expanded. --[[Jogo]]
 
+>> Thanks for the help Jogo. Looking at the [[templates]] page, it says that
+"...you can include WikiLinks and all other forms of wiki markup in the template." I read this
+to mean that a template may indeed include Markdown. Am I wrong in my interpratation? --[[buo]] 
+
 Worse, this is the relevant part of the html file of the page that includes the template:
 
     <div class="infobox">
-- 
cgit v1.2.3


From 03bfd6c317a035434ba4abd59704d22f7535b664 Mon Sep 17 00:00:00 2001
From: buo <buo@web>
Date: Fri, 7 Aug 2009 14:52:30 -0400
Subject:

---
 doc/forum/Sidebar_with_links__63__.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/Sidebar_with_links__63__.mdwn b/doc/forum/Sidebar_with_links__63__.mdwn
index f3deb29c0..79da03e5f 100644
--- a/doc/forum/Sidebar_with_links__63__.mdwn
+++ b/doc/forum/Sidebar_with_links__63__.mdwn
@@ -32,6 +32,10 @@ has been copied literally instead of being converted to a link, as I expected.
 "...you can include WikiLinks and all other forms of wiki markup in the template." I read this
 to mean that a template may indeed include Markdown. Am I wrong in my interpratation? --[[buo]] 
 
+>> I discovered that if I eliminate all html from my sidebar.mdwn template, the links are
+rendered properly. It seems that the mix of Markdown and html is confusing some part of
+Ikiwiki. --[[buo]]
+
 Worse, this is the relevant part of the html file of the page that includes the template:
 
     <div class="infobox">
-- 
cgit v1.2.3


From 8fba0e710186071ca0a776140fe7b6acc8f07dad Mon Sep 17 00:00:00 2001
From: buo <buo@web>
Date: Fri, 7 Aug 2009 15:26:07 -0400
Subject: Solved.

---
 doc/forum/Sidebar_with_links__63__.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/forum/Sidebar_with_links__63__.mdwn b/doc/forum/Sidebar_with_links__63__.mdwn
index 79da03e5f..790ee85a2 100644
--- a/doc/forum/Sidebar_with_links__63__.mdwn
+++ b/doc/forum/Sidebar_with_links__63__.mdwn
@@ -49,3 +49,10 @@ Worse, this is the relevant part of the html file of the page that includes the
 Note that the `Existing internal link` is no longer a link. It is only text.
 
 What am I doing wrong? Any help or pointers will be appreciated. --[[buo]]
+
+-----
+
+I think I have figured this out. I thought the template was filled and then
+processed to convert Markdown to html. Instead, the text in each variable is
+processed and then the template is filled. I somehow misunderstood the 
+[[templates]] page. -- [[buo]]
-- 
cgit v1.2.3


From 1632976f63787324b5466bea10a1e4e80d2d1989 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 8 Aug 2009 12:10:57 -0400
Subject: Dragonfly BSD has been using ikiwiki for their website since last
 December

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 72bdbf3d8..2584de6ea 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -44,6 +44,7 @@ Projects & Organizations
 * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * The [GNU Hurd](http://www.gnu.org/software/hurd/)'s web pages
+* [DragonFly BSD](http://www.dragonflybsd.org/)
 * The [Free Software Foundation](http://fsf.org) uses it for their internal wiki, with subversion.
 
 Personal sites and blogs
-- 
cgit v1.2.3


From 92d0299ea02cba9221a7d9f67a504cadfdea5ea2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 8 Aug 2009 12:15:44 -0400
Subject: move larger projects using ikiwiki to top of list

---
 doc/ikiwikiusers.mdwn | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 2584de6ea..db0d8cd9c 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -2,6 +2,12 @@ Projects & Organizations
 ========================
 
 * [This wiki](http://ikiwiki.info) (of course!)
+* The [GNU Hurd](http://www.gnu.org/software/hurd/)
+* [DragonFly BSD](http://www.dragonflybsd.org/)
+* [Monotone](http://monotone.ca/wiki/FrontPage/)
+* The [Free Software Foundation](http://fsf.org) uses it for their internal wiki, with subversion.
+* The [cairo graphics library](http://cairographics.org/) website.
+* The [Portland State Aerospace Society](http://psas.pdx.edu) website.  Converted from a combination of TWiki and MoinMoin to ikiwiki, including full history ([[rcs/Git]] backend).
 * [Planet Debian upstream](http://updo.debian.net/)
 * [Debian Mentors wiki](http://jameswestby.net/mentors/)
 * The [Sparse wiki](http://kernel.org/pub/linux/kernel/people/josh/sparse).
@@ -13,8 +19,6 @@ Projects & Organizations
 * [Braawi Ltd](http://braawi.com/) and the community site [Braawi.org](http://braawi.org/)
 * [Webconverger](http://webconverger.org/) (a Web only linux distribution) with a [blog](http://webconverger.org/blog/)
 * [debian-community.org](http://debian-community.org/)
-* The [cairo graphics library](http://cairographics.org/) website.
-* The [Portland State Aerospace Society](http://psas.pdx.edu) website.  Converted from a combination of TWiki and MoinMoin to ikiwiki, including full history ([[rcs/Git]] backend).
 * [DebTorrent](http://debtorrent.alioth.debian.org)
 * The [netconf project](http://netconf.alioth.debian.org)
 * The [Debian Packaging Handbook project](http://packaging-handbook.alioth.debian.org/wiki/)
@@ -27,7 +31,6 @@ Projects & Organizations
 * [Enemies of Carlotta](http://www.e-o-c.org/)
 * [vcs-pkg](http://vcs-pkg.org)
 * [vcs-home](http://vcs-home.madduck.net)
-* [GNU Hurd wiki](http://www.bddebian.com/~wiki/)
 * [Query Object Framework](http://qof.alioth.debian.org/)
 * [Estron - Object Relational Mapping interpreter](http://estron.alioth.debian.org/)
 * [Public Domain collection of Debian related tips & tricks](http://dabase.com/tips/) - please add any tips too
@@ -37,20 +40,15 @@ Projects & Organizations
 * [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de)
 * [monkeysphere](http://web.monkeysphere.info/)
 * [The Walden Effect](http://www.waldeneffect.org/)
-* [Monotone](http://monotone.ca/wiki/FrontPage/)
 * The support pages for [Trinity Centre for High Performance Computing](http://www.tchpc.tcd.ie/support/)
 * [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/)
 * [Pigro Network](http://www.pigro.net) is running a hg based ikiwiki. (And provides ikiwiki hosting for $10/m.)
 * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
-* The [GNU Hurd](http://www.gnu.org/software/hurd/)'s web pages
-* [DragonFly BSD](http://www.dragonflybsd.org/)
-* The [Free Software Foundation](http://fsf.org) uses it for their internal wiki, with subversion.
 
 Personal sites and blogs
 ========================
 
-* [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
 * [[Joey]]'s [homepage](http://kitenet.net/~joey/), including his weblog
 * [Kyle's MacLea Genealogy wiki](http://kitenet.net/~kyle/family/wiki) and [Livingstone and MacLea Emigration Registry](http://kitenet.net/~kyle/family/registry)
 * [Ulrik's personal web page](http://kaizer.se/wiki/)
@@ -124,10 +122,13 @@ Personal sites and blogs
 * [Natalian - Kai Hendry's personal blog](http://natalian.org/)
 * [Mick Pollard aka \_lunix_ - Personal sysadmin blog and wiki](http://www.lunix.com.au)
 * [tumashu's page](http://tumashu.github.com) This is my personal site in github  created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master)  
+* [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
 
 Please feel free to add your own ikiwiki site!
 
 See also: [Debian ikiwiki popcon graph](http://qa.debian.org/popcon.php?package=ikiwiki)
 and [google search for ikiwiki powered sites](http://www.google.com/search?q=%22powered%20by%20ikiwiki%22).
 
-While nothing makes me happier than knowing that ikiwiki has happy users, dropping some change in the [[TipJar]] is a nice way to show extra appreciation.
+While nothing makes me happier than knowing that ikiwiki has happy users,
+dropping some change in the [[TipJar]] is a nice way to show extra
+appreciation.
-- 
cgit v1.2.3


From 22edaf77c2a4318ebd8ed0881dd6a62cfc2ca2b2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 8 Aug 2009 12:23:50 -0400
Subject: fix misleading comment

---
 IkiWiki/Plugin/getsource.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index e8aea2c39..91c4cc1c9 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -42,10 +42,6 @@ sub pagetemplate (@) {
 sub cgi_getsource ($) {
 	my $cgi=shift;
 
-	# Note: we use sessioncgi rather than just cgi
-	# because we need %pagesources to be
-	# populated.
-
 	return unless (defined $cgi->param('do') &&
 					$cgi->param("do") eq "getsource");
 
@@ -53,6 +49,7 @@ sub cgi_getsource ($) {
 
 	my $page=$cgi->param('page');
 
+	# For %pagesources.
 	IkiWiki::loadindex();
 
 	if (! exists $pagesources{$page}) {
-- 
cgit v1.2.3


From 8f6e0212fdbf3de286e504ed2802111bf7864abe Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 8 Aug 2009 12:27:48 -0400
Subject: verify page name is sane

paranoia; I was thinking about XSS attacks specificaly
---
 IkiWiki/Plugin/getsource.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index 91c4cc1c9..ae9ea3cc7 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -42,13 +42,17 @@ sub pagetemplate (@) {
 sub cgi_getsource ($) {
 	my $cgi=shift;
 
-	return unless (defined $cgi->param('do') &&
-					$cgi->param("do") eq "getsource");
+	return unless defined $cgi->param('do') &&
+	              $cgi->param("do") eq "getsource";
 
 	IkiWiki::decode_cgi_utf8($cgi);
 
 	my $page=$cgi->param('page');
 
+	if (! defined $page || $page !~ /$config{wiki_file_regexp}/) {
+		error("invalid page parameter");
+	}
+
 	# For %pagesources.
 	IkiWiki::loadindex();
 
-- 
cgit v1.2.3


From c0c1e05daba09ce9c73c6c2f1ceca02b488613ba Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 8 Aug 2009 12:32:39 -0400
Subject: finish merging getsource

---
 debian/copyright           | 2 +-
 doc/plugins/getsource.mdwn | 4 ++--
 doc/todo/source_link.mdwn  | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 762f9f445..b06d27f19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -136,7 +136,7 @@ Files: 404.pm
 Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
-Files: wmd.pm
+Files: wmd.pm, getsource.pm
 Copyright: © 2009 William Uther
 License: GPL-2+
 
diff --git a/doc/plugins/getsource.mdwn b/doc/plugins/getsource.mdwn
index 4fbf4be98..20040ccee 100644
--- a/doc/plugins/getsource.mdwn
+++ b/doc/plugins/getsource.mdwn
@@ -1,7 +1,7 @@
 [[!template id=plugin name=getsource author="[[Will_Uther|Will]]"]]
 
-This plugin adds a `getsource` action to the IkiWiki CGI, and a "Source" link
-that uses it to display pages' source.
+This plugin adds a "Source" link to the top of each page that uses
+the CGI to display the page's source.
 
 Configuration for this plugin in the setup file:
 
diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index 0c639a314..dfc2766cc 100644
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -13,6 +13,7 @@ All of this code is licensed under the GPLv2+. -- [[Will]]
 
 [[!template id=gitbranch branch=smcv/ready/getsource
   author="[[Will]]/[[smcv]]"]]
+[[done]]
 
 >> I've applied the patch below in a git branch, fixed my earlier criticism,
 >> and also fixed a couple of other issues I noticed:
-- 
cgit v1.2.3


From 67bca4125d6fba24d69f53183949d89b632955dc Mon Sep 17 00:00:00 2001
From: "http://eric.shared.dre.am/" <http://eric.shared.dre.am/@web>
Date: Sat, 8 Aug 2009 14:39:11 -0400
Subject:

---
 doc/tips/dot_cgi.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn
index 4532c84cd..0379ece93 100644
--- a/doc/tips/dot_cgi.mdwn
+++ b/doc/tips/dot_cgi.mdwn
@@ -56,6 +56,10 @@ rule that allow `ikiwiki.cgi` to be executed.
 server (offline). I am not sure of how secure this approach is.
 If you have any thought about it, feel free to let me know.
 
+## nginx
+
+* To run CGI under nginx, just us a FastCGI wrapper like [this one](http://technotes.1000lines.net/?p=23). The wrapper must be started somehow just like any other FastCGI program. I use launchd on OSX.
+
 ## boa
 
 Edit /etc/boa/boa.conf and make sure the following line is not commented:
-- 
cgit v1.2.3


From aa29cb5fc0126e90b4994d31e491179a1184e047 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Sat, 8 Aug 2009 15:39:37 -0400
Subject: typo

---
 doc/tips/dot_cgi.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn
index 0379ece93..da55c1f1c 100644
--- a/doc/tips/dot_cgi.mdwn
+++ b/doc/tips/dot_cgi.mdwn
@@ -58,7 +58,7 @@ If you have any thought about it, feel free to let me know.
 
 ## nginx
 
-* To run CGI under nginx, just us a FastCGI wrapper like [this one](http://technotes.1000lines.net/?p=23). The wrapper must be started somehow just like any other FastCGI program. I use launchd on OSX.
+* To run CGI under nginx, just use a FastCGI wrapper like [this one](http://technotes.1000lines.net/?p=23). The wrapper must be started somehow just like any other FastCGI program. I use launchd on OSX.
 
 ## boa
 
-- 
cgit v1.2.3


From 52ee05feb7f136d0211732f7a7f93960d3938555 Mon Sep 17 00:00:00 2001
From: "http://christine-spang.myopenid.com/"
 <http://christine-spang.myopenid.com/@web>
Date: Sat, 8 Aug 2009 16:04:58 -0400
Subject:

---
 doc/tips/importing_posts_from_typo.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/tips/importing_posts_from_typo.mdwn

diff --git a/doc/tips/importing_posts_from_typo.mdwn b/doc/tips/importing_posts_from_typo.mdwn
new file mode 100644
index 000000000..1b87e7dae
--- /dev/null
+++ b/doc/tips/importing_posts_from_typo.mdwn
@@ -0,0 +1 @@
+[Here](http://blog.spang.cc/posts/migrating_from_typo_to_ikiwiki/) is a blog post that gives instructions and a script for importing posts from [Typo](http://typosphere.org/), a Ruby-on-Rails based blogging engine.
-- 
cgit v1.2.3


From 255835660b91e601b250bffe5a00751767b43f87 Mon Sep 17 00:00:00 2001
From: bremner <bremner@web>
Date: Sat, 8 Aug 2009 16:48:00 -0400
Subject: question (for joeyh?) about IkiWiki::refresh()

---
 doc/plugins/contrib/postal/discussion.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/plugins/contrib/postal/discussion.mdwn

diff --git a/doc/plugins/contrib/postal/discussion.mdwn b/doc/plugins/contrib/postal/discussion.mdwn
new file mode 100644
index 000000000..90113eb41
--- /dev/null
+++ b/doc/plugins/contrib/postal/discussion.mdwn
@@ -0,0 +1,15 @@
+It seems like the filter 'postal-accept.pl' I wrote doesn't refresh thoroughly enough.  When a comment is added  it calls
+
+         IkiWiki::add_depends($page,$comments_page);
+
+And then after adding the actual comment, it ends with
+
+         IkiWiki::refresh();
+         IkiWiki::saveindex();
+
+Sure enough, the page being commented on is refreshed, but not any inline pages (e.g. tags pages, blog top level) that contain it.
+Is there a way to recursively refresh? Or should it work that way by default. I guess it is some part of the api that I don't understand, 
+since I think not many people grub about in the internals of ikiwiki this way.
+It would be nice to figure this out, doing a full rebuild every time I get a blog comment is not that fun.
+
+[[DavidBremner]]
-- 
cgit v1.2.3


From eb5e6b2bb63a7e1096e6f16ecc9d5bf881b23983 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 8 Aug 2009 17:01:10 -0400
Subject: response

---
 doc/plugins/contrib/postal/discussion.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/plugins/contrib/postal/discussion.mdwn b/doc/plugins/contrib/postal/discussion.mdwn
index 90113eb41..3e6d056e2 100644
--- a/doc/plugins/contrib/postal/discussion.mdwn
+++ b/doc/plugins/contrib/postal/discussion.mdwn
@@ -13,3 +13,10 @@ since I think not many people grub about in the internals of ikiwiki this way.
 It would be nice to figure this out, doing a full rebuild every time I get a blog comment is not that fun.
 
 [[DavidBremner]]
+
+> Ikiwiki currently doesn't have support for transitive dependencies.
+> This is discussed deep inside [[todo/tracking_bugs_with_dependencies]]
+> and in [[todo/inlines_inheriting_links]]. 
+> 
+> FYI, the [[plugins/comments]] plugin avoids this problem by only showing the
+> comments on the page, and not on pages that inline it. --[[Joey]] 
-- 
cgit v1.2.3


From 3c1ebd20f84f1ec654105340a1d7c28dd3748557 Mon Sep 17 00:00:00 2001
From: bremner <bremner@web>
Date: Sat, 8 Aug 2009 17:19:07 -0400
Subject: ok, thanks. I'll probably do the same.

---
 doc/plugins/contrib/postal/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/contrib/postal/discussion.mdwn b/doc/plugins/contrib/postal/discussion.mdwn
index 3e6d056e2..4eaacc044 100644
--- a/doc/plugins/contrib/postal/discussion.mdwn
+++ b/doc/plugins/contrib/postal/discussion.mdwn
@@ -20,3 +20,5 @@ It would be nice to figure this out, doing a full rebuild every time I get a blo
 > 
 > FYI, the [[plugins/comments]] plugin avoids this problem by only showing the
 > comments on the page, and not on pages that inline it. --[[Joey]] 
+>> Ok, thanks for the speedy response. I guess I should do the same thing.
+>> [[DavidBremner]]
-- 
cgit v1.2.3


From c86842711ffd76b1ce52ce9a5fc21bfae136aebb Mon Sep 17 00:00:00 2001
From: "http://certifi.ca/lunix" <http://certifi.ca/lunix@web>
Date: Sat, 8 Aug 2009 19:19:32 -0400
Subject: centos question

---
 doc/plugins/highlight/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/highlight/discussion.mdwn b/doc/plugins/highlight/discussion.mdwn
index 7d3cabea9..51d70bcf9 100644
--- a/doc/plugins/highlight/discussion.mdwn
+++ b/doc/plugins/highlight/discussion.mdwn
@@ -10,3 +10,7 @@ if you want to implement it I won't complain :-). [[DavidBremner]]
 > of, but if there are multiple options, giving each its own nane would
 > word better for websetup than would putting all the options in a
 > sub-hash. --[[Joey]] 
+
+
+Has anyone got this running with CentOS/RHEL ?   
+Having trouble working out where to get the perl bindings for highlight. --[Mick](http://www.lunix.com.au)  
-- 
cgit v1.2.3


From a0ace62664dd767a3894c1a708b8ed49e380c368 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 8 Aug 2009 20:27:50 -0400
Subject: point out where to get highlight perl bindings

---
 doc/plugins/highlight.mdwn            | 6 ++++--
 doc/plugins/highlight/discussion.mdwn | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/highlight.mdwn b/doc/plugins/highlight.mdwn
index 44ced80f7..5f04fda52 100644
--- a/doc/plugins/highlight.mdwn
+++ b/doc/plugins/highlight.mdwn
@@ -8,8 +8,10 @@ languages and file formats.
 ## prerequisites
 
 You will need to install the perl bindings to the
-[highlight library](http://www.andre-simon.de/), which in Debian
-are in the [[!debpkg libhighlight-perl]] package.
+[highlight library](http://www.andre-simon.de/). In Debian
+they are in the [[!debpkg libhighlight-perl]] package. If
+your distribution does not have them, look in `examples/swig`
+in highlight's source.
 
 ## embedding highlighted code
 
diff --git a/doc/plugins/highlight/discussion.mdwn b/doc/plugins/highlight/discussion.mdwn
index 51d70bcf9..0c9e654c1 100644
--- a/doc/plugins/highlight/discussion.mdwn
+++ b/doc/plugins/highlight/discussion.mdwn
@@ -14,3 +14,6 @@ if you want to implement it I won't complain :-). [[DavidBremner]]
 
 Has anyone got this running with CentOS/RHEL ?   
 Having trouble working out where to get the perl bindings for highlight. --[Mick](http://www.lunix.com.au)  
+
+> The perl bindings are hidden in `examples/swig` in highlight's source.
+> --[[Joey]] 
-- 
cgit v1.2.3


From 4e387bc6b65c4d56027ac93498e9782dbaba94d7 Mon Sep 17 00:00:00 2001
From: "http://certifi.ca/lunix" <http://certifi.ca/lunix@web>
Date: Sat, 8 Aug 2009 21:11:03 -0400
Subject: reponse about highlight plugin

---
 doc/plugins/highlight/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/highlight/discussion.mdwn b/doc/plugins/highlight/discussion.mdwn
index 0c9e654c1..3ae6149bf 100644
--- a/doc/plugins/highlight/discussion.mdwn
+++ b/doc/plugins/highlight/discussion.mdwn
@@ -17,3 +17,5 @@ Having trouble working out where to get the perl bindings for highlight. --[Mick
 
 > The perl bindings are hidden in `examples/swig` in highlight's source.
 > --[[Joey]] 
+
+Thanks for prompt reply. Now just need to work out how to get it to work with inline code. I can not find the 'format' plugin to enable it. --[Mick](http://www.lunix.com.au) 
-- 
cgit v1.2.3


From c430c5ebd08e92f38975faa3ac99b0c68015099b Mon Sep 17 00:00:00 2001
From: "http://certifi.ca/lunix" <http://certifi.ca/lunix@web>
Date: Sun, 9 Aug 2009 01:34:11 -0400
Subject: add my response

---
 doc/plugins/highlight/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/highlight/discussion.mdwn b/doc/plugins/highlight/discussion.mdwn
index 3ae6149bf..556b04145 100644
--- a/doc/plugins/highlight/discussion.mdwn
+++ b/doc/plugins/highlight/discussion.mdwn
@@ -18,4 +18,4 @@ Having trouble working out where to get the perl bindings for highlight. --[Mick
 > The perl bindings are hidden in `examples/swig` in highlight's source.
 > --[[Joey]] 
 
-Thanks for prompt reply. Now just need to work out how to get it to work with inline code. I can not find the 'format' plugin to enable it. --[Mick](http://www.lunix.com.au) 
+Thanks for prompt reply.All working. I will post on my site tonight and link here what I did on CentOS to make this work. --[Mick](http://www.lunix.com.au) 
-- 
cgit v1.2.3


From d7773939ccc88452fea600a5fe72e5d14fb7a3f6 Mon Sep 17 00:00:00 2001
From: "http://christine-spang.myopenid.com/"
 <http://christine-spang.myopenid.com/@web>
Date: Sun, 9 Aug 2009 07:57:06 -0400
Subject: add user page for Christine Spang

---
 doc/users/Christine_Spang.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/Christine_Spang.mdwn

diff --git a/doc/users/Christine_Spang.mdwn b/doc/users/Christine_Spang.mdwn
new file mode 100644
index 000000000..223e9739d
--- /dev/null
+++ b/doc/users/Christine_Spang.mdwn
@@ -0,0 +1 @@
+Running ikiwiki on her [homepage](http://spang.cc/) and [blog](http://blog.spang.cc/).
-- 
cgit v1.2.3


From 9d0f8c917ecb9b960845126446cebefab88f0380 Mon Sep 17 00:00:00 2001
From: "http://christine-spang.myopenid.com/"
 <http://christine-spang.myopenid.com/@web>
Date: Sun, 9 Aug 2009 08:01:12 -0400
Subject: add MIT SIPB to list of organisations using ikiwiki

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index db0d8cd9c..58dd51600 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -45,6 +45,7 @@ Projects & Organizations
 * [Pigro Network](http://www.pigro.net) is running a hg based ikiwiki. (And provides ikiwiki hosting for $10/m.)
 * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
+* [MIT Student Information Processing Board](http://sipb.mit.edu/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 792026fe97c47a3da4f941dc615ebf3bd428ad37 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Sun, 9 Aug 2009 22:06:02 -0400
Subject: add install and usage directions, to-do list

---
 doc/plugins/contrib/cvs.mdwn | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index fc5afebfd..db9cde98b 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -2,20 +2,16 @@
 
 This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]].
 
-* Diffs are against [[3.14159|news/version_3.14159]]. `cvs.pm` started life as a copy of `svn.pm`.
-* `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata into `$DESTDIR`.
-* [[ikiwiki-makerepo]]:
- * creates a repository,
- * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
- * creates a small post-commit wrapper to prevent `cvs add <directory>` from being seen by ikiwiki's [[post-commit]] hook,
- * configures the wrapper itself as a post-commit hook in `CVSROOT/loginfo`.
-* [`cvsps`](http://www.cobite.com/cvsps/) is required (`rcs_recentchanges()` and `rcs_diff()` need it to work).
-* [[!cpan IPC::Cmd]] and [[!cpan String::ShellQuote]] are required (to safely keep `cvs` quiet and to safely escape commit messages, respectively).
-* CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It might be possible to solve this problem with scripts like `commit_prep` and `log_accum` from CVS contrib.
-* Due to the name of CVS's metadata directories, it's impossible to create `.../CVS/foo.mdwn`. On case-insensitive filesystems it's also impossible to create `.../cvs/foo.mdwn`. Since the failure can have confusing effects on one's CVS checkout, perhaps the web interface should prevent the attempt.
-* No testing or special-casing has been done with [[attachments|plugins/attachment]], but they'll probably need `cvs add -kb`.
+### Installation and usage
+7. Apply patches to [`IkiWiki.pm`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-IkiWiki.pm.diff)
+and [`ikiwiki-makerepo`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-ikiwiki-makerepo.diff).
+7. Rebuild and install ikiwiki.
+7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan IPC::Cmd]], [[!cpan String::ShellQuote]], and [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
+7. Download [`cvs.pm`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs.pm) into a suitable `$libdir/IkiWiki/Plugin`.
+7. While setting up a wiki [[by hand|setup/byhand]], also specify `--libdir` until you get to the point where you have a setup file. (This ensures the CVS plugin is found and its settings stanza included.)
+7. Adjust CVS-related parameters in your setup file.
 
-Having a `$HOME/.cvsrc` isn't necessary. Sure does make using CVS more livable, though. Here's a good general-purpose one:
+Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn't need it, but you yourself might. Here's a good general-purpose one:
 
     cvs -q
     checkout -P
@@ -23,10 +19,19 @@ Having a `$HOME/.cvsrc` isn't necessary. Sure does make using CVS more livable,
     diff -u
     rdiff -u
 
-Not knowing how the tests get set up, I blindly attempted to add subversion-like tests to `t/file_pruned.t`. They fail. But the plugin definitely works. :-)
+### Implementation details
+* Diffs are against [[3.14159|news/version_3.14159]]. `cvs.pm` started life as a copy of `svn.pm`.
+* `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata into `$DESTDIR`.
+* [[ikiwiki-makerepo]]:
+ * creates a repository,
+ * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
+ * creates a small post-commit wrapper to prevent `cvs add <directory>` from being seen by ikiwiki's [[post-commit]] hook,
+ * configures the wrapper itself as a post-commit hook in `CVSROOT/loginfo`.
+* CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum`scripts (see below).
 
-### Code
-* [`cvs.pm`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs.pm)
-* [`cvs-IkiWiki.pm.diff`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-IkiWiki.pm.diff)
-* [`cvs-ikiwiki-makerepo.diff`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-ikiwiki-makerepo.diff)
-* [`cvs-t-file_pruned.t.diff`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-t-file_pruned.t.diff)
+### To do
+* Add automated tests. ([Blindly adding svn-like tests to `t/file_pruned.t`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-t-file_pruned.t.diff) doesn't do the trick.)
+* If the argument to `cvs add` smells like a binary file, `cvs add -kb` it (for [[plugins/attachment]] support).
+* Don't slurp the entire `cvsps` output into memory (!).
+* Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records.
+* Perhaps prevent web edits from attempting to create `.../CVS/foo.mdwn` (and `.../cvs/foo.mdwn` on case-insensitive filesystems); thanks to the CVS metadata directory, the attempt will fail anyway (and much more confusingly) if we don't.
-- 
cgit v1.2.3


From af29201c3ce1099fbc3f8e6986d098fac6cef249 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Sun, 9 Aug 2009 22:09:42 -0400
Subject: the post-commit wrapper wrapper also avoids cvs deadlock

---
 doc/plugins/contrib/cvs.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index db9cde98b..f466b9399 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -25,9 +25,9 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
 * [[ikiwiki-makerepo]]:
  * creates a repository,
  * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
- * creates a small post-commit wrapper to prevent `cvs add <directory>` from being seen by ikiwiki's [[post-commit]] hook,
+ * creates a small post-commit wrapper to prevent `cvs add <directory>` from being seen by ikiwiki's [[post-commit]] hook (and avoid `cvs` locking against itself),
  * configures the wrapper itself as a post-commit hook in `CVSROOT/loginfo`.
-* CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum`scripts (see below).
+* CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below).
 
 ### To do
 * Add automated tests. ([Blindly adding svn-like tests to `t/file_pruned.t`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-t-file_pruned.t.diff) doesn't do the trick.)
-- 
cgit v1.2.3


From 8c4325d2ceb50533cea01128d119ff19fba2ea44 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 10 Aug 2009 15:24:07 -0400
Subject: turn powered by ikiwiki link into link to the local documentation

---
 doc/basewiki/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/basewiki/index.mdwn b/doc/basewiki/index.mdwn
index 05834e079..4187c1162 100644
--- a/doc/basewiki/index.mdwn
+++ b/doc/basewiki/index.mdwn
@@ -4,4 +4,4 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
 
 ----
 
-This wiki is powered by [ikiwiki](http://ikiwiki.info/).
+This wiki is powered by [[ikiwiki]].
-- 
cgit v1.2.3


From 83480665c256a344900fc817bcb4618f8db9aeee Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 10 Aug 2009 15:59:32 -0400
Subject: po: Fix copy of po file from underlay when editing

When first editing a page that was in the underlay, avoid losing
the translation by copying the po file over from the underlay.
---
 IkiWiki/Plugin/po.pm | 15 +++++++++++++++
 doc/plugins/po.mdwn  | 11 -----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 0ae4adcfc..e9dc9dd8c 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -827,6 +827,21 @@ sub refreshpofiles ($@) {
 
 	foreach my $pofile (@pofiles) {
 		IkiWiki::prep_writefile(basename($pofile),dirname($pofile));
+
+		if (! -e $pofile) {
+			# If the po file exists in an underlay, copy it
+			# from there.
+			my ($pobase)=$pofile=~/^\Q$config{srcdir}\E\/?(.*)$/;
+			foreach my $dir (@{$config{underlaydirs}}) {
+				if (-e "$dir/$pobase") {
+					File::Copy::syscopy("$dir/$pobase",$pofile)
+						or error("po(refreshpofiles) ".
+							 sprintf(gettext("failed to copy underlay PO file to %s"),
+								 $pofile));
+				}
+			}
+		}
+
 		if (-e $pofile) {
 			system("msgmerge", "--previous", "-q", "-U", "--backup=none", $pofile, $potfile) == 0
 				or error("po(refreshpofiles) ".
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 0c8110563..2fbf67016 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -277,17 +277,6 @@ That used to be so, but the bug was fixed. Does this mean
 that po might be replacing the only link on a page, in error? 
 --[[Joey]] 
 
-Bug when editing underlay file
-------------------------------
-
-While I've gotten translated underlays working, there is a bug
-if the wiki is currently using a page from the underlay, and the master
-language version is edited. This causes the edited page to be saved
-to srcdir.. and all the translations get set to 0% and their
-po files have the translated strings "emptied". What's really going on
-is that these are entirely new po files not based on the old ones
-in the basewiki, and thus lacking translations. --[[Joey]] 
-
 Documentation
 -------------
 
-- 
cgit v1.2.3


From fd80cec18d4ad6f2f1ecbe1feb37f065b6bb1f26 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 10 Aug 2009 16:31:51 -0400
Subject: idea

---
 doc/todo/paste_plugin.mdwn | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 doc/todo/paste_plugin.mdwn

diff --git a/doc/todo/paste_plugin.mdwn b/doc/todo/paste_plugin.mdwn
new file mode 100644
index 000000000..83384a8d7
--- /dev/null
+++ b/doc/todo/paste_plugin.mdwn
@@ -0,0 +1,36 @@
+It was suggested that using ikiwiki as an alternative to pastebin services
+could be useful, especially if you want pastes to not expire and be
+cloneable.
+
+All you really need is a special purpose ikiwiki instance that you commit
+to by git. But a web interface for pasting could also be nice.
+
+There could be a directive that inserts a paste form onto a page. The form
+would have a big textarea for pasting into, and might also have a file
+upload button (for uploading instead of pasting). It could also copy the
+page edit form's dropdown of markup types, which would be especially useful
+if using the highlight plugin to support programming languages. The default
+should probably be txt, not mdwn, if the txt plugin is enabled.
+
+(There's a lot of overlap between that and editpage of course .. similar
+to the overlap between the comment form and editpage.)
+
+When posted, the form would just come up with a new, numeric subpage
+of the page it appears on, and save the paste there.
+
+Another thing that might be useful is a "copy" (or "paste as new") action
+on the action bar. This would take an existing paste and copy it into the
+paste edit form, for editing and saving under a new id.
+
+---
+
+A sample wiki configuration using this might be:
+
+* enable highlight and txt
+* enable anonok so anyone can paste; lock anonymous users down to only
+  creating new pastes, not editing other pages
+* disable modification of existing pastes (how? disabling editpage would
+  work, but that would disallow setting up anonymous git push)
+* enable comments, so that each paste can be commented on
+* enable getsource, so the source to a paste can easily be downloaded
+* optionally, enable untrusted git push
-- 
cgit v1.2.3


From 24d1cf19b8d711c445e1faf825889dd6cfd5bf4b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 10 Aug 2009 16:34:14 -0400
Subject: typo

---
 doc/tips/untrusted_git_push.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/untrusted_git_push.mdwn b/doc/tips/untrusted_git_push.mdwn
index aef67a3db..3573a0ddf 100644
--- a/doc/tips/untrusted_git_push.mdwn
+++ b/doc/tips/untrusted_git_push.mdwn
@@ -74,7 +74,7 @@ Once you're done modifying the setup file, don't forget to run
 
 You'll need to arrange the permissions on your bare git repository so that
 user anon can write to it. One way to do it is to create a group, and put
-both anon and your regular user in that group. Then make make the bare git
+both anon and your regular user in that group. Then make the bare git
 repository owned and writable by the group. See [[rcs/git]] for some more
 tips on setting up a git repository with multiple committers.
 
-- 
cgit v1.2.3


From 8364adcfb75bbf755844c0fd17dc9e393737a960 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 11 Aug 2009 15:19:19 -0400
Subject: releasing version 3.15

---
 debian/changelog |   4 +-
 po/bg.po         | 189 +++++++++++++++++++++++++++++++------------------------
 po/cs.po         | 189 +++++++++++++++++++++++++++++++------------------------
 po/da.po         | 117 ++++++++++++++++++++--------------
 po/de.po         | 117 ++++++++++++++++++++--------------
 po/es.po         | 114 +++++++++++++++++++--------------
 po/fr.po         | 114 +++++++++++++++++++--------------
 po/gu.po         | 189 +++++++++++++++++++++++++++++++------------------------
 po/ikiwiki.pot   | 165 ++++++++++++++++++++++++++----------------------
 po/pl.po         | 189 +++++++++++++++++++++++++++++++------------------------
 po/sv.po         | 189 +++++++++++++++++++++++++++++++------------------------
 po/vi.po         | 189 +++++++++++++++++++++++++++++++------------------------
 12 files changed, 1003 insertions(+), 762 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e370a33ef..d02ce888e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.15) UNRELEASED; urgency=low
+ikiwiki (3.15) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
@@ -18,7 +18,7 @@ ikiwiki (3.15) UNRELEASED; urgency=low
     pages to inline, in a specific order, without using a PageSpec. (smcv)
   * Add getsource plugin (Will, smcv)
 
- -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 11 Aug 2009 14:59:31 -0400
 
 ikiwiki (3.14159) unstable; urgency=low
 
diff --git a/po/bg.po b/po/bg.po
index 9c03e3b87..8ffbf26a4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 06:45+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -22,7 +22,7 @@ msgstr "Първо трябва да влезете."
 
 #: ../IkiWiki/CGI.pm:146
 msgid ""
-"probable misconfiguration: sslcookie is set, but you are attepting to login "
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
@@ -147,8 +147,9 @@ msgid "Must specify %s"
 msgstr ""
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket in S3: "
-msgstr ""
+#, fuzzy
+msgid "Failed to create S3 bucket: "
+msgstr "Грешка при изпращане на поща"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
 #, fuzzy
@@ -188,10 +189,10 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "Дискусия"
 
@@ -335,6 +336,26 @@ msgstr ""
 msgid "fortune failed"
 msgstr "грешшка в приставката „fortune”"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#, fuzzy
+msgid "missing page"
+msgstr "липсващ параметър „id” на шаблона"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "грешка при четене на „%s”: %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, perl-format
+msgid "%s is an attachment, not a page."
+msgstr ""
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -360,16 +381,6 @@ msgstr "При използване на приеставката „search” 
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/goto.pm:55
-#, fuzzy
-msgid "missing page"
-msgstr "липсващ параметър „id” на шаблона"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -394,28 +405,28 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "не е инсталиран polygen"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "грешка при запис на файла „%s”: %s"
@@ -436,25 +447,30 @@ msgstr "шаблонът „%s” не е намерен"
 msgid "missing pages parameter"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
@@ -520,7 +536,8 @@ msgid "Get an OpenID"
 msgstr "Получаване на OpenID номер"
 
 #: ../IkiWiki/Plugin/orphans.pm:52
-msgid "All pages are linked to by other pages."
+#, fuzzy
+msgid "All pages have other pages linking to them."
 msgstr "Всички страници имат връзки от други страници."
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
@@ -578,103 +595,106 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
-#: ../IkiWiki/Plugin/po.pm:130
-msgid ""
-"At least one slave language must be defined in po_slave_languages when using "
-"the po plugin"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:131
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:143
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:148
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:276
+#: ../IkiWiki/Plugin/po.pm:282
 msgid "discussion"
 msgstr "дискусия"
 
-#: ../IkiWiki/Plugin/po.pm:373
+#: ../IkiWiki/Plugin/po.pm:379
 #, perl-format
-msgid "re-rendering all pages to fix meta titles"
+msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
-#, perl-format
-msgid "rendering %s"
-msgstr "обновяване на страницата „%s”"
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:410
+#: ../IkiWiki/Plugin/po.pm:420
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:444
 msgid ""
-"Can not remove a translation. Removing the master page, though, removes its "
-"translations as well."
+"Can not remove a translation. If the master page is removed, however, its "
+"translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:464
 msgid ""
-"Can not rename a translation. Renaming the master page, though, renames its "
-"translations as well."
+"Can not rename a translation. If the master page is renamed, however, its "
+"translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:816
+#: ../IkiWiki/Plugin/po.pm:825
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:824
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "крешка при компилиране на файла %s"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:830
+#: ../IkiWiki/Plugin/po.pm:854
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:866
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:879
+#: ../IkiWiki/Plugin/po.pm:903
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:955
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
-#: ../IkiWiki/Plugin/po.pm:1072
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1030
+#: ../IkiWiki/Plugin/po.pm:1054
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1059
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
+#: ../IkiWiki/Plugin/po.pm:1108
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
 msgstr "гласуване"
@@ -1023,56 +1043,56 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
-#: ../IkiWiki/Render.pm:436
-#, perl-format
-msgid "rendering %s, which links to %s"
+#: ../IkiWiki/Render.pm:442
+#, fuzzy, perl-format
+msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:457
-#, perl-format
-msgid "rendering %s, which depends on %s"
+#: ../IkiWiki/Render.pm:463
+#, fuzzy, perl-format
+msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:496
-#, perl-format
-msgid "rendering %s, to update its backlinks"
+#: ../IkiWiki/Render.pm:502
+#, fuzzy, perl-format
+msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:508
-#, perl-format
-msgid "removing %s, no longer rendered by %s"
+#: ../IkiWiki/Render.pm:514
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:532
-#, perl-format
-msgid "ikiwiki: cannot render %s"
+#: ../IkiWiki/Render.pm:538
+#, fuzzy, perl-format
+msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
 
 #. translators: The first parameter is a filename, and the second
@@ -1191,13 +1211,16 @@ msgid "What revision control system to use?"
 msgstr ""
 
 #: ../auto.setup:20
-msgid "What wiki user (or openid) will be admin?"
+msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "rendering %s"
+#~ msgstr "обновяване на страницата „%s”"
+
 #, fuzzy
 #~ msgid "Must specify %s when using the google search plugin"
 #~ msgstr ""
diff --git a/po/cs.po b/po/cs.po
index b629e20a9..e377b0cf2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 06:45+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2007-05-09 21:21+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -21,7 +21,7 @@ msgstr "Nejprve se musíte přihlásit."
 
 #: ../IkiWiki/CGI.pm:146
 msgid ""
-"probable misconfiguration: sslcookie is set, but you are attepting to login "
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
@@ -144,8 +144,9 @@ msgid "Must specify %s"
 msgstr ""
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket in S3: "
-msgstr ""
+#, fuzzy
+msgid "Failed to create S3 bucket: "
+msgstr "Nepodařilo se odeslat email."
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
 #, fuzzy
@@ -185,10 +186,10 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "Diskuse"
 
@@ -332,6 +333,26 @@ msgstr ""
 msgid "fortune failed"
 msgstr "fortune selhal"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#, fuzzy
+msgid "missing page"
+msgstr "chybí hodnoty"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "nemohu číst %s: %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, fuzzy, perl-format
+msgid "%s is an attachment, not a page."
+msgstr "%s není editovatelná stránka"
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -357,16 +378,6 @@ msgstr "Při používání vyhledávacího modulu musíte zadat %s"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/goto.pm:55
-#, fuzzy
-msgid "missing page"
-msgstr "chybí hodnoty"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "nepodařilo se spustit graphviz"
@@ -390,28 +401,28 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "polygen není nainstalován"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "nelze číst %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "nelze změnit velikost: %s"
@@ -430,25 +441,30 @@ msgstr "zdroj nebyl nalezen"
 msgid "missing pages parameter"
 msgstr "chybí parametr %s"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr "Přidat nový příspěvek nazvaný:"
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "neexistující šablona %s"
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
@@ -510,7 +526,8 @@ msgid "Get an OpenID"
 msgstr "Získat OpenID"
 
 #: ../IkiWiki/Plugin/orphans.pm:52
-msgid "All pages are linked to by other pages."
+#, fuzzy
+msgid "All pages have other pages linking to them."
 msgstr "Na každou stránku vede odkaz z jiné stránky."
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
@@ -568,103 +585,106 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
-#: ../IkiWiki/Plugin/po.pm:130
-msgid ""
-"At least one slave language must be defined in po_slave_languages when using "
-"the po plugin"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:131
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:143
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:148
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:276
+#: ../IkiWiki/Plugin/po.pm:282
 msgid "discussion"
 msgstr "diskuse"
 
-#: ../IkiWiki/Plugin/po.pm:373
+#: ../IkiWiki/Plugin/po.pm:379
 #, perl-format
-msgid "re-rendering all pages to fix meta titles"
+msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
-#, perl-format
-msgid "rendering %s"
-msgstr "zpracovávám %s"
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "upravuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:410
+#: ../IkiWiki/Plugin/po.pm:420
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:444
 msgid ""
-"Can not remove a translation. Removing the master page, though, removes its "
-"translations as well."
+"Can not remove a translation. If the master page is removed, however, its "
+"translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:464
 msgid ""
-"Can not rename a translation. Renaming the master page, though, renames its "
-"translations as well."
+"Can not rename a translation. If the master page is renamed, however, its "
+"translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:816
+#: ../IkiWiki/Plugin/po.pm:825
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:824
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "nelze zkompilovat %s"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:830
+#: ../IkiWiki/Plugin/po.pm:854
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:866
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:879
+#: ../IkiWiki/Plugin/po.pm:903
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/po.pm:955
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
-#: ../IkiWiki/Plugin/po.pm:1072
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "nelze zapsat %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1030
+#: ../IkiWiki/Plugin/po.pm:1054
 #, fuzzy
 msgid "failed to translate"
 msgstr "nepodařilo se spustit dot"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1059
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "nelze číst %s: %s"
 
+#: ../IkiWiki/Plugin/po.pm:1108
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
 msgstr "hlasovat"
@@ -1009,56 +1029,56 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
-#: ../IkiWiki/Render.pm:436
-#, perl-format
-msgid "rendering %s, which links to %s"
+#: ../IkiWiki/Render.pm:442
+#, fuzzy, perl-format
+msgid "building %s, which links to %s"
 msgstr "zpracovávám %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:457
-#, perl-format
-msgid "rendering %s, which depends on %s"
+#: ../IkiWiki/Render.pm:463
+#, fuzzy, perl-format
+msgid "building %s, which depends on %s"
 msgstr "zpracovávám %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:496
-#, perl-format
-msgid "rendering %s, to update its backlinks"
+#: ../IkiWiki/Render.pm:502
+#, fuzzy, perl-format
+msgid "building %s, to update its backlinks"
 msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:508
-#, perl-format
-msgid "removing %s, no longer rendered by %s"
+#: ../IkiWiki/Render.pm:514
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
 msgstr "odstraňuji %s, již není zpracovávána %s"
 
-#: ../IkiWiki/Render.pm:532
-#, perl-format
-msgid "ikiwiki: cannot render %s"
+#: ../IkiWiki/Render.pm:538
+#, fuzzy, perl-format
+msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze zpracovat %s"
 
 #. translators: The first parameter is a filename, and the second
@@ -1175,13 +1195,16 @@ msgid "What revision control system to use?"
 msgstr ""
 
 #: ../auto.setup:20
-msgid "What wiki user (or openid) will be admin?"
+msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "rendering %s"
+#~ msgstr "zpracovávám %s"
+
 #, fuzzy
 #~ msgid "Must specify %s when using the google search plugin"
 #~ msgstr "Při používání vyhledávacího modulu musíte zadat %s"
diff --git a/po/da.po b/po/da.po
index b0f5d7a5f..9ced576d8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-23 01:01+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -150,15 +150,18 @@ msgid "Must specify %s"
 msgstr "Skal angive %s"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket inside S3: "
+#, fuzzy
+msgid "Failed to create S3 bucket: "
 msgstr "Oprettelse af bundt i S3 mislykkedes: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
-msgid "Failed to save file into S3: "
+#, fuzzy
+msgid "Failed to save file to S3: "
 msgstr "Arkivering af fil i S3 mislykkedes: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:243
-msgid "Failed to delete file inside S3: "
+#, fuzzy
+msgid "Failed to delete file from S3: "
 msgstr "Sletning af fil fra S3 mislykkedes: "
 
 #: ../IkiWiki/Plugin/attachment.pm:49
@@ -191,10 +194,10 @@ msgstr ""
 "a>: "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
 #: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "Diskussion"
 
@@ -335,6 +338,25 @@ msgstr "skal angive format og tekst"
 msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+msgid "missing page"
+msgstr "manglende side"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr "Siden %s eksisterer ikke."
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "kan ikke få sider til at passe sammen: %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, fuzzy, perl-format
+msgid "%s is an attachment, not a page."
+msgstr "%s er ikke en redigérbar side"
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -360,15 +382,6 @@ msgstr "Skal angive %s når udvidelsen %s bruges"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn"
 
-#: ../IkiWiki/Plugin/goto.pm:55
-msgid "missing page"
-msgstr "manglende side"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr "Siden %s eksisterer ikke."
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "graphviz-kørsel mislykkedes"
@@ -394,27 +407,27 @@ msgstr ""
 "advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel "
 "gennemkørsel"
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ikke installeret"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "forkert størrelsesformat \"%s\" (burde være WxH)"
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "læsning af %s mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Ændring af størrelse mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Vurdering af billedstørrelse mislykkedes: %s"
@@ -431,25 +444,30 @@ msgstr "sideredigering er ikke tilladt"
 msgid "missing pages parameter"
 msgstr "mangler pages-parametren"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally krævet for title_natural sortering"
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr "Tilføj nyt indlæg med følgende titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "ikke-eksisterende skabelon: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 
@@ -599,7 +617,7 @@ msgstr "diskussion"
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:415
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
@@ -629,45 +647,50 @@ msgstr ""
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:833
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "kopiering af POT-filen til %s mislykkedes"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:854
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:875
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:903
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1027 ../IkiWiki/Plugin/po.pm:1041
-#: ../IkiWiki/Plugin/po.pm:1081
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1039
+#: ../IkiWiki/Plugin/po.pm:1054
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1044
+#: ../IkiWiki/Plugin/po.pm:1059
 #, perl-format
 msgid "failed to read %s"
 msgstr "læsning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1093
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -1011,7 +1034,7 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1020,47 +1043,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "gennemlæser %s"
 
-#: ../IkiWiki/Render.pm:436
+#: ../IkiWiki/Render.pm:442
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:457
+#: ../IkiWiki/Render.pm:463
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:496
+#: ../IkiWiki/Render.pm:502
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:508
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:532
+#: ../IkiWiki/Render.pm:538
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
diff --git a/po/de.po b/po/de.po
index b5c7c9ec2..83a70bd9c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-23 01:01+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -147,15 +147,18 @@ msgid "Must specify %s"
 msgstr "%s muss angegeben werden"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket inside S3: "
+#, fuzzy
+msgid "Failed to create S3 bucket: "
 msgstr "Konnte Behälter (bucket) in S3 nicht anlegen: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
-msgid "Failed to save file into S3: "
+#, fuzzy
+msgid "Failed to save file to S3: "
 msgstr "Konnte die Datei nicht in S3 speichern: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:243
-msgid "Failed to delete file inside S3: "
+#, fuzzy
+msgid "Failed to delete file from S3: "
 msgstr "Konnte die Datei nicht in S3 löschen: "
 
 #: ../IkiWiki/Plugin/attachment.pm:49
@@ -188,10 +191,10 @@ msgstr ""
 "als Spam ein: "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
 #: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "Diskussion"
 
@@ -333,6 +336,25 @@ msgstr "Format und Text müssen spezifiziert werden"
 msgid "fortune failed"
 msgstr "fortune fehlgeschlagen"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+msgid "missing page"
+msgstr "fehlende Seite"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr "Die Seite %s existiert nicht."
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "Kann die Seiten nicht zuordnen: %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, fuzzy, perl-format
+msgid "%s is an attachment, not a page."
+msgstr "Seite %s kann nicht bearbeitet werden"
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -358,15 +380,6 @@ msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr "auswerten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen"
 
-#: ../IkiWiki/Plugin/goto.pm:55
-msgid "missing page"
-msgstr "fehlende Seite"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr "Die Seite %s existiert nicht."
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "graphviz konnte nicht ausgeführt werden"
@@ -392,27 +405,27 @@ msgstr ""
 "Warnung: das highlight Perlmodul ist nicht verfügbar; greife zurück auf pass "
 "through"
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ist nicht installiert"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "falsches Format in \"%s\" für size (sollte BxH sein)"
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "Lesen von %s fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Größenänderung fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Größe des Bildes %s konnte nicht festgestellt werden."
@@ -431,25 +444,30 @@ msgstr "bearbeiten der Seiten nicht erlaubt"
 msgid "missing pages parameter"
 msgstr "fehlender Seitenparameter"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally wird benötigt für title_natural sort"
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "nicht-vorhandene Vorlage %s"
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
@@ -602,7 +620,7 @@ msgstr "Diskussion"
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:415
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
@@ -632,45 +650,50 @@ msgstr ""
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:833
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:854
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:875
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:903
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1027 ../IkiWiki/Plugin/po.pm:1041
-#: ../IkiWiki/Plugin/po.pm:1081
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1039
+#: ../IkiWiki/Plugin/po.pm:1054
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1044
+#: ../IkiWiki/Plugin/po.pm:1059
 #, perl-format
 msgid "failed to read %s"
 msgstr "lesen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1093
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -1020,7 +1043,7 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1029,47 +1052,47 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "durchsuche %s"
 
-#: ../IkiWiki/Render.pm:436
+#: ../IkiWiki/Render.pm:442
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:457
+#: ../IkiWiki/Render.pm:463
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:496
+#: ../IkiWiki/Render.pm:502
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:508
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:532
+#: ../IkiWiki/Render.pm:538
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
diff --git a/po/es.po b/po/es.po
index 9f7f2829b..65ad72140 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-23 01:01+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -153,17 +153,17 @@ msgstr "Debe especificar %s"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
 #, fuzzy
-msgid "Failed to create bucket inside S3: "
+msgid "Failed to create S3 bucket: "
 msgstr "Creación de directorio en S3 fallida: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
 #, fuzzy
-msgid "Failed to save file into S3: "
+msgid "Failed to save file to S3: "
 msgstr "No puedo guardar el archivo en S3: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:243
 #, fuzzy
-msgid "Failed to delete file inside S3: "
+msgid "Failed to delete file from S3: "
 msgstr "No puedo borrar archivo en S3: "
 
 #: ../IkiWiki/Plugin/attachment.pm:49
@@ -196,10 +196,10 @@ msgstr ""
 "dice que el texto puede ser spam."
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
 #: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "Comentarios"
 
@@ -340,6 +340,25 @@ msgstr "se deben especificar tanto el formato como el texto"
 msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+msgid "missing page"
+msgstr "página no encontrada"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr "No existe la página %s."
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "no encuentro páginas coincidentes: %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, fuzzy, perl-format
+msgid "%s is an attachment, not a page."
+msgstr "la página %s no es modificable"
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -366,15 +385,6 @@ msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 "Error en el análisis del URL, no puedo determinar el nombre del dominio"
 
-#: ../IkiWiki/Plugin/goto.pm:55
-msgid "missing page"
-msgstr "página no encontrada"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr "No existe la página %s."
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "no he podido ejecutar el programa graphviz "
@@ -400,27 +410,27 @@ msgstr ""
 "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada "
 "para continuar el proceso. "
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr "El complemento Image::Magick no ha sido instalado"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "no puedo leer de %s: %s "
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "no he podido determinar el tamaño de la imagen %s"
@@ -439,27 +449,32 @@ msgstr "no está permitida la modificación de páginas"
 msgid "missing pages parameter"
 msgstr "falta el parámetro pages"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 "Se necesita el módulo Sort::Naturally para el tipo de ordenación "
 "title_natural"
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr "Añadir una entrada nueva titulada:"
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "la plantilla %s no existe "
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
@@ -610,7 +625,7 @@ msgstr "Comentarios"
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:415
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
@@ -636,46 +651,51 @@ msgstr ""
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:833
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "ha fallado la compilación del programa %s"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:854
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:875
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:903
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1027 ../IkiWiki/Plugin/po.pm:1041
-#: ../IkiWiki/Plugin/po.pm:1081
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1039
+#: ../IkiWiki/Plugin/po.pm:1054
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1044
+#: ../IkiWiki/Plugin/po.pm:1059
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "no puedo leer de %s: %s "
 
-#: ../IkiWiki/Plugin/po.pm:1093
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1024,7 +1044,7 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1033,49 +1053,49 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
-#: ../IkiWiki/Render.pm:436
+#: ../IkiWiki/Render.pm:442
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:457
+#: ../IkiWiki/Render.pm:463
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:496
+#: ../IkiWiki/Render.pm:502
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:508
+#: ../IkiWiki/Render.pm:514
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:532
+#: ../IkiWiki/Render.pm:538
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
diff --git a/po/fr.po b/po/fr.po
index fe78d0a72..a27420254 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-23 01:01+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2009-06-29 16:42+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -149,17 +149,17 @@ msgstr "Vous devez spécifier %s"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
 #, fuzzy
-msgid "Failed to create bucket inside S3: "
+msgid "Failed to create S3 bucket: "
 msgstr "Impossible de créer un compartiment S3 :"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
 #, fuzzy
-msgid "Failed to save file into S3: "
+msgid "Failed to save file to S3: "
 msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:243
 #, fuzzy
-msgid "Failed to delete file inside S3: "
+msgid "Failed to delete file from S3: "
 msgstr "Échec lors de la suppression du fichier sur S3 :"
 
 #: ../IkiWiki/Plugin/attachment.pm:49
@@ -192,10 +192,10 @@ msgstr ""
 "blogspam.net/\">blogspam</a>: "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
 #: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "Discussion"
 
@@ -336,6 +336,25 @@ msgstr "le format et le texte doivent être indiqués"
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+msgid "missing page"
+msgstr "Page manquante"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr "La page %s n'existe pas."
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "Impossible de trouver les pages %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, fuzzy, perl-format
+msgid "%s is an attachment, not a page."
+msgstr "%s n'est pas une page éditable"
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -361,15 +380,6 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « search »."
 msgid "Failed to parse url, cannot determine domain name"
 msgstr "Impossible d'analyser l'url, pas de nom de domaine"
 
-#: ../IkiWiki/Plugin/goto.pm:55
-msgid "missing page"
-msgstr "Page manquante"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr "La page %s n'existe pas."
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "Échec du lancement de graphviz"
@@ -395,27 +405,27 @@ msgstr ""
 "Avertissement : le module perl « highlight » n'est pas disponible. "
 "Continuation malgré tout."
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick n'est pas installé"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "Échec de la lecture de %s : %s"
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Échec de la détermination de la taille de l'image : %s"
@@ -434,25 +444,30 @@ msgstr "Modification de page interdite"
 msgid "missing pages parameter"
 msgstr "Paramètre « pages » manquant"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "Le modèle de page %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -601,7 +616,7 @@ msgstr "Discussion"
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:415
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "va envoyer un ping à %s"
@@ -627,46 +642,51 @@ msgstr ""
 msgid "POT file (%s) does not exist"
 msgstr "La page %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:833
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "Échec de la compilation de %s"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "Échec de la compilation de %s"
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:854
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Échec de la compilation de %s"
 
-#: ../IkiWiki/Plugin/po.pm:875
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:903
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1027 ../IkiWiki/Plugin/po.pm:1041
-#: ../IkiWiki/Plugin/po.pm:1081
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/po.pm:1039
+#: ../IkiWiki/Plugin/po.pm:1054
 #, fuzzy
 msgid "failed to translate"
 msgstr "Échec du lancement de dot"
 
-#: ../IkiWiki/Plugin/po.pm:1044
+#: ../IkiWiki/Plugin/po.pm:1059
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "Échec de la lecture de %s : %s"
 
-#: ../IkiWiki/Plugin/po.pm:1093
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1015,7 +1035,7 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1024,47 +1044,47 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:436
+#: ../IkiWiki/Render.pm:442
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:457
+#: ../IkiWiki/Render.pm:463
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:496
+#: ../IkiWiki/Render.pm:502
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:508
+#: ../IkiWiki/Render.pm:514
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:532
+#: ../IkiWiki/Render.pm:538
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
diff --git a/po/gu.po b/po/gu.po
index 5bc897a90..ce76f8612 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 06:45+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -21,7 +21,7 @@ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશ
 
 #: ../IkiWiki/CGI.pm:146
 msgid ""
-"probable misconfiguration: sslcookie is set, but you are attepting to login "
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
@@ -145,8 +145,9 @@ msgid "Must specify %s"
 msgstr ""
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket in S3: "
-msgstr ""
+#, fuzzy
+msgid "Failed to create S3 bucket: "
+msgstr "મેઇલ મોકલવામાં નિષ્ફળ"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
 #, fuzzy
@@ -186,10 +187,10 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "ચર્ચા"
 
@@ -333,6 +334,26 @@ msgstr ""
 msgid "fortune failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#, fuzzy
+msgid "missing page"
+msgstr "ખોવાયેલ કિંમતો"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "વાંચી શકાતી નથી %s: %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, fuzzy, perl-format
+msgid "%s is an attachment, not a page."
+msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -358,16 +379,6 @@ msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કર
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/goto.pm:55
-#, fuzzy
-msgid "missing page"
-msgstr "ખોવાયેલ કિંમતો"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ"
@@ -391,28 +402,28 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "પોલિગોન સ્થાપિત નથી"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
@@ -431,25 +442,30 @@ msgstr "ફીડ મળ્યું નહી"
 msgid "missing pages parameter"
 msgstr "ખોવાયેલ %s વિકલ્પ"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:"
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
@@ -510,7 +526,8 @@ msgid "Get an OpenID"
 msgstr "ઓપનઆઇડી મેળવો"
 
 #: ../IkiWiki/Plugin/orphans.pm:52
-msgid "All pages are linked to by other pages."
+#, fuzzy
+msgid "All pages have other pages linking to them."
 msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે."
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
@@ -568,103 +585,106 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:130
-msgid ""
-"At least one slave language must be defined in po_slave_languages when using "
-"the po plugin"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:131
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:143
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:148
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:276
+#: ../IkiWiki/Plugin/po.pm:282
 msgid "discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki/Plugin/po.pm:373
+#: ../IkiWiki/Plugin/po.pm:379
 #, perl-format
-msgid "re-rendering all pages to fix meta titles"
+msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
-#, perl-format
-msgid "rendering %s"
-msgstr "રેન્ડર કરે છે %s"
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:410
+#: ../IkiWiki/Plugin/po.pm:420
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:444
 msgid ""
-"Can not remove a translation. Removing the master page, though, removes its "
-"translations as well."
+"Can not remove a translation. If the master page is removed, however, its "
+"translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:464
 msgid ""
-"Can not rename a translation. Renaming the master page, though, renames its "
-"translations as well."
+"Can not rename a translation. If the master page is renamed, however, its "
+"translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:816
+#: ../IkiWiki/Plugin/po.pm:825
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:824
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:830
+#: ../IkiWiki/Plugin/po.pm:854
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:866
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:879
+#: ../IkiWiki/Plugin/po.pm:903
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:955
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
-#: ../IkiWiki/Plugin/po.pm:1072
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1030
+#: ../IkiWiki/Plugin/po.pm:1054
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1059
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 
+#: ../IkiWiki/Plugin/po.pm:1108
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
 msgstr "મત"
@@ -1009,56 +1029,56 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
-#: ../IkiWiki/Render.pm:436
-#, perl-format
-msgid "rendering %s, which links to %s"
+#: ../IkiWiki/Render.pm:442
+#, fuzzy, perl-format
+msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:457
-#, perl-format
-msgid "rendering %s, which depends on %s"
+#: ../IkiWiki/Render.pm:463
+#, fuzzy, perl-format
+msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:496
-#, perl-format
-msgid "rendering %s, to update its backlinks"
+#: ../IkiWiki/Render.pm:502
+#, fuzzy, perl-format
+msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:508
-#, perl-format
-msgid "removing %s, no longer rendered by %s"
+#: ../IkiWiki/Render.pm:514
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:532
-#, perl-format
-msgid "ikiwiki: cannot render %s"
+#: ../IkiWiki/Render.pm:538
+#, fuzzy, perl-format
+msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
 
 #. translators: The first parameter is a filename, and the second
@@ -1175,13 +1195,16 @@ msgid "What revision control system to use?"
 msgstr ""
 
 #: ../auto.setup:20
-msgid "What wiki user (or openid) will be admin?"
+msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "rendering %s"
+#~ msgstr "રેન્ડર કરે છે %s"
+
 #, fuzzy
 #~ msgid "Must specify %s when using the google search plugin"
 #~ msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 3451329cc..8ba10ecbb 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 06:45+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ../IkiWiki/CGI.pm:146
 msgid ""
-"probable misconfiguration: sslcookie is set, but you are attepting to login "
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgid "Must specify %s"
 msgstr ""
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket in S3: "
+msgid "Failed to create S3 bucket: "
 msgstr ""
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
@@ -184,10 +184,10 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr ""
 
@@ -328,6 +328,24 @@ msgstr ""
 msgid "fortune failed"
 msgstr ""
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+msgid "missing page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+msgid "not a page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, perl-format
+msgid "%s is an attachment, not a page."
+msgstr ""
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -353,15 +371,6 @@ msgstr ""
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/goto.pm:55
-msgid "missing page"
-msgstr ""
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr ""
@@ -385,27 +394,27 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
@@ -422,25 +431,30 @@ msgstr ""
 msgid "missing pages parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -499,7 +513,7 @@ msgid "Get an OpenID"
 msgstr ""
 
 #: ../IkiWiki/Plugin/orphans.pm:52
-msgid "All pages are linked to by other pages."
+msgid "All pages have other pages linking to them."
 msgstr ""
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
@@ -556,102 +570,105 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:130
-msgid ""
-"At least one slave language must be defined in po_slave_languages when using "
-"the po plugin"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:131
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:143
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:148
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:276
+#: ../IkiWiki/Plugin/po.pm:282
 msgid "discussion"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:373
+#: ../IkiWiki/Plugin/po.pm:379
 #, perl-format
-msgid "re-rendering all pages to fix meta titles"
+msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
 #, perl-format
-msgid "rendering %s"
+msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:410
+#: ../IkiWiki/Plugin/po.pm:420
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:444
 msgid ""
-"Can not remove a translation. Removing the master page, though, removes its "
-"translations as well."
+"Can not remove a translation. If the master page is removed, however, its "
+"translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:464
 msgid ""
-"Can not rename a translation. Renaming the master page, though, renames its "
-"translations as well."
+"Can not rename a translation. If the master page is renamed, however, its "
+"translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:816
+#: ../IkiWiki/Plugin/po.pm:825
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:824
+#: ../IkiWiki/Plugin/po.pm:839
+#, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:830
+#: ../IkiWiki/Plugin/po.pm:854
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:866
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:879
+#: ../IkiWiki/Plugin/po.pm:903
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:955
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
-#: ../IkiWiki/Plugin/po.pm:1072
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1030
+#: ../IkiWiki/Plugin/po.pm:1054
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1059
 #, perl-format
 msgid "failed to read %s"
 msgstr ""
 
+#: ../IkiWiki/Plugin/po.pm:1108
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
 msgstr ""
@@ -987,56 +1004,56 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:436
+#: ../IkiWiki/Render.pm:442
 #, perl-format
-msgid "rendering %s, which links to %s"
+msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:457
+#: ../IkiWiki/Render.pm:463
 #, perl-format
-msgid "rendering %s, which depends on %s"
+msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:496
+#: ../IkiWiki/Render.pm:502
 #, perl-format
-msgid "rendering %s, to update its backlinks"
+msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:508
+#: ../IkiWiki/Render.pm:514
 #, perl-format
-msgid "removing %s, no longer rendered by %s"
+msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:532
+#: ../IkiWiki/Render.pm:538
 #, perl-format
-msgid "ikiwiki: cannot render %s"
+msgid "ikiwiki: cannot build %s"
 msgstr ""
 
 #. translators: The first parameter is a filename, and the second
@@ -1153,7 +1170,7 @@ msgid "What revision control system to use?"
 msgstr ""
 
 #: ../auto.setup:20
-msgid "What wiki user (or openid) will be admin?"
+msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
 #: ../auto.setup:23
diff --git a/po/pl.po b/po/pl.po
index afbcbe39e..3e8d08523 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 06:45+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -22,7 +22,7 @@ msgstr "Proszę najpierw zalogować się."
 
 #: ../IkiWiki/CGI.pm:146
 msgid ""
-"probable misconfiguration: sslcookie is set, but you are attepting to login "
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
@@ -149,8 +149,9 @@ msgid "Must specify %s"
 msgstr ""
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket in S3: "
-msgstr ""
+#, fuzzy
+msgid "Failed to create S3 bucket: "
+msgstr "Awaria w trakcie wysyłania wiadomości"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
 #, fuzzy
@@ -190,10 +191,10 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "Dyskusja"
 
@@ -337,6 +338,26 @@ msgstr ""
 msgid "fortune failed"
 msgstr "awaria fortunki"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#, fuzzy
+msgid "missing page"
+msgstr "brakujące wartości"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "awaria w trakcie odczytu %s: %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, fuzzy, perl-format
+msgid "%s is an attachment, not a page."
+msgstr "Strona %s nie może być edytowana"
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -362,16 +383,6 @@ msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/goto.pm:55
-#, fuzzy
-msgid "missing page"
-msgstr "brakujące wartości"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -396,28 +407,28 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "wtyczka polygen nie jest zainstalowana"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
@@ -438,25 +449,30 @@ msgstr "nieznaleziony kanał RSS"
 msgid "missing pages parameter"
 msgstr "brakujący parametr %s"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr "Tytuł nowego wpisu"
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "brakujący szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
@@ -523,7 +539,8 @@ msgid "Get an OpenID"
 msgstr "Pobierz OpenID"
 
 #: ../IkiWiki/Plugin/orphans.pm:52
-msgid "All pages are linked to by other pages."
+#, fuzzy
+msgid "All pages have other pages linking to them."
 msgstr "Dla każdej strony istnieje odnośnik z innej strony"
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
@@ -581,103 +598,106 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
-#: ../IkiWiki/Plugin/po.pm:130
-msgid ""
-"At least one slave language must be defined in po_slave_languages when using "
-"the po plugin"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:131
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:143
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:148
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:276
+#: ../IkiWiki/Plugin/po.pm:282
 msgid "discussion"
 msgstr "dyskusja"
 
-#: ../IkiWiki/Plugin/po.pm:373
+#: ../IkiWiki/Plugin/po.pm:379
 #, perl-format
-msgid "re-rendering all pages to fix meta titles"
+msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
-#, perl-format
-msgid "rendering %s"
-msgstr "renderowanie %s"
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:410
+#: ../IkiWiki/Plugin/po.pm:420
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:444
 msgid ""
-"Can not remove a translation. Removing the master page, though, removes its "
-"translations as well."
+"Can not remove a translation. If the master page is removed, however, its "
+"translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:464
 msgid ""
-"Can not rename a translation. Renaming the master page, though, renames its "
-"translations as well."
+"Can not rename a translation. If the master page is renamed, however, its "
+"translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:816
+#: ../IkiWiki/Plugin/po.pm:825
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:824
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "awaria w trakcie kompilowania %s"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:830
+#: ../IkiWiki/Plugin/po.pm:854
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:866
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:879
+#: ../IkiWiki/Plugin/po.pm:903
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:955
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
-#: ../IkiWiki/Plugin/po.pm:1072
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1030
+#: ../IkiWiki/Plugin/po.pm:1054
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1059
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
+#: ../IkiWiki/Plugin/po.pm:1108
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
 msgstr "głosuj"
@@ -1031,56 +1051,56 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "skanowanie %s"
 
-#: ../IkiWiki/Render.pm:436
-#, perl-format
-msgid "rendering %s, which links to %s"
+#: ../IkiWiki/Render.pm:442
+#, fuzzy, perl-format
+msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:457
-#, perl-format
-msgid "rendering %s, which depends on %s"
+#: ../IkiWiki/Render.pm:463
+#, fuzzy, perl-format
+msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:496
-#, perl-format
-msgid "rendering %s, to update its backlinks"
+#: ../IkiWiki/Render.pm:502
+#, fuzzy, perl-format
+msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:508
-#, perl-format
-msgid "removing %s, no longer rendered by %s"
+#: ../IkiWiki/Render.pm:514
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:532
-#, perl-format
-msgid "ikiwiki: cannot render %s"
+#: ../IkiWiki/Render.pm:538
+#, fuzzy, perl-format
+msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
 
 #. translators: The first parameter is a filename, and the second
@@ -1199,13 +1219,16 @@ msgid "What revision control system to use?"
 msgstr ""
 
 #: ../auto.setup:20
-msgid "What wiki user (or openid) will be admin?"
+msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "rendering %s"
+#~ msgstr "renderowanie %s"
+
 #, fuzzy
 #~ msgid "Must specify %s when using the google search plugin"
 #~ msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
diff --git a/po/sv.po b/po/sv.po
index 70d9ca68c..ff8d3aa0d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 06:45+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -21,7 +21,7 @@ msgstr "Du måste logga in först."
 
 #: ../IkiWiki/CGI.pm:146
 msgid ""
-"probable misconfiguration: sslcookie is set, but you are attepting to login "
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
@@ -146,8 +146,9 @@ msgid "Must specify %s"
 msgstr ""
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket in S3: "
-msgstr ""
+#, fuzzy
+msgid "Failed to create S3 bucket: "
+msgstr "Misslyckades med att skicka e-post"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
 #, fuzzy
@@ -187,10 +188,10 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "Diskussion"
 
@@ -334,6 +335,26 @@ msgstr ""
 msgid "fortune failed"
 msgstr "fortune misslyckades"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#, fuzzy
+msgid "missing page"
+msgstr "mall saknar id-parameter"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "kan inte läsa %s: %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, perl-format
+msgid "%s is an attachment, not a page."
+msgstr ""
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -359,16 +380,6 @@ msgstr "Måste ange %s när sökinsticket används"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/goto.pm:55
-#, fuzzy
-msgid "missing page"
-msgstr "mall saknar id-parameter"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -393,28 +404,28 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "polygen inte installerad"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "misslyckades med att skriva %s: %s"
@@ -433,25 +444,30 @@ msgstr "mallen %s hittades inte"
 msgid "missing pages parameter"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
@@ -516,7 +532,8 @@ msgid "Get an OpenID"
 msgstr "Skaffa ett OpenID"
 
 #: ../IkiWiki/Plugin/orphans.pm:52
-msgid "All pages are linked to by other pages."
+#, fuzzy
+msgid "All pages have other pages linking to them."
 msgstr "Alla sidor länkas till av andra sidor."
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
@@ -574,103 +591,106 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
-#: ../IkiWiki/Plugin/po.pm:130
-msgid ""
-"At least one slave language must be defined in po_slave_languages when using "
-"the po plugin"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:131
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:143
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:148
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:276
+#: ../IkiWiki/Plugin/po.pm:282
 msgid "discussion"
 msgstr "diskussion"
 
-#: ../IkiWiki/Plugin/po.pm:373
+#: ../IkiWiki/Plugin/po.pm:379
 #, perl-format
-msgid "re-rendering all pages to fix meta titles"
+msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
-#, perl-format
-msgid "rendering %s"
-msgstr "ritar upp %s"
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:410
+#: ../IkiWiki/Plugin/po.pm:420
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:444
 msgid ""
-"Can not remove a translation. Removing the master page, though, removes its "
-"translations as well."
+"Can not remove a translation. If the master page is removed, however, its "
+"translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:464
 msgid ""
-"Can not rename a translation. Renaming the master page, though, renames its "
-"translations as well."
+"Can not rename a translation. If the master page is renamed, however, its "
+"translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:816
+#: ../IkiWiki/Plugin/po.pm:825
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:824
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "misslyckades med att kompilera %s"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:830
+#: ../IkiWiki/Plugin/po.pm:854
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:866
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:879
+#: ../IkiWiki/Plugin/po.pm:903
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:955
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
-#: ../IkiWiki/Plugin/po.pm:1072
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1030
+#: ../IkiWiki/Plugin/po.pm:1054
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1059
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "misslyckades med att skriva %s: %s"
 
+#: ../IkiWiki/Plugin/po.pm:1108
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
 msgstr "röst"
@@ -1018,56 +1038,56 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
-#: ../IkiWiki/Render.pm:436
-#, perl-format
-msgid "rendering %s, which links to %s"
+#: ../IkiWiki/Render.pm:442
+#, fuzzy, perl-format
+msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:457
-#, perl-format
-msgid "rendering %s, which depends on %s"
+#: ../IkiWiki/Render.pm:463
+#, fuzzy, perl-format
+msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:496
-#, perl-format
-msgid "rendering %s, to update its backlinks"
+#: ../IkiWiki/Render.pm:502
+#, fuzzy, perl-format
+msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:508
-#, perl-format
-msgid "removing %s, no longer rendered by %s"
+#: ../IkiWiki/Render.pm:514
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:532
-#, perl-format
-msgid "ikiwiki: cannot render %s"
+#: ../IkiWiki/Render.pm:538
+#, fuzzy, perl-format
+msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
 
 #. translators: The first parameter is a filename, and the second
@@ -1184,13 +1204,16 @@ msgid "What revision control system to use?"
 msgstr ""
 
 #: ../auto.setup:20
-msgid "What wiki user (or openid) will be admin?"
+msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "rendering %s"
+#~ msgstr "ritar upp %s"
+
 #, fuzzy
 #~ msgid "Must specify %s when using the google search plugin"
 #~ msgstr "Måste ange %s när sökinsticket används"
diff --git a/po/vi.po b/po/vi.po
index 75fceb445..7cf911b16 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 06:45+0200\n"
+"POT-Creation-Date: 2009-08-11 15:00-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -22,7 +22,7 @@ msgstr "Trước tiên bạn cần phải đăng nhập."
 
 #: ../IkiWiki/CGI.pm:146
 msgid ""
-"probable misconfiguration: sslcookie is set, but you are attepting to login "
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
@@ -147,8 +147,9 @@ msgid "Must specify %s"
 msgstr ""
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket in S3: "
-msgstr ""
+#, fuzzy
+msgid "Failed to create S3 bucket: "
+msgstr "Lỗi gửi thư"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
 #, fuzzy
@@ -188,10 +189,10 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
-#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
+#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
 msgid "Discussion"
 msgstr "Thảo luận"
 
@@ -335,6 +336,26 @@ msgstr ""
 msgid "fortune failed"
 msgstr "fortune bị lỗi"
 
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#, fuzzy
+msgid "missing page"
+msgstr "mẫu thiếu tham số id"
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+#, fuzzy
+msgid "not a page"
+msgstr "không thể đọc %s: %s"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, perl-format
+msgid "%s is an attachment, not a page."
+msgstr ""
+
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
@@ -360,16 +381,6 @@ msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/goto.pm:55
-#, fuzzy
-msgid "missing page"
-msgstr "mẫu thiếu tham số id"
-
-#: ../IkiWiki/Plugin/goto.pm:57
-#, perl-format
-msgid "The page %s does not exist."
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -394,28 +405,28 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "chưa cài đặt polygen"
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:90
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:119
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "lỗi ghi %s: %s"
@@ -436,25 +447,30 @@ msgstr "không tìm thấy mẫu %s"
 msgid "missing pages parameter"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/inline.pm:196
+#: ../IkiWiki/Plugin/inline.pm:192
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:214
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:207
+#: ../IkiWiki/Plugin/inline.pm:225
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:310
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:330
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:596
+#: ../IkiWiki/Plugin/inline.pm:615
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
@@ -517,7 +533,8 @@ msgid "Get an OpenID"
 msgstr "Lấy OpenID"
 
 #: ../IkiWiki/Plugin/orphans.pm:52
-msgid "All pages are linked to by other pages."
+#, fuzzy
+msgid "All pages have other pages linking to them."
 msgstr "Mọi trang được liên kết với trang khác."
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
@@ -575,103 +592,106 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
-#: ../IkiWiki/Plugin/po.pm:130
-msgid ""
-"At least one slave language must be defined in po_slave_languages when using "
-"the po plugin"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:131
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:143
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:148
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:276
+#: ../IkiWiki/Plugin/po.pm:282
 msgid "discussion"
 msgstr "thảo luận"
 
-#: ../IkiWiki/Plugin/po.pm:373
+#: ../IkiWiki/Plugin/po.pm:379
 #, perl-format
-msgid "re-rendering all pages to fix meta titles"
+msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
-#, perl-format
-msgid "rendering %s"
-msgstr "đang vẽ %s"
+#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:410
+#: ../IkiWiki/Plugin/po.pm:420
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:444
 msgid ""
-"Can not remove a translation. Removing the master page, though, removes its "
-"translations as well."
+"Can not remove a translation. If the master page is removed, however, its "
+"translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:464
 msgid ""
-"Can not rename a translation. Renaming the master page, though, renames its "
-"translations as well."
+"Can not rename a translation. If the master page is renamed, however, its "
+"translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:816
+#: ../IkiWiki/Plugin/po.pm:825
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:824
+#: ../IkiWiki/Plugin/po.pm:839
+#, fuzzy, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "lỗi biên dịch %s"
+
+#: ../IkiWiki/Plugin/po.pm:848
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:830
+#: ../IkiWiki/Plugin/po.pm:854
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:866
+#: ../IkiWiki/Plugin/po.pm:890
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:879
+#: ../IkiWiki/Plugin/po.pm:903
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:955
+#: ../IkiWiki/Plugin/po.pm:979
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
-#: ../IkiWiki/Plugin/po.pm:1072
+#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
+#: ../IkiWiki/Plugin/po.pm:1096
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1030
+#: ../IkiWiki/Plugin/po.pm:1054
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1059
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "lỗi ghi %s: %s"
 
+#: ../IkiWiki/Plugin/po.pm:1108
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
 msgstr "bỏ phiếu"
@@ -1019,56 +1039,56 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:254
+#: ../IkiWiki/Render.pm:260
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:290
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:370
+#: ../IkiWiki/Render.pm:376
 #, perl-format
 msgid "removing old page %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:416
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
-#: ../IkiWiki/Render.pm:436
-#, perl-format
-msgid "rendering %s, which links to %s"
+#: ../IkiWiki/Render.pm:442
+#, fuzzy, perl-format
+msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:457
-#, perl-format
-msgid "rendering %s, which depends on %s"
+#: ../IkiWiki/Render.pm:463
+#, fuzzy, perl-format
+msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:496
-#, perl-format
-msgid "rendering %s, to update its backlinks"
+#: ../IkiWiki/Render.pm:502
+#, fuzzy, perl-format
+msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:508
-#, perl-format
-msgid "removing %s, no longer rendered by %s"
+#: ../IkiWiki/Render.pm:514
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
-#: ../IkiWiki/Render.pm:532
-#, perl-format
-msgid "ikiwiki: cannot render %s"
+#: ../IkiWiki/Render.pm:538
+#, fuzzy, perl-format
+msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
 
 #. translators: The first parameter is a filename, and the second
@@ -1185,13 +1205,16 @@ msgid "What revision control system to use?"
 msgstr ""
 
 #: ../auto.setup:20
-msgid "What wiki user (or openid) will be admin?"
+msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "rendering %s"
+#~ msgstr "đang vẽ %s"
+
 #, fuzzy
 #~ msgid "Must specify %s when using the google search plugin"
 #~ msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
-- 
cgit v1.2.3


From d165afb1f59f1f21a6968dc2be9fce4ab86d8c48 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 11 Aug 2009 15:20:26 -0400
Subject: add news item for ikiwiki 3.15

---
 doc/news/version_3.14.mdwn | 13 -------------
 doc/news/version_3.15.mdwn | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 doc/news/version_3.14.mdwn
 create mode 100644 doc/news/version_3.15.mdwn

diff --git a/doc/news/version_3.14.mdwn b/doc/news/version_3.14.mdwn
deleted file mode 100644
index 83c2b9188..000000000
--- a/doc/news/version_3.14.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-ikiwiki 3.14 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * highlight: New plugin supporting syntax highlighting of pretty much
-     anything.
-   * debian/control: Add suggests for libhighlight-perl, although
-     that package is not yet created by Debian's highlight source package.
-     (See #529869)
-   * format: Provide a htmlizefallback hook that other plugins
-     can use to handle formats that are not suitable for general-purpose
-     htmlize hooks. Used by highlight.
-   * Fix test suite to not rely on an installed copy of ikiwiki after
-     underlaydir change. Closes: #[530502](http://bugs.debian.org/530502)
-   * Danish translation update. Closes: #[530877](http://bugs.debian.org/530877)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.15.mdwn b/doc/news/version_3.15.mdwn
new file mode 100644
index 000000000..30a66ea23
--- /dev/null
+++ b/doc/news/version_3.15.mdwn
@@ -0,0 +1,19 @@
+ikiwiki 3.15 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Add new hooks: canremove, canrename, rename. (intrigeri)
+   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
+   * po: New plugin, suporting translation of wiki pages using po files.
+     (intrigeri)
+   * Add build machinery to build po files to translate the underlay wikis,
+   * Add further build machinery to generate translated underlays from
+     the po file, for use by wikis whose primary language is not English.
+   * Add Danish basewiki translation by Jonas Smedegaard.
+   * img: Fix adding of dependency from page to the image.
+   * pagestats: add `among` parameter, which only counts links from specified
+     pages (smcv)
+   * pagestats: when making a tag cloud, don't emit links where the tag is
+     unused (smcv)
+   * map: Avoid emitting an unclosed ul element if the map is empty. (harishcm)
+   * inline: Add pagenames parameter that can be used to list a set of
+     pages to inline, in a specific order, without using a PageSpec. (smcv)
+   * Add getsource plugin (Will, smcv)"""]]
\ No newline at end of file
-- 
cgit v1.2.3


From fc5c5df60ec6d30c1a284f4194f5ea8e2f5fa2c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 11 Aug 2009 16:24:28 -0400
Subject: releasing version 3.141592

---
 debian/changelog           |  2 +-
 doc/news/version_3.15.mdwn | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 doc/news/version_3.15.mdwn

diff --git a/debian/changelog b/debian/changelog
index d02ce888e..2cbf1403e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.15) unstable; urgency=low
+ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
diff --git a/doc/news/version_3.15.mdwn b/doc/news/version_3.15.mdwn
deleted file mode 100644
index 30a66ea23..000000000
--- a/doc/news/version_3.15.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-ikiwiki 3.15 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add new hooks: canremove, canrename, rename. (intrigeri)
-   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
-   * po: New plugin, suporting translation of wiki pages using po files.
-     (intrigeri)
-   * Add build machinery to build po files to translate the underlay wikis,
-   * Add further build machinery to generate translated underlays from
-     the po file, for use by wikis whose primary language is not English.
-   * Add Danish basewiki translation by Jonas Smedegaard.
-   * img: Fix adding of dependency from page to the image.
-   * pagestats: add `among` parameter, which only counts links from specified
-     pages (smcv)
-   * pagestats: when making a tag cloud, don't emit links where the tag is
-     unused (smcv)
-   * map: Avoid emitting an unclosed ul element if the map is empty. (harishcm)
-   * inline: Add pagenames parameter that can be used to list a set of
-     pages to inline, in a specific order, without using a PageSpec. (smcv)
-   * Add getsource plugin (Will, smcv)"""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 55e062f2d1ba5505caf0eadd95240348ac05ec0e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 11 Aug 2009 16:27:32 -0400
Subject: add news item for ikiwiki 3.141592

---
 doc/news/version_3.141592.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/news/version_3.141592.mdwn

diff --git a/doc/news/version_3.141592.mdwn b/doc/news/version_3.141592.mdwn
new file mode 100644
index 000000000..5911e07f9
--- /dev/null
+++ b/doc/news/version_3.141592.mdwn
@@ -0,0 +1,19 @@
+ikiwiki 3.141592 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Add new hooks: canremove, canrename, rename. (intrigeri)
+   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
+   * po: New plugin, suporting translation of wiki pages using po files.
+     (intrigeri)
+   * Add build machinery to build po files to translate the underlay wikis,
+   * Add further build machinery to generate translated underlays from
+     the po file, for use by wikis whose primary language is not English.
+   * Add Danish basewiki translation by Jonas Smedegaard.
+   * img: Fix adding of dependency from page to the image.
+   * pagestats: add `among` parameter, which only counts links from specified
+     pages (smcv)
+   * pagestats: when making a tag cloud, don't emit links where the tag is
+     unused (smcv)
+   * map: Avoid emitting an unclosed ul element if the map is empty. (harishcm)
+   * inline: Add pagenames parameter that can be used to list a set of
+     pages to inline, in a specific order, without using a PageSpec. (smcv)
+   * Add getsource plugin (Will, smcv)"""]]
\ No newline at end of file
-- 
cgit v1.2.3


From b4d7dfcbe1e7ea62f1c25e0534feee58720397ac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 12 Aug 2009 12:26:07 -0400
Subject: po: Detect if nowrapi18n can't be passed to po4a, and warn about the
 old version, but continue. Closes: #541205

---
 IkiWiki/Plugin/po.pm | 7 ++++++-
 debian/changelog     | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index e9dc9dd8c..52677076e 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -10,7 +10,12 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Encode;
-use Locale::Po4a::Common qw(nowrapi18n !/.*/);
+eval q{use Locale::Po4a::Common qw(nowrapi18n !/.*/)};
+if ($@) {
+	print STDERR gettext("warning: Old po4a detected! Recommend upgrade to 0.35.")."\n";
+	eval q{use Locale::Po4a::Common qw(!/.*/)};
+	die $@ if $@;
+}
 use Locale::Po4a::Chooser;
 use Locale::Po4a::Po;
 use File::Basename;
diff --git a/debian/changelog b/debian/changelog
index 2cbf1403e..95e3905a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.141593) UNRELEASED; urgency=low
+
+  * po: Detect if nowrapi18n can't be passed to po4a, and warn about
+    the old version, but continue. Closes: #541205 
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
+
 ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
-- 
cgit v1.2.3


From 04014e47755312bb500b28fc10153dd38eeb7131 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 12 Aug 2009 12:33:02 -0400
Subject: inline: Avoid use of my $_ as it fails with older perls. Closes:
 #541215

---
 IkiWiki/Plugin/inline.pm | 6 ++----
 debian/changelog         | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e7d6f250e..04ad6ed23 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -186,7 +186,6 @@ sub preprocess_inline (@) {
 	my @list;
 
 	if (exists $params{pagenames}) {
-
 		foreach my $p (qw(sort pages)) {
 			if (exists $params{$p}) {
 				error sprintf(gettext("the %s and %s parameters cannot be used together"),
@@ -194,9 +193,8 @@ sub preprocess_inline (@) {
 			}
 		}
 
-		@list = split ' ', $params{pagenames};
-		my $_;
-		@list = map { bestlink($params{page}, $_) } @list;
+		@list = map { bestlink($params{page}, $_) }
+		        split ' ', $params{pagenames};
 
 		$params{pages} = join(" or ", @list);
 	}
diff --git a/debian/changelog b/debian/changelog
index 95e3905a3..ed7854e8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
 
   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
     the old version, but continue. Closes: #541205 
+  * inline: Avoid use of my $_ as it fails with older perls.
+    Closes: #541215
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
-- 
cgit v1.2.3


From 906c8f6e5837a1de5e032d40eba0856b9918bbee Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 12 Aug 2009 12:43:57 -0400
Subject: use a more idiomatic foreach my

---
 IkiWiki/Plugin/monotone.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index bdb564a71..05c5a514d 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -575,13 +575,12 @@ sub rcs_recentchanges ($) {
 		}
 		
 		my @changed_files = get_changed_files($automator, $rev);
-		my $file;
 		
 		my ($out, $err) = $automator->call("parents", $rev);
 		my @parents = ($out =~ m/^($sha1_pattern)$/);
 		my $parent = $parents[0];
 
-		foreach $file (@changed_files) {
+		foreach my $file (@changed_files) {
 			next unless length $file;
 			
 			if (defined $config{diffurl} and (@parents == 1)) {
-- 
cgit v1.2.3


From 63ce4459f58b69ac8bac418b85b789486ac775b1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 12 Aug 2009 12:49:16 -0400
Subject: fix some more foreaches that clal functions to not use $_

---
 IkiWiki/Render.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5cb67ea07..fc8f287ce 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -379,12 +379,13 @@ sub refresh () {
 			$links{$page}=[];
 			$renderedfiles{$page}=[];
 			$pagemtime{$page}=0;
-			prune($config{destdir}."/".$_)
-				foreach @{$oldrenderedfiles{$page}};
+			foreach my $old (@{$oldrenderedfiles{$page}}) {
+				prune($config{destdir}."/".$old);
+			}
 			delete $pagesources{$page};
-			foreach (keys %destsources) {
-				if ($destsources{$_} eq $page) {
-					delete $destsources{$_};
+			foreach my $source (keys %destsources) {
+				if ($destsources{$source} eq $page) {
+					delete $destsources{$source};
 				}
 			}
 		}
-- 
cgit v1.2.3


From 4971f873a0ed64dc3eb4d9ddd5c4977d72317a14 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 12 Aug 2009 12:49:40 -0400
Subject: more idiomatic use of foreach

---
 IkiWiki/Plugin/darcs.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 9b62e70e4..2448673ac 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -318,9 +318,9 @@ sub rcs_recentchanges ($) {
 		my $hash=$patch->{hash};
 		my $when=str2time($date);
 		my (@pages, @files, @pg);
-		push @pages, $_ for (@{$patch->{summary}->[0]->{modify_file}});
-		push @pages, $_ for (@{$patch->{summary}->[0]->{add_file}});
-		push @pages, $_ for (@{$patch->{summary}->[0]->{remove_file}});
+		push @pages, $_ foreach (@{$patch->{summary}->[0]->{modify_file}});
+		push @pages, $_ foreach (@{$patch->{summary}->[0]->{add_file}});
+		push @pages, $_ foreach (@{$patch->{summary}->[0]->{remove_file}});
 		foreach my $f (@pages) {
 			$f = $f->{content} if ref $f;
 			$f =~ s,^\s+,,; $f =~ s,\s+$,,; # cut whitespace
-- 
cgit v1.2.3


From 6f4e9f38b866559af9e644a95093b3ed08019c8c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 12 Aug 2009 16:15:59 -0400
Subject: version po4a build-dep to 0.34

0.35 is much better, but 0.34 is the minimum version that will work
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index db86aa909..96ba221ff 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libtext-markdown-perl | markdown, 
   libtimedate-perl, libhtml-template-perl,
   libhtml-scrubber-perl, wdg-html-validator,
-  libhtml-parser-perl, liburi-perl, perlmagick, po4a
+  libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34)
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.8.1
-- 
cgit v1.2.3


From 92d185093c952c075d9b4040d8f3d1fa071449c9 Mon Sep 17 00:00:00 2001
From: dave <dave@web>
Date: Wed, 12 Aug 2009 23:48:45 -0400
Subject:

---
 doc/ikiwiki/markdown/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/ikiwiki/markdown/discussion.mdwn

diff --git a/doc/ikiwiki/markdown/discussion.mdwn b/doc/ikiwiki/markdown/discussion.mdwn
new file mode 100644
index 000000000..d3affec34
--- /dev/null
+++ b/doc/ikiwiki/markdown/discussion.mdwn
@@ -0,0 +1 @@
+Is anyone else having trouble using the definition list feature of multimarkdown?  If not, then I could use some help figuring out why it's not working on my text site.  Version is 3.141~bpo50+1 (debian backports), multimarkdown and mdwn support enabled in preferences.  Any pointers to the obvious thing I'm missing would be appreciated. - dave
-- 
cgit v1.2.3


From da1d046f61a51c9a2bb00f96d510f953fe73db9f Mon Sep 17 00:00:00 2001
From: lnussel <lnussel@web>
Date: Thu, 13 Aug 2009 11:07:59 -0400
Subject: yes please

---
 doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn b/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn
index 7870281ae..74a4fb1b1 100644
--- a/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn
+++ b/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn
@@ -1,3 +1,5 @@
 It would be nice to specify a minimum length for the change log for web edits, and if it's only required vs. non-required. I realise this is not going to solve the problem of crap log messages, but it helps guard against accidental submissions which one would have logged. Mediawiki/wikipedia has that option, and I find it a useful reminder. --[[madduck]]
 
+> +1 --[[lnussel]]
+
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 1c2bdf835217f7424383e881380ec51f2bff2dff Mon Sep 17 00:00:00 2001
From: lnussel <lnussel@web>
Date: Thu, 13 Aug 2009 11:45:38 -0400
Subject: add comment about automenu plugin

---
 doc/todo/a_navbar_based_on_page_properties.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/todo/a_navbar_based_on_page_properties.mdwn b/doc/todo/a_navbar_based_on_page_properties.mdwn
index 09be409ac..091e0a39b 100644
--- a/doc/todo/a_navbar_based_on_page_properties.mdwn
+++ b/doc/todo/a_navbar_based_on_page_properties.mdwn
@@ -38,4 +38,11 @@ well.
 There is a problem though if this navbar were included in a sidebar (the logical place): if a page is updated, the navbar needs to be rebuilt which causes the sidebar to be rebuilt, which causes the whole site to be rebuilt. Unless we can subscribe only to title changes, this will be pretty bad...
 
 --[[madduck]]
+
+> I've just written a plugin for a automatically created menu for use
+> [here](http://www.ff-egersdorf-wachendorf.de/). The source is at
+> [gitorious](http://gitorious.org/ikiwiki-plugins/automenu). The problem with
+> rebuilding remains unsolved but doesn't matter that much for me as I always
+> generate the web site myself, ie it's not really a wiki. --[[lnussel]]
+
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 3c06e9497838bb4dd57dbf5b9c0c5f61a240b629 Mon Sep 17 00:00:00 2001
From: "91.105.86.99" <91.105.86.99@web>
Date: Thu, 13 Aug 2009 14:05:59 -0400
Subject: poll vote (Accept only OpenID for logins)

---
 doc/news/openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index cc13a6548..7a6f84518 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 62 "Accept only OpenID for logins" 19 "Accept only password logins" 36 "Accept both"]]
+[[!poll 63 "Accept only OpenID for logins" 19 "Accept only password logins" 36 "Accept both"]]
-- 
cgit v1.2.3


From 7b3b0dabb309794bb1d7c9191b7236d2c87c389b Mon Sep 17 00:00:00 2001
From: lludwig <lludwig@web>
Date: Thu, 13 Aug 2009 14:14:50 -0400
Subject:

---
 doc/forum/google_openid_broken__63__.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/forum/google_openid_broken__63__.mdwn

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
new file mode 100644
index 000000000..2ca339c3c
--- /dev/null
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -0,0 +1,5 @@
+when I login via to this wiki (or ours) via Google's OpenID, I get this error:
+
+Error: OpenID failure: no_identity_server: The provided URL doesn't declare its OpenID identity server. 
+
+Any idea how to fix this??
-- 
cgit v1.2.3


From 2b7a003794537ebf8e02f122cc2743834b47a396 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 13 Aug 2009 16:56:26 -0400
Subject: Add my CVS plugin and related patches.

---
 IkiWiki.pm            |   2 +-
 IkiWiki/Plugin/cvs.pm | 423 ++++++++++++++++++++++++++++++++++++++++++++++++++
 ikiwiki-makerepo      |  52 ++++++-
 t/file_pruned.t       |   5 +-
 4 files changed, 479 insertions(+), 3 deletions(-)
 create mode 100644 IkiWiki/Plugin/cvs.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a11b330f2..2355c0780 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -329,7 +329,7 @@ sub getsetup () {
 			qr/\.x?html?$/, qr/\.ikiwiki-new$/,
 			qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
 			qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
-			qr/\.dpkg-tmp$/],
+			qr/(^|\/)CVS\//, qr/\.dpkg-tmp$/],
 		description => "regexps of source files to ignore",
 		safe => 0,
 		rebuild => 1,
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
new file mode 100644
index 000000000..c09e4f9aa
--- /dev/null
+++ b/IkiWiki/Plugin/cvs.pm
@@ -0,0 +1,423 @@
+#!/usr/pkg/bin/perl
+package IkiWiki::Plugin::cvs;
+
+use warnings;
+use strict;
+use IkiWiki;
+
+sub import {
+	hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
+	hook(type => "getsetup", id => "cvs", call => \&getsetup);
+	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
+	hook(type => "rcs", id => "rcs_prepedit", call => \&rcs_prepedit);
+	hook(type => "rcs", id => "rcs_commit", call => \&rcs_commit);
+	hook(type => "rcs", id => "rcs_commit_staged", call => \&rcs_commit_staged);
+	hook(type => "rcs", id => "rcs_add", call => \&rcs_add);
+	hook(type => "rcs", id => "rcs_remove", call => \&rcs_remove);
+	hook(type => "rcs", id => "rcs_rename", call => \&rcs_rename);
+	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
+	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
+	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+}
+
+sub checkconfig () {
+	if (! defined $config{cvspath}) {
+		$config{cvspath}="ikiwiki";
+	}
+	if (exists $config{cvspath}) {
+		# code depends on the path not having extraneous slashes
+		$config{cvspath}=~tr#/#/#s;
+		$config{cvspath}=~s/\/$//;
+		$config{cvspath}=~s/^\///;
+	}
+	if (defined $config{cvs_wrapper} && length $config{cvs_wrapper}) {
+		push @{$config{wrappers}}, {
+			wrapper => $config{cvs_wrapper},
+			wrappermode => (defined $config{cvs_wrappermode} ? $config{cvs_wrappermode} : "04755"),
+		};
+	}
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 0, # rcs plugin
+			rebuild => undef,
+		},
+		cvsrepo => {
+			type => "string",
+			example => "/cvs/wikirepo",
+			description => "cvs repository location",
+			safe => 0, # path
+			rebuild => 0,
+		},
+		cvspath => {
+			type => "string",
+			example => "ikiwiki",
+			description => "path inside repository where the wiki is located",
+			safe => 0, # paranoia
+			rebuild => 0,
+		},
+		cvs_wrapper => {
+			type => "string",
+			example => "/cvs/wikirepo/CVSROOT/post-commit",
+			description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry",
+			safe => 0, # file
+			rebuild => 0,
+		},
+		cvs_wrappermode => {
+			type => "string",
+			example => '04755',
+			description => "mode for cvs_wrapper (can safely be made suid)",
+			safe => 0,
+			rebuild => 0,
+		},
+		historyurl => {
+			type => "string",
+			example => "http://cvs.example.org/cvsweb.cgi/ikiwiki/[[file]]",
+			description => "cvsweb url to show file history ([[file]] substituted)",
+			safe => 1,
+			rebuild => 1,
+		},
+		diffurl => {
+			type => "string",
+			example => "http://cvs.example.org/cvsweb.cgi/ikiwiki/[[file]].diff?r1=text&amp;tr1=[[r1]]&amp;r2=text&amp;tr2=[[r2]]",
+			description => "cvsweb url to show a diff ([[file]], [[r1]], and [[r2]] substituted)",
+			safe => 1,
+			rebuild => 1,
+		},
+}
+
+sub cvs_info ($$) {
+	my $field=shift;
+	my $file=shift;
+
+	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+
+	my $info=`cvs status $file`;
+	my ($ret)=$info=~/^\s*$field:\s*(\S+)/m;
+	return $ret;
+}
+
+sub cvs_runcvs(@) {
+	my ($cmd) = @_;
+	unshift @$cmd, 'cvs', '-Q';
+
+	eval q{
+		use IPC::Cmd;
+	};
+	error($@) if $@;
+
+	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+
+	debug("runcvs: " . join(" ", @$cmd));
+
+	my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
+		IPC::Cmd::run(command => $cmd, verbose => 0);
+	if (! $success) {
+		warn(join(" ", @$cmd) . " exited with code $error_code\n");
+		warn(join "", @$stderr_buf);
+	}
+	return $success;
+}
+
+sub cvs_shquote_commit ($) {
+	my $message = shift;
+
+	eval q{
+		use String::ShellQuote;
+	};
+	error($@) if $@;
+
+	return shell_quote(IkiWiki::possibly_foolish_untaint($message));
+}
+
+sub cvs_is_controlling {
+	my $dir=shift;
+	$dir=$config{srcdir} unless defined($dir);
+	return (-d "$dir/CVS") ? 1 : 0;
+}
+
+sub rcs_update () {
+	return unless cvs_is_controlling;
+	cvs_runcvs(['update', '-dP']);
+}
+
+sub rcs_prepedit ($) {
+	# Prepares to edit a file under revision control. Returns a token
+	# that must be passed into rcs_commit when the file is ready
+	# for committing.
+	# The file is relative to the srcdir.
+	my $file=shift;
+
+	return unless cvs_is_controlling;
+
+	# For cvs, return the revision of the file when
+	# editing begins.
+	my $rev=cvs_info("Repository revision", "$file");
+	return defined $rev ? $rev : "";
+}
+
+sub rcs_commit ($$$;$$) {
+	# Tries to commit the page; returns undef on _success_ and
+	# a version of the page with the rcs's conflict markers on failure.
+	# The file is relative to the srcdir.
+	my $file=shift;
+	my $message=shift;
+	my $rcstoken=shift;
+	my $user=shift;
+	my $ipaddr=shift;
+
+	return unless cvs_is_controlling;
+
+	if (defined $user) {
+		$message="web commit by $user".(length $message ? ": $message" : "");
+	}
+	elsif (defined $ipaddr) {
+		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
+	}
+
+	# Check to see if the page has been changed by someone
+	# else since rcs_prepedit was called.
+	my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
+	my $rev=cvs_info("Repository revision", "$config{srcdir}/$file");
+	if (defined $rev && defined $oldrev && $rev != $oldrev) {
+		# Merge their changes into the file that we've
+		# changed.
+		cvs_runcvs(['update', $file]) ||
+			warn("cvs merge from $oldrev to $rev failed\n");
+	}
+
+	if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
+		my $conflict=readfile("$config{srcdir}/$file");
+		cvs_runcvs(['update', '-C', $file]) ||
+			warn("cvs revert failed\n");
+		return $conflict;
+	}
+
+	return undef # success
+}
+
+sub rcs_commit_staged ($$$) {
+	# Commits all staged changes. Changes can be staged using rcs_add,
+	# rcs_remove, and rcs_rename.
+	my ($message, $user, $ipaddr)=@_;
+
+	if (defined $user) {
+		$message="web commit by $user".(length $message ? ": $message" : "");
+	}
+	elsif (defined $ipaddr) {
+		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
+	}
+
+	if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
+		warn "cvs staged commit failed\n";
+		return 1; # failure
+	}
+	return undef # success
+}
+
+sub rcs_add ($) {
+	# filename is relative to the root of the srcdir
+	my $file=shift;
+	my $parent=IkiWiki::dirname($file);
+	my @files_to_add = ($file);
+
+	until ((length($parent) == 0) || cvs_is_controlling("$config{srcdir}/$parent")){
+		push @files_to_add, $parent;
+		$parent = IkiWiki::dirname($parent);
+	}
+
+	while ($file = pop @files_to_add) {
+		cvs_runcvs(['add', $file]) ||
+			warn("cvs add $file failed\n");
+	}
+}
+
+sub rcs_remove ($) {
+	# filename is relative to the root of the srcdir
+	my $file=shift;
+
+	return unless cvs_is_controlling;
+
+	cvs_runcvs(['rm', '-f', $file]) ||
+		warn("cvs rm $file failed\n");
+}
+
+sub rcs_rename ($$) {
+	# filenames relative to the root of the srcdir
+	my ($src, $dest)=@_;
+
+	return unless cvs_is_controlling;
+
+	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+
+	if (system("mv", "$src", "$dest") != 0) {
+		warn("filesystem rename failed\n");
+	}
+
+	rcs_add($dest);
+	rcs_remove($src);
+}
+
+sub rcs_recentchanges($) {
+	my $num = shift;
+	my @ret;
+
+	return unless cvs_is_controlling;
+
+	eval q{
+		use Date::Parse;
+	};
+	error($@) if $@;
+
+	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+
+	open CVSPS, "env TZ=UTC cvsps -q --cvs-direct -z 30 -x |" || error "couldn't get cvsps output: $!\n";
+	my @spsvc = reverse <CVSPS>;		# is this great? no it is not
+	close CVSPS || error "couldn't close cvsps output: $!\n";
+
+	while (my $line = shift @spsvc) {
+		$line =~ /^$/ || error "expected blank line, got $line";
+
+		my ($rev, $user, $committype, $when);
+		my (@message, @pages);
+
+		# We're reading backwards.
+		# Forwards, an entry looks like so:
+		# ---------------------
+		# PatchSet $rev
+		# Date: $when
+		# Author: $user (or user CGI runs as, for web commits)
+		# Branch: branch
+		# Tag: tag
+		# Log:
+		# @message_lines
+		# Members:
+		#	@pages (and revisions)
+		#
+
+		while ($line = shift @spsvc) {
+			last if ($line =~ /^Members:/);
+			for ($line) {
+				s/^\s+//;
+				s/\s+$//;
+			}
+			my ($page, $revs) = split(/:/, $line);
+			my ($oldrev, $newrev) = split(/->/, $revs);
+			$oldrev =~ s/INITIAL/0/;
+			$newrev =~ s/\(DEAD\)//;
+			my $diffurl = defined $config{diffurl} ? $config{diffurl} : "";
+			$diffurl=~s/\[\[file\]\]/$page/g;
+			$diffurl=~s/\[\[r1\]\]/$oldrev/g;
+			$diffurl=~s/\[\[r2\]\]/$newrev/g;
+			unshift @pages, {
+				page => pagename($page),
+				diffurl => $diffurl,
+			} if length $page;
+		}
+
+		while ($line = shift @spsvc) {
+			last if ($line =~ /^Log:$/);
+			chomp $line;
+			unshift @message, { line => $line };
+		}
+		$committype = "web";
+		if (defined $message[0] &&
+		    $message[0]->{line}=~/$config{web_commit_regexp}/) {
+			$user=defined $2 ? "$2" : "$3";
+			$message[0]->{line}=$4;
+		} else {
+			$committype="cvs";
+		}
+
+		$line = shift @spsvc;	# Tag
+		$line = shift @spsvc;	# Branch
+
+		$line = shift @spsvc;
+		if ($line =~ /^Author: (.*)$/) {
+			$user = $1 unless defined $user && length $user;
+		} else {
+			error "expected Author, got $line";
+		}
+
+		$line = shift @spsvc;
+		if ($line =~ /^Date: (.*)$/) {
+			$when = str2time($1, 'UTC');
+		} else {
+			error "expected Date, got $line";
+		}
+
+		$line = shift @spsvc;
+		if ($line =~ /^PatchSet (.*)$/) {
+			$rev = $1;
+		} else {
+			error "expected PatchSet, got $line";
+		}
+
+		$line = shift @spsvc;	# ---------------------
+
+		push @ret, {
+			rev => $rev,
+			user => $user,
+			committype => $committype,
+			when => $when,
+			message => [@message],
+			pages => [@pages],
+		} if @pages;
+		return @ret if @ret >= $num;
+	}
+
+	return @ret;
+}
+
+sub rcs_diff ($) {
+	my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
+
+	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+
+	# diff output is unavoidably preceded by the cvsps PatchSet entry
+	my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`;
+	my $blank_lines_seen = 0;
+
+	while (my $line = shift @cvsps) {
+		$blank_lines_seen++ if ($line =~ /^$/);
+		last if $blank_lines_seen == 2;
+	}
+
+	if (wantarray) {
+		return @cvsps;
+	} else {
+		return join("", @cvsps);
+	}
+}
+
+sub rcs_getctime ($) {
+	my $file=shift;
+
+	my $cvs_log_infoline=qr/^date: (.+);\s+author/;
+
+	open CVSLOG, "cvs -Q log -r1.1 '$file' |"
+		|| error "couldn't get cvs log output: $!\n";
+
+	my $date;
+	while (<CVSLOG>) {
+		if (/$cvs_log_infoline/) {
+			$date=$1;
+		}
+	}
+	close CVSLOG || warn "cvs log $file exited $?";
+
+	if (! defined $date) {
+		warn "failed to parse cvs log for $file\n";
+		return 0;
+	}
+
+	eval q{use Date::Parse};
+	error($@) if $@;
+	$date=str2time($date, 'UTC');
+	debug("found ctime ".localtime($date)." for $file");
+	return $date;
+}
+
+1
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 7f82e7177..bf33a3a80 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -6,7 +6,7 @@ srcdir="$2"
 repository="$3"
 
 usage () {
-	echo "usage: ikiwiki-makerepo svn|git|monotone|darcs srcdir repository" >&2
+	echo "usage: ikiwiki-makerepo cvs|svn|git|monotone|darcs srcdir repository" >&2
 	echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2
 	exit 1
 }
@@ -39,6 +39,56 @@ fi
 echo "Importing $srcdir into $rcs"
 
 case "$rcs" in
+cvs)
+	if [ -e "$srcdir/CVS" ]; then
+		echo "$srcdir already seems to be a cvs working copy" >&2
+		exit 1
+	fi
+	cvs -Q -d "$repository" init
+	cat > "$repository/CVSROOT/post-commit-wrapper" <<EOF
+#!/bin/sh
+
+IKIWIKI_POST_COMMIT_HOOK="$repository/CVSROOT/post-commit"
+
+exists_ikiwiki_post_commit_hook() {
+	[ -x \$IKIWIKI_POST_COMMIT_HOOK ];
+}
+
+called_with_exactly_one_dir() {
+	echo "\$@" | grep 'New directory' >/dev/null 2>&1
+}
+
+main() {
+	exists_ikiwiki_post_commit_hook || exit 0
+	called_with_exactly_one_dir "\$@" && exit 0
+	# Return from commit and relinquish write lock. ikiwiki post-commit
+	# wants to "cvs update", which wants to take a read lock.
+	\$IKIWIKI_POST_COMMIT_HOOK &
+	return 0
+}
+
+main "\$@"
+exit \$?
+EOF
+	chmod +x "$repository/CVSROOT/post-commit-wrapper"
+	cd "$srcdir"/..
+	cvs -Q -d "$repository" get -P CVSROOT
+	cd CVSROOT
+	echo .ikiwiki >> cvsignore
+	cvs -Q add cvsignore
+	echo "^ikiwiki $repository/CVSROOT/post-commit-wrapper %{sVv}" >> loginfo
+	cvs -Q commit -m "ikiwiki-makerepo setup" cvsignore loginfo
+	cd ..
+	rm -rf CVSROOT
+	cd "$srcdir"
+	cvs -Q -d "$repository" import -m "initial import" ikiwiki IKIWIKI PRE_CVS
+	cd ..
+	mv "$srcdir" "$srcdir.orig"
+	cvs -Q -d "$repository" get -P -d "$(basename "$srcdir")" ikiwiki
+	[ -d "$srcdir.orig/.ikiwiki" ] && mv "$srcdir.orig/.ikiwiki" "$srcdir"
+	rm -rf "$srcdir.orig"
+	echo "Directory $srcdir is now a checkout of $rcs repository $repository"
+;;
 svn)
 	if [ -e "$srcdir/.svn" ]; then
 		echo "$srcdir already seems to be a svn working copy" >&2
diff --git a/t/file_pruned.t b/t/file_pruned.t
index 7d46c4b7f..a05ad548f 100755
--- a/t/file_pruned.t
+++ b/t/file_pruned.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 24;
+use Test::More tests => 27;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -9,6 +9,9 @@ BEGIN { use_ok("IkiWiki"); }
 
 ok(IkiWiki::file_pruned("src/.ikiwiki/", "src"));
 ok(IkiWiki::file_pruned("src/.ikiwiki/index", "src"));
+ok(IkiWiki::file_pruned("src/CVS", "src"));
+ok(IkiWiki::file_pruned("src/subdir/CVS", "src"));
+ok(IkiWiki::file_pruned("src/subdir/CVS/foo", "src"));
 ok(IkiWiki::file_pruned("src/.svn", "src"));
 ok(IkiWiki::file_pruned("src/subdir/.svn", "src"));
 ok(IkiWiki::file_pruned("src/subdir/.svn/foo", "src"));
-- 
cgit v1.2.3


From 9e2c8a96cd3f54644f38d43d7beb347edda0684c Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Thu, 13 Aug 2009 17:14:32 -0400
Subject: add me new repo, yarrr

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 18fbd238b..1cd91e532 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -46,6 +46,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[arpitjain]] `git://github.com/arpitjain11/ikiwiki.git`
 * [[chrysn]] `git://github.com/github076986099/ikiwiki.git`
 * [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git`
+* [[schmonz]] `git://github.com/schmonz/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From d512d5802273faac184d133d64965336a68cd603 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 13 Aug 2009 17:48:36 -0400
Subject: response

---
 doc/forum/google_openid_broken__63__.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 2ca339c3c..890bba4d9 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -3,3 +3,8 @@ when I login via to this wiki (or ours) via Google's OpenID, I get this error:
 Error: OpenID failure: no_identity_server: The provided URL doesn't declare its OpenID identity server. 
 
 Any idea how to fix this??
+
+> Google is [doing things with openid that are not in the spec](http://googledataapis.blogspot.com/2008/10/federated-login-for-google-account.html)
+> and it's not clear to me that they intend regular openid to work at all.
+> What is your google openid URL so I can take a look at the data they are
+> providing? --[[Joey]] 
-- 
cgit v1.2.3


From b137edd0e7aebe47b771a4dffcb4d1c68b59b530 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 13 Aug 2009 17:53:07 -0400
Subject: Life is simpler on a git branch.

---
 doc/plugins/contrib/cvs.mdwn | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index f466b9399..23e00201f 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -1,14 +1,11 @@
 [[!template id=plugin name=cvs core=0 author="[[schmonz]]"]]
 
+[[!template id=gitbranch branch=schmonz author="[[schmonz]]"]]
+
 This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]].
 
-### Installation and usage
-7. Apply patches to [`IkiWiki.pm`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-IkiWiki.pm.diff)
-and [`ikiwiki-makerepo`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-ikiwiki-makerepo.diff).
-7. Rebuild and install ikiwiki.
+### Usage
 7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan IPC::Cmd]], [[!cpan String::ShellQuote]], and [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
-7. Download [`cvs.pm`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs.pm) into a suitable `$libdir/IkiWiki/Plugin`.
-7. While setting up a wiki [[by hand|setup/byhand]], also specify `--libdir` until you get to the point where you have a setup file. (This ensures the CVS plugin is found and its settings stanza included.)
 7. Adjust CVS-related parameters in your setup file.
 
 Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn't need it, but you yourself might. Here's a good general-purpose one:
@@ -20,7 +17,7 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
     rdiff -u
 
 ### Implementation details
-* Diffs are against [[3.14159|news/version_3.14159]]. `cvs.pm` started life as a copy of `svn.pm`.
+* `cvs.pm` started life as a copy of [[3.14159|news/version_3.14159]]'s `svn.pm`.
 * `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata into `$DESTDIR`.
 * [[ikiwiki-makerepo]]:
  * creates a repository,
@@ -30,7 +27,7 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
 * CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below).
 
 ### To do
-* Add automated tests. ([Blindly adding svn-like tests to `t/file_pruned.t`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-t-file_pruned.t.diff) doesn't do the trick.)
+* Add automated tests. (Blindly adding svn-like tests to `t/file_pruned.t` doesn't do the trick.)
 * If the argument to `cvs add` smells like a binary file, `cvs add -kb` it (for [[plugins/attachment]] support).
 * Don't slurp the entire `cvsps` output into memory (!).
 * Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records.
-- 
cgit v1.2.3


From 8ba32abaf27110d86a52720bcb738402bf90fadb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 13 Aug 2009 17:55:01 -0400
Subject: review: question

---
 doc/plugins/contrib/cvs/discussion | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/plugins/contrib/cvs/discussion

diff --git a/doc/plugins/contrib/cvs/discussion b/doc/plugins/contrib/cvs/discussion
new file mode 100644
index 000000000..e2411af63
--- /dev/null
+++ b/doc/plugins/contrib/cvs/discussion
@@ -0,0 +1,5 @@
+I've started reviewing this, and the main thing I don't like is the
+post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up.
+That just seems unnecessarily complicated. Why can't ikiwiki itself detect
+the "cvs add <directory>" call and avoid doing anything in that case?
+--[[Joey]] 
-- 
cgit v1.2.3


From 3401dc6110ac785c1df3f447d2f1de017be92538 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 13 Aug 2009 18:12:28 -0400
Subject: fix name

---
 doc/plugins/contrib/cvs/discussion      | 5 -----
 doc/plugins/contrib/cvs/discussion.mdwn | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 doc/plugins/contrib/cvs/discussion
 create mode 100644 doc/plugins/contrib/cvs/discussion.mdwn

diff --git a/doc/plugins/contrib/cvs/discussion b/doc/plugins/contrib/cvs/discussion
deleted file mode 100644
index e2411af63..000000000
--- a/doc/plugins/contrib/cvs/discussion
+++ /dev/null
@@ -1,5 +0,0 @@
-I've started reviewing this, and the main thing I don't like is the
-post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up.
-That just seems unnecessarily complicated. Why can't ikiwiki itself detect
-the "cvs add <directory>" call and avoid doing anything in that case?
---[[Joey]] 
diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
new file mode 100644
index 000000000..e2411af63
--- /dev/null
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -0,0 +1,5 @@
+I've started reviewing this, and the main thing I don't like is the
+post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up.
+That just seems unnecessarily complicated. Why can't ikiwiki itself detect
+the "cvs add <directory>" call and avoid doing anything in that case?
+--[[Joey]] 
-- 
cgit v1.2.3


From 46c2d66fd37b12c2d02466118cb206000174f1b4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 13 Aug 2009 19:05:27 -0400
Subject: disable pagecount here, sorta of excessive since the bug has been
 done

---
 doc/bugs/pagecount_is_broken.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/pagecount_is_broken.mdwn b/doc/bugs/pagecount_is_broken.mdwn
index 101230d94..57df6b75d 100644
--- a/doc/bugs/pagecount_is_broken.mdwn
+++ b/doc/bugs/pagecount_is_broken.mdwn
@@ -1,3 +1,4 @@
-The [[plugins/pagecount]] plugin seems to be broken, as it claims there are [[!pagecount ]] pages in this wiki. (if it's not 0, the bug is fixed)
+The [[plugins/pagecount]] plugin seems to be broken, as it claims there are
+\[[!pagecount ]] pages in this wiki. (if it's not 0, the bug is fixed)
 
 [[fixed|done]] --[[Joey]] 
-- 
cgit v1.2.3


From 159c0c043cdd4009562087144a37fdda38eb6409 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 13 Aug 2009 21:04:19 -0400
Subject: optimise gettext calls

---
 IkiWiki/Plugin/brokenlinks.pm | 2 +-
 IkiWiki/Plugin/inline.pm      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index cf8f25281..f8d44892b 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -28,9 +28,9 @@ sub preprocess (@) {
 	add_depends($params{page}, $params{pages});
 	
 	my %broken;
+	my $discussion=gettext("Discussion");
 	foreach my $page (pagespec_match_list([keys %links],
 			$params{pages}, location => $params{page})) {
-		my $discussion=gettext("Discussion");
 		my %seen;
 		foreach my $link (@{$links{$page}}) {
 			next if $seen{$link};
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 04ad6ed23..2fbb45e02 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -348,6 +348,9 @@ sub preprocess_inline (@) {
 		}
 		my $template=HTML::Template->new(@params) unless $raw;
 	
+		my $discussionlink=lc(gettext("Discussion"))
+			if $config{discussion};
+
 		foreach my $page (@list) {
 			my $file = $pagesources{$page};
 			my $type = pagetype($file);
@@ -371,7 +374,6 @@ sub preprocess_inline (@) {
 					my $file = $pagesources{$page};
 					my $type = pagetype($file);
 					if ($config{discussion}) {
-						my $discussionlink=lc(gettext("Discussion"));
 						if ($page !~ /.*\/\Q$discussionlink\E$/ &&
 						    (length $config{cgiurl} ||
 						     exists $links{$page."/".$discussionlink})) {
-- 
cgit v1.2.3


From fed73d8d922ec4d52457a99f652c1d0d26ba67c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 13 Aug 2009 21:05:07 -0400
Subject: change PROFILE to use Devel::NYTProf

---
 Makefile.PL | 2 +-
 README      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 602d8fb5c..020813177 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -27,7 +27,7 @@ PROBABLE_INST_LIB=$(shell \\
 W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
 
 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
-extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
 
 ikiwiki.out: ikiwiki.in
 	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
diff --git a/README b/README
index 408ab666a..a4dc0d641 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ available online at <http://ikiwiki.info/>
 A few special variables you can set while using the Makefile:
 
   PROFILE=1 turns on profiling for the build of the doc wiki.
-  (Uses Devel::Profile)
+  (Uses Devel::NYTProf)
 
   NOTAINT=0 turns on the taint flag in the ikiwiki program. (Not recommended
   unless your perl is less buggy than mine -- see
-- 
cgit v1.2.3


From 2007005cd2497ff10defa3e3e9cc91890df1c5d8 Mon Sep 17 00:00:00 2001
From: dave <dave@web>
Date: Thu, 13 Aug 2009 21:09:24 -0400
Subject: removed

---
 doc/ikiwiki/markdown/discussion.mdwn | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 doc/ikiwiki/markdown/discussion.mdwn

diff --git a/doc/ikiwiki/markdown/discussion.mdwn b/doc/ikiwiki/markdown/discussion.mdwn
deleted file mode 100644
index d3affec34..000000000
--- a/doc/ikiwiki/markdown/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Is anyone else having trouble using the definition list feature of multimarkdown?  If not, then I could use some help figuring out why it's not working on my text site.  Version is 3.141~bpo50+1 (debian backports), multimarkdown and mdwn support enabled in preferences.  Any pointers to the obvious thing I'm missing would be appreciated. - dave
-- 
cgit v1.2.3


From 830c9e59b2c4d5c90e4316d8e81558e1aeb132f2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 13 Aug 2009 21:41:33 -0400
Subject: Add discussionpage configuration setting

By adding this setting, we get both more configurability, and a minor
optimisation too, since gettext does not need to be called continually
to get the Discussion value.
---
 IkiWiki.pm                       | 7 +++++++
 IkiWiki/Plugin/brokenlinks.pm    | 3 +--
 IkiWiki/Plugin/editpage.pm       | 5 +++--
 IkiWiki/Plugin/inline.pm         | 9 +++------
 IkiWiki/Plugin/opendiscussion.pm | 3 +--
 IkiWiki/Plugin/orphans.pm        | 3 +--
 IkiWiki/Render.pm                | 9 ++++-----
 debian/changelog                 | 2 ++
 8 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a11b330f2..b47da966e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -220,6 +220,13 @@ sub getsetup () {
 		safe => 1,
 		rebuild => 1,
 	},
+	discussionpage => {
+		type => "string",
+		default => gettext("Discussion"),
+		description => "name of Discussion pages",
+		safe => 1,
+		rebuild => 1,
+	},
 	sslcookie => {
 		type => "boolean",
 		default => 0,
diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index f8d44892b..5ad4c917c 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -28,14 +28,13 @@ sub preprocess (@) {
 	add_depends($params{page}, $params{pages});
 	
 	my %broken;
-	my $discussion=gettext("Discussion");
 	foreach my $page (pagespec_match_list([keys %links],
 			$params{pages}, location => $params{page})) {
 		my %seen;
 		foreach my $link (@{$links{$page}}) {
 			next if $seen{$link};
 			$seen{$link}=1;
-			next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};
+			next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion};
 			my $bestlink=bestlink($page, $link);
 			next if length $bestlink;
 			push @{$broken{$link}}, $page;
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 467cd9ed5..fca970c60 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -229,8 +229,9 @@ sub cgi_editpage ($$) {
 				my $dir=$from."/";
 				$dir=~s![^/]+/+$!!;
 				
-				if ((defined $form->field('subpage') && length $form->field('subpage')) ||
-				    $page eq lc(gettext('Discussion'))) {
+				if ((defined $form->field('subpage') &&
+				     length $form->field('subpage')) ||
+				    $page eq lc($config{discussionpage})) {
 					$best_loc="$from/$page";
 				}
 				else {
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2fbb45e02..704fa711d 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -348,9 +348,6 @@ sub preprocess_inline (@) {
 		}
 		my $template=HTML::Template->new(@params) unless $raw;
 	
-		my $discussionlink=lc(gettext("Discussion"))
-			if $config{discussion};
-
 		foreach my $page (@list) {
 			my $file = $pagesources{$page};
 			my $type = pagetype($file);
@@ -374,14 +371,14 @@ sub preprocess_inline (@) {
 					my $file = $pagesources{$page};
 					my $type = pagetype($file);
 					if ($config{discussion}) {
-						if ($page !~ /.*\/\Q$discussionlink\E$/ &&
+						if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
 						    (length $config{cgiurl} ||
-						     exists $links{$page."/".$discussionlink})) {
+						     exists $links{$page."/".$config{discussionpage}})) {
 							$template->param(have_actions => 1);
 							$template->param(discussionlink =>
 								htmllink($page,
 									$params{destpage},
-									gettext("Discussion"),
+									$config{discussionpage},
 									noimageinline => 1,
 									forcesubpage => 1));
 						}
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 60b193eca..1bec4b013 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -23,8 +23,7 @@ sub canedit ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
-	my $discussion=lc(gettext("Discussion"));
-	return "" if $page=~/(\/|^)\Q$discussion\E$/;
+	return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/;
 	return undef;
 }
 
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 7c938ef74..02f5d2524 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -34,7 +34,6 @@ sub preprocess (@) {
 	}
 	
 	my @orphans;
-	my $discussion=lc(gettext("Discussion"));
 	foreach my $page (pagespec_match_list(
 			[ grep { ! $linkedto{$_} && $_ ne 'index' }
 				keys %pagesources ],
@@ -43,7 +42,7 @@ sub preprocess (@) {
 		# indirectly linked to a page via that page's backlinks.
 		next if grep { 
 			length $_ &&
-			($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) &&
+			($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) &&
 			bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
 		} @{$links{$page}};
 		push @orphans, $page;
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fc8f287ce..d5e81f1b9 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -83,11 +83,10 @@ sub genpage ($$) {
 		$actions++;
 	}
 	if ($config{discussion}) {
-		my $discussionlink=lc(gettext("Discussion"));
-		if ($page !~ /.*\/\Q$discussionlink\E$/ &&
+		if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
 		   (length $config{cgiurl} ||
-		    exists $links{$page."/".$discussionlink})) {
-			$template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), noimageinline => 1, forcesubpage => 1));
+		    exists $links{$page."/".$config{discussionpage}})) {
+			$template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));
 			$actions++;
 		}
 	}
@@ -153,7 +152,7 @@ sub scan ($) {
 		if ($config{discussion}) {
 			# Discussion links are a special case since they're
 			# not in the text of the page, but on its template.
-			$links{$page}=[ $page."/".lc(gettext("Discussion")) ];
+			$links{$page}=[ $page."/".lc($config{discussionpage}) ];
 		}
 		else {
 			$links{$page}=[];
diff --git a/debian/changelog b/debian/changelog
index ed7854e8a..5e5149927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
     the old version, but continue. Closes: #541205 
   * inline: Avoid use of my $_ as it fails with older perls.
     Closes: #541215
+  * Add discussionpage configuration setting.
+  * Small optimisations.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
-- 
cgit v1.2.3


From 949eb252e9f918bd57e58b75479ed3b4c017f87d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 13 Aug 2009 21:41:48 -0400
Subject: po: use discussionpage config setting

This was tricky. $links{$page/discussion} must be checked; with it in
lowercase.
---
 IkiWiki/Plugin/po.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 52677076e..b8967058e 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -284,17 +284,16 @@ sub pagetemplate (@) {
 		map add_depends($page, $_), (values %{otherlanguages($page)});
 	}
 	if ($config{discussion} && istranslation($page)) {
-		my $discussionlink=gettext("discussion");
-		if ($page !~ /.*\/\Q$discussionlink\E$/i &&
+		if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
 		   (length $config{cgiurl} ||
-		    exists $links{$masterpage."/".$discussionlink})) {
+		    exists $links{$masterpage."/".lc($config{discussionpage})})) {
 			$template->param('discussionlink' => htmllink(
 				$page,
 				$destpage,
-				$masterpage . '/' . gettext("Discussion"),
+				$masterpage . '/' . $config{discussionpage},
 				noimageinline => 1,
 				forcesubpage => 0,
-				linktext => gettext("Discussion"),
+				linktext => $config{discussionpage},
 		));
 		}
 	}
-- 
cgit v1.2.3


From f486271009142ec7e04e1a62c1e94ad9e51b6d39 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 14 Aug 2009 00:51:52 -0400
Subject: orphans: Reuse backlinks info

This plugin was building essentially the same data that is built to handle
backlinks, so reuse that as an optimisation.
---
 IkiWiki/Plugin/orphans.pm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 02f5d2524..711226772 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -27,15 +27,9 @@ sub preprocess (@) {
 	# register a dependency.
 	add_depends($params{page}, $params{pages});
 	
-	my %linkedto;
-	foreach my $p (keys %links) {
-		map { $linkedto{bestlink($p, $_)}=1 if length $_ }
-			@{$links{$p}};
-	}
-	
 	my @orphans;
 	foreach my $page (pagespec_match_list(
-			[ grep { ! $linkedto{$_} && $_ ne 'index' }
+			[ grep { ! IkiWiki::backlink_pages($_) && $_ ne 'index' }
 				keys %pagesources ],
 			$params{pages}, location => $params{page})) {
 		# If the page has a link to some other page, it's
-- 
cgit v1.2.3


From 82bb3af579db809b884c7be5f49012469902bf52 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 14 Aug 2009 01:11:53 -0400
Subject: optimise brokenlinks by gathering the data when calculating backlinks

During backlink calulation, all links are examined and broken links can
be detected for free, so store a list of broken links and have brokenlinks
use it.

Exposing the %brokenlinks structure is a bit ugly, but the speedup seems
worth it: Around 1 second for wikis the size of the doc wiki that use
brokenlinks.
---
 IkiWiki/Plugin/brokenlinks.pm | 30 +++++++++++++-----------------
 IkiWiki/Render.pm             | 23 ++++++++++++++---------
 debian/changelog              |  3 ++-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 5ad4c917c..eb698b0be 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -27,31 +27,27 @@ sub preprocess (@) {
 	# register a dependency.
 	add_depends($params{page}, $params{pages});
 	
-	my %broken;
-	foreach my $page (pagespec_match_list([keys %links],
-			$params{pages}, location => $params{page})) {
-		my %seen;
-		foreach my $link (@{$links{$page}}) {
-			next if $seen{$link};
-			$seen{$link}=1;
-			next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion};
-			my $bestlink=bestlink($page, $link);
-			next if length $bestlink;
-			push @{$broken{$link}}, $page;
+	my @broken;
+	foreach my $link (keys %IkiWiki::brokenlinks) {
+		next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion};
+
+		my @pages;
+		foreach my $page (@{$IkiWiki::brokenlinks{$link}}) {
+			push @pages, $page
+				if pagespec_match($page, $params{pages}, location => $params{page});
 		}
-	}
+		next unless @pages;
 
-	my @broken;
-	foreach my $link (keys %broken) {
-		my $page=$broken{$link}->[0];
+		my $page=$IkiWiki::brokenlinks{$link}->[0];
 		push @broken, sprintf(gettext("%s from %s"),
 			htmllink($page, $params{destpage}, $link, noimageinline => 1),
 			join(", ", map {
 				htmllink($params{page}, $params{destpage}, $_, 	noimageinline => 1)
-			} @{$broken{$link}}));
+			} @pages)
+		);
 	}
 	
-	return gettext("There are no broken links!") unless %broken;
+	return gettext("There are no broken links!") unless @broken;
 	return "<ul>\n"
 		.join("\n",
 			map {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d5e81f1b9..578142d2e 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -8,26 +8,31 @@ use IkiWiki;
 use Encode;
 
 my %backlinks;
-my $backlinks_calculated=0;
+our %brokenlinks;
+my $links_calculated=0;
 
-sub calculate_backlinks () {
-	return if $backlinks_calculated;
-	%backlinks=();
+sub calculate_links () {
+	return if $links_calculated;
+	%backlinks=%brokenlinks=();
 	foreach my $page (keys %links) {
 		foreach my $link (@{$links{$page}}) {
 			my $bestlink=bestlink($page, $link);
-			if (length $bestlink && $bestlink ne $page) {
-				$backlinks{$bestlink}{$page}=1;
+			if (length $bestlink) {
+				$backlinks{$bestlink}{$page}=1
+					if $bestlink ne $page;
+			}
+			else {
+				push @{$brokenlinks{$link}}, $page;
 			}
 		}
 	}
-	$backlinks_calculated=1;
+	$links_calculated=1;
 }
 
 sub backlink_pages ($) {
 	my $page=shift;
 
-	calculate_backlinks();
+	calculate_links();
 
 	return keys %{$backlinks{$page}};
 }
@@ -416,7 +421,7 @@ sub refresh () {
 		debug(sprintf(gettext("scanning %s"), $file));
 		scan($file);
 	}
-	calculate_backlinks();
+	calculate_links();
 	foreach my $file (@needsbuild) {
 		debug(sprintf(gettext("building %s"), $file));
 		render($file);
diff --git a/debian/changelog b/debian/changelog
index 5e5149927..147d279bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
   * inline: Avoid use of my $_ as it fails with older perls.
     Closes: #541215
   * Add discussionpage configuration setting.
-  * Small optimisations.
+  * Several optimisations, including speedups to orphans and brokenlinks
+    calculation.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
-- 
cgit v1.2.3


From 4bf7c24451f8a1c434851a98ca78a7d5dcba8461 Mon Sep 17 00:00:00 2001
From: "62.147.182.222" <62.147.182.222@web>
Date: Fri, 14 Aug 2009 07:42:28 -0400
Subject: poll vote (Accept only password logins)

---
 doc/news/openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 7a6f84518..79eeaec01 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 63 "Accept only OpenID for logins" 19 "Accept only password logins" 36 "Accept both"]]
+[[!poll 63 "Accept only OpenID for logins" 20 "Accept only password logins" 36 "Accept both"]]
-- 
cgit v1.2.3


From 110d6e18b438809b53f5a2a12d81659247079464 Mon Sep 17 00:00:00 2001
From: lludwig <lludwig@web>
Date: Fri, 14 Aug 2009 09:49:49 -0400
Subject:

---
 doc/forum/google_openid_broken__63__.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 890bba4d9..e0b24eab9 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -8,3 +8,7 @@ Any idea how to fix this??
 > and it's not clear to me that they intend regular openid to work at all.
 > What is your google openid URL so I can take a look at the data they are
 > providing? --[[Joey]] 
+
+
+http://openid-provider.appspot.com/larrylud
+
-- 
cgit v1.2.3


From cfdabf348db8f8ba75aac39678b060b39824db08 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 14 Aug 2009 15:09:01 -0400
Subject: forwarded upstream with analysis

---
 doc/forum/google_openid_broken__63__.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index e0b24eab9..0e0d8d118 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -12,3 +12,7 @@ Any idea how to fix this??
 
 http://openid-provider.appspot.com/larrylud
 
+> I've debugged this some and filed
+> <https://rt.cpan.org/Ticket/Display.html?id=48728> on the Openid perl
+> module. It's a pretty easy fix, so I hope upstream will fix it quickly.
+> --[[Joey]] 
-- 
cgit v1.2.3


From 68d9d7d7cb0063209db07da13bc78a1bd0fd37b6 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 14 Aug 2009 17:43:12 -0400
Subject: switched my DreamHost install to pkgsrc, happily

---
 doc/tips/DreamHost/discussion.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/tips/DreamHost/discussion.mdwn b/doc/tips/DreamHost/discussion.mdwn
index 74f48938e..258d385ae 100644
--- a/doc/tips/DreamHost/discussion.mdwn
+++ b/doc/tips/DreamHost/discussion.mdwn
@@ -3,3 +3,16 @@ I managed to install ikiwiki on eggplant farms, with most basic features except
 I think ikiwiki is more suitable for VPS/dedicated server. Shared hosting doesn't fit.
 
 I just (2009/04/27) installed ikiwiki on DreamHost and the CPAN instructions here are unnecessarily complicated. I used "cpan" instead of "perl -MCPAN -e shell" and had no trouble with  that portion of the install. --[[schmonz]]
+
+After tiring of managing things by hand, I've switched to using
+pkgsrc as an unprivileged user. This uses a bit more disk for my
+own copies of perl, python, etc., but in exchange I can `cd
+.../pkgsrc/www/ikiwiki && make install` and everything just works.
+Plus I get all the benefits of a package system, like easy uninstalling
+and being notified of outdated or insecure software.
+
+The only catch: sometimes the package dependency tree gets too deep
+for DreamHost's user process limit, resulting in build death. I
+work around this by resuming the build partway down the tree, then
+trying again from whatever I was actually trying to install.
+--[[schmonz]]
-- 
cgit v1.2.3


From 3e086c84a2f826c77322a5dabdff1277eeb7152c Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Fri, 14 Aug 2009 19:10:57 -0400
Subject: Related comments on openid redirection.

---
 doc/forum/google_openid_broken__63__.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 0e0d8d118..1be9d0487 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -16,3 +16,15 @@ http://openid-provider.appspot.com/larrylud
 > <https://rt.cpan.org/Ticket/Display.html?id=48728> on the Openid perl
 > module. It's a pretty easy fix, so I hope upstream will fix it quickly.
 > --[[Joey]] 
+
+>> A little more information here:  I'm using that same openid provider at the moment.  Note that
+>> that provider isn't google - it is someone using the google API to authenticate.  I normally have it
+>> set up as a redirect from my home page (which means I can change providers easily).
+
+    <link rel="openid.server" href="http://openid-provider.appspot.com/will.uther">
+    <link rel="openid.delegate" href="http://openid-provider.appspot.com/will.uther">
+
+>> In that mode it works (I used it to log in to make this edit).  However, when I try the openid
+>> URL directly, it doesn't work.  I think there is something weird with re-direction.  I hope this
+>> isn't a more general security hole.
+>> -- [[Will]]
-- 
cgit v1.2.3


From 1f64181f90a10b28fce3f2166b763a3333375ac9 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Fri, 14 Aug 2009 21:43:47 -0400
Subject: new dependency added

---
 doc/bugs/po_plugin_adds_new_dependency.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/bugs/po_plugin_adds_new_dependency.mdwn

diff --git a/doc/bugs/po_plugin_adds_new_dependency.mdwn b/doc/bugs/po_plugin_adds_new_dependency.mdwn
new file mode 100644
index 000000000..880b491cf
--- /dev/null
+++ b/doc/bugs/po_plugin_adds_new_dependency.mdwn
@@ -0,0 +1,10 @@
+Was it intended that the po plugin add a new dependency?
+
+    PERL5LIB=.. ./po2wiki underlay.setup
+    Failed to load plugin IkiWiki::Plugin::po: Can't locate Locale/Po4a/Common.pm in @INC (@INC contains: .. /Library/Perl/Updates/5.8.8 /System/Library/Perl/5.8.8/darwin-thread-multi-2level /System/Library/Perl/5.8.8 /Library/Perl/5.8.8/darwin-thread-multi-2level /Library/Perl/5.8.8 /Library/Perl /Network/Library/Perl/5.8.8/darwin-thread-multi-2level /Network/Library/Perl/5.8.8 /Network/Library/Perl /System/Library/Perl/Extras/5.8.8/darwin-thread-multi-2level /System/Library/Perl/Extras/5.8.8 /Library/Perl/5.8.6 /Library/Perl/5.8.1 /sw/lib/perl5/5.8.8/darwin-thread-multi-2level /sw/lib/perl5/5.8.8 /sw/lib/perl5/darwin-thread-multi-2level /sw/lib/perl5 /sw/lib/perl5/darwin /usr/local/lib/perl5/site_perl/5.8.8/darwin-thread-multi-2level /usr/local/lib/perl5/site_perl/5.8.8 /usr/local/lib/perl5/site_perl .) at ../IkiWiki/Plugin/po.pm line 13.
+    BEGIN failed--compilation aborted at ../IkiWiki/Plugin/po.pm line 13.
+    Compilation failed in require at (eval 27) line 2.
+    BEGIN failed--compilation aborted at (eval 27) line 2.
+    
+    make[1]: *** [po2wiki_stamp] Error 2
+    make: *** [extra_build] Error 2
-- 
cgit v1.2.3


From fdf30251334bfff4b03ed1bbdd85a8fd016e75a8 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Fri, 14 Aug 2009 22:21:04 -0400
Subject:

---
 doc/bugs/po_plugin_adds_new_dependency.mdwn | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/doc/bugs/po_plugin_adds_new_dependency.mdwn b/doc/bugs/po_plugin_adds_new_dependency.mdwn
index 880b491cf..3da326f48 100644
--- a/doc/bugs/po_plugin_adds_new_dependency.mdwn
+++ b/doc/bugs/po_plugin_adds_new_dependency.mdwn
@@ -8,3 +8,28 @@ Was it intended that the po plugin add a new dependency?
     
     make[1]: *** [po2wiki_stamp] Error 2
     make: *** [extra_build] Error 2
+
+And it looks like this dependency is not easy to work around.  The issue is that the newly translated base wiki means that the po plugin is being used by the build system.  It is no longer optional.  I've turned it off in my workspace like this: (heavy handed, but it lets me keep going until a proper fix is available)
+
+    diff --git a/Makefile.PL b/Makefile.PL
+    index 602d8fb..68728b7 100755
+    --- a/Makefile.PL
+    +++ b/Makefile.PL
+    @@ -42,7 +42,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki
+     	./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
+     	./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
+     	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
+    -	$(MAKE) -C po
+    +	# $(MAKE) -C po
+     	
+     docwiki: ikiwiki.out
+     	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
+    @@ -114,7 +114,7 @@ extra_install: underlay_install
+     	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
+     	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
+     
+    -	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
+    +	# $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
+     	
+     	# These might fail if a regular user is installing into a home
+     	# directory.
-- 
cgit v1.2.3


From e0bb9675ce349c02fce1e835b5aaa6601d4254d2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Jun 2009 15:34:48 +0100
Subject: img: depend on absolute page name, not relative

Previously, [[!img bar.jpg]] on foo, where foo/bar.jpg exists, would
get a dependency equivalent to "glob(bar.jpg)" (which might not match
anything), rather than the correct "glob(foo/bar.jpg)".
(cherry picked from commit 85b2ec49ecd12dd23e5c432933457a72744ce7cb)
---
 IkiWiki/Plugin/img.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 68b001671..5f97e3810 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -135,11 +135,15 @@ sub preprocess (@) {
 	elsif ($params{link} =~ /^\w+:\/\//) {
 		$imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
 	}
-	elsif (length bestlink($params{page}, $params{link})) {
-		add_depends($params{page}, $params{link});
-		$imgtag=htmllink($params{page}, $params{destpage},
-			$params{link}, linktext => $imgtag,
-			noimageinline => 1);
+	else {
+		my $b = bestlink($params{page}, $params{link});
+	
+		if (length $b) {
+			add_depends($params{page}, $b);
+			$imgtag=htmllink($params{page}, $params{destpage},
+				$params{link}, linktext => $imgtag,
+				noimageinline => 1);
+		}
 	}
 
 	if (exists $params{caption}) {
-- 
cgit v1.2.3


From 97e9d99358a04ef0623e57e82e6a61d42b3f2a99 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Jun 2009 15:32:55 +0100
Subject: meta: depend on absolute page name, not relative

Previously, [[!meta redir="foo"]] on bar, where bar/foo exists, would
depend on "foo" (which matches nothing, probably) rather than "bar/foo".
(cherry picked from commit f27ec09b72f886415e63fe394e18d9c3cb3913bf)
---
 IkiWiki/Plugin/meta.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index b2295923e..514b09369 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -191,11 +191,11 @@ sub preprocess (@) {
 		if ($value !~ /^\w+:\/\//) {
 			my ($redir_page, $redir_anchor) = split /\#/, $value;
 
-			add_depends($page, $redir_page);
 			my $link=bestlink($page, $redir_page);
 			if (! length $link) {
 				error gettext("redir page not found")
 			}
+			add_depends($page, $link);
 
 			$value=urlto($link, $page);
 			$value.='#'.$redir_anchor if defined $redir_anchor;
-- 
cgit v1.2.3


From 6a2f3ef4bd0649608592331ae52ca6895abdd2c4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 13:58:04 -0400
Subject: indentation

---
 IkiWiki/Plugin/calendar.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index fe4b16072..c25893f72 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -211,8 +211,8 @@ EOF
 	# matching the pagespec are added or removed.
 	add_depends($params{page}, $params{pages});
 	# Explicitly add all currently linked pages as dependencies, so
-        # that if they are removed, the calendar will be sure to be updated.
-        add_depends($params{page}, join(" or ", @list));
+	# that if they are removed, the calendar will be sure to be updated.
+	add_depends($params{page}, join(" or ", @list));
 
 	return $calendar;
 }
-- 
cgit v1.2.3


From c258160725a79953f28f799b31959b73e4beac77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 13:59:04 -0400
Subject: review of ready branch

---
 debian/changelog                        |  1 +
 doc/todo/should_optimise_pagespecs.mdwn | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 147d279bb..5bef06aec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
   * Add discussionpage configuration setting.
   * Several optimisations, including speedups to orphans and brokenlinks
     calculation.
+  * meta, img: Fix bugs in dependency code. (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 3ccef62fe..1919e3584 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -105,4 +105,33 @@ I can think about reducung the size of my wiki source and making it available on
 >>>>> ikiwiki-transition, but that copy doesn't have to be optimal or support
 >>>>> future features like [[tracking_bugs_with_dependencies]]). --[[smcv]]
 
+---
+
+Some questions on your optimize-depends branch. --[[Joey]]
+
+In saveindex it still or'd together the depends list, but the `{depends}`
+field seems only useful for backwards compatability (ie, ikiwiki-transition
+uses it still), and otherwise just bloats the index.
+
+Is an array the right data structure? `add_depends` has to loop through the
+array to avoid dups, it would be better if a hash were used there. Since
+inline (and other plugins) explicitly add all linked pages, each as a
+separate item, the list can get rather long, and that single add_depends
+loop has suddenly become O(N^2) to the number of pages, which is something
+to avoid..
+
+Also, since a lot of places are calling add_depends in a loop, it probably
+makes sense to just make it accept a list of dependencies to add. It'll be
+marginally faster, probably, and should allow for better optimisation
+when adding a lot of depends at once.
+
+In Render.pm, we now have a triply nested loop, which is a bit
+scary for efficiency. It seems there should be a way to
+rework this code so it can use the optimised `pagespec_match_list`,
+and/or hoist some of the inner loop calculations (like the `pagename`)
+out.
+
+Very good catch on img/meta using the wrong dependency; verified in the wild!
+(I've cherry-picked those bug fixes.)
+
 [[!tag wishlist patch patch/core]]
-- 
cgit v1.2.3


From 04760df3813a1b44043176e95bcd3eae6ba0507c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 14:10:39 -0400
Subject: Allow building ikiwiki on systems w/o po4a -- building of the
 translated underlays will be skipped in this case.

---
 debian/changelog                            |   2 +
 doc/bugs/po_plugin_adds_new_dependency.mdwn |   3 +
 po/Makefile                                 |   7 +-
 po/bg.po                                    | 129 ++++++++++++++-------------
 po/cs.po                                    | 129 ++++++++++++++-------------
 po/da.po                                    | 129 ++++++++++++++-------------
 po/de.po                                    | 129 ++++++++++++++-------------
 po/es.po                                    | 131 ++++++++++++++--------------
 po/fr.po                                    | 129 ++++++++++++++-------------
 po/gu.po                                    | 129 ++++++++++++++-------------
 po/ikiwiki.pot                              | 126 +++++++++++++-------------
 po/pl.po                                    | 129 ++++++++++++++-------------
 po/sv.po                                    | 129 ++++++++++++++-------------
 po/vi.po                                    | 129 ++++++++++++++-------------
 14 files changed, 712 insertions(+), 718 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5bef06aec..39ff60717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
   * Several optimisations, including speedups to orphans and brokenlinks
     calculation.
   * meta, img: Fix bugs in dependency code. (smcv)
+  * Allow building ikiwiki on systems w/o po4a --
+    building of the translated underlays will be skipped in this case.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/doc/bugs/po_plugin_adds_new_dependency.mdwn b/doc/bugs/po_plugin_adds_new_dependency.mdwn
index 3da326f48..3ddcc30f2 100644
--- a/doc/bugs/po_plugin_adds_new_dependency.mdwn
+++ b/doc/bugs/po_plugin_adds_new_dependency.mdwn
@@ -1,5 +1,8 @@
 Was it intended that the po plugin add a new dependency?
 
+> Yes; see debian/control Build-Depends. However, I have made it disable
+> building that is po4a is not available. [[done]] --[[Joey]] 
+
     PERL5LIB=.. ./po2wiki underlay.setup
     Failed to load plugin IkiWiki::Plugin::po: Can't locate Locale/Po4a/Common.pm in @INC (@INC contains: .. /Library/Perl/Updates/5.8.8 /System/Library/Perl/5.8.8/darwin-thread-multi-2level /System/Library/Perl/5.8.8 /Library/Perl/5.8.8/darwin-thread-multi-2level /Library/Perl/5.8.8 /Library/Perl /Network/Library/Perl/5.8.8/darwin-thread-multi-2level /Network/Library/Perl/5.8.8 /Network/Library/Perl /System/Library/Perl/Extras/5.8.8/darwin-thread-multi-2level /System/Library/Perl/Extras/5.8.8 /Library/Perl/5.8.6 /Library/Perl/5.8.1 /sw/lib/perl5/5.8.8/darwin-thread-multi-2level /sw/lib/perl5/5.8.8 /sw/lib/perl5/darwin-thread-multi-2level /sw/lib/perl5 /sw/lib/perl5/darwin /usr/local/lib/perl5/site_perl/5.8.8/darwin-thread-multi-2level /usr/local/lib/perl5/site_perl/5.8.8 /usr/local/lib/perl5/site_perl .) at ../IkiWiki/Plugin/po.pm line 13.
     BEGIN failed--compilation aborted at ../IkiWiki/Plugin/po.pm line 13.
diff --git a/po/Makefile b/po/Makefile
index d67c3a4ff..d094733b1 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -5,7 +5,10 @@ POTFILES=$(sort $(shell find ../IkiWiki -type f -name \*.pm)) \
 POFILES=$(wildcard *.po)
 MOFILES=$(POFILES:.po=.mo)
 
-all: ikiwiki.pot mo ../underlays/locale
+# Translated underlays can only be generated if po4a is available.
+TRANSLATED_UNDERLAYS=$(shell if perl -e 'use Locale::Po4a::Common' 2>/dev/null; then echo ../underlays/locale; fi)
+
+all: ikiwiki.pot mo $(TRANSLATED_UNDERLAYS)
 
 mo: $(MOFILES)
 
@@ -83,7 +86,7 @@ underlays: ../ikiwiki.out underlays_copy_stamp
 ../Makefile: ../Makefile.PL
 	cd .. && ./Makefile.PL
 
-../underlays/locale: po2wiki_stamp
+$(TRANSLATED_UNDERLAYS): po2wiki_stamp
 po2wiki_stamp: po2wiki underlays_copy_stamp
 	PERL5LIB=.. ./po2wiki underlay.setup
 	touch $@
diff --git a/po/bg.po b/po/bg.po
index 8ffbf26a4..d29f81723 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "Грешка"
 
@@ -188,20 +188,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "Дискусия"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "Няма „счупени” връзки!"
 
@@ -296,14 +288,14 @@ msgstr "премахване на старата страница „%s”"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
@@ -371,7 +363,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -447,30 +439,30 @@ msgstr "шаблонът „%s” не е намерен"
 msgid "missing pages parameter"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
@@ -501,7 +493,7 @@ msgstr ""
 msgid "stylesheet not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 #, fuzzy
 msgid "redir page not found"
 msgstr "шаблонът „%s” не е намерен"
@@ -535,7 +527,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "Получаване на OpenID номер"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Всички страници имат връзки от други страници."
@@ -595,103 +587,103 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr "дискусия"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1043,54 +1035,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1169,31 +1161,35 @@ msgstr "обновяване на уики..."
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Дискусия"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
@@ -1218,6 +1214,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "дискусия"
+
 #~ msgid "rendering %s"
 #~ msgstr "обновяване на страницата „%s”"
 
diff --git a/po/cs.po b/po/cs.po
index e377b0cf2..657d2852c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2007-05-09 21:21+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -53,7 +53,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "Chyba"
 
@@ -185,20 +185,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "Diskuse"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "Žádné porušené odkazy!"
 
@@ -293,14 +285,14 @@ msgstr "odstraňuji starou stránku %s"
 msgid "%s is not an editable page"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
@@ -368,7 +360,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -441,30 +433,30 @@ msgstr "zdroj nebyl nalezen"
 msgid "missing pages parameter"
 msgstr "chybí parametr %s"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr "Přidat nový příspěvek nazvaný:"
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "neexistující šablona %s"
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
@@ -491,7 +483,7 @@ msgstr ""
 msgid "stylesheet not found"
 msgstr "styl nebyl nalezen"
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 #, fuzzy
 msgid "redir page not found"
 msgstr "zdroj nebyl nalezen"
@@ -525,7 +517,7 @@ msgstr "Přihlásit pomocí"
 msgid "Get an OpenID"
 msgstr "Získat OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Na každou stránku vede odkaz z jiné stránky."
@@ -585,103 +577,103 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr "diskuse"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "upravuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "nelze zapsat %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 #, fuzzy
 msgid "failed to translate"
 msgstr "nepodařilo se spustit dot"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "nelze číst %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1029,54 +1021,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "zpracovávám %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "zpracovávám %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "odstraňuji %s, již není zpracovávána %s"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze zpracovat %s"
@@ -1155,29 +1147,33 @@ msgstr "znovu vytvářím wiki..."
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Diskuse"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "nemohu číst %s: %s"
@@ -1202,6 +1198,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "diskuse"
+
 #~ msgid "rendering %s"
 #~ msgstr "zpracovávám %s"
 
diff --git a/po/da.po b/po/da.po
index 9ced576d8..b4e06535b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "Fejl"
 
@@ -193,20 +193,12 @@ msgstr ""
 "Beklager, men det ligner spam til <a href=\"http://blogspam.net/\">blogspam</"
 "a>: "
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "Diskussion"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr "%s fra %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
@@ -301,14 +293,14 @@ msgstr "fjerner gammelt smugkig %s"
 msgid "%s is not an editable page"
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "redigerer %s"
@@ -372,7 +364,7 @@ msgstr "du kan ikke påvirke en fil med modus %s"
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -444,30 +436,30 @@ msgstr "sideredigering er ikke tilladt"
 msgid "missing pages parameter"
 msgstr "mangler pages-parametren"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally krævet for title_natural sortering"
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr "Tilføj nyt indlæg med følgende titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "ikke-eksisterende skabelon: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 
@@ -496,7 +488,7 @@ msgstr ""
 msgid "stylesheet not found"
 msgstr "stilsnit (stylesheet) ikke fundet"
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 msgid "redir page not found"
 msgstr "henvisningsside ikke fundet"
 
@@ -528,7 +520,7 @@ msgstr "Log på med"
 msgid "Get an OpenID"
 msgstr "Skaf en OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 msgid "All pages have other pages linking to them."
 msgstr "Alle sider har henvisninger fra andre sider."
 
@@ -587,12 +579,16 @@ msgstr "ignorerer ping-direktiv for wiki %s (denne wiki er %s)"
 msgid "LWP not found, not pinging"
 msgstr "LWP ikke fundet, pinger ikke"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -600,7 +596,7 @@ msgstr ""
 "%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -608,25 +604,21 @@ msgstr ""
 "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr "diskussion"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -634,7 +626,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -642,55 +634,55 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, perl-format
 msgid "failed to read %s"
 msgstr "læsning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -1034,7 +1026,7 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1043,47 +1035,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "gennemlæser %s"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1162,30 +1154,34 @@ msgstr "genopbygger wiki..."
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Diskussion"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
@@ -1209,3 +1205,6 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er webserverens domænenavn?"
+
+#~ msgid "discussion"
+#~ msgstr "diskussion"
diff --git a/po/de.po b/po/de.po
index 83a70bd9c..51c1b0fca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "Fehler"
 
@@ -190,20 +190,12 @@ msgstr ""
 "Entschuldigung, aber <a href=\"http://blogspam.net/\">blogspam</a> stuft das "
 "als Spam ein: "
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "Diskussion"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "Es gibt keine ungültigen Verweise!"
 
@@ -299,14 +291,14 @@ msgstr "entferne alte Vorschau %s"
 msgid "%s is not an editable page"
 msgstr "Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "erstelle %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "bearbeite %s"
@@ -370,7 +362,7 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -444,30 +436,30 @@ msgstr "bearbeiten der Seiten nicht erlaubt"
 msgid "missing pages parameter"
 msgstr "fehlender Seitenparameter"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally wird benötigt für title_natural sort"
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "nicht-vorhandene Vorlage %s"
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
@@ -497,7 +489,7 @@ msgstr ""
 msgid "stylesheet not found"
 msgstr "Stylesheet nicht gefunden"
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 msgid "redir page not found"
 msgstr "Umleitungsseite nicht gefunden"
 
@@ -529,7 +521,7 @@ msgstr "Anmelden mit"
 msgid "Get an OpenID"
 msgstr "Eine OpenID anfordern"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite."
@@ -590,12 +582,16 @@ msgstr "Ignoriere die ping Anweisung für das Wiki %s (dieses Wiki ist %s)"
 msgid "LWP not found, not pinging"
 msgstr "LWP nicht gefunden, führe Ping nicht aus"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist keine gültige Sprachkodierung"
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -603,7 +599,7 @@ msgstr ""
 "%s ist kein gültiger Wert für po_link_to, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -611,25 +607,21 @@ msgstr ""
 "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr "Diskussion"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -637,7 +629,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -645,55 +637,55 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, perl-format
 msgid "failed to read %s"
 msgstr "lesen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -1043,7 +1035,7 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1052,47 +1044,47 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "durchsuche %s"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1174,32 +1166,36 @@ msgstr "erzeuge Wiki neu.."
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Diskussion"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
@@ -1223,3 +1219,6 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?"
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
+
+#~ msgid "discussion"
+#~ msgstr "Diskussion"
diff --git a/po/es.po b/po/es.po
index 65ad72140..77f1cea6e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "Error"
 
@@ -195,20 +195,12 @@ msgstr ""
 "Lo siento, pero el analizador <a href=\"http://blospam.net\">blogspam</a> "
 "dice que el texto puede ser spam."
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "Comentarios"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr "%s desde la página %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "¡ No hay enlaces rotos !"
 
@@ -303,14 +295,14 @@ msgstr "eliminando la antigua previsualización %s"
 msgid "%s is not an editable page"
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
@@ -374,7 +366,7 @@ msgstr "no puede actuar sobre un archivo con permisos %s"
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -449,32 +441,32 @@ msgstr "no está permitida la modificación de páginas"
 msgid "missing pages parameter"
 msgstr "falta el parámetro pages"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 "Se necesita el módulo Sort::Naturally para el tipo de ordenación "
 "title_natural"
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr "Añadir una entrada nueva titulada:"
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "la plantilla %s no existe "
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
@@ -503,7 +495,7 @@ msgstr ""
 msgid "stylesheet not found"
 msgstr "hoja de estilo no encontrada "
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 msgid "redir page not found"
 msgstr "falta la página a donde redirigir"
 
@@ -535,7 +527,7 @@ msgstr "Identificarse mediante "
 msgid "Get an OpenID"
 msgstr "Consiga un identificador OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Todas las páginas están referenciadas entre sí."
@@ -598,104 +590,103 @@ msgstr "Ignorando directiva 'ping' para el wiki %s (este wiki es %s)"
 msgid "LWP not found, not pinging"
 msgstr "No he encontrado el componente LWP, no envío señal alguna"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:282
-#, fuzzy
-msgid "discussion"
-msgstr "Comentarios"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "no puedo leer de %s: %s "
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1044,7 +1035,7 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1053,49 +1044,49 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1176,33 +1167,37 @@ msgstr "reconstruyendo el wiki.."
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Comentarios"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
@@ -1230,6 +1225,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#, fuzzy
+#~ msgid "discussion"
+#~ msgstr "Comentarios"
+
 #~ msgid "rendering %s"
 #~ msgstr "convirtiendo %s"
 
diff --git a/po/fr.po b/po/fr.po
index a27420254..c151bcf68 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2009-06-29 16:42+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "Erreur"
 
@@ -191,20 +191,12 @@ msgstr ""
 "Désolé, mais ceci ressemble à un spam à destination de <a href=\"http://"
 "blogspam.net/\">blogspam</a>: "
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "Discussion"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr "%s sur %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "Aucun lien cassé !"
 
@@ -299,14 +291,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s"
 msgid "%s is not an editable page"
 msgstr "%s n'est pas une page éditable"
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "Édition de %s"
@@ -370,7 +362,7 @@ msgstr "Vous ne pouvez modifier un fichier dont le mode est %s"
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -444,30 +436,30 @@ msgstr "Modification de page interdite"
 msgid "missing pages parameter"
 msgstr "Paramètre « pages » manquant"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "Le modèle de page %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -495,7 +487,7 @@ msgstr ""
 msgid "stylesheet not found"
 msgstr "Feuille de style introuvable "
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 msgid "redir page not found"
 msgstr "Page de redirection introuvable"
 
@@ -527,7 +519,7 @@ msgstr "S'identifier en tant que"
 msgid "Get an OpenID"
 msgstr "Obtenir un compte OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Toutes les pages sont liées à d'autres pages."
@@ -590,103 +582,103 @@ msgstr "Les instructions du wiki %s sont ignorées (ce wiki est %s)"
 msgid "LWP not found, not pinging"
 msgstr "LWP est introuvable. Pas de réponse au ping"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un fichier"
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr "Discussion"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "va envoyer un ping à %s"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "La page %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Échec de la compilation de %s"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "Échec de la compilation de %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Échec de la compilation de %s"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 #, fuzzy
 msgid "failed to translate"
 msgstr "Échec du lancement de dot"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "Échec de la lecture de %s : %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1035,7 +1027,7 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1044,47 +1036,47 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1168,30 +1160,34 @@ msgstr "Reconstruction du wiki..."
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Discussion"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de pré traitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
@@ -1217,6 +1213,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "discussion"
+#~ msgstr "Discussion"
+
 #~ msgid "rendering %s"
 #~ msgstr "Reconstruction de %s"
 
diff --git a/po/gu.po b/po/gu.po
index ce76f8612..d7e6eaa6a 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -186,20 +186,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "ચર્ચા"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "અહીં કોઇ તૂટેલ કડી નથી!"
 
@@ -294,14 +286,14 @@ msgstr "જુનાં પાનાં દૂર કરે છે %s"
 msgid "%s is not an editable page"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
@@ -369,7 +361,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -442,30 +434,30 @@ msgstr "ફીડ મળ્યું નહી"
 msgid "missing pages parameter"
 msgstr "ખોવાયેલ %s વિકલ્પ"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:"
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
@@ -491,7 +483,7 @@ msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bi
 msgid "stylesheet not found"
 msgstr "સ્ટાઇલશીટ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 #, fuzzy
 msgid "redir page not found"
 msgstr "ફીડ મળ્યું નહી"
@@ -525,7 +517,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "ઓપનઆઇડી મેળવો"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે."
@@ -585,103 +577,103 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr "ચર્ચા"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1029,54 +1021,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1155,29 +1147,33 @@ msgstr "વીકી ફરીથી બનાવે છે.."
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "ચર્ચા"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
@@ -1202,6 +1198,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "ચર્ચા"
+
 #~ msgid "rendering %s"
 #~ msgstr "રેન્ડર કરે છે %s"
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 8ba10ecbb..a9c0fbb99 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr ""
 
@@ -183,20 +183,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr ""
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr ""
 
@@ -291,14 +283,14 @@ msgstr ""
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -361,7 +353,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -431,30 +423,30 @@ msgstr ""
 msgid "missing pages parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -480,7 +472,7 @@ msgstr ""
 msgid "stylesheet not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 msgid "redir page not found"
 msgstr ""
 
@@ -512,7 +504,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr ""
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 msgid "All pages have other pages linking to them."
 msgstr ""
 
@@ -570,102 +562,102 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, perl-format
 msgid "failed to read %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1004,54 +996,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1130,29 +1122,33 @@ msgstr ""
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr ""
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 3e8d08523..6ecda8d88 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "Błąd"
 
@@ -190,20 +190,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "Dyskusja"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "Wszystkie odnośniki są aktualne!"
 
@@ -298,14 +290,14 @@ msgstr "usuwanie starej strony %s"
 msgid "%s is not an editable page"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "edycja %s"
@@ -373,7 +365,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -449,30 +441,30 @@ msgstr "nieznaleziony kanał RSS"
 msgid "missing pages parameter"
 msgstr "brakujący parametr %s"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr "Tytuł nowego wpisu"
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "brakujący szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
@@ -504,7 +496,7 @@ msgstr ""
 msgid "stylesheet not found"
 msgstr "nieznaleziony szablon ze stylami CSS"
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 #, fuzzy
 msgid "redir page not found"
 msgstr "nieznaleziony kanał RSS"
@@ -538,7 +530,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "Pobierz OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Dla każdej strony istnieje odnośnik z innej strony"
@@ -598,103 +590,103 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr "dyskusja"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1051,54 +1043,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "skanowanie %s"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1177,31 +1169,35 @@ msgstr "przebudowywanie wiki..."
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Dyskusja"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
@@ -1226,6 +1222,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "dyskusja"
+
 #~ msgid "rendering %s"
 #~ msgstr "renderowanie %s"
 
diff --git a/po/sv.po b/po/sv.po
index ff8d3aa0d..075de56d0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "Fel"
 
@@ -187,20 +187,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "Diskussion"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "Det finns inga trasiga länkar!"
 
@@ -295,14 +287,14 @@ msgstr "tar bort gammal sida %s"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
@@ -370,7 +362,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -444,30 +436,30 @@ msgstr "mallen %s hittades inte"
 msgid "missing pages parameter"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
@@ -497,7 +489,7 @@ msgstr ""
 msgid "stylesheet not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 #, fuzzy
 msgid "redir page not found"
 msgstr "mallen %s hittades inte"
@@ -531,7 +523,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "Skaffa ett OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Alla sidor länkas till av andra sidor."
@@ -591,103 +583,103 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr "diskussion"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1038,54 +1030,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1164,29 +1156,33 @@ msgstr "bygger om wiki.."
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Diskussion"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
@@ -1211,6 +1207,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "diskussion"
+
 #~ msgid "rendering %s"
 #~ msgstr "ritar upp %s"
 
diff --git a/po/vi.po b/po/vi.po
index 7cf911b16..b500ed581 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:00-0400\n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
 msgid "Error"
 msgstr "Lỗi"
 
@@ -188,20 +188,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384
-#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292
-#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156
-msgid "Discussion"
-msgstr "Thảo luận"
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:48
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:55
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 
@@ -296,14 +288,14 @@ msgstr "đang gỡ bỏ trang cũ %s"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:291
+#: ../IkiWiki/Plugin/editpage.pm:292
 #, perl-format
 msgid "creating %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328
-#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382
-#: ../IkiWiki/Plugin/editpage.pm:421
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
@@ -371,7 +363,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -447,30 +439,30 @@ msgstr "không tìm thấy mẫu %s"
 msgid "missing pages parameter"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/inline.pm:192
+#: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:214
+#: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:225
+#: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:327
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:347
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:615
+#: ../IkiWiki/Plugin/inline.pm:612
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
@@ -498,7 +490,7 @@ msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (
 msgid "stylesheet not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/meta.pm:197
+#: ../IkiWiki/Plugin/meta.pm:196
 #, fuzzy
 msgid "redir page not found"
 msgstr "không tìm thấy mẫu %s"
@@ -532,7 +524,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "Lấy OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:52
+#: ../IkiWiki/Plugin/orphans.pm:45
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Mọi trang được liên kết với trang khác."
@@ -592,103 +584,103 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
-#: ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:143
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:282
-msgid "discussion"
-msgstr "thảo luận"
-
-#: ../IkiWiki/Plugin/po.pm:379
+#: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:420
+#: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:444
+#: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:464
+#: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:825
+#: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:839
+#: ../IkiWiki/Plugin/po.pm:843
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:848
+#: ../IkiWiki/Plugin/po.pm:852
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:858
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:907
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056
-#: ../IkiWiki/Plugin/po.pm:1096
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1054
+#: ../IkiWiki/Plugin/po.pm:1058
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1059
+#: ../IkiWiki/Plugin/po.pm:1063
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1039,54 +1031,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:260
+#: ../IkiWiki/Render.pm:264
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:290
+#: ../IkiWiki/Render.pm:294
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:376
+#: ../IkiWiki/Render.pm:380
 #, perl-format
 msgid "removing old page %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:416
+#: ../IkiWiki/Render.pm:421
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
-#: ../IkiWiki/Render.pm:442
+#: ../IkiWiki/Render.pm:447
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:463
+#: ../IkiWiki/Render.pm:468
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:502
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:519
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
-#: ../IkiWiki/Render.pm:538
+#: ../IkiWiki/Render.pm:543
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
@@ -1165,29 +1157,33 @@ msgstr "đang xây dựng lại wiki.."
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
-#: ../IkiWiki.pm:487
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Thảo luận"
+
+#: ../IkiWiki.pm:494
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:562
+#: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1236
+#: ../IkiWiki.pm:1243
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1776
+#: ../IkiWiki.pm:1783
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1908
+#: ../IkiWiki.pm:1915
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
@@ -1212,6 +1208,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "thảo luận"
+
 #~ msgid "rendering %s"
 #~ msgstr "đang vẽ %s"
 
-- 
cgit v1.2.3


From bd34fcd87464708afc81dd3a4d3e07e3531e7f71 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 14:26:07 -0400
Subject: reorg and cleanup

---
 doc/todo/l10n.mdwn | 61 ++++++++++++++----------------------------------------
 1 file changed, 16 insertions(+), 45 deletions(-)

diff --git a/doc/todo/l10n.mdwn b/doc/todo/l10n.mdwn
index bba103494..fed3f63b6 100644
--- a/doc/todo/l10n.mdwn
+++ b/doc/todo/l10n.mdwn
@@ -1,3 +1,19 @@
+ikiwiki should be fully internationalized.
+
+----
+
+As to the hardcoded strings in ikiwiki, I've internationalized the program,
+and there is a po/ikiwiki.pot in the source that can be translated.
+--[[Joey]]
+
+----
+
+> The now merged po plugin handles l10n of wiki pages. The only missing
+> piece now is l10n of the templates.
+> --[[Joey]]
+
+----
+
 From [[Recai]]:
 > Here is my initial work on ikiwiki l10n infrastructure (I'm sending it
 > before finalizing, there may be errors).
@@ -54,48 +70,3 @@ kullanıcının ait IP adresi: <TMPL_VAR REMOTE_ADDR>[2] <TMPL_VAR WIKIURL>
 This could be easily worked around in tmpl_process3, but I wouldn't like to
 maintain a separate utility.
 
-----
-
-As to the hardcoded strings in ikiwiki, I've internationalized the program,
-and there is a po/ikiwiki.pot in the source that can be translated.
---[[Joey]]
-
-----
-
-Danish l10n of templates and basewiki is available with the following commands:
-
-    git clone http://source.jones.dk/ikiwiki.git newsite
-    cd newsite
-    make
-
-Updates are retrieved with this single command:
-
-    make
-
-l10n is maintained using po4a for basewiki, smiley and templates - please  send me PO files if you
-translate to other languagess than the few I know about myself: <dr@jones.dk>
-
-As upstream ikiwiki is now maintained in GIT too, keeping the master mirror in sync with upstream
-could probably be automated even more - but an obstacle seems to be that content is not maintained
-separately but as an integral part of upstream source (GIT seems to not support subscribing to
-only parts of a repository).
-
-For example use, here's how to roll out a clone of the [Redpill support site](http://support.redpill.dk/):
-
-    mkdir -p ~/public_cgi/support.redpill.dk
-    git clone git://source.jones.dk/bin
-    bin/localikiwikicreatesite -o git://source.redpill.dk/support rpdemo
-
-(Redpill support is inspired by <http://help.riseup.net> but needs to be reusable for several similarly configured networks)
-
---[[JonasSmedegaard]]
-
-> I don't understand at all why you're using git the way you are.
-> 
-> I think that this needs to be reworked into a patch against the regular
-> ikiwiki tree, that adds the po4a stuff needed to generate the pot files for the
-> basewiki and template content, as well as the stuff that generates the
-> translated versions of those from the po files.
->
-> The now merged po plugin also handles some of this.
-> --[[Joey]]
-- 
cgit v1.2.3


From d13c07dec1a5516b7fa595004e16021f2a182bb6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 15:20:46 -0400
Subject: noticed a problem

---
 doc/plugins/po.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 2fbf67016..4e1bf20bb 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -277,6 +277,15 @@ That used to be so, but the bug was fixed. Does this mean
 that po might be replacing the only link on a page, in error? 
 --[[Joey]] 
 
+Name of toplevel index page
+---------------------------
+
+Normally at the top index page of a wiki, you see the wiki name at
+the top. However, at the top *translated* index page, you see something
+like "index.da".
+
+
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From e9bc2e96acd5977a35f338ddd392733aaca761f7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 15:49:07 -0400
Subject: resolve conflict

---
 doc/sandbox.mdwn | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9b0a53c68..c84d52ef2 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,15 +4,10 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 2009/7/13 Monday Blue...\\
 While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] Phpbb 與 Dokuwiki 之間的往來]] (External Link to //http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199// not working?), surf Internet for Wikis supporting //Creole V1.0//, found this site.
 
-<<<<<<< HEAD:doc/sandbox.mdwn
 * I thought that creole markup is used by ikiwiki...
 * Thought about using //SVN/CVS// server, however with different idea
 * Kinda curious why **Tcl** does not show her face in this Wiki arena
-=======
-* Thought about using //SVN/CVS// server, however with different idea
-* Kinda curious why **Tcl** does not show her face in this Wiki arena
 * It looks like that I was wrong, from Wikipedia Creole page it mention that ikiwiki is also adopting Creole markup.
->>>>>>> 55c1a37cce91d4fd01bf80fcaeeaf56535218a5c:doc/sandbox.mdwn
 
 
 --- 
-- 
cgit v1.2.3


From 1b63a0e4fae5396014ed222647ae9c3c88a35de5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 16:15:36 -0400
Subject: another problem

---
 doc/plugins/po.mdwn | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 4e1bf20bb..5016f1037 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -282,9 +282,17 @@ Name of toplevel index page
 
 Normally at the top index page of a wiki, you see the wiki name at
 the top. However, at the top *translated* index page, you see something
-like "index.da".
+like "index.da". --[[Joey]] 
 
+Pagespecs
+---------
 
+I was suprised that, when using the map directive, a pagespec of "*"
+listed all the translated pages as well as regular pages. That can 
+make a big difference to an existing wiki when po is turned on,
+and seems generally not wanted.
+(OTOH, you do want to match translated pages by
+default when locking pages.) --[[Joey]]
 
 Documentation
 -------------
-- 
cgit v1.2.3


From 54c2e05ccf8fad1e77d4ee717c48f3622f60b4e4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 16:33:54 -0400
Subject: Add basic styling of po plugin's languages list.

---
 debian/changelog | 1 +
 doc/style.css    | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 39ff60717..88fac32ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
   * meta, img: Fix bugs in dependency code. (smcv)
   * Allow building ikiwiki on systems w/o po4a --
     building of the translated underlays will be skipped in this case.
+  * Add basic styling of po plugin's languages list.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/doc/style.css b/doc/style.css
index e6512aed8..4fa48b140 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -32,6 +32,15 @@
 	border-bottom: 0;
 }
 
+#otherlanguages ul {
+	margin: 0;
+	padding: 6px;
+	list-style-type: none;
+}
+.pageheader #otherlanguages {
+	border-bottom: 1px solid #000;
+}
+
 div.inlinecontent {
 	margin-top: .4em;
 }
-- 
cgit v1.2.3


From e03155172756f5c54c180136a5982e543cacb534 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 16:42:29 -0400
Subject: update for consistency

---
 IkiWiki/Plugin/po.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index b8967058e..1bf0b72e3 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -99,7 +99,7 @@ sub getsetup () {
 			type => "string",
 			example => {
 				'fr' => 'Français',
-				'es' => 'Castellano',
+				'es' => 'Español',
 				'de' => 'Deutsch'
 			},
 			description => "slave languages (PO files)",
-- 
cgit v1.2.3


From e9d20231a0fa99fe614a43cf60c53af7a84fc795 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 17:00:16 -0400
Subject: further otherlanguages list styling

---
 doc/style.css       | 13 ++++++++-----
 templates/page.tmpl |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 4fa48b140..4770fc942 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -24,6 +24,10 @@
 	padding: 6px;
 	list-style-type: none;
 }
+.actions li {
+	display: inline;
+	padding: .2em .4em;
+}
 .pageheader .actions ul {
 	border-bottom: 1px solid #000;
 }
@@ -37,6 +41,10 @@
 	padding: 6px;
 	list-style-type: none;
 }
+#otherlanguages li {
+	display: inline;
+	padding: .2em .4em;
+}
 .pageheader #otherlanguages {
 	border-bottom: 1px solid #000;
 }
@@ -45,11 +53,6 @@ div.inlinecontent {
 	margin-top: .4em;
 }
 
-.actions li {
-	display: inline;
-	padding: .2em .4em;
-}
-
 .pagefooter {
 	clear: both;
 }
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 653179e5d..e71ba316d 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -29,7 +29,7 @@
 <span class="title">
 <TMPL_VAR TITLE>
 <TMPL_IF NAME="ISTRANSLATION">
-(<TMPL_VAR NAME="PERCENTTRANSLATED">&nbsp;%)
+&nbsp;(<TMPL_VAR NAME="PERCENTTRANSLATED">%)
 </TMPL_IF>
 </span>
 </span><!--.header-->
@@ -76,7 +76,7 @@
 <TMPL_IF NAME="MASTER">
 (master)
 <TMPL_ELSE>
-(<TMPL_VAR NAME="PERCENT">&nbsp;%)
+&nbsp;(<TMPL_VAR NAME="PERCENT">%)
 </TMPL_IF>
 </li>
 </TMPL_LOOP>
-- 
cgit v1.2.3


From 1e30be656f38b3a42a4ddd28a50d5721ad3849d5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 17:07:25 -0400
Subject: link to l10n.ikiwiki.info website

---
 doc/translation.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/translation.mdwn b/doc/translation.mdwn
index 459f47eb5..d869a6821 100644
--- a/doc/translation.mdwn
+++ b/doc/translation.mdwn
@@ -26,6 +26,10 @@ essentially three pieces needed for a complete translation:
    [[plugins/contrib/po]] ikiwiki plugin will allow translating
    wikis using po files and can be used for this.
 
+   There is now a website, [l10n.ikiwiki.info](http://l10n.ikiwiki.info)
+   that both demos the translated basewiki, and allows easy translation of
+   it.
+
    To generate the po and pot files for translating the basewiki,
    get ikiwiki's source, edit the `po/underlay.setup` file,
    adding your language. Then run 'make -C po underlays`.
-- 
cgit v1.2.3


From 43e895ec78a00a53aca31a5b38c18e8ef4ab6842 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 17:29:05 -0400
Subject: another problem

---
 doc/plugins/po.mdwn | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 5016f1037..f738d61de 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -248,7 +248,7 @@ ea753782b222bf4ba2fb4683b6363afdd9055b64, which should be reverted
 once [[intrigeri]]'s `meta` branch is merged.
 
 An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
-and `meta` branches, and thus has thise additional features.
+and `meta` branches, and thus has this additional features.
 
 Self links
 ----------
@@ -294,6 +294,18 @@ and seems generally not wanted.
 (OTOH, you do want to match translated pages by
 default when locking pages.) --[[Joey]]
 
+Edit links on untranslated pages
+--------------------------------
+
+If a page is not translated yet, the "translated" version of it
+displays wikilinks to other, existing (but not yet translated?)
+pages as edit links, as if those pages do not exist. 
+
+That's really confusing, especially as clicking such a link
+brings up an edit form to create a new, english page.
+
+This is with po_link_to=current. With default, it doesn't happen..
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From 6793d0e2f5adbc2da0ebfca1b5730e67d09e87f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 18:28:51 -0400
Subject: update

---
 po/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/Makefile b/po/Makefile
index d094733b1..dfb018c81 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -37,7 +37,7 @@ ikiwiki.pot: $(POTFILES)
 
 clean:
 	rm -f $(MOFILES) messages messages.mo *_stamp
-	rm -rf html underlays/.ikiwiki ../underlays/locale
+	rm -rf html underlays/.ikiwiki $(TRANSLATED_UNDERLAYS)
 	find underlays -name \*.mdwn -or -name \*.pot | xargs rm -f
 
 %.mo: %.po
-- 
cgit v1.2.3


From 7d901b9a5412e94ab127fcc447536e391eba0399 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 19:16:22 -0400
Subject: another problem..

---
 doc/plugins/po.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index f738d61de..f6409aae5 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -306,6 +306,20 @@ brings up an edit form to create a new, english page.
 
 This is with po_link_to=current. With default, it doesn't happen..
 
+Double commits of po files
+--------------------------
+
+When adding a new english page, the po files are created, committed,
+and then committed again. The second commit makes this change:
+
+	-"Content-Type: text/plain; charset=utf-8\n"
+	-"Content-Transfer-Encoding: ENCODING"
+	+"Content-Type: text/plain; charset=UTF-8\n"
+	+"Content-Transfer-Encoding: ENCODING\n"
+
+Same thing happens when a change to an existing page triggers a po file
+update.
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From 7ea1f9692687310fb434a7cc6e6f84b57b9f4ef8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 19:39:51 -0400
Subject: apache config details

---
 doc/plugins/po.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index f6409aae5..30f2e158e 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -114,7 +114,8 @@ Apache
 
 Using Apache `mod_negotiation` makes it really easy to have Apache
 serve any page in the client's preferred language, if available.
-This is the default Debian Apache configuration.
+
+Add 'Options MultiViews' to the wiki directory's configuration in Apache.
 
 When `usedirs` is enabled, one has to set `DirectoryIndex index` for
 the wiki context.
@@ -123,6 +124,8 @@ Setting `DefaultLanguage LL` (replace `LL` with your default MIME
 language code) for the wiki context can help to ensure
 `bla/page/index.en.html` is served as `Content-Language: LL`.
 
+For details, see [Apache's documentation](http://httpd.apache.org/docs/2.2/content-negotiation.html).
+
 lighttpd
 --------
 
-- 
cgit v1.2.3


From 0e4f67842a449d4f25b79836078a352007ea27b9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 21:00:27 -0400
Subject: update

---
 doc/plugins/po.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 30f2e158e..684593bf3 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -307,7 +307,7 @@ pages as edit links, as if those pages do not exist.
 That's really confusing, especially as clicking such a link
 brings up an edit form to create a new, english page.
 
-This is with po_link_to=current. With default, it doesn't happen..
+This is with po_link_to=current or negotiated. With default, it doesn't happen..
 
 Double commits of po files
 --------------------------
-- 
cgit v1.2.3


From 1be07eae46e4993ecfea3da750727e1ec2d4b07d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 21:08:17 -0400
Subject: replace N/A with 0

I think the N/A was not intended to be visible, but it can show up as the
percent translated to a language. This happens if the page is located in an
underlay, and not translated to the language in any other underlay.
---
 IkiWiki/Plugin/po.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 1bf0b72e3..ce32aab05 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -891,7 +891,7 @@ sub percenttranslated ($) {
 	my $page=shift;
 
 	$page=~s/^\///;
-	return gettext("N/A") unless istranslation($page);
+	return gettext("0") unless istranslation($page);
 	my $file=srcfile($pagesources{$page});
 	my $masterfile = srcfile($pagesources{masterpage($page)});
 	my %options = (
-- 
cgit v1.2.3


From 4ff3e2a540d154d49dfc70fb89dcc8422f2047e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 15 Aug 2009 22:18:05 -0400
Subject: po: Better fix for missing underlay translation problem.

If a page is taken from the underlay, and one of the specified languages
does not have po files in the underlay, it would create a broken link
to the translated version of the page for that language.

With this change, there's no broken link.
---
 IkiWiki/Plugin/po.pm | 4 ++--
 doc/plugins/po.mdwn  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index ce32aab05..aa3d72b90 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -891,7 +891,7 @@ sub percenttranslated ($) {
 	my $page=shift;
 
 	$page=~s/^\///;
-	return gettext("0") unless istranslation($page);
+	return gettext("N/A") unless istranslation($page);
 	my $file=srcfile($pagesources{$page});
 	my $masterfile = srcfile($pagesources{masterpage($page)});
 	my %options = (
@@ -934,7 +934,7 @@ sub otherlanguagesloop ($) {
 				master => 1,
 			};
 		}
-		else {
+		elsif (istranslation($otherpage)) {
 			push @ret, {
 				url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
 				code => $lang,
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 684593bf3..3766ad295 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -307,7 +307,8 @@ pages as edit links, as if those pages do not exist.
 That's really confusing, especially as clicking such a link
 brings up an edit form to create a new, english page.
 
-This is with po_link_to=current or negotiated. With default, it doesn't happen..
+This is with po_link_to=current or negotiated. With default, it doesn't
+happen.. --[[Joey]] 
 
 Double commits of po files
 --------------------------
@@ -321,7 +322,7 @@ and then committed again. The second commit makes this change:
 	+"Content-Transfer-Encoding: ENCODING\n"
 
 Same thing happens when a change to an existing page triggers a po file
-update.
+update. --[[Joey]] 
 
 Documentation
 -------------
-- 
cgit v1.2.3


From 294aa199694a602325751420650da2b533c80fbf Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sun, 16 Aug 2009 07:01:39 -0400
Subject: Fix (hopefully) grammar.

---
 doc/ikiwiki/directive/inline.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn
index 9c55e07c2..99f795972 100644
--- a/doc/ikiwiki/directive/inline.mdwn
+++ b/doc/ikiwiki/directive/inline.mdwn
@@ -56,7 +56,7 @@ directive. These are the commonly used ones:
 * `postform` - Set to "yes" to enable a form to post new pages to a
   blog.
 * `postformtext` - Set to specify text that is displayed in a postform.
-* `rootpage` - Enable the postform, and allows controling where
+* `rootpage` - Enables the postform, and allows controling where
   newly posted pages should go, by specifiying the page that
   they should be a [[SubPage]] of.
 
-- 
cgit v1.2.3


From 216f5b5b203ca3ea9ddb3f6d8c2e03dae35aeb7e Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sun, 16 Aug 2009 08:34:57 -0400
Subject: Add sentence to clarify how to get feeds for the RecentChanges page.

---
 doc/plugins/recentchanges.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn
index 4ab2cd078..9375296a4 100644
--- a/doc/plugins/recentchanges.mdwn
+++ b/doc/plugins/recentchanges.mdwn
@@ -24,3 +24,6 @@ Here's an example of how to show only changes that Joey didn't make.
 	\[[!inline pages="internal(recentchanges/change_*) and
 	!author(joey) and !author(http://joey.kitenet.net*)"
 	template=recentchanges show=0]]
+
+If you want to generate feeds for the RecentChanges page, you have to use
+[[`rss`_or_`atom`_in_the_setup_file|/todo/minor adjustment to setup documentation for recentchanges feeds]].
-- 
cgit v1.2.3


From d3ec1a3af2f9a2265336ba376f3ee7b75bb6e534 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Sun, 16 Aug 2009 09:01:12 -0400
Subject: comment on part of Joey's comment

---
 doc/todo/should_optimise_pagespecs.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 1919e3584..9d2611249 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -120,6 +120,14 @@ separate item, the list can get rather long, and that single add_depends
 loop has suddenly become O(N^2) to the number of pages, which is something
 to avoid..
 
+> I was also thinking about this (I've been playing with some stuff based on the
+> `remove-pagespec-merge` branch).  A hash, by itself, is not optimal because
+> the dependency list holds two things: page names and page specs.  The hash would
+> work well for the page names, but you'll still need to iterate through the page specs.
+> I was thinking of keeping a list and a hash.  You use the list for pagespecs
+> and the hash for individual page names.  To make this work you need to adjust the
+> API so it knows which you're adding.  -- [[Will]]
+
 Also, since a lot of places are calling add_depends in a loop, it probably
 makes sense to just make it accept a list of dependencies to add. It'll be
 marginally faster, probably, and should allow for better optimisation
-- 
cgit v1.2.3


From 56bd1735967daef3610357801232a41de7ee2cbb Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 16 Aug 2009 11:56:16 -0400
Subject: switched my DreamHost install to pkgsrc, happily

---
 doc/tips/DreamHost/discussion.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/tips/DreamHost/discussion.mdwn b/doc/tips/DreamHost/discussion.mdwn
index 74f48938e..258d385ae 100644
--- a/doc/tips/DreamHost/discussion.mdwn
+++ b/doc/tips/DreamHost/discussion.mdwn
@@ -3,3 +3,16 @@ I managed to install ikiwiki on eggplant farms, with most basic features except
 I think ikiwiki is more suitable for VPS/dedicated server. Shared hosting doesn't fit.
 
 I just (2009/04/27) installed ikiwiki on DreamHost and the CPAN instructions here are unnecessarily complicated. I used "cpan" instead of "perl -MCPAN -e shell" and had no trouble with  that portion of the install. --[[schmonz]]
+
+After tiring of managing things by hand, I've switched to using
+pkgsrc as an unprivileged user. This uses a bit more disk for my
+own copies of perl, python, etc., but in exchange I can `cd
+.../pkgsrc/www/ikiwiki && make install` and everything just works.
+Plus I get all the benefits of a package system, like easy uninstalling
+and being notified of outdated or insecure software.
+
+The only catch: sometimes the package dependency tree gets too deep
+for DreamHost's user process limit, resulting in build death. I
+work around this by resuming the build partway down the tree, then
+trying again from whatever I was actually trying to install.
+--[[schmonz]]
-- 
cgit v1.2.3


From b5576b556027e8f9b9ad52e02b383b8644adfb33 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 16 Aug 2009 11:58:28 -0400
Subject: Life is simpler on a git branch.

---
 doc/plugins/contrib/cvs.mdwn | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index f466b9399..23e00201f 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -1,14 +1,11 @@
 [[!template id=plugin name=cvs core=0 author="[[schmonz]]"]]
 
+[[!template id=gitbranch branch=schmonz author="[[schmonz]]"]]
+
 This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]].
 
-### Installation and usage
-7. Apply patches to [`IkiWiki.pm`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-IkiWiki.pm.diff)
-and [`ikiwiki-makerepo`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-ikiwiki-makerepo.diff).
-7. Rebuild and install ikiwiki.
+### Usage
 7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan IPC::Cmd]], [[!cpan String::ShellQuote]], and [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
-7. Download [`cvs.pm`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs.pm) into a suitable `$libdir/IkiWiki/Plugin`.
-7. While setting up a wiki [[by hand|setup/byhand]], also specify `--libdir` until you get to the point where you have a setup file. (This ensures the CVS plugin is found and its settings stanza included.)
 7. Adjust CVS-related parameters in your setup file.
 
 Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn't need it, but you yourself might. Here's a good general-purpose one:
@@ -20,7 +17,7 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
     rdiff -u
 
 ### Implementation details
-* Diffs are against [[3.14159|news/version_3.14159]]. `cvs.pm` started life as a copy of `svn.pm`.
+* `cvs.pm` started life as a copy of [[3.14159|news/version_3.14159]]'s `svn.pm`.
 * `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata into `$DESTDIR`.
 * [[ikiwiki-makerepo]]:
  * creates a repository,
@@ -30,7 +27,7 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
 * CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below).
 
 ### To do
-* Add automated tests. ([Blindly adding svn-like tests to `t/file_pruned.t`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-t-file_pruned.t.diff) doesn't do the trick.)
+* Add automated tests. (Blindly adding svn-like tests to `t/file_pruned.t` doesn't do the trick.)
 * If the argument to `cvs add` smells like a binary file, `cvs add -kb` it (for [[plugins/attachment]] support).
 * Don't slurp the entire `cvsps` output into memory (!).
 * Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records.
-- 
cgit v1.2.3


From 46a6e27347869f699b4cdf2dda57fd5491c98e93 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 16 Aug 2009 13:43:31 -0400
Subject: fix error message display

The gettext call can clear $@ in at least some cases.
---
 IkiWiki.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b47da966e..bac48c9a4 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1255,9 +1255,10 @@ sub preprocess ($$$;$$) {
 					);
 				};
 				if ($@) {
-					chomp $@;
+					my $error=$@;
+					chomp $error;
 				 	$ret="[[!$command <span class=\"error\">".
-						gettext("Error").": $@"."</span>]]";
+						gettext("Error").": $error"."</span>]]";
 				}
 			}
 			else {
-- 
cgit v1.2.3


From 8b99e6874353a1b981490de8d96ca1945fc0b752 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 16 Aug 2009 13:45:10 -0400
Subject: use pagespec_match_list for feedpages

This is both faster, and propigates any error in processing the feedpages
pagespec out to display on the page. Which may have been why I didn't use
it before, but currently seems like a good thing to do, since it explains
why your feeds are empty..
---
 IkiWiki/Plugin/inline.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 704fa711d..3a2f4b7bc 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -254,7 +254,7 @@ sub preprocess_inline (@) {
 	add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
 	
 	if ($feeds && exists $params{feedpages}) {
-		@feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
+		@feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
 	}
 
 	my ($feedbase, $feednum);
-- 
cgit v1.2.3


From e8fd8583408a12d670b370716f4b7627a49533e0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 16 Aug 2009 13:47:04 -0400
Subject: created_before/after: throw error if specified page does not exist

This assumes that no ctime means the page doesn't exist, which seems
reasonable.
---
 IkiWiki.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bac48c9a4..43ffb1fd8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2056,7 +2056,7 @@ sub match_created_before ($$;@) {
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$testpage has no ctime");
+		return IkiWiki::ErrorReason->new("$testpage does not exist");
 	}
 }
 
@@ -2076,7 +2076,7 @@ sub match_created_after ($$;@) {
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$testpage has no ctime");
+		return IkiWiki::ErrorReason->new("$testpage does not exist");
 	}
 }
 
-- 
cgit v1.2.3


From 5d8bfe9f3704d4cc81ee3ac312a703bb48d6f976 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 16 Aug 2009 13:49:56 -0400
Subject: changelog

---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 88fac32ee..4fcd13d5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
   * Allow building ikiwiki on systems w/o po4a --
     building of the translated underlays will be skipped in this case.
   * Add basic styling of po plugin's languages list.
+  * inline: Display an error if feedpages is specified and fails to match
+    due to a problem such as created_before being told to check against
+    a page that does not exist.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
-- 
cgit v1.2.3


From db041b8854d2d3f7137367e11e960ac4f6cdb6c5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 16 Aug 2009 13:53:44 -0400
Subject: minor problem

---
 doc/plugins/po.mdwn | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 3766ad295..3f91775f1 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -308,7 +308,19 @@ That's really confusing, especially as clicking such a link
 brings up an edit form to create a new, english page.
 
 This is with po_link_to=current or negotiated. With default, it doesn't
-happen.. --[[Joey]] 
+happen.. 
+
+Also, this may only happen if the page being linked to is coming from an
+underlay, and the underlays lack translation to a given language.
+--[[Joey]] 
+
+recentchanges links to po files
+-------------------------------
+
+When a po file is changed, the recentchanges page shows a link such as
+"sandbox.es". But, clicking on it goes to the English (or negotiated
+language) version of the page. It would be better in this one case if
+the link went direct to the translated version of the page. --[[Joey]] 
 
 Double commits of po files
 --------------------------
-- 
cgit v1.2.3


From e03d5c6a7c3f64a591ff6d639c8e4b92c11e1cec Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 16 Aug 2009 14:32:10 -0400
Subject: Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective
 pages from the basewiki.

---
 debian/changelog                                      | 2 ++
 underlays/basewiki/ikiwiki/blog.mdwn                  | 8 --------
 underlays/basewiki/ikiwiki/preprocessordirective.mdwn | 7 -------
 3 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 underlays/basewiki/ikiwiki/blog.mdwn
 delete mode 100644 underlays/basewiki/ikiwiki/preprocessordirective.mdwn

diff --git a/debian/changelog b/debian/changelog
index 4fcd13d5b..b07fe94a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
   * inline: Display an error if feedpages is specified and fails to match
     due to a problem such as created_before being told to check against
     a page that does not exist.
+  * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective
+    pages from the basewiki.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/underlays/basewiki/ikiwiki/blog.mdwn b/underlays/basewiki/ikiwiki/blog.mdwn
deleted file mode 100644
index 0a5a5247d..000000000
--- a/underlays/basewiki/ikiwiki/blog.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!meta robots="noindex, follow"]]
-
-This page has been removed from ikiwiki's basewiki. For documentation about
-creating a blog with ikiwiki, see the documentation of the
-[[!iki ikiwiki/directive/inline desc=inline]] directive.
-
-Please update your links, as this redirection page will be removed in a
-future ikiwiki release.
diff --git a/underlays/basewiki/ikiwiki/preprocessordirective.mdwn b/underlays/basewiki/ikiwiki/preprocessordirective.mdwn
deleted file mode 100644
index bd12895cc..000000000
--- a/underlays/basewiki/ikiwiki/preprocessordirective.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!meta redir=ikiwiki/directive delay=10]]
-[[!meta robots="noindex, follow"]]
-
-This page has moved to
-[[ikiwiki/directive|ikiwiki/directive]]. Please
-update your links, as this redirection page will be removed in a future
-ikiwiki release.
-- 
cgit v1.2.3


From 9ca8de2e75bc9a11b1b8547b375a887a8b1ef60b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 16 Aug 2009 14:40:40 -0400
Subject: add l10n branch

---
 doc/git.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 1cd91e532..06bccc7a3 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -33,6 +33,8 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * github `git://github.com/joeyh/ikiwiki.git`
   ([browse](http://github.com/joeyh/ikiwiki/tree/master))  
   A mirror of the main repo, automatically updated.
+* l10n `git://l10n.ikiwiki.info/`
+  Open push localization branch used for <http://l10n.ikiwiki.info/>
 * [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git`
 * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git`
 * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`
-- 
cgit v1.2.3


From 611256ba1c6f9b5cfdaabed634a1be00eb32e7a7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 16 Aug 2009 16:32:35 -0400
Subject: clarification

---
 doc/todo/should_optimise_pagespecs.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 9d2611249..33bca677a 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -128,6 +128,9 @@ to avoid..
 > and the hash for individual page names.  To make this work you need to adjust the
 > API so it knows which you're adding.  -- [[Will]]
 
+> I wasn't thinking about a lookup hash, just a dedup hash, FWIW.
+> --[[Joey]]
+
 Also, since a lot of places are calling add_depends in a loop, it probably
 makes sense to just make it accept a list of dependencies to add. It'll be
 marginally faster, probably, and should allow for better optimisation
-- 
cgit v1.2.3


From 65bf1dab5f8ce4b1d1170113e5dbb1ff50c04502 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 17 Aug 2009 12:26:51 -0400
Subject: Updated French program translation from Philippe Batailler. Closes:
 #542036

---
 debian/changelog |   2 +
 po/fr.po         | 115 +++++++++++++++++++++++++++----------------------------
 2 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b07fe94a9..ddf69f284 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
     a page that does not exist.
   * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective
     pages from the basewiki.
+  * Updated French program translation from Philippe Batailler.
+    Closes: #542036
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/po/fr.po b/po/fr.po
index c151bcf68..08ca06d0b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-15 14:07-0400\n"
-"PO-Revision-Date: 2009-06-29 16:42+0200\n"
+"PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -148,17 +148,14 @@ msgid "Must specify %s"
 msgstr "Vous devez spécifier %s"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-#, fuzzy
 msgid "Failed to create S3 bucket: "
 msgstr "Impossible de créer un compartiment S3 :"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
-#, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:243
-#, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "Échec lors de la suppression du fichier sur S3 :"
 
@@ -187,9 +184,7 @@ msgstr "Génération de l'index automatique"
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
-msgstr ""
-"Désolé, mais ceci ressemble à un spam à destination de <a href=\"http://"
-"blogspam.net/\">blogspam</a>: "
+msgstr "Désolé, mais cela ressemble à un « spam » selon les critères de <a href=\"http://blogspam.net/\">blogspam</a> : "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
@@ -338,14 +333,13 @@ msgid "The page %s does not exist."
 msgstr "La page %s n'existe pas."
 
 #: ../IkiWiki/Plugin/getsource.pm:73
-#, fuzzy
 msgid "not a page"
-msgstr "Impossible de trouver les pages %s"
+msgstr "Ce n'est pas une page."
 
 #: ../IkiWiki/Plugin/getsource.pm:75
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is an attachment, not a page."
-msgstr "%s n'est pas une page éditable"
+msgstr "%s est une pièce jointe, pas une page."
 
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
@@ -356,7 +350,7 @@ msgstr "Vous n'êtes pas autorisé à modifier %s"
 #: ../IkiWiki/Plugin/git.pm:666
 #, perl-format
 msgid "you cannot act on a file with mode %s"
-msgstr "Vous ne pouvez modifier un fichier dont le mode est %s"
+msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
 #: ../IkiWiki/Plugin/git.pm:670
 msgid "you are not allowed to change file modes"
@@ -364,13 +358,13 @@ msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
 #: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
-#, fuzzy, perl-format
+#, perl-format
 msgid "Must specify %s when using the %s plugin"
-msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « search »."
+msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s."
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"
-msgstr "Impossible d'analyser l'url, pas de nom de domaine"
+msgstr "Impossible d'analyser l'URL, pas de nom de domaine"
 
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
@@ -404,7 +398,7 @@ msgstr "Image::Magick n'est pas installé"
 #: ../IkiWiki/Plugin/img.pm:72
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
-msgstr ""
+msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)"
 
 #: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
 #: ../IkiWiki/Plugin/img.pm:104
@@ -439,7 +433,7 @@ msgstr "Paramètre « pages » manquant"
 #: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
-msgstr ""
+msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble."
 
 #: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
@@ -520,7 +514,6 @@ msgid "Get an OpenID"
 msgstr "Obtenir un compte OpenID"
 
 #: ../IkiWiki/Plugin/orphans.pm:45
-#, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Toutes les pages sont liées à d'autres pages."
 
@@ -538,9 +531,7 @@ msgstr "Erreur lors de la création du compte."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:258
 msgid "No email address, so cannot email password reset instructions."
-msgstr ""
-"Pas d'adresse spécifiée. Impossible d'envoyer les instructions pour "
-"réinitialiser le mot de passe."
+msgstr "Aucune adresse indiquée. Impossible d'envoyer les instructions pour réinitialiser le mot de passe."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:292
 msgid "Failed to send mail"
@@ -566,7 +557,7 @@ msgstr "Ping reçu"
 
 #: ../IkiWiki/Plugin/pinger.pm:53
 msgid "requires 'from' and 'to' parameters"
-msgstr "les paramètres 'from' et 'to' sont nécessaires"
+msgstr "les paramètres « from » et « to » sont nécessaires."
 
 #: ../IkiWiki/Plugin/pinger.pm:58
 #, perl-format
@@ -585,102 +576,115 @@ msgstr "LWP est introuvable. Pas de réponse au ping"
 #: ../IkiWiki/Plugin/po.pm:15
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
+"Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
+"version 0.35."
 
 #: ../IkiWiki/Plugin/po.pm:136
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is not a valid language code"
-msgstr "%s n'est pas un fichier"
+msgstr "%s n'est pas un code de langue valable"
 
 #: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
+"%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
+"défaut."
 
 #: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
+"po_link_to=negotiated nécessite que usedirs soit activé, retour à "
+"po_link_to=default."
 
 #: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
+"Reconstruction de toutes les pages pour corriger les titres (greffon "
+"« meta »)."
 
 #: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
-#, fuzzy, perl-format
+#, perl-format
 msgid "building %s"
-msgstr "va envoyer un ping à %s"
+msgstr "construction de %s"
 
 #: ../IkiWiki/Plugin/po.pm:424
 msgid "updated PO files"
-msgstr ""
+msgstr "Fichiers PO mis à jour."
 
 #: ../IkiWiki/Plugin/po.pm:448
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
+"Impossible de supprimer cette traduction. Si la page maître est supprimée, "
+"alors ses traductions seront supprimées."
 
 #: ../IkiWiki/Plugin/po.pm:468
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
+"Impossible de renommer cette traduction. Si la page maître est renommée, "
+"alors ses traductions pourront être renommées."
 
 #: ../IkiWiki/Plugin/po.pm:829
-#, fuzzy, perl-format
+#, perl-format
 msgid "POT file (%s) does not exist"
-msgstr "La page %s n'existe pas."
+msgstr "Le fichier POT %s n'existe pas."
 
 #: ../IkiWiki/Plugin/po.pm:843
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to copy underlay PO file to %s"
-msgstr "Échec de la compilation de %s"
+msgstr "Impossible de copier le fichier PO underlay dans %s"
 
 #: ../IkiWiki/Plugin/po.pm:852
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to update %s"
-msgstr "Échec de la compilation de %s"
+msgstr "Impossible de mettre à jour %s"
 
 #: ../IkiWiki/Plugin/po.pm:858
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to copy the POT file to %s"
-msgstr "Échec de la compilation de %s"
+msgstr "Impossible de copier le fichier POT dans %s"
 
 #: ../IkiWiki/Plugin/po.pm:894
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: ../IkiWiki/Plugin/po.pm:907
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to translate %s"
-msgstr "Échec du redimensionnement : %s"
+msgstr "Impossible de traduire %s"
 
 #: ../IkiWiki/Plugin/po.pm:983
 msgid "removed obsolete PO files"
-msgstr ""
+msgstr "Fichiers PO obsolètes supprimés."
 
 #: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
 #: ../IkiWiki/Plugin/po.pm:1100
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to write %s"
-msgstr "Échec du redimensionnement : %s"
+msgstr "Impossible de modifier %s"
 
 #: ../IkiWiki/Plugin/po.pm:1058
-#, fuzzy
 msgid "failed to translate"
-msgstr "Échec du lancement de dot"
+msgstr "Impossible de traduire"
 
 #: ../IkiWiki/Plugin/po.pm:1063
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to read %s"
-msgstr "Échec de la lecture de %s : %s"
+msgstr "Impossible de lire %s"
 
 #: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
+"Données gettext incorrectes, retour à la page précédente pour la poursuite "
+"des modifications."
 
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
@@ -898,12 +902,10 @@ msgid "parse error"
 msgstr "Erreur d'analyse"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-#, fuzzy
 msgid "invalid featurepoint diameter"
 msgstr "Diamètre du point incorrect"
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-#, fuzzy
 msgid "invalid featurepoint location"
 msgstr "Emplacement du point incorrect"
 
@@ -912,7 +914,6 @@ msgid "missing values"
 msgstr "Il manque des valeurs"
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
-#, fuzzy
 msgid "invalid height value"
 msgstr "Hauteur incorrecte"
 
@@ -921,7 +922,6 @@ msgid "missing width parameter"
 msgstr "Le paramètre largeur manque"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
-#, fuzzy
 msgid "invalid width value"
 msgstr "Largeur incorrecte"
 
@@ -1057,27 +1057,27 @@ msgid "scanning %s"
 msgstr "Examen de %s"
 
 #: ../IkiWiki/Render.pm:447
-#, fuzzy, perl-format
+#, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
 #: ../IkiWiki/Render.pm:468
-#, fuzzy, perl-format
+#, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
 #: ../IkiWiki/Render.pm:507
-#, fuzzy, perl-format
+#, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
 #: ../IkiWiki/Render.pm:519
-#, fuzzy, perl-format
+#, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
 #: ../IkiWiki/Render.pm:543
-#, fuzzy, perl-format
+#, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
 
@@ -1106,9 +1106,7 @@ msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 #: ../IkiWiki/Setup/Automator.pm:115
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
-msgstr ""
-"** désactivation du greffon %s, car échec de l'installation, avec le message "
-"suivant :"
+msgstr "** Désactivation du greffon %s, l'installation a échoué avec le message suivant :"
 
 #: ../IkiWiki/Wrapper.pm:16
 #, perl-format
@@ -1181,7 +1179,7 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s
 #: ../IkiWiki.pm:1243
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
-msgstr "Une boucle de pré traitement a été détectée sur %s à hauteur de %i"
+msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
 #: ../IkiWiki.pm:1783
 msgid "yes"
@@ -1205,7 +1203,6 @@ msgid "What revision control system to use?"
 msgstr "Système de contrôle de version utilisé :"
 
 #: ../auto.setup:20
-#, fuzzy
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 
-- 
cgit v1.2.3


From 89b5e2b8224a6e05e8f2a7d2d0affe7ae700fa97 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 17 Aug 2009 16:15:41 -0400
Subject: responses to code review (I'll try to get them implemented later this
 week)

---
 doc/todo/should_optimise_pagespecs.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 33bca677a..0a3720b3c 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -113,6 +113,13 @@ In saveindex it still or'd together the depends list, but the `{depends}`
 field seems only useful for backwards compatability (ie, ikiwiki-transition
 uses it still), and otherwise just bloats the index.
 
+> If it's acceptable to declare that downgrading IkiWiki requires a complete
+> rebuild, I'm happy with that. I'd prefer to keep the (simple form of the)
+> transition done automatically during a load/save cycle, rather than
+> requiring ikiwiki-transition to be run; we should probably say in NEWS
+> that the performance increase won't fully apply until the next
+> rebuild. --[[smcv]]
+
 Is an array the right data structure? `add_depends` has to loop through the
 array to avoid dups, it would be better if a hash were used there. Since
 inline (and other plugins) explicitly add all linked pages, each as a
@@ -131,17 +138,31 @@ to avoid..
 > I wasn't thinking about a lookup hash, just a dedup hash, FWIW.
 > --[[Joey]]
 
+>> I was under the impression from previous code review that you preferred
+>> to represent unordered sets as lists, rather than hashes with dummy
+>> values. If I was wrong, great, I'll fix that and it'll probably go
+>> a bit faster. --[[smcv]]
+
 Also, since a lot of places are calling add_depends in a loop, it probably
 makes sense to just make it accept a list of dependencies to add. It'll be
 marginally faster, probably, and should allow for better optimisation
 when adding a lot of depends at once.
 
+> That'd be an API change; perhaps marginally faster, but I don't
+> see how it would allow better optimisation if we're de-duplicating
+> anyway? --[[smcv]]
+
 In Render.pm, we now have a triply nested loop, which is a bit
 scary for efficiency. It seems there should be a way to
 rework this code so it can use the optimised `pagespec_match_list`,
 and/or hoist some of the inner loop calculations (like the `pagename`)
 out.
 
+> I don't think the complexity is any greater than it was: I've just
+> moved one level of "loop" out of the generated Perl, to be
+> in visible code. I'll see whether some of it can be hoisted, though.
+> --[[smcv]]
+
 Very good catch on img/meta using the wrong dependency; verified in the wild!
 (I've cherry-picked those bug fixes.)
 
-- 
cgit v1.2.3


From 46adbbd1c377b6c4a55c466e27de0bdce2fcb52c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 17 Aug 2009 16:30:21 -0400
Subject: respond

---
 doc/todo/should_optimise_pagespecs.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 0a3720b3c..1594dcee7 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -120,6 +120,11 @@ uses it still), and otherwise just bloats the index.
 > that the performance increase won't fully apply until the next
 > rebuild. --[[smcv]]
 
+>> It is acceptable not to support downgrades.
+>> I don't think we need a NEWS file update since any sort of refresh,
+>> not just a full rebuild, will cause the indexdb to be loaded and saved,
+>> enabling the optimisation. --[[Joey]] 
+
 Is an array the right data structure? `add_depends` has to loop through the
 array to avoid dups, it would be better if a hash were used there. Since
 inline (and other plugins) explicitly add all linked pages, each as a
@@ -143,6 +148,9 @@ to avoid..
 >> values. If I was wrong, great, I'll fix that and it'll probably go
 >> a bit faster. --[[smcv]]
 
+>>> It depends, really. And it'd certianly make sense to benchmark such a
+>>> change. --[[Joey]] 
+
 Also, since a lot of places are calling add_depends in a loop, it probably
 makes sense to just make it accept a list of dependencies to add. It'll be
 marginally faster, probably, and should allow for better optimisation
@@ -152,6 +160,11 @@ when adding a lot of depends at once.
 > see how it would allow better optimisation if we're de-duplicating
 > anyway? --[[smcv]]
 
+>> Well, I was thinking that it might be sufficient to build a `%seen`
+>> hash of dependencies inside `add_depends`, if the places that call
+>> it lots were changed to just call it once. Of course the only way to
+>> tell is benchmarking. --[[Joey]] 
+
 In Render.pm, we now have a triply nested loop, which is a bit
 scary for efficiency. It seems there should be a way to
 rework this code so it can use the optimised `pagespec_match_list`,
@@ -163,6 +176,10 @@ out.
 > in visible code. I'll see whether some of it can be hoisted, though.
 > --[[smcv]]
 
+>> The call to `pagename` is the only part I can see that's clearly
+>> run more often than before. That function is pretty inexpensive, but..
+>> --[[Joey]]
+
 Very good catch on img/meta using the wrong dependency; verified in the wild!
 (I've cherry-picked those bug fixes.)
 
-- 
cgit v1.2.3


From 9552f35b5153cf324141430e415c077d8387a810 Mon Sep 17 00:00:00 2001
From: Jimmy Tang <jtang@duo.tchpc.tcd.ie>
Date: Tue, 18 Aug 2009 15:17:58 +0100
Subject: added my homepage link

---
 doc/users/Jimmy_Tang.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/Jimmy_Tang.mdwn

diff --git a/doc/users/Jimmy_Tang.mdwn b/doc/users/Jimmy_Tang.mdwn
new file mode 100644
index 000000000..a1402bcae
--- /dev/null
+++ b/doc/users/Jimmy_Tang.mdwn
@@ -0,0 +1 @@
+<http://www.sgenomics.org/~jtang>
-- 
cgit v1.2.3


From 8315913a252f9a036f139a1d9541ae1693ef33eb Mon Sep 17 00:00:00 2001
From: Jimmy Tang <jtang@duo.tchpc.tcd.ie>
Date: Tue, 18 Aug 2009 15:22:02 +0100
Subject: added myself as a user

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 58dd51600..e1e25a045 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -124,6 +124,7 @@ Personal sites and blogs
 * [Mick Pollard aka \_lunix_ - Personal sysadmin blog and wiki](http://www.lunix.com.au)
 * [tumashu's page](http://tumashu.github.com) This is my personal site in github  created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master)  
 * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
+* [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From eedd1687f821a649ff2d30da8beb67012cdab50d Mon Sep 17 00:00:00 2001
From: "http://emptty.myopenid.com/" <http://emptty.myopenid.com/@web>
Date: Wed, 19 Aug 2009 05:08:49 -0400
Subject:

---
 doc/ikiwiki/directive/brokenlinks/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/ikiwiki/directive/brokenlinks/discussion.mdwn

diff --git a/doc/ikiwiki/directive/brokenlinks/discussion.mdwn b/doc/ikiwiki/directive/brokenlinks/discussion.mdwn
new file mode 100644
index 000000000..65e97cff6
--- /dev/null
+++ b/doc/ikiwiki/directive/brokenlinks/discussion.mdwn
@@ -0,0 +1 @@
+Would it be possible to have such a thing also checking for external links? -- [[user/emptty]]
-- 
cgit v1.2.3


From 036f4f367d092b5017e1deb4cd95480ac1171da7 Mon Sep 17 00:00:00 2001
From: AlexandreDupas <AlexandreDupas@web>
Date: Wed, 19 Aug 2009 12:33:09 -0400
Subject: bugs with po and git plugins

---
 doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn

diff --git a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
new file mode 100644
index 000000000..f87457080
--- /dev/null
+++ b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
@@ -0,0 +1,7 @@
+po files are not added to git (error: /path/to/po/file not in repository tree) in my setup.
+
+I have set absolute path for srcdir = '/path/to/repo/doc/'. The root of my git repository is '/path/to/repo/'. When I enable the po plugin, it creates all po files and produces an error when it try to add the file saying that the /path/to/repo/doc/index.fr.po is not in the repository tree.
+
+I have no problem when I use an relative path like srcdir = '.'.
+
+I have an other issue with the po plugin when I set the srcdir to './doc/' (provided that my config file is in /path/to/repo). In this case the po plugin try to add 'doc/doc/index.fr.po' which does not exists (seems like the srcdir path is prepended twice).
-- 
cgit v1.2.3


From 9b799ccc851afc70b5b068e088f095e14005bda8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 19 Aug 2009 14:05:59 -0400
Subject: po: Fixed to run rcs_add ralative to srcdir.

---
 IkiWiki/Plugin/po.pm                                 | 2 +-
 debian/changelog                                     | 1 +
 doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index aa3d72b90..414906999 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -414,7 +414,7 @@ sub change (@) {
 		}
 		if (@pofiles) {
 			refreshpofiles($masterfile, @pofiles);
-			map { IkiWiki::rcs_add($_) } @pofiles if $config{rcs};
+			map { s/^\Q$config{srcdir}\E\/*//; IkiWiki::rcs_add($_) } @pofiles if $config{rcs};
 			$updated_po_files=1;
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index ddf69f284..4bb450a55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
     pages from the basewiki.
   * Updated French program translation from Philippe Batailler.
     Closes: #542036
+  * po: Fixed to run rcs_add ralative to srcdir.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
index f87457080..6fadff07e 100644
--- a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
+++ b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
@@ -5,3 +5,10 @@ I have set absolute path for srcdir = '/path/to/repo/doc/'. The root of my git r
 I have no problem when I use an relative path like srcdir = '.'.
 
 I have an other issue with the po plugin when I set the srcdir to './doc/' (provided that my config file is in /path/to/repo). In this case the po plugin try to add 'doc/doc/index.fr.po' which does not exists (seems like the srcdir path is prepended twice).
+
+> You should never use a relative srcdir path with ikiwiki.
+> 
+> I wonder what version of git you have there, since it works ok with the
+> version I have here. But, the po plugin is definitly doing the wrong
+> thing; it's telling git to add the po file with the full scrdir path
+> rather than relative to its root. Fixed that. [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From f712ffa66df2edc119d34a09a76b0c4d82563543 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 19 Aug 2009 14:12:37 -0400
Subject: another issue

---
 doc/plugins/po.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 3f91775f1..dca2f5d66 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -336,6 +336,11 @@ and then committed again. The second commit makes this change:
 Same thing happens when a change to an existing page triggers a po file
 update. --[[Joey]] 
 
+Ugly messages with empty files
+------------------------------
+
+If there are empty .mdwn files, the po plugin displays some ugly messages.
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From e6ed1aabfd06884b655deaf5af0c25263aa5c1a0 Mon Sep 17 00:00:00 2001
From: AlexandreDupas <AlexandreDupas@web>
Date: Wed, 19 Aug 2009 14:42:35 -0400
Subject: Add some details

---
 doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
index 6fadff07e..c794f82d7 100644
--- a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
+++ b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
@@ -12,3 +12,23 @@ I have an other issue with the po plugin when I set the srcdir to './doc/' (prov
 > version I have here. But, the po plugin is definitly doing the wrong
 > thing; it's telling git to add the po file with the full scrdir path
 > rather than relative to its root. Fixed that. [[done]] --[[Joey]] 
+
+>> Yeah, I figured for the relative path
+>> Git version 1.6.3.3 (on both my dev and server machines)
+>>
+>> Here is an example of what I get when I update the po file on my laptop and I push to the master repository:
+>>
+>>     From /srv/git/sb
+>>       5eb4619..ecac4d7  master     -> origin/master
+>>    scanning doc.fr.po
+>>    building doc.fr.po
+>>    building doc.mdwn, which depends on doc.fr
+>>    building recentchanges.mdwn, which depends on recentchanges/change_ecac4d7311b15a3a3ed03102b9250487315740bc
+>>    fatal: '/srv/www/sb.l.n/new/doc/doc.fr.po' is outside repository
+>>    'git add /srv/www/sb.l.n/new/doc/doc.fr.po' failed:  at /usr/share/perl5/IkiWiki/Plugin/git.pm line 161.
+>>    done
+>>    To ssh://git.lohrun.net/var/cache/git/songbook.git
+>>       5eb4619..ecac4d7  master -> master
+>>  
+>> The root repository used to run ikiwiki is `/srv/www/sb.l.n/new/` 
+>> -- [[AlexandreDupas]]
-- 
cgit v1.2.3


From 69874215d4c8ca5fcf877f020352ec17f4a43c14 Mon Sep 17 00:00:00 2001
From: AlexandreDupas <AlexandreDupas@web>
Date: Wed, 19 Aug 2009 14:45:29 -0400
Subject: formatting

---
 .../po_plugin_cannot_add_po_files_into_git.mdwn    | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
index c794f82d7..8e3399611 100644
--- a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
+++ b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
@@ -17,18 +17,18 @@ I have an other issue with the po plugin when I set the srcdir to './doc/' (prov
 >> Git version 1.6.3.3 (on both my dev and server machines)
 >>
 >> Here is an example of what I get when I update the po file on my laptop and I push to the master repository:
->>
->>     From /srv/git/sb
->>       5eb4619..ecac4d7  master     -> origin/master
->>    scanning doc.fr.po
->>    building doc.fr.po
->>    building doc.mdwn, which depends on doc.fr
->>    building recentchanges.mdwn, which depends on recentchanges/change_ecac4d7311b15a3a3ed03102b9250487315740bc
->>    fatal: '/srv/www/sb.l.n/new/doc/doc.fr.po' is outside repository
->>    'git add /srv/www/sb.l.n/new/doc/doc.fr.po' failed:  at /usr/share/perl5/IkiWiki/Plugin/git.pm line 161.
->>    done
->>    To ssh://git.lohrun.net/var/cache/git/songbook.git
->>       5eb4619..ecac4d7  master -> master
->>  
+
+     From /srv/git/sb
+       5eb4619..ecac4d7  master     -> origin/master
+    scanning doc.fr.po
+    building doc.fr.po
+    building doc.mdwn, which depends on doc.fr
+    building recentchanges.mdwn, which depends on recentchanges/change_ecac4d7311b15a3a3ed03102b9250487315740bc
+    fatal: '/srv/www/sb.l.n/new/doc/doc.fr.po' is outside repository
+    'git add /srv/www/sb.l.n/new/doc/doc.fr.po' failed:  at /usr/share/perl5/IkiWiki/Plugin/git.pm line 161.
+    done
+    To ssh://git.lohrun.net/var/cache/git/songbook.git
+       5eb4619..ecac4d7  master -> master
+  
 >> The root repository used to run ikiwiki is `/srv/www/sb.l.n/new/` 
 >> -- [[AlexandreDupas]]
-- 
cgit v1.2.3


From df9d39698f93d803acdf37d1c94f74f58719634e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 20 Aug 2009 12:29:19 -0400
Subject: Italian program translation from Luca Bruno.

---
 debian/changelog |    1 +
 po/it.po         | 1176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1177 insertions(+)
 create mode 100644 po/it.po

diff --git a/debian/changelog b/debian/changelog
index 4bb450a55..5b021ec24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
   * Updated French program translation from Philippe Batailler.
     Closes: #542036
   * po: Fixed to run rcs_add ralative to srcdir.
+  * Italian program translation from Luca Bruno.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 000000000..53fb3e3f4
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,1176 @@
+# Italian translation of ikiwiki.
+# This file is distributed under the same license as the ikiwiki package.
+# Luca Bruno <lucab@debian.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"PO-Revision-Date: 2009-08-16 11:01+0100\n"
+"Last-Translator: Luca Bruno <lucab@debian.org>\n"
+"Language-Team: Italian TP <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../IkiWiki/CGI.pm:113
+msgid "You need to log in first."
+msgstr "Occorre prima effettuare l'accesso."
+
+#: ../IkiWiki/CGI.pm:146
+msgid "probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https"
+msgstr "possibile errore di configurazione: sslcookie è impostato, ma si sta tentando un accesso via http, non https"
+
+#: ../IkiWiki/CGI.pm:149
+msgid "login failed, perhaps you need to turn on cookies?"
+msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?"
+
+#: ../IkiWiki/CGI.pm:168
+#: ../IkiWiki/CGI.pm:299
+msgid "Your login session has expired."
+msgstr "La sessione è scaduta."
+
+#: ../IkiWiki/CGI.pm:189
+msgid "Login"
+msgstr "Entra"
+
+#: ../IkiWiki/CGI.pm:190
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: ../IkiWiki/CGI.pm:191
+msgid "Admin"
+msgstr "Amministrazione"
+
+#: ../IkiWiki/CGI.pm:231
+msgid "Preferences saved."
+msgstr "Preferenze salvate."
+
+#: ../IkiWiki/CGI.pm:262
+msgid "You are banned."
+msgstr "Avete ricevuto un ban."
+
+#: ../IkiWiki/CGI.pm:390
+#: ../IkiWiki/CGI.pm:391
+#: ../IkiWiki.pm:1260
+msgid "Error"
+msgstr "Errore"
+
+#: ../IkiWiki/Plugin/aggregate.pm:84
+msgid "Aggregation triggered via web."
+msgstr "Aggregazione attivata dal web."
+
+#: ../IkiWiki/Plugin/aggregate.pm:93
+msgid "Nothing to do right now, all feeds are up-to-date!"
+msgstr "Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati."
+
+#: ../IkiWiki/Plugin/aggregate.pm:220
+#, perl-format
+msgid "missing %s parameter"
+msgstr "parametro %s mancante"
+
+#: ../IkiWiki/Plugin/aggregate.pm:255
+msgid "new feed"
+msgstr "nuovo notiziario"
+
+#: ../IkiWiki/Plugin/aggregate.pm:269
+msgid "posts"
+msgstr "articoli"
+
+#: ../IkiWiki/Plugin/aggregate.pm:271
+msgid "new"
+msgstr "nuovo"
+
+#: ../IkiWiki/Plugin/aggregate.pm:441
+#, perl-format
+msgid "expiring %s (%s days old)"
+msgstr "in scadenza %s (vecchio di %s giorni)"
+
+#: ../IkiWiki/Plugin/aggregate.pm:448
+#, perl-format
+msgid "expiring %s"
+msgstr "in scadenza %s"
+
+#: ../IkiWiki/Plugin/aggregate.pm:475
+#, perl-format
+msgid "last checked %s"
+msgstr "ultimo controllo %s"
+
+#: ../IkiWiki/Plugin/aggregate.pm:479
+#, perl-format
+msgid "checking feed %s ..."
+msgstr "controllo notiziario %s..."
+
+#: ../IkiWiki/Plugin/aggregate.pm:484
+#, perl-format
+msgid "could not find feed at %s"
+msgstr "impossibile trovare il notiziario %s"
+
+#: ../IkiWiki/Plugin/aggregate.pm:503
+msgid "feed not found"
+msgstr "notiziario non trovato"
+
+#: ../IkiWiki/Plugin/aggregate.pm:514
+#, perl-format
+msgid "(invalid UTF-8 stripped from feed)"
+msgstr "(codifica UTF-8 non valida eliminata dal notiziario)"
+
+#: ../IkiWiki/Plugin/aggregate.pm:522
+#, perl-format
+msgid "(feed entities escaped)"
+msgstr "(entità del notiziario espanse con escape)"
+
+#: ../IkiWiki/Plugin/aggregate.pm:530
+msgid "feed crashed XML::Feed!"
+msgstr "il notiziario ha fatto andare in crash XML::Feed."
+
+#: ../IkiWiki/Plugin/aggregate.pm:616
+#, perl-format
+msgid "creating new page %s"
+msgstr "creazione nuova pagina %s"
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:31
+msgid "deleting bucket.."
+msgstr "eliminazione contenitore..."
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:38
+#: ../ikiwiki.in:210
+msgid "done"
+msgstr "fatto"
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:97
+#, perl-format
+msgid "Must specify %s"
+msgstr "Occorre specificare %s"
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:136
+msgid "Failed to create S3 bucket: "
+msgstr "Impossibile creare il contenitore S3: "
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:221
+msgid "Failed to save file to S3: "
+msgstr "Impossibile salvare il file sul S3: "
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:243
+msgid "Failed to delete file from S3: "
+msgstr "Impossibile eliminare il file dal S3: "
+
+#: ../IkiWiki/Plugin/attachment.pm:49
+#, perl-format
+msgid "there is already a page named %s"
+msgstr "esiste già una pagina chiamata %s"
+
+#: ../IkiWiki/Plugin/attachment.pm:65
+msgid "prohibited by allowed_attachments"
+msgstr "non permesso da allowed_attachments"
+
+#: ../IkiWiki/Plugin/attachment.pm:140
+msgid "bad attachment filename"
+msgstr "nome file dell'allegato non valido"
+
+#: ../IkiWiki/Plugin/attachment.pm:182
+msgid "attachment upload"
+msgstr "carica allegato"
+
+#: ../IkiWiki/Plugin/autoindex.pm:105
+msgid "automatic index generation"
+msgstr "generazione automatica dell'indice"
+
+#: ../IkiWiki/Plugin/blogspam.pm:108
+msgid "Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: "
+msgstr "È stato riconosciuto come spam da <a href=\"http://blogspam.net/\">blogspam</a>: "
+
+#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#, perl-format
+msgid "%s from %s"
+msgstr "%s da %s"
+
+#: ../IkiWiki/Plugin/brokenlinks.pm:50
+msgid "There are no broken links!"
+msgstr "Non ci sono collegamenti rotti."
+
+#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/format.pm:38
+#, perl-format
+msgid "unsupported page format %s"
+msgstr "formato pagina %s non supportato"
+
+#: ../IkiWiki/Plugin/comments.pm:129
+msgid "comment must have content"
+msgstr "i commenti devono avere un contenuto"
+
+#: ../IkiWiki/Plugin/comments.pm:185
+msgid "Anonymous"
+msgstr "Anonimo"
+
+#: ../IkiWiki/Plugin/comments.pm:340
+#: ../IkiWiki/Plugin/editpage.pm:97
+msgid "bad page name"
+msgstr "nome pagina non valido"
+
+#: ../IkiWiki/Plugin/comments.pm:345
+#, perl-format
+msgid "commenting on %s"
+msgstr "commento su %s"
+
+#: ../IkiWiki/Plugin/comments.pm:363
+#, perl-format
+msgid "page '%s' doesn't exist, so you can't comment"
+msgstr "la pagina «%s» non esiste, impossibile commentarla"
+
+#: ../IkiWiki/Plugin/comments.pm:370
+#, perl-format
+msgid "comments on page '%s' are closed"
+msgstr "i commenti per la pagina «%s» sono chiusi"
+
+#: ../IkiWiki/Plugin/comments.pm:464
+msgid "comment stored for moderation"
+msgstr "commento trattenuto per moderazione"
+
+#: ../IkiWiki/Plugin/comments.pm:466
+msgid "Your comment will be posted after moderator review"
+msgstr "Il commento sarà pubblicato dopo la verifica del moderatore"
+
+#: ../IkiWiki/Plugin/comments.pm:479
+msgid "Added a comment"
+msgstr "Aggiunto commento"
+
+#: ../IkiWiki/Plugin/comments.pm:483
+#, perl-format
+msgid "Added a comment: %s"
+msgstr "Aggiunto commento: %s"
+
+#: ../IkiWiki/Plugin/comments.pm:525
+#: ../IkiWiki/Plugin/websetup.pm:236
+msgid "you are not logged in as an admin"
+msgstr "non siete autenticati come amministratore"
+
+#: ../IkiWiki/Plugin/comments.pm:576
+msgid "Comment moderation"
+msgstr "Moderazione commenti"
+
+#: ../IkiWiki/Plugin/comments.pm:615
+msgid "comment moderation"
+msgstr "moderazione commento"
+
+#: ../IkiWiki/Plugin/comments.pm:766
+msgid "Comments"
+msgstr "Commenti"
+
+#: ../IkiWiki/Plugin/conditional.pm:27
+#: ../IkiWiki/Plugin/cutpaste.pm:30
+#: ../IkiWiki/Plugin/cutpaste.pm:45
+#: ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/testpagespec.pm:26
+#, perl-format
+msgid "%s parameter is required"
+msgstr "parametro %s necessario"
+
+#: ../IkiWiki/Plugin/cutpaste.pm:66
+msgid "no text was copied in this page"
+msgstr "nessun testo è stato copiato in questa pagina"
+
+#: ../IkiWiki/Plugin/cutpaste.pm:69
+#, perl-format
+msgid "no text was copied in this page with id %s"
+msgstr "nessun testo è stato copiato in questa pagina con l'id %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:40
+#, perl-format
+msgid "removing old preview %s"
+msgstr "rimozione vecchia anteprima %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:113
+#, perl-format
+msgid "%s is not an editable page"
+msgstr "%s non è una pagina modificabile"
+
+#: ../IkiWiki/Plugin/editpage.pm:292
+#, perl-format
+msgid "creating %s"
+msgstr "creazione %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:310
+#: ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339
+#: ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
+#, perl-format
+msgid "editing %s"
+msgstr "modifica %s"
+
+#: ../IkiWiki/Plugin/edittemplate.pm:51
+msgid "template not specified"
+msgstr "modello non specificato"
+
+#: ../IkiWiki/Plugin/edittemplate.pm:54
+msgid "match not specified"
+msgstr "corrispondenza non specificata"
+
+#: ../IkiWiki/Plugin/edittemplate.pm:62
+#, perl-format
+msgid "edittemplate %s registered for %s"
+msgstr "edittemplate %s registrato per %s"
+
+#: ../IkiWiki/Plugin/edittemplate.pm:133
+msgid "failed to process"
+msgstr "errore nell'elaborazione"
+
+#: ../IkiWiki/Plugin/format.pm:20
+msgid "must specify format and text"
+msgstr "occorre specificare formato e testo"
+
+#: ../IkiWiki/Plugin/fortune.pm:27
+msgid "fortune failed"
+msgstr "errore nel fortune"
+
+#: ../IkiWiki/Plugin/getsource.pm:62
+#: ../IkiWiki/Plugin/goto.pm:55
+msgid "missing page"
+msgstr "pagina mancante"
+
+#: ../IkiWiki/Plugin/getsource.pm:64
+#: ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr "La pagina %s non esiste."
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+msgid "not a page"
+msgstr "non è una pagina"
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, perl-format
+msgid "%s is an attachment, not a page."
+msgstr "%s è un allegato, non una pagina."
+
+#: ../IkiWiki/Plugin/git.pm:626
+#: ../IkiWiki/Plugin/git.pm:644
+#: ../IkiWiki/Receive.pm:129
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr "non è permesso modificare %s"
+
+#: ../IkiWiki/Plugin/git.pm:666
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr "non è permesso lavorare su un file in modalità %s"
+
+#: ../IkiWiki/Plugin/git.pm:670
+msgid "you are not allowed to change file modes"
+msgstr "non è permesso cambiare la modalità del file"
+
+#: ../IkiWiki/Plugin/google.pm:27
+#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/search.pm:36
+#, perl-format
+msgid "Must specify %s when using the %s plugin"
+msgstr "Occorre specificare %s quando si usa il plugin %s"
+
+#: ../IkiWiki/Plugin/google.pm:31
+msgid "Failed to parse url, cannot determine domain name"
+msgstr "Errore nell'interpretazione dell'URL, impossibile determinare il nome del dominio"
+
+#: ../IkiWiki/Plugin/graphviz.pm:67
+msgid "failed to run graphviz"
+msgstr "errore nell'eseguire graphviz"
+
+#: ../IkiWiki/Plugin/graphviz.pm:94
+msgid "prog not a valid graphviz program"
+msgstr "prog non è un programma graphviz valido"
+
+#: ../IkiWiki/Plugin/highlight.pm:47
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr "tohighlight contiene il tipo di file sconosciuto «%s»"
+
+#: ../IkiWiki/Plugin/highlight.pm:58
+#, perl-format
+msgid "Source code: %s"
+msgstr "Sorgente: %s"
+
+#: ../IkiWiki/Plugin/highlight.pm:123
+msgid "warning: highlight perl module not available; falling back to pass through"
+msgstr "attenzione: modulo perl highlight non trovato, verrà passato inalterato"
+
+#: ../IkiWiki/Plugin/img.pm:63
+msgid "Image::Magick is not installed"
+msgstr "Image::Magick non è installato"
+
+#: ../IkiWiki/Plugin/img.pm:72
+#, perl-format
+msgid "wrong size format \"%s\" (should be WxH)"
+msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)"
+
+#: ../IkiWiki/Plugin/img.pm:83
+#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:104
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr "impossibile leggere %s: %s"
+
+#: ../IkiWiki/Plugin/img.pm:90
+#, perl-format
+msgid "failed to resize: %s"
+msgstr "impossibile ridimensionare: %s"
+
+#: ../IkiWiki/Plugin/img.pm:119
+#, perl-format
+msgid "failed to determine size of image %s"
+msgstr "impossibile determinare la dimensione dell'immagine %s"
+
+#: ../IkiWiki/Plugin/inline.pm:92
+msgid "Must specify url to wiki with --url when using --rss or --atom"
+msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom"
+
+#: ../IkiWiki/Plugin/inline.pm:138
+msgid "page editing not allowed"
+msgstr "modifica della pagina non ammessa"
+
+#: ../IkiWiki/Plugin/inline.pm:155
+msgid "missing pages parameter"
+msgstr "parametro pagine mancante"
+
+#: ../IkiWiki/Plugin/inline.pm:191
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr "i parametri %s e %s non possono essere usati insieme"
+
+#: ../IkiWiki/Plugin/inline.pm:212
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
+
+#: ../IkiWiki/Plugin/inline.pm:223
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "ordinamento %s sconosciuto"
+
+#: ../IkiWiki/Plugin/inline.pm:327
+msgid "Add a new post titled:"
+msgstr "Aggiungere un nuovo articolo dal titolo:"
+
+#: ../IkiWiki/Plugin/inline.pm:347
+#, perl-format
+msgid "nonexistant template %s"
+msgstr "modello %s non esistente"
+
+#: ../IkiWiki/Plugin/inline.pm:612
+msgid "RPC::XML::Client not found, not pinging"
+msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
+
+#: ../IkiWiki/Plugin/linkmap.pm:106
+msgid "failed to run dot"
+msgstr "impossibile eseguire dot"
+
+#: ../IkiWiki/Plugin/lockedit.pm:47
+#, perl-format
+msgid "%s is locked and cannot be edited"
+msgstr "%s è bloccata e non può essere modificata"
+
+#: ../IkiWiki/Plugin/mdwn.pm:44
+msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
+msgstr "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato"
+
+#: ../IkiWiki/Plugin/mdwn.pm:67
+#, perl-format
+msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
+msgstr "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)"
+
+#: ../IkiWiki/Plugin/meta.pm:158
+msgid "stylesheet not found"
+msgstr "foglio di stile non trovato"
+
+#: ../IkiWiki/Plugin/meta.pm:196
+msgid "redir page not found"
+msgstr "pagina di reindirizzamento non trovata"
+
+#: ../IkiWiki/Plugin/meta.pm:210
+msgid "redir cycle is not allowed"
+msgstr "ciclo di reindirizzamento non ammesso"
+
+#: ../IkiWiki/Plugin/mirrorlist.pm:42
+msgid "Mirrors"
+msgstr "Mirror"
+
+#: ../IkiWiki/Plugin/mirrorlist.pm:42
+msgid "Mirror"
+msgstr "Mirror"
+
+#: ../IkiWiki/Plugin/more.pm:8
+msgid "more"
+msgstr "altro"
+
+#: ../IkiWiki/Plugin/norcs.pm:65
+msgid "getctime not implemented"
+msgstr "getctime non implementata"
+
+#: ../IkiWiki/Plugin/openid.pm:61
+msgid "Log in with"
+msgstr "Accedi tramite"
+
+#: ../IkiWiki/Plugin/openid.pm:64
+msgid "Get an OpenID"
+msgstr "Ottieni un OpenID"
+
+#: ../IkiWiki/Plugin/orphans.pm:45
+msgid "All pages have other pages linking to them."
+msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine."
+
+#: ../IkiWiki/Plugin/pagetemplate.pm:30
+msgid "bad or missing template"
+msgstr "modello errato o mancante"
+
+#: ../IkiWiki/Plugin/passwordauth.pm:248
+msgid "Account creation successful. Now you can Login."
+msgstr "Account creato con successo. È ora possibile effettuare l'accesso."
+
+#: ../IkiWiki/Plugin/passwordauth.pm:251
+msgid "Error creating account."
+msgstr "Errore nella creazione dell'account."
+
+#: ../IkiWiki/Plugin/passwordauth.pm:258
+msgid "No email address, so cannot email password reset instructions."
+msgstr "Nessun indirizzo email, impossibile inviare per email le istruzioni per reimpostare la password."
+
+#: ../IkiWiki/Plugin/passwordauth.pm:292
+msgid "Failed to send mail"
+msgstr "Impossibile spedire il messaggio"
+
+#: ../IkiWiki/Plugin/passwordauth.pm:294
+msgid "You have been mailed password reset instructions."
+msgstr "Il messaggio con le istruzioni per reimpostare la password è stato inviato."
+
+#: ../IkiWiki/Plugin/passwordauth.pm:329
+msgid "incorrect password reset url"
+msgstr "url per il reset della password non corretto"
+
+#: ../IkiWiki/Plugin/passwordauth.pm:332
+msgid "password reset denied"
+msgstr "reset della password non permesso"
+
+#: ../IkiWiki/Plugin/pingee.pm:30
+msgid "Ping received."
+msgstr "Ping ricevuto."
+
+#: ../IkiWiki/Plugin/pinger.pm:53
+msgid "requires 'from' and 'to' parameters"
+msgstr "sono richiesti i parametri \"to\" e \"from\""
+
+#: ../IkiWiki/Plugin/pinger.pm:58
+#, perl-format
+msgid "Will ping %s"
+msgstr "Verrà inviato un ping a %s"
+
+#: ../IkiWiki/Plugin/pinger.pm:61
+#, perl-format
+msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
+msgstr "Ignorata la richiesta di ping per il wiki %s (questo wiki è %s)"
+
+#: ../IkiWiki/Plugin/pinger.pm:77
+msgid "LWP not found, not pinging"
+msgstr "LWP non trovato, ping non inviato"
+
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno alla versione 0.35."
+
+#: ../IkiWiki/Plugin/po.pm:136
+#, perl-format
+msgid "%s is not a valid language code"
+msgstr "%s non è una codifica di lingua valida"
+
+#: ../IkiWiki/Plugin/po.pm:148
+#, perl-format
+msgid "%s is not a valid value for po_link_to, falling back to po_link_to=default"
+msgstr "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
+
+#: ../IkiWiki/Plugin/po.pm:153
+msgid "po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default"
+msgstr "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato po_link_to=default"
+
+#: ../IkiWiki/Plugin/po.pm:383
+#, perl-format
+msgid "rebuilding all pages to fix meta titles"
+msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
+
+#: ../IkiWiki/Plugin/po.pm:387
+#: ../IkiWiki/Render.pm:426
+#, perl-format
+msgid "building %s"
+msgstr "compilazione di %s"
+
+#: ../IkiWiki/Plugin/po.pm:424
+msgid "updated PO files"
+msgstr "file PO aggiornati"
+
+#: ../IkiWiki/Plugin/po.pm:448
+msgid "Can not remove a translation. If the master page is removed, however, its translations will be removed as well."
+msgstr "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è stata eliminata anche le traduzioni lo saranno."
+
+#: ../IkiWiki/Plugin/po.pm:468
+msgid "Can not rename a translation. If the master page is renamed, however, its translations will be renamed as well."
+msgstr "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è stata rinominata anche le traduzioni lo saranno."
+
+#: ../IkiWiki/Plugin/po.pm:829
+#, perl-format
+msgid "POT file (%s) does not exist"
+msgstr "Il file POT (%s) non esiste"
+
+#: ../IkiWiki/Plugin/po.pm:843
+#, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr "impossibile copiare il file PO di underlay in %s"
+
+#: ../IkiWiki/Plugin/po.pm:852
+#, perl-format
+msgid "failed to update %s"
+msgstr "impossibile aggiornare %s"
+
+#: ../IkiWiki/Plugin/po.pm:858
+#, perl-format
+msgid "failed to copy the POT file to %s"
+msgstr "impossibile copiare il file POT in %s"
+
+#: ../IkiWiki/Plugin/po.pm:894
+msgid "N/A"
+msgstr "N/D"
+
+#: ../IkiWiki/Plugin/po.pm:907
+#, perl-format
+msgid "failed to translate %s"
+msgstr "impossibile tradurre %s"
+
+#: ../IkiWiki/Plugin/po.pm:983
+msgid "removed obsolete PO files"
+msgstr "file PO obsoleti rimossi"
+
+#: ../IkiWiki/Plugin/po.pm:1046
+#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1100
+#, perl-format
+msgid "failed to write %s"
+msgstr "impossibile scrivere %s"
+
+#: ../IkiWiki/Plugin/po.pm:1058
+msgid "failed to translate"
+msgstr "impossibile tradurre"
+
+#: ../IkiWiki/Plugin/po.pm:1063
+#, perl-format
+msgid "failed to read %s"
+msgstr "impossibile leggere %s"
+
+#: ../IkiWiki/Plugin/po.pm:1112
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr "dati gettext non validi, tornare alle pagina precedente per continuare le modifiche"
+
+#: ../IkiWiki/Plugin/poll.pm:69
+msgid "vote"
+msgstr "voto"
+
+#: ../IkiWiki/Plugin/poll.pm:77
+msgid "Total votes:"
+msgstr "Voti totali:"
+
+#: ../IkiWiki/Plugin/polygen.pm:41
+msgid "polygen not installed"
+msgstr "polygen non è installato"
+
+#: ../IkiWiki/Plugin/polygen.pm:60
+msgid "command failed"
+msgstr "errore nel comando"
+
+#: ../IkiWiki/Plugin/postsparkline.pm:41
+msgid "missing formula"
+msgstr "formula mancante"
+
+#: ../IkiWiki/Plugin/postsparkline.pm:48
+msgid "unknown formula"
+msgstr "formula sconosciuta"
+
+#. translators: These descriptions of times of day are used
+#. translators: in messages like "last edited <description>".
+#. translators: %A is the name of the day of the week, while
+#. translators: %A- is the name of the previous day.
+#: ../IkiWiki/Plugin/prettydate.pm:15
+msgid "late %A- night"
+msgstr "%A- a tarda notte"
+
+#: ../IkiWiki/Plugin/prettydate.pm:17
+msgid "in the wee hours of %A- night"
+msgstr "%A prima dell'alba"
+
+#: ../IkiWiki/Plugin/prettydate.pm:20
+msgid "terribly early %A morning"
+msgstr "%A mattina molto presto"
+
+#: ../IkiWiki/Plugin/prettydate.pm:22
+msgid "early %A morning"
+msgstr "%A mattina presto"
+
+#: ../IkiWiki/Plugin/prettydate.pm:25
+msgid "mid-morning %A"
+msgstr "%A metà mattina"
+
+#: ../IkiWiki/Plugin/prettydate.pm:26
+msgid "late %A morning"
+msgstr "%A mattina tardi"
+
+#: ../IkiWiki/Plugin/prettydate.pm:27
+msgid "at lunch time on %A"
+msgstr "%A all'ora di pranzo"
+
+#: ../IkiWiki/Plugin/prettydate.pm:29
+msgid "%A afternoon"
+msgstr "%A pomeriggio"
+
+#: ../IkiWiki/Plugin/prettydate.pm:32
+msgid "late %A afternoon"
+msgstr "%A pomeriggio tardo"
+
+#: ../IkiWiki/Plugin/prettydate.pm:33
+msgid "%A evening"
+msgstr "%A sera"
+
+#: ../IkiWiki/Plugin/prettydate.pm:35
+msgid "late %A evening"
+msgstr "%A sera tardi"
+
+#: ../IkiWiki/Plugin/prettydate.pm:37
+msgid "%A night"
+msgstr "%A notte"
+
+#: ../IkiWiki/Plugin/prettydate.pm:101
+msgid "at teatime on %A"
+msgstr "%A all'ora di merenda"
+
+#: ../IkiWiki/Plugin/prettydate.pm:105
+msgid "at midnight"
+msgstr "a mezzanotte"
+
+#: ../IkiWiki/Plugin/prettydate.pm:108
+msgid "at noon on %A"
+msgstr "%A a mezzogiorno"
+
+#: ../IkiWiki/Plugin/progress.pm:34
+#, perl-format
+msgid "illegal percent value %s"
+msgstr "valore percentuale %s non ammesso"
+
+#: ../IkiWiki/Plugin/progress.pm:59
+msgid "need either `percent` or `totalpages` and `donepages` parameters"
+msgstr "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e \"donepages\""
+
+#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
+msgid "(Diff truncated)"
+msgstr "(Diff troncato)"
+
+#: ../IkiWiki/Plugin/remove.pm:31
+#: ../IkiWiki/Plugin/rename.pm:36
+#, perl-format
+msgid "%s does not exist"
+msgstr "%s non esiste"
+
+#: ../IkiWiki/Plugin/remove.pm:38
+#, perl-format
+msgid "%s is not in the srcdir, so it cannot be deleted"
+msgstr "%s non è in src, quindi non può essere eliminato"
+
+#: ../IkiWiki/Plugin/remove.pm:41
+#: ../IkiWiki/Plugin/rename.pm:45
+#, perl-format
+msgid "%s is not a file"
+msgstr "%s non è un file"
+
+#: ../IkiWiki/Plugin/remove.pm:134
+#, perl-format
+msgid "confirm removal of %s"
+msgstr "conferma rimozione di %s"
+
+#: ../IkiWiki/Plugin/remove.pm:171
+msgid "Please select the attachments to remove."
+msgstr "Selezionare l'allegato da rimuovere."
+
+#: ../IkiWiki/Plugin/remove.pm:211
+msgid "removed"
+msgstr "rimosso"
+
+#: ../IkiWiki/Plugin/rename.pm:42
+#, perl-format
+msgid "%s is not in the srcdir, so it cannot be renamed"
+msgstr "%s non è in src, quindi non può essere rinominato"
+
+#: ../IkiWiki/Plugin/rename.pm:62
+msgid "no change to the file name was specified"
+msgstr "non è stata specificata nessuna modifica al nome del file"
+
+#: ../IkiWiki/Plugin/rename.pm:68
+#, perl-format
+msgid "illegal name"
+msgstr "nome non valido"
+
+#: ../IkiWiki/Plugin/rename.pm:73
+#, perl-format
+msgid "%s already exists"
+msgstr "%s esiste già"
+
+#: ../IkiWiki/Plugin/rename.pm:79
+#, perl-format
+msgid "%s already exists on disk"
+msgstr "%s già presente su disco"
+
+#: ../IkiWiki/Plugin/rename.pm:122
+#, perl-format
+msgid "rename %s"
+msgstr "rinomina di %s"
+
+#: ../IkiWiki/Plugin/rename.pm:161
+msgid "Also rename SubPages and attachments"
+msgstr "Rinomina anche SottoPagine e allegati"
+
+#: ../IkiWiki/Plugin/rename.pm:247
+msgid "Only one attachment can be renamed at a time."
+msgstr "Si può rinominare un solo allegato alla volta."
+
+#: ../IkiWiki/Plugin/rename.pm:250
+msgid "Please select the attachment to rename."
+msgstr "Selezionare l'allegato da rinominare."
+
+#: ../IkiWiki/Plugin/rename.pm:347
+#, perl-format
+msgid "rename %s to %s"
+msgstr "rinomina %s in %s"
+
+#: ../IkiWiki/Plugin/rename.pm:571
+#, perl-format
+msgid "update for rename of %s to %s"
+msgstr "aggiornamento per rinomina di %s in %s"
+
+#: ../IkiWiki/Plugin/search.pm:182
+#, perl-format
+msgid "need Digest::SHA1 to index %s"
+msgstr "è necessario Digest::SHA1 per l'indice di %s"
+
+#: ../IkiWiki/Plugin/search.pm:217
+msgid "search"
+msgstr "cerca"
+
+#: ../IkiWiki/Plugin/shortcut.pm:31
+#, perl-format
+msgid "shortcut plugin will not work without %s"
+msgstr "il plugin scorciatoia non può funzionare senza %s"
+
+#: ../IkiWiki/Plugin/shortcut.pm:44
+msgid "missing name or url parameter"
+msgstr "parametro nome o url mancante"
+
+#. translators: This is used to display what shortcuts are defined.
+#. translators: First parameter is the name of the shortcut, the second
+#. translators: is an URL.
+#: ../IkiWiki/Plugin/shortcut.pm:54
+#, perl-format
+msgid "shortcut %s points to <i>%s</i>"
+msgstr "la scorciatoia %s punta a <i>%s</i>"
+
+#: ../IkiWiki/Plugin/smiley.pm:43
+msgid "failed to parse any smileys"
+msgstr "impossibile interpretare gli smile"
+
+#: ../IkiWiki/Plugin/sparkline.pm:72
+msgid "parse error"
+msgstr "errore nell'interpretazione"
+
+#: ../IkiWiki/Plugin/sparkline.pm:78
+msgid "invalid featurepoint diameter"
+msgstr "Diametro featurepoint non valido"
+
+#: ../IkiWiki/Plugin/sparkline.pm:88
+msgid "invalid featurepoint location"
+msgstr "Posizione featurepoint non valida"
+
+#: ../IkiWiki/Plugin/sparkline.pm:99
+msgid "missing values"
+msgstr "valori mancanti"
+
+#: ../IkiWiki/Plugin/sparkline.pm:104
+msgid "invalid height value"
+msgstr "valore altezza non valido"
+
+#: ../IkiWiki/Plugin/sparkline.pm:111
+msgid "missing width parameter"
+msgstr "parametro larghezza mancante"
+
+#: ../IkiWiki/Plugin/sparkline.pm:115
+msgid "invalid width value"
+msgstr "valore larghezza non valido"
+
+#: ../IkiWiki/Plugin/sparkline.pm:153
+msgid "failed to run php"
+msgstr "impossibile eseguire php"
+
+#: ../IkiWiki/Plugin/table.pm:31
+msgid "cannot find file"
+msgstr "impossibile trovare il file"
+
+#: ../IkiWiki/Plugin/table.pm:87
+msgid "unknown data format"
+msgstr "formato dati sconosiuto"
+
+#: ../IkiWiki/Plugin/table.pm:95
+msgid "empty data"
+msgstr "nessun dato"
+
+#: ../IkiWiki/Plugin/table.pm:114
+msgid "Direct data download"
+msgstr "Scaricamento diretto dei dati"
+
+#: ../IkiWiki/Plugin/table.pm:148
+#, perl-format
+msgid "parse fail at line %d: %s"
+msgstr "errore di interpretazione alla riga %d: %s"
+
+#: ../IkiWiki/Plugin/template.pm:29
+msgid "missing id parameter"
+msgstr "parametro id mancante"
+
+#: ../IkiWiki/Plugin/template.pm:36
+#, perl-format
+msgid "template %s not found"
+msgstr "modello %s non trovato"
+
+#: ../IkiWiki/Plugin/template.pm:55
+msgid "failed to process:"
+msgstr "errore nell'elaborazione:"
+
+#: ../IkiWiki/Plugin/teximg.pm:70
+msgid "missing tex code"
+msgstr "codice tex mancante"
+
+#: ../IkiWiki/Plugin/teximg.pm:77
+msgid "code includes disallowed latex commands"
+msgstr "nel codice sono presenti comandi latex non permessi"
+
+#: ../IkiWiki/Plugin/teximg.pm:128
+msgid "failed to generate image from code"
+msgstr "impossibile generare l'immagine dal codice"
+
+#: ../IkiWiki/Plugin/websetup.pm:89
+msgid "plugin"
+msgstr "plugin"
+
+#: ../IkiWiki/Plugin/websetup.pm:108
+#, perl-format
+msgid "enable %s?"
+msgstr "abilitare %s?"
+
+#: ../IkiWiki/Plugin/websetup.pm:240
+msgid "setup file for this wiki is not known"
+msgstr "il file di setup di questo wiki non è noto"
+
+#: ../IkiWiki/Plugin/websetup.pm:256
+msgid "main"
+msgstr "principale"
+
+#: ../IkiWiki/Plugin/websetup.pm:257
+msgid "plugins"
+msgstr "plugin"
+
+#: ../IkiWiki/Plugin/websetup.pm:395
+msgid "The configuration changes shown below require a wiki rebuild to take effect."
+msgstr "Le sottostanti modifiche alla configurazione richiedono la ricompilazione del wiki."
+
+#: ../IkiWiki/Plugin/websetup.pm:399
+msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki."
+msgstr "Affinché le sottostanti modifiche alla configurazione abbiano effetto, occorre ricostruire il wiki."
+
+#: ../IkiWiki/Plugin/websetup.pm:436
+#, perl-format
+msgid "Error: %s exited nonzero (%s). Discarding setup changes."
+msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
+
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr "impossibile determinare l'id del committer non fidato %s"
+
+#: ../IkiWiki/Receive.pm:85
+#, perl-format
+msgid "bad file name %s"
+msgstr "nome file %s scorretto"
+
+#: ../IkiWiki/Render.pm:264
+#, perl-format
+msgid "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this"
+msgstr "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare allow_symlinks_before_srcdir per abilitare questa configurazione"
+
+#: ../IkiWiki/Render.pm:287
+#: ../IkiWiki/Render.pm:312
+#, perl-format
+msgid "skipping bad filename %s"
+msgstr "ignorato il file dal nome scorretto %s"
+
+#: ../IkiWiki/Render.pm:294
+#, perl-format
+msgid "%s has multiple possible source pages"
+msgstr "%s ha diverse pagine sorgenti possibili"
+
+#: ../IkiWiki/Render.pm:380
+#, perl-format
+msgid "removing old page %s"
+msgstr "rimozione della vecchia pagina %s"
+
+#: ../IkiWiki/Render.pm:421
+#, perl-format
+msgid "scanning %s"
+msgstr "scansione %s"
+
+#: ../IkiWiki/Render.pm:447
+#, perl-format
+msgid "building %s, which links to %s"
+msgstr "compilazione di %s, che è collegato a %s"
+
+#: ../IkiWiki/Render.pm:468
+#, perl-format
+msgid "building %s, which depends on %s"
+msgstr "compilazione di %s, che dipende da %s"
+
+#: ../IkiWiki/Render.pm:507
+#, perl-format
+msgid "building %s, to update its backlinks"
+msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
+
+#: ../IkiWiki/Render.pm:519
+#, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "rimozione di %s, non più richiesto da %s"
+
+#: ../IkiWiki/Render.pm:543
+#, perl-format
+msgid "ikiwiki: cannot build %s"
+msgstr "ikiwiki: impossibile compilare %s"
+
+#. translators: The first parameter is a filename, and the second
+#. translators: is a (probably not translated) error message.
+#: ../IkiWiki/Setup.pm:19
+#, perl-format
+msgid "cannot read %s: %s"
+msgstr "impossibile leggere %s: %s"
+
+#: ../IkiWiki/Setup/Automator.pm:34
+msgid "you must enter a wikiname (that contains alphanumerics)"
+msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)"
+
+#: ../IkiWiki/Setup/Automator.pm:71
+#, perl-format
+msgid "unsupported revision control system %s"
+msgstr "sistema di controllo di revisione %s non supportato"
+
+#: ../IkiWiki/Setup/Automator.pm:97
+msgid "failed to set up the repository with ikiwiki-makerepo"
+msgstr "impossibile creare un repository tramite ikiwiki-makerepo"
+
+#: ../IkiWiki/Setup/Automator.pm:115
+#, perl-format
+msgid "** Disabling plugin %s, since it is failing with this message:"
+msgstr "** Plugin %s disabilitato, a causa della seguente segnalazione di errore:"
+
+#: ../IkiWiki/Wrapper.pm:16
+#, perl-format
+msgid "%s doesn't seem to be executable"
+msgstr "%s non sembra essere eseguibile"
+
+#: ../IkiWiki/Wrapper.pm:20
+msgid "cannot create a wrapper that uses a setup file"
+msgstr "impossibile creare un contenitore che utilizzi un file di setup"
+
+#: ../IkiWiki/Wrapper.pm:24
+msgid "wrapper filename not specified"
+msgstr "nome del file del contenitore non specificato"
+
+#. translators: The parameter is a C filename.
+#: ../IkiWiki/Wrapper.pm:152
+#, perl-format
+msgid "failed to compile %s"
+msgstr "errore nel compilare %s"
+
+#. translators: The parameter is a filename.
+#: ../IkiWiki/Wrapper.pm:172
+#, perl-format
+msgid "successfully generated %s"
+msgstr "%s generato con successo"
+
+#: ../ikiwiki.in:13
+msgid "usage: ikiwiki [options] source dest"
+msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione"
+
+#: ../ikiwiki.in:14
+msgid "       ikiwiki --setup configfile"
+msgstr "       ikiwiki --setup configfile"
+
+#: ../ikiwiki.in:91
+msgid "usage: --set var=value"
+msgstr "utilizzo: --set var=valore"
+
+#: ../ikiwiki.in:140
+msgid "generating wrappers.."
+msgstr "generazione contenitori..."
+
+#: ../ikiwiki.in:199
+msgid "rebuilding wiki.."
+msgstr "ricostruzione wiki..."
+
+#: ../ikiwiki.in:202
+msgid "refreshing wiki.."
+msgstr "aggiornamento wiki..."
+
+#: ../IkiWiki.pm:225
+msgid "Discussion"
+msgstr "Discussione"
+
+#: ../IkiWiki.pm:494
+msgid "Must specify url to wiki with --url when using --cgi"
+msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
+
+#: ../IkiWiki.pm:540
+msgid "cannot use multiple rcs plugins"
+msgstr "impossibile usare più plugin rcs"
+
+#: ../IkiWiki.pm:569
+#, perl-format
+msgid "failed to load external plugin needed for %s plugin: %s"
+msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
+
+#: ../IkiWiki.pm:1243
+#, perl-format
+msgid "preprocessing loop detected on %s at depth %i"
+msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
+
+#: ../IkiWiki.pm:1783
+msgid "yes"
+msgstr "sì"
+
+#: ../IkiWiki.pm:1915
+#, perl-format
+msgid "cannot match pages: %s"
+msgstr "impossibile trovare pagine corrispondenti: %s"
+
+#: ../auto.setup:16
+msgid "What will the wiki be named?"
+msgstr "Quale sarà il nome del wiki?"
+
+#: ../auto.setup:16
+msgid "wiki"
+msgstr "wiki"
+
+#: ../auto.setup:18
+msgid "What revision control system to use?"
+msgstr "Che sistema di controllo di revisione usare?"
+
+#: ../auto.setup:20
+msgid "Which user (wiki account or openid) will be admin?"
+msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
+
+#: ../auto.setup:23
+msgid "What is the domain name of the web server?"
+msgstr "Qual è il nome del dominio del server web?"
+
-- 
cgit v1.2.3


From 24d43bea075354ecd8546131529a064140b9039c Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 20 Aug 2009 16:10:56 -0400
Subject: response

---
 doc/plugins/contrib/cvs/discussion.mdwn | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index e2411af63..847d0f92a 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -3,3 +3,33 @@ post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up.
 That just seems unnecessarily complicated. Why can't ikiwiki itself detect
 the "cvs add <directory>" call and avoid doing anything in that case?
 --[[Joey]] 
+
+> The wrapper wrapper does three things:
+>
+> 7. It ignores `cvs add <directory>`, since this is a weird CVS
+> behavior that ikiwiki gets confused by and doesn't need to act on.
+> 7. It prevents `cvs` locking against itself: `cvs commit` takes a
+> write lock and runs the post-commit hook, which runs `cvs update`,
+> which wants a read lock and sleeps forever -- unless the post-commit
+> hook runs in the background so the commit can "finish".
+> 7. It fails silently if the ikiwiki post-commit hook is missing.
+> CVS doesn't have any magic post-commit filenames, so hooks have to
+> be configured explicitly. I don't think a commit will actually fail
+> if a configured post-commit hook is missing (though I can't test
+> this at the moment).
+>
+> Thing 1 can probably be handled within ikiwiki, if that seems less
+> gross to you.
+>
+> Thing 2 I'm less sure of. (I'd like to see the web UI return
+> immediately on save anyway, to a temporary "rebuilding, please wait
+> if you feel like knowing when it's done" page, but this problem
+> with CVS happens with any kind of commit, and could conceivably
+> happen with some other VCS.)
+>
+> Thing 3 I think I did in order to squelch the error messages that
+> were bollixing up the CGI. It was easy to do this in the wrapper
+> wrapper, but if that's going away, it can be done just as easily
+> with output redirection in `CVSROOT/loginfo`.
+>
+> --[[schmonz]]
-- 
cgit v1.2.3


From 73e562edc865c6357cc1b4c8436e0a44957800e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 21 Aug 2009 16:09:26 -0400
Subject: response

---
 doc/plugins/contrib/cvs/discussion.mdwn | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index 847d0f92a..ed6cf506e 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -20,16 +20,34 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >
 > Thing 1 can probably be handled within ikiwiki, if that seems less
 > gross to you.
->
+
+>> It seems like it might be. You can use a `getopt` hook to check
+>> `@ARGV` to see how it was called. --[[Joey]] 
+
 > Thing 2 I'm less sure of. (I'd like to see the web UI return
 > immediately on save anyway, to a temporary "rebuilding, please wait
 > if you feel like knowing when it's done" page, but this problem
 > with CVS happens with any kind of commit, and could conceivably
 > happen with some other VCS.)
->
+
+>> None of the other VCSes let a write lock block a read lock, apparently.
+>> 
+>> Anyway, re the backgrounding, when committing via the web, the
+>> post-commit hook doesn't run anyway; the rendering is done via the
+>> ikiwiki CGI. It would certianly be nice if it popped up a quick "working"
+>> page and replaced it with the updated page when done, but that's
+>> unrelated;  the post-commit
+>> hook only does rendering when committing using the VCS directly. The
+>> backgrounding you do actually seems safe enough -- but tacking
+>> on a " &" to the ikiwiki wrapper call doesn't need a wrapper script,
+>> does it? --[[Joey]]
+
 > Thing 3 I think I did in order to squelch the error messages that
 > were bollixing up the CGI. It was easy to do this in the wrapper
 > wrapper, but if that's going away, it can be done just as easily
 > with output redirection in `CVSROOT/loginfo`.
 >
 > --[[schmonz]]
+
+>> If the error messages screw up the CGI they must go to stdout.
+>> I thought we had stderr even in the the CVS dark ages. ;-) --[[Joey]] 
-- 
cgit v1.2.3


From 5c0e56d149c6b33d010561f64f583e7ad1c529da Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 21 Aug 2009 22:51:12 -0400
Subject: Put old unixauth plugin under git control. Needs some serious
 attention.

---
 IkiWiki/Plugin/unixauth.pm | 195 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 IkiWiki/Plugin/unixauth.pm

diff --git a/IkiWiki/Plugin/unixauth.pm b/IkiWiki/Plugin/unixauth.pm
new file mode 100644
index 000000000..4f0cb4dd2
--- /dev/null
+++ b/IkiWiki/Plugin/unixauth.pm
@@ -0,0 +1,195 @@
+#!/usr/bin/perl
+# Ikiwiki unixauth authentication.
+package IkiWiki::Plugin::unixauth;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+sub import {
+	hook(type => "getsetup", id => "unixauth", call => \&getsetup);
+		hook(type => "formbuilder_setup", id => "unixauth",
+			call => \&formbuilder_setup);
+		hook(type => "formbuilder", id => "unixauth",
+			call => \&formbuilder);
+	hook(type => "sessioncgi", id => "unixauth", call => \&sessioncgi);
+}
+
+sub getsetup () {
+	return
+	unixauth_type => {
+			type => "string",
+			example => "checkpassword",
+			description => "type of authenticator; can be 'checkpassword' or 'pwauth'",
+			safe => 0,
+			rebuild => 1,
+	},
+	unixauth_command => {
+			type => "string",
+			example => "/path/to/checkpassword",
+			description => "full path and any arguments",
+			safe => 0,
+			rebuild => 1,
+	},
+	unixauth_requiressl => {
+			type => "boolean",
+			example => "1",
+			description => "require SSL? strongly recommended",
+			safe => 0,
+			rebuild => 1,
+	},
+	plugin => {
+			description => "Unix user authentication",
+			safe => 0,
+			rebuild => 1,
+	},
+}
+
+# Checks if a string matches a user's password, and returns true or false.
+sub checkpassword ($$;$) {
+	my $user=shift;
+	my $password=shift;
+	my $field=shift || "password";
+
+	# It's very important that the user not be allowed to log in with
+	# an empty password!
+	if (! length $password) {
+			return 0;
+	}
+
+	my $ret=0;
+	if (! exists $config{unixauth_type}) {
+			# admin needs to carefully think over his configuration
+			return 0;
+	}
+	elsif ($config{unixauth_type} eq "checkpassword") {
+			open UNIXAUTH, "|$config{unixauth_command} true 3<&0" or die("Could not run $config{unixauth_type}");
+			print UNIXAUTH "$user\0$password\0Y123456\0";
+			close UNIXAUTH;
+			$ret=!($?>>8);
+	}
+	elsif ($config{unixauth_type} eq "pwauth") {
+			open UNIXAUTH, "|$config{unixauth_command}" or die("Could not run $config{unixauth_type}");
+			print UNIXAUTH "$user\n$password\n";
+			close UNIXAUTH;
+			$ret=!($?>>8);
+	}
+	else {
+			# no such authentication type
+			return 0;
+	}
+
+	if ($ret) {
+		my $userinfo=IkiWiki::userinfo_retrieve();
+		if (! length $user || ! defined $userinfo ||
+			! exists $userinfo->{$user} || ! ref $userinfo->{$user}) {
+				IkiWiki::userinfo_setall($user, {
+					'email' => '',
+					'regdate' => time,
+				});
+		}
+	}
+
+	return $ret;
+}
+
+sub formbuilder_setup (@) {
+	my %params=@_;
+
+	my $form=$params{form};
+	my $session=$params{session};
+	my $cgi=$params{cgi};
+
+	# if not under SSL, die before even showing a login form,
+	# unless the admin explicitly says it's fine
+	if (! exists $config{unixauth_requiressl}) {
+			$config{unixauth_requiressl} = 1;
+	}
+	if ($config{unixauth_requiressl}) {
+		if ((! $config{sslcookie}) || (! exists $ENV{'HTTPS'})) {
+			die("SSL required to login. Contact your administrator.<br>");
+		}
+	}
+
+	if ($form->title eq "signin") {
+			$form->field(name => "name", required => 0);
+			$form->field(name => "password", type => "password", required => 0);
+
+			if ($form->submitted) {
+					my $submittype=$form->submitted;
+					# Set required fields based on how form was submitted.
+					my %required=(
+							"Login" => [qw(name password)],
+					);
+					foreach my $opt (@{$required{$submittype}}) {
+							$form->field(name => $opt, required => 1);
+					}
+
+					# Validate password against name for Login.
+					if ($submittype eq "Login") {
+							$form->field(
+									name => "password",
+									validate => sub {
+											checkpassword($form->field("name"), shift);
+									},
+							);
+					}
+
+					# XXX is this reachable? looks like no
+					elsif ($submittype eq "Login") {
+							$form->field(
+									name => "name",
+									validate => sub {
+											my $name=shift;
+											length $name &&
+											IkiWiki::userinfo_get($name, "regdate");
+									},
+							);
+					}
+			}
+			else {
+					# First time settings.
+					$form->field(name => "name");
+					if ($session->param("name")) {
+							$form->field(name => "name", value => $session->param("name"));
+					}
+			}
+	}
+	elsif ($form->title eq "preferences") {
+		$form->field(name => "name", disabled => 1,
+				value => $session->param("name"), force => 1,
+				fieldset => "login");
+		$form->field(name => "password", disabled => 1, type => "password",
+				fieldset => "login"),
+	}
+}
+
+sub formbuilder (@) {
+	my %params=@_;
+
+	my $form=$params{form};
+	my $session=$params{session};
+	my $cgi=$params{cgi};
+	my $buttons=$params{buttons};
+
+	if ($form->title eq "signin") {
+		if ($form->submitted && $form->validate) {
+			if ($form->submitted eq 'Login') {
+				$session->param("name", $form->field("name"));
+				IkiWiki::cgi_postsignin($cgi, $session);
+			}
+		}
+	}
+	elsif ($form->title eq "preferences") {
+		if ($form->submitted eq "Save Preferences" && $form->validate) {
+			my $user_name=$form->field('name');
+		}
+	}
+}
+
+sub sessioncgi ($$) {
+	my $q=shift;
+	my $session=shift;
+}
+
+1
-- 
cgit v1.2.3


From 524de4db2639d37aa7049de4363c5d482cd34a0e Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 22 Aug 2009 01:25:41 -0400
Subject: Pass along wrapper args to ikiwiki, then handle the "cvs add dir"
 case with a getopt hook directly in my plugin. If the wrapper change is safe,
 we won't need a wrapper wrapper.

---
 IkiWiki/Plugin/cvs.pm | 8 ++++++++
 IkiWiki/Wrapper.pm    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index c09e4f9aa..076af26f3 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -6,6 +6,7 @@ use strict;
 use IkiWiki;
 
 sub import {
+	hook(type => "getopt", id => "cvs", call => \&getopt);
 	hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
 	hook(type => "getsetup", id => "cvs", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -20,6 +21,13 @@ sub import {
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 }
 
+sub getopt () {
+	# "cvs add dir" acts immediately on the repository.
+	# post-commit gets confused by this and doesn't need to act on it.
+	# If that's why we're here, terminate the process.
+	@ARGV == 3 && $ARGV[1] eq "NONE" && $ARGV[2] eq "NONE" && exit 0;
+}
+
 sub checkconfig () {
 	if (! defined $config{cvspath}) {
 		$config{cvspath}="ikiwiki";
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 6555fe625..4d92716ff 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -139,7 +139,7 @@ $envsave
 	}
 
 $pre_exec
-	execl("$this", "$this", NULL);
+	execv("$this", argv);
 	perror("exec $this");
 	exit(1);
 }
-- 
cgit v1.2.3


From 7849d675a3cf3792a271a2fa9fc9172b394b3f25 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 22 Aug 2009 02:02:34 -0400
Subject: response

---
 doc/plugins/contrib/cvs/discussion.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index ed6cf506e..65b6befd1 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -24,6 +24,13 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >> It seems like it might be. You can use a `getopt` hook to check
 >> `@ARGV` to see how it was called. --[[Joey]] 
 
+>>> This does the trick iff the post-commit wrapper passes its args
+>>> along. Committed on my branch. This seems potentially dangerous,
+>>> since the args passed to ikiwiki are influenced by web commits.
+>>> I don't see an exploit, but for paranoia's sake, maybe the wrapper
+>>> should only be built with execv() if the cvs plugin is loaded?
+>>> --[[schmonz]]
+
 > Thing 2 I'm less sure of. (I'd like to see the web UI return
 > immediately on save anyway, to a temporary "rebuilding, please wait
 > if you feel like knowing when it's done" page, but this problem
@@ -42,6 +49,9 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >> on a " &" to the ikiwiki wrapper call doesn't need a wrapper script,
 >> does it? --[[Joey]]
 
+>>> Nope, it works fine to append it to the `CVSROOT/loginfo` line.
+>>> Fixed on my branch. --[[schmonz]]
+
 > Thing 3 I think I did in order to squelch the error messages that
 > were bollixing up the CGI. It was easy to do this in the wrapper
 > wrapper, but if that's going away, it can be done just as easily
@@ -51,3 +61,10 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 
 >> If the error messages screw up the CGI they must go to stdout.
 >> I thought we had stderr even in the the CVS dark ages. ;-) --[[Joey]] 
+
+>>> Some messages go to stderr, but definitely not all. That's why
+>>> I wound up reaching for IPC::Cmd, to execute the command line
+>>> safely while shutting CVS up. Anyway, I've tested what happens
+>>> if a configured post-commit hook is missing, and it seems fine,
+>>> probably also thanks to IPC::Cmd.
+>>> --[[schmonz]]
-- 
cgit v1.2.3


From 8f15311597c257eca37c1f20769b80ef8f6c82c0 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 22 Aug 2009 02:05:59 -0400
Subject: No more wrapper wrapper.

---
 ikiwiki-makerepo | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index bf33a3a80..aca8da153 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -45,38 +45,12 @@ cvs)
 		exit 1
 	fi
 	cvs -Q -d "$repository" init
-	cat > "$repository/CVSROOT/post-commit-wrapper" <<EOF
-#!/bin/sh
-
-IKIWIKI_POST_COMMIT_HOOK="$repository/CVSROOT/post-commit"
-
-exists_ikiwiki_post_commit_hook() {
-	[ -x \$IKIWIKI_POST_COMMIT_HOOK ];
-}
-
-called_with_exactly_one_dir() {
-	echo "\$@" | grep 'New directory' >/dev/null 2>&1
-}
-
-main() {
-	exists_ikiwiki_post_commit_hook || exit 0
-	called_with_exactly_one_dir "\$@" && exit 0
-	# Return from commit and relinquish write lock. ikiwiki post-commit
-	# wants to "cvs update", which wants to take a read lock.
-	\$IKIWIKI_POST_COMMIT_HOOK &
-	return 0
-}
-
-main "\$@"
-exit \$?
-EOF
-	chmod +x "$repository/CVSROOT/post-commit-wrapper"
 	cd "$srcdir"/..
 	cvs -Q -d "$repository" get -P CVSROOT
 	cd CVSROOT
 	echo .ikiwiki >> cvsignore
 	cvs -Q add cvsignore
-	echo "^ikiwiki $repository/CVSROOT/post-commit-wrapper %{sVv}" >> loginfo
+	echo "^ikiwiki $repository/CVSROOT/post-commit %{sVv} &" >> loginfo
 	cvs -Q commit -m "ikiwiki-makerepo setup" cvsignore loginfo
 	cd ..
 	rm -rf CVSROOT
-- 
cgit v1.2.3


From 5bdcd4d57b2ca5dbf6e3d46a693cec4d27512020 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 22 Aug 2009 02:22:36 -0400
Subject: Oops, use the more recent (and less brittle) directory test.

---
 IkiWiki/Plugin/cvs.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 076af26f3..ac188d4a1 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -25,7 +25,7 @@ sub getopt () {
 	# "cvs add dir" acts immediately on the repository.
 	# post-commit gets confused by this and doesn't need to act on it.
 	# If that's why we're here, terminate the process.
-	@ARGV == 3 && $ARGV[1] eq "NONE" && $ARGV[2] eq "NONE" && exit 0;
+	((grep /New directory/, @ARGV) > 0) && exit 0;
 }
 
 sub checkconfig () {
-- 
cgit v1.2.3


From 2acc71849d78d1dde7ac237e8ebc54d33548e9e7 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 22 Aug 2009 03:52:45 -0400
Subject: no more wrapper wrapper

---
 doc/plugins/contrib/cvs.mdwn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index 23e00201f..6b600eef7 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -22,8 +22,7 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
 * [[ikiwiki-makerepo]]:
  * creates a repository,
  * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
- * creates a small post-commit wrapper to prevent `cvs add <directory>` from being seen by ikiwiki's [[post-commit]] hook (and avoid `cvs` locking against itself),
- * configures the wrapper itself as a post-commit hook in `CVSROOT/loginfo`.
+ * configures the post-commit hook in `CVSROOT/loginfo`.
 * CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below).
 
 ### To do
-- 
cgit v1.2.3


From 78213cf83837132e4dd392a0c98d199a05103d2d Mon Sep 17 00:00:00 2001
From: "http://xn--andreaskrger-llb.myopenid.com/"
 <http://xn--andreaskrger-llb.myopenid.com/@web>
Date: Sat, 22 Aug 2009 06:07:38 -0400
Subject:

---
 doc/sandbox.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index c84d52ef2..b8790d8ca 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -9,6 +9,15 @@ While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97]
 * Kinda curious why **Tcl** does not show her face in this Wiki arena
 * It looks like that I was wrong, from Wikipedia Creole page it mention that ikiwiki is also adopting Creole markup.
 
+---
+
+Guten Morgen aus Deutschland. Wir mögen Umläuter (ich weiß, der Plural ist falsch, aber dafür hat er einen). Die sind heutzutage kein Ärgernis mehr.
+
+&amp;#x263a; becomes &#x263a; 
+
+<script>
+   alert("If this pops, ikiwiki is not cross site scripting safe.")
+</script>
 
 --- 
 I try to have a discussion page !!!
-- 
cgit v1.2.3


From e51f099ed1e73d9b84ad7e26758c1e60f42205b8 Mon Sep 17 00:00:00 2001
From: "http://xn--andreaskrger-llb.myopenid.com/"
 <http://xn--andreaskrger-llb.myopenid.com/@web>
Date: Sat, 22 Aug 2009 06:25:12 -0400
Subject:

---
 doc/sandbox.mdwn | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b8790d8ca..6ea8cc607 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -15,9 +15,7 @@ Guten Morgen aus Deutschland. Wir mögen Umläuter (ich weiß, der Plural ist fa
 
 &amp;#x263a; becomes &#x263a; 
 
-<script>
-   alert("If this pops, ikiwiki is not cross site scripting safe.")
-</script>
+<script>alert("If this pops, ikiwiki is not cross site scripting safe."); /* Fortunately, this does not work. */</script>
 
 --- 
 I try to have a discussion page !!!
-- 
cgit v1.2.3


From 59527de76708616bc8966d0ced3577573c3062b6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 22 Aug 2009 14:29:18 -0400
Subject: uh oh

---
 doc/plugins/contrib/cvs/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index 65b6befd1..b063a53c2 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -31,6 +31,11 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >>> should only be built with execv() if the cvs plugin is loaded?
 >>> --[[schmonz]]
 
+>>>> Hadn't considered that. While in wrapper mode the normal getopt is not
+>>>> done, plugin getopt still runs, and so any unsafe options that 
+>>>> other plugins support could be a problem if another user runs
+>>>> the setuid wrapper and passes those options through. --[[Joey]]
+
 > Thing 2 I'm less sure of. (I'd like to see the web UI return
 > immediately on save anyway, to a temporary "rebuilding, please wait
 > if you feel like knowing when it's done" page, but this problem
-- 
cgit v1.2.3


From 16b0e475487911790fae1b78a89ce94477eb970a Mon Sep 17 00:00:00 2001
From: "http://rtfb.myopenid.com/" <http://rtfb.myopenid.com/@web>
Date: Sun, 23 Aug 2009 11:40:44 -0400
Subject: Added closing parenthesis

---
 doc/setup/byhand.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
index 0184d3d2a..53f8d18bb 100644
--- a/doc/setup/byhand.mdwn
+++ b/doc/setup/byhand.mdwn
@@ -83,7 +83,7 @@ the rest of the files. A good place to put it is in a ~/.ikiwiki/
 subdirectory.
    
 Most of the options, like `wikiname` in the setup file are the same as
-ikiwiki's command line options (documented in [[usage]]. `srcdir` and
+ikiwiki's command line options (documented in [[usage]]). `srcdir` and
 `destdir` are the two directories you specify when running ikiwiki by
 hand. Make sure that these are pointing to the right directories, and
 read through and configure the rest of the file to your liking.
-- 
cgit v1.2.3


From 3d6bc6e1b7145d85cd9495fd0a0d0a6823869368 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 23 Aug 2009 15:18:41 -0400
Subject: Add rsync plugin, though the only rsync-specific thing about it is
 the assumption that uploading an entire site is efficient.

---
 IkiWiki/Plugin/rsync.pm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 IkiWiki/Render.pm       |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 IkiWiki/Plugin/rsync.pm

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
new file mode 100644
index 000000000..630469528
--- /dev/null
+++ b/IkiWiki/Plugin/rsync.pm
@@ -0,0 +1,47 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::rsync;
+
+use warnings;
+no warnings 'redefine';
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "rsync", call => \&getsetup);
+	hook(type => "checkconfig", id => "rsync", call => \&checkconfig);
+	hook(type => "postrefresh", id => "rsync", call => \&postrefresh);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 0,
+			rebuild => 0,
+		},
+		rsync_command => {
+			type => "string",
+			example => "rsync -qa --delete /path/to/destdir/ user\@host:/path/to/docroot/",
+			description => "command to upload regenerated pages to another host",
+			safe => 0,
+			rebuild => 0,
+		},
+}
+
+sub checkconfig {
+	if (! exists $config{rsync_command} ||
+	    ! defined $config{rsync_command}) {
+		error("Must specify rsync_command");
+	}
+}
+
+sub postrefresh () {
+	debug "in postrefresh hook, gonna run rsync";
+	system $config{rsync_command};
+	if ($? == -1) {
+		error("failed to execute rsync_command: $!");
+	} elsif ($? != 0) {
+		error(sprintf("rsync_command exited %d", $? >> 8));
+	}
+}
+
+1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fc8f287ce..74033fa97 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -524,6 +524,7 @@ sub refresh () {
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });
 	}
+	run_hooks(postrefresh => sub { shift->() });
 }
 
 sub commandline_render () {
-- 
cgit v1.2.3


From 844169c9b06830df33ccde8abead015128baa496 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 23 Aug 2009 15:21:39 -0400
Subject: I'm not redefining any subs after all, don't prevent those warnings.

---
 IkiWiki/Plugin/rsync.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 630469528..62ecc4e38 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -2,7 +2,6 @@
 package IkiWiki::Plugin::rsync;
 
 use warnings;
-no warnings 'redefine';
 use strict;
 use IkiWiki 3.00;
 
-- 
cgit v1.2.3


From 0d5a8bc3f060a26069df4c20880888303ff41d55 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 23 Aug 2009 15:41:29 -0400
Subject: new rsync plugin

---
 doc/plugins/contrib/rsync.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 doc/plugins/contrib/rsync.mdwn

diff --git a/doc/plugins/contrib/rsync.mdwn b/doc/plugins/contrib/rsync.mdwn
new file mode 100644
index 000000000..71cd63947
--- /dev/null
+++ b/doc/plugins/contrib/rsync.mdwn
@@ -0,0 +1,21 @@
+[[!template id=plugin name=rsync core=0 author="[[schmonz]]"]]
+
+[[!template id=gitbranch branch=schmonz author="[[schmonz]]"]]
+
+This plugin allows ikiwiki to push generated pages to another host
+by running a command such as `rsync`.
+
+### Usage
+7. Enable automated SSH key exchange between ikiwiki and the remote
+   host. [keychain](http://www.gentoo.org/proj/en/keychain/) makes
+   it easy to use a passphrase-protected key for this purpose. It's
+   also a good idea to specify the exact command line to be permitted
+   in the remote host's `$HOME/.ssh/authorized_keys`.
+7. Set `rsync_command` in your setup file. If you're using a
+   passphrase-protected key, then set `rsync_command` to a shell
+   script which reads `keychain`'s current state before calling
+   `rsync`.
+
+### Implementation details
+* The plugin relies on a new "postrefresh" hook called at the very end of
+  `IkiWiki/Render.pm:refresh()`.
-- 
cgit v1.2.3


From 607534cecc7ab1bfefd1df1bfe19e4d7c338029b Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 23 Aug 2009 15:43:18 -0400
Subject: Explain that command must run unattended, and lose the debug
 statement.

---
 IkiWiki/Plugin/rsync.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 62ecc4e38..3f049457b 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -20,7 +20,7 @@ sub getsetup () {
 		rsync_command => {
 			type => "string",
 			example => "rsync -qa --delete /path/to/destdir/ user\@host:/path/to/docroot/",
-			description => "command to upload regenerated pages to another host",
+			description => "unattended command to upload regenerated pages",
 			safe => 0,
 			rebuild => 0,
 		},
@@ -34,7 +34,6 @@ sub checkconfig {
 }
 
 sub postrefresh () {
-	debug "in postrefresh hook, gonna run rsync";
 	system $config{rsync_command};
 	if ($? == -1) {
 		error("failed to execute rsync_command: $!");
-- 
cgit v1.2.3


From 156625ebac9fdd6d7193c5d997e6fd0141d4d84b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 23 Aug 2009 16:27:18 -0400
Subject: update config file snippet to use current git_wrapper name

---
 doc/tips/laptop_wiki_with_git_extended.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/tips/laptop_wiki_with_git_extended.mdwn b/doc/tips/laptop_wiki_with_git_extended.mdwn
index 620370218..0666da450 100644
--- a/doc/tips/laptop_wiki_with_git_extended.mdwn
+++ b/doc/tips/laptop_wiki_with_git_extended.mdwn
@@ -10,7 +10,7 @@ a bare repo on `gitserver`, and clone that to a workingdir on  gitserver.
   Next create a setup file for the laptop with 
 
         gitorigin_branch=> "",
-        wrapper => "/working/dir/.git/hooks/post-commit",
+        git_wrapper => "/working/dir/.git/hooks/post-commit",
     
   At this point, assuming you followed page above, and not my hasty summary, 
 
@@ -21,7 +21,7 @@ a bare repo on `gitserver`, and clone that to a workingdir on  gitserver.
 2. Now create a setup file for the server (I call it server.setup).
 
         gitorigin_branch=> "origin",
-        wrapper => "/repo/wiki.git/hooks/post-update.ikiwiki"
+        git_wrapper => "/repo/wiki.git/hooks/post-update.ikiwiki"
        
   Note the non-standard and bizzare name of the hook.   
 
-- 
cgit v1.2.3


From b43c25001453674feb1ca862325222da67bc758c Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Sun, 23 Aug 2009 17:54:38 -0400
Subject: use a map instead

---
 doc/users/schmonz.mdwn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index 752880561..8273bdbb6 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -1,4 +1,3 @@
 [Amitai Schlair](http://www.columbia.edu/~ays2105/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing:
 
-* [[plugins/contrib/unixauth]]
-* [[plugins/contrib/cvs]]
+[[!map pages="link(users/schmonz) and plugins/* and !*/Discussion"]]
-- 
cgit v1.2.3


From 18a7b65094ca761fea0785a81f3c0923ea66b018 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 23 Aug 2009 18:15:56 -0400
Subject: response

---
 doc/plugins/contrib/cvs/discussion.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index b063a53c2..2de938fb7 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -36,6 +36,19 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >>>> other plugins support could be a problem if another user runs
 >>>> the setuid wrapper and passes those options through. --[[Joey]]
 
+>>>>> I've tried compiling the argument check into the wrapper as
+>>>>> the first thing main() does, and was surprised to find that
+>>>>> this doesn't prevent the `cvs add <dir>` deadlock in a web
+>>>>> commit. I was convinced this'd be a reasonable solution,
+>>>>> especially if conditionalized on the cvs plugin being loaded,
+>>>>> but it doesn't work. And I stuck debug printfs at the beginning
+>>>>> of all the rcs_foo() subs, and whatever `cvs add <dir>` is
+>>>>> doing to ikiwiki isn't visible to my plugin, because none of
+>>>>> those subs are getting called. Nuts. Can you think of anything
+>>>>> else that might solve the problem, or should I go back to
+>>>>> generating a minimal wrapper wrapper that checks for just
+>>>>> this one thing? --[[schmonz]]
+
 > Thing 2 I'm less sure of. (I'd like to see the web UI return
 > immediately on save anyway, to a temporary "rebuilding, please wait
 > if you feel like knowing when it's done" page, but this problem
-- 
cgit v1.2.3


From 5da229aa51adcec27b109ebe2e696f7426cbd781 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 23 Aug 2009 18:25:02 -0400
Subject: Instead of passing the args through the wrapper so the CVS plugin can
 evaluate them, check them in the wrapper right off the bat. This doesn't
 prevent the deadlock in web commits that need to cvs add directories, but I'm
 committing so Joey can take a look if he wants.

---
 IkiWiki/Wrapper.pm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 4d92716ff..2354717c3 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -44,6 +44,17 @@ EOF
 		$test_receive=IkiWiki::Receive::gen_wrapper();
 	}
 
+	my $check_cvs_add_dir="";
+	# XXX conditionalize on $config{rcs} eq 'cvs'
+	$check_cvs_add_dir=<<"EOF";
+	{
+		int j;
+		for (j = 1; j < argc; j++)
+			if (strcmp(argv[j], "New directory") == 0)
+				exit(0);
+	}
+EOF
+
 	my $check_commit_hook="";
 	my $pre_exec="";
 	if ($config{post_commit}) {
@@ -119,6 +130,7 @@ addenv(char *var, char *val) {
 int main (int argc, char **argv) {
 	char *s;
 
+$check_cvs_add_dir
 $check_commit_hook
 $test_receive
 $envsave
@@ -139,7 +151,7 @@ $envsave
 	}
 
 $pre_exec
-	execv("$this", argv);
+	execl("$this", "$this", NULL);
 	perror("exec $this");
 	exit(1);
 }
-- 
cgit v1.2.3


From 80ca685385cd827f19718eaea5fb772782f68d3b Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 23 Aug 2009 23:27:53 -0400
Subject: why I needed this, in case it's useful to someone else

---
 doc/plugins/contrib/rsync/discussion.mdwn | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 doc/plugins/contrib/rsync/discussion.mdwn

diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn
new file mode 100644
index 000000000..a2c2eb725
--- /dev/null
+++ b/doc/plugins/contrib/rsync/discussion.mdwn
@@ -0,0 +1,27 @@
+## A use case
+
+Why I needed this plugin: I have two web servers available to me
+for a project. Neither does everything I need, but together they
+do. (This is a bit like the [Amazon S3
+scenario](http://kitenet.net/~joey/blog/entry/running_a_wiki_on_Amazon_S3/).)
+
+Server (1) is a university web server. It provides plentiful space
+and bandwidth, easy authentication for people editing the wiki, and
+a well-known stable URL. The wiki really wants to live here and
+very easily could except that the server doesn't allow arbitrary
+CGIs.
+
+Server (2) is provided by a generous alumnus's paid [[tips/DreamHost]]
+account. Disk and particularly network usage need to be minimized
+because over some threshold it costs him. CGI, etc. are available.
+
+My plan was to host the wiki on server (1) by taking advantage of
+server (2) to store the repository, source checkout, and generated
+pages, to host the repository browser, and to handle ikiwiki's CGI
+operations. In order for this to work, web edits on (2) would need
+to automatically push any changed pages to (1).
+
+As a proof of concept, I added an rsync post-commit hook after
+ikiwiki's usual. It worked, just not for web edits, which is how
+the wiki will be used. So I wrote this plugin to finish the job.
+The wiki now lives on (1), and clicking "edit" just works.
-- 
cgit v1.2.3


From a27861c512bcf5808c59d9bc2b38c80b559d6d69 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Mon, 24 Aug 2009 03:13:25 -0400
Subject: Comment on another possible solution to the use case.

---
 doc/plugins/contrib/rsync/discussion.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn
index a2c2eb725..b2d21e6d5 100644
--- a/doc/plugins/contrib/rsync/discussion.mdwn
+++ b/doc/plugins/contrib/rsync/discussion.mdwn
@@ -25,3 +25,14 @@ As a proof of concept, I added an rsync post-commit hook after
 ikiwiki's usual. It worked, just not for web edits, which is how
 the wiki will be used. So I wrote this plugin to finish the job.
 The wiki now lives on (1), and clicking "edit" just works.
+
+> Just out of interest, why use `rsync` and not `git push`.  i.e. a
+> different setup to solve the same problem would be to run a
+> normal ikiwiki setup on the universities server with its git
+> repository available over ssh (same security setup your using
+> for rsync should work for git over ssh).  On the cgi-capable server,
+> when it would rsync, make it git push.  It would seem that git
+> has enough information that it should be able to be more
+> network efficient.  It also means that corruption at one end
+> wouldn't be propagated to the other end. -- [[Will]]
+
-- 
cgit v1.2.3


From 8d504e6b3dcacd333c0b07387e7acd3bf8a65d9c Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Mon, 24 Aug 2009 04:20:31 -0400
Subject: response

---
 doc/plugins/contrib/rsync/discussion.mdwn | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn
index b2d21e6d5..20c04af0f 100644
--- a/doc/plugins/contrib/rsync/discussion.mdwn
+++ b/doc/plugins/contrib/rsync/discussion.mdwn
@@ -24,7 +24,7 @@ to automatically push any changed pages to (1).
 As a proof of concept, I added an rsync post-commit hook after
 ikiwiki's usual. It worked, just not for web edits, which is how
 the wiki will be used. So I wrote this plugin to finish the job.
-The wiki now lives on (1), and clicking "edit" just works.
+The wiki now lives on (1), and clicking "edit" just works. --[[schmonz]]
 
 > Just out of interest, why use `rsync` and not `git push`.  i.e. a
 > different setup to solve the same problem would be to run a
@@ -36,3 +36,13 @@ The wiki now lives on (1), and clicking "edit" just works.
 > network efficient.  It also means that corruption at one end
 > wouldn't be propagated to the other end. -- [[Will]]
 
+>> Hey, that's a nice solution. (The site was in svn to begin with,
+>> but it's in git now.) One advantage of my approach in this particular
+>> case: server (1) doesn't have `git` installed, but does have `rsync`,
+>> so (1)'s environment can remain completely untweaked other than the
+>> SSH arrangement. I kind of like that all the sysadmin effort is
+>> contained on one host.
+>>
+>> This plugin is definitely still useful for projects not able to use
+>> a DVCS (of which I've got at least one other), and possibly for
+>> other uses not yet imagined. ;-) --[[schmonz]]
-- 
cgit v1.2.3


From f5187ed0b50d363ad16c6273b986f7e4fccc6c5d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 24 Aug 2009 14:08:20 -0400
Subject: clarify and add link

---
 doc/shortcuts.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 14cd5ff2b..d9c2e1937 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -62,9 +62,9 @@ This page controls what shortcut links the wiki supports.
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-text passed to the named shortcut, after url-encoding it, and '%S' is
-replaced with the raw, non-encoded text. The optional `desc` parameter
-controls the description of the link.
+text passed to the named shortcut, after [[!wikipedia url-encoding]]
+it, and '%S' is replaced with the raw, non-encoded text. The optional
+`desc` parameter controls the description of the link.
 
 Remember that the `name` you give the shortcut will become a new
 [[ikiwiki/directive]].  Avoid using a `name` that conflicts
@@ -73,5 +73,5 @@ parameter that will override the one provided at definition time.
 
 If you come up with a shortcut that you think others might find useful,
 consider contributing it to the [shortcuts page on the ikiwiki
-ikiwiki](http://ikiwiki.info/shortcuts/), so that future versions of
+wiki](http://ikiwiki.info/shortcuts/), so that future versions of
 ikiwiki will include your shortcut in the standard underlay.
-- 
cgit v1.2.3


From 004d460d9cc1fc6a691bc6eaa0d5cd2a9206c224 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 24 Aug 2009 14:09:58 -0400
Subject: fix link

---
 doc/shortcuts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index d9c2e1937..500146a31 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -62,7 +62,7 @@ This page controls what shortcut links the wiki supports.
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-text passed to the named shortcut, after [[!wikipedia url-encoding]]
+text passed to the named shortcut, after [[!wikipedia url_encoding]]
 it, and '%S' is replaced with the raw, non-encoded text. The optional
 `desc` parameter controls the description of the link.
 
-- 
cgit v1.2.3


From 43db8269a002daf00ac6195d4bd70018b4b68b75 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 24 Aug 2009 15:47:24 -0400
Subject: response

---
 doc/plugins/contrib/cvs/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index 2de938fb7..e1fa6e428 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -49,6 +49,9 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >>>>> generating a minimal wrapper wrapper that checks for just
 >>>>> this one thing? --[[schmonz]]
 
+>>>>>> I don't see how there could possibly be a difference between
+>>>>>> ikiwiki's C wrapper and your shell wrapper wrapper here. --[[Joey]]
+
 > Thing 2 I'm less sure of. (I'd like to see the web UI return
 > immediately on save anyway, to a temporary "rebuilding, please wait
 > if you feel like knowing when it's done" page, but this problem
-- 
cgit v1.2.3


From 68b6926420172f69a05bccbdbe7776755cd92a27 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 24 Aug 2009 15:51:05 -0400
Subject: fixed via getsource plugin

---
 doc/todo/Raw_view_link.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Raw_view_link.mdwn b/doc/todo/Raw_view_link.mdwn
index fd64074c2..b62a9022b 100644
--- a/doc/todo/Raw_view_link.mdwn
+++ b/doc/todo/Raw_view_link.mdwn
@@ -4,7 +4,7 @@ The configuration setting for Mercurial could be something like this:
 
     rawurl => "http://localhost:8000//raw-file/tip/\[[file]]",
 
-> What I want to do when I want to see if the raw source is either
+> What I do when I want to see if the raw source is either
 > click on the edit link, or click on history and navigate to it in the
 > history browser (easier to do in viewvc than in gitweb, IIRC).
 > Not that I'm opposed to the idea of a plugin that adds a Raw link
@@ -14,4 +14,6 @@ The configuration setting for Mercurial could be something like this:
 >> to gitweb/etc. I think Will's patch is a good approach, and have improved
 >> on it a bit in a git branch.
 
+>>> Since that is merged in now, I'm marking this [[done]] --[[Joey]] 
+
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 6b97e8f0ee74bb2f3189f669deefe0a227b0fc6f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 24 Aug 2009 15:52:56 -0400
Subject: close as wontfix

---
 doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn b/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn
index 0fb14bafe..4489dd5d2 100644
--- a/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn
+++ b/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn
@@ -23,4 +23,4 @@ that we're at the root of a (sub-)hierarchy.
 
 >> This sounds like WONTFIX to me? --[[smcv]]
 
-[[!tag wishlist]]
+[[!tag wishlist done]]
-- 
cgit v1.2.3


From cc665380e3c9998ef04f1e42320cecd152ffd23c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 24 Aug 2009 15:57:10 -0400
Subject: move undownloadable item to discussion page

---
 doc/css_market.mdwn            | 11 -----------
 doc/css_market/discussion.mdwn | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index 61254c4b8..c0e349552 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -23,17 +23,6 @@ gnomes will convert them to css files..)
   Debian lighttpd index.html page.
   [[!meta stylesheet="embeddedmoose"]]
 
-* **Refresh**, contributed by [[FredericLespez]]. Adapted from a free template
-  designed by [styleshout](http://www.styleshout.com).
-  You can see it [here](http://fred.ccheznous.org). You can download the local.css file and
-  the modified templates [here](http://fred.ccheznous.org/refresh_20060602.tgz).
-
-    * This link (above) seems to deliver an empty tarball.
-
-    * You'll find a updated version of these templates [here](http://www.der-winnie.de/~winnie/configs/ikiwiki-templates.tar.gz). 
-       These templates are known to work with ikiwiki 2.31, and since I'll install always the newest one on my server I'll will update them on a regular basis.
-        * (This link appears to be broken?)
-
 * **[[02_Template.css]]**, contributed and adapted by [maxx](http://martin.wuertele.net/), [original](http://www.openwebdesign.org/viewdesign.phtml?id=3057)
   designed by [jarico](http://www.openwebdesign.org/userinfo.phtml?user=jcarico) 
   (License: public domain). You'll need a modified page.tmpl
diff --git a/doc/css_market/discussion.mdwn b/doc/css_market/discussion.mdwn
index 86d16de9a..3dc47b55a 100644
--- a/doc/css_market/discussion.mdwn
+++ b/doc/css_market/discussion.mdwn
@@ -18,3 +18,20 @@ The most recent version is always available at: <http://git.upsilon.cc/cgi-bin/g
 ----
 
 Added small changes to embeddedmoose.css to work with ikiwiki 3.x.  Figured here is as good as any until Josh can review and update if he so chooses:  <http://bosboot.org/tb-embeddedmoose.css>.  It removes annoying borders around the header and footer.  -- [[TimBosse]]
+
+-----
+
+I removed this from the list since both places to download it are broken.
+--[[Joey]] 
+
+* **Refresh**, contributed by [[FredericLespez]]. Adapted from a free template
+  designed by [styleshout](http://www.styleshout.com).
+  You can see it [here](http://fred.ccheznous.org). You can download the local.css file and
+  the modified templates [here](http://fred.ccheznous.org/refresh_20060602.tgz).
+
+    * This link (above) seems to deliver an empty tarball.
+
+    * You'll find a updated version of these templates [here](http://www.der-winnie.de/~winnie/configs/ikiwiki-templates.tar.gz). 
+       These templates are known to work with ikiwiki 2.31, and since I'll install always the newest one on my server I'll will update them on a regular basis.
+        * (This link appears to be broken?)
+
-- 
cgit v1.2.3


From fe4f176f725b069ac74561600bba982c2d9ad607 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Jun 2009 15:54:53 +0100
Subject: Optimize the dependencies list

On a large wiki you can spend a lot of time reading through large lists
of dependencies to see whether files need to be rebuilt (album, with its
one-page-per-photo arrangement, suffers particularly badly from this).

The dependency list is currently a single pagespec, but it's not used like
a normal pagespec - in practice, it's a list of pagespecs joined with the
"or" operator.

Accordingly, change it to be stored as a list of pagespecs. On a wiki
with many tagged photo albums, this reduces the time to refresh after
`touch tags/*.mdwn` from about 31 to 25 seconds.

Getting the benefit of this change on an existing wiki requires a rebuild.
---
 IkiWiki.pm         | 19 +++++++++++++------
 IkiWiki/Render.pm  | 24 +++++++++++++-----------
 ikiwiki-transition |  2 +-
 t/index.t          | 12 ++++++------
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 43ffb1fd8..3e94c8a25 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1507,8 +1507,11 @@ sub loadindex () {
 				$links{$page}=$d->{links};
 				$oldlinks{$page}=[@{$d->{links}}];
 			}
-			if (exists $d->{depends}) {
-				$depends{$page}=$d->{depends};
+			if (exists $d->{dependslist}) {
+				$depends{$page}=$d->{dependslist};
+			}
+			elsif (exists $d->{depends}) {
+				$depends{$page}=[$d->{depends}];
 			}
 			if (exists $d->{state}) {
 				$pagestate{$page}=$d->{state};
@@ -1554,7 +1557,8 @@ sub saveindex () {
 		};
 
 		if (exists $depends{$page}) {
-			$index{page}{$src}{depends} = $depends{$page};
+			$index{page}{$src}{depends} = join(" or ", @{$depends{$page}});
+			$index{page}{$src}{dependslist} = $depends{$page};
 		}
 
 		if (exists $pagestate{$page}) {
@@ -1724,14 +1728,17 @@ sub rcs_receive () {
 sub add_depends ($$) {
 	my $page=shift;
 	my $pagespec=shift;
-	
+
 	return unless pagespec_valid($pagespec);
 
 	if (! exists $depends{$page}) {
-		$depends{$page}=$pagespec;
+		$depends{$page}=[$pagespec];
 	}
 	else {
-		$depends{$page}=pagespec_merge($depends{$page}, $pagespec);
+		foreach my $p (@{$depends{$page}}) {
+			return 1 if $p eq $pagespec;
+		}
+		push @{$depends{$page}}, $pagespec;
 	}
 
 	return 1;
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 578142d2e..08d484847 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -455,20 +455,22 @@ sub refresh () {
 		my @changed=(keys %rendered, @del);
 
 		# rebuild dependant pages
-		foreach my $f (@$files) {
+		F: foreach my $f (@$files) {
 			next if $rendered{$f};
 			my $p=pagename($f);
 			if (exists $depends{$p}) {
-				# only consider internal files
-				# if the page explicitly depends on such files
-				foreach my $file (@changed, $depends{$p}=~/internal\(/ ? @internal : ()) {
-					next if $f eq $file;
-					my $page=pagename($file);
-					if (pagespec_match($page, $depends{$p}, location => $p)) {
-						debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
-						render($f);
-						$rendered{$f}=1;
-						last;
+				foreach my $d (@{$depends{$p}}) {
+					# only consider internal files
+					# if the page explicitly depends on such files
+					foreach my $file (@changed, $d=~/internal\(/ ? @internal : ()) {
+						next if $f eq $file;
+						my $page=pagename($file);
+						if (pagespec_match($page, $d, location => $p)) {
+							debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
+							render($f);
+							$rendered{$f}=1;
+							next F;
+						}
 					}
 				}
 			}
diff --git a/ikiwiki-transition b/ikiwiki-transition
index 398b1a3c8..60cea3d54 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -299,7 +299,7 @@ sub oldloadindex {
 			$pagemtime{$page}=$items{mtime}[0];
 			$oldlinks{$page}=[@{$items{link}}];
 			$links{$page}=[@{$items{link}}];
-			$depends{$page}=$items{depends}[0] if exists $items{depends};
+			$depends{$page}=[$items{depends}[0]] if exists $items{depends};
 			$destsources{$_}=$page foreach @{$items{dest}};
 			$renderedfiles{$page}=[@{$items{dest}}];
 			$pagecase{lc $page}=$page;
diff --git a/t/index.t b/t/index.t
index e79609902..107dac9d0 100755
--- a/t/index.t
+++ b/t/index.t
@@ -32,9 +32,9 @@ $renderedfiles{"bar.png"}=["bar.png"];
 $links{"Foo"}=["bar.png"];
 $links{"bar"}=["Foo", "new-page"];
 $links{"bar.png"}=[];
-$depends{"Foo"}="";
-$depends{"bar"}="foo*";
-$depends{"bar.png"}="";
+$depends{"Foo"}=[];
+$depends{"bar"}=["foo*"];
+$depends{"bar.png"}=[];
 $pagestate{"bar"}{meta}{title}="a page about bar";
 $pagestate{"bar"}{meta}{moo}="mooooo";
 # only loaded plugins save state, so this should not be saved out
@@ -80,9 +80,9 @@ is_deeply(\%links, {
 	"bar.png" => [],
 }, "%links loaded correctly");
 is_deeply(\%depends, {
-	Foo => "",
-	bar => "foo*",
-	"bar.png" => "",
+	Foo => [],
+	bar => ["foo*"],
+	"bar.png" => [],
 }, "%depends loaded correctly");
 is_deeply(\%pagestate, {
 	bar => {
-- 
cgit v1.2.3


From b6fcb1cb0ef27e5a63184440675d465fad652acf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Jun 2009 15:55:55 +0100
Subject: calendar, inline, map: don't pre-join dependencies

The new dependency handling works better (eliminates more duplicates) if
dependencies are split up. On the same wiki mentioned in the previous
commit, this saves about a second (i.e. 4%) on the same test.
---
 IkiWiki/Plugin/calendar.pm | 4 +++-
 IkiWiki/Plugin/inline.pm   | 4 +++-
 IkiWiki/Plugin/map.pm      | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index c25893f72..5d16dff75 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -212,7 +212,9 @@ EOF
 	add_depends($params{page}, $params{pages});
 	# Explicitly add all currently linked pages as dependencies, so
 	# that if they are removed, the calendar will be sure to be updated.
-	add_depends($params{page}, join(" or ", @list));
+	foreach my $p (@list) {
+		add_depends($params{page}, $p);
+	}
 
 	return $calendar;
 }
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 3a2f4b7bc..a501566b5 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -251,7 +251,9 @@ sub preprocess_inline (@) {
 	# Explicitly add all currently displayed pages as dependencies, so
 	# that if they are removed or otherwise changed, the inline will be
 	# sure to be updated.
-	add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
+	foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
+		add_depends($params{page}, $p);
+	}
 	
 	if ($feeds && exists $params{feedpages}) {
 		@feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 826dbbd66..54146dc46 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -73,7 +73,9 @@ sub preprocess (@) {
 	add_depends($params{page}, $params{pages});
 	# Explicitly add all currently shown pages, to detect when pages
 	# are removed.
-	add_depends($params{page}, join(" or ", keys %mapitems));
+	foreach my $item (keys %mapitems) {
+		add_depends($params{page}, $item);
+	}
 
 	# Create the map.
 	my $parent="";
-- 
cgit v1.2.3


From 2cf26fd709efa802b93109935b4203590d549810 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 24 Aug 2009 22:18:46 +0100
Subject: Don't bother to save {depends} to the index

As per Joey's review.
---
 IkiWiki.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 3e94c8a25..734b167cf 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1557,7 +1557,6 @@ sub saveindex () {
 		};
 
 		if (exists $depends{$page}) {
-			$index{page}{$src}{depends} = join(" or ", @{$depends{$page}});
 			$index{page}{$src}{dependslist} = $depends{$page};
 		}
 
-- 
cgit v1.2.3


From 7227c2debfeef94b35f7d81f42900aa01820caa3 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 24 Aug 2009 23:01:42 +0100
Subject: Use a hash to de-duplicate dependencies

---
 IkiWiki.pm         | 19 ++++++-------------
 IkiWiki/Render.pm  |  2 +-
 ikiwiki-transition |  2 +-
 t/index.t          | 12 ++++++------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 734b167cf..21a74adce 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1508,10 +1508,12 @@ sub loadindex () {
 				$oldlinks{$page}=[@{$d->{links}}];
 			}
 			if (exists $d->{dependslist}) {
-				$depends{$page}=$d->{dependslist};
+				$depends{$page}={
+					map { $_ => 1 } @{$d->{dependslist}}
+				};
 			}
 			elsif (exists $d->{depends}) {
-				$depends{$page}=[$d->{depends}];
+				$depends{$page}={$d->{depends} => 1};
 			}
 			if (exists $d->{state}) {
 				$pagestate{$page}=$d->{state};
@@ -1557,7 +1559,7 @@ sub saveindex () {
 		};
 
 		if (exists $depends{$page}) {
-			$index{page}{$src}{dependslist} = $depends{$page};
+			$index{page}{$src}{dependslist} = [ keys %{$depends{$page}} ];
 		}
 
 		if (exists $pagestate{$page}) {
@@ -1730,16 +1732,7 @@ sub add_depends ($$) {
 
 	return unless pagespec_valid($pagespec);
 
-	if (! exists $depends{$page}) {
-		$depends{$page}=[$pagespec];
-	}
-	else {
-		foreach my $p (@{$depends{$page}}) {
-			return 1 if $p eq $pagespec;
-		}
-		push @{$depends{$page}}, $pagespec;
-	}
-
+	$depends{$page}{$pagespec} = 1;
 	return 1;
 }
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 08d484847..b9f1d7754 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -459,7 +459,7 @@ sub refresh () {
 			next if $rendered{$f};
 			my $p=pagename($f);
 			if (exists $depends{$p}) {
-				foreach my $d (@{$depends{$p}}) {
+				foreach my $d (keys %{$depends{$p}}) {
 					# only consider internal files
 					# if the page explicitly depends on such files
 					foreach my $file (@changed, $d=~/internal\(/ ? @internal : ()) {
diff --git a/ikiwiki-transition b/ikiwiki-transition
index 60cea3d54..795ab31cb 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -299,7 +299,7 @@ sub oldloadindex {
 			$pagemtime{$page}=$items{mtime}[0];
 			$oldlinks{$page}=[@{$items{link}}];
 			$links{$page}=[@{$items{link}}];
-			$depends{$page}=[$items{depends}[0]] if exists $items{depends};
+			$depends{$page}={ $items{depends}[0] => 1 } if exists $items{depends};
 			$destsources{$_}=$page foreach @{$items{dest}};
 			$renderedfiles{$page}=[@{$items{dest}}];
 			$pagecase{lc $page}=$page;
diff --git a/t/index.t b/t/index.t
index 107dac9d0..2f23524a7 100755
--- a/t/index.t
+++ b/t/index.t
@@ -32,9 +32,9 @@ $renderedfiles{"bar.png"}=["bar.png"];
 $links{"Foo"}=["bar.png"];
 $links{"bar"}=["Foo", "new-page"];
 $links{"bar.png"}=[];
-$depends{"Foo"}=[];
-$depends{"bar"}=["foo*"];
-$depends{"bar.png"}=[];
+$depends{"Foo"}={};
+$depends{"bar"}={"foo*" => 1};
+$depends{"bar.png"}={};
 $pagestate{"bar"}{meta}{title}="a page about bar";
 $pagestate{"bar"}{meta}{moo}="mooooo";
 # only loaded plugins save state, so this should not be saved out
@@ -80,9 +80,9 @@ is_deeply(\%links, {
 	"bar.png" => [],
 }, "%links loaded correctly");
 is_deeply(\%depends, {
-	Foo => [],
-	bar => ["foo*"],
-	"bar.png" => [],
+	Foo => {},
+	bar => {"foo*" => 1},
+	"bar.png" => {},
 }, "%depends loaded correctly");
 is_deeply(\%pagestate, {
 	bar => {
-- 
cgit v1.2.3


From e4cd168ebedd95585290c97ff42234344bfed46c Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 24 Aug 2009 23:16:15 +0100
Subject: Allow add_depends to take an arrayref

---
 IkiWiki.pm                 | 9 +++++++++
 IkiWiki/Plugin/calendar.pm | 4 +---
 IkiWiki/Plugin/inline.pm   | 4 +---
 IkiWiki/Plugin/map.pm      | 4 +---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 21a74adce..35fee1aa7 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1730,6 +1730,15 @@ sub add_depends ($$) {
 	my $page=shift;
 	my $pagespec=shift;
 
+	if (ref $pagespec eq 'ARRAY') {
+		foreach my $ps (@$pagespec) {
+			if (pagespec_valid($ps)) {
+				$depends{$page}{$ps} = 1;
+			}
+		}
+		return;
+	}
+
 	return unless pagespec_valid($pagespec);
 
 	$depends{$page}{$pagespec} = 1;
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 5d16dff75..ce0719404 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -212,9 +212,7 @@ EOF
 	add_depends($params{page}, $params{pages});
 	# Explicitly add all currently linked pages as dependencies, so
 	# that if they are removed, the calendar will be sure to be updated.
-	foreach my $p (@list) {
-		add_depends($params{page}, $p);
-	}
+	add_depends($params{page}, \@list);
 
 	return $calendar;
 }
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a501566b5..b566d960f 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -251,9 +251,7 @@ sub preprocess_inline (@) {
 	# Explicitly add all currently displayed pages as dependencies, so
 	# that if they are removed or otherwise changed, the inline will be
 	# sure to be updated.
-	foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
-		add_depends($params{page}, $p);
-	}
+	add_depends($params{page}, $#list >= $#feedlist ? \@list : \@feedlist);
 	
 	if ($feeds && exists $params{feedpages}) {
 		@feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 54146dc46..cc977024d 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -73,9 +73,7 @@ sub preprocess (@) {
 	add_depends($params{page}, $params{pages});
 	# Explicitly add all currently shown pages, to detect when pages
 	# are removed.
-	foreach my $item (keys %mapitems) {
-		add_depends($params{page}, $item);
-	}
+	add_depends($params{page}, [keys %mapitems]);
 
 	# Create the map.
 	my $parent="";
-- 
cgit v1.2.3


From 275dd5c4ea748261741236a62ad763c775a651c5 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 25 Aug 2009 00:02:27 +0100
Subject: IkiWiki::pagename: memoize results

This relies for its correctness on %config, %hooks and pagetype() not
changing.
---
 IkiWiki.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 35fee1aa7..8a8695768 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -661,9 +661,15 @@ sub pagetype ($) {
 	return;
 }
 
+my %pagename_cache;
+
 sub pagename ($) {
 	my $file=shift;
 
+	if (exists $pagename_cache{$file}) {
+		return $pagename_cache{$file};
+	}
+
 	my $type=pagetype($file);
 	my $page=$file;
  	$page=~s/\Q.$type\E*$//
@@ -672,6 +678,8 @@ sub pagename ($) {
 	if ($config{indexpages} && $page=~/(.*)\/index$/) {
 		$page=$1;
 	}
+
+	$pagename_cache{$file} = $page;
 	return $page;
 }
 
-- 
cgit v1.2.3


From df8ab3406d67dd7d97fc45324ebb0e30c30dc9b0 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 25 Aug 2009 00:21:19 +0100
Subject: use pagespec_match_list

---
 IkiWiki/Render.pm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index b9f1d7754..fb28b6e3b 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -462,15 +462,17 @@ sub refresh () {
 				foreach my $d (keys %{$depends{$p}}) {
 					# only consider internal files
 					# if the page explicitly depends on such files
-					foreach my $file (@changed, $d=~/internal\(/ ? @internal : ()) {
-						next if $f eq $file;
-						my $page=pagename($file);
-						if (pagespec_match($page, $d, location => $p)) {
-							debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
-							render($f);
-							$rendered{$f}=1;
-							next F;
-						}
+					my @pages = map {
+						pagename($_)
+					} grep {
+						$_ ne $f
+					} (@changed, $d =~ /internal\(/ ? @internal : ());
+					@pages = pagespec_match_list(\@pages, $d, location => $p);
+					if (@pages) {
+						debug(sprintf(gettext("building %s, which depends on %s"), $f, $pages[0]));
+						render($f);
+						$rendered{$f}=1;
+						next F;
 					}
 				}
 			}
-- 
cgit v1.2.3


From bc6e50a075b164100d3144a13633647613a3dc8e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 1 Aug 2009 12:43:04 +0100
Subject: Mark "should optimise pagespecs" as done

---
 doc/todo/should_optimise_pagespecs.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 1594dcee7..5ed24d333 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -90,6 +90,8 @@ I can think about reducung the size of my wiki source and making it available on
 >> rather than a single pagespec. This does turn out to be faster, although
 >> not as much as I'd like. --[[smcv]]
 
+>>> [[Merged|done]] --[[smcv]]
+
 >>> I just wanted to note that there is a whole long discussion of dependencies and pagespecs on the [[todo/tracking_bugs_with_dependencies]] page. -- [[Will]]
 
 >>>> Yeah, I had a look at that (as the only other mention of `pagespec_merge`).
-- 
cgit v1.2.3


From 1ea8580a5f912c305f8ea89431b39033522c657e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 25 Jul 2009 20:04:04 +0100
Subject: Remove now-unused function pagespec_merge

Now that dependencies are a list of pagespecs with an implicit "or"
operation, there's no need to try to merge pagespecs under normal use.

ikiwiki-transition contains the only use of the function, so move
it there rather than deleting it entirely (it's used to concatenate all
admins' lists of locked pages).
---
 IkiWiki.pm         |  8 --------
 ikiwiki-transition | 10 ++++++++++
 t/pagespec_merge.t | 44 --------------------------------------------
 3 files changed, 10 insertions(+), 52 deletions(-)
 delete mode 100755 t/pagespec_merge.t

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8a8695768..06a0b7a2c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1833,14 +1833,6 @@ sub add_link ($$) {
 		unless grep { $_ eq $link } @{$links{$page}};
 }
 
-sub pagespec_merge ($$) {
-	my $a=shift;
-	my $b=shift;
-
-	return $a if $a eq $b;
-	return "($a) or ($b)";
-}
-
 sub pagespec_translate ($) {
 	my $spec=shift;
 
diff --git a/ikiwiki-transition b/ikiwiki-transition
index 795ab31cb..8a20cf655 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -335,4 +335,14 @@ sub get_banned_users () {
 	return @ret;
 }
 
+# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
+# setup file) now.
+sub pagespec_merge ($$) {
+	my $a=shift;
+	my $b=shift;
+
+	return $a if $a eq $b;
+	return "($a) or ($b)";
+}
+
 1
diff --git a/t/pagespec_merge.t b/t/pagespec_merge.t
deleted file mode 100755
index 9e38d5761..000000000
--- a/t/pagespec_merge.t
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use Test::More tests => 25;
-
-BEGIN { use_ok("IkiWiki"); }
-
-sub same {
-	my $a=shift;
-	my $b=shift;
-	my $match=shift;
-	
-	my $imatch=(pagespec_match($match, $a) ||
-		    pagespec_match($match, $b));
-	my $cmatch=pagespec_match($match, IkiWiki::pagespec_merge($a, $b));
-	
-	return $imatch == $cmatch;
-}
-
-ok(same("foo", "bar", "foo"), "basic match 1");
-ok(same("foo", "bar", "bar"), "basic match 2");
-ok(same("foo", "bar", "foobar"), "basic failed match");
-ok(same("foo", "!bar", "foo"), "basic match with inversion");
-ok(same("foo", "!bar", "bar"), "basic failed match with inversion");
-ok(same("!foo", "bar", "foo"), "basic failed match with inversion 2");
-ok(same("!foo", "bar", "bar"), "basic match with inversion 2");
-ok(same("!foo", "!bar", "foo"), "double inversion failed match");
-ok(same("!foo", "!bar", "bar"), "double inversion failed match 2");
-ok(same("*", "!bar", "foo"), "glob+inversion match");
-ok(same("*", "!bar", "bar"), "matching glob and matching inversion");
-ok(same("* and !foo", "!bar", "bar"), "matching glob and matching inversion");
-ok(same("* and !foo", "!bar", "foo"), "matching glob with matching inversion and non-matching inversion");
-ok(same("* and !foo", "!foo", "foo"), "matching glob with matching inversion and matching inversion");
-ok(same("b??", "!b??", "bar"), "matching glob and matching inverted glob");
-ok(same("f?? !f??", "!bar", "bar"), "matching glob and matching inverted glob");
-ok(same("b??", "!b?z", "bar"), "matching glob and non-matching inverted glob");
-ok(same("f?? !f?z", "!bar", "bar"), "matching glob and non-matching inverted glob");
-ok(same("!foo bar baz", "!bar", "bar"), "matching list and matching inversion");
-ok(pagespec_match("foo/Discussion",
-	IkiWiki::pagespec_merge("* and !*/Discussion", "*/Discussion")), "should match");
-ok(same("* and !*/Discussion", "*/Discussion", "foo/Discussion"), "Discussion merge 1");
-ok(same("*/Discussion", "* and !*/Discussion", "foo/Discussion"), "Discussion merge 2");
-ok(same("*/Discussion !*/bar", "*/bar !*/Discussion", "foo/Discussion"), "bidirectional merge 1");
-ok(same("*/Discussion !*/bar", "*/bar !*/Discussion", "foo/bar"), "bidirectional merge 2");
-- 
cgit v1.2.3


From 848bb66c37b94b633a378e186e561aebb7bab43a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 1 Aug 2009 12:43:37 +0100
Subject: Indicate that pagespec_merge() is no longer needed (much rejoicing?)

---
 doc/todo/tracking_bugs_with_dependencies.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index a198530fc..bfdbf0875 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -410,8 +410,8 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>>> then the last definition (baz) takes precedence.
 >>>>> In the process of writing this I think I've come up with a way to change this back the way it was, still using closures. -- [[Will]]
 
->>> Alternatively, my [[remove-pagespec-merge|should_optimise_pagespecs]]
->>> branch solves this, in a Gordian knot sort of way :-) --[[smcv]]
+>>> My [[remove-pagespec-merge|should_optimise_pagespecs]] branch has now
+>>> solved all this by deleting the offending function :-) --[[smcv]]
 
 >>  Secondly, it seems that there are two types of dependency, and ikiwiki
 >>  currently only handles one of them.  The first type is "Rebuild this
-- 
cgit v1.2.3


From 68fd245addb9b96b473949349440b86796955cce Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 25 Aug 2009 00:45:28 +0100
Subject: Respond with benchmarks and an updated branch

---
 doc/todo/should_optimise_pagespecs.mdwn | 79 +++++++++++++++++++++++++++++++--
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 1594dcee7..3dfa8e1f2 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -123,7 +123,12 @@ uses it still), and otherwise just bloats the index.
 >> It is acceptable not to support downgrades.
 >> I don't think we need a NEWS file update since any sort of refresh,
 >> not just a full rebuild, will cause the indexdb to be loaded and saved,
->> enabling the optimisation. --[[Joey]] 
+>> enabling the optimisation. --[[Joey]]
+
+>>> A refresh will load the current dependencies from `{depends}` and save
+>>> them as-is as a one-element `{dependslist}`; only a rebuild will replace
+>>> the single complex pagespec with a long list of simpler pagespecs.
+>>> --[[smcv]]
 
 Is an array the right data structure? `add_depends` has to loop through the
 array to avoid dups, it would be better if a hash were used there. Since
@@ -149,7 +154,9 @@ to avoid..
 >> a bit faster. --[[smcv]]
 
 >>> It depends, really. And it'd certianly make sense to benchmark such a
->>> change. --[[Joey]] 
+>>> change. --[[Joey]]
+
+>>>> Benchmarked, below. --[[smcv]]
 
 Also, since a lot of places are calling add_depends in a loop, it probably
 makes sense to just make it accept a list of dependencies to add. It'll be
@@ -163,7 +170,10 @@ when adding a lot of depends at once.
 >> Well, I was thinking that it might be sufficient to build a `%seen`
 >> hash of dependencies inside `add_depends`, if the places that call
 >> it lots were changed to just call it once. Of course the only way to
->> tell is benchmarking. --[[Joey]] 
+>> tell is benchmarking. --[[Joey]]
+
+>>> It doesn't seem that it significantly affects performance either way.
+>>> --[[smcv]]
 
 In Render.pm, we now have a triply nested loop, which is a bit
 scary for efficiency. It seems there should be a way to
@@ -180,7 +190,70 @@ out.
 >> run more often than before. That function is pretty inexpensive, but..
 >> --[[Joey]]
 
+>>> I don't see anything that can be hoisted without significant refactoring,
+>>> actually. Beware that there are two pagename calls in the loop: one for
+>>> `$f` (which is the page we might want to rebuild), and one for `$file`
+>>> (which is the changed page that it might depend on). Note that I didn't
+>>> choose those names!
+>>>
+>>> The three loops are over source files, their lists of dependency pagespecs,
+>>> and files that might have changed. I see the following things we might be
+>>> doing redundantly:
+>>>
+>>> * If `$file` is considered as a potential dependency for more than
+>>>   one `$f`, we evaluate `pagename($file)` more than once. Potential fix:
+>>>   cache them (this turns out to save about half a second on the docwiki,
+>>>   see below).
+>>> * If several pages depend on the same pagespec, we evaluate whether each
+>>>   changed page matches that pagespec more than once: however, we do so
+>>>   with a different location parameter every time, so repeated calls are,
+>>>   in the general case, the only correct thing to do. Potential fix:
+>>>   perhaps special-case "page x depends on page y and nothing else"
+>>>   (i.e. globs that have no wildcards) into a separate hash? I haven't
+>>>   done anything in this direction.
+>>> * Any preparatory work done by pagespec_match (converting the pagespec
+>>>   into Perl, mostly?) is done in the inner loop; switching to
+>>>   pagespec_match_list (significant refactoring) saves more than half a
+>>>   second on the docwiki.
+>>>
+>>> --[[smcv]]
+
 Very good catch on img/meta using the wrong dependency; verified in the wild!
 (I've cherry-picked those bug fixes.)
 
+----
+
+Benchmarking results: I benchmarked by altering docwiki.setup to switch off
+verbose, running "make clean && ./Makefile.PL && make", and timing one rebuild
+of the docwiki followed by three refreshes. Before each refresh I used
+`touch plugins/*.mdwn` to have something significant to refresh.
+
+I'm assuming that "user" CPU time is the important thing here (system time was
+relatively small in all cases, up to 0.35 seconds per run).
+
+master at the time of rebasing: 14.20s to rebuild, 10.04/12.07/14.01s to
+refresh. I think you can see the bug clearly here - the pagespecs are getting
+more complicated every time!
+
+After the initial optimization: 14.27s to rebuild, 8.26/8.33/8.26 to refresh.
+Success!
+
+Not pre-joining dependencies actually took about ~0.2s more; I don't know why.
+I'm worried that duplicates will just build up (again) in less simple cases,
+though, so 0.2s is probably a small price to pay for that not happening (it
+might well be experimental error, for that matter).
+
+Not saving {depends} to the index, using a hash instead of a list to
+de-duplicate, and allowing add_depends to take an arrayref instead of a single
+pagespec had no noticable positive or negative effect on this test.
+
+Memoizing the results of pagename brought the rebuild time down to 14.06s
+and the refresh time down to 7.96/7.92/7.92, a significant win.
+
+Refactoring to use pagespec_match_list looks more risky from a code churn
+point of view; rebuild now takes 14.35s, but refresh is only 7.30/7.29/7.28,
+another significant win.
+
+--[[smcv]]
+
 [[!tag wishlist patch patch/core]]
-- 
cgit v1.2.3


From 96936899da3037fa28f8be73003a14aa829878ee Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 24 Aug 2009 21:54:22 -0400
Subject: at this point I'm down to deciding which specific commits to merge
 and which were dead ends

---
 doc/todo/should_optimise_pagespecs.mdwn | 42 +++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 3dfa8e1f2..f3048f328 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -235,6 +235,21 @@ master at the time of rebasing: 14.20s to rebuild, 10.04/12.07/14.01s to
 refresh. I think you can see the bug clearly here - the pagespecs are getting
 more complicated every time!
 
+> I can totally see a bug here, and it's one I didn't think existed. Ie,
+> I thought that after the first refresh, the pagespec should stabalize,
+> and what it stabalized to was probably unnecessarily long, but not
+> growing w/o bounds!
+> 
+> a) Explains why ikiwiki.info has been so slow lately. Well that and some
+>    other things that overloaded the system.
+> b) Suggests to me we will probably want to force a rebuild on upgrade
+>    when fixing this (via the mechanism in the postinst).
+> 
+> BTW, the underlying bug here is really horribly simple:
+> When refreshing, `loadindex` preserves the previous depends list,
+> and `add_depends` adds stuff to it. So it doubles every time a page is
+> re-rendered during refresh. --[[Joey]]
+
 After the initial optimization: 14.27s to rebuild, 8.26/8.33/8.26 to refresh.
 Success!
 
@@ -243,17 +258,44 @@ I'm worried that duplicates will just build up (again) in less simple cases,
 though, so 0.2s is probably a small price to pay for that not happening (it
 might well be experimental error, for that matter).
 
+> It's weird that the suggested optimisations to
+> `add_depends` had no effect. So, the commit message to
+> b6fcb1cb0ef27e5a63184440675d465fad652acf is actually wrong.. ? --[[Joey]] 
+
 Not saving {depends} to the index, using a hash instead of a list to
 de-duplicate, and allowing add_depends to take an arrayref instead of a single
 pagespec had no noticable positive or negative effect on this test.
 
+> I see e4cd168ebedd95585290c97ff42234344bfed46c is still in your branch
+> though. I don't like using an arrayref, it could just take `($page, @depends)`.
+> and I don't see the need to keep it if it doesn't currently help.
+> 
+> Is there any reason to keep 7227c2debfeef94b35f7d81f42900aa01820caa3
+> if it doesn't improve speed?
+> --[[Joey]] 
+
 Memoizing the results of pagename brought the rebuild time down to 14.06s
 and the refresh time down to 7.96/7.92/7.92, a significant win.
 
+> Ok, that seems safe to memoize. (It's a real function and it isn't
+> called with a great many inputs.) Why did you chose to memoize it
+> explicitly rather than adding it to the memoize list at the top?
+
 Refactoring to use pagespec_match_list looks more risky from a code churn
 point of view; rebuild now takes 14.35s, but refresh is only 7.30/7.29/7.28,
 another significant win.
 
 --[[smcv]]
 
+> I had mostly convinced myself that
+> `pagespec_match_list` would not lead to a speed gain here. My reasoning
+> was that you want to stop after finding one match, while `pagespec_match_list`
+> checks all pages for matches. So what we're seeing is that
+> on a rebuild, `@changed` is all pages, and not short-circuiting leads
+> to unnecessary work. OTOH, on refresh, `@changed` is small and I suppose
+> `pagespec_match_list`'s other slight efficiencies win out somehow.
+> 
+> Welcome to the "I made ikiwiki twice as fast
+> and all I got was this lousy git sha1sum" club BTW :-) --[[Joey]] 
+
 [[!tag wishlist patch patch/core]]
-- 
cgit v1.2.3


From 134a25d1633513afd9506318aeb4349381dc061e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 24 Aug 2009 22:10:12 -0400
Subject: better analysis of why the depends keep growing

---
 doc/todo/should_optimise_pagespecs.mdwn | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index f3048f328..2dd1f7b9e 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -244,11 +244,13 @@ more complicated every time!
 >    other things that overloaded the system.
 > b) Suggests to me we will probably want to force a rebuild on upgrade
 >    when fixing this (via the mechanism in the postinst).
-> 
-> BTW, the underlying bug here is really horribly simple:
-> When refreshing, `loadindex` preserves the previous depends list,
-> and `add_depends` adds stuff to it. So it doubles every time a page is
-> re-rendered during refresh. --[[Joey]]
+>
+> I've investigated why the pagespecs keep growing: When page A changes,
+> its old depends are cleared. Then
+> page B that inlines A gets rebuilt, and its old depends are also cleared.
+> But page B also inlines page C; which means C gets re-rendered. And this
+> happens w/o its old depends being cleared, so C's depends are doubled.
+> --[[Joey]]
 
 After the initial optimization: 14.27s to rebuild, 8.26/8.33/8.26 to refresh.
 Success!
-- 
cgit v1.2.3


From 99626615ff41a257090414bf500a83674e8fdc27 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 25 Aug 2009 13:39:33 -0400
Subject: Fix example blog's tags/life to not have a broken PageSpec. Closes:
 #543510

---
 debian/changelog                 | 2 ++
 doc/examples/blog/tags/life.mdwn | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5b021ec24..cfe45c3b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
     Closes: #542036
   * po: Fixed to run rcs_add ralative to srcdir.
   * Italian program translation from Luca Bruno.
+  * Fix example blog's tags/life to not have a broken PageSpec.
+    Closes: #543510
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
index ddc2e646c..719f2b192 100644
--- a/doc/examples/blog/tags/life.mdwn
+++ b/doc/examples/blog/tags/life.mdwn
@@ -1,4 +1,4 @@
 This feed contains pages in the "life" category.
 
-[[!inline pages="link(tags/life) and ./posts/* and !*/Discussion"
+[[!inline pages="link(tags/life) and !*/Discussion"
 show="10" actions=yes]]
-- 
cgit v1.2.3


From 5bcdc39999025062d201ae16babc0eabc2f4d976 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 25 Aug 2009 17:11:29 -0400
Subject: Revert "Allow add_depends to take an arrayref"

This reverts commit e4cd168ebedd95585290c97ff42234344bfed46c.

There was no benefit to this change.
---
 IkiWiki.pm                 | 9 ---------
 IkiWiki/Plugin/calendar.pm | 4 +++-
 IkiWiki/Plugin/inline.pm   | 4 +++-
 IkiWiki/Plugin/map.pm      | 4 +++-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8a8695768..871170992 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1738,15 +1738,6 @@ sub add_depends ($$) {
 	my $page=shift;
 	my $pagespec=shift;
 
-	if (ref $pagespec eq 'ARRAY') {
-		foreach my $ps (@$pagespec) {
-			if (pagespec_valid($ps)) {
-				$depends{$page}{$ps} = 1;
-			}
-		}
-		return;
-	}
-
 	return unless pagespec_valid($pagespec);
 
 	$depends{$page}{$pagespec} = 1;
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index ce0719404..5d16dff75 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -212,7 +212,9 @@ EOF
 	add_depends($params{page}, $params{pages});
 	# Explicitly add all currently linked pages as dependencies, so
 	# that if they are removed, the calendar will be sure to be updated.
-	add_depends($params{page}, \@list);
+	foreach my $p (@list) {
+		add_depends($params{page}, $p);
+	}
 
 	return $calendar;
 }
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index b566d960f..a501566b5 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -251,7 +251,9 @@ sub preprocess_inline (@) {
 	# Explicitly add all currently displayed pages as dependencies, so
 	# that if they are removed or otherwise changed, the inline will be
 	# sure to be updated.
-	add_depends($params{page}, $#list >= $#feedlist ? \@list : \@feedlist);
+	foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
+		add_depends($params{page}, $p);
+	}
 	
 	if ($feeds && exists $params{feedpages}) {
 		@feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index cc977024d..54146dc46 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -73,7 +73,9 @@ sub preprocess (@) {
 	add_depends($params{page}, $params{pages});
 	# Explicitly add all currently shown pages, to detect when pages
 	# are removed.
-	add_depends($params{page}, [keys %mapitems]);
+	foreach my $item (keys %mapitems) {
+		add_depends($params{page}, $item);
+	}
 
 	# Create the map.
 	my $parent="";
-- 
cgit v1.2.3


From aeea77e5c434bf432ea574c62e685cf655af15bd Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 25 Aug 2009 22:18:52 +0100
Subject: reply

---
 doc/todo/should_optimise_pagespecs.mdwn | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 2dd1f7b9e..5dd3b1e34 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -264,6 +264,9 @@ might well be experimental error, for that matter).
 > `add_depends` had no effect. So, the commit message to
 > b6fcb1cb0ef27e5a63184440675d465fad652acf is actually wrong.. ? --[[Joey]] 
 
+>> I'll try benchmarking again on the non-public wiki where I had the 4%
+>> speedup. The docwiki is so small that 4% is hard to measure... --[[smcv]]
+
 Not saving {depends} to the index, using a hash instead of a list to
 de-duplicate, and allowing add_depends to take an arrayref instead of a single
 pagespec had no noticable positive or negative effect on this test.
@@ -271,11 +274,17 @@ pagespec had no noticable positive or negative effect on this test.
 > I see e4cd168ebedd95585290c97ff42234344bfed46c is still in your branch
 > though. I don't like using an arrayref, it could just take `($page, @depends)`.
 > and I don't see the need to keep it if it doesn't currently help.
-> 
+
+>> I'll drop it. --[[smcv]]
+
 > Is there any reason to keep 7227c2debfeef94b35f7d81f42900aa01820caa3
 > if it doesn't improve speed?
 > --[[Joey]] 
 
+>> I'll try benchmarking on a more complex wiki and see whether it has a
+>> positive or negative effect. It does avoid being O(n**2) in number of
+>> dependencies. --[[smcv]]
+
 Memoizing the results of pagename brought the rebuild time down to 14.06s
 and the refresh time down to 7.96/7.92/7.92, a significant win.
 
@@ -283,6 +292,9 @@ and the refresh time down to 7.96/7.92/7.92, a significant win.
 > called with a great many inputs.) Why did you chose to memoize it
 > explicitly rather than adding it to the memoize list at the top?
 
+>> It does depend on global variables, so using Memoize seemed like asking for
+>> trouble. I suppose what I did is equivalent to Memoize though... --[[smcv]]
+
 Refactoring to use pagespec_match_list looks more risky from a code churn
 point of view; rebuild now takes 14.35s, but refresh is only 7.30/7.29/7.28,
 another significant win.
-- 
cgit v1.2.3


From 2ef6b15973290619fdcbda2e323dbb50224622cb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 25 Aug 2009 17:27:32 -0400
Subject: changelog and news file, also make postinst rebuild on upgrade

---
 debian/NEWS      | 10 ++++++++++
 debian/changelog | 10 ++++++++--
 debian/postinst  |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 75b6d0471..535708872 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+ikiwiki (3.1415926) UNRELEASED; urgency=low
+
+  In order to fix a performance bug, all wikis need to be rebuilt on
+  upgrade to this version. If you listed your wiki in
+  /etc/ikiwiki/wikilist this will be done automatically when the
+  Debian package is upgraded. Or use ikiwiki-mass-rebuild to force
+  a rebuild.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 25 Aug 2009 17:24:43 -0400
+
 ikiwiki (3.13) unstable; urgency=low
 
   The `ikiwiki-transition deduplinks` command introduced in the
diff --git a/debian/changelog b/debian/changelog
index cfe45c3b3..0d3f61e6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.141593) UNRELEASED; urgency=low
+ikiwiki (3.1415926) UNRELEASED; urgency=low
 
   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
     the old version, but continue. Closes: #541205 
@@ -22,6 +22,12 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
   * Italian program translation from Luca Bruno.
   * Fix example blog's tags/life to not have a broken PageSpec.
     Closes: #543510
+  * Optimize the dependencies list. This also fixes a bug
+    that could cause repeated refreshes of the wiki to grow
+    increasingly larger dependency lists, and get increasingly
+    slower. (smcv)
+  * Rebuild wikis on upgrade to this version to fix bloat caused
+    by the dependency bug.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
@@ -29,7 +35,7 @@ ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
-  * po: New plugin, suporting translation of wiki pages using po files.
+  * po: New plugin<F11>, suporting translation of wiki pages using po files.
     (intrigeri)
   * Add build machinery to build po files to translate the underlay wikis,
   * Add further build machinery to generate translated underlays from
diff --git a/debian/postinst b/debian/postinst
index 0a836a0b2..2ba26e5b6 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=2.52
+firstcompat=3.1415926
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then
-- 
cgit v1.2.3


From 7dd9b65db4dae3aca473f15ea7dcdbf88c8acb1b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 25 Aug 2009 17:46:15 -0400
Subject: don't use pagespec_match_list

This should be more efficient than pagespec_match_list since it short-circuits
after the first match is found.

The other problem with using pagespec_match_list here is it may throw an
error if a bad or failing pagespec somehow got into the dependencies.
---
 IkiWiki/Render.pm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fb28b6e3b..da2d7b4cc 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -460,19 +460,21 @@ sub refresh () {
 			my $p=pagename($f);
 			if (exists $depends{$p}) {
 				foreach my $d (keys %{$depends{$p}}) {
+					my $sub=pagespec_translate($d);
+					next if $@ || ! defined $sub;
+
 					# only consider internal files
-					# if the page explicitly depends on such files
-					my @pages = map {
-						pagename($_)
-					} grep {
-						$_ ne $f
-					} (@changed, $d =~ /internal\(/ ? @internal : ());
-					@pages = pagespec_match_list(\@pages, $d, location => $p);
-					if (@pages) {
-						debug(sprintf(gettext("building %s, which depends on %s"), $f, $pages[0]));
-						render($f);
-						$rendered{$f}=1;
-						next F;
+					# if the page explicitly depends
+					# on such files
+					foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
+						next if $file eq $f;
+						my $page=pagename($file);
+						if ($sub->($page, location => $p)) {
+							debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
+							render($f);
+							$rendered{$f}=1;
+							next F;
+						}
 					}
 				}
 			}
-- 
cgit v1.2.3


From 0113c69d4fb5f55da932cb26e9eb58709d12e5a5 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 26 Aug 2009 07:02:29 +0200
Subject: po: (hopefully) fixed WikiLink to self with po_link_to=default

---
 IkiWiki/Plugin/po.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 414906999..ea0e56467 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -547,6 +547,9 @@ sub mybestlink ($$) {
 	my $page=shift;
 	my $link=shift;
 
+	return $origsubs{'bestlink'}->($page, $link)
+		if $config{po_link_to} eq "default";
+
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
 	if (length $res
 	    && ($config{po_link_to} eq "current" || $config{po_link_to} eq "negotiated")
-- 
cgit v1.2.3


From 145d89a6fc03936cc36d70946a8471da9bfe468a Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@web>
Date: Wed, 26 Aug 2009 01:05:07 -0400
Subject: po: maybe fixed self links

---
 doc/plugins/po.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index dca2f5d66..b4c8b135e 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -260,7 +260,9 @@ If a page contains a WikiLink to itself, ikiwiki does not normally
 turn that into a hyperlink. However, if a translated page contains a
 WikiLink to itself, a hyperlink is inserted, at least with the default
 `po_link_to` the link points to the English version of the page. Is there a
-good reason for that to be done? --[[Joey]] 
+good reason for that to be done? --[[Joey]]
+
+> The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]]
 
 Language display order
 ----------------------
-- 
cgit v1.2.3


From 7bd7e78e4a7d31c460909776057687e0e29dba12 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@web>
Date: Wed, 26 Aug 2009 01:41:55 -0400
Subject: po: commenting some TODO items

---
 doc/plugins/po.mdwn | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index b4c8b135e..45630d763 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -282,12 +282,23 @@ That used to be so, but the bug was fixed. Does this mean
 that po might be replacing the only link on a page, in error? 
 --[[Joey]] 
 
+> It would replace it. The only problematic case is when another
+> plugin has its own reasons, in its `scan` hook, to add a page
+> that is already there to `$links{$page}`. This other plugin's
+> effect might then be changed by po's `scan` hook... which could
+> be either good (better overall l10n) or bad (break the other
+> plugin's goal). --[[intrigeri]]
+
 Name of toplevel index page
 ---------------------------
 
 Normally at the top index page of a wiki, you see the wiki name at
 the top. However, at the top *translated* index page, you see something
-like "index.da". --[[Joey]] 
+like "index.da". --[[Joey]]
+
+> I suggest changing `Render.pm`, line 115, to replace the `$page eq 'index'`
+> test with a predicate call such as isindexpage($page). Such a predicate
+> function could then be overriden by the po plugin. --[[intrigeri]]
 
 Pagespecs
 ---------
-- 
cgit v1.2.3


From 496e8523c6706d096f1b794e3f3ba5dd2fa260f3 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 26 Aug 2009 07:56:33 +0200
Subject: po: do not beautify urls on the recentchanges page

... else, the recentchanges page shows a link such as "sandbox.es". But,
clicking on it goes to the English (or negotiated language) version of the page.

It is better in this one case if the link goes direct to the translated version
of the page.
---
 IkiWiki/Plugin/po.pm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index ea0e56467..88d021388 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -605,17 +605,21 @@ sub myurlto ($$;$) {
 	# so that one is redirected to the just-edited page rather than to the
 	# negociated translation; to prevent unnecessary fiddling with caller/inject,
 	# we only do so when our beautify_urlpath would actually do what we want to
-	# avoid, i.e. when po_link_to = negotiated
+	# avoid, i.e. when po_link_to = negotiated.
+	# also avoid doing so when run by cgi_goto, so that the links on recentchanges
+	# page actually lead to the exact page they pretend to.
 	if ($config{po_link_to} eq "negotiated") {
 		my @caller = caller(1);
-		my $run_by_editpage = 0;
-		$run_by_editpage = 1 if (exists $caller[3] && defined $caller[3]
-					 && $caller[3] eq "IkiWiki::cgi_editpage");
+		my $use_orig = 0;
+		$use_orig = 1 if (exists $caller[3] && defined $caller[3]
+				 && ($caller[3] eq "IkiWiki::cgi_editpage" ||
+				     $caller[3] eq "IkiWiki::Plugin::goto::cgi_goto")
+				 );
 		inject(name => "IkiWiki::beautify_urlpath", call => $origsubs{'beautify_urlpath'})
-			if $run_by_editpage;
+			if $use_orig;
 		my $res = $origsubs{'urlto'}->($to,$from,$absolute);
 		inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath)
-			if $run_by_editpage;
+			if $use_orig;
 		return $res;
 	}
 	else {
-- 
cgit v1.2.3


From d5a04b2de9ce027c0e4cd47c9342bcd3db7f9f27 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@web>
Date: Wed, 26 Aug 2009 02:00:48 -0400
Subject: po: more TODO items comments and patches

---
 doc/plugins/po.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 45630d763..079a36633 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -335,6 +335,10 @@ When a po file is changed, the recentchanges page shows a link such as
 language) version of the page. It would be better in this one case if
 the link went direct to the translated version of the page. --[[Joey]] 
 
+> The (untested) commit 496e8523c670 in my po branch might fix this...
+> or at least, I believe, put someone on the right track.
+> --[[intrigeri]]
+
 Double commits of po files
 --------------------------
 
-- 
cgit v1.2.3


From cc76cd64024ed09eff2a3e2da1282497e8c4e21b Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Wed, 26 Aug 2009 09:59:39 -0400
Subject: suggestion

---
 doc/todo/tmplvars_plugin/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/todo/tmplvars_plugin/discussion.mdwn

diff --git a/doc/todo/tmplvars_plugin/discussion.mdwn b/doc/todo/tmplvars_plugin/discussion.mdwn
new file mode 100644
index 000000000..93cb9b414
--- /dev/null
+++ b/doc/todo/tmplvars_plugin/discussion.mdwn
@@ -0,0 +1 @@
+I find this plugin quite usefull. But one thing, I would like to be able to do is set a tmplvar e.g. in a sidebar so that it affects all Pages this sidebar is used in. --martin
-- 
cgit v1.2.3


From 155347837a6757bd85f9b15778133622daa006c0 Mon Sep 17 00:00:00 2001
From: "https://infosoph.myopenid.com/" <https://infosoph.myopenid.com/@web>
Date: Wed, 26 Aug 2009 10:25:48 -0400
Subject: initial report

---
 .../defintion_lists_appear_to_be_disabled.mdwn     | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 doc/bugs/defintion_lists_appear_to_be_disabled.mdwn

diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
new file mode 100644
index 000000000..c9756617d
--- /dev/null
+++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
@@ -0,0 +1,38 @@
+Adding text of the format 
+
+    Apple
+    :   Pomaceous fruit of plants of the genus Malus in 
+        the family Rosaceae.
+    :   An american computer company.
+
+    Orange
+    :   The fruit of an evergreen tree of the genus Citrus.
+
+Does not result in expected HTML as described in the [MultiMarkdown Syntax Guide](http://fletcherpenney.net/multimarkdown/users_guide/multimarkdown_syntax_guide/):
+
+Should be 
+
+    <dl xmlns="http://www.w3.org/1999/xhtml">
+    <dt>Apple</dt>
+     <dd>
+       <p>Pomaceous fruit of plants of the genus Malus in 
+          the family Rosaceae.</p>
+     </dd>
+     <dd>
+       <p>An american computer company.</p>
+    </dd>
+    <dt>Orange</dt>
+     <dd>
+      <p>The fruit of an evergreen tree of the genus Citrus.</p>
+     </dd>
+    </dl>
+
+But instead it gives:
+
+    <p>Apple
+     :   Pomaceous fruit of plants of the genus Malus in 
+         the family Rosaceae.
+     :   An american computer company.</p>
+
+    <p>Orange
+    :   The fruit of an evergreen tree of the genus Citrus.</p>
-- 
cgit v1.2.3


From 2996f0b5ee0b3a06d6476eff57b40cb2d8fc587a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 26 Aug 2009 13:04:09 -0400
Subject: fix emphasis examples to actually work

---
 doc/ikiwiki/formatting.mdwn |   2 +-
 po/fr.po                    |  34 ++++----
 po/ikiwiki.pot              |  22 ++---
 po/it.po                    | 195 +++++++++++++++++++++++++-------------------
 4 files changed, 144 insertions(+), 109 deletions(-)

diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn
index 2ed5cc26f..befbce9aa 100644
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -7,7 +7,7 @@ called [[MarkDown]], and it works like this:
 
 Leave blank lines between paragraphs.
 
-You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it
+You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it
 in single or double asterisks.
 
 To create a list, start each line with an asterisk:
diff --git a/po/fr.po b/po/fr.po
index 08ca06d0b..df3b23891 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-25 18:43-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Erreur"
 
@@ -184,7 +184,9 @@ msgstr "Génération de l'index automatique"
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
-msgstr "Désolé, mais cela ressemble à un « spam » selon les critères de <a href=\"http://blogspam.net/\">blogspam</a> : "
+msgstr ""
+"Désolé, mais cela ressemble à un « spam » selon les critères de <a href="
+"\"http://blogspam.net/\">blogspam</a> : "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
@@ -444,16 +446,16 @@ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "Le modèle de page %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:614
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -531,7 +533,9 @@ msgstr "Erreur lors de la création du compte."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:258
 msgid "No email address, so cannot email password reset instructions."
-msgstr "Aucune adresse indiquée. Impossible d'envoyer les instructions pour réinitialiser le mot de passe."
+msgstr ""
+"Aucune adresse indiquée. Impossible d'envoyer les instructions pour "
+"réinitialiser le mot de passe."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:292
 msgid "Failed to send mail"
@@ -1061,22 +1065,22 @@ msgstr "Examen de %s"
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:473
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:513
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:525
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:549
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1106,7 +1110,9 @@ msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 #: ../IkiWiki/Setup/Automator.pm:115
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
-msgstr "** Désactivation du greffon %s, l'installation a échoué avec le message suivant :"
+msgstr ""
+"** Désactivation du greffon %s, l'installation a échoué avec le message "
+"suivant :"
 
 #: ../IkiWiki/Wrapper.pm:16
 #, perl-format
@@ -1176,12 +1182,12 @@ msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1791
 msgid "yes"
 msgstr "oui"
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index a9c0fbb99..29a2d508c 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-25 18:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr ""
 
@@ -437,16 +437,16 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:614
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -1028,22 +1028,22 @@ msgstr ""
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:473
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:513
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:525
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:549
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1139,12 +1139,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1791
 msgid "yes"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 53fb3e3f4..c740fb0cb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-25 18:43-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -18,15 +18,18 @@ msgid "You need to log in first."
 msgstr "Occorre prima effettuare l'accesso."
 
 #: ../IkiWiki/CGI.pm:146
-msgid "probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https"
-msgstr "possibile errore di configurazione: sslcookie è impostato, ma si sta tentando un accesso via http, non https"
+msgid ""
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
+"via http, not https"
+msgstr ""
+"possibile errore di configurazione: sslcookie è impostato, ma si sta "
+"tentando un accesso via http, non https"
 
 #: ../IkiWiki/CGI.pm:149
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?"
 
-#: ../IkiWiki/CGI.pm:168
-#: ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
 msgid "Your login session has expired."
 msgstr "La sessione è scaduta."
 
@@ -50,9 +53,7 @@ msgstr "Preferenze salvate."
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:390
-#: ../IkiWiki/CGI.pm:391
-#: ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Errore"
 
@@ -62,7 +63,8 @@ msgstr "Aggregazione attivata dal web."
 
 #: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
-msgstr "Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati."
+msgstr ""
+"Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati."
 
 #: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
@@ -133,8 +135,7 @@ msgstr "creazione nuova pagina %s"
 msgid "deleting bucket.."
 msgstr "eliminazione contenitore..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38
-#: ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
 msgid "done"
 msgstr "fatto"
 
@@ -177,8 +178,12 @@ msgid "automatic index generation"
 msgstr "generazione automatica dell'indice"
 
 #: ../IkiWiki/Plugin/blogspam.pm:108
-msgid "Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: "
-msgstr "È stato riconosciuto come spam da <a href=\"http://blogspam.net/\">blogspam</a>: "
+msgid ""
+"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
+"\">blogspam</a>: "
+msgstr ""
+"È stato riconosciuto come spam da <a href=\"http://blogspam.net/\">blogspam</"
+"a>: "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
@@ -189,8 +194,7 @@ msgstr "%s da %s"
 msgid "There are no broken links!"
 msgstr "Non ci sono collegamenti rotti."
 
-#: ../IkiWiki/Plugin/comments.pm:124
-#: ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato pagina %s non supportato"
@@ -203,8 +207,7 @@ msgstr "i commenti devono avere un contenuto"
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: ../IkiWiki/Plugin/comments.pm:340
-#: ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr "nome pagina non valido"
 
@@ -240,8 +243,7 @@ msgstr "Aggiunto commento"
 msgid "Added a comment: %s"
 msgstr "Aggiunto commento: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:525
-#: ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr "non siete autenticati come amministratore"
 
@@ -257,10 +259,8 @@ msgstr "moderazione commento"
 msgid "Comments"
 msgstr "Commenti"
 
-#: ../IkiWiki/Plugin/conditional.pm:27
-#: ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45
-#: ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
+#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
@@ -290,10 +290,8 @@ msgstr "%s non è una pagina modificabile"
 msgid "creating %s"
 msgstr "creazione %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310
-#: ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339
-#: ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
 #: ../IkiWiki/Plugin/editpage.pm:422
 #, perl-format
 msgid "editing %s"
@@ -324,13 +322,11 @@ msgstr "occorre specificare formato e testo"
 msgid "fortune failed"
 msgstr "errore nel fortune"
 
-#: ../IkiWiki/Plugin/getsource.pm:62
-#: ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
 msgid "missing page"
 msgstr "pagina mancante"
 
-#: ../IkiWiki/Plugin/getsource.pm:64
-#: ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La pagina %s non esiste."
@@ -344,8 +340,7 @@ msgstr "non è una pagina"
 msgid "%s is an attachment, not a page."
 msgstr "%s è un allegato, non una pagina."
 
-#: ../IkiWiki/Plugin/git.pm:626
-#: ../IkiWiki/Plugin/git.pm:644
+#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
@@ -360,8 +355,7 @@ msgstr "non è permesso lavorare su un file in modalità %s"
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
-#: ../IkiWiki/Plugin/google.pm:27
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -369,7 +363,9 @@ msgstr "Occorre specificare %s quando si usa il plugin %s"
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"
-msgstr "Errore nell'interpretazione dell'URL, impossibile determinare il nome del dominio"
+msgstr ""
+"Errore nell'interpretazione dell'URL, impossibile determinare il nome del "
+"dominio"
 
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
@@ -390,8 +386,10 @@ msgid "Source code: %s"
 msgstr "Sorgente: %s"
 
 #: ../IkiWiki/Plugin/highlight.pm:123
-msgid "warning: highlight perl module not available; falling back to pass through"
-msgstr "attenzione: modulo perl highlight non trovato, verrà passato inalterato"
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+"attenzione: modulo perl highlight non trovato, verrà passato inalterato"
 
 #: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
@@ -402,8 +400,7 @@ msgstr "Image::Magick non è installato"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)"
 
-#: ../IkiWiki/Plugin/img.pm:83
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
 #: ../IkiWiki/Plugin/img.pm:104
 #, perl-format
 msgid "failed to read %s: %s"
@@ -421,7 +418,8 @@ msgstr "impossibile determinare la dimensione dell'immagine %s"
 
 #: ../IkiWiki/Plugin/inline.pm:92
 msgid "Must specify url to wiki with --url when using --rss or --atom"
-msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom"
+msgstr ""
+"Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom"
 
 #: ../IkiWiki/Plugin/inline.pm:138
 msgid "page editing not allowed"
@@ -445,16 +443,16 @@ msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:329
 msgid "Add a new post titled:"
 msgstr "Aggiungere un nuovo articolo dal titolo:"
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:349
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "modello %s non esistente"
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:614
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
 
@@ -469,12 +467,14 @@ msgstr "%s è bloccata e non può essere modificata"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
-msgstr "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato"
+msgstr ""
+"multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato"
 
 #: ../IkiWiki/Plugin/mdwn.pm:67
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
-msgstr "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)"
+msgstr ""
+"impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)"
 
 #: ../IkiWiki/Plugin/meta.pm:158
 msgid "stylesheet not found"
@@ -530,7 +530,9 @@ msgstr "Errore nella creazione dell'account."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:258
 msgid "No email address, so cannot email password reset instructions."
-msgstr "Nessun indirizzo email, impossibile inviare per email le istruzioni per reimpostare la password."
+msgstr ""
+"Nessun indirizzo email, impossibile inviare per email le istruzioni per "
+"reimpostare la password."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:292
 msgid "Failed to send mail"
@@ -538,7 +540,8 @@ msgstr "Impossibile spedire il messaggio"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:294
 msgid "You have been mailed password reset instructions."
-msgstr "Il messaggio con le istruzioni per reimpostare la password è stato inviato."
+msgstr ""
+"Il messaggio con le istruzioni per reimpostare la password è stato inviato."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:329
 msgid "incorrect password reset url"
@@ -572,7 +575,9 @@ msgstr "LWP non trovato, ping non inviato"
 
 #: ../IkiWiki/Plugin/po.pm:15
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
-msgstr "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno alla versione 0.35."
+msgstr ""
+"attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno "
+"alla versione 0.35."
 
 #: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
@@ -581,20 +586,25 @@ msgstr "%s non è una codifica di lingua valida"
 
 #: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
-msgid "%s is not a valid value for po_link_to, falling back to po_link_to=default"
-msgstr "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
+msgid ""
+"%s is not a valid value for po_link_to, falling back to po_link_to=default"
+msgstr ""
+"%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
 
 #: ../IkiWiki/Plugin/po.pm:153
-msgid "po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default"
-msgstr "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato po_link_to=default"
+msgid ""
+"po_link_to=negotiated requires usedirs to be enabled, falling back to "
+"po_link_to=default"
+msgstr ""
+"po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
+"po_link_to=default"
 
 #: ../IkiWiki/Plugin/po.pm:383
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:387
-#: ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
@@ -604,12 +614,20 @@ msgid "updated PO files"
 msgstr "file PO aggiornati"
 
 #: ../IkiWiki/Plugin/po.pm:448
-msgid "Can not remove a translation. If the master page is removed, however, its translations will be removed as well."
-msgstr "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è stata eliminata anche le traduzioni lo saranno."
+msgid ""
+"Can not remove a translation. If the master page is removed, however, its "
+"translations will be removed as well."
+msgstr ""
+"Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
+"stata eliminata anche le traduzioni lo saranno."
 
 #: ../IkiWiki/Plugin/po.pm:468
-msgid "Can not rename a translation. If the master page is renamed, however, its translations will be renamed as well."
-msgstr "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è stata rinominata anche le traduzioni lo saranno."
+msgid ""
+"Can not rename a translation. If the master page is renamed, however, its "
+"translations will be renamed as well."
+msgstr ""
+"Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
+"stata rinominata anche le traduzioni lo saranno."
 
 #: ../IkiWiki/Plugin/po.pm:829
 #, perl-format
@@ -644,8 +662,7 @@ msgstr "impossibile tradurre %s"
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1046
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
 #: ../IkiWiki/Plugin/po.pm:1100
 #, perl-format
 msgid "failed to write %s"
@@ -662,7 +679,9 @@ msgstr "impossibile leggere %s"
 
 #: ../IkiWiki/Plugin/po.pm:1112
 msgid "invalid gettext data, go back to previous page to continue edit"
-msgstr "dati gettext non validi, tornare alle pagina precedente per continuare le modifiche"
+msgstr ""
+"dati gettext non validi, tornare alle pagina precedente per continuare le "
+"modifiche"
 
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
@@ -759,14 +778,15 @@ msgstr "valore percentuale %s non ammesso"
 
 #: ../IkiWiki/Plugin/progress.pm:59
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
-msgstr "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e \"donepages\""
+msgstr ""
+"occorrono alternativamente i parametri \"percent\" o \"totalpages\" e "
+"\"donepages\""
 
 #: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
 msgstr "(Diff troncato)"
 
-#: ../IkiWiki/Plugin/remove.pm:31
-#: ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s non esiste"
@@ -776,8 +796,7 @@ msgstr "%s non esiste"
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s non è in src, quindi non può essere eliminato"
 
-#: ../IkiWiki/Plugin/remove.pm:41
-#: ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
 #, perl-format
 msgid "%s is not a file"
 msgstr "%s non è un file"
@@ -976,12 +995,19 @@ msgid "plugins"
 msgstr "plugin"
 
 #: ../IkiWiki/Plugin/websetup.pm:395
-msgid "The configuration changes shown below require a wiki rebuild to take effect."
-msgstr "Le sottostanti modifiche alla configurazione richiedono la ricompilazione del wiki."
+msgid ""
+"The configuration changes shown below require a wiki rebuild to take effect."
+msgstr ""
+"Le sottostanti modifiche alla configurazione richiedono la ricompilazione "
+"del wiki."
 
 #: ../IkiWiki/Plugin/websetup.pm:399
-msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki."
-msgstr "Affinché le sottostanti modifiche alla configurazione abbiano effetto, occorre ricostruire il wiki."
+msgid ""
+"For the configuration changes shown below to fully take effect, you may need "
+"to rebuild the wiki."
+msgstr ""
+"Affinché le sottostanti modifiche alla configurazione abbiano effetto, "
+"occorre ricostruire il wiki."
 
 #: ../IkiWiki/Plugin/websetup.pm:436
 #, perl-format
@@ -1000,11 +1026,14 @@ msgstr "nome file %s scorretto"
 
 #: ../IkiWiki/Render.pm:264
 #, perl-format
-msgid "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this"
-msgstr "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare allow_symlinks_before_srcdir per abilitare questa configurazione"
+msgid ""
+"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
+"allow this"
+msgstr ""
+"collegamento simbolico trovato nel percorso srcdir (%s) -- impostare "
+"allow_symlinks_before_srcdir per abilitare questa configurazione"
 
-#: ../IkiWiki/Render.pm:287
-#: ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorato il file dal nome scorretto %s"
@@ -1029,22 +1058,22 @@ msgstr "scansione %s"
 msgid "building %s, which links to %s"
 msgstr "compilazione di %s, che è collegato a %s"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:473
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "compilazione di %s, che dipende da %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:513
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:525
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "rimozione di %s, non più richiesto da %s"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:549
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1072,7 +1101,8 @@ msgstr "impossibile creare un repository tramite ikiwiki-makerepo"
 #: ../IkiWiki/Setup/Automator.pm:115
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
-msgstr "** Plugin %s disabilitato, a causa della seguente segnalazione di errore:"
+msgstr ""
+"** Plugin %s disabilitato, a causa della seguente segnalazione di errore:"
 
 #: ../IkiWiki/Wrapper.pm:16
 #, perl-format
@@ -1140,12 +1170,12 @@ msgstr "impossibile usare più plugin rcs"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1791
 msgid "yes"
 msgstr "sì"
 
@@ -1173,4 +1203,3 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr "Qual è il nome del dominio del server web?"
-
-- 
cgit v1.2.3


From 27c6f56fcfac8a60b55751a7eda90bf78fab8c1f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 26 Aug 2009 13:05:46 -0400
Subject: typo

---
 doc/ikiwiki/searching.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/searching.mdwn b/doc/ikiwiki/searching.mdwn
index 539e7193d..4c1287933 100644
--- a/doc/ikiwiki/searching.mdwn
+++ b/doc/ikiwiki/searching.mdwn
@@ -5,7 +5,7 @@ then="This wiki has searching **enabled**."
 else="This wiki has searching **disabled**."]]
 
 If searching is enabled, you can enter search terms in the search field,
-as you'd expect. There are a few special things you can do to constuct
+as you'd expect. There are a few special things you can do to construct
 more powerful searches.
 
 * To match a phrase, enclose it in double quotes.
-- 
cgit v1.2.3


From 4ce93af516360a223016681961481f51a3ce81f7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 26 Aug 2009 13:09:43 -0400
Subject: translation of directives

---
 doc/plugins/po.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 079a36633..9273da399 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -358,6 +358,15 @@ Ugly messages with empty files
 
 If there are empty .mdwn files, the po plugin displays some ugly messages.
 
+Translation of directives
+-------------------------
+
+If a translated page contains a directive, it may expand to some english
+text, or text in whatever single language ikiwiki is configured to "speak".
+
+Maybe there could be a way to switch ikiwiki to speaking another language
+when building a non-english page? Then the directives would get translated.
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From 2736fc5ba975a92311649b5951c677223732d531 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 26 Aug 2009 13:11:55 -0400
Subject: close; multimarkdown not enabled by default

---
 doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
index c9756617d..d6136ed4e 100644
--- a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
+++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
@@ -36,3 +36,7 @@ But instead it gives:
 
     <p>Orange
     :   The fruit of an evergreen tree of the genus Citrus.</p>
+
+> ikiwiki's markdown support does not include support for multimarkdown by
+> default. If you want to enable that, you can turn on the `multimarkdown`
+> option in the setup file. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 4e70f2f0d20bbfc800aafb1b78cc6a41f4617d32 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 26 Aug 2009 13:24:51 -0400
Subject: htmltidy: Print a warning message if tidy fails. Closes: #543722

---
 IkiWiki/Plugin/htmltidy.pm | 5 ++++-
 debian/changelog           | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 6f3379ef4..fc0d3b1d6 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -46,7 +46,10 @@ sub sanitize (@) {
 	waitpid $pid, 0;
 
 	$SIG{PIPE}="DEFAULT";
-	return "" if $sigpipe || ! defined $ret;
+	if ($sigpipe || ! defined $ret) {
+		print STDERR gettext("warning: tidy failed")."\n";
+		return "";
+	}
 
 	return $ret;
 }
diff --git a/debian/changelog b/debian/changelog
index 0d3f61e6f..69e197e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
     slower. (smcv)
   * Rebuild wikis on upgrade to this version to fix bloat caused
     by the dependency bug.
+  * htmltidy: Print a warning message if tidy fails. Closes: #543722
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
-- 
cgit v1.2.3


From 70c601990b345b03ddf2406c46017da232bef8b9 Mon Sep 17 00:00:00 2001
From: "https://infosoph.myopenid.com/" <https://infosoph.myopenid.com/@web>
Date: Wed, 26 Aug 2009 14:39:25 -0400
Subject: Forgot to mention I have multimarkdown enabled

---
 doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
index d6136ed4e..97538ed87 100644
--- a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
+++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
@@ -39,4 +39,13 @@ But instead it gives:
 
 > ikiwiki's markdown support does not include support for multimarkdown by
 > default. If you want to enable that, you can turn on the `multimarkdown`
-> option in the setup file. --[[Joey]] [[done]]
+> option in the setup file. --[[Joey]]
+
+>> Sorry, I should have indicated, I have multimarkdown enabled:
+
+    # mdwn plugin
+    # enable multimarkdown features?
+    multimarkdown => 1,
+
+>>Other features appear to be working, tables and footnotes for instance. See current install: <http://wiki.infosoph.org>
+
-- 
cgit v1.2.3


From dc1399fa809dc38e070a3c160b26926c27a04ddd Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@web>
Date: Wed, 26 Aug 2009 21:19:55 -0400
Subject: initial patch proposal

---
 ...irrorlist_with_per-mirror_usedirs_settings.mdwn | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn

diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
new file mode 100644
index 000000000..6ca9962ba
--- /dev/null
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -0,0 +1,24 @@
+I've got a wiki that is built at two places:
+
+* a static copy, aimed at being viewed without any web server, using
+  a web browser's `file:///` urls => usedirs is disabled to get nice
+  and working links
+* an online copy, with usedirs enabled in order to benefit from the
+  language negotiation using the po plugin
+
+I need to use mirrorlist on the static copy, so that one can easily
+reach the online, possibly updated, pages. But as documented, "pages are
+assumed to exist in the same location under the specified url on each
+mirror", so the generated urls are wrong.
+
+My `mirrorlist` branch contains a patch that allows one to configure usedirs
+per-mirror. Note: the old configuration format is still supported, so this should
+not break existing wikis.
+
+OT: as a bonus, this branch contains a patch to support {hashes,arrays} of
+{hashes,arrays} in `$config`, which I missed a bit when writing the po plugin,
+and decided this time it was really needed to implement this feature.
+
+--[[intrigeri]]
+
+[[!tag patch]]
-- 
cgit v1.2.3


From 6ba35a7cb41f18e79a0257d40df0ec1d56035101 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 12:41:25 -0400
Subject: forwarded

---
 doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
index 97538ed87..6dac9c8b8 100644
--- a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
+++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
@@ -49,3 +49,6 @@ But instead it gives:
 
 >>Other features appear to be working, tables and footnotes for instance. See current install: <http://wiki.infosoph.org>
 
+>>> Ok, in that case it's a bug in the perl module. Forwarded to
+>>> <http://github.com/bobtfish/text-markdown/issues#issue/6> --[[Joey]]
+>>> [[!tag done]]
-- 
cgit v1.2.3


From 18fc71f033cf0ff9ccd6ef16212ce3b4e34ac725 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 12:56:24 -0400
Subject: unsure if this patch is enough

---
 doc/plugins/po.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 9273da399..b77c545d9 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -264,6 +264,11 @@ good reason for that to be done? --[[Joey]]
 
 > The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]]
 
+>> It may fix it in passing, but shouldn't it also be fixed for the other
+>> `po_link_to` styles? (Also, if `mybestlink` is going to always 
+>> just return `bestlink` in this case, there seems no reason to inject
+>> it.) --[[Joey]]
+
 Language display order
 ----------------------
 
-- 
cgit v1.2.3


From 5eec60d4c6c34b6f3d0d2bc002f5d4158354910a Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 26 Aug 2009 07:56:33 +0200
Subject: po: do not beautify urls on the recentchanges page

... else, the recentchanges page shows a link such as "sandbox.es". But,
clicking on it goes to the English (or negotiated language) version of the page.

It is better in this one case if the link goes direct to the translated version
of the page.
(cherry picked from commit 496e8523c6706d096f1b794e3f3ba5dd2fa260f3)
---
 IkiWiki/Plugin/po.pm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 414906999..a9517adce 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -602,17 +602,21 @@ sub myurlto ($$;$) {
 	# so that one is redirected to the just-edited page rather than to the
 	# negociated translation; to prevent unnecessary fiddling with caller/inject,
 	# we only do so when our beautify_urlpath would actually do what we want to
-	# avoid, i.e. when po_link_to = negotiated
+	# avoid, i.e. when po_link_to = negotiated.
+	# also avoid doing so when run by cgi_goto, so that the links on recentchanges
+	# page actually lead to the exact page they pretend to.
 	if ($config{po_link_to} eq "negotiated") {
 		my @caller = caller(1);
-		my $run_by_editpage = 0;
-		$run_by_editpage = 1 if (exists $caller[3] && defined $caller[3]
-					 && $caller[3] eq "IkiWiki::cgi_editpage");
+		my $use_orig = 0;
+		$use_orig = 1 if (exists $caller[3] && defined $caller[3]
+				 && ($caller[3] eq "IkiWiki::cgi_editpage" ||
+				     $caller[3] eq "IkiWiki::Plugin::goto::cgi_goto")
+				 );
 		inject(name => "IkiWiki::beautify_urlpath", call => $origsubs{'beautify_urlpath'})
-			if $run_by_editpage;
+			if $use_orig;
 		my $res = $origsubs{'urlto'}->($to,$from,$absolute);
 		inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath)
-			if $run_by_editpage;
+			if $use_orig;
 		return $res;
 	}
 	else {
-- 
cgit v1.2.3


From e1acb707db3f204708f88648ed80762689a15425 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 12:57:04 -0400
Subject: cherry-picked fix for recentchanges links

---
 doc/plugins/po.mdwn | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index b77c545d9..2e32d78fd 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -332,18 +332,6 @@ Also, this may only happen if the page being linked to is coming from an
 underlay, and the underlays lack translation to a given language.
 --[[Joey]] 
 
-recentchanges links to po files
--------------------------------
-
-When a po file is changed, the recentchanges page shows a link such as
-"sandbox.es". But, clicking on it goes to the English (or negotiated
-language) version of the page. It would be better in this one case if
-the link went direct to the translated version of the page. --[[Joey]] 
-
-> The (untested) commit 496e8523c670 in my po branch might fix this...
-> or at least, I believe, put someone on the right track.
-> --[[intrigeri]]
-
 Double commits of po files
 --------------------------
 
-- 
cgit v1.2.3


From 5e515b493c00c70095aeb8bad1e0b7757ed943db Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 13:10:31 -0400
Subject: followups

---
 doc/plugins/po.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 2e32d78fd..65573b877 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -294,6 +294,12 @@ that po might be replacing the only link on a page, in error?
 > be either good (better overall l10n) or bad (break the other
 > plugin's goal). --[[intrigeri]]
 
+>> Right.. well, the cases where links are added is very small.
+>> Grepping for `add_link`, it's just done by link, camelcase, meta, and
+>> tag. All of these are supposed to work just link regular links
+>> so I'd think that is ok. We could probably remove the currently scary
+>> comment about only wanting to change the first link. --[[Joey]] 
+
 Name of toplevel index page
 ---------------------------
 
@@ -305,6 +311,14 @@ like "index.da". --[[Joey]]
 > test with a predicate call such as isindexpage($page). Such a predicate
 > function could then be overriden by the po plugin. --[[intrigeri]]
 
+>> Could do that, but if you have such a function it's natural to want to
+>> use it elsewhere. Not clear to me it would make sense for po to override
+>> such a function if it were used in some of the other places that compare
+>> to index.
+>> 
+>> The other option would be for po to override the template setting.
+>> --[[Joey]] 
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From 3c2bffe21b91684971155ab41b15dacc515b2fc5 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 19:59:15 +0200
Subject: po(scan): removed scary comment about only wanting to change the
 first link

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 88d021388..3039334c4 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -204,10 +204,7 @@ sub scan (@) {
 	if (istranslation($page)) {
 		foreach my $destpage (@{$links{$page}}) {
 			if (istranslatable($destpage)) {
-				# replace one occurence of $destpage in $links{$page}
-				# (we only want to replace the one that was added by
-				# IkiWiki::Plugin::link::scan, other occurences may be
-				# there for other reasons)
+				# replace the occurence of $destpage in $links{$page}
 				for (my $i=0; $i<@{$links{$page}}; $i++) {
 					if (@{$links{$page}}[$i] eq $destpage) {
 						@{$links{$page}}[$i] = $destpage . '.' . lang($page);
-- 
cgit v1.2.3


From 7d35d17f956740a310465d5162b9313e120694a3 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 20:01:24 +0200
Subject: doc/po: follow-up

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 doc/plugins/po.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 65573b877..2c230d409 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -300,6 +300,8 @@ that po might be replacing the only link on a page, in error?
 >> so I'd think that is ok. We could probably remove the currently scary
 >> comment about only wanting to change the first link. --[[Joey]] 
 
+>>> Commit 3c2bffe21b91684 in my po branch does this. --[[intrigeri]]
+
 Name of toplevel index page
 ---------------------------
 
-- 
cgit v1.2.3


From 6c0f9c691c3df3a2ec30dec626c997623568a400 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 20:19:17 +0200
Subject: po: override the title template variable for coherent homepage
 titling

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 3039334c4..2b2839f24 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -302,6 +302,9 @@ sub pagetemplate (@) {
 	    && $masterpage eq "index") {
 		$template->param('parentlinks' => []);
 	}
+	if (ishomepage($page) && $template->query(name => "title")) {
+		$template->param(title => $config{wikiname});
+	}
 } # }}}
 
 # Add the renamed page translations to the list of to-be-renamed pages.
@@ -960,6 +963,14 @@ sub homepageurl (;$) {
 	return urlto('', $page);
 }
 
+sub ishomepage ($) {
+	my $page = shift;
+
+	return 1 if $page eq 'index';
+	map { return 1 if $page eq 'index.'.$_ } keys %{$config{po_slave_languages}};
+	return undef;
+}
+
 sub deletetranslations ($) {
 	my $deletedmasterfile=shift;
 
-- 
cgit v1.2.3


From 6bc3206af16f4910e49478319a8e81d74c7de342 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 20:21:16 +0200
Subject: doc/po: follow-up

---
 doc/plugins/po.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 2c230d409..1d343e0f8 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -321,6 +321,8 @@ like "index.da". --[[Joey]]
 >> The other option would be for po to override the template setting.
 >> --[[Joey]] 
 
+>>> Great idea. Commit 6c0f9c691c3df3a in my po branch does it. --[[intrigeri]]
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From cdc3576c8d1efb2593cac2d9da3f2393a2afe26e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 20:31:44 +0200
Subject: po: do not inject custom bestlink function when po_link_to eq default

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 2b2839f24..12f41f6de 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -51,8 +51,6 @@ sub import {
 	hook(type => "formbuilder_setup", id => "po", call => \&formbuilder_setup, last => 1);
 	hook(type => "formbuilder", id => "po", call => \&formbuilder);
 
-	$origsubs{'bestlink'}=\&IkiWiki::bestlink;
-	inject(name => "IkiWiki::bestlink", call => \&mybestlink);
 	$origsubs{'beautify_urlpath'}=\&IkiWiki::beautify_urlpath;
 	inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
 	$origsubs{'targetpage'}=\&IkiWiki::targetpage;
@@ -153,6 +151,10 @@ sub checkconfig () {
 		warn(gettext('po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default'));
 		$config{po_link_to}='default';
 	}
+	unless ($config{po_link_to} eq 'default') {
+		$origsubs{'bestlink'}=\&IkiWiki::bestlink;
+		inject(name => "IkiWiki::bestlink", call => \&mybestlink);
+	}
 
 	push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
 
@@ -543,16 +545,13 @@ sub formbuilder (@) {
 # `----
 
 # Implement po_link_to 'current' and 'negotiated' settings.
+# Not injected otherwise.
 sub mybestlink ($$) {
 	my $page=shift;
 	my $link=shift;
 
-	return $origsubs{'bestlink'}->($page, $link)
-		if $config{po_link_to} eq "default";
-
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
 	if (length $res
-	    && ($config{po_link_to} eq "current" || $config{po_link_to} eq "negotiated")
 	    && istranslatable($res)
 	    && istranslation($page)) {
 		return $res . "." . lang($page);
-- 
cgit v1.2.3


From eaa782a1856cff50df68f1135955d58dc97bb833 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 20:38:36 +0200
Subject: doc/po(self-links): follow-ups

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 doc/plugins/po.mdwn | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 1d343e0f8..673bbf406 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -265,9 +265,20 @@ good reason for that to be done? --[[Joey]]
 > The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]]
 
 >> It may fix it in passing, but shouldn't it also be fixed for the other
->> `po_link_to` styles? (Also, if `mybestlink` is going to always 
->> just return `bestlink` in this case, there seems no reason to inject
->> it.) --[[Joey]]
+>> `po_link_to` styles?
+
+>>> Other `po_link_to` styles already work ok: say there is
+>>> a \[[dest]] link on a page called `dest`. When rendering
+>>> `dest.LL`, `mybestlink` returns `dest.LL`, and `htmllink` is then
+>>> able to detect, and manage correctly, that it is a self-link.
+>>> --[[intrigeri]]
+
+>> (Also, if `mybestlink` is going to always just return `bestlink` in
+>> this case, there seems no reason to inject it.) --[[Joey]]
+
+>>> Right. Commit cdc3576c8d1efb2 in my po branch prevents
+>>> `mybestlink` to be injected when `po_link_to` is
+>>> `default`. --[[intrigeri]]
 
 Language display order
 ----------------------
-- 
cgit v1.2.3


From 33b18e12c7ef638e54411a60a49ce73e4f23eaee Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 19:59:15 +0200
Subject: po(scan): removed scary comment about only wanting to change the
 first link

Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit 3c2bffe21b91684971155ab41b15dacc515b2fc5)
---
 IkiWiki/Plugin/po.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index a9517adce..61f8db328 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -204,10 +204,7 @@ sub scan (@) {
 	if (istranslation($page)) {
 		foreach my $destpage (@{$links{$page}}) {
 			if (istranslatable($destpage)) {
-				# replace one occurence of $destpage in $links{$page}
-				# (we only want to replace the one that was added by
-				# IkiWiki::Plugin::link::scan, other occurences may be
-				# there for other reasons)
+				# replace the occurence of $destpage in $links{$page}
 				for (my $i=0; $i<@{$links{$page}}; $i++) {
 					if (@{$links{$page}}[$i] eq $destpage) {
 						@{$links{$page}}[$i] = $destpage . '.' . lang($page);
-- 
cgit v1.2.3


From ffcd97ce52edd73f092d15aae89bbacad99b38b6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 15:49:12 -0400
Subject: change cherry-picked; move to discussion

---
 doc/plugins/po.mdwn            | 24 ------------------------
 doc/plugins/po/discussion.mdwn | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 673bbf406..9c4d8ffbd 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -289,30 +289,6 @@ order, as `po_slave_languages` is a hash. It would need to be converted
 to an array to support this. (If twere done, twere best done quickly.)
 --[[Joey]] 
 
-Duplicate %links ?
-------------------
-
-I notice code in the scan hook that seems to assume
-that %links will accumulate duplicate links for a page.
-That used to be so, but the bug was fixed. Does this mean
-that po might be replacing the only link on a page, in error? 
---[[Joey]] 
-
-> It would replace it. The only problematic case is when another
-> plugin has its own reasons, in its `scan` hook, to add a page
-> that is already there to `$links{$page}`. This other plugin's
-> effect might then be changed by po's `scan` hook... which could
-> be either good (better overall l10n) or bad (break the other
-> plugin's goal). --[[intrigeri]]
-
->> Right.. well, the cases where links are added is very small.
->> Grepping for `add_link`, it's just done by link, camelcase, meta, and
->> tag. All of these are supposed to work just link regular links
->> so I'd think that is ok. We could probably remove the currently scary
->> comment about only wanting to change the first link. --[[Joey]] 
-
->>> Commit 3c2bffe21b91684 in my po branch does this. --[[intrigeri]]
-
 Name of toplevel index page
 ---------------------------
 
diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index 1c3f0e752..ab822e76c 100644
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -699,3 +699,28 @@ and via CGI, have been tested.
 * general test with `indexpages` enabled: **not OK**
 * general test with `po_link_to=default` with `userdirs` enabled: **OK**
 * general test with `po_link_to=default` with `userdirs` disabled: **OK**
+
+Duplicate %links ?
+------------------
+
+I notice code in the scan hook that seems to assume
+that %links will accumulate duplicate links for a page.
+That used to be so, but the bug was fixed. Does this mean
+that po might be replacing the only link on a page, in error? 
+--[[Joey]] 
+
+> It would replace it. The only problematic case is when another
+> plugin has its own reasons, in its `scan` hook, to add a page
+> that is already there to `$links{$page}`. This other plugin's
+> effect might then be changed by po's `scan` hook... which could
+> be either good (better overall l10n) or bad (break the other
+> plugin's goal). --[[intrigeri]]
+
+>> Right.. well, the cases where links are added is very small.
+>> Grepping for `add_link`, it's just done by link, camelcase, meta, and
+>> tag. All of these are supposed to work just link regular links
+>> so I'd think that is ok. We could probably remove the currently scary
+>> comment about only wanting to change the first link. --[[Joey]] 
+
+>>> Commit 3c2bffe21b91684 in my po branch does this. --[[intrigeri]]
+>>>> Cherry-picked --[[Joey]] 
-- 
cgit v1.2.3


From f4583c1524ea1aab4ec1eb83a361355788b5b531 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 20:19:17 +0200
Subject: po: override the title template variable for coherent homepage
 titling

Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit 6c0f9c691c3df3a2ec30dec626c997623568a400)
---
 IkiWiki/Plugin/po.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 61f8db328..1b313a979 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -302,6 +302,9 @@ sub pagetemplate (@) {
 	    && $masterpage eq "index") {
 		$template->param('parentlinks' => []);
 	}
+	if (ishomepage($page) && $template->query(name => "title")) {
+		$template->param(title => $config{wikiname});
+	}
 } # }}}
 
 # Add the renamed page translations to the list of to-be-renamed pages.
@@ -957,6 +960,14 @@ sub homepageurl (;$) {
 	return urlto('', $page);
 }
 
+sub ishomepage ($) {
+	my $page = shift;
+
+	return 1 if $page eq 'index';
+	map { return 1 if $page eq 'index.'.$_ } keys %{$config{po_slave_languages}};
+	return undef;
+}
+
 sub deletetranslations ($) {
 	my $deletedmasterfile=shift;
 
-- 
cgit v1.2.3


From f8ad1bfec4e12944482d5f58a0961b0c476602c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 15:50:43 -0400
Subject: fix cherry-picked

---
 debian/changelog    |  1 +
 doc/plugins/po.mdwn | 21 ---------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69e197e37..9f10c2913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * Rebuild wikis on upgrade to this version to fix bloat caused
     by the dependency bug.
   * htmltidy: Print a warning message if tidy fails. Closes: #543722
+  * po: Fix name of translated toplevel index page. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 9c4d8ffbd..f020adac2 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -289,27 +289,6 @@ order, as `po_slave_languages` is a hash. It would need to be converted
 to an array to support this. (If twere done, twere best done quickly.)
 --[[Joey]] 
 
-Name of toplevel index page
----------------------------
-
-Normally at the top index page of a wiki, you see the wiki name at
-the top. However, at the top *translated* index page, you see something
-like "index.da". --[[Joey]]
-
-> I suggest changing `Render.pm`, line 115, to replace the `$page eq 'index'`
-> test with a predicate call such as isindexpage($page). Such a predicate
-> function could then be overriden by the po plugin. --[[intrigeri]]
-
->> Could do that, but if you have such a function it's natural to want to
->> use it elsewhere. Not clear to me it would make sense for po to override
->> such a function if it were used in some of the other places that compare
->> to index.
->> 
->> The other option would be for po to override the template setting.
->> --[[Joey]] 
-
->>> Great idea. Commit 6c0f9c691c3df3a in my po branch does it. --[[intrigeri]]
-
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From 18e4fa65399f2a21bd943b0e62b81a100f941d44 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 15:54:44 -0400
Subject: fix merged

---
 debian/changelog    |  1 +
 doc/plugins/po.mdwn | 27 ---------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f10c2913..b4169c576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
     by the dependency bug.
   * htmltidy: Print a warning message if tidy fails. Closes: #543722
   * po: Fix name of translated toplevel index page. (intrigeri)
+  * po: Fix display of links from a translated page to itself (ntrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index f020adac2..57459c1ef 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -253,33 +253,6 @@ once [[intrigeri]]'s `meta` branch is merged.
 An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
 and `meta` branches, and thus has this additional features.
 
-Self links
-----------
-
-If a page contains a WikiLink to itself, ikiwiki does not normally
-turn that into a hyperlink. However, if a translated page contains a
-WikiLink to itself, a hyperlink is inserted, at least with the default
-`po_link_to` the link points to the English version of the page. Is there a
-good reason for that to be done? --[[Joey]]
-
-> The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]]
-
->> It may fix it in passing, but shouldn't it also be fixed for the other
->> `po_link_to` styles?
-
->>> Other `po_link_to` styles already work ok: say there is
->>> a \[[dest]] link on a page called `dest`. When rendering
->>> `dest.LL`, `mybestlink` returns `dest.LL`, and `htmllink` is then
->>> able to detect, and manage correctly, that it is a self-link.
->>> --[[intrigeri]]
-
->> (Also, if `mybestlink` is going to always just return `bestlink` in
->> this case, there seems no reason to inject it.) --[[Joey]]
-
->>> Right. Commit cdc3576c8d1efb2 in my po branch prevents
->>> `mybestlink` to be injected when `po_link_to` is
->>> `default`. --[[intrigeri]]
-
 Language display order
 ----------------------
 
-- 
cgit v1.2.3


From 0c1a71896d792e3fb2fe6624a2dc9fdac30e1b80 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 16:27:57 -0400
Subject: htmltidy: Return an error message if tidy fails. Closes: #543722

On second^Wthird^Wfourth thought, putting the message into the page seems
better than using stderr.
---
 IkiWiki/Plugin/htmltidy.pm | 3 +--
 debian/changelog           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index fc0d3b1d6..e6d377f8a 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -47,8 +47,7 @@ sub sanitize (@) {
 
 	$SIG{PIPE}="DEFAULT";
 	if ($sigpipe || ! defined $ret) {
-		print STDERR gettext("warning: tidy failed")."\n";
-		return "";
+		return gettext("htmltidy failed to parse this html");
 	}
 
 	return $ret;
diff --git a/debian/changelog b/debian/changelog
index b4169c576..8cd5032cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,7 +28,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
     slower. (smcv)
   * Rebuild wikis on upgrade to this version to fix bloat caused
     by the dependency bug.
-  * htmltidy: Print a warning message if tidy fails. Closes: #543722
+  * htmltidy: Return an error message if tidy fails. Closes: #543722
   * po: Fix name of translated toplevel index page. (intrigeri)
   * po: Fix display of links from a translated page to itself (ntrigeri)
 
-- 
cgit v1.2.3


From 545029fe4bc11e828da193745c7555c1e8322768 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 01:13:43 +0100
Subject: Explain my depends-exact branch

---
 doc/todo/optimize_simple_dependencies.mdwn | 48 ++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 doc/todo/optimize_simple_dependencies.mdwn

diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn
new file mode 100644
index 000000000..c3ccd5ad0
--- /dev/null
+++ b/doc/todo/optimize_simple_dependencies.mdwn
@@ -0,0 +1,48 @@
+[[!template id=gitbranch branch=smcv/ready/depends-exact author="[[smcv]]"]]
+
+I'm still trying to optimize ikiwiki for a site using
+[[plugins/contrib/album]], and checking which pages depend on which pages
+is still taking too long. Here's another go at fixing that, using [[Will]]'s
+suggestion from [[todo/should_optimise_pagespecs]]:
+
+> A hash, by itself, is not optimal because
+> the dependency list holds two things: page names and page specs.  The hash would
+> work well for the page names, but you'll still need to iterate through the page specs.
+> I was thinking of keeping a list and a hash.  You use the list for pagespecs
+> and the hash for individual page names.  To make this work you need to adjust the
+> API so it knows which you're adding.  -- [[Will]]
+
+If you have P pages and refresh after changing C of them, where an average
+page has E dependencies on exact page names and D other dependencies, this
+branch should drop the complexity of checking dependencies from
+O(P * (D+E) * C) to O(C + P*E + P*D*C). Pages that use inline or map have
+a large value for E (e.g. one per inlined page) and a small value for D (e.g.
+one per inline).
+
+Benchmarking:
+
+Test 1: a wiki with about 3500 pages and 3500 photos, and a change that
+touches about 350 pages and 350 photos
+
+Test 2: the docwiki (about 700 objects not excluded by docwiki.setup, mostly
+pages), docwiki.setup modified to turn off verbose, and a change that touches
+the 98 pages of plugins/*.mdwn
+
+In both tests I rebuilt the wiki with the target ikiwiki version, then touched
+the appropriate pages and refreshed.
+
+Results of test 1: without this branch it took around 5:45 to rebuild and
+around 5:45 again to refresh (so rebuilding 10% of the pages, then deciding
+that most of the remaining 90% didn't need to change, took about as long as
+rebuilding everything). With this branch it took 5:47 to rebuild and 1:16
+to refresh.
+
+Results of test 2: rebuilding took 14.11s without, 13.96s with; refreshing
+three times took 7.29/7.40/7.37s without, 6.62/6.56/6.63s with.
+
+(This benchmarking was actually done with my [[plugins/contrib/album]] branch,
+since that's what the huge wiki needs; that branch doesn't alter core code
+beyond the ready/depends-exact branch point, so the results should be
+equally valid.)
+
+--[[smcv]]
-- 
cgit v1.2.3


From d4b4b3d988c0b7bfc74876c3b55b787baffc0dcf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 20:16:57 -0400
Subject: avoid fetching tags from random remotes

git makes it too easy to get crap tags into origin
---
 gitremotes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitremotes b/gitremotes
index 91bf2fe84..bcee005c3 100755
--- a/gitremotes
+++ b/gitremotes
@@ -20,7 +20,7 @@ while (<IN>) {
 			$error |= system("git", "remote", "add", "-f", $remote, $url);
 		}
 		else {
-			$error |= system("git", "fetch", $remote);
+			$error |= system("git", "fetch", "--no-tag", $remote);
 		}
 	}
 }
-- 
cgit v1.2.3


From 04a8da4f0176d153fed7d9a1c483f19b70f32900 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 21:00:39 -0400
Subject: mention ignore branch

---
 doc/git.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 06bccc7a3..f6971e84b 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -64,6 +64,8 @@ Some of the branches included in the main repository include:
 * `debian-stable` is used for updates to the old version included in
   Debian's stable release, and `debian-testing` is used for updates to
   Debian's testing release.
+* `ignore` gets various branches merged to it that Joey wishes to ignore
+  when looking at everyone's unmerged changes.
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
-- 
cgit v1.2.3


From b7a3fbec78a7584f24b8dcc38e5e9537ad95c7f5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 21:36:55 -0400
Subject: response

---
 doc/todo/optimize_simple_dependencies.mdwn | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn
index c3ccd5ad0..44163311b 100644
--- a/doc/todo/optimize_simple_dependencies.mdwn
+++ b/doc/todo/optimize_simple_dependencies.mdwn
@@ -46,3 +46,23 @@ beyond the ready/depends-exact branch point, so the results should be
 equally valid.)
 
 --[[smcv]]
+
+> We discussed this on irc; I had some worries that things may have been
+> switched to `add_depends_exact` that were not pure page names. My current
+> feeling is it's all safe, but who knows. It's easy to miss something.
+> Which makes me think this is not a good interface.
+> 
+> Why not, instead, make `add_depends` smart. If it's passed something
+> that is clearly a raw page name, it can add it to the exact depends hash.
+> Else, add it to the pagespec hash. You can tell if it's a pure page name
+> by matching on `$config{wiki_file_regexp}`.
+> 
+> Also I think there may be little optimisation value left in
+> 7227c2debfeef94b35f7d81f42900aa01820caa3, since the "regular" dependency
+> lists will be much shorter.
+>
+> Sounds like inline pagenames has an already exstant bug WRT
+> pages moving, which this should not make worse. Would be good to verify.
+> 
+> Re coding, it would be nice if `refresh()` could avoid duplicating
+> the debug message, etc in the two cases. --[[Joey]] 
-- 
cgit v1.2.3


From 588b8951d37a4ef737edf3e36e0e8ae6c9a51f38 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 21:51:06 -0400
Subject: print which remotes are failing

---
 gitremotes | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gitremotes b/gitremotes
index bcee005c3..e2468814b 100755
--- a/gitremotes
+++ b/gitremotes
@@ -15,13 +15,19 @@ while (<IN>) {
 		# check configured url to deal with it changing
 		my $info=`git remote show -n $remote`;
 		my ($oldurl)=$info=~/URL: (.*)/m;
+		my $r;
 		if ($oldurl ne $url) {
 			system("git remote rm $remote 2>/dev/null");
-			$error |= system("git", "remote", "add", "-f", $remote, $url);
+			$r = system("git", "remote", "add", "-f", $remote, $url)
 		}
 		else {
-			$error |= system("git", "fetch", "--no-tag", $remote);
+			$r = system("git", "fetch", "--no-tag", $remote);
 		}
+
+		if ($r != 0) {
+			print "$remote failed\n";
+		}
+		$error |= $r;
 	}
 }
 close IN;
-- 
cgit v1.2.3


From 23f2d53277b6b2900ef60723169f83fa6c9590cd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 06:07:59 -0400
Subject: merge updates to danish translation from l10n

---
 po/underlays/basewiki/ikiwiki/blog.da.po           | 43 ----------------------
 po/underlays/basewiki/ikiwiki/formatting.da.po     |  8 +++-
 .../basewiki/ikiwiki/preprocessordirective.da.po   | 40 --------------------
 po/underlays/basewiki/ikiwiki/searching.da.po      |  9 ++++-
 po/underlays/basewiki/index.da.po                  |  6 ++-
 po/underlays/basewiki/shortcuts.da.po              | 26 +++++++++----
 6 files changed, 36 insertions(+), 96 deletions(-)
 delete mode 100644 po/underlays/basewiki/ikiwiki/blog.da.po
 delete mode 100644 po/underlays/basewiki/ikiwiki/preprocessordirective.da.po

diff --git a/po/underlays/basewiki/ikiwiki/blog.da.po b/po/underlays/basewiki/ikiwiki/blog.da.po
deleted file mode 100644
index 6b188fe3e..000000000
--- a/po/underlays/basewiki/ikiwiki/blog.da.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# Danish translation of basewiki/ikiwiki/blog page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
-# This file is distributed under the same license as the ikiwiki package.
-# Jonas Smedegaard <dr@jones.dk>, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
-"PO-Revision-Date: 2009-07-19 23:45+0200\n"
-"Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
-"Language-Team: None\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Danish\n"
-"X-Poedit-Country: DENMARK\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This page has been removed from ikiwiki's basewiki. For documentation about "
-"creating a blog with ikiwiki, see the documentation of the [[!iki ikiwiki/"
-"directive/inline desc=inline]] directive."
-msgstr ""
-"Denne side er blevet fjernet fra ikiwiki's basewiki. For dokumentation om "
-"oprettelse af en blog med ikiwiki se dokumentationen til [[!iki ikiwiki/"
-"directive/inline desc=inline]]-direktivet."
-
-#. type: Plain text
-msgid ""
-"Please update your links, as this redirection page will be removed in a "
-"future ikiwiki release."
-msgstr ""
-"Opdatér dine henvisninger, da denne omdirigeringsside bliver fjernet i en "
-"fremtidig udgave af ikiwiki."
diff --git a/po/underlays/basewiki/ikiwiki/formatting.da.po b/po/underlays/basewiki/ikiwiki/formatting.da.po
index 3a229e9f0..2c4b67814 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.da.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 21:25+0300\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -44,8 +44,12 @@ msgid "Leave blank lines between paragraphs."
 msgstr "hold afstand med blanke linjer mellem afsnit."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
+#| "placing it in single or double asterisks."
 msgid ""
-"You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
+"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
 "placing it in single or double asterisks."
 msgstr ""
 "du kan \\**fremhæve*\\* eller \\*\\***kraftigt fremhæve**\\*\\* tekst ved at "
diff --git a/po/underlays/basewiki/ikiwiki/preprocessordirective.da.po b/po/underlays/basewiki/ikiwiki/preprocessordirective.da.po
deleted file mode 100644
index 4eee72835..000000000
--- a/po/underlays/basewiki/ikiwiki/preprocessordirective.da.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# Danish translation of basewiki/ikiwiki/preprocessordirective page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
-# This file is distributed under the same license as the ikiwiki package.
-# Jonas Smedegaard <dr@jones.dk>, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
-"PO-Revision-Date: 2009-07-19 23:45+0200\n"
-"Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
-"Language-Team: None\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Danish\n"
-"X-Poedit-Country: DENMARK\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/directive delay=10]]\n"
-msgstr "[[!meta redir=ikiwiki/directive delay=10]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This page has moved to [[ikiwiki/directive|ikiwiki/directive]]. Please "
-"update your links, as this redirection page will be removed in a future "
-"ikiwiki release."
-msgstr ""
-"Denne side er flyttet til [[ikiwiki/directive|ikiwiki/directive]]. Opdatér "
-"dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
-"udgave af ikiwiki."
diff --git a/po/underlays/basewiki/ikiwiki/searching.da.po b/po/underlays/basewiki/ikiwiki/searching.da.po
index 3d65812ca..02827e6b0 100644
--- a/po/underlays/basewiki/ikiwiki/searching.da.po
+++ b/po/underlays/basewiki/ikiwiki/searching.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -36,9 +36,14 @@ msgstr ""
 "else=\"Denne wiki har søgning **deaktiveret**.\"]]\n"
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If searching is enabled, you can enter search terms in the search field, "
+#| "as you'd expect. There are a few special things you can do to constuct "
+#| "more powerful searches."
 msgid ""
 "If searching is enabled, you can enter search terms in the search field, as "
-"you'd expect. There are a few special things you can do to constuct more "
+"you'd expect. There are a few special things you can do to construct more "
 "powerful searches."
 msgstr ""
 "Hvis søgning er aktiveret, kan du angive søgeudtryk i søgefeltet, som du "
diff --git a/po/underlays/basewiki/index.da.po b/po/underlays/basewiki/index.da.po
index 8835e9b99..9da4c5021 100644
--- a/po/underlays/basewiki/index.da.po
+++ b/po/underlays/basewiki/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2009-08-15 18:53-0300\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -30,5 +30,7 @@ msgstr ""
 "også."
 
 #. type: Plain text
-msgid "This wiki is powered by [ikiwiki](http://ikiwiki.info/)."
+#, fuzzy
+#| msgid "This wiki is powered by [ikiwiki](http://ikiwiki.info/)."
+msgid "This wiki is powered by [[ikiwiki]]."
 msgstr "Denne wiki er drevet af [ikiwiki](http://ikiwiki.info/)."
diff --git a/po/underlays/basewiki/shortcuts.da.po b/po/underlays/basewiki/shortcuts.da.po
index f6907d9e4..c342d12e1 100644
--- a/po/underlays/basewiki/shortcuts.da.po
+++ b/po/underlays/basewiki/shortcuts.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -193,11 +193,17 @@ msgstr ""
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the "
+#| "url, \"%s\" is replaced with the text passed to the named shortcut, after "
+#| "url-encoding it, and '%S' is replaced with the raw, non-encoded text. The "
+#| "optional `desc` parameter controls the description of the link."
 msgid ""
 "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
-"\"%s\" is replaced with the text passed to the named shortcut, after url-"
-"encoding it, and '%S' is replaced with the raw, non-encoded text. The "
-"optional `desc` parameter controls the description of the link."
+"\"%s\" is replaced with the text passed to the named shortcut, after [[!"
+"wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded "
+"text. The optional `desc` parameter controls the description of the link."
 msgstr ""
 "Tilføj en ny genvej med [[direktivet|ikiwiki/directive]] `shortcut`. I URLen "
 "erstattes \"%s\" med teksten overdraget til den navngivne genvej, efter URL-"
@@ -217,11 +223,17 @@ msgstr ""
 "overskygge den der blev angivet ved definitionen."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you come up with a shortcut that you think others might find useful, "
+#| "consider contributing it to the [shortcuts page on the ikiwiki ikiwiki]"
+#| "(http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki will "
+#| "include your shortcut in the standard underlay."
 msgid ""
 "If you come up with a shortcut that you think others might find useful, "
-"consider contributing it to the [shortcuts page on the ikiwiki ikiwiki]"
-"(http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki will "
-"include your shortcut in the standard underlay."
+"consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
+"ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include "
+"your shortcut in the standard underlay."
 msgstr ""
 "Hvis du finder på en genvej som du mener andre kunne få glæde af også, kan "
 "du overveje at bidrage med den til [shortcuts-siden på ikiwiki ikiwikien]"
-- 
cgit v1.2.3


From 11ef522086f0d0ba4baeac642cda59bf8e1adfe8 Mon Sep 17 00:00:00 2001
From: Miroslav Kure <kurem@upcase.inf.upol.cz>
Date: Fri, 28 Aug 2009 06:08:46 -0400
Subject: Initial Czech translation of basewiki/

---
 po/underlays/basewiki/ikiwiki.cs.po                |  69 +++++
 po/underlays/basewiki/ikiwiki/directive.cs.po      | 130 ++++++++++
 po/underlays/basewiki/ikiwiki/formatting.cs.po     | 288 +++++++++++++++++++++
 po/underlays/basewiki/ikiwiki/markdown.cs.po       |  48 ++++
 po/underlays/basewiki/ikiwiki/openid.cs.po         | 116 +++++++++
 po/underlays/basewiki/ikiwiki/pagespec.cs.po       | 247 ++++++++++++++++++
 .../basewiki/ikiwiki/pagespec/attachment.cs.po     | 112 ++++++++
 po/underlays/basewiki/ikiwiki/pagespec/po.cs.po    |  61 +++++
 po/underlays/basewiki/ikiwiki/searching.cs.po      |  80 ++++++
 po/underlays/basewiki/ikiwiki/subpage.cs.po        |  52 ++++
 .../basewiki/ikiwiki/subpage/linkingrules.cs.po    | 100 +++++++
 po/underlays/basewiki/ikiwiki/wikilink.cs.po       | 106 ++++++++
 po/underlays/basewiki/index.cs.po                  |  27 ++
 po/underlays/basewiki/recentchanges.cs.po          |  38 +++
 po/underlays/basewiki/sandbox.cs.po                |  91 +++++++
 po/underlays/basewiki/shortcuts.cs.po              | 227 ++++++++++++++++
 po/underlays/basewiki/templates.cs.po              | 238 +++++++++++++++++
 po/underlays/basewiki/templates/note.cs.po         |  42 +++
 po/underlays/basewiki/templates/popup.cs.po        |  51 ++++
 19 files changed, 2123 insertions(+)
 create mode 100644 po/underlays/basewiki/ikiwiki.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/directive.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/formatting.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/markdown.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/openid.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/po.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/searching.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/subpage.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/subpage/linkingrules.cs.po
 create mode 100644 po/underlays/basewiki/ikiwiki/wikilink.cs.po
 create mode 100644 po/underlays/basewiki/index.cs.po
 create mode 100644 po/underlays/basewiki/recentchanges.cs.po
 create mode 100644 po/underlays/basewiki/sandbox.cs.po
 create mode 100644 po/underlays/basewiki/shortcuts.cs.po
 create mode 100644 po/underlays/basewiki/templates.cs.po
 create mode 100644 po/underlays/basewiki/templates/note.cs.po
 create mode 100644 po/underlays/basewiki/templates/popup.cs.po

diff --git a/po/underlays/basewiki/ikiwiki.cs.po b/po/underlays/basewiki/ikiwiki.cs.po
new file mode 100644
index 000000000..2584af2a6
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki.cs.po
@@ -0,0 +1,69 @@
+# Czech translation of basewiki/ikiwiki page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"PO-Revision-Date: 2009-08-16 16:29+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Currently running version [[!version ]].)\"\n"
+"]]\n"
+msgstr ""
+"Tato wiki běží na [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Momentálně na verzi [[!version ]].)\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid "Some documentation on using ikiwiki:"
+msgstr "Základní dokumentace o používání ikiwiki:"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/formatting]]"
+msgstr "[[formátování|ikiwiki/formatting]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/wikilink]]"
+msgstr "[[wiki_odkazy|ikiwiki/wikilink]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/subpage]]"
+msgstr "[[podstránky|ikiwiki/subpage]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/pagespec]]"
+msgstr "[[výběr_stránek|ikiwiki/pagespec]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/directive]]"
+msgstr "[[direktivy|ikiwiki/directive]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/markdown]]"
+msgstr "[[ikiwiki/markdown]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/openid]]"
+msgstr "[[ikiwiki/openid]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/searching]]"
+msgstr "[[vyhledávání|ikiwiki/searching]]"
diff --git a/po/underlays/basewiki/ikiwiki/directive.cs.po b/po/underlays/basewiki/ikiwiki/directive.cs.po
new file mode 100644
index 000000000..984c77603
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/directive.cs.po
@@ -0,0 +1,130 @@
+# Czech translation of basewiki/ikiwiki/directive page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"PO-Revision-Date: 2009-08-22 07:39+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin "
+"with `!` and may contain parameters. The general form is:"
+msgstr ""
+"Direktivy se podobají [[wiki odkazům|ikiwiki/WikiLink]], až na to, že "
+"začínají vykřičníkem a mohou obsahovat parametry. Obecný formát vypadá "
+"následovně:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgstr "\t\\[[!direktiva param=\"hodnota\" param=\"hodnota\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This gets expanded before the rest of the page is processed, and can be used "
+"to transform the page in various ways."
+msgstr ""
+"Direktivy se aplikují před zpracováním zbytku stránky a mohou stránku "
+"nejrůznějším způsobem měnit."
+
+#. type: Plain text
+msgid ""
+"The quotes around values can be omitted if the value is a simple word.  "
+"Also, some directives may use parameters without values, for example:"
+msgstr ""
+"Uvozovky okolo hodnot mohou být vynechány v případě, že je hodnotou jediné "
+"slovo. Některé direktivy mohou používat parametry bez hodnot. Například:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!tag foo]]\n"
+msgstr "\t\\[[!tag foo]]\n"
+
+#. type: Plain text
+msgid ""
+"A directive does not need to all be on one line, it can be wrapped to "
+"multiple lines if you like:"
+msgstr ""
+"Direktiva nemusí být zapsána celá na jednom řádku. Pokud je to čitelnější, "
+"můžete ji roztáhnout přes více řádků:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+msgstr ""
+"\t\\[[!direktiva foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+
+#. type: Plain text
+msgid ""
+"Also, multiple lines of *quoted* text can be used for a value.  To allow "
+"quote marks inside the quoted text, delimit the block of text with triple-"
+"quotes:"
+msgstr ""
+"Více řádků *uvozeného* textu lze použít i v hodnotě. Chcete-li v uvozeném "
+"textu použít (anglické) uvozovky, obklopte text trojitými uvozovkami:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive text=\"\"\"\n"
+msgstr "\t\\[[!direktiva text=\"\"\"\n"
+
+#. type: Bullet: '	1. '
+msgid "\"foo\""
+msgstr "\"něco\""
+
+#. type: Bullet: '	2. '
+msgid "\"bar\""
+msgstr "\"cosi\""
+
+#. type: Bullet: '	3. '
+msgid "\"baz\""
+msgstr "\"cokoliv\""
+
+#. type: Plain text
+msgid ""
+"ikiwiki also has an older syntax for directives, which requires a space in "
+"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This "
+"syntax has several disadvantages: it requires a space after directives with "
+"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
+"[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed "
+"syntax shown above as default.  However, ikiwiki still supports wikis using "
+"the older syntax, if the `prefix_directives` option is disabled."
+msgstr ""
+"ikiwiki podporuje i starší zápis direktiv, který vyžaduje, aby se v "
+"direktivě nacházela mezera, což ji odliší od [[wiki odkazů|ikiwiki/"
+"wikilink]]. Tento zápis má několik nevýhod: vyžaduje za direktivou bez "
+"parametrů mezeru (například `\\[[pagecount ]]`) a naopak neumožňuje mezery "
+"ve [[wiki odkazech|ikiwiki/wikilink]]. Zápis direktiv s `!` na začátku je v "
+"ikiwiki výchozí, ale chcete-li použít starší způsob zápisu, stačí vypnout "
+"volbu `prefix_directives`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid "Here is a list of currently available directives in this wiki:"
+msgstr "Následuje seznam direktiv povolených v této wiki:"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!listdirectives ]]\n"
+msgstr "[[!listdirectives ]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.cs.po b/po/underlays/basewiki/ikiwiki/formatting.cs.po
new file mode 100644
index 000000000..320667742
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/formatting.cs.po
@@ -0,0 +1,288 @@
+# Czech translation of basewiki/ikiwiki/formatting page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"PO-Revision-Date: 2009-08-28 11:17+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
+msgstr "[[!meta title=\"Formátování wiki stránek\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Text on this wiki is, by default, written in a form very close to how you "
+"might write text for an email message. This style of text formatting is "
+"called [[MarkDown]], and it works like this:"
+msgstr ""
+"Text na této wiki je psán hodně podobně tomu, jak byste mohli psát email. "
+"Tento styl formátování se nazývá [[Markdown]] a používá se následovně:"
+
+#. type: Plain text
+msgid "Leave blank lines between paragraphs."
+msgstr "Odstavce oddělujte prázdnými řádky."
+
+#. type: Plain text
+msgid ""
+"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
+"placing it in single or double asterisks."
+msgstr ""
+"Text můžete *\\*zvýraznit\\** nebo **\\*\\*silně zdůraznit\\*\\*** uzavřením "
+"mezi jedny nebo dvoje hvězdičky."
+
+#. type: Plain text
+msgid "To create a list, start each line with an asterisk:"
+msgstr "Pro vytvoření seznamu začněte každý řádek hvězdičkou:"
+
+#. type: Bullet: '* '
+msgid "\"* this is my list\""
+msgstr "\"* toto je můj seznam\""
+
+#. type: Bullet: '* '
+msgid "\"* another item\""
+msgstr "\"* další položka\""
+
+#. type: Plain text
+msgid ""
+"To make a numbered list, start each line with a number (any number will do) "
+"followed by a period:"
+msgstr ""
+"Pro vytvoření číslovaného seznamu začněte každý řádek číslem (libovolným) "
+"následovaným tečkou:"
+
+#. type: Bullet: '1. '
+msgid "\"1. first line\""
+msgstr "\"1. první řádek\""
+
+#. type: Bullet: '2. '
+msgid "\"2. second line\""
+msgstr "\"2. druhý řádek\""
+
+#. type: Bullet: '2. '
+msgid "\"2. third line\""
+msgstr "\"2. třetí řádek\""
+
+#. type: Plain text
+msgid ""
+"To create a header, start a line with one or more `#` characters followed by "
+"a space and the header text. The number of `#` characters controls the size "
+"of the header:"
+msgstr ""
+"Pro vytvoření nadpisu začněte řádek jedním nebo více znaky `#`, mezerou a "
+"textem nadpisu. Počet znaků `#` určuje velikost nadpisu:"
+
+#. type: Title #
+#, no-wrap
+msgid "# h1"
+msgstr "# h1"
+
+#. type: Title ##
+#, no-wrap
+msgid "## h2"
+msgstr "## h2"
+
+#. type: Title ###
+#, no-wrap
+msgid "### h3"
+msgstr "### h3"
+
+#. type: Title ####
+#, no-wrap
+msgid "#### h4"
+msgstr "#### h4"
+
+#. type: Title #####
+#, no-wrap
+msgid "##### h5"
+msgstr "##### h5"
+
+#. type: Title ######
+#, no-wrap
+msgid "###### h6"
+msgstr "###### h6"
+
+#. type: Plain text
+msgid ""
+"To create a horizontal rule, just write three or more dashes or stars on "
+"their own line:"
+msgstr ""
+"Pro vytvoření horizontální čáry napište na samostatný řádek alespoň tři "
+"pomlčky nebo hvězdičky:"
+
+#. type: Plain text
+#, no-wrap
+msgid "To quote someone, prefix the quote with \">\":\n"
+msgstr "Chcete-li někoho citovat, uvoďte citaci znakem „>“:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> To be or not to be,\n"
+"> that is the question.\n"
+msgstr ""
+"> Být či nebýt,\n"
+"> toť oč tu běží.\n"
+
+#. type: Plain text
+msgid "To write a code block, indent each line with a tab or 4 spaces:"
+msgstr ""
+"Pro zápis bloku kódu odsaďte každý řádek tabulátorem nebo čtyřmi mezerami:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t10 PRINT \"Hello, world!\"\n"
+"\t20 GOTO 10\n"
+msgstr ""
+"\t10 PRINT \"Hello, world!\"\n"
+"\t20 GOTO 10\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"To link to an url or email address, you can just put the\n"
+"url in angle brackets: <<http://ikiwiki.info>>, or you can use the\n"
+"form \\[link text\\]\\(url\\)\n"
+msgstr "Pro vytvoření odkazu na url nebo emailovou adresu můžete jednoduše uzavřít url do špičatých závorek: <<http://ikiwiki.info>>, nebo použít formu \\[text odkazu\\]\\(url\\)\n"
+
+#. type: Plain text
+msgid ""
+"In addition to basic html formatting using [[MarkDown]], this wiki lets you "
+"use the following additional features:"
+msgstr ""
+"Kromě základního html formátování pomocí [[MarkDown]]u vám tato wiki dává k "
+"dispozici následující vylepšení:"
+
+#. type: Bullet: '* '
+msgid ""
+"To link to another page on the wiki, place the page's name inside double "
+"square brackets. So you would use `\\[[WikiLink]]` to link to [[WikiLink]]."
+msgstr ""
+"Odkaz na jinou stránku ve wiki vytvoříte tak, že jméno stránky uzavřete do "
+"dvojice hranatých závorek. Pro odkaz na stránku [[WikiLink]] byste použili `"
+"\\[[WikiLink]]`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Insert [[smileys]] and some other useful symbols. :-)"
+msgstr ""
+"Vkládání [[smajlíků|smileys]] a několika dalších užitečných symbolů. :-)"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Use [[shortcuts]] to link to common resources."
+msgstr "Použití [[zkratek|shortcuts]] pro odkazy na běžné zdroje."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid ""
+"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
+"text."
+msgstr ""
+"Vytváření a používání [[šablon|templates]] pro opakované kusy "
+"parameterizovaného wiki textu."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* Insert various [[directives|directive]] onto a page to perform useful\n"
+"  actions.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
+msgstr ""
+"* Vkládání různých [[direktiv|directive]], které mohou provádět užitečné\n"
+"  akce.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  For example, you can:\n"
+msgstr "  Například můžete:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Add a table of contents to a page:"
+msgstr "Přidat do stránky obsah:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc]]\n"
+msgstr "\t\\[[!toc]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Change the title of a page:"
+msgstr "Změnit název stránky:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"full page title\"]]\n"
+msgstr "\t\\[[!meta title=\"Kompletní název stránky\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Create a blog by inlining a set of pages:"
+msgstr "Vytvořit blog vložením množiny stránek:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
+msgstr "\t\\[[!inline pages=\"blog/*\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Full list of [[directives|directive]] enabled for this wiki:\n"
+msgstr "  Úplný seznam [[direktiv|directive]] povolených v této wiki:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  [[!listdirectives ]]\n"
+msgstr "  [[!listdirectives ]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/markdown.cs.po b/po/underlays/basewiki/ikiwiki/markdown.cs.po
new file mode 100644
index 000000000..3217b009e
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/markdown.cs.po
@@ -0,0 +1,48 @@
+# Czech translation of basewiki/ikiwiki/markdown page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-22 08:43+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[Markdown](http://daringfireball.net/projects/markdown/)  is a minimal "
+"markup language that resembles plain text as used in email messages. It is "
+"the markup language used by this wiki by default."
+msgstr ""
+"[Markdown](http://daringfireball.net/projects/markdown/) je minimální "
+"značkovací jazyk, který připomíná prostý text používaný v emailové "
+"korespondeci. Tento značkovací jazyk je v této wiki používaný jako výchozí."
+
+#. type: Plain text
+msgid ""
+"For documentation about the markdown syntax, see [[formatting]] and "
+"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
+msgstr ""
+"Popis syntaxe naleznete na stránkách [[formátování|formatting]] a [Markdown: "
+"syntax](http://daringfireball.net/projects/markdown/syntax)."
+
+#. type: Plain text
+msgid ""
+"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part "
+"of the markdown syntax, and are the only bit of markup that this wiki "
+"handles internally."
+msgstr ""
+"Poznamenejme, že [[wiki odkazy|WikiLink]] a [[direktivy|directive]] nejsou "
+"součástí syntaxe Markdownu a jsou jediné části značkování, které si tato "
+"wiki řeší interně."
diff --git a/po/underlays/basewiki/ikiwiki/openid.cs.po b/po/underlays/basewiki/ikiwiki/openid.cs.po
new file mode 100644
index 000000000..6cc5f7126
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/openid.cs.po
@@ -0,0 +1,116 @@
+# Czech translation of basewiki/ikiwiki/openid page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-22 09:00+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"OpenID\"]]\n"
+msgstr "[[!meta title=\"OpenID\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(openid)\"\n"
+"     then=\"This wiki has OpenID **enabled**.\"\n"
+"     else=\"This wiki has OpenID **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(openid)\"\n"
+"     then=\"Tato wiki má OpenID **povolené**.\"\n"
+"     else=\"Tato wiki má OpenID **vypnuté**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[OpenID](http://openid.net) is a decentralized authentication mechanism that "
+"allows you to have one login that you can use on a growing number of "
+"websites."
+msgstr ""
+"[OpenID](http://openid.net) je decentralizovaný authentizační systém, který "
+"vám umožňuje mít jedno přihlášení, které můžete použít na stále rostoucím "
+"počtu webů."
+
+#. type: Plain text
+msgid ""
+"To sign up for an OpenID, visit one of the following identity providers:"
+msgstr ""
+"Pro získání OpenID navštivte některého z následujících poskytovatelů identit:"
+
+#. type: Bullet: '* '
+msgid "[MyOpenID](https://www.myopenid.com/)"
+msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[GetOpenID](https://getopenid.com/)"
+msgstr "[GetOpenID](https://getopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[Videntity](http://videntity.org/)"
+msgstr "[Videntity](http://videntity.org/)"
+
+#. type: Bullet: '* '
+msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#. type: Bullet: '* '
+msgid "[TrustBearer](https://openid.trustbearer.com/)"
+msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#. type: Bullet: '* '
+msgid ""
+"or any of the [many others out there](http://openiddirectory.com/openid-"
+"providers-c-1.html)"
+msgstr ""
+"nebo některého [z mnoha dalších](http://openiddirectory.com/openid-providers-"
+"c-1.html)"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Your OpenID is the URL that you are given when you sign up.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgstr ""
+"Vaše OpenID je URL, které jste získali, když jste se zaregistrovali.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"To sign in to this wiki using OpenID, just enter it in the OpenID field in "
+"the signin form. You do not need to give this wiki a password or go through "
+"any registration process when using OpenID."
+msgstr ""
+"Pro přihlášení do této wiki pomocí OpenID jednoduše zadejte své OpenID do "
+"pole pro přihlášení přes OpenID. Při používání OpenID se u této wiki "
+"nemusíte registrovat ani zadávat žádné heslo."
+
+#. type: Plain text
+msgid ""
+"It's also possible to make a page in the wiki usable as an OpenID url, by "
+"delegating it to an openid server. Here's an example of how to do that:"
+msgstr ""
+"Dokonce je možné vytvořit wiki stránku, která bude sloužit jako OpenID url. "
+"Tato stránka bude delegovat požadavky na OpenID server. Příklad:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t       server=\"http://www.myopenid.com/server\"]]\n"
+msgstr ""
+"\t\\[[!meta openid=\"http://vase-id.myopenid.com/\"\n"
+"\t       server=\"http://www.myopenid.com/server\"]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.cs.po b/po/underlays/basewiki/ikiwiki/pagespec.cs.po
new file mode 100644
index 000000000..d59e7dd28
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec.cs.po
@@ -0,0 +1,247 @@
+# Czech translation of basewiki/ikiwiki/pagespec page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-26 14:14+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To select a set of pages, such as pages that are locked, pages whose commit "
+"emails you want subscribe to, or pages to combine into a blog, the wiki uses "
+"a PageSpec. This is an expression that matches a set of pages."
+msgstr ""
+"Pro výběr množiny stránek (jako jsou například zamknuté stránky, stránky, u "
+"nichž chcete dostávat maily se změnami nebo třeba stránky, které chcete "
+"zkombinovat do blogu) používá wiki něco s názvem PageSpec. PageSpec je "
+"výraz, který se shoduje s množinou stránek."
+
+#. type: Plain text
+msgid ""
+"The simplest PageSpec is a simple list of pages. For example, this matches "
+"any of the three listed pages:"
+msgstr ""
+"Nejjednodušší PageSpec je jednoduchý seznam stránek. Například následující "
+"se shoduje s libovolnou ze tří zmíněných stránek:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tfoo or bar or baz\n"
+msgstr "\tstránka1 or stránka2 or stránka3\n"
+
+#. type: Plain text
+msgid ""
+"More often you will want to match any pages that have a particular thing in "
+"their name. You can do this using a glob pattern. \"`*`\" stands for any "
+"part of a page name, and \"`?`\" for any single letter of a page name. So "
+"this matches all pages about music, and any [[SubPage]]s of the SandBox, but "
+"does not match the SandBox itself:"
+msgstr ""
+"Mnohem častěji budete chtít vybrat stránky, které obsahují ve svém názvu "
+"konkrétní řetězec. K tomu můžete použít tzv. vzor, který může obsahovat "
+"zástupné znaky. „`*`“ znamená libovolnou část názvu stránky, „`?`“ zastupuje "
+"jedno písmeno názvu stránky. Následující příklad vybere všechny stránky o "
+"hudbě a všechny [[podstránky|SubPage]] [[pískoviště|SandBox]] (ve wiki "
+"uložené jako SandBox), ale ne pískoviště samotné:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t*music* or SandBox/*\n"
+msgstr "\t*music* or SandBox/*\n"
+
+#. type: Plain text
+msgid ""
+"You can also prefix an item with \"`!`\" to skip pages that match it. So to "
+"match all pages except for Discussion pages and the SandBox:"
+msgstr ""
+"Výraz můžete uvodit znakem „`!`“ a negovat tak jeho význam, tj. přeskočit "
+"dané stránky. Například chcete-li vybrat všechny stránky ve wiki kromě "
+"diskuzí (uložené jako Discussion) a pískoviště (SandBox), použijte:"
+
+#. type: Bullet: '	* '
+msgid "and !SandBox and !*/Discussion"
+msgstr "and !SandBox and !*/Discussion"
+
+#. type: Plain text
+msgid ""
+"Some more elaborate limits can be added to what matches using these "
+"functions:"
+msgstr "S komplikovanějšími výběry mohou pomoci následující funkce:"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+msgstr ""
+"„`link(stránka)`“ - vybere stránky, které odkazují na danou stránku (resp. "
+"stránky, pokud použijete zástupné znaky)"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
+"(or tags matched by a glob)"
+msgstr ""
+"„`tagged(štítek)`“ - vybere stránky, které obsahují daný štítek (resp. "
+"štítky, pokud použijete zástupné znaky), nebo na něj odkazují"
+
+#. type: Bullet: '* '
+msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+msgstr ""
+"„`backlink(stránka)`“ - vybere pouze stránky, na které odkazuje daná stránka"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`creation_month(month)`\" - matches only pages created on the given month"
+msgstr ""
+"„`creation_month(měsíc)`“ - vybere pouze stránky vytvořené v daném měsíci"
+
+#. type: Bullet: '* '
+msgid "\"`creation_day(mday)`\" - or day of the month"
+msgstr ""
+"„`creation_day(den_měsíce)`“ - vybere pouze stránky vytvořené daného dne v "
+"měsíci"
+
+#. type: Bullet: '* '
+msgid "\"`creation_year(year)`\" - or year"
+msgstr "„`creation_year(rok)`“ - vybere pouze stránky vytvořené v daném roce"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_after(page)`\" - matches only pages created after the given page "
+"was created"
+msgstr ""
+"„`created_after(stránka)`“ - vybere pouze stránky vytvořené po vytvoření "
+"dané stránky"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_before(page)`\" - matches only pages created before the given "
+"page was created"
+msgstr ""
+"„`created_before(stránka)`“ - vybere pouze stránky vytvořené před vytvořením "
+"dané stránky"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
+"the glob by itself is actually a shorthand for this function."
+msgstr ""
+"„`glob(vzor)`“ - vybere stránky, které odpovídají danému vzoru. Použití "
+"samotného vzoru je zkratkou za tuto funkci."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+"that globs do not usually match."
+msgstr ""
+"„`internal(vzor)`“ - jako `glob()`, ale vybere i stránky pro interní "
+"potřebu, které glob() obvykle přeskočí."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
+"matching the specified glob."
+msgstr ""
+"„`title(vzor)`“, „`author(vzor)`“, „`authorurl(vzor)`“, „`license(vzor)`“, "
+"„`copyright(vzor)`“ - vybere stránky, které obsahují metadata odpovídající "
+"zadanému vzoru."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`user(username)`\" - tests whether a modification is being made by a user "
+"with the specified username. If openid is enabled, an openid can also be put "
+"here."
+msgstr ""
+"„`user(uživatelskéjméno)`“ - testuje, zda změnu provádí uživatel s daným "
+"uživatelským jménem. Je-li povoleno openid, můžete ho použít místo "
+"uživatelského jména."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`admin()`\" - tests whether a modification is being made by one of the "
+"wiki admins."
+msgstr "„`admin()`“ - testuje, zda změnu provádí některý ze správců wiki."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ip(address)`\" - tests whether a modification is being made from the "
+"specified IP address."
+msgstr "„`ip(adresa)`“ - testuje, zda změnu provádí někdo z dané IP adresy."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
+"page matching the specified glob"
+msgstr ""
+"„`postcomment(vzor)`“ - shoduje se pouze pokud se komentáře ukládají do "
+"stránky odpovídající zadanému vzoru"
+
+#. type: Plain text
+msgid ""
+"For example, to match all pages in a blog that link to the page about music "
+"and were written in 2005:"
+msgstr ""
+"Například pro výběr všech stránek v blogu, které se odkazují na stránku o "
+"hudbě a byly napsány v roce 2005:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and link(music) and creation_year(2005)\n"
+msgstr "\tblog/* and link(music) and creation_year(2005)\n"
+
+#. type: Plain text
+msgid ""
+"Note the use of \"and\" in the above example, that means that only pages "
+"that match each of the three expressions match the whole. Use \"and\" when "
+"you want to combine expression like that; \"or\" when it's enough for a page "
+"to match one expression. Note that it doesn't make sense to say \"index and "
+"SandBox\", since no page can match both expressions."
+msgstr ""
+"Povšimněte si použití „and“ v předchozím příkladu. Znamená to, že se vyberou "
+"pouze stránky, které splňují všechny tři podmínky zároveň. Pokud by stačilo, "
+"aby byla platná alespoň jedna ze zadaných podmínek, použijte „or“. Poznámka: "
+"výraz „index and SandBox“ nikdy nevrátí žádnou stránku, protože není možné, "
+"aby nějaká stránka splňovala obě podmínky zároveň."
+
+#. type: Plain text
+msgid ""
+"More complex expressions can also be created, by using parentheses for "
+"grouping. For example, to match pages in a blog that are tagged with either "
+"of two tags, use:"
+msgstr ""
+"Při vytváření komplexnějších výrazů můžete použít závorky. Například pro "
+"výběr stránek v blogu, které mají alespoň jeden ze dvou štítků, můžete "
+"použít:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and (tagged(foo) or tagged(bar))\n"
+msgstr "\tblog/* and (tagged(štítek1) or tagged(štítek2))\n"
+
+#. type: Plain text
+msgid ""
+"Note that page names in PageSpecs are matched against the absolute filenames "
+"of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will "
+"not match a page named \"a/foo\" or \"a/b/foo\". To match relative to the "
+"directory of the page containing the pagespec, you can use \"./\". For "
+"example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
+msgstr ""
+"Jména stránek v PageSpec se porovnávají vůči absolutním jménům souborů wiki "
+"stránek, takže PageSpec „něco“ použité na stránce „a/b“ nenajde „a/něco“ ani "
+"„a/b/něco“. Chcete-li vyhledávat relativně k adresáři stránky, která "
+"obsahuje PageSpec, můžete použít „./“. To znamená, že „./něco“ na stránce „a/"
+"b“ najde stránku „a/něco“."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po
new file mode 100644
index 000000000..2eb1493c8
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po
@@ -0,0 +1,112 @@
+# Czech translation of basewiki/ikiwiki/pagespec/attachment page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-27 09:04+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(attachment)\"\n"
+"     then=\"This wiki has attachments **enabled**.\"\n"
+"     else=\"This wiki has attachments **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(attachment)\"\n"
+"     then=\"Tato wiki má přílohy **povolené**.\"\n"
+"     else=\"Tato wiki má přílohy **vypnuté**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If attachments are enabled, the wiki admin can control what types of "
+"attachments will be accepted, via the `allowed_attachments` configuration "
+"setting."
+msgstr ""
+"Pokud jsou přílohy povoleny, může správce wiki pomocí volby "
+"`allowed_attachments` určovat, které typy příloh budou povoleny."
+
+#. type: Plain text
+msgid ""
+"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
+"files to be uploaded by joey into a specific directory, and check all "
+"attachments for viruses, something like this could be used:"
+msgstr ""
+"Například pokud byste chtěli omezit všechny soubory na 50 kilobajtů s "
+"výjimkou větčích mp3 souborů nahraných uživatelem joey do specifického "
+"adresáře a navíc byste chtěli všechny soubory zkontrolovat na přítomnost "
+"virů, mohli byste použít něco jako:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+
+#. type: Plain text
+msgid ""
+"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
+"additional tests:"
+msgstr "Běžná syntaxe [[ikiwiki/PageSpec]] je rozšířena o následující testy:"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`maxsize(size)`\" - tests whether the attachment is no larger than the "
+"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", \"gb"
+"\" etc can be used to specify the units."
+msgstr ""
+"„`maxsize(velikost)`“ - testuje, zda není příloha větší než zadaná velikost. "
+"Velikost je standardně uváděna v bajtech, ale můžete použít i jiné jednotky, "
+"když za velikost připojíte „kb“, „mb“, „gb“ apod."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`minsize(size)`\" - tests whether the attachment is no smaller than the "
+"specified size."
+msgstr ""
+"„`minsize(velikost)`“ - testuje, zda není příloha menší než zadaná velikost. "
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as "
+"a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other "
+"enabled page format)."
+msgstr ""
+"„`ispage()`“ - testuje, zda bude ikiwiki přílohu chápat jako wiki stránku "
+"(tzn. zda má příloha příponu „.mdwn“, nebo příponu některého jiného "
+"podporovaného formátu)."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
+"  use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n"
+"  as attachments, use `ispage()`.\n"
+msgstr ""
+"  Pokud nechcete umožnit nahrávání wiki stránek jako příloh, použijte\n"
+"  `!ispage()`. Analogicky, chcete-li umožnit nahrávání pouze wiki stránek,\n"
+"  použijte `ispage()`.\n"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can "
+"include a glob in the type, for example `mimetype(image/*)`."
+msgstr ""
+"„`mimetype(něco/cosi)`“ - zkontroluje MIME typ přílohy. Můžete použít i "
+"zástupné znaky, například `mimetype(image/*)`."
+
+#. type: Bullet: '* '
+msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
+msgstr "„`virusfree()`“ - zkontroluje přílohu antivirovým programem."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po b/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po
new file mode 100644
index 000000000..6e09fa4e6
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po
@@ -0,0 +1,61 @@
+# Czech translation of basewiki/ikiwiki/pagespec/po page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"PO-Revision-Date: 2009-08-27 09:20+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(po)\"\n"
+"     then=\"This wiki has po support **enabled**.\"\n"
+"     else=\"This wiki has po support **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(po)\"\n"
+"     then=\"Tato wiki má podporu překladů **povolenou**.\"\n"
+"     else=\"Tato wiki má podporu překladů **vypnutou**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/"
+"PageSpec]] syntax is expanded with the following additional tests that can "
+"be used to improve user navigation in a multi-lingual wiki:"
+msgstr ""
+"Pokud je povolený modul [[!iki plugins/po desc=po]], je standardní syntaxe "
+"[[ikiwiki/PageSpec]] rozšířena o následující testy, které lze použít pro "
+"zlepšení navigace ve vícejazyčné wiki:"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`lang(LL)`\" - tests whether a page is written in the language specified "
+"as a ISO639-1 (two-letter) language code."
+msgstr ""
+"„`lang(LL)`“ - testuje, zda je stránka napsána v jazyce zadaném "
+"dvoupísmenným kódem jazyka dle normy ISO639-1."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`currentlang()`\" - tests whether a page is written in the same language "
+"as the current page."
+msgstr ""
+"„`currentlang()`“ - testuje, zda je stránka napsána ve stejném jazyce jako "
+"aktuální stránka."
+
+#. type: Plain text
+msgid ""
+"Note that every non-po page is considered to be written in "
+"`po_master_language`, as specified in `ikiwiki.setup`."
+msgstr ""
+"O každé stránce, která nepoužívá „po“ překlad, se předpokládá, že je napsaná "
+"v jazyce zadaném proměnnou `po_master_language` v konfiguračním souboru "
+"ikiwiki."
diff --git a/po/underlays/basewiki/ikiwiki/searching.cs.po b/po/underlays/basewiki/ikiwiki/searching.cs.po
new file mode 100644
index 000000000..7734ff343
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/searching.cs.po
@@ -0,0 +1,80 @@
+# Czech translation of basewiki/ikiwiki/searching page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"PO-Revision-Date: 2009-08-28 11:17+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(search)\"\n"
+"then=\"This wiki has searching **enabled**.\"\n"
+"else=\"This wiki has searching **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(search)\"\n"
+"     then=\"Tato wiki má hledání **povolené**.\"\n"
+"     else=\"Tato wiki má hledání **vypnuté**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If searching is enabled, you can enter search terms in the search field, as "
+"you'd expect. There are a few special things you can do to construct more "
+"powerful searches."
+msgstr ""
+"Pokud je hledání povoleno, můžete ve wiki vyhledávat prostřednictvím "
+"vyhledávacího pole. Pro získání přesnějších výsledků existuje několik tipů:"
+
+#. type: Bullet: '* '
+msgid "To match a phrase, enclose it in double quotes."
+msgstr "Pro vyhledání celé fráze ji uzavřete do uvozovek."
+
+#. type: Bullet: '* '
+msgid "`AND` can be used to search for documents containing two expressions."
+msgstr "Pro vyhledání dokumentů obsahujících dva výrazy je možno použít „AND“."
+
+#. type: Bullet: '* '
+msgid ""
+"`OR` can be used to search for documents containing either one of two "
+"expressions."
+msgstr ""
+"Pro vyhledání dokumentů obsahujících libovolný ze dvou výrazů je možno "
+"použít „OR“."
+
+#. type: Bullet: '* '
+msgid ""
+"Parentheses can be used to build up complicated search expressions. For "
+"example, \"(foo AND bar) OR (me AND you)\""
+msgstr ""
+"Komplikovanější dotazy lze sestavit pomocí uzávorkování. Například „(něco "
+"AND cosi) or (já AND ty)“."
+
+#. type: Bullet: '* '
+msgid ""
+"Prefix a search term with \"-\" to avoid it from appearing in the results.  "
+"For example, \"-discussion\" will omit \"discussion\"."
+msgstr ""
+"Pokud nechcete, aby se zadaný výraz objevoval ve výsledcích hledání, napište "
+"před něj „-“. Například „-diskuze“ vynechá \"diskuze\"."
+
+#. type: Bullet: '* '
+msgid "To search for a page with a given title, use \"title:foo\"."
+msgstr "Pro vyhledání stránky se zadaným názvem použijte „title:něco“."
+
+#. type: Bullet: '* '
+msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"."
+msgstr "Pro vyhledání stránek obsahujících odkaz „cosi“ použijte „link:cosi“."
diff --git a/po/underlays/basewiki/ikiwiki/subpage.cs.po b/po/underlays/basewiki/ikiwiki/subpage.cs.po
new file mode 100644
index 000000000..8a69549f9
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage.cs.po
@@ -0,0 +1,52 @@
+# Czech translation of basewiki/ikiwiki/subpage page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-26 17:01+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"ikiwiki supports placing pages in a directory hierarchy. For example, this "
+"page, [[SubPage]] has some related pages placed under it, like [[SubPage/"
+"LinkingRules]]. This is a useful way to add some order to your wiki rather "
+"than just having a great big directory full of pages."
+msgstr ""
+"ikiwiki podporuje ukládání stránek do adresářové hierarchie. Například tato "
+"stránka, [[SubPage]], má pod sebou umístěno několik příbuzných stránek, jako "
+"je [[SubPage/LinkingRules]]. Adresářová hierarchie je vhodným nástrojem pro "
+"zavedení pořádku ve wiki - určitě to je lepší, než mít jeden adresář plný "
+"stránek."
+
+#. type: Plain text
+msgid ""
+"To add a SubPage, just make a subdirectory and put pages in it. For example, "
+"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
+"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"nested as deeply as you'd like."
+msgstr ""
+"Pro přidání [[podstránky|SubPage]] jednoduše vytvořte podadresář a umístěte "
+"do něj nějaké stránky. Například tato stránka je ve zdrojové podobě této "
+"wiki uložena jako SubPage.mdwn a existuje též podadresář SubPage, který "
+"obsahuje soubor SubPage/LinkingRules.mdwn. Hierarchie podstránek můžete být "
+"libovolně hluboká (s přihlédnutím k limitům operačního systému)."
+
+#. type: Plain text
+msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
+msgstr ""
+"Vytváření odkazů na podstránky je vysvětleno v [[pravidlech vytváření odkazů|"
+"LinkingRules]]."
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.cs.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.cs.po
new file mode 100644
index 000000000..46918a42e
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.cs.po
@@ -0,0 +1,100 @@
+# Czech translation of basewiki/ikiwiki/subpage/linkingrules page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-27 10:43+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To link to or from a [[SubPage]], you can normally use a regular "
+"[[WikiLink]] that does not contain the name of the parent directory of the "
+"[[SubPage]]. Ikiwiki descends the directory hierarchy looking for a page "
+"that matches your link."
+msgstr ""
+"Pro vytvoření odkazu z/na [[podstránku|SubPage]] můžete použít běžný [[wiki "
+"odkaz|WikiLink]], který neobsahuje název rodičovského adresáře [[podstránky|"
+"SubPage]]. Ikiwiki postupuje hierarchií adresářů a hledá stránku, která "
+"odpovídá zadanému odkazu."
+
+#. type: Plain text
+msgid ""
+"For example, if FooBar/SubPage links to \"OtherPage\", ikiwiki will first "
+"prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next to "
+"FooBar/OtherPage and finally to OtherPage in the root of the wiki."
+msgstr ""
+"Například pokud stránka Cokoliv/Podstránka odkazuje na „JináStránka“, bude "
+"ikiwiki preferovat odkaz na Cokoliv/Podstránka/JináStránka (pokud existuje), "
+"potom Cokoliv/JináStránka a na závěr odkaz na JináStránka v kořenu wiki."
+
+#. type: Plain text
+msgid ""
+"Note that this means that if a link on FooBar/SomePage to \"OtherPage\" "
+"currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage "
+"is created, the link will _change_ to point to FooBar/OtherPage. On the "
+"other hand, a link from BazBar to \"OtherPage\" would be unchanged by this "
+"creation of a [[SubPage]] of FooBar."
+msgstr ""
+"To mimo jiné znamená, že pokud odkaz „JináStránka“ na stránce Cokoliv/"
+"NějakáStránka momentálně odkazuje na stránku JináStránka v kořenu wiki a "
+"někdo vytvoří stránku Cokoliv/JináStránka, odkaz se _změní_ a začne ukazovat "
+"na Cokoliv/JináStránka. Na druhou stranu odkaz z DalšíStránka na JináStránka "
+"by vytvořením [[podstránky|SubPage]] v adresáři Cokoliv zůstal nezměněn."
+
+#. type: Plain text
+msgid ""
+"You can also specify a link that contains a directory name, like \"FooBar/"
+"OtherPage\" to more exactly specify what page to link to. This is the only "
+"way to link to an unrelated [[SubPage]]."
+msgstr ""
+"Pro přesnější určení, kam má odkaz ukazovat, je možné zadat odkaz včetně "
+"jména adresáře, např. „Cokoliv/JináStránka“. Toto je jediný způsob, jak se "
+"odkazovat na nesouvisející [[podstránku|SubPage]]."
+
+#. type: Plain text
+msgid ""
+"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", "
+"or from BazBar/SubPage to \"FooBar/SubPage\"."
+msgstr ""
+"Můžete tak odkazovat například ze stránky DalšíStránka na „Cokoliv/"
+"Podstránka“, nebo z DalšíStránka/Podstránka na „Cokoliv/Podstránka“."
+
+#. type: Plain text
+msgid ""
+"You can also use \"/\" at the start of a link, to specify exactly which page "
+"to link to, when there are multiple pages with similar names and the link "
+"goes to the wrong page by default. For example, linking from \"FooBar/SubPage"
+"\" to \"/OtherPage\" will link to the \"OtherPage\" in the root of the wiki, "
+"even if there is a \"FooBar/OtherPage\"."
+msgstr ""
+"Pokud ve wiki existuje několik stránek se stejnými názvy a odkaz se vytváří "
+"na nesprávnou stránku, můžete na začátku odkazu použít „/“ a zapsat "
+"absolutní cestu ke stránce. Například odkaz z „Cosi/Podstránka“ na „/"
+"JináStránka“ se bude odkazovat na stránku v kořenu wiki i v případě, že "
+"existuje „Cosi/JináStránka“."
+
+#. type: Plain text
+msgid ""
+"Also, if the wiki is configured with a userdir, you can link to pages within "
+"the userdir without specifying a path to them. This is to allow for easy "
+"linking to a user's page in the userdir, to sign a comment. These links are "
+"checked for last of all."
+msgstr ""
+"Pokud je wiki nastavena s volbou „userdir“, můžete se odkazovat na stránky "
+"uvnitř uživatelského adresáře bez nutnosti zadávání cesty. To umožňuje "
+"jednoduché odkazování na uživatelovu stránku, podepsání komentáře. Tyto "
+"odkazy jsou kontrolovány jako poslední."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.cs.po b/po/underlays/basewiki/ikiwiki/wikilink.cs.po
new file mode 100644
index 000000000..1ca35af2f
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/wikilink.cs.po
@@ -0,0 +1,106 @@
+# Czech translation of basewiki/ikiwiki/wikilink page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"PO-Revision-Date: 2009-08-27 08:23+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"WikiLinks provide easy linking between pages of the wiki. To create a "
+"[[WikiLink]], just put the name of the page to link to in double brackets.  "
+"For example `\\[[WikiLink]]`."
+msgstr ""
+"Wiki odkazy poskytují jednoduchý způsob vytváření odkazů mezi stránkami ve "
+"wiki. Pro vytvoření [[wiki odkazu|WikiLink]] jednoduše umístěte jméno "
+"stránky, na kterou se chcete odkázat, do dvojitých hranatých závorek. "
+"Například `\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"If you ever need to write something like `\\[[WikiLink]]` without creating a "
+"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
+msgstr ""
+"Pokud byste někdy potřebovali napsat něco jako `\\[[WikiLink]]` bez "
+"vytvoření wiki odkazu, jednoduše před první závorku napište `\\` jako zde: `"
+"\\\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"There are some special [[SubPage/LinkingRules]] that come into play when "
+"linking between [[SubPages|SubPage]]."
+msgstr ""
+"Při odkazování mezi [[podstránkami|SubPage]] platí speciální [[pravidla "
+"vytváření odkazů|SubPage/LinkingRules]]."
+
+#. type: Plain text
+msgid ""
+"Also, if the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Také pokud soubor odkazovaný pomocí wiki odkazu vypadá jako obrázek, bude "
+"zobrazen přímo ve stránce."
+
+#. type: Plain text
+msgid ""
+"WikiLinks are matched with page names in a case-insensitive manner, so you "
+"don't need to worry about getting the case the same, and can capitalise "
+"links at the start of a sentence, and so on."
+msgstr ""
+"Wiki odkazy ignorují rozdíly mezi malými a velkými písmeny, takže se "
+"nemusíte starat o to, jaký zápis jste použili při vytváření stránky. Můžete "
+"tak v odkazech na začátcích vět použít velká písmena a podobně."
+
+#. type: Plain text
+msgid ""
+"It's also possible to write a WikiLink that uses something other than the "
+"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
+"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
+msgstr ""
+"Také je možné vytvořit wiki odkaz, který používá jiný text odkazu, než je "
+"název odkazované stránky (čehož zhusta využíváme v českém překladu). "
+"Například `\\[[pískoviště|SandBox]]` odkazuje na stránku SandBox, ale odkaz "
+"bude vypadat takto: [[pískoviště|SandBox]]."
+
+#. type: Plain text
+msgid ""
+"To link to an anchor inside a page, you can use something like `"
+"\\[[WikiLink#foo]]` ."
+msgstr ""
+"Pro odkaz na kotvu uvnitř stránky použijte něco jako `\\[[WikiLink#kotva]]`."
+
+#. type: Title ##
+#, no-wrap
+msgid "Directives and WikiLinks"
+msgstr "Direktivy a wiki odkazy"
+
+#. type: Plain text
+msgid ""
+"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+"used spaces to distinguish between directives and wikilinks; as a result, "
+"with that syntax in use, you cannot use spaces in WikiLinks, and must "
+"replace spaces with underscores.  The newer syntax, enabled with the "
+"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+"with `!`, and thus does not prevent links with spaces.  Future versions of "
+"ikiwiki will turn this option on by default."
+msgstr ""
+"ikiwiki používá pro [[direktivy|directive]] dva zápisy. Starší zápis používá "
+"pro rozlišení mezi direktivami a wiki odkazy mezery. To znamená, že ve wiki "
+"odkazech pak nemůžete použít mezery a musíte je nahradit podtržítky. Novější "
+"zápis, který se povoluje v konfiguračním souboru volbou `prefix_directives` "
+"vyžaduje, aby direktivy začínaly vykřičníkem a tím pádem nevylučuje odkazy s "
+"mezerami. Budoucí verze ikiwiki budou mít tuto volbu implicitně zapnutou."
diff --git a/po/underlays/basewiki/index.cs.po b/po/underlays/basewiki/index.cs.po
new file mode 100644
index 000000000..acc7dc756
--- /dev/null
+++ b/po/underlays/basewiki/index.cs.po
@@ -0,0 +1,27 @@
+# Czech translation of basewiki/index page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-16 16:18+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid "Welcome to your new wiki."
+msgstr "Vítejte ve své nové wiki."
+
+#. type: Plain text
+msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
+msgstr "Všechny wiki by měly mít [[pískoviště|SandBox]] a tato není výjimkou."
+
+#. type: Plain text
+msgid "This wiki is powered by [[ikiwiki]]."
+msgstr "Tato wiki běží na [[ikiwiki]]."
diff --git a/po/underlays/basewiki/recentchanges.cs.po b/po/underlays/basewiki/recentchanges.cs.po
new file mode 100644
index 000000000..069faded7
--- /dev/null
+++ b/po/underlays/basewiki/recentchanges.cs.po
@@ -0,0 +1,38 @@
+# Czech translation of basewiki/recentchanges page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-16 16:43+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"RecentChanges\"]]\n"
+msgstr "[[!meta title=\"Nedávné změny\"]]\n"
+
+#. type: Plain text
+msgid "Recent changes to this wiki:"
+msgstr "Nedávné změny v této wiki:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
+msgstr ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
diff --git a/po/underlays/basewiki/sandbox.cs.po b/po/underlays/basewiki/sandbox.cs.po
new file mode 100644
index 000000000..778a61419
--- /dev/null
+++ b/po/underlays/basewiki/sandbox.cs.po
@@ -0,0 +1,91 @@
+# Czech translation of basewiki/sandbox page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-16 16:56+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid ""
+"This is the SandBox, a page anyone can edit to learn how to use the wiki."
+msgstr ""
+"Toto je pískoviště, stránka, kterou může upravovat kdokoliv, aby se naučil "
+"používat wiki."
+
+#. type: Plain text
+msgid "Here's a paragraph."
+msgstr "Tady máme odstavec."
+
+#. type: Plain text
+msgid "Here's another one with *emphasised* text."
+msgstr "A tady máme další se *zvýrazněným* textem."
+
+#. type: Title #
+#, no-wrap
+msgid "Header"
+msgstr "Nadpis"
+
+#. type: Title ##
+#, no-wrap
+msgid "Subheader"
+msgstr "Podnadpis"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> This is a blockquote.\n"
+">\n"
+"> This is the first level of quoting.\n"
+">\n"
+"> > This is nested blockquote.\n"
+">\n"
+"> Back to the first level.\n"
+msgstr ""
+"> Toto je citace.\n"
+">\n"
+"> Toto je první úroveň citace.\n"
+">\n"
+"> > Toto je vnořená citace.\n"
+">\n"
+"> Zpět na první úroveň.\n"
+
+#. type: Plain text
+msgid "Numbered list"
+msgstr "Číslovaný seznam"
+
+#. type: Bullet: '1. '
+msgid "First item."
+msgstr "První položka."
+
+#. type: Bullet: '1. '
+msgid "Another."
+msgstr "Další."
+
+#. type: Bullet: '1. '
+msgid "And another.."
+msgstr "A další..."
+
+#. type: Plain text
+msgid "Bulleted list"
+msgstr "Odrážkový seznam"
+
+#. type: Bullet: '* '
+msgid "*item*"
+msgstr "*položka*"
+
+#. type: Bullet: '* '
+msgid "item"
+msgstr "položka"
+
+#. type: Plain text
+msgid "[[ikiwiki/WikiLink]]"
+msgstr "[[wiki_odkaz|ikiwiki/WikiLink]]"
diff --git a/po/underlays/basewiki/shortcuts.cs.po b/po/underlays/basewiki/shortcuts.cs.po
new file mode 100644
index 000000000..c842e249f
--- /dev/null
+++ b/po/underlays/basewiki/shortcuts.cs.po
@@ -0,0 +1,227 @@
+# Czech translation of basewiki/shortcuts page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"PO-Revision-Date: 2009-08-28 11:20+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(shortcut)\"\n"
+"     then=\"This wiki has shortcuts **enabled**.\"\n"
+"     else=\"This wiki has shortcuts **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(shortcut)\"\n"
+"     then=\"Tato wiki má zkratky **povolené**.\"\n"
+"     else=\"Tato wiki má zkratky **vypnuté**.\"]]\n"
+
+#. type: Plain text
+msgid "Some examples of using shortcuts include:"
+msgstr "Příklady použití některých zkratek:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n"
+msgstr ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tZkontrolujte \\[[!cia ikiwiki desc=\"CIA stránku %s\"]].\n"
+
+#. type: Plain text
+msgid "This page controls what shortcut links the wiki supports."
+msgstr "Tato stránka určuje, které zkratky bude wiki podporovat."
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgstr ""
+"[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+msgstr ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"chyba č. %s"
+"\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
+msgstr ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgstr ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
+msgstr ""
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+"  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+msgstr ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+"  * Použití: `\\[[!debss balík]]`, `\\[[!debss balík#verze]]` nebo `\\[[!debss balík/verze]]`. Podrobnosti na http://snapshot.debian.net.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME chyba č. %s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux chyba č. %s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla chyba č. %s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
+"\"%s\" is replaced with the text passed to the named shortcut, after [[!"
+"wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded "
+"text. The optional `desc` parameter controls the description of the link."
+msgstr ""
+"Pro přidání nové zkratky použijte [[direktivu|ikiwiki/directive]] "
+"`shortcut`. Řetězec „%s“ je v adrese nahrazen textem předaným dané zkratce. "
+"Tento text je automaticky zakódován ([[! wikipedia url_encoding]]) do podoby "
+"vhodné pro url. Nechcete-li text kódovat, použijte „%S“. Volitelný parametr "
+"`desc` dovoluje změnit popis odkazu."
+
+#. type: Plain text
+msgid ""
+"Remember that the `name` you give the shortcut will become a new [[ikiwiki/"
+"directive]].  Avoid using a `name` that conflicts with an existing "
+"directive.  These directives also accept a `desc` parameter that will "
+"override the one provided at definition time."
+msgstr ""
+"Mějte na paměti, že jméno, které dáte zkratce pomocí parametru `name`, se "
+"stane novou [[direktivou|ikiwiki/directive]]. Vyhněte se tedy jménům, která "
+"kolidují s existujícími direktivami. Tyto direktivy podporují parametr "
+"`desc`, který má přednost před popisem zadaným při definici zkratky."
+
+#. type: Plain text
+msgid ""
+"If you come up with a shortcut that you think others might find useful, "
+"consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
+"ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include "
+"your shortcut in the standard underlay."
+msgstr ""
+"Pokud jste přišli na nějakou zkratku, o které si myslíte, že by byla "
+"užitečná i pro ostatní, zkuste ji přidat do [seznamu zkratek ve wiki ikiwiki]"
+"(http://ikiwiki.info/shortcuts/), aby ji budoucí verze ikiwiki obsahovaly "
+"rovnou ve standardní výbavě."
diff --git a/po/underlays/basewiki/templates.cs.po b/po/underlays/basewiki/templates.cs.po
new file mode 100644
index 000000000..c30f067aa
--- /dev/null
+++ b/po/underlays/basewiki/templates.cs.po
@@ -0,0 +1,238 @@
+# Czech translation of basewiki/templates page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"PO-Revision-Date: 2009-08-20 09:38+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"This wiki has templates **enabled**.\"\n"
+"else=\"This wiki has templates **disabled**.\"\n"
+"]]\n"
+msgstr ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"Tato wiki má šablony **povolené**.\"\n"
+"else=\"Tato wiki má šablony **vypnuté**.\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid ""
+"Templates are files that can be filled out and inserted into pages in the "
+"wiki."
+msgstr ""
+"Šablony jsou soubory, které je možno vyplnit a vložit do stránek ve wiki."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"These templates are available for inclusion onto other pages in this wiki:"
+msgstr "V této wiki jsou k dispozici následující šablony:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+msgstr ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "Using a template"
+msgstr "Používání šablon"
+
+#. type: Plain text
+msgid "Using a template works like this:"
+msgstr "Použití šablony vypadá následovně:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+msgstr "\t\\[[!template id=note text=\"\"\"Text pro vložení do poznámky.\"\"\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This fills out the [[note]] template, filling in the `text` field with the "
+"specified value, and inserts the result into the page."
+msgstr ""
+"Tímto se v šabloně [[note]] vyplní pole `text` zadanou hodnotou a výsledek "
+"se vloží do stránky."
+
+#. type: Plain text
+msgid ""
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
+msgstr ""
+"Hodnota může obsahovat libovolné značky, které jsou povoleny v běžné wiki "
+"stránce. Trojité uvozovky dokonce umožňují používat uvnitř hodnoty i běžné "
+"anglické uvozovky. V kombinaci s viceřádkovými hodnotami lze do šablony "
+"vložit poměrně velké kusy označkovaného textu:"
+
+#. type: Plain text
+#, no-wrap
+msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+msgstr "        \\[[!template id=foo name=\"Sally\" color=\"zelená\" age=8 notes=\"\"\"\n"
+
+#. type: Bullet: '        * '
+msgid "\\[[Charley]]'s sister."
+msgstr "\\[[Charlieho|Charley]] sestra."
+
+#. type: Bullet: '        * '
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr "\"Až vyrostu, chci být kosmonautem.\""
+
+#. type: Bullet: '        * '
+msgid "Really 8 and a half."
+msgstr "Opravdu, 8 a půl."
+
+#. type: Title ##
+#, no-wrap
+msgid "Creating a template"
+msgstr "Vytvoření šablony"
+
+#. type: Plain text
+msgid ""
+"To create a template, simply add a template directive to a page, and the "
+"page will provide a link that can be used to create the template. The "
+"template is a regular wiki page, located in the `templates/` subdirectory "
+"inside the source directory of the wiki."
+msgstr ""
+"Pro vytvoření šablony jednoduše přidejte do stránky direktivu template a "
+"stránka poskytne odkaz, který se dá použít pro vytvoření šablony. Šablona je "
+"běžná wiki stránka umístěná ve zdrojovém adresáři wiki v podadresáři "
+"`templates/`."
+
+#. type: Plain text
+msgid ""
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
+msgstr ""
+"Šablona používá stejnou syntaxi jako perlový modul [[!cpan HTML::Template]], "
+"což umožňuje provádět poměrně komplexní věci. Úplný popis syntaxe naleznete "
+"v dokumentaci modulu, ale ve skutečnosti stačí znát jen pár věcí:"
+
+#. type: Bullet: '* '
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr ""
+"Každý parametr, který předáte direktivě template, vygeneruje proměnnou "
+"šablony. Existuje několik předdefinovaných proměnných jako PAGE a BASENAME."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
+msgstr ""
+"Pro vložení hodnoty proměnné použijte `<TMPL_VAR proměnná>`. Wiki značky v "
+"hodnotě budou nejprve převedeny na html."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
+msgstr ""
+"Chcete-li vložit hodnotu proměnné bez dalších úprav (bez převodu na html), "
+"použijte `<TMPL_VAR raw_proměnná>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"NAME=\"variable\">text</TMPL_IF>`."
+msgstr ""
+"Chcete-li blok textu zobrazit pouze pokud je nastavena příslušná proměnná, "
+"použijte `<TMPL_IF NAME=\"proměnná\">text</TMPL_IF>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+"Chcete-li použít jeden blok textu v případě, že je proměnná nastavená, a "
+"jiný blok textu pokud nastavená není, použijte `<TMPL_IF NAME=\"proměnná"
+"\">text<TMPL_ELSE>jiný text</TMPL_IF>`."
+
+#. type: Plain text
+msgid "Here's a sample template:"
+msgstr "Ukázková šablona:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        <span class=\"infobox\">\n"
+"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Age: <TMPL_VAR age><br />\n"
+"        <TMPL_IF NAME=\"color\">\n"
+"        Favorite color: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF NAME=\"notes\">\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+msgstr ""
+"        <span class=\"infobox\">\n"
+"        Jméno: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Věk: <TMPL_VAR age><br />\n"
+"        <TMPL_IF NAME=\"color\">\n"
+"        Oblíbená barva: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        Žádná oblíbená barva.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF NAME=\"notes\">\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+
+#. type: Plain text
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
+msgstr ""
+"Vyplněná šablona bude formátována stejně jako zbytek stránky, do které je "
+"vložena, tudíž můžete v šabloně používat wiki linky a všechny obvyklé "
+"formátovací značky. Změnou je, že se wiki linky neobjeví jako zpětné odkazy "
+"na stránku, která šablonu použila."
+
+#. type: Plain text
+msgid ""
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
+"ensures that if the name contains something that might be mistaken for wiki "
+"markup, it's not converted to html before being processed as a [[ikiwiki/"
+"WikiLink]]."
+msgstr ""
+"Všimněte si použití „raw_name“ uvnitř generátoru [[wiki odkazu|ikiwiki/"
+"WikiLink]]. Tímto se zajistí, že pokud by jméno obsahovalo něco, co by mohlo "
+"být považováno za formátovací wiki značku, nebude to převedeno na html před "
+"vytvořením [[wiki odkazu|ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates/note.cs.po b/po/underlays/basewiki/templates/note.cs.po
new file mode 100644
index 000000000..74f66e9a0
--- /dev/null
+++ b/po/underlays/basewiki/templates/note.cs.po
@@ -0,0 +1,42 @@
+# Czech translation of basewiki/templetes/note page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"PO-Revision-Date: 2009-08-20 10:11+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Use this template to insert a note into a page. The note will be styled to\n"
+"float to the right of other text on the page. This template has one\n"
+"parameter:\n"
+"<ul>\n"
+"<li>`text` - the text to display in the note\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
+msgstr ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Šablona slouží pro vložení poznámky do stránky. Poznámka bude pomocí stylů \n"
+"nastavena, aby plavala při pravém okraji stránky. Šablona má jediný \n"
+"parametr:\n"
+"<ul>\n"
+"<li>`text` - text, který se má zobrazit v poznámce\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
diff --git a/po/underlays/basewiki/templates/popup.cs.po b/po/underlays/basewiki/templates/popup.cs.po
new file mode 100644
index 000000000..5951b0145
--- /dev/null
+++ b/po/underlays/basewiki/templates/popup.cs.po
@@ -0,0 +1,51 @@
+# Czech translation of basewiki/templetes/popup page for ikiwiki.
+# Copyright (C) 2009 Miroslav Kure <kurem@debian.cz>
+# This file is distributed under the same license as the ikiwiki package.
+# Miroslav Kure <kurem@debian.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki/basewiki\n"
+"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"PO-Revision-Date: 2009-08-20 10:28+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Use this template to create a popup window that is displayed when the mouse\n"
+"is over part of the page. This template has two parameters:\n"
+"<ul>\n"
+"<li>`mouseover` - This is the text or other content that triggers the\n"
+"popup.\n"
+"<li>`popup` - This should be the content of the popup window. It can be\n"
+"anything, even images or a whole little wiki page, but should not be too\n"
+"large for good usability.\n"
+"</ul>\n"
+"Note that browsers that do not support the CSS will display the popup\n"
+"inline in the page, inside square brackets.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
+msgstr ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Šablona slouží pro vytvoření vyskakovacího okna, které se objeví při najetí\n"
+"myší nad danou část stránky. Šablona má dva parametry:\n"
+"<ul>\n"
+"<li>`mouseover` - Text, případně jiný obsah, který aktivuje vyskočení okna.\n"
+"<li>`popup` - Obsah vyskakovacího okna. Může to být téměř cokoliv (obrázky\n"
+"nebo celá malá wiki stránka), ale pro rozumnou použitelnost by to nemělo být\n"
+"příliš velké.\n"
+"</ul>\n"
+"Prohlížeče, které nepodporují kaskádové styly, zobrazí obsah vyskakovacího\n"
+"okna přímo ve stránce uvnitř hranatých závorek.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
-- 
cgit v1.2.3


From 29e1c8e033880abd4541b99cbd436ab2c81d752e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 06:12:05 -0400
Subject: Czech basewiki enabled

---
 debian/changelog  | 1 +
 po/underlay.setup | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8cd5032cd..045f27540 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * htmltidy: Return an error message if tidy fails. Closes: #543722
   * po: Fix name of translated toplevel index page. (intrigeri)
   * po: Fix display of links from a translated page to itself (ntrigeri)
+  * Add Czech basewiki translation from Miroslav Kure.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/po/underlay.setup b/po/underlay.setup
index 3e6c12566..76df2e29c 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -11,6 +11,7 @@ use IkiWiki::Setup::Standard {
 		#'es' => 'Español',
 		#'de' => 'Deutsch',
 		'da' => 'Dansk',
+		'cs' =" 'česky',
         },
 	po_master_language => { 'code' => 'en', 'name' => 'English' },
 	po_translatable_pages => "*",
-- 
cgit v1.2.3


From 1914ae2fd24e1e8021404eae847d70c710f8542d Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 12:38:07 +0200
Subject: po: fix interdiction to create pages of type po

... which was broken by the new page_types code.

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 12f41f6de..b9f59f3e8 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -533,7 +533,7 @@ sub formbuilder (@) {
 			next unless "$field" eq "type";
 			if ($field->type eq 'select') {
 				# remove po from the list of types
-				my @types = grep { $_ ne 'po' } $field->options;
+				my @types = grep { $_->[0] ne 'po' } $field->options;
 				$field->options(\@types) if @types;
 			}
 		}
-- 
cgit v1.2.3


From c9301d2c296f6822ecb38cc264e74c7186c13124 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 13:12:58 +0200
Subject: po: favor the type of linking page's masterpage on page creation

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index b9f59f3e8..55c1c32c6 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -531,10 +531,23 @@ sub formbuilder (@) {
 	if ($form->field("do") eq "create") {
 	        foreach my $field ($form->field) {
 			next unless "$field" eq "type";
-			if ($field->type eq 'select') {
-				# remove po from the list of types
-				my @types = grep { $_->[0] ne 'po' } $field->options;
-				$field->options(\@types) if @types;
+			next unless $field->type eq 'select';
+			my $orig_value = $field->value;
+			# remove po from the list of types
+			my @types = grep { $_->[0] ne 'po' } $field->options;
+			$field->options(\@types) if @types;
+			# favor the type of linking page's masterpage
+			if ($orig_value eq 'po') {
+				my ($from, $type);
+				if (defined $form->field('from')) {
+					($from)=$form->field('from')=~/$config{wiki_file_regexp}/;
+					$from = masterpage($from);
+				}
+				if (defined $from && exists $pagesources{$from}) {
+					$type=pagetype($pagesources{$from});
+				}
+				$type=$config{default_pageext} unless defined $type;
+				$field->value($type) ;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 8064acf87fb7e708a03e47dd82457dec237e886e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 13:19:48 +0200
Subject: doc/po: reported bug + patches wrt. created page type

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 doc/plugins/po.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 57459c1ef..3b152586e 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -317,6 +317,19 @@ text, or text in whatever single language ikiwiki is configured to "speak".
 Maybe there could be a way to switch ikiwiki to speaking another language
 when building a non-english page? Then the directives would get translated.
 
+Created page type
+-----------------
+
+The interdiction to create pages of type po was broken by the new
+`page_types` code. This is fixed in my po branch by
+commit 1914ae2fd24e1e802.
+
+While I was there, I also added some code to set a new default value
+to the type select field in case it was previously set to "po".
+This code favors the type of the linking page's masterpage on page
+creation (when `from=page.LL`). This is commit c9301d2c296f682.
+--[[intrigeri]]
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From 18ddf727d1fb30e3a3022fa8a73077c4c75dd262 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 12:38:07 +0200
Subject: po: fix interdiction to create pages of type po

... which was broken by the new page_types code.

Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit 1914ae2fd24e1e8021404eae847d70c710f8542d)
---
 IkiWiki/Plugin/po.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 12f41f6de..b9f59f3e8 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -533,7 +533,7 @@ sub formbuilder (@) {
 			next unless "$field" eq "type";
 			if ($field->type eq 'select') {
 				# remove po from the list of types
-				my @types = grep { $_ ne 'po' } $field->options;
+				my @types = grep { $_->[0] ne 'po' } $field->options;
 				$field->options(\@types) if @types;
 			}
 		}
-- 
cgit v1.2.3


From 5136c22eed0527bce976c76205c6ccb2ddb0b062 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 13:12:58 +0200
Subject: po: favor the type of linking page's masterpage on page creation

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index b9f59f3e8..55c1c32c6 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -531,10 +531,23 @@ sub formbuilder (@) {
 	if ($form->field("do") eq "create") {
 	        foreach my $field ($form->field) {
 			next unless "$field" eq "type";
-			if ($field->type eq 'select') {
-				# remove po from the list of types
-				my @types = grep { $_->[0] ne 'po' } $field->options;
-				$field->options(\@types) if @types;
+			next unless $field->type eq 'select';
+			my $orig_value = $field->value;
+			# remove po from the list of types
+			my @types = grep { $_->[0] ne 'po' } $field->options;
+			$field->options(\@types) if @types;
+			# favor the type of linking page's masterpage
+			if ($orig_value eq 'po') {
+				my ($from, $type);
+				if (defined $form->field('from')) {
+					($from)=$form->field('from')=~/$config{wiki_file_regexp}/;
+					$from = masterpage($from);
+				}
+				if (defined $from && exists $pagesources{$from}) {
+					$type=pagetype($pagesources{$from});
+				}
+				$type=$config{default_pageext} unless defined $type;
+				$field->value($type) ;
 			}
 		}
 	}
-- 
cgit v1.2.3


From cc6000f0b9b82b19ea4635edcace2f6ba164adf1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 07:34:09 -0400
Subject: both changes picked

---
 debian/changelog    | 3 +++
 doc/plugins/po.mdwn | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 045f27540..d10bc36cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,9 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * po: Fix name of translated toplevel index page. (intrigeri)
   * po: Fix display of links from a translated page to itself (ntrigeri)
   * Add Czech basewiki translation from Miroslav Kure.
+  * po: fix interdiction to create pages of type po (intrigeri)
+  * po: po: favor the type of linking page's masterpage on page creation
+    (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 3b152586e..fdef41e45 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -330,6 +330,8 @@ This code favors the type of the linking page's masterpage on page
 creation (when `from=page.LL`). This is commit c9301d2c296f682.
 --[[intrigeri]]
 
+> Both cherry picked. --[[Joey]] 
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From 72ac9821e566373de49a77ffee642b14ecf643e1 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 13:56:03 +0200
Subject: inline: moved rootpage logic to a function

The po plugin's injected bestlink must do something special when called by this
exact part of inline's code.

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/inline.pm | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a501566b5..c9cbb9cb7 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -307,17 +307,7 @@ sub preprocess_inline (@) {
 		# Add a blog post form, with feed buttons.
 		my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
 		$formtemplate->param(cgiurl => $config{cgiurl});
-		my $rootpage;
-		if (exists $params{rootpage}) {
-			$rootpage=bestlink($params{page}, $params{rootpage});
-			if (!length $rootpage) {
-				$rootpage=$params{rootpage};
-			}
-		}
-		else {
-			$rootpage=$params{page};
-		}
-		$formtemplate->param(rootpage => $rootpage);
+		$formtemplate->param(rootpage => rootpage(%params));
 		$formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
 		$formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
 		if (exists $params{postformtext}) {
@@ -654,4 +644,21 @@ sub pingurl (@) {
 	exit 0; # daemon done
 }
 
+
+sub rootpage (@) {
+	my %params=@_;
+
+	my $rootpage;
+	if (exists $params{rootpage}) {
+		$rootpage=bestlink($params{page}, $params{rootpage});
+		if (!length $rootpage) {
+			$rootpage=$params{rootpage};
+		}
+	}
+	else {
+		$rootpage=$params{page};
+	}
+	return $rootpage;
+}
+
 1
-- 
cgit v1.2.3


From cf43ae5a1f5460a98cdd7acb36c0691b2eec988f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 13:57:15 +0200
Subject: po: keep masterpage as the rootpage for inline's post form

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 55c1c32c6..103347c37 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -564,9 +564,13 @@ sub mybestlink ($$) {
 	my $link=shift;
 
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
+	my @caller = caller(1);
 	if (length $res
 	    && istranslatable($res)
-	    && istranslation($page)) {
+	    && istranslation($page)
+	    # keep masterpage as the rootpage for inline's post form
+	    && !(exists $caller[3] && defined $caller[3]
+		 && ($caller[3] eq "IkiWiki::rootpage"))) {
 		return $res . "." . lang($page);
 	}
 	return $res;
-- 
cgit v1.2.3


From 53dc18ec2b46ded088a3dca0abafb2f3c184969e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 14:47:11 +0200
Subject: Revert "po: keep masterpage as the rootpage for inline's post form"

This reverts commit cf43ae5a1f5460a98cdd7acb36c0691b2eec988f, which actually
only works when a rootpage parameter is set. A more complete fix will be
written soon.
---
 IkiWiki/Plugin/po.pm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 103347c37..55c1c32c6 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -564,13 +564,9 @@ sub mybestlink ($$) {
 	my $link=shift;
 
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
-	my @caller = caller(1);
 	if (length $res
 	    && istranslatable($res)
-	    && istranslation($page)
-	    # keep masterpage as the rootpage for inline's post form
-	    && !(exists $caller[3] && defined $caller[3]
-		 && ($caller[3] eq "IkiWiki::rootpage"))) {
+	    && istranslation($page)) {
 		return $res . "." . lang($page);
 	}
 	return $res;
-- 
cgit v1.2.3


From e671e72053e81fa06cb9c9407ff17a0beff2f1fe Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 15:00:16 +0200
Subject: po: better rootpage logic for inline's post form

Set rootpage to the non-l10n'd rootpage parameter if it is set,
else to the masterpage of the linking page.

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 55c1c32c6..14c7318fe 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -59,6 +59,8 @@ sub import {
 	inject(name => "IkiWiki::urlto", call => \&myurlto);
 	$origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
 	inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
+	$origsubs{'rootpage'}=\&IkiWiki::rootpage;
+	inject(name => "IkiWiki::rootpage", call => \&myrootpage);
 }
 
 
@@ -649,6 +651,22 @@ sub mycgiurl (@) {
 	return $origsubs{'cgiurl'}->(%params);
 }
 
+sub myrootpage (@) {
+	my %params=@_;
+
+	my $rootpage;
+	if (exists $params{rootpage}) {
+		$rootpage=$origsubs{'bestlink'}->($params{page}, $params{rootpage});
+		if (!length $rootpage) {
+			$rootpage=$params{rootpage};
+		}
+	}
+	else {
+		$rootpage=masterpage($params{page});
+	}
+	return $rootpage;
+}
+
 # ,----
 # | Blackboxes for private data
 # `----
-- 
cgit v1.2.3


From e3b5d7013717af732b36efd9e4abe1f14d0f3175 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 14:41:32 +0200
Subject: doc/po: bug report + patch proposal wrt. inline's post form's
 rootpage

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 doc/plugins/po.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index fdef41e45..39b237c73 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -332,6 +332,17 @@ creation (when `from=page.LL`). This is commit c9301d2c296f682.
 
 > Both cherry picked. --[[Joey]] 
 
+inline's post form's rootpage
+-----------------------------
+
+When a translatable page (say it is called "bugs") contains an
+[[inline directive|ikiwiki/directive/inline]] with `postform` enabled,
+the rootpage is l10n'd on translations pages (e.g. "bugs.fr" gets
+a `rootpage` value of `bugs.fr`). This is usually not what's expected,
+as translation pages are not supposed to have subpages. My po branch
+has code (e671e72053e81fa, which depends on 72ac9821e56637) that fixes
+this. --[[intrigeri]]
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From 3f303cc853426a1ddb8e36b8fb544a69bced3721 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 15:25:05 +0200
Subject: follow-up

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 .../language_definition_for_the_meta_plugin.mdwn    | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/doc/todo/language_definition_for_the_meta_plugin.mdwn b/doc/todo/language_definition_for_the_meta_plugin.mdwn
index 90bfbef3b..44fcf32bb 100644
--- a/doc/todo/language_definition_for_the_meta_plugin.mdwn
+++ b/doc/todo/language_definition_for_the_meta_plugin.mdwn
@@ -95,7 +95,24 @@ This may be useful for sites with a few pages in different languages, but no ful
 
 >>> Now that po has been merged, this patch should probably also be adapted
 >>> so that the po plugin forces the meta::lang of every page to what po
->>> thinks it should be. Perhaps [[the_special_po_pagespecs|ikiwiki/pagespec/po]]
->>> should also work with meta-assigned languages? --[[smcv]]
+>>> thinks it should be. --[[smcv]]
+
+>>>> Agreed, users of the po plugin would greatly benefit from it.
+>>>> Seems doable. --[[intrigeri]]
+
+>>> Perhaps [[the_special_po_pagespecs|ikiwiki/pagespec/po]] should
+>>> also work with meta-assigned languages? --[[smcv]]
+
+>>>> Yes. But then, these special pagespecs should be moved outside of
+>>>> [[plugins/po]], as they could be useful to anyone using the
+>>>> currently discussed patch even when not using the po plugin.
+>>>> 
+>>>> We could add these pagespecs to the core and make them use
+>>>> a simple language-guessing system based on a new hook. Any plugin
+>>>> that implements such a hook could decide whether it should
+>>>> overrides the language guessed by another one, and optionally use
+>>>> the `first`/`last` options (e.g. the po plugin will want to be
+>>>> authoritative on the pages of type po, and will then use
+>>>> `last`). --[[intrigeri]]
 
 [[!tag wishlist patch plugins/meta translation]]
-- 
cgit v1.2.3


From 8b927d4a6565125bc09d18d9e971f804d1e44e0a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 15:32:58 +0100
Subject: Fix typo in underlay.setup

---
 po/underlay.setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/underlay.setup b/po/underlay.setup
index 76df2e29c..237acef5d 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -11,7 +11,7 @@ use IkiWiki::Setup::Standard {
 		#'es' => 'Español',
 		#'de' => 'Deutsch',
 		'da' => 'Dansk',
-		'cs' =" 'česky',
+		'cs' => 'česky',
         },
 	po_master_language => { 'code' => 'en', 'name' => 'English' },
 	po_translatable_pages => "*",
-- 
cgit v1.2.3


From d92f767fb772c9b11293134bd67bc1261aea8f1e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 27 Aug 2009 23:30:41 +0100
Subject: inline: if using pagenames, don't add a dependency on "page1 or page2
 or..."

This is unnecessary and just slows us down (by a factor of 2, in the
pessimal case where every page has an inline with pagenames); it's also
not possible to optimize it into add_depends_exact calls.
---
 IkiWiki/Plugin/inline.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a501566b5..d5ad11d43 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -195,10 +195,10 @@ sub preprocess_inline (@) {
 
 		@list = map { bestlink($params{page}, $_) }
 		        split ' ', $params{pagenames};
-
-		$params{pages} = join(" or ", @list);
 	}
 	else {
+		add_depends($params{page}, $params{pages});
+
 		@list = pagespec_match_list(
 			[ grep { $_ ne $params{page} } keys %pagesources ],
 			$params{pages}, location => $params{page});
@@ -247,7 +247,6 @@ sub preprocess_inline (@) {
 		@list=@list[0..$params{show} - 1];
 	}
 
-	add_depends($params{page}, $params{pages});
 	# Explicitly add all currently displayed pages as dependencies, so
 	# that if they are removed or otherwise changed, the inline will be
 	# sure to be updated.
-- 
cgit v1.2.3


From c80a3cbcfde1a00ffdb0e62f70ee3a7d6bf442df Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 27 Aug 2009 23:25:58 +0100
Subject: Add depends_exact: simplified dependency tracking for dependencies on
 a single page

Let E be the number of dependencies per page of the form "A depends on B and
nothing else", let D be the number of other dependencies per page,
let P be the total number of pages, and let C be the number of changed
pages in a refresh.

This patch should speed up a refresh from O(E*C*P + D*C*P) to
O(C + E*P + D*C*P), assuming that hash lookups are O(1).

In practice, plugins like inline and map produce a lot of these very simple
dependencies, and my album plugin's combination of inline with a large
number of pages causes it to suffer particularly badly.

In testing on a wiki with about 7000 objects (3500 full pages, 3500
images), a full rebuild continued to take about 5:30, and a refresh
after touching about 350 pages and 350 images reduced from 5:30 to 1:30.

As with my previous optimizations, this change will result in downgrades not
working correctly until the wiki is rebuilt.
---
 IkiWiki.pm        | 23 ++++++++++++++++++++---
 IkiWiki/Render.pm | 17 +++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5563a03af..f6a985556 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,14 +14,14 @@ use open qw{:utf8 :std};
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
 	    %pagesources %destsources %depends %hooks %forcerebuild
-	    %loaded_plugins};
+	    %loaded_plugins %depends_exact};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  pagespec_match_list bestlink htmllink readfile writefile
 		 pagetype srcfile pagename displaytime will_render gettext urlto
 		 targetpage add_underlay pagetitle titlepage linkpage
-		 newpagefile inject add_link
+		 newpagefile inject add_link add_depends_exact
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
@@ -1475,7 +1475,8 @@ sub loadindex () {
 	%oldrenderedfiles=%pagectime=();
 	if (! $config{rebuild}) {
 		%pagesources=%pagemtime=%oldlinks=%links=%depends=
-		%destsources=%renderedfiles=%pagecase=%pagestate=();
+		%destsources=%renderedfiles=%pagecase=%pagestate=
+		%depends_exact=();
 	}
 	my $in;
 	if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
@@ -1515,6 +1516,11 @@ sub loadindex () {
 				$links{$page}=$d->{links};
 				$oldlinks{$page}=[@{$d->{links}}];
 			}
+			if (exists $d->{depends_exact}) {
+				$depends_exact{$page}={
+					map { $_ => 1 } @{$d->{depends_exact}}
+				};
+			}
 			if (exists $d->{dependslist}) {
 				$depends{$page}={
 					map { $_ => 1 } @{$d->{dependslist}}
@@ -1570,6 +1576,10 @@ sub saveindex () {
 			$index{page}{$src}{dependslist} = [ keys %{$depends{$page}} ];
 		}
 
+		if (exists $depends_exact{$page}) {
+			$index{page}{$src}{depends_exact} = [ keys %{$depends_exact{$page}} ];
+		}
+
 		if (exists $pagestate{$page}) {
 			foreach my $id (@hookids) {
 				foreach my $key (keys %{$pagestate{$page}{$id}}) {
@@ -1744,6 +1754,13 @@ sub add_depends ($$) {
 	return 1;
 }
 
+sub add_depends_exact ($$) {
+	my $page = shift;
+	my $dep = shift;
+
+	$depends_exact{$page}{$dep} = 1;
+}
+
 sub file_pruned ($$) {
 	require File::Spec;
 	my $file=File::Spec->canonpath(shift);
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index da2d7b4cc..121fc97e3 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -210,6 +210,7 @@ sub render ($) {
 	if (defined $type) {
 		my $page=pagename($file);
 		delete $depends{$page};
+		delete $depends_exact{$page};
 		will_render($page, htmlpage($page), 1);
 		return if $type=~/^_/;
 		
@@ -224,6 +225,7 @@ sub render ($) {
 	}
 	else {
 		delete $depends{$file};
+		delete $depends_exact{$file};
 		will_render($file, $file, 1);
 		
 		if ($config{hardlink}) {
@@ -431,6 +433,7 @@ sub refresh () {
 		# internal pages are not rendered
 		my $page=pagename($file);
 		delete $depends{$page};
+		delete $depends_exact{$page};
 		foreach my $old (@{$renderedfiles{$page}}) {
 			delete $destsources{$old};
 		}
@@ -454,10 +457,24 @@ sub refresh () {
 	if (%rendered || @del || @internal) {
 		my @changed=(keys %rendered, @del);
 
+ 		my %changedpages = map { pagename($_) => 1 } @changed;
+ 
 		# rebuild dependant pages
 		F: foreach my $f (@$files) {
 			next if $rendered{$f};
 			my $p=pagename($f);
+
+			if (exists $depends_exact{$p}) {
+				foreach my $d (keys %{$depends_exact{$p}}) {
+					if (exists $changedpages{$d}) {
+						debug(sprintf(gettext("building %s, which depends on %s"), $f, $p));
+						render($f);
+						$rendered{$f}=1;
+						next F;
+					}
+				}
+			}
+
 			if (exists $depends{$p}) {
 				foreach my $d (keys %{$depends{$p}}) {
 					my $sub=pagespec_translate($d);
-- 
cgit v1.2.3


From ec2367cfbfb0053c61bb394af5ac6f5f930325fd Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 02:11:26 +0100
Subject: Fix typo in dependency debug message

---
 IkiWiki/Render.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 121fc97e3..f1ee140db 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -467,7 +467,7 @@ sub refresh () {
 			if (exists $depends_exact{$p}) {
 				foreach my $d (keys %{$depends_exact{$p}}) {
 					if (exists $changedpages{$d}) {
-						debug(sprintf(gettext("building %s, which depends on %s"), $f, $p));
+						debug(sprintf(gettext("building %s, which depends on %s"), $f, $d));
 						render($f);
 						$rendered{$f}=1;
 						next F;
-- 
cgit v1.2.3


From 646c9a4c95a480544d63c161651c45b3b029e598 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 16:34:58 +0200
Subject: po: fix link() pagespec when used on translation pages

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 14c7318fe..21e3b8e37 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -566,9 +566,12 @@ sub mybestlink ($$) {
 	my $link=shift;
 
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
+	my @caller = caller(1);
 	if (length $res
 	    && istranslatable($res)
-	    && istranslation($page)) {
+	    && istranslation($page)
+	    &&  !(exists $caller[3] && defined $caller[3]
+		  && ($caller[3] eq "IkiWiki::PageSpec::match_link"))) {
 		return $res . "." . lang($page);
 	}
 	return $res;
-- 
cgit v1.2.3


From 6be874612539d3148d288fc6a4c47743a7c0c8fc Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 16:38:13 +0200
Subject: doc/po: report problem with link() + propose patch

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 doc/plugins/po.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 39b237c73..031188a67 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -343,6 +343,15 @@ as translation pages are not supposed to have subpages. My po branch
 has code (e671e72053e81fa, which depends on 72ac9821e56637) that fixes
 this. --[[intrigeri]]
 
+link() pagespec on translation pages
+------------------------------------
+
+The `link()` pagespec, on translation pages, currently tests whether
+a given page links to the *current translation page*, rather than
+whether it links to its master page. I believe the later is generally
+expected. Commit 646c9a4c95a480 in my po branch fixes this.
+--[[intrigeri]]
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From b6992ec56629f4a893c7f016aaa81be25326356b Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 15:41:26 +0100
Subject: Auto-detect "simple dependencies" instead of requiring callers to use
 add_depends_exact()

---
 IkiWiki.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index f6a985556..e4fcf1d6f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -21,7 +21,7 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  pagespec_match_list bestlink htmllink readfile writefile
 		 pagetype srcfile pagename displaytime will_render gettext urlto
 		 targetpage add_underlay pagetitle titlepage linkpage
-		 newpagefile inject add_link add_depends_exact
+		 newpagefile inject add_link
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
@@ -1748,19 +1748,19 @@ sub add_depends ($$) {
 	my $page=shift;
 	my $pagespec=shift;
 
+	if ($pagespec =~ /$config{wiki_file_regexp}/ &&
+		$pagespec !~ /[\s*?()!]/) {
+		# a simple dependency, which can be matched by string eq
+		$depends_exact{$page}{$pagespec} = 1;
+		return 1;
+	}
+
 	return unless pagespec_valid($pagespec);
 
 	$depends{$page}{$pagespec} = 1;
 	return 1;
 }
 
-sub add_depends_exact ($$) {
-	my $page = shift;
-	my $dep = shift;
-
-	$depends_exact{$page}{$dep} = 1;
-}
-
 sub file_pruned ($$) {
 	require File::Spec;
 	my $file=File::Spec->canonpath(shift);
-- 
cgit v1.2.3


From 2a7f3b91d4fa46a67d04f963785f957563ac0cfc Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 15:22:07 +0100
Subject: Force %depends_exact to lower case, fixing incorrect case-sensitivity

---
 IkiWiki.pm        | 2 +-
 IkiWiki/Render.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e4fcf1d6f..8bded8a0e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1751,7 +1751,7 @@ sub add_depends ($$) {
 	if ($pagespec =~ /$config{wiki_file_regexp}/ &&
 		$pagespec !~ /[\s*?()!]/) {
 		# a simple dependency, which can be matched by string eq
-		$depends_exact{$page}{$pagespec} = 1;
+		$depends_exact{$page}{lc $pagespec} = 1;
 		return 1;
 	}
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index f1ee140db..5367b1309 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -457,7 +457,7 @@ sub refresh () {
 	if (%rendered || @del || @internal) {
 		my @changed=(keys %rendered, @del);
 
- 		my %changedpages = map { pagename($_) => 1 } @changed;
+ 		my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
  
 		# rebuild dependant pages
 		F: foreach my $f (@$files) {
@@ -466,7 +466,7 @@ sub refresh () {
 
 			if (exists $depends_exact{$p}) {
 				foreach my $d (keys %{$depends_exact{$p}}) {
-					if (exists $changedpages{$d}) {
+					if (exists $lcchanged{$d}) {
 						debug(sprintf(gettext("building %s, which depends on %s"), $f, $d));
 						render($f);
 						$rendered{$f}=1;
-- 
cgit v1.2.3


From 20a38fbf6d4fda7d811239ae2980a166bc32ad0d Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 15:28:52 +0100
Subject: Avoid duplicating debug message for building a page due to a
 dependency

As per Joey's review
---
 IkiWiki/Render.pm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5367b1309..85ae0f8e9 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -460,23 +460,22 @@ sub refresh () {
  		my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
  
 		# rebuild dependant pages
-		F: foreach my $f (@$files) {
+		foreach my $f (@$files) {
 			next if $rendered{$f};
 			my $p=pagename($f);
+			my $reason = undef;
 
 			if (exists $depends_exact{$p}) {
 				foreach my $d (keys %{$depends_exact{$p}}) {
 					if (exists $lcchanged{$d}) {
-						debug(sprintf(gettext("building %s, which depends on %s"), $f, $d));
-						render($f);
-						$rendered{$f}=1;
-						next F;
+						$reason = $d;
+						last;
 					}
 				}
 			}
 
-			if (exists $depends{$p}) {
-				foreach my $d (keys %{$depends{$p}}) {
+			if (exists $depends{$p} && ! defined $reason) {
+				D: foreach my $d (keys %{$depends{$p}}) {
 					my $sub=pagespec_translate($d);
 					next if $@ || ! defined $sub;
 
@@ -487,14 +486,18 @@ sub refresh () {
 						next if $file eq $f;
 						my $page=pagename($file);
 						if ($sub->($page, location => $p)) {
-							debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
-							render($f);
-							$rendered{$f}=1;
-							next F;
+							$reason = $page;
+							last D;
 						}
 					}
 				}
 			}
+
+			if (defined $reason) {
+				debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+				render($f);
+				$rendered{$f}=1;
+			}
 		}
 		
 		# handle backlinks; if a page has added/removed links,
-- 
cgit v1.2.3


From de4dc8befe7ede3cd34daf3f2bce5dd6305599f0 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 15:48:51 +0100
Subject: Updated branch, thanks for the feedback

---
 doc/todo/optimize_simple_dependencies.mdwn | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn
index 44163311b..10c6c7272 100644
--- a/doc/todo/optimize_simple_dependencies.mdwn
+++ b/doc/todo/optimize_simple_dependencies.mdwn
@@ -56,13 +56,33 @@ equally valid.)
 > that is clearly a raw page name, it can add it to the exact depends hash.
 > Else, add it to the pagespec hash. You can tell if it's a pure page name
 > by matching on `$config{wiki_file_regexp}`.
-> 
+
+>> Good thinking. Done in commit 68ce514a 'Auto-detect "simple dependencies"',
+>> with a related bugfix in e8b43825 "Force %depends_exact to lower case".
+>>
+>> Performance impact: Test 2 above takes 0.2s longer to rebuild (probably
+>> from all the calls to lc, which are, however, necessary for correctness)
+>> and has indistinguishable performance for a refresh. --[[smcv]]
+
 > Also I think there may be little optimisation value left in
 > 7227c2debfeef94b35f7d81f42900aa01820caa3, since the "regular" dependency
 > lists will be much shorter.
->
+
+>> You're probably right, but IMO it's not worth reverting it - a set (hash with
+>> dummy values) is still the right data structure. --[[smcv]]
+
 > Sounds like inline pagenames has an already exstant bug WRT
 > pages moving, which this should not make worse. Would be good to verify.
-> 
+
+>> If you mean the standard "add a better match for a link-like construct" bug
+>> that also affects sidebar, then yes, it does have the bug, but I'm pretty
+>> sure this branch doesn't make it any worse. I could solve this at the cost
+>> of making pagenames less useful for interactive use, by making it not
+>> respect [[ikiwiki/subpage/LinkingRules]], but instead always interpret
+>> its paths as relative to the top of the wiki - that's actually all that
+>> [[plugins/contrib/album]] needs. --[[smcv]]
+
 > Re coding, it would be nice if `refresh()` could avoid duplicating
-> the debug message, etc in the two cases. --[[Joey]] 
+> the debug message, etc in the two cases. --[[Joey]]
+
+>> Fixed in commit f805d566 "Avoid duplicating debug message..." --[[smcv]]
-- 
cgit v1.2.3


From 54b3d55aadf9c6ee2b4b3aa68b3a1794a9394fd4 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 15:50:02 +0100
Subject: Mark as done

---
 doc/todo/optimize_simple_dependencies.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn
index 44163311b..50ecafa05 100644
--- a/doc/todo/optimize_simple_dependencies.mdwn
+++ b/doc/todo/optimize_simple_dependencies.mdwn
@@ -47,6 +47,10 @@ equally valid.)
 
 --[[smcv]]
 
+> Now [[merged|done]] --[[smcv]]
+
+----
+
 > We discussed this on irc; I had some worries that things may have been
 > switched to `add_depends_exact` that were not pure page names. My current
 > feeling is it's all safe, but who knows. It's easy to miss something.
-- 
cgit v1.2.3


From 54f94e6bc88415990db5b5095b6a52890797f6f7 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 16:11:52 +0100
Subject: Some crude benchmarking on a larger wiki

---
 doc/todo/optimize_simple_dependencies.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn
index 10c6c7272..da75ff177 100644
--- a/doc/todo/optimize_simple_dependencies.mdwn
+++ b/doc/todo/optimize_simple_dependencies.mdwn
@@ -62,7 +62,12 @@ equally valid.)
 >>
 >> Performance impact: Test 2 above takes 0.2s longer to rebuild (probably
 >> from all the calls to lc, which are, however, necessary for correctness)
->> and has indistinguishable performance for a refresh. --[[smcv]]
+>> and has indistinguishable performance for a refresh.
+>>
+>> Test 1 took about 6 minutes to rebuild and 1:25 to refresh; those are
+>> pessimistic figures, since I've added 90 more photos and 90 more pages
+>> (both to the wiki as a whole, and the number touched before refreshing)
+>> since testing the previous version of this branch. --[[smcv]]
 
 > Also I think there may be little optimisation value left in
 > 7227c2debfeef94b35f7d81f42900aa01820caa3, since the "regular" dependency
-- 
cgit v1.2.3


From 79d3bb16ea54520cffbb4e120b1a87a3b2967cb4 Mon Sep 17 00:00:00 2001
From: "http://emptty.myopenid.com/" <http://emptty.myopenid.com/@web>
Date: Fri, 28 Aug 2009 12:18:30 -0400
Subject: my first edit to this site, please forgive mistakes

---
 doc/todo/Restrict_page_viewing.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/todo/Restrict_page_viewing.mdwn

diff --git a/doc/todo/Restrict_page_viewing.mdwn b/doc/todo/Restrict_page_viewing.mdwn
new file mode 100644
index 000000000..b25b7de0a
--- /dev/null
+++ b/doc/todo/Restrict_page_viewing.mdwn
@@ -0,0 +1,11 @@
+I'd like to have some pages of my wiki to be only viewable by some users.
+
+I could use htaccess for that, but it would force the users to have 2 authentication mecanisms, so I'd prefer to use openID for that too.
+
+* I'm thinking of adding a "show" parameter to the cgi script, thanks to a plugin similar to goto.
+* When called, it would check the credential using the session stuff (that I don't understand yet). If not enough, it would serve a 403 error of course.
+* If enough, it would read the file locally on the server side and return this as a content.
+
+Then, I'd have to generate the private page the regular way with ikiwiki, and prevent apache from serving them with an appropriate and much more maintainable htaccess file.
+
+-- [[users/emptty]]
-- 
cgit v1.2.3


From b6e589c9a484a60b804b9208b41209ca05101682 Mon Sep 17 00:00:00 2001
From: "http://emptty.myopenid.com/" <http://emptty.myopenid.com/@web>
Date: Fri, 28 Aug 2009 12:22:38 -0400
Subject: Introduce myself

---
 doc/users/emptty.mdwn | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/users/emptty.mdwn

diff --git a/doc/users/emptty.mdwn b/doc/users/emptty.mdwn
new file mode 100644
index 000000000..08ef7d0f3
--- /dev/null
+++ b/doc/users/emptty.mdwn
@@ -0,0 +1,2 @@
+My professional homepage is [here](http://www.loria.fr/~quinson/). I'm currently (09/09) trying to move it from WML to ikiwiki.
+I'm sure I'll have a bunch of ideas, requests and maybe even patches in the process.
-- 
cgit v1.2.3


From 4236eb5f688944d70c19427e1150285238ce61ce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 15:00:58 -0400
Subject: response

---
 doc/todo/Restrict_page_viewing.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/todo/Restrict_page_viewing.mdwn b/doc/todo/Restrict_page_viewing.mdwn
index b25b7de0a..ec7b05a51 100644
--- a/doc/todo/Restrict_page_viewing.mdwn
+++ b/doc/todo/Restrict_page_viewing.mdwn
@@ -9,3 +9,7 @@ I could use htaccess for that, but it would force the users to have 2 authentica
 Then, I'd have to generate the private page the regular way with ikiwiki, and prevent apache from serving them with an appropriate and much more maintainable htaccess file.
 
 -- [[users/emptty]]
+
+> While I'm sure a plugin could do this, it adds so much scalability cost
+> and is so counter to ikiwiki's design.. Have you considered using the
+> [[plugins/httpauth]] plugin to unify around htaccess auth? --[[Joey]] 
-- 
cgit v1.2.3


From 4e3a2a370cdc431091b32e8d5fa03c8718e6ea4a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 15:11:21 -0400
Subject: changelpg

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d10bc36cf..870abfdd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
     slower. (smcv)
   * Rebuild wikis on upgrade to this version to fix bloat caused
     by the dependency bug.
+  * Further optimisation of dependency handling by adding a special
+    case for simple page dependencies. (smcv)
   * htmltidy: Return an error message if tidy fails. Closes: #543722
   * po: Fix name of translated toplevel index page. (intrigeri)
   * po: Fix display of links from a translated page to itself (ntrigeri)
-- 
cgit v1.2.3


From 125c6ec65028f46ed3c4dc3bbf6e26c2890a2262 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 15:13:45 -0400
Subject: <pedant>rename depends_exact to depends_simple

It's not "exact" since case munging has to be done, and I think
"simple" captures the optimisation better.</pedant>

With apologies to smcv, who probably has to rebuild his wiki now.
---
 IkiWiki.pm        | 18 +++++++++---------
 IkiWiki/Render.pm | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8bded8a0e..b8e89b73f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -13,8 +13,8 @@ use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
-	    %pagesources %destsources %depends %hooks %forcerebuild
-	    %loaded_plugins %depends_exact};
+	    %pagesources %destsources %depends %depends_simple %hooks
+	    %forcerebuild %loaded_plugins};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
@@ -1476,7 +1476,7 @@ sub loadindex () {
 	if (! $config{rebuild}) {
 		%pagesources=%pagemtime=%oldlinks=%links=%depends=
 		%destsources=%renderedfiles=%pagecase=%pagestate=
-		%depends_exact=();
+		%depends_simple=();
 	}
 	my $in;
 	if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
@@ -1516,9 +1516,9 @@ sub loadindex () {
 				$links{$page}=$d->{links};
 				$oldlinks{$page}=[@{$d->{links}}];
 			}
-			if (exists $d->{depends_exact}) {
-				$depends_exact{$page}={
-					map { $_ => 1 } @{$d->{depends_exact}}
+			if (exists $d->{depends_simple}) {
+				$depends_simple{$page}={
+					map { $_ => 1 } @{$d->{depends_simple}}
 				};
 			}
 			if (exists $d->{dependslist}) {
@@ -1576,8 +1576,8 @@ sub saveindex () {
 			$index{page}{$src}{dependslist} = [ keys %{$depends{$page}} ];
 		}
 
-		if (exists $depends_exact{$page}) {
-			$index{page}{$src}{depends_exact} = [ keys %{$depends_exact{$page}} ];
+		if (exists $depends_simple{$page}) {
+			$index{page}{$src}{depends_simple} = [ keys %{$depends_simple{$page}} ];
 		}
 
 		if (exists $pagestate{$page}) {
@@ -1751,7 +1751,7 @@ sub add_depends ($$) {
 	if ($pagespec =~ /$config{wiki_file_regexp}/ &&
 		$pagespec !~ /[\s*?()!]/) {
 		# a simple dependency, which can be matched by string eq
-		$depends_exact{$page}{lc $pagespec} = 1;
+		$depends_simple{$page}{lc $pagespec} = 1;
 		return 1;
 	}
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 85ae0f8e9..246c2260d 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -210,7 +210,7 @@ sub render ($) {
 	if (defined $type) {
 		my $page=pagename($file);
 		delete $depends{$page};
-		delete $depends_exact{$page};
+		delete $depends_simple{$page};
 		will_render($page, htmlpage($page), 1);
 		return if $type=~/^_/;
 		
@@ -225,7 +225,7 @@ sub render ($) {
 	}
 	else {
 		delete $depends{$file};
-		delete $depends_exact{$file};
+		delete $depends_simple{$file};
 		will_render($file, $file, 1);
 		
 		if ($config{hardlink}) {
@@ -433,7 +433,7 @@ sub refresh () {
 		# internal pages are not rendered
 		my $page=pagename($file);
 		delete $depends{$page};
-		delete $depends_exact{$page};
+		delete $depends_simple{$page};
 		foreach my $old (@{$renderedfiles{$page}}) {
 			delete $destsources{$old};
 		}
@@ -465,8 +465,8 @@ sub refresh () {
 			my $p=pagename($f);
 			my $reason = undef;
 
-			if (exists $depends_exact{$p}) {
-				foreach my $d (keys %{$depends_exact{$p}}) {
+			if (exists $depends_simple{$p}) {
+				foreach my $d (keys %{$depends_simple{$p}}) {
 					if (exists $lcchanged{$d}) {
 						$reason = $d;
 						last;
-- 
cgit v1.2.3


From 54a3928508d4421388e1b0876f963aa648da695c Mon Sep 17 00:00:00 2001
From: furby <furby@web>
Date: Fri, 28 Aug 2009 18:03:28 -0400
Subject:

---
 doc/sandbox.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 6ea8cc607..b986176ae 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -171,3 +171,10 @@ testing
 [[!toc  levels=2]]
 
 [[Mamma Mia]]
+----
+
+[[!format  c """
+void main () {
+    printf("hello, world!");
+}
+"""]]
-- 
cgit v1.2.3


From 25bf32431fd59afcc808eb74d5cefc96efab1182 Mon Sep 17 00:00:00 2001
From: furby <furby@web>
Date: Fri, 28 Aug 2009 18:08:16 -0400
Subject:

---
 doc/sandbox.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b986176ae..96b880b34 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -171,6 +171,7 @@ testing
 [[!toc  levels=2]]
 
 [[Mamma Mia]]
+
 ----
 
 [[!format  c """
@@ -178,3 +179,5 @@ void main () {
     printf("hello, world!");
 }
 """]]
+
+
-- 
cgit v1.2.3


From 2ba54735ce78a80d9577bef068f674559dddf57b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 18:22:11 -0400
Subject: po test suite failure

---
 doc/plugins/po.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 031188a67..4fecaeb53 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -352,6 +352,12 @@ whether it links to its master page. I believe the later is generally
 expected. Commit 646c9a4c95a480 in my po branch fixes this.
 --[[intrigeri]]
 
+2 test suite failures
+--------------------
+
+t/po is currently failing tests 57 and 59 (and I would like to release
+soon..) --[[Joey]] 
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From ec26a9619358498afb817c759625607d3b40f15d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 19:15:25 -0400
Subject: avoid clobbering origsub if checkconfig runs more than once

checkconfig can run more than once in a single ikiwiki run if setup is
building wrappers. That clobbered the origsub value for bestlink, leading
to infinite recursion
---
 IkiWiki/Plugin/po.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 55c1c32c6..cde2ad4e3 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -152,8 +152,10 @@ sub checkconfig () {
 		$config{po_link_to}='default';
 	}
 	unless ($config{po_link_to} eq 'default') {
-		$origsubs{'bestlink'}=\&IkiWiki::bestlink;
-		inject(name => "IkiWiki::bestlink", call => \&mybestlink);
+		if (! exists $origsubs{'bestlink'}) {
+			$origsubs{'bestlink'}=\&IkiWiki::bestlink;
+			inject(name => "IkiWiki::bestlink", call => \&mybestlink);
+		}
 	}
 
 	push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
-- 
cgit v1.2.3


From 94727e7fcfff204030bec64509ecedacb0abd6dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 19:49:22 -0400
Subject: merged

---
 doc/plugins/po.mdwn | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 4fecaeb53..04420c115 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -317,41 +317,6 @@ text, or text in whatever single language ikiwiki is configured to "speak".
 Maybe there could be a way to switch ikiwiki to speaking another language
 when building a non-english page? Then the directives would get translated.
 
-Created page type
------------------
-
-The interdiction to create pages of type po was broken by the new
-`page_types` code. This is fixed in my po branch by
-commit 1914ae2fd24e1e802.
-
-While I was there, I also added some code to set a new default value
-to the type select field in case it was previously set to "po".
-This code favors the type of the linking page's masterpage on page
-creation (when `from=page.LL`). This is commit c9301d2c296f682.
---[[intrigeri]]
-
-> Both cherry picked. --[[Joey]] 
-
-inline's post form's rootpage
------------------------------
-
-When a translatable page (say it is called "bugs") contains an
-[[inline directive|ikiwiki/directive/inline]] with `postform` enabled,
-the rootpage is l10n'd on translations pages (e.g. "bugs.fr" gets
-a `rootpage` value of `bugs.fr`). This is usually not what's expected,
-as translation pages are not supposed to have subpages. My po branch
-has code (e671e72053e81fa, which depends on 72ac9821e56637) that fixes
-this. --[[intrigeri]]
-
-link() pagespec on translation pages
-------------------------------------
-
-The `link()` pagespec, on translation pages, currently tests whether
-a given page links to the *current translation page*, rather than
-whether it links to its master page. I believe the later is generally
-expected. Commit 646c9a4c95a480 in my po branch fixes this.
---[[intrigeri]]
-
 2 test suite failures
 --------------------
 
-- 
cgit v1.2.3


From 03449610d6c666ba24bea68f01d896613e522278 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 23:23:06 -0400
Subject: img: Don't generate new verison of image if it is scaled to be larger
 in either dimension.

Although imagemagick handles even really large sizes sanely, using a page
file, doing so would just waste time and disk space, since the browser
can be told to resize it larger.
---
 IkiWiki/Plugin/img.pm | 39 ++++++++++++++++++++++++++++++++++++---
 debian/changelog      |  2 ++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 5f97e3810..9ae85c4e6 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -65,6 +65,8 @@ sub preprocess (@) {
 	my $imglink;
 	my $r;
 
+	my ($dwidth, $dheight);
+
 	if ($params{size} ne 'full') {
 		add_depends($params{page}, $image);
 
@@ -86,7 +88,15 @@ sub preprocess (@) {
 			$r = $im->Read($srcfile);
 			error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 
-			$r = $im->Resize(geometry => "${w}x${h}");
+			# don't resize any larger
+			my ($rw, $rh) = ($w, $h);
+			if ((length $rw && $rw > $im->Get("width")) ||
+			    (length $rh && $rh > $im->Get("height"))) {
+				$rw=$im->Get("width");
+				$rh=$im->Get("height");
+			}
+
+			$r = $im->Resize(geometry => "${rw}x${rh}");
 			error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
 			# don't actually write file in preview mode
@@ -98,11 +108,34 @@ sub preprocess (@) {
 				$imglink = $file;
 			}
 		}
+
+		# since we don't really resize larger, set the display
+		# size, so the browser can scale the image up if necessary
+		if (length $w && length $h) {
+			($dwidth, $dheight)=($w, $h);
+		}
+		# avoid division by zero on 0x0 image
+		elsif ($im->Get("width") == 0 || $im->Get("height") == 0) {
+			($dwidth, $dheight)=(0, 0);
+		}
+		# calculate unspecified size from the other one, preserving
+		# aspect ratio
+		elsif (length $w) {
+			$dwidth=$w;
+			$dheight=$w / $im->Get("width") * $im->Get("height");
+		}
+		elsif (length $h) {
+			$dheight=$h;
+			$dwidth=$h / $im->Get("height") * $im->Get("width");
+		}
+
 	}
 	else {
 		$r = $im->Read($srcfile);
 		error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 		$imglink = $file;
+		$dwidth = $im->Get("width");
+		$dheight = $im->Get("height");
 	}
 
 	my ($fileurl, $imgurl);
@@ -120,8 +153,8 @@ sub preprocess (@) {
 	}
 
 	my $imgtag='<img src="'.$imgurl.
-		'" width="'.$im->Get("width").
-		'" height="'.$im->Get("height").'"'.
+		'" width="'.$dwidth.
+		'" height="'.$dheight.'"'.
 		(exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
 		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
 		(exists $params{align} ? ' align="'.$params{align}.'"' : '').
diff --git a/debian/changelog b/debian/changelog
index 870abfdd5..992692566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * po: fix interdiction to create pages of type po (intrigeri)
   * po: po: favor the type of linking page's masterpage on page creation
     (intrigeri)
+  * img: Don't generate new verison of image if it is scaled to be
+    larger in either dimension.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
-- 
cgit v1.2.3


From 44ce9563a328ecb3b5fa8fd97afa30c3033fca76 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 29 Aug 2009 01:13:24 -0400
Subject: note that debian-* branches are subject to being rebased

---
 doc/git.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index f6971e84b..008f109df 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -63,7 +63,7 @@ Some of the branches included in the main repository include:
   changes.
 * `debian-stable` is used for updates to the old version included in
   Debian's stable release, and `debian-testing` is used for updates to
-  Debian's testing release.
+  Debian's testing release. (These and similar branches will be rebased.)
 * `ignore` gets various branches merged to it that Joey wishes to ignore
   when looking at everyone's unmerged changes.
 * `pristine-tar` contains deltas that
-- 
cgit v1.2.3


From 9f75d3b1f3c43820cff9ce554601f64c60d72b14 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Fri, 28 Aug 2009 23:07:27 -0700
Subject: teximg: Make TeX handle preventing unsafe things; remove insufficient
 blacklist

TeX has configuration options that prevent unsafe things like shell
escapes and insecure file reads/writes.  Turn all of them on.

teximg's regex-based blacklist does not suffice.  For instance:

[[!teximg code="""
\catcode`\%=0
%input{/etc/passwd}
"""]]

Remove the blacklist, since the TeX configuration options seal off the
underlying mechanisms more safely, and the blacklist blocks other TeX
commands that can prove useful.
---
 IkiWiki/Plugin/teximg.pm | 40 ++--------------------------------------
 debian/changelog         |  5 +++++
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index dba5372b5..f92ed0132 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -69,13 +69,7 @@ sub preprocess (@) {
 	if (! defined $code && ! length $code) {
 		error gettext("missing tex code");
 	}
-
-	if (check($code)) {
-		return create($code, check_height($height), \%params);
-	}
-	else {
-		error gettext("code includes disallowed latex commands")
-	}
+	return create($code, check_height($height), \%params);
 }
 
 sub check_height ($) {
@@ -155,7 +149,7 @@ sub gen_image ($$$$) {
 	my $tmp = eval { create_tmp_dir($digest) };
 	if (! $@ &&
 	    writefile("$digest.tex", $tmp, $tex) &&
-	    system("cd $tmp; latex --interaction=nonstopmode $tmp/$digest.tex > /dev/null") == 0 &&
+	    system("cd $tmp; shell_escape=f openout_any=p openin_any=p latex --interaction=nonstopmode $digest.tex < /dev/null > /dev/null") == 0 &&
 	    # ensure destination directory exists
 	    writefile("$imagedir/$digest.png", $config{destdir}, "") &&
 	    (($config{teximg_dvipng} &&
@@ -191,34 +185,4 @@ sub create_tmp_dir ($) {
 	return $tmpdir;
 }
 
-sub check ($) {
-	# Check if the code is ok
-	my $code = shift;
-
-	my @badthings = (
-		qr/\$\$/,
-		qr/\\include/,
-		qr/\\includegraphic/,
-		qr/\\usepackage/,
-		qr/\\newcommand/, 
-		qr/\\renewcommand/,
-		qr/\\def/,
-		qr/\\input/,
-		qr/\\open/,
-		qr/\\loop/,
-		qr/\\errorstopmode/,
-		qr/\\scrollmode/,
-		qr/\\batchmode/,
-		qr/\\read/,
-		qr/\\write/,
-	);
-	
-	foreach my $thing (@badthings) {
-		if ($code =~ m/$thing/ ) {
-			return 0;
-		}
-	}
-	return 1;
-}
-
 1
diff --git a/debian/changelog b/debian/changelog
index 992692566..a5b07aac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ikiwiki (3.1415926) UNRELEASED; urgency=low
 
+  [ Joey Hess ]
   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
     the old version, but continue. Closes: #541205 
   * inline: Avoid use of my $_ as it fails with older perls.
@@ -40,6 +41,10 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * img: Don't generate new verison of image if it is scaled to be
     larger in either dimension.
 
+  [ Josh Triplett ]
+  * teximg: Replace the insufficient blacklist with the built-in security
+    mechanisms of TeX.
+
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 
 ikiwiki (3.141592) unstable; urgency=low
-- 
cgit v1.2.3


From a4c9a8461cc85377f8c88a62f2f980a0c7e2a042 Mon Sep 17 00:00:00 2001
From: "http://emptty.myopenid.com/" <http://emptty.myopenid.com/@web>
Date: Sat, 29 Aug 2009 04:28:01 -0400
Subject: Answer to Joey, and justify my text (in the source)

---
 doc/todo/Restrict_page_viewing.mdwn | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/doc/todo/Restrict_page_viewing.mdwn b/doc/todo/Restrict_page_viewing.mdwn
index ec7b05a51..0b2a65a66 100644
--- a/doc/todo/Restrict_page_viewing.mdwn
+++ b/doc/todo/Restrict_page_viewing.mdwn
@@ -1,15 +1,27 @@
 I'd like to have some pages of my wiki to be only viewable by some users.
 
-I could use htaccess for that, but it would force the users to have 2 authentication mecanisms, so I'd prefer to use openID for that too.
+I could use htaccess for that, but it would force the users to have 
+2 authentication mecanisms, so I'd prefer to use openID for that too.
 
-* I'm thinking of adding a "show" parameter to the cgi script, thanks to a plugin similar to goto.
-* When called, it would check the credential using the session stuff (that I don't understand yet). If not enough, it would serve a 403 error of course.
-* If enough, it would read the file locally on the server side and return this as a content.
+* I'm thinking of adding a "show" parameter to the cgi script, thanks 
+  to a plugin similar to goto.
+* When called, it would check the credential using the session stuff 
+  (that I don't understand yet). 
+* If not enough, it would serve a 403 error of course.
+* If enough, it would read the file locally on the server side and 
+  return this as a content.
 
-Then, I'd have to generate the private page the regular way with ikiwiki, and prevent apache from serving them with an appropriate and much more maintainable htaccess file.
+Then, I'd have to generate the private page the regular way with ikiwiki,
+and prevent apache from serving them with an appropriate and 
+much more maintainable htaccess file.
 
 -- [[users/emptty]]
 
 > While I'm sure a plugin could do this, it adds so much scalability cost
 > and is so counter to ikiwiki's design.. Have you considered using the
 > [[plugins/httpauth]] plugin to unify around htaccess auth? --[[Joey]] 
+
+>> I'm not speaking of rendering the pages on demand, but to serve them on demand.
+>> They would still be compiled the regular way;
+>> I'll have another look at [[plugins/httpauth]] but I really like the openID whole idea.
+>> --[[emptty]]
-- 
cgit v1.2.3


From a0de415ae0bdfef3aa12bc4201f72c6dedbe021d Mon Sep 17 00:00:00 2001
From: bremner <bremner@web>
Date: Sat, 29 Aug 2009 07:16:57 -0400
Subject: build failure on nearlyfreespeech.net

---
 doc/tips/nearlyfreespeech/discussion.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/tips/nearlyfreespeech/discussion.mdwn

diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
new file mode 100644
index 000000000..3d4dc732d
--- /dev/null
+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
@@ -0,0 +1,9 @@
+with version 3.141592 I get
+<pre>
+HOME=/home/me /usr/bin/perl -Iblib/lib   ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+Failed to load plugin IkiWiki::Plugin::inline: Can't use global $_ in "my" at IkiWiki/Plugin/inline.pm line 198, near "my $_"
+Compilation failed in require at (eval 19) line 2.
+BEGIN failed--compilation aborted at (eval 19) line 2.
+</pre>
+
+perl is 5.8.9
-- 
cgit v1.2.3


From 517432273b96fc9e6bad9b7667ef6d1b04c699ee Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Sat, 29 Aug 2009 10:47:45 -0400
Subject: mod_auth_openid

---
 doc/todo/Restrict_page_viewing.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/todo/Restrict_page_viewing.mdwn b/doc/todo/Restrict_page_viewing.mdwn
index 0b2a65a66..089d27fff 100644
--- a/doc/todo/Restrict_page_viewing.mdwn
+++ b/doc/todo/Restrict_page_viewing.mdwn
@@ -25,3 +25,12 @@ much more maintainable htaccess file.
 >> They would still be compiled the regular way;
 >> I'll have another look at [[plugins/httpauth]] but I really like the openID whole idea.
 >> --[[emptty]]
+
+>>> How about
+>>> [mod_auth_openid](http://trac.butterfat.net/public/mod_auth_openid), then?
+>>> A plugin for ikiwiki to serve its own pages is far afield from ikiwiki's roots,
+>>> as Joey pointed out, but might be a neat option to have anyway -- for unifying
+>>> authentication across views and edits, for systems not otherwise running
+>>> web servers, for systems with web servers you don't have access to, and
+>>> doubtless for other purposes. Such a plugin would add quite a bit of flexibility,
+>>> and in that sense (IMO, of course) it'd be in the spirit of ikiwiki. --[[schmonz]]
-- 
cgit v1.2.3


From ef69cb34c355e184b01999cf445793cebc16f0c4 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 29 Aug 2009 16:32:48 +0200
Subject: doc/po(test suite failures): follow-up

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 doc/plugins/po.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 04420c115..9f4cf5564 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -323,6 +323,20 @@ when building a non-english page? Then the directives would get translated.
 t/po is currently failing tests 57 and 59 (and I would like to release
 soon..) --[[Joey]] 
 
+> They are failing because of commit cdc3576c8d1e (po: do not inject
+> custom bestlink function when `po_link_to` eq `default`). The test
+> suite changes `$config{po_link_to}`, but the `checkconfig` hook is
+> not re-run. I could manually run it when needed in the test-suite,
+> but this would lead to this function being injected several times,
+> and then `$origsubs{'bestlink'}` to be sometimes set to a wrong
+> value, which would break other parts of the test-suite. The best
+> solution I can think of (apart of reverting this commit or disabling
+> these two tests) is to split the test-suite into 3 parts, depending
+> on the `$config{po_link_to}` setting, either in 3 different `.t`
+> files, or inside the existing one and completely reset the IkiWiki
+> environment at the start of these parts... which I did not manage to
+> achieve in the last 2 hours :/ --[[intrigeri]]
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From 6191f3fbb9e0189276f84e15b9582fbd352b7a9b Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 29 Aug 2009 21:35:54 -0400
Subject: Remove getopt() hook (it's a dead end, unsafe to pass wrapper args to
 ikiwiki). Crunch on-demand module loads into one-liners. Comment why cvsps
 output is getting read in its entirety and reversed.

---
 IkiWiki/Plugin/cvs.pm | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index ac188d4a1..20b9f793a 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -6,7 +6,6 @@ use strict;
 use IkiWiki;
 
 sub import {
-	hook(type => "getopt", id => "cvs", call => \&getopt);
 	hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
 	hook(type => "getsetup", id => "cvs", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -21,13 +20,6 @@ sub import {
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 }
 
-sub getopt () {
-	# "cvs add dir" acts immediately on the repository.
-	# post-commit gets confused by this and doesn't need to act on it.
-	# If that's why we're here, terminate the process.
-	((grep /New directory/, @ARGV) > 0) && exit 0;
-}
-
 sub checkconfig () {
 	if (! defined $config{cvspath}) {
 		$config{cvspath}="ikiwiki";
@@ -111,9 +103,7 @@ sub cvs_runcvs(@) {
 	my ($cmd) = @_;
 	unshift @$cmd, 'cvs', '-Q';
 
-	eval q{
-		use IPC::Cmd;
-	};
+	eval q{use IPC::Cmd};
 	error($@) if $@;
 
 	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
@@ -132,9 +122,7 @@ sub cvs_runcvs(@) {
 sub cvs_shquote_commit ($) {
 	my $message = shift;
 
-	eval q{
-		use String::ShellQuote;
-	};
+	eval q{use String::ShellQuote};
 	error($@) if $@;
 
 	return shell_quote(IkiWiki::possibly_foolish_untaint($message));
@@ -274,13 +262,12 @@ sub rcs_recentchanges($) {
 
 	return unless cvs_is_controlling;
 
-	eval q{
-		use Date::Parse;
-	};
+	eval q{use Date::Parse};
 	error($@) if $@;
 
 	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
 
+	# there's no option to get the last N changesets, so read backwards
 	open CVSPS, "env TZ=UTC cvsps -q --cvs-direct -z 30 -x |" || error "couldn't get cvsps output: $!\n";
 	my @spsvc = reverse <CVSPS>;		# is this great? no it is not
 	close CVSPS || error "couldn't close cvsps output: $!\n";
-- 
cgit v1.2.3


From 6962b3459725a921714b4d777cab6288711f4990 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 29 Aug 2009 22:17:40 -0400
Subject: This is in my git branch now, no need for a copy of the code here.

---
 doc/plugins/contrib/unixauth.mdwn | 204 +-------------------------------------
 1 file changed, 2 insertions(+), 202 deletions(-)

diff --git a/doc/plugins/contrib/unixauth.mdwn b/doc/plugins/contrib/unixauth.mdwn
index 6108ebfae..137195139 100644
--- a/doc/plugins/contrib/unixauth.mdwn
+++ b/doc/plugins/contrib/unixauth.mdwn
@@ -1,6 +1,8 @@
 [[!template id=plugin name=unixauth core=0 author="[[schmonz]]"]]
 [[!tag type/auth]]
 
+[[!template id=gitbranch branch=schmonz author="[[schmonz]]"]]
+
 This plugin authenticates users against the Unix user database. It presents a similar UI to [[plugins/passwordauth]], but simpler, as there's no need to be able to register or change one's password.
 
 To authenticate, either [checkpassword](http://cr.yp.to/checkpwd.html) or [pwauth](http://www.unixpapa.com/pwauth/) must be installed and configured. `checkpassword` is strongly preferred. If your web server runs as an unprivileged user -- as it darn well should! -- then `checkpassword` needs to be setuid root. (Or your ikiwiki CGI wrapper, I guess, but don't do that.) Other checkpassword implementations are available, notably [checkpassword-pam](http://checkpasswd-pam.sourceforge.net/).
@@ -17,205 +19,3 @@ __Security__: [As with passwordauth](/security/#index14h2), be wary of sending u
 `unixauth` needs the `HTTPS` environment variable, available in ikiwiki 2.67 or later (fixed in #[502047](http://bugs.debian.org/502047)), without which it fails closed.
 
 The plugin has not been tested with newer versions of ikiwiki. [[schmonz]] hopes to have time to polish this plugin soon.
-
-[[!toggle id="code" text="unixauth.pm"]]
-
-[[!toggleable id="code" text="""
-
-    #!/usr/bin/perl
-    # Ikiwiki unixauth authentication.
-    package IkiWiki::Plugin::unixauth;
-    
-    use warnings;
-    use strict;
-    use IkiWiki 2.00;
-    
-    sub import {
-        hook(type => "getsetup", id => "unixauth", call => \&getsetup);
-            hook(type => "formbuilder_setup", id => "unixauth",
-                call => \&formbuilder_setup);
-            hook(type => "formbuilder", id => "unixauth",
-                call => \&formbuilder);
-        hook(type => "sessioncgi", id => "unixauth", call => \&sessioncgi);
-    }
-    
-    sub getsetup () {
-        return
-        unixauth_type => {
-                type => "string",
-                example => "checkpassword",
-                description => "type of authenticator; can be 'checkpassword' or 'pwauth'",
-                safe => 0,
-                rebuild => 1,
-        },
-        unixauth_command => {
-                type => "string",
-                example => "/path/to/checkpassword",
-                description => "full path and any arguments",
-                safe => 0,
-                rebuild => 1,
-        },
-        unixauth_requiressl => {
-                type => "boolean",
-                example => "1",
-                description => "require SSL? strongly recommended",
-                safe => 0,
-                rebuild => 1,
-        },
-        plugin => {
-                description => "Unix user authentication",
-                safe => 0,
-                rebuild => 1,
-        },
-    }
-    
-    # Checks if a string matches a user's password, and returns true or false.
-    sub checkpassword ($$;$) {
-        my $user=shift;
-        my $password=shift;
-        my $field=shift || "password";
-    
-        # It's very important that the user not be allowed to log in with
-        # an empty password!
-        if (! length $password) {
-                return 0;
-        }
-    
-        my $ret=0;
-        if (! exists $config{unixauth_type}) {
-                # admin needs to carefully think over his configuration
-                return 0;
-        }
-        elsif ($config{unixauth_type} eq "checkpassword") {
-                open UNIXAUTH, "|$config{unixauth_command} true 3<&0" or die("Could not run $config{unixauth_type}");
-                print UNIXAUTH "$user\0$password\0Y123456\0";
-                close UNIXAUTH;
-                $ret=!($?>>8);
-        }
-        elsif ($config{unixauth_type} eq "pwauth") {
-                open UNIXAUTH, "|$config{unixauth_command}" or die("Could not run $config{unixauth_type}");
-                print UNIXAUTH "$user\n$password\n";
-                close UNIXAUTH;
-                $ret=!($?>>8);
-        }
-        else {
-                # no such authentication type
-                return 0;
-        }
-    
-        if ($ret) {
-            my $userinfo=IkiWiki::userinfo_retrieve();
-            if (! length $user || ! defined $userinfo ||
-                ! exists $userinfo->{$user} || ! ref $userinfo->{$user}) {
-                    IkiWiki::userinfo_setall($user, {
-                        'email' => '',
-                        'regdate' => time,
-                    });
-            }
-        }
-    
-        return $ret;
-    }
-    
-    sub formbuilder_setup (@) {
-        my %params=@_;
-    
-        my $form=$params{form};
-        my $session=$params{session};
-        my $cgi=$params{cgi};
-    
-        # if not under SSL, die before even showing a login form,
-        # unless the admin explicitly says it's fine
-        if (! exists $config{unixauth_requiressl}) {
-                $config{unixauth_requiressl} = 1;
-        }
-        if ($config{unixauth_requiressl}) {
-            if ((! $config{sslcookie}) || (! exists $ENV{'HTTPS'})) {
-                die("SSL required to login. Contact your administrator.<br>");
-            }
-        }
-    
-        if ($form->title eq "signin") {
-                $form->field(name => "name", required => 0);
-                $form->field(name => "password", type => "password", required => 0);
-                
-                if ($form->submitted) {
-                        my $submittype=$form->submitted;
-                        # Set required fields based on how form was submitted.
-                        my %required=(
-                                "Login" => [qw(name password)],
-                        );
-                        foreach my $opt (@{$required{$submittype}}) {
-                                $form->field(name => $opt, required => 1);
-                        }
-        
-                        # Validate password against name for Login.
-                        if ($submittype eq "Login") {
-                                $form->field(
-                                        name => "password",
-                                        validate => sub {
-                                                checkpassword($form->field("name"), shift);
-                                        },
-                                );
-                        }
-                        
-                        # XXX is this reachable? looks like no
-                        elsif ($submittype eq "Login") {
-                                $form->field( 
-                                        name => "name",
-                                        validate => sub {
-                                                my $name=shift;
-                                                length $name &&
-                                                IkiWiki::userinfo_get($name, "regdate");
-                                        },
-                                );
-                        }
-                }
-                else {
-                        # First time settings.
-                        $form->field(name => "name");
-                        if ($session->param("name")) {
-                                $form->field(name => "name", value => $session->param("name"));
-                        }
-                }
-        }
-        elsif ($form->title eq "preferences") {
-                $form->field(name => "name", disabled => 1, 
-                        value => $session->param("name"), force => 1,
-                        fieldset => "login");
-                $form->field(name => "password", disabled => 1, type => "password",
-                        fieldset => "login"),
-        }
-    }
-    
-    sub formbuilder (@) {
-        my %params=@_;
-    
-        my $form=$params{form};
-        my $session=$params{session};
-        my $cgi=$params{cgi};
-        my $buttons=$params{buttons};
-    
-        if ($form->title eq "signin") {
-                if ($form->submitted && $form->validate) {
-                        if ($form->submitted eq 'Login') {
-                                $session->param("name", $form->field("name"));
-                                IkiWiki::cgi_postsignin($cgi, $session);
-                        }
-                }
-        }
-        elsif ($form->title eq "preferences") {
-                if ($form->submitted eq "Save Preferences" && $form->validate) {
-                        my $user_name=$form->field('name');
-                }
-        }
-    }
-    
-    sub sessioncgi ($$) {
-        my $q=shift;
-        my $session=shift;
-    }
-    
-    1
-
-"""]]
-- 
cgit v1.2.3


From 992d0aac09a3e3e81d7ad999910a4a026984f804 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 00:05:23 -0400
Subject: The string to match might not be "New directory" exactly, so match
 that substring instead.

---
 IkiWiki/Wrapper.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 2354717c3..87c2ffc89 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -50,7 +50,7 @@ EOF
 	{
 		int j;
 		for (j = 1; j < argc; j++)
-			if (strcmp(argv[j], "New directory") == 0)
+			if (strstr(argv[j], "New directory") != NULL)
 				exit(0);
 	}
 EOF
-- 
cgit v1.2.3


From b493f9b6d8e2131dd2338da05d98fded592d0943 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 00:17:42 -0400
Subject: Knock off a to-do item: "If the argument to cvs add smells like a
 binary file, cvs add -kb it (for attachment support)."

---
 IkiWiki/Plugin/cvs.pm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 20b9f793a..ccd9527cd 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -219,14 +219,25 @@ sub rcs_add ($) {
 	my $parent=IkiWiki::dirname($file);
 	my @files_to_add = ($file);
 
+	eval q{use File::MimeInfo};
+	error($@) if $@;
+
 	until ((length($parent) == 0) || cvs_is_controlling("$config{srcdir}/$parent")){
 		push @files_to_add, $parent;
 		$parent = IkiWiki::dirname($parent);
 	}
 
 	while ($file = pop @files_to_add) {
-		cvs_runcvs(['add', $file]) ||
-			warn("cvs add $file failed\n");
+		if ((@files_to_add == 0) &&
+			(File::MimeInfo::default $file ne 'text/plain')) {
+			# it's a binary file, add specially
+			cvs_runcvs(['add', '-kb', $file]) ||
+				warn("cvs add $file failed\n");
+		} else {
+			# directory or regular file
+			cvs_runcvs(['add', $file]) ||
+				warn("cvs add $file failed\n");
+		}
 	}
 }
 
-- 
cgit v1.2.3


From 2d1ff30e13d91cc4fa355bc392ba6044c6a6f31e Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 01:14:22 -0400
Subject: Knock off another to-do item: "Don't slurp the entire cvsps output
 into memory (!)."

---
 IkiWiki/Plugin/cvs.pm | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index ccd9527cd..c1b40bda1 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -278,12 +278,26 @@ sub rcs_recentchanges($) {
 
 	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
 
-	# there's no option to get the last N changesets, so read backwards
-	open CVSPS, "env TZ=UTC cvsps -q --cvs-direct -z 30 -x |" || error "couldn't get cvsps output: $!\n";
-	my @spsvc = reverse <CVSPS>;		# is this great? no it is not
-	close CVSPS || error "couldn't close cvsps output: $!\n";
+	# There's no cvsps option to get the last N changesets.
+	# Write full output to a temp file and read backwards.
 
-	while (my $line = shift @spsvc) {
+	eval q{use File::Temp qw/tempfile/};
+	error($@) if $@;
+	eval q{use File::ReadBackwards};
+	error($@) if $@;
+
+	my (undef, $tmpfile) = tempfile(OPEN=>0);
+	system("env TZ=UTC cvsps -q --cvs-direct -z 30 -x >$tmpfile");
+	if ($? == -1) {
+		error "couldn't run cvsps: $!\n";
+	} elsif (($? >>8) != 0) {
+		error "cvsps exited " . ($? >> 8) . ": $!\n";
+	}
+
+	tie(*SPSVC, 'File::ReadBackwards', $tmpfile)
+		|| error "couldn't open $tmpfile for read: $!\n";
+
+	while (my $line = <SPSVC>) {
 		$line =~ /^$/ || error "expected blank line, got $line";
 
 		my ($rev, $user, $committype, $when);
@@ -303,7 +317,7 @@ sub rcs_recentchanges($) {
 		#	@pages (and revisions)
 		#
 
-		while ($line = shift @spsvc) {
+		while ($line = <SPSVC>) {
 			last if ($line =~ /^Members:/);
 			for ($line) {
 				s/^\s+//;
@@ -323,7 +337,7 @@ sub rcs_recentchanges($) {
 			} if length $page;
 		}
 
-		while ($line = shift @spsvc) {
+		while ($line = <SPSVC>) {
 			last if ($line =~ /^Log:$/);
 			chomp $line;
 			unshift @message, { line => $line };
@@ -337,31 +351,31 @@ sub rcs_recentchanges($) {
 			$committype="cvs";
 		}
 
-		$line = shift @spsvc;	# Tag
-		$line = shift @spsvc;	# Branch
+		$line = <SPSVC>;	# Tag
+		$line = <SPSVC>;	# Branch
 
-		$line = shift @spsvc;
+		$line = <SPSVC>;
 		if ($line =~ /^Author: (.*)$/) {
 			$user = $1 unless defined $user && length $user;
 		} else {
 			error "expected Author, got $line";
 		}
 
-		$line = shift @spsvc;
+		$line = <SPSVC>;
 		if ($line =~ /^Date: (.*)$/) {
 			$when = str2time($1, 'UTC');
 		} else {
 			error "expected Date, got $line";
 		}
 
-		$line = shift @spsvc;
+		$line = <SPSVC>;
 		if ($line =~ /^PatchSet (.*)$/) {
 			$rev = $1;
 		} else {
 			error "expected PatchSet, got $line";
 		}
 
-		$line = shift @spsvc;	# ---------------------
+		$line = <SPSVC>;	# ---------------------
 
 		push @ret, {
 			rev => $rev,
@@ -371,9 +385,11 @@ sub rcs_recentchanges($) {
 			message => [@message],
 			pages => [@pages],
 		} if @pages;
-		return @ret if @ret >= $num;
+		last if @ret >= $num;
 	}
 
+	unlink($tmpfile) || error "couldn't unlink $tmpfile: $!\n";
+
 	return @ret;
 }
 
-- 
cgit v1.2.3


From 0721363a7adfc0f993a485a45222482a8a854a19 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 01:26:57 -0400
Subject: bug fixed, to-dos done

---
 doc/plugins/contrib/cvs.mdwn            | 2 --
 doc/plugins/contrib/cvs/discussion.mdwn | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index 6b600eef7..afef98c74 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -27,7 +27,5 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
 
 ### To do
 * Add automated tests. (Blindly adding svn-like tests to `t/file_pruned.t` doesn't do the trick.)
-* If the argument to `cvs add` smells like a binary file, `cvs add -kb` it (for [[plugins/attachment]] support).
-* Don't slurp the entire `cvsps` output into memory (!).
 * Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records.
 * Perhaps prevent web edits from attempting to create `.../CVS/foo.mdwn` (and `.../cvs/foo.mdwn` on case-insensitive filesystems); thanks to the CVS metadata directory, the attempt will fail anyway (and much more confusingly) if we don't.
diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index e1fa6e428..e142452d0 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -52,6 +52,10 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >>>>>> I don't see how there could possibly be a difference between
 >>>>>> ikiwiki's C wrapper and your shell wrapper wrapper here. --[[Joey]]
 
+>>>>>>> I was comparing strings overly precisely. Fixed on my branch.
+>>>>>>> I've also knocked off the two most pressing to-do items. I
+>>>>>>> think the plugin's ready for prime time. --[[schmonz]]
+
 > Thing 2 I'm less sure of. (I'd like to see the web UI return
 > immediately on save anyway, to a temporary "rebuilding, please wait
 > if you feel like knowing when it's done" page, but this problem
-- 
cgit v1.2.3


From 558873131f10c52ecbc0b97544db6556964f172a Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 01:31:15 -0400
Subject: also need File::ReadBackwards now

---
 doc/plugins/contrib/cvs.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index afef98c74..4cd7dcc7d 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -5,7 +5,9 @@
 This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]].
 
 ### Usage
-7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan IPC::Cmd]], [[!cpan String::ShellQuote]], and [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
+7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan IPC::Cmd]],
+[[!cpan String::ShellQuote]], [[!cpan File::ReadBackwards]], and
+[cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
 7. Adjust CVS-related parameters in your setup file.
 
 Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn't need it, but you yourself might. Here's a good general-purpose one:
-- 
cgit v1.2.3


From 968c6c93b4cfdb0b13609d90f058e6c4d005c75d Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 01:45:09 -0400
Subject: Remove debug statement.

---
 IkiWiki/Plugin/cvs.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index c1b40bda1..66e9463be 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -108,8 +108,6 @@ sub cvs_runcvs(@) {
 
 	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
 
-	debug("runcvs: " . join(" ", @$cmd));
-
 	my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
 		IPC::Cmd::run(command => $cmd, verbose => 0);
 	if (! $success) {
-- 
cgit v1.2.3


From 5e94e973eeb4ba75d9c37bd801278f686f0977c3 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 02:00:49 -0400
Subject: Only examine argv if the VCS is cvs.

---
 IkiWiki/Wrapper.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 87c2ffc89..cc2223d7a 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -45,8 +45,8 @@ EOF
 	}
 
 	my $check_cvs_add_dir="";
-	# XXX conditionalize on $config{rcs} eq 'cvs'
-	$check_cvs_add_dir=<<"EOF";
+	if ($config{rcs} eq 'cvs') {
+		$check_cvs_add_dir=<<"EOF";
 	{
 		int j;
 		for (j = 1; j < argc; j++)
@@ -54,6 +54,7 @@ EOF
 				exit(0);
 	}
 EOF
+	}
 
 	my $check_commit_hook="";
 	my $pre_exec="";
-- 
cgit v1.2.3


From 58cef9c3cf6da1b614c0a24ebef15a0d8ecea335 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 02:35:38 -0400
Subject: describe the wrapper change

---
 doc/plugins/contrib/cvs.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index 4cd7dcc7d..1c43fb272 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -20,7 +20,11 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
 
 ### Implementation details
 * `cvs.pm` started life as a copy of [[3.14159|news/version_3.14159]]'s `svn.pm`.
-* `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata into `$DESTDIR`.
+* `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata
+into `$DESTDIR`.
+* `IkiWiki/Wrapper.pm` avoids calling ikiwiki from post-commit if it's a
+directory being `cvs add`ed (this check is only compiled into the wrapper
+iff the configured VCS is "cvs").
 * [[ikiwiki-makerepo]]:
  * creates a repository,
  * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
-- 
cgit v1.2.3


From e972cadf78ba511af33ba19d40c5b6156569120d Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 13:49:38 -0400
Subject: Fix uninitialized value when editing a page being vivified from the
 basewiki. Makes the filetype-testing logic more explicit anyway.

---
 IkiWiki/Plugin/cvs.pm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 66e9463be..fa4c4da8e 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -226,13 +226,18 @@ sub rcs_add ($) {
 	}
 
 	while ($file = pop @files_to_add) {
-		if ((@files_to_add == 0) &&
-			(File::MimeInfo::default $file ne 'text/plain')) {
-			# it's a binary file, add specially
-			cvs_runcvs(['add', '-kb', $file]) ||
-				warn("cvs add $file failed\n");
+		if (@files_to_add == 0) {
+			# file
+			my $filemime = File::MimeInfo::default($file);
+			if (defined($filemime) && $filemime eq 'text/plain') {
+				cvs_runcvs(['add', $file]) ||
+					warn("cvs add $file failed\n");
+			} else {
+				cvs_runcvs(['add', '-kb', $file]) ||
+					warn("cvs add binary $file failed\n");
+			}
 		} else {
-			# directory or regular file
+			# directory
 			cvs_runcvs(['add', $file]) ||
 				warn("cvs add $file failed\n");
 		}
-- 
cgit v1.2.3


From d678147410fd5b1a7c6ca595f651b4da154229a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 14:49:53 -0400
Subject: Revert "po: do not inject custom bestlink function when po_link_to eq
 default"

This reverts commit cdc3576c8d1efb2593cac2d9da3f2393a2afe26e.

Conflicts:

	IkiWiki/Plugin/po.pm

This change broke the test suite and is not strictly necessary.
---
 IkiWiki/Plugin/po.pm | 12 +++++-------
 doc/plugins/po.mdwn  |  2 ++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 792d84261..5d0d9e79d 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -51,6 +51,8 @@ sub import {
 	hook(type => "formbuilder_setup", id => "po", call => \&formbuilder_setup, last => 1);
 	hook(type => "formbuilder", id => "po", call => \&formbuilder);
 
+	$origsubs{'bestlink'}=\&IkiWiki::bestlink;
+	inject(name => "IkiWiki::bestlink", call => \&mybestlink);
 	$origsubs{'beautify_urlpath'}=\&IkiWiki::beautify_urlpath;
 	inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
 	$origsubs{'targetpage'}=\&IkiWiki::targetpage;
@@ -153,12 +155,6 @@ sub checkconfig () {
 		warn(gettext('po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default'));
 		$config{po_link_to}='default';
 	}
-	unless ($config{po_link_to} eq 'default') {
-		if (! exists $origsubs{'bestlink'}) {
-			$origsubs{'bestlink'}=\&IkiWiki::bestlink;
-			inject(name => "IkiWiki::bestlink", call => \&mybestlink);
-		}
-	}
 
 	push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
 
@@ -562,11 +558,13 @@ sub formbuilder (@) {
 # `----
 
 # Implement po_link_to 'current' and 'negotiated' settings.
-# Not injected otherwise.
 sub mybestlink ($$) {
 	my $page=shift;
 	my $link=shift;
 
+	return $origsubs{'bestlink'}->($page, $link)
+		if $config{po_link_to} eq "default";
+
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
 	my @caller = caller(1);
 	if (length $res
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 9f4cf5564..38b6b12cd 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -337,6 +337,8 @@ soon..) --[[Joey]]
 > environment at the start of these parts... which I did not manage to
 > achieve in the last 2 hours :/ --[[intrigeri]]
 
+>> I've reverted it. --[[Joey]] 
+
 Documentation
 -------------
 
-- 
cgit v1.2.3


From 2e357179bd9cc7b2b05ae7ecad52273d5be02ebd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 14:51:51 -0400
Subject: fixed

---
 doc/tips/nearlyfreespeech/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
index 3d4dc732d..a003760b9 100644
--- a/doc/tips/nearlyfreespeech/discussion.mdwn
+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
@@ -7,3 +7,5 @@ BEGIN failed--compilation aborted at (eval 19) line 2.
 </pre>
 
 perl is 5.8.9
+
+> This is fixed in 3.1415926. --[[Joey]] 
-- 
cgit v1.2.3


From b83cb1d9f5ad1bc3eab332a75ecd958d63610ce9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 14:54:52 -0400
Subject: note

---
 doc/todo/Restrict_page_viewing.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/Restrict_page_viewing.mdwn b/doc/todo/Restrict_page_viewing.mdwn
index 089d27fff..9c1889d63 100644
--- a/doc/todo/Restrict_page_viewing.mdwn
+++ b/doc/todo/Restrict_page_viewing.mdwn
@@ -34,3 +34,6 @@ much more maintainable htaccess file.
 >>> web servers, for systems with web servers you don't have access to, and
 >>> doubtless for other purposes. Such a plugin would add quite a bit of flexibility,
 >>> and in that sense (IMO, of course) it'd be in the spirit of ikiwiki. --[[schmonz]]
+
+>>>> Yes, I think this could probably be used in combination with ikiwiki's
+>>>> httpauth and openid plugins. --[[Joey]] 
-- 
cgit v1.2.3


From 41122048b924ffa16ef8e1f77730f15b455733b0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 15:20:32 -0400
Subject: teximg security problem

---
 doc/security.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/security.mdwn b/doc/security.mdwn
index 939d65d01..ba3eac187 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -417,3 +417,13 @@ attack.
 intrigeri discovered this problem on 12 Nov 2008 and a patch put in place
 later that day, in version 2.70. The fix was backported to testing as version
 2.53.3, and to stable as version 1.33.7.
+
+## Insufficient blacklisting in teximg plugin
+
+Josh Tripplet discovered on 28 Aug 2009 that the teximg plugin's
+blacklisting of insecure TeX commands was insufficient; it could be
+bypassed and used to read arbitrary files. This was fixed by
+enabling TeX configuration options that disallow unsafe TeX commands.
+The fix was released on 30 Aug 2009 in version 3.1415926, and was
+backported to stable in version 2.53.4. If you use the teximg plugin,
+I recommend upgrading.
-- 
cgit v1.2.3


From 7823eb7c932d49228f55a83f33e47d10e7f5ec13 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 15:29:08 -0400
Subject: finalize release

---
 debian/changelog |   4 +--
 po/bg.po         |  99 +++++++++++++++++++++++++++--------------------------
 po/cs.po         |  99 +++++++++++++++++++++++++++--------------------------
 po/da.po         | 102 +++++++++++++++++++++++++++++--------------------------
 po/de.po         | 102 +++++++++++++++++++++++++++++--------------------------
 po/es.po         | 102 +++++++++++++++++++++++++++++--------------------------
 po/fr.po         |  98 +++++++++++++++++++++++++++-------------------------
 po/gu.po         |  99 +++++++++++++++++++++++++++--------------------------
 po/ikiwiki.pot   |  94 +++++++++++++++++++++++++-------------------------
 po/it.po         |  98 +++++++++++++++++++++++++++-------------------------
 po/pl.po         |  99 +++++++++++++++++++++++++++--------------------------
 po/sv.po         |  99 +++++++++++++++++++++++++++--------------------------
 po/vi.po         |  99 +++++++++++++++++++++++++++--------------------------
 13 files changed, 610 insertions(+), 584 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5b07aac1..ee8e74027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.1415926) UNRELEASED; urgency=low
+ikiwiki (3.1415926) unstable; urgency=high
 
   [ Joey Hess ]
   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
@@ -45,7 +45,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * teximg: Replace the insufficient blacklist with the built-in security
     mechanisms of TeX.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 30 Aug 2009 15:20:46 -0400
 
 ikiwiki (3.141592) unstable; urgency=low
 
diff --git a/po/bg.po b/po/bg.po
index d29f81723..d21205272 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Грешка"
 
@@ -363,7 +363,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -397,28 +397,33 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "няма разпознати усмивки; изключване на приставката „smiley”"
+
 #: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "не е инсталиран polygen"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "грешка при запис на файла „%s”: %s"
@@ -453,16 +458,16 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
@@ -591,99 +596,99 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -979,11 +984,7 @@ msgstr "грешка при обработване на шаблона"
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr ""
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "грешка при запис на файла „%s”: %s"
@@ -1035,54 +1036,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:497
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:533
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:545
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:569
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1180,16 +1181,16 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
diff --git a/po/cs.po b/po/cs.po
index 657d2852c..398a14211 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2007-05-09 21:21+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -53,7 +53,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Chyba"
 
@@ -360,7 +360,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -393,28 +393,33 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "nepodařilo se rozpoznat žádné smajlíky"
+
 #: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "polygen není nainstalován"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "nelze číst %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "nelze změnit velikost: %s"
@@ -447,16 +452,16 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr "Přidat nový příspěvek nazvaný:"
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "neexistující šablona %s"
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
@@ -581,99 +586,99 @@ msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "upravuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "nelze zapsat %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "nepodařilo se spustit dot"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "nelze číst %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -964,11 +969,7 @@ msgstr "nepodařilo se zpracovat:"
 msgid "missing tex code"
 msgstr "chybí hodnoty"
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr ""
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "nelze změnit velikost: %s"
@@ -1021,54 +1022,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "zpracovávám %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:497
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "zpracovávám %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:533
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:545
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "odstraňuji %s, již není zpracovávána %s"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:569
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze zpracovat %s"
@@ -1164,16 +1165,16 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "nemohu číst %s: %s"
diff --git a/po/da.po b/po/da.po
index b4e06535b..c7cbbb352 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Fejl"
 
@@ -364,7 +364,7 @@ msgstr "du kan ikke påvirke en fil med modus %s"
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -399,27 +399,32 @@ msgstr ""
 "advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel "
 "gennemkørsel"
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "afkodning af smileys mislykkedes"
+
 #: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ikke installeret"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "forkert størrelsesformat \"%s\" (burde være WxH)"
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "læsning af %s mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Ændring af størrelse mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Vurdering af billedstørrelse mislykkedes: %s"
@@ -450,16 +455,16 @@ msgstr "Sort::Naturally krævet for title_natural sortering"
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr "Tilføj nyt indlæg med følgende titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "ikke-eksisterende skabelon: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 
@@ -583,12 +588,12 @@ msgstr "LWP ikke fundet, pinger ikke"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -596,7 +601,7 @@ msgstr ""
 "%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -604,21 +609,21 @@ msgstr ""
 "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -626,7 +631,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -634,55 +639,55 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, perl-format
 msgid "failed to read %s"
 msgstr "læsning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -967,11 +972,7 @@ msgstr "dannelsen mislykkedes:"
 msgid "missing tex code"
 msgstr "manglende tex-kode"
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr "kode indeholder ikke-tilladte latec-kommandoer"
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 msgid "failed to generate image from code"
 msgstr "billedopbygning fra kode mislykkedes"
 
@@ -1026,7 +1027,7 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1035,47 +1036,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "gennemlæser %s"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:497
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:533
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:545
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:569
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1172,16 +1173,16 @@ msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
@@ -1206,5 +1207,8 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er webserverens domænenavn?"
 
+#~ msgid "code includes disallowed latex commands"
+#~ msgstr "kode indeholder ikke-tilladte latec-kommandoer"
+
 #~ msgid "discussion"
 #~ msgstr "diskussion"
diff --git a/po/de.po b/po/de.po
index 51c1b0fca..13a7355bb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Fehler"
 
@@ -362,7 +362,7 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -397,27 +397,32 @@ msgstr ""
 "Warnung: das highlight Perlmodul ist nicht verfügbar; greife zurück auf pass "
 "through"
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "Smileys konnten nicht ausgewertet werden"
+
 #: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ist nicht installiert"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "falsches Format in \"%s\" für size (sollte BxH sein)"
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "Lesen von %s fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Größenänderung fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Größe des Bildes %s konnte nicht festgestellt werden."
@@ -450,16 +455,16 @@ msgstr "Sort::Naturally wird benötigt für title_natural sort"
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "nicht-vorhandene Vorlage %s"
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
@@ -586,12 +591,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist keine gültige Sprachkodierung"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -599,7 +604,7 @@ msgstr ""
 "%s ist kein gültiger Wert für po_link_to, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -607,21 +612,21 @@ msgstr ""
 "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -629,7 +634,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -637,55 +642,55 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, perl-format
 msgid "failed to read %s"
 msgstr "lesen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -973,11 +978,7 @@ msgstr "Fehler beim Ablauf:"
 msgid "missing tex code"
 msgstr "fehlender TeX-Code"
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr "Code enthält verbotene LaTeX-Befehle"
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 msgid "failed to generate image from code"
 msgstr "konnte kein Bild aus dem Code erzeugen"
 
@@ -1035,7 +1036,7 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1044,47 +1045,47 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "durchsuche %s"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:497
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:533
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:545
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:569
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1186,16 +1187,16 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
@@ -1220,5 +1221,8 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?"
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
 
+#~ msgid "code includes disallowed latex commands"
+#~ msgstr "Code enthält verbotene LaTeX-Befehle"
+
 #~ msgid "discussion"
 #~ msgstr "Diskussion"
diff --git a/po/es.po b/po/es.po
index 77f1cea6e..56d7e62bd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Error"
 
@@ -366,7 +366,7 @@ msgstr "no puede actuar sobre un archivo con permisos %s"
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -402,27 +402,32 @@ msgstr ""
 "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada "
 "para continuar el proceso. "
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "Algunos emoticonos tienen errores"
+
 #: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr "El complemento Image::Magick no ha sido instalado"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "no puedo leer de %s: %s "
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "no he podido determinar el tamaño de la imagen %s"
@@ -457,16 +462,16 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr "Añadir una entrada nueva titulada:"
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "la plantilla %s no existe "
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
@@ -594,99 +599,99 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "no puedo leer de %s: %s "
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -974,11 +979,7 @@ msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
 msgid "missing tex code"
 msgstr "falta el código tex"
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr "el código incluye órdenes latex anuladas"
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 msgid "failed to generate image from code"
 msgstr "no he podido crear la imagen desde el código"
 
@@ -1035,7 +1036,7 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1044,49 +1045,49 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:497
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:533
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:545
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:569
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1186,18 +1187,18 @@ msgstr "no puedo emplear varios complementos rcs"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
@@ -1225,6 +1226,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "code includes disallowed latex commands"
+#~ msgstr "el código incluye órdenes latex anuladas"
+
 #, fuzzy
 #~ msgid "discussion"
 #~ msgstr "Comentarios"
diff --git a/po/fr.po b/po/fr.po
index df3b23891..75142e55c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 18:43-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -358,7 +358,7 @@ msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -393,27 +393,32 @@ msgstr ""
 "Avertissement : le module perl « highlight » n'est pas disponible. "
 "Continuation malgré tout."
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "Aucun smiley n'a pu être analysé"
+
 #: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick n'est pas installé"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)"
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "Échec de la lecture de %s : %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Échec de la détermination de la taille de l'image : %s"
@@ -446,16 +451,16 @@ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "Le modèle de page %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:614
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -583,12 +588,12 @@ msgstr ""
 "Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
 "version 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un code de langue valable"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -596,7 +601,7 @@ msgstr ""
 "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
 "défaut."
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -604,23 +609,23 @@ msgstr ""
 "po_link_to=negotiated nécessite que usedirs soit activé, retour à "
 "po_link_to=default."
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -628,7 +633,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -636,55 +641,55 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, perl-format
 msgid "failed to read %s"
 msgstr "Impossible de lire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -971,11 +976,7 @@ msgstr "Échec du traitement :"
 msgid "missing tex code"
 msgstr "Il manque le code TeX"
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr "Le code comporte des commandes LaTeX non permises"
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 msgid "failed to generate image from code"
 msgstr "Échec de la création de l'image à partir du code"
 
@@ -1031,7 +1032,7 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1040,47 +1041,47 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:473
+#: ../IkiWiki/Render.pm:497
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:513
+#: ../IkiWiki/Render.pm:533
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:525
+#: ../IkiWiki/Render.pm:545
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:549
+#: ../IkiWiki/Render.pm:569
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1187,11 +1188,11 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1791
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
@@ -1216,6 +1217,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "code includes disallowed latex commands"
+#~ msgstr "Le code comporte des commandes LaTeX non permises"
+
 #~ msgid "discussion"
 #~ msgstr "Discussion"
 
diff --git a/po/gu.po b/po/gu.po
index d7e6eaa6a..9dd1d0114 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -361,7 +361,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -394,28 +394,33 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ"
+
 #: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "પોલિગોન સ્થાપિત નથી"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
@@ -448,16 +453,16 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:"
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
@@ -581,99 +586,99 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -965,11 +970,7 @@ msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
 msgid "missing tex code"
 msgstr "ખોવાયેલ કિંમતો"
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr ""
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
@@ -1021,54 +1022,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:497
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:533
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:545
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:569
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1164,16 +1165,16 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 29a2d508c..7903fa19d 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 18:43-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -353,7 +353,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -386,27 +386,31 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+msgid "htmltidy failed to parse this html"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
@@ -437,16 +441,16 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:614
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -566,98 +570,98 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, perl-format
 msgid "failed to read %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -941,11 +945,7 @@ msgstr ""
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr ""
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 msgid "failed to generate image from code"
 msgstr ""
 
@@ -996,54 +996,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:473
+#: ../IkiWiki/Render.pm:497
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:513
+#: ../IkiWiki/Render.pm:533
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:525
+#: ../IkiWiki/Render.pm:545
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:549
+#: ../IkiWiki/Render.pm:569
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1144,11 +1144,11 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1791
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index c740fb0cb..a44199dae 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 18:43-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -355,7 +355,7 @@ msgstr "non è permesso lavorare su un file in modalità %s"
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -391,27 +391,32 @@ msgid ""
 msgstr ""
 "attenzione: modulo perl highlight non trovato, verrà passato inalterato"
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "impossibile interpretare gli smile"
+
 #: ../IkiWiki/Plugin/img.pm:63
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick non è installato"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)"
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "impossibile leggere %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "impossibile ridimensionare: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "impossibile determinare la dimensione dell'immagine %s"
@@ -443,16 +448,16 @@ msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki/Plugin/inline.pm:329
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr "Aggiungere un nuovo articolo dal titolo:"
 
-#: ../IkiWiki/Plugin/inline.pm:349
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "modello %s non esistente"
 
-#: ../IkiWiki/Plugin/inline.pm:614
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
 
@@ -579,19 +584,19 @@ msgstr ""
 "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno "
 "alla versione 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s non è una codifica di lingua valida"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -599,21 +604,21 @@ msgstr ""
 "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr "file PO aggiornati"
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -621,7 +626,7 @@ msgstr ""
 "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
 "stata eliminata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -629,55 +634,55 @@ msgstr ""
 "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
 "stata rinominata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Il file POT (%s) non esiste"
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "impossibile copiare il file PO di underlay in %s"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, perl-format
 msgid "failed to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "impossibile copiare il file POT in %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr "N/D"
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to translate %s"
 msgstr "impossibile tradurre %s"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, perl-format
 msgid "failed to read %s"
 msgstr "impossibile leggere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
@@ -965,11 +970,7 @@ msgstr "errore nell'elaborazione:"
 msgid "missing tex code"
 msgstr "codice tex mancante"
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr "nel codice sono presenti comandi latex non permessi"
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 msgid "failed to generate image from code"
 msgstr "impossibile generare l'immagine dal codice"
 
@@ -1024,7 +1025,7 @@ msgstr "impossibile determinare l'id del committer non fidato %s"
 msgid "bad file name %s"
 msgstr "nome file %s scorretto"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1033,47 +1034,47 @@ msgstr ""
 "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare "
 "allow_symlinks_before_srcdir per abilitare questa configurazione"
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorato il file dal nome scorretto %s"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s ha diverse pagine sorgenti possibili"
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "rimozione della vecchia pagina %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "scansione %s"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "compilazione di %s, che è collegato a %s"
 
-#: ../IkiWiki/Render.pm:473
+#: ../IkiWiki/Render.pm:497
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "compilazione di %s, che dipende da %s"
 
-#: ../IkiWiki/Render.pm:513
+#: ../IkiWiki/Render.pm:533
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:525
+#: ../IkiWiki/Render.pm:545
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "rimozione di %s, non più richiesto da %s"
 
-#: ../IkiWiki/Render.pm:549
+#: ../IkiWiki/Render.pm:569
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1175,11 +1176,11 @@ msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1791
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
@@ -1203,3 +1204,6 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr "Qual è il nome del dominio del server web?"
+
+#~ msgid "code includes disallowed latex commands"
+#~ msgstr "nel codice sono presenti comandi latex non permessi"
diff --git a/po/pl.po b/po/pl.po
index 6ecda8d88..23f1af5f6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Błąd"
 
@@ -365,7 +365,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -399,28 +399,33 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "awaria w trakcie przetwarzania emitoikonki"
+
 #: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "wtyczka polygen nie jest zainstalowana"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
@@ -455,16 +460,16 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr "Tytuł nowego wpisu"
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "brakujący szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
@@ -594,99 +599,99 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -987,11 +992,7 @@ msgstr "awaria w trakcie przetwarzania:"
 msgid "missing tex code"
 msgstr "brakujące wartości"
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr ""
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
@@ -1043,54 +1044,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "skanowanie %s"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:497
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:533
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:545
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:569
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1188,16 +1189,16 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 075de56d0..b81830763 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Fel"
 
@@ -362,7 +362,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -396,28 +396,33 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "misslyckades med att tolka smilisar, inaktiverar instick"
+
 #: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "polygen inte installerad"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "misslyckades med att skriva %s: %s"
@@ -450,16 +455,16 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
@@ -587,99 +592,99 @@ msgstr "RPC::XML::Client hittades inte, pingar inte"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -974,11 +979,7 @@ msgstr "misslyckades med att behandla mall:"
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr ""
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "misslyckades med att skriva %s: %s"
@@ -1030,54 +1031,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:497
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:533
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:545
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:569
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1173,16 +1174,16 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
diff --git a/po/vi.po b/po/vi.po
index b500ed581..6f50e2c65 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 14:07-0400\n"
+"POT-Creation-Date: 2009-08-30 15:25-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
 msgid "Error"
 msgstr "Lỗi"
 
@@ -363,7 +363,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -397,28 +397,33 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+#, fuzzy
+msgid "htmltidy failed to parse this html"
+msgstr "lỗi phân tách hình cười nào nên tắt bổ sung"
+
 #: ../IkiWiki/Plugin/img.pm:63
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "chưa cài đặt polygen"
 
-#: ../IkiWiki/Plugin/img.pm:72
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87
-#: ../IkiWiki/Plugin/img.pm:104
+#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
+#: ../IkiWiki/Plugin/img.pm:135
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:90
+#: ../IkiWiki/Plugin/img.pm:100
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:119
+#: ../IkiWiki/Plugin/img.pm:152
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "lỗi ghi %s: %s"
@@ -453,16 +458,16 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:347
+#: ../IkiWiki/Plugin/inline.pm:338
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:612
+#: ../IkiWiki/Plugin/inline.pm:603
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
@@ -588,99 +593,99 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:136
+#: ../IkiWiki/Plugin/po.pm:138
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:148
+#: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:153
+#: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:383
+#: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:424
+#: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:448
+#: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:468
+#: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:829
+#: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:843
+#: ../IkiWiki/Plugin/po.pm:883
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:852
+#: ../IkiWiki/Plugin/po.pm:892
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:858
+#: ../IkiWiki/Plugin/po.pm:898
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:907
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:983
+#: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1148
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1058
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1063
+#: ../IkiWiki/Plugin/po.pm:1111
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1112
+#: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -975,11 +980,7 @@ msgstr "mẫu không xử lý được:"
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
-msgstr ""
-
-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:122
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "lỗi ghi %s: %s"
@@ -1031,54 +1032,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:264
+#: ../IkiWiki/Render.pm:266
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312
+#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:294
+#: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:380
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "removing old page %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:421
+#: ../IkiWiki/Render.pm:423
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:450
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:468
+#: ../IkiWiki/Render.pm:497
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:533
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:519
+#: ../IkiWiki/Render.pm:545
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
-#: ../IkiWiki/Render.pm:543
+#: ../IkiWiki/Render.pm:569
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
@@ -1174,16 +1175,16 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1243
+#: ../IkiWiki.pm:1251
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1783
+#: ../IkiWiki.pm:1808
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1915
+#: ../IkiWiki.pm:1932
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From 5acec79c64de145feb364742dde7d9391992b0a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 15:31:47 -0400
Subject: add news item for ikiwiki 3.1415926

---
 doc/news/version_3.1415926.mdwn | 53 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 doc/news/version_3.1415926.mdwn

diff --git a/doc/news/version_3.1415926.mdwn b/doc/news/version_3.1415926.mdwn
new file mode 100644
index 000000000..c914c83cd
--- /dev/null
+++ b/doc/news/version_3.1415926.mdwn
@@ -0,0 +1,53 @@
+News for ikiwiki 3.1415926:
+
+   In order to fix a performance bug, all wikis need to be rebuilt on
+   upgrade to this version. If you listed your wiki in
+   /etc/ikiwiki/wikilist this will be done automatically when the
+   Debian package is upgraded. Or use ikiwiki-mass-rebuild to force
+   a rebuild.
+
+ikiwiki 3.1415926 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * [ Joey Hess ]
+   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
+     the old version, but continue. Closes: #[541205](http://bugs.debian.org/541205)
+   * inline: Avoid use of my $\_ as it fails with older perls.
+     Closes: #[541215](http://bugs.debian.org/541215)
+   * Add discussionpage configuration setting.
+   * Several optimisations, including speedups to orphans and brokenlinks
+     calculation.
+   * meta, img: Fix bugs in dependency code. (smcv)
+   * Allow building ikiwiki on systems w/o po4a --
+     building of the translated underlays will be skipped in this case.
+   * Add basic styling of po plugin's languages list.
+   * inline: Display an error if feedpages is specified and fails to match
+     due to a problem such as created\_before being told to check against
+     a page that does not exist.
+   * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective
+     pages from the basewiki.
+   * Updated French program translation from Philippe Batailler.
+     Closes: #[542036](http://bugs.debian.org/542036)
+   * po: Fixed to run rcs\_add ralative to srcdir.
+   * Italian program translation from Luca Bruno.
+   * Fix example blog's tags/life to not have a broken PageSpec.
+     Closes: #[543510](http://bugs.debian.org/543510)
+   * Optimize the dependencies list. This also fixes a bug
+     that could cause repeated refreshes of the wiki to grow
+     increasingly larger dependency lists, and get increasingly
+     slower. (smcv)
+   * Rebuild wikis on upgrade to this version to fix bloat caused
+     by the dependency bug.
+   * Further optimisation of dependency handling by adding a special
+     case for simple page dependencies. (smcv)
+   * htmltidy: Return an error message if tidy fails. Closes: #[543722](http://bugs.debian.org/543722)
+   * po: Fix name of translated toplevel index page. (intrigeri)
+   * po: Fix display of links from a translated page to itself (ntrigeri)
+   * Add Czech basewiki translation from Miroslav Kure.
+   * po: fix interdiction to create pages of type po (intrigeri)
+   * po: po: favor the type of linking page's masterpage on page creation
+     (intrigeri)
+   * img: Don't generate new verison of image if it is scaled to be
+     larger in either dimension.
+ * [ Josh Triplett ]
+   * teximg: Replace the insufficient blacklist with the built-in security
+     mechanisms of TeX."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 7021fc36466d80ca0c4105b82239d3ba008ade80 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 15:32:42 -0400
Subject: still mispelling josh's name..

---
 doc/security.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/security.mdwn b/doc/security.mdwn
index ba3eac187..200ae29e2 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -420,7 +420,7 @@ later that day, in version 2.70. The fix was backported to testing as version
 
 ## Insufficient blacklisting in teximg plugin
 
-Josh Tripplet discovered on 28 Aug 2009 that the teximg plugin's
+Josh Triplett discovered on 28 Aug 2009 that the teximg plugin's
 blacklisting of insecure TeX commands was insufficient; it could be
 bypassed and used to read arbitrary files. This was fixed by
 enabling TeX configuration options that disallow unsafe TeX commands.
-- 
cgit v1.2.3


From 1af7d7d8429b6e73493a5f8ba877c6cfb888cfe1 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 16:13:17 -0400
Subject: On some systems the commit message gets quoted properly already.
 Don't requote in such cases, do quote in all others.

---
 IkiWiki/Plugin/cvs.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index fa4c4da8e..849302df4 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -119,11 +119,21 @@ sub cvs_runcvs(@) {
 
 sub cvs_shquote_commit ($) {
 	my $message = shift;
+	my $test_message = "CVS autodiscover quoting CVS";
 
 	eval q{use String::ShellQuote};
 	error($@) if $@;
+	eval q{use IPC::Cmd};
+	error($@) if $@;
 
-	return shell_quote(IkiWiki::possibly_foolish_untaint($message));
+	my $cmd = ['echo', shell_quote($test_message)];
+	my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
+		IPC::Cmd::run(command => $cmd, verbose => 0);
+	if ((grep /'$test_message'/, @$stdout_buf) > 0) {
+		return IkiWiki::possibly_foolish_untaint($message);
+	} else {
+		return shell_quote(IkiWiki::possibly_foolish_untaint($message));
+	}
 }
 
 sub cvs_is_controlling {
-- 
cgit v1.2.3


From 8aeac3b6666eee4bcabf0e5c49bf1806d9410983 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 17:48:14 -0400
Subject: CVE

---
 debian/changelog                | 2 +-
 doc/news/version_3.1415926.mdwn | 2 +-
 doc/security.mdwn               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee8e74027..4dd47d2dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,7 +43,7 @@ ikiwiki (3.1415926) unstable; urgency=high
 
   [ Josh Triplett ]
   * teximg: Replace the insufficient blacklist with the built-in security
-    mechanisms of TeX.
+    mechanisms of TeX. (CVE-2009-2944)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 30 Aug 2009 15:20:46 -0400
 
diff --git a/doc/news/version_3.1415926.mdwn b/doc/news/version_3.1415926.mdwn
index c914c83cd..d31812c8e 100644
--- a/doc/news/version_3.1415926.mdwn
+++ b/doc/news/version_3.1415926.mdwn
@@ -50,4 +50,4 @@ ikiwiki 3.1415926 released with [[!toggle text="these changes"]]
      larger in either dimension.
  * [ Josh Triplett ]
    * teximg: Replace the insufficient blacklist with the built-in security
-     mechanisms of TeX."""]]
\ No newline at end of file
+     mechanisms of TeX. ([[!cve CVE-2009-2944]])"""]]
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 200ae29e2..3924186c2 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -426,4 +426,4 @@ bypassed and used to read arbitrary files. This was fixed by
 enabling TeX configuration options that disallow unsafe TeX commands.
 The fix was released on 30 Aug 2009 in version 3.1415926, and was
 backported to stable in version 2.53.4. If you use the teximg plugin,
-I recommend upgrading.
+I recommend upgrading. ([[!cve CVE-2009-2944]])
-- 
cgit v1.2.3


From a86de9b1f6e6ae867a5a2f7ede5b52a04f306c58 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 19:17:45 -0400
Subject: update for Text::MultiMarkdown split

---
 doc/plugins/mdwn.mdwn | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn
index 6ad1fb229..af0531059 100644
--- a/doc/plugins/mdwn.mdwn
+++ b/doc/plugins/mdwn.mdwn
@@ -12,9 +12,9 @@ this plugin. The [original version of
 markdown](http://daringfireball.net/projects/markdown/) can be used, or the
 [[!cpan Text::Markdown]] perl module.
 
-[[!cpan Text::Markdown]] also includes a markdown variant called
-[multimarkdown](http://fletcherpenney.net/MultiMarkdown/), which supports
-tables, footnotes, and other new features. Multimarkdown is not enabled by
-default, but can be turned on via the `multimarkdown` option in the setup
-file. Note that multimarkdown's metadata and wikilinks features are
-disabled when it's used with ikiwiki.
+[[!cpan Text::MultiMarkdown]] can be used in order to use tables, footnotes,
+and other new features from the markdown variant called
+multimarkdown](http://fletcherpenney.net/MultiMarkdown/). Multimarkdown is
+not enabled by default, but can be turned on via the `multimarkdown` option
+in the setup file. Note that multimarkdown's metadata and wikilinks
+features are disabled when it's used with ikiwiki.
-- 
cgit v1.2.3


From 85844b8494dd5e032d06afd623c25b4bb4a72578 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 21:03:18 -0400
Subject: whitespace

---
 IkiWiki/Plugin/cvs.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 849302df4..4735c0138 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -303,7 +303,7 @@ sub rcs_recentchanges($) {
 	system("env TZ=UTC cvsps -q --cvs-direct -z 30 -x >$tmpfile");
 	if ($? == -1) {
 		error "couldn't run cvsps: $!\n";
-	} elsif (($? >>8) != 0) {
+	} elsif (($? >> 8) != 0) {
 		error "cvsps exited " . ($? >> 8) . ": $!\n";
 	}
 
-- 
cgit v1.2.3


From 9492bf315832df1e92277dcb75f95de50abe3e9c Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Mon, 31 Aug 2009 11:03:20 -0400
Subject: fixed link

---
 doc/plugins/mdwn.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn
index af0531059..756462aa1 100644
--- a/doc/plugins/mdwn.mdwn
+++ b/doc/plugins/mdwn.mdwn
@@ -14,7 +14,7 @@ markdown](http://daringfireball.net/projects/markdown/) can be used, or the
 
 [[!cpan Text::MultiMarkdown]] can be used in order to use tables, footnotes,
 and other new features from the markdown variant called
-multimarkdown](http://fletcherpenney.net/MultiMarkdown/). Multimarkdown is
+[multimarkdown](http://fletcherpenney.net/MultiMarkdown/). Multimarkdown is
 not enabled by default, but can be turned on via the `multimarkdown` option
 in the setup file. Note that multimarkdown's metadata and wikilinks
 features are disabled when it's used with ikiwiki.
-- 
cgit v1.2.3


From e5113aa766fa19a16b29d762f2bca2e9670c0677 Mon Sep 17 00:00:00 2001
From: mike castleman <m@mlcastle.net>
Date: Mon, 31 Aug 2009 13:50:59 -0400
Subject: new page: sandbox/test2

---
 doc/sandbox/test2.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/sandbox/test2.mdwn

diff --git a/doc/sandbox/test2.mdwn b/doc/sandbox/test2.mdwn
new file mode 100644
index 000000000..3e50e68f3
--- /dev/null
+++ b/doc/sandbox/test2.mdwn
@@ -0,0 +1 @@
+this is test two, being pushed by [[tips/untrusted_git_push]].
-- 
cgit v1.2.3


From 9e195018a2a7ba315ee947bd367fca33b704ef2c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 31 Aug 2009 19:30:31 -0400
Subject: remove ^P's

---
 doc/plugins/mdwn.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn
index 756462aa1..ce1b6097a 100644
--- a/doc/plugins/mdwn.mdwn
+++ b/doc/plugins/mdwn.mdwn
@@ -14,7 +14,7 @@ markdown](http://daringfireball.net/projects/markdown/) can be used, or the
 
 [[!cpan Text::MultiMarkdown]] can be used in order to use tables, footnotes,
 and other new features from the markdown variant called
-[multimarkdown](http://fletcherpenney.net/MultiMarkdown/). Multimarkdown is
+[multimarkdown](http://fletcherpenney.net/MultiMarkdown/). Multimarkdown is
 not enabled by default, but can be turned on via the `multimarkdown` option
 in the setup file. Note that multimarkdown's metadata and wikilinks
 features are disabled when it's used with ikiwiki.
-- 
cgit v1.2.3


From 904c16a68b07078750e5906ffb2c568d22d955e3 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 1 Sep 2009 14:17:51 +0100
Subject: Remove references to merged-and-deleted git branches

---
 doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 2 --
 doc/todo/backlinks_result_is_lossy.mdwn                    | 1 -
 doc/todo/generated_po_stuff_not_ignored_by_git.mdwn        | 1 -
 doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn | 2 --
 doc/todo/optimize_simple_dependencies.mdwn                 | 2 --
 doc/todo/pagestats_among_a_subset_of_pages.mdwn            | 1 -
 doc/todo/should_optimise_pagespecs.mdwn                    | 4 ----
 doc/todo/source_link.mdwn                                  | 2 --
 8 files changed, 15 deletions(-)

diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
index 5e842ca7f..ad0f506f2 100644
--- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
+++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
@@ -66,8 +66,6 @@ Patch:
 
 >>>>>> The current arrangement looks fine to me. Thanks. --[[harishcm]]
 
-[[!template id=gitbranch author="[[harishcm]]" branch=smcv/ready/harishcm-map-fix]]
-
 > [[merged|done]] --[[Joey]] 
 
 Patch:
diff --git a/doc/todo/backlinks_result_is_lossy.mdwn b/doc/todo/backlinks_result_is_lossy.mdwn
index 11b5fbcae..2a9fc4a0a 100644
--- a/doc/todo/backlinks_result_is_lossy.mdwn
+++ b/doc/todo/backlinks_result_is_lossy.mdwn
@@ -1,5 +1,4 @@
 [[!tag patch patch/core]]
-[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]]
 
 IkiWiki::backlinks returns a form of $backlinks{$page} that has undergone a
 lossy transformation (to get it in the form that page templates want), making
diff --git a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
index 1d24fd385..29c017c5d 100644
--- a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
+++ b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
@@ -1,4 +1,3 @@
-[[!template id=gitbranch branch=smcv/gitignore author="[[smcv]]"]]
 [[!tag patch]]
 
 The recent merge of the po branch didn't come with a .gitignore.
diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
index bbde04f83..85bb4ff5a 100644
--- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
+++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
@@ -1,5 +1,3 @@
-[[!template id=gitbranch branch=smcv/ready/inline-pagenames author="[[smcv]]"]]
-
 A [[!taglink patch]] in my git repository (the inline-pagenames branch) adds
 the following parameter to the [[ikiwiki/directive/inline]] directive:
 
diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn
index 91e184c29..6f6284303 100644
--- a/doc/todo/optimize_simple_dependencies.mdwn
+++ b/doc/todo/optimize_simple_dependencies.mdwn
@@ -1,5 +1,3 @@
-[[!template id=gitbranch branch=smcv/ready/depends-exact author="[[smcv]]"]]
-
 I'm still trying to optimize ikiwiki for a site using
 [[plugins/contrib/album]], and checking which pages depend on which pages
 is still taking too long. Here's another go at fixing that, using [[Will]]'s
diff --git a/doc/todo/pagestats_among_a_subset_of_pages.mdwn b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
index fd15d6a42..33f9258fd 100644
--- a/doc/todo/pagestats_among_a_subset_of_pages.mdwn
+++ b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
@@ -1,5 +1,4 @@
 [[!tag patch plugins/pagestats]]
-[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]]
 
 My `among` branch fixes [[todo/backlinks_result_is_lossy]], then uses that
 to provide pagestats for links from a subset of pages. From the docs included
diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 4b4e267f0..728ab8994 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -79,8 +79,6 @@ I can think about reducung the size of my wiki source and making it available on
 > 
 > --[[Joey]]
 
-[[!template id=gitbranch branch=smcv/ready/optimize-depends author="[[smcv]]"]]
-
 >> I've been looking at optimizing ikiwiki for a site using
 >> [[plugins/contrib/album]] (which produces a lot of pages) and it seems
 >> that checking which pages depend on which pages does take a significant
@@ -100,8 +98,6 @@ I can think about reducung the size of my wiki source and making it available on
 >>>> I haven't actually deleted it), because the "or" operation is now done in
 >>>> the Perl code, rather than by merging pagespecs and translating. --[[smcv]]
 
-[[!template id=gitbranch branch=smcv/ready/remove-pagespec-merge author="[[smcv]]"]]
-
 >>>>> I've now added a patch to the end of that branch that deletes
 >>>>> `pagespec_merge` almost entirely (we do need to keep a copy around, in
 >>>>> ikiwiki-transition, but that copy doesn't have to be optimal or support
diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index dfc2766cc..cf3e69487 100644
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -11,8 +11,6 @@ All of this code is licensed under the GPLv2+. -- [[Will]]
 > by loading the index with IkiWiki::loadindex, like [[plugins/goto]] does?
 > --[[smcv]]
 
-[[!template id=gitbranch branch=smcv/ready/getsource
-  author="[[Will]]/[[smcv]]"]]
 [[done]]
 
 >> I've applied the patch below in a git branch, fixed my earlier criticism,
-- 
cgit v1.2.3


From 86ddfb9b8f24bba9e2d98ccf4fbc9aad268eda03 Mon Sep 17 00:00:00 2001
From: blahgrad <blahgrad@web>
Date: Tue, 1 Sep 2009 10:17:26 -0400
Subject: test

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 96b880b34..9009df305 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -47,7 +47,7 @@ Here's another one with *emphasised* text.
 > > This is nested blockquote.
 >
 >> Without a space works too.
->>> to three levels
+>>> to three levels of [term papers](http://www.superiorpapers.com/)
 >
 > Back to the first level.
 
-- 
cgit v1.2.3


From ccb1239d88803e07c590d2a69a0a26977d9c1bc8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 1 Sep 2009 12:32:39 -0400
Subject: typo

---
 doc/tips/upgrade_to_3.0.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/upgrade_to_3.0.mdwn b/doc/tips/upgrade_to_3.0.mdwn
index d22813bf2..05b6d6fbd 100644
--- a/doc/tips/upgrade_to_3.0.mdwn
+++ b/doc/tips/upgrade_to_3.0.mdwn
@@ -45,7 +45,7 @@ contain the above, then run `ikiwiki-transition prefix_directives your.setup`
 ## GlobLists
 
 In 3.0, the old "GlobList" syntax for [[PageSpecs|ikiwiki/PageSpec]] is no
-longer supported. A GlobList contains multiple term, but does not separate
+longer supported. A GlobList contains multiple terms, but does not separate
 them with "and" or "or":
 
 	sandbox !*/Discussion
-- 
cgit v1.2.3


From 38b331b57e096426106667f96b09f322634ef584 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 1 Sep 2009 13:05:32 -0400
Subject: Revert spam

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9009df305..96b880b34 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -47,7 +47,7 @@ Here's another one with *emphasised* text.
 > > This is nested blockquote.
 >
 >> Without a space works too.
->>> to three levels of [term papers](http://www.superiorpapers.com/)
+>>> to three levels
 >
 > Back to the first level.
 
-- 
cgit v1.2.3


From bf81cf9ed203bda4c37338cc87250ca843dc4afe Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Wed, 2 Sep 2009 01:21:01 -0400
Subject: Add link to my git repository

---
 doc/users/Will.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/users/Will.mdwn b/doc/users/Will.mdwn
index 9c46edc69..043203dc3 100644
--- a/doc/users/Will.mdwn
+++ b/doc/users/Will.mdwn
@@ -4,6 +4,8 @@ Lately I've been using Ikiwiki for other things and seem to be scratching a few
 
 I generally use my [[ikiwiki/openid]] login when editing here: <http://www.cse.unsw.edu.au/~willu/>
 
+I have a git repository for some of my IkiWiki code: <http://www.cse.unsw.edu.au/~willu/ikiwiki.git>.
+
 Generic License Grant
 -----------------
 
-- 
cgit v1.2.3


From 81b9321e61f545be3ca94fc484f62b44ec836fb5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Sep 2009 15:04:27 -0400
Subject: Add French basewiki translation from the Debian French l10n team,
 including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.

---
 debian/changelog                                   |   7 +
 po/underlay.setup                                  |   2 +-
 po/underlays/basewiki/ikiwiki.fr.po                |  69 +++++
 po/underlays/basewiki/ikiwiki/directive.fr.po      | 132 ++++++++++
 po/underlays/basewiki/ikiwiki/formatting.fr.po     | 291 +++++++++++++++++++++
 po/underlays/basewiki/ikiwiki/markdown.fr.po       |  49 ++++
 po/underlays/basewiki/ikiwiki/openid.fr.po         | 118 +++++++++
 po/underlays/basewiki/ikiwiki/pagespec.fr.po       | 236 +++++++++++++++++
 .../basewiki/ikiwiki/pagespec/attachment.fr.po     | 114 ++++++++
 po/underlays/basewiki/ikiwiki/pagespec/po.fr.po    |  57 ++++
 po/underlays/basewiki/ikiwiki/searching.fr.po      |  87 ++++++
 po/underlays/basewiki/ikiwiki/subpage.fr.po        |  51 ++++
 .../basewiki/ikiwiki/subpage/linkingrules.fr.po    | 103 ++++++++
 po/underlays/basewiki/ikiwiki/wikilink.fr.po       | 107 ++++++++
 po/underlays/basewiki/index.fr.po                  |  26 ++
 po/underlays/basewiki/recentchanges.fr.po          |  37 +++
 po/underlays/basewiki/sandbox.fr.po                |  88 +++++++
 po/underlays/basewiki/shortcuts.fr.po              | 224 ++++++++++++++++
 po/underlays/basewiki/templates.fr.po              | 241 +++++++++++++++++
 po/underlays/basewiki/templates/note.fr.po         |  40 +++
 po/underlays/basewiki/templates/popup.fr.po        |  46 ++++
 21 files changed, 2124 insertions(+), 1 deletion(-)
 create mode 100644 po/underlays/basewiki/ikiwiki.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/directive.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/formatting.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/markdown.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/openid.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/searching.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/subpage.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po
 create mode 100644 po/underlays/basewiki/ikiwiki/wikilink.fr.po
 create mode 100644 po/underlays/basewiki/index.fr.po
 create mode 100644 po/underlays/basewiki/recentchanges.fr.po
 create mode 100644 po/underlays/basewiki/sandbox.fr.po
 create mode 100644 po/underlays/basewiki/shortcuts.fr.po
 create mode 100644 po/underlays/basewiki/templates.fr.po
 create mode 100644 po/underlays/basewiki/templates/note.fr.po
 create mode 100644 po/underlays/basewiki/templates/popup.fr.po

diff --git a/debian/changelog b/debian/changelog
index 4dd47d2dd..6109a7012 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.14159265) UNRELEASED; urgency=low
+
+  * Add French basewiki translation from the Debian French l10n team,
+    including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
+
 ikiwiki (3.1415926) unstable; urgency=high
 
   [ Joey Hess ]
diff --git a/po/underlay.setup b/po/underlay.setup
index 237acef5d..a7d307e71 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -7,9 +7,9 @@ use IkiWiki::Setup::Standard {
 	# Listing languages without active translations
 	# will excessively bloat things.
         po_slave_languages => {
-		#'fr' => 'Français',
 		#'es' => 'Español',
 		#'de' => 'Deutsch',
+		'fr' => 'Français',
 		'da' => 'Dansk',
 		'cs' => 'česky',
         },
diff --git a/po/underlays/basewiki/ikiwiki.fr.po b/po/underlays/basewiki/ikiwiki.fr.po
new file mode 100644
index 000000000..6fceab6f2
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki.fr.po
@@ -0,0 +1,69 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-30 09:46+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Currently running version [[!version ]].)\"\n"
+"]]\n"
+msgstr ""
+"Ce wiki est propulsé par [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"      then \"(version actuelle : [[!version ]].)\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid "Some documentation on using ikiwiki:"
+msgstr "Voici quelques pages de documentation sur l'utilisation d'ikiwiki :"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/formatting]]"
+msgstr "[[ikiwiki/formatting]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/wikilink]]"
+msgstr "[[ikiwiki/wikilink]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/subpage]]"
+msgstr "[[ikiwiki/subpage]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/pagespec]]"
+msgstr "[[ikiwiki/pagespec]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/directive]]"
+msgstr "[[ikiwiki/directive]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/markdown]]"
+msgstr "[[ikiwiki/markdown]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/openid]]"
+msgstr "[[ikiwiki/openid]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/searching]]"
+msgstr "[[ikiwiki/searching]]"
diff --git a/po/underlays/basewiki/ikiwiki/directive.fr.po b/po/underlays/basewiki/ikiwiki/directive.fr.po
new file mode 100644
index 000000000..b4d7513c9
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/directive.fr.po
@@ -0,0 +1,132 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 11:25+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin "
+"with `!` and may contain parameters. The general form is:"
+msgstr ""
+"Les directives sont semblables aux [[ikiwiki/WikiLink]] mais elles "
+"commencent par un `!` et peuvent contenir des paramètres. La forme d'une "
+"directive est la suivante :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgstr "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This gets expanded before the rest of the page is processed, and can be used "
+"to transform the page in various ways."
+msgstr ""
+"Le contenu de cette directive est traité avant que la page ne soit traitée "
+"et cela peut être utilisé pour modifier cette page."
+
+#. type: Plain text
+msgid ""
+"The quotes around values can be omitted if the value is a simple word.  "
+"Also, some directives may use parameters without values, for example:"
+msgstr ""
+"Les guillements autour des valeurs des paramètres peuvent être omis si cette "
+"valeur est un simple mot. D'autre part, certaines directives peuvent avoir "
+"des paramètres sans valeur, par exemple : "
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!tag foo]]\n"
+msgstr "\t\\[[!tag foo]]\n"
+
+#. type: Plain text
+msgid ""
+"A directive does not need to all be on one line, it can be wrapped to "
+"multiple lines if you like:"
+msgstr ""
+"Il n'est pas nécessaire d'écrire une directive sur une seule ligne ; elle "
+"peut l'être sur plusieurs si vous préférez. Par exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+msgstr ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+
+#. type: Plain text
+msgid ""
+"Also, multiple lines of *quoted* text can be used for a value.  To allow "
+"quote marks inside the quoted text, delimit the block of text with triple-"
+"quotes:"
+msgstr ""
+"De plus, une *citation* sur plusieurs lignes peut servir de valeur. Pour "
+"autoriser les guillemets du texte, il suffit de mettre trois séries de "
+"guillemets autour du texte :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive text=\"\"\"\n"
+msgstr "\t\\[[!directive text=\"\"\"\n"
+
+#. type: Bullet: '	1. '
+msgid "\"foo\""
+msgstr "\"foo\""
+
+#. type: Bullet: '	2. '
+msgid "\"bar\""
+msgstr "\"bar\""
+
+#. type: Bullet: '	3. '
+msgid "\"baz\""
+msgstr "\"baz\""
+
+#. type: Plain text
+msgid ""
+"ikiwiki also has an older syntax for directives, which requires a space in "
+"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This "
+"syntax has several disadvantages: it requires a space after directives with "
+"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
+"[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed "
+"syntax shown above as default.  However, ikiwiki still supports wikis using "
+"the older syntax, if the `prefix_directives` option is disabled."
+msgstr ""
+"Il existe aussi une ancienne syntaxe pour les directives. Elle demande un "
+"espace dans la directive pour les distinguer des [[wikilinks|ikiwiki/"
+"wikilink]]. Cette syntaxe a plusieurs défauts : elle demande un espace après "
+"une directive sans paramètre, comme `\\[[pagecount ]]`, et elle interdit les "
+"espaces dans les [[wikilinks|ikiwiki/wikilink]]. Par défaut, ikiwiki utilise "
+"maintenant la syntaxe montrée plus haut, avec le `!`. Cependant, l'ancienne "
+"syntaxe est toujours acceptée, une fois que l'option `prefix_directives` est "
+"désactivée."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid "Here is a list of currently available directives in this wiki:"
+msgstr "Voici une liste des directives actuellement disponibles sur ce wiki :"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!listdirectives ]]\n"
+msgstr "[[!listdirectives ]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.fr.po b/po/underlays/basewiki/ikiwiki/formatting.fr.po
new file mode 100644
index 000000000..05231364e
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/formatting.fr.po
@@ -0,0 +1,291 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"PO-Revision-Date: 2009-08-26 21:18+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@fre.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
+msgstr "[[!meta title=\"Formater les pages\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Text on this wiki is, by default, written in a form very close to how you "
+"might write text for an email message. This style of text formatting is "
+"called [[MarkDown]], and it works like this:"
+msgstr ""
+"Sur ce wiki, la mise en forme du texte est semblable à celle utilisée dans "
+"les courriels. Ce style de formatage s'appelle [[MarkDown]]. Voici comment "
+"il fonctionne :"
+
+#. type: Plain text
+msgid "Leave blank lines between paragraphs."
+msgstr "Lignes vides entre les paragraphes."
+
+#. type: Plain text
+msgid ""
+"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
+"placing it in single or double asterisks."
+msgstr ""
+"Texte en *\\*italique\\** avec un astérisque ou texte en **\\*\\*gras\\*"
+"\\*** avec deux astérisques."
+
+#. type: Plain text
+msgid "To create a list, start each line with an asterisk:"
+msgstr "Une liste, chaque ligne commençant par un astérisque :"
+
+#. type: Bullet: '* '
+msgid "\"* this is my list\""
+msgstr "\"* ma liste\""
+
+#. type: Bullet: '* '
+msgid "\"* another item\""
+msgstr "\"* un autre élément\""
+
+#. type: Plain text
+msgid ""
+"To make a numbered list, start each line with a number (any number will do) "
+"followed by a period:"
+msgstr ""
+"Une liste numérotée, chaque ligne commençant par un chiffre (n'importe "
+"lequel), suivi d'un point :"
+
+#. type: Bullet: '1. '
+msgid "\"1. first line\""
+msgstr "\"1. première ligne\""
+
+#. type: Bullet: '2. '
+msgid "\"2. second line\""
+msgstr "\"2. deuxième ligne\""
+
+#. type: Bullet: '2. '
+msgid "\"2. third line\""
+msgstr "\"2. troisième ligne\""
+
+#. type: Plain text
+msgid ""
+"To create a header, start a line with one or more `#` characters followed by "
+"a space and the header text. The number of `#` characters controls the size "
+"of the header:"
+msgstr ""
+"Un titre, une ligne commençant par un ou plusieurs caractères `#` suivis "
+"d'un caractère espace et du texte du titre. Le nombre de `#` détermine la "
+"taille du titre :"
+
+#. type: Title #
+#, no-wrap
+msgid "# h1"
+msgstr "# h1"
+
+#. type: Title ##
+#, no-wrap
+msgid "## h2"
+msgstr "## h2"
+
+#. type: Title ###
+#, no-wrap
+msgid "### h3"
+msgstr "### h3"
+
+#. type: Title ####
+#, no-wrap
+msgid "#### h4"
+msgstr "#### h4"
+
+#. type: Title #####
+#, no-wrap
+msgid "##### h5"
+msgstr "##### h5"
+
+#. type: Title ######
+#, no-wrap
+msgid "###### h6"
+msgstr "###### h6"
+
+#. type: Plain text
+msgid ""
+"To create a horizontal rule, just write three or more dashes or stars on "
+"their own line:"
+msgstr ""
+"Une règle horizontale,  au moins trois tirets ou étoiles sur la même ligne :"
+
+#. type: Plain text
+#, no-wrap
+msgid "To quote someone, prefix the quote with \">\":\n"
+msgstr "Pour citer quelqu'un, faire précéder la citation de \">\" :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> To be or not to be,\n"
+"> that is the question.\n"
+msgstr ""
+"> To be or not to be,\n"
+"> that is the question.\n"
+
+#. type: Plain text
+msgid "To write a code block, indent each line with a tab or 4 spaces:"
+msgstr ""
+"Un morceau de code, faire précéder chaque ligne par une tabulation ou quatre "
+"espaces :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t10 PRINT \"Hello, world!\"\n"
+"\t20 GOTO 10\n"
+msgstr ""
+"\t10 PRINT \"Hello, world!\"\n"
+"\t20 GOTO 10\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"To link to an url or email address, you can just put the\n"
+"url in angle brackets: <<http://ikiwiki.info>>, or you can use the\n"
+"form \\[link text\\]\\(url\\)\n"
+msgstr ""
+"Pour créer un lien avec une URL ou une adresse électronique,\n"
+"mettre l'URL entre crochets, <<http://ikiwiki.info>>,\n"
+"ou utiliser la forme \\[texte du lien\\]\\(url\\)\n"
+
+#. type: Plain text
+msgid ""
+"In addition to basic html formatting using [[MarkDown]], this wiki lets you "
+"use the following additional features:"
+msgstr ""
+"En plus du formatage html élémentaire avec [[MarkDown]], ce wiki offre "
+"d'autres possibilités :"
+
+#. type: Bullet: '* '
+msgid ""
+"To link to another page on the wiki, place the page's name inside double "
+"square brackets. So you would use `\\[[WikiLink]]` to link to [[WikiLink]]."
+msgstr ""
+"Pour créer un lien vers une autre page du wiki, mettre le nom de la page "
+"entre deux paires de crochets. Ainsi, utilisez `\\[[WikiLink]]` pour un lien "
+"avec [[WikiLink]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Insert [[smileys]] and some other useful symbols. :-)"
+msgstr "Insérer des [[smileys]] et d'autres symboles très utiles :-)"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Use [[shortcuts]] to link to common resources."
+msgstr "Utiliser des [[shortcuts]] pour renvoyer à des ressources communes."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid ""
+"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
+"text."
+msgstr ""
+"Créer et utiliser des modèles ([[templates]]) pour répéter des morceaux de "
+"texte standard."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* Insert various [[directives|directive]] onto a page to perform useful\n"
+"  actions.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
+msgstr ""
+"Insérer diverses [[directives|directive]] sur une page pour modifier cette page.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  For example, you can:\n"
+msgstr "  Par exemple, vous pouvez :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Add a table of contents to a page:"
+msgstr "ajouter une table des matières sur une page :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc]]\n"
+msgstr "\t\\[[!toc]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Change the title of a page:"
+msgstr "changer le titre d'une page :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"full page title\"]]\n"
+msgstr "\t\\[[!meta title=\"titre complet de la page\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Create a blog by inlining a set of pages:"
+msgstr ""
+"créer un blog en enchaînant un ensemble de pages (directive « inline ») :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
+msgstr "\t\\[[!inline pages=\"blog/*\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Full list of [[directives|directive]] enabled for this wiki:\n"
+msgstr "  Voici la liste complète des directives activées sur ce wiki :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  [[!listdirectives ]]\n"
+msgstr "  [[!listdirectives ]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/markdown.fr.po b/po/underlays/basewiki/ikiwiki/markdown.fr.po
new file mode 100644
index 000000000..71dc70c64
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/markdown.fr.po
@@ -0,0 +1,49 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 09:31+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[Markdown](http://daringfireball.net/projects/markdown/)  is a minimal "
+"markup language that resembles plain text as used in email messages. It is "
+"the markup language used by this wiki by default."
+msgstr ""
+"[Markdown](http://daringfireball.net/projects/markdown/) est un langage de "
+"balisage élémentaire, comparable à celui utilisé dans la messagerie "
+"électronique. Il s'agit du langage de balisage utilisé par défaut dans ce "
+"wiki."
+
+#. type: Plain text
+msgid ""
+"For documentation about the markdown syntax, see [[formatting]] and "
+"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
+msgstr ""
+"Référez vous à [[formatting]] et [Syntaxe Markdown](http://daringfireball."
+"net/projects/markdown/syntax) pour la documentation sur la syntaxe du langage "
+"markdown."
+
+#. type: Plain text
+msgid ""
+"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part "
+"of the markdown syntax, and are the only bit of markup that this wiki "
+"handles internally."
+msgstr ""
+"Notez que les [[WikiLinks|WikiLink]] et les [[directives|directive]] ne font "
+"pas partie de la syntaxe du langage markdown. Il s'agit des seules balises "
+"qui sont traitées en interne par ce wiki."
diff --git a/po/underlays/basewiki/ikiwiki/openid.fr.po b/po/underlays/basewiki/ikiwiki/openid.fr.po
new file mode 100644
index 000000000..81d36e068
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/openid.fr.po
@@ -0,0 +1,118 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 09:52+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"OpenID\"]]\n"
+msgstr "[[!meta title=\"OpenID\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(openid)\"\n"
+"     then=\"This wiki has OpenID **enabled**.\"\n"
+"     else=\"This wiki has OpenID **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(openid)\"\n"
+"     then=\"OpenID est **activé** sur ce wiki.\"\n"
+"     else=\"OpenID est **desactivé** sur ce wiki.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[OpenID](http://openid.net) is a decentralized authentication mechanism that "
+"allows you to have one login that you can use on a growing number of "
+"websites."
+msgstr ""
+"[OpenID](http://openid.net) est un système d'authentification décentralisé "
+"qui permet d'avoir un identifiant unique, utilisable sur un nombre croissant "
+"de sites internet."
+
+#. type: Plain text
+msgid ""
+"To sign up for an OpenID, visit one of the following identity providers:"
+msgstr ""
+"Pour obtenir un identifiant OpenID, visitez l'un des fournisseurs d'identité "
+"suivants :"
+
+#. type: Bullet: '* '
+msgid "[MyOpenID](https://www.myopenid.com/)"
+msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[GetOpenID](https://getopenid.com/)"
+msgstr "[GetOpenID](https://getopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[Videntity](http://videntity.org/)"
+msgstr "[Videntity](http://videntity.org/)"
+
+#. type: Bullet: '* '
+msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#. type: Bullet: '* '
+msgid "[TrustBearer](https://openid.trustbearer.com/)"
+msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#. type: Bullet: '* '
+msgid ""
+"or any of the [many others out there](http://openiddirectory.com/openid-"
+"providers-c-1.html)"
+msgstr ""
+"ou n'importe lequel des [nombreux autres fournisseurs existants](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Your OpenID is the URL that you are given when you sign up.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgstr ""
+"Votre identifiant OpenID est l'URL qui vous est attribuée lorsque vous vous inscrivez.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"To sign in to this wiki using OpenID, just enter it in the OpenID field in "
+"the signin form. You do not need to give this wiki a password or go through "
+"any registration process when using OpenID."
+msgstr ""
+"Pour vous connecter à ce wiki en utilisant OpenID, entrez simplement votre "
+"identifiant dans le champ OpenID du formulaire de connexion. Vous n'avez pas "
+"besoin de donner un mot de passe pour ce wiki ou de passer par le processus "
+"d'enregistrement lorsque vous utilisez OpenID."
+
+#. type: Plain text
+msgid ""
+"It's also possible to make a page in the wiki usable as an OpenID url, by "
+"delegating it to an openid server. Here's an example of how to do that:"
+msgstr ""
+"Il est également possible de faire une page dans le wiki utilisable comme un "
+"identifiant OpenID (URL) en la déléguant à un serveur OpenID. Voici un "
+"exemple permettant de faire cela :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t       server=\"http://www.myopenid.com/server\"]]\n"
+msgstr ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t       server=\"http://www.myopenid.com/server\"]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.fr.po b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
new file mode 100644
index 000000000..aeec3b95e
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
@@ -0,0 +1,236 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the ikiwiki package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki 3.141\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-02 17:42+0200\n"
+"Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To select a set of pages, such as pages that are locked, pages whose commit "
+"emails you want subscribe to, or pages to combine into a blog, the wiki uses "
+"a PageSpec. This is an expression that matches a set of pages."
+msgstr ""
+"Le wiki utilise un concept de spécification de page « PageSpec » afin de "
+"choisir un ensemble de pages. Par exemple il est possible de choisir les "
+"pages verrouillées, les pages dont vous recevez par courriel les "
+"modifications ou des pages à regrouper pour faire blog. Une spécification "
+"correspond à un ensemble de pages."
+
+#. type: Plain text
+msgid ""
+"The simplest PageSpec is a simple list of pages. For example, this matches "
+"any of the three listed pages:"
+msgstr ""
+"La spécification la plus simple est la liste de pages. Par exemple, "
+"l'expression suivante correspond à l'une ou l'autre des trois pages listées :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tfoo or bar or baz\n"
+msgstr "\tfoo or bar or baz\n"
+
+#. type: Plain text
+msgid ""
+"More often you will want to match any pages that have a particular thing in "
+"their name. You can do this using a glob pattern. \"`*`\" stands for any "
+"part of a page name, and \"`?`\" for any single letter of a page name. So "
+"this matches all pages about music, and any [[SubPage]]s of the SandBox, but "
+"does not match the SandBox itself:"
+msgstr "La plupart du temps, vous voulez trouver les pages qui contiennent une expression particulière dans leur nom. Cela s'obtient en utilisant un motif (« glob pattern »). Le métacaractère « `*` » correspond à n'importe quelle partie du nom de la page et le métacaractère « `?` » à n'importe quelle lettre. Ainsi, l'expression suivante correspond à toutes les pages traitant de musique et à n'importe quelle sous-page [[SubPage]] de la *SandBox*, mais pas à la *SandBox* elle-même :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t*music* or SandBox/*\n"
+msgstr "\t*musique* or SandBox/*\n"
+
+#. type: Plain text
+msgid ""
+"You can also prefix an item with \"`!`\" to skip pages that match it. So to "
+"match all pages except for Discussion pages and the SandBox:"
+msgstr "Vous pouvez également préfixer un élément avec « `!` » pour ignorer les pages correspondantes. Ainsi pour trouver toutes les pages sauf les pages Discussion et la page *SandBox* :"
+
+#. type: Bullet: '	* '
+msgid "and !SandBox and !*/Discussion"
+msgstr "and !SandBox and !*/Discussion"
+
+#. type: Plain text
+msgid ""
+"Some more elaborate limits can be added to what matches using these "
+"functions:"
+msgstr ""
+"Des contraintes plus élaborées peuvent être ajoutées avec les fonctions "
+"suivantes :"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+msgstr "« `link(page)` » - correspond aux pages ayant un lien vers cette page (ou motif)"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
+"(or tags matched by a glob)"
+msgstr ""
+"« `tagged(tag)` » - correspond aux pages qui sont marquées ou qui sont liées "
+"à l'étiquette donnée (ou des étiquettes correspondant à un motif)."
+
+#. type: Bullet: '* '
+msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+msgstr ""
+"« `backlink(page)` » - correspond seulement aux pages qui sont pointées "
+"(lien) par la page donnée."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`creation_month(month)`\" - matches only pages created on the given month"
+msgstr "« `creation_month(mois)` » - correspond aux pages créées durant ce mois"
+
+#. type: Bullet: '* '
+msgid "\"`creation_day(mday)`\" - or day of the month"
+msgstr "« `creation_day(jour)` » - ou au jour de ce mois"
+
+#. type: Bullet: '* '
+msgid "\"`creation_year(year)`\" - or year"
+msgstr "« `creation_year(année)` » - ou année"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_after(page)`\" - matches only pages created after the given page "
+"was created"
+msgstr ""
+"« `created_after(page)` » - correspond aux pages créées après la page donnée"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_before(page)`\" - matches only pages created before the given "
+"page was created"
+msgstr "« `created_before(page) » - correspond aux pages créées avant la page donnée"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
+"the glob by itself is actually a shorthand for this function."
+msgstr ""
+"« `glob(motif)` » - correspond aux pages correspondantes au motif donné. "
+"N'écrire que le motif lui-même est un raccourci pour cette fonction."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+"that globs do not usually match."
+msgstr ""
+"« `internal(motif)` » - pareil à `glob()`, mais correspond en plus aux pages "
+"à usage interne que la fonction glob ne trouve pas en général."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
+"matching the specified glob."
+msgstr ""
+"« `title(motif)`, `author(motif)`, `authorurl(motif)`, `license(motif)`, "
+"`copyright(motif)` » - renvoient les pages qui possèdent les métadonnées "
+"correspondant au motif donné."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`user(username)`\" - tests whether a modification is being made by a user "
+"with the specified username. If openid is enabled, an openid can also be put "
+"here."
+msgstr ""
+"« `user(identifiant)` » - teste si une modification est faite par "
+"l'identifiant donné. Si openid est activé, on peut aussi l'utiliser."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`admin()`\" - tests whether a modification is being made by one of the "
+"wiki admins."
+msgstr ""
+"« `admin()` » - teste si une modification par un administrateur est en cours."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ip(address)`\" - tests whether a modification is being made from the "
+"specified IP address."
+msgstr ""
+"« `ip(adresse)` » - teste si une modification par l'IP donnée est en cours."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
+"page matching the specified glob"
+msgstr ""
+"« `postcomment(motif) » - ne correspond que si des commentaires sont postés "
+"vers une page correspondant au motif donné."
+
+#. type: Plain text
+msgid ""
+"For example, to match all pages in a blog that link to the page about music "
+"and were written in 2005:"
+msgstr ""
+"Par exemple, pour trouver toutes les pages d'un blog qui ont un lien vers la "
+"page traitant de musique et qui ont été créées en 2005 :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and link(music) and creation_year(2005)\n"
+msgstr "\tblog/* and link(musique) and creation_year(2005)\n"
+
+#. type: Plain text
+msgid ""
+"Note the use of \"and\" in the above example, that means that only pages "
+"that match each of the three expressions match the whole. Use \"and\" when "
+"you want to combine expression like that; \"or\" when it's enough for a page "
+"to match one expression. Note that it doesn't make sense to say \"index and "
+"SandBox\", since no page can match both expressions."
+msgstr ""
+"Veuillez noter l'utilisation du « and » dans l'exemple ci-dessus. Seules les "
+"pages dont les trois conditions sont vraies seront trouvées. Utilisez « and » "
+"pour ce genre d'expression combinée. « or » est utilisé quand une seule des "
+"trois conditions est suffisante. Veuillez noter que « index and SandBox » n'a "
+"pas de sens puisqu'aucune page ne peut correspondre aux deux expressions."
+
+#. type: Plain text
+msgid ""
+"More complex expressions can also be created, by using parentheses for "
+"grouping. For example, to match pages in a blog that are tagged with either "
+"of two tags, use:"
+msgstr ""
+"On peut créer des expressions plus complexes à l'aide de parenthèses. Par "
+"exemple, pour trouver les pages d'un blog possédantl'une ou l'autre "
+"étiquette, on utiliserait :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and (tagged(foo) or tagged(bar))\n"
+msgstr "\tblog/* and (tagged(foo) or tagged(bar))\n"
+
+#. type: Plain text
+msgid ""
+"Note that page names in PageSpecs are matched against the absolute filenames "
+"of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will "
+"not match a page named \"a/foo\" or \"a/b/foo\". To match relative to the "
+"directory of the page containing the pagespec, you can use \"./\". For "
+"example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
+msgstr ""
+"Veuillez noter que le nom d'une page dans une spécification de page "
+"correspond au nom absolu du fichier dans le wiki. Ainsi une expression "
+"« foo » utilisée sur une page « a/b » ne correspondra pas à une page nommée « a/"
+"foo » ni à une page « a/b/foo ». Pour une correspondance relative au "
+"répertoire de la page contenant la spécification, vous pouvez utiliser "
+"« ./ ». Par exemple, « ./foo » sur la page « a/b » correspondra à la page « a/"
+"foo »."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
new file mode 100644
index 000000000..10f942033
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
@@ -0,0 +1,114 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-26 14:46+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(attachment)\"\n"
+"     then=\"This wiki has attachments **enabled**.\"\n"
+"     else=\"This wiki has attachments **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(attachment)\"\n"
+"     then=\"Les pièces jointes sont autorisées sur ce wiki.\"\n"
+"     else=\"Les pièces jointes ne sont pas autorisées sur ce wiki.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If attachments are enabled, the wiki admin can control what types of "
+"attachments will be accepted, via the `allowed_attachments` configuration "
+"setting."
+msgstr ""
+"Quand les pièces jointes sont autorisées, l'administrateur du wiki peut "
+"contrôler le type des pièces acceptées, avec l'option de configuration "
+"`allowed_attachments`."
+
+#. type: Plain text
+msgid ""
+"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
+"files to be uploaded by joey into a specific directory, and check all "
+"attachments for viruses, something like this could be used:"
+msgstr ""
+"Par exemple, pour limiter tous les fichiers à 50 kilooctets mais permettre "
+"que des fichiers mp3 plus grands soient envoyés par joey dans un répertoire "
+"donné et pour vérifier que toutes les pièces jointes sont sans virus, on "
+"peut utiliser quelque chose comme ça :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+
+#. type: Plain text
+msgid ""
+"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
+"additional tests:"
+msgstr ""
+"La syntaxe normale de [[ikiwiki/PageSpec]] est appliquée avec les tests "
+"supplémentaires suivants :"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`maxsize(size)`\" - tests whether the attachment is no larger than the "
+"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", \"gb"
+"\" etc can be used to specify the units."
+msgstr ""
+"`maxsize(size)` - teste si la taille de la pièce n'est pas plus grande que "
+"la taille donnée. La taille est mesurée en octet mais on peut l'indiquer en "
+"« ko », « mo », « go » etc."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`minsize(size)`\" - tests whether the attachment is no smaller than the "
+"specified size."
+msgstr ""
+"`minsize(size)` -  teste si la taille de la pièce n'est pas plus petite que "
+"la taille donnée."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as "
+"a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other "
+"enabled page format)."
+msgstr ""
+"`ispage()` - teste si la pièce jointe sera traitée comme page de wiki par "
+"ikiwiki, c'est-à-dire si son extension est « .mdwn » ou un autre format "
+"accepté."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
+"  use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n"
+"  as attachments, use `ispage()`.\n"
+msgstr ""
+" Donc, si vous ne voulez pas que des pages de wiki puissent être envoyées en pièces jointes, utilisez  `!ispage()`\n"
+" et dans le cas contraire, `ispage()`.\n"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can "
+"include a glob in the type, for example `mimetype(image/*)`."
+msgstr ""
+"`mimetype(foo/bar)` - teste le type MIME de la pièce jointe. Vous pouvez "
+"inclure un motif dans le type, par exemple  `mimetype(image/*)`."
+
+#. type: Bullet: '* '
+msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
+msgstr "`virusfree()` - teste la pièce jointe avec un programme antivirus."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
new file mode 100644
index 000000000..a771f6ef7
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
@@ -0,0 +1,57 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-30 09:37+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(po)\"\n"
+"     then=\"This wiki has po support **enabled**.\"\n"
+"     else=\"This wiki has po support **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(po)\"\n"
+"     then=\"Ce wiki gère le mode po.\"\n"
+"     else=\"Ce wiki ne gère pas le mode po.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/"
+"PageSpec]] syntax is expanded with the following additional tests that can "
+"be used to improve user navigation in a multi-lingual wiki:"
+msgstr "Si le greffon [[!iki plugins/po desc=po]] est activé, la syntaxe normale de [[ikiwiki/PageSpec]] est développée avec les tests supplémentaires suivants qui peuvent améliorer la navigation d'un utilisateur de wiki plurilinguistique :"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`lang(LL)`\" - tests whether a page is written in the language specified "
+"as a ISO639-1 (two-letter) language code."
+msgstr ""
+"`lang(LL)` - teste si la page est écrite dans la langue indiquée par le code "
+"ISO639-1 (deux lettres)."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`currentlang()`\" - tests whether a page is written in the same language "
+"as the current page."
+msgstr ""
+"`currentlang()` - teste si une page est écrite dans la langue de la page "
+"donnée."
+
+#. type: Plain text
+msgid ""
+"Note that every non-po page is considered to be written in "
+"`po_master_language`, as specified in `ikiwiki.setup`."
+msgstr ""
+"Notez que chaque page qui n'est pas de type po est considérée comme une page "
+"écrite selon le `po_master_language`, tel que spécifié dans le fichier de "
+"configuration `ikiwiki.setup`."
diff --git a/po/underlays/basewiki/ikiwiki/searching.fr.po b/po/underlays/basewiki/ikiwiki/searching.fr.po
new file mode 100644
index 000000000..1fdee43dc
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/searching.fr.po
@@ -0,0 +1,87 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 10:10+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(search)\"\n"
+"then=\"This wiki has searching **enabled**.\"\n"
+"else=\"This wiki has searching **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(search)\"\n"
+"then=\"La fonction de recherche est **activée** sur ce wiki.\"\n"
+"else=\"La fonction de recherche est **désactivée** sur ce wiki.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If searching is enabled, you can enter search terms in the search field, as "
+"you'd expect. There are a few special things you can do to construct more "
+"powerful searches."
+msgstr ""
+"Si la fonction de recherche est activée, vous pouvez saisir des mots clefs "
+"dans le champ de recherche, comme vous pouvez vous y attendre. Il y a "
+"quelques petits trucs que vous pouvez utiliser pour obtenir des résultats "
+"plus précis."
+
+#. type: Bullet: '* '
+msgid "To match a phrase, enclose it in double quotes."
+msgstr "Pour rechercher précisément une phrase, mettez-la entre guillemets."
+
+#. type: Bullet: '* '
+msgid "`AND` can be used to search for documents containing two expressions."
+msgstr ""
+"`AND` peut être utilisé pour rechercher des documents contenant deux "
+"expressions."
+
+#. type: Bullet: '* '
+msgid ""
+"`OR` can be used to search for documents containing either one of two "
+"expressions."
+msgstr ""
+"`OR` peut être utilisé pour rechercher des documents contenant l'une des "
+"deux expressions."
+
+#. type: Bullet: '* '
+msgid ""
+"Parentheses can be used to build up complicated search expressions. For "
+"example, \"(foo AND bar) OR (me AND you)\""
+msgstr ""
+"Les parenthèses peuvent être utilisées pour construire des requêtes plus "
+"compliquées, comme par exemple \"(foo AND bar) OR (me AND you)\""
+
+#. type: Bullet: '* '
+msgid ""
+"Prefix a search term with \"-\" to avoid it from appearing in the results.  "
+"For example, \"-discussion\" will omit \"discussion\"."
+msgstr ""
+"Préfixez un mot clef avec \"-\" pour éviter que les pages contenant ce mot "
+"clef n'apparaissent dans les résultats. Par exemple, \"-discussion\" ne "
+"prendra pas en compte les pages contenant \"discussion\"."
+
+#. type: Bullet: '* '
+msgid "To search for a page with a given title, use \"title:foo\"."
+msgstr ""
+"Pour chercher une page dont le titre est connu, utilisez \"title:foo\"."
+
+#. type: Bullet: '* '
+msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"."
+msgstr ""
+"Pour rechercher les pages contenant un lien vers une page \"truc\", utilisez "
+"\"link:truc\"."
diff --git a/po/underlays/basewiki/ikiwiki/subpage.fr.po b/po/underlays/basewiki/ikiwiki/subpage.fr.po
new file mode 100644
index 000000000..cf0e56cd9
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage.fr.po
@@ -0,0 +1,51 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 10:31+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"ikiwiki supports placing pages in a directory hierarchy. For example, this "
+"page, [[SubPage]] has some related pages placed under it, like [[SubPage/"
+"LinkingRules]]. This is a useful way to add some order to your wiki rather "
+"than just having a great big directory full of pages."
+msgstr ""
+"ikiwiki permet de ranger les pages dans une arborescence de répertoires. Par "
+"exemple cette page, [[SubPage]], est liée à des pages placées "
+"hiérarchiquement sous elle, comme la page [[SubPage/LinkingRules]]. C'est "
+"une façon pratique d'ordonner le wiki au lieu d'avoir un seul gros "
+"répertoire plein de pages."
+
+#. type: Plain text
+msgid ""
+"To add a SubPage, just make a subdirectory and put pages in it. For example, "
+"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
+"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"nested as deeply as you'd like."
+msgstr ""
+"Pour ajouter une sous-page, faites simplement un sous-répertoire et mettez-y "
+"les pages. Par exemple, cette page est `subpage.mdwn` dans les sources de ce "
+"wiki et il y a également un sous-répertoire `subpage`, qui contient `subpage/"
+"linkingrules.mdwn`. Les sous-pages peuvent être emboîtées autant que vous le "
+"souhaitez."
+
+#. type: Plain text
+msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
+msgstr ""
+"Faire un lien depuis et vers une sous-page est expliqué dans "
+"[[LinkingRules]]."
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po
new file mode 100644
index 000000000..36f7ef96f
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po
@@ -0,0 +1,103 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 10:59+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To link to or from a [[SubPage]], you can normally use a regular "
+"[[WikiLink]] that does not contain the name of the parent directory of the "
+"[[SubPage]]. Ikiwiki descends the directory hierarchy looking for a page "
+"that matches your link."
+msgstr ""
+"Pour faire un lien depuis ou vers une sous-page ([[SubPage]]), vous pouvez "
+"normalement utiliser un [[WikiLink]] classique qui ne contient pas le nom du "
+"répertoire parent de la sous-page. Ikiwiki parcourt l'arborescence des "
+"répertoires pour trouver une page qui corresponde au lien."
+
+#. type: Plain text
+msgid ""
+"For example, if FooBar/SubPage links to \"OtherPage\", ikiwiki will first "
+"prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next to "
+"FooBar/OtherPage and finally to OtherPage in the root of the wiki."
+msgstr ""
+"Par exemple, si FooBar/SubPage est liée à \"OtherPage\", ikiwiki préfèrera "
+"d'abord chercher la page dans FooBar/SubPage/OtherPage si elle existe, "
+"ensuite dans FooBar/OtherPage et finalement dans OtherPage à la racine du "
+"wiki."
+
+#. type: Plain text
+msgid ""
+"Note that this means that if a link on FooBar/SomePage to \"OtherPage\" "
+"currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage "
+"is created, the link will _change_ to point to FooBar/OtherPage. On the "
+"other hand, a link from BazBar to \"OtherPage\" would be unchanged by this "
+"creation of a [[SubPage]] of FooBar."
+msgstr ""
+"Cela signifie que si un lien de FooBar/SomePage vers \"OtherPage\" pointe "
+"actuellement vers OtherPage à la racine du wiki, et que la page FooBar/"
+"OtherPage est créée, alors le lien _changera_ pour pointer vers la page "
+"FooBar/OtherPage. Cependant, un lien de BazBar vers \"OtherPage\" ne serait "
+"pas impacté par cette création d'une sous-page ([[SubPage]]) de FooBar."
+
+#. type: Plain text
+msgid ""
+"You can also specify a link that contains a directory name, like \"FooBar/"
+"OtherPage\" to more exactly specify what page to link to. This is the only "
+"way to link to an unrelated [[SubPage]]."
+msgstr ""
+"Vous pouvez également définir un lien qui contient le nom d'un répertoire, "
+"comme \"FooBar/OtherPage\" pour spécifier plus précisément vers quelle page "
+"il faut pointer. C'est le seul moyen de faire un lien vers une sous-page qui "
+"n'est pas apparentée."
+
+#. type: Plain text
+msgid ""
+"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", "
+"or from BazBar/SubPage to \"FooBar/SubPage\"."
+msgstr ""
+"Vous pouvez utiliser ceci pour, par exemple, faire un lien depuis BazBar "
+"vers \"FooBar/SubPage\", ou de BazBar/SubPage vers \"FooBar/SubPage\"."
+
+#. type: Plain text
+msgid ""
+"You can also use \"/\" at the start of a link, to specify exactly which page "
+"to link to, when there are multiple pages with similar names and the link "
+"goes to the wrong page by default. For example, linking from \"FooBar/SubPage"
+"\" to \"/OtherPage\" will link to the \"OtherPage\" in the root of the wiki, "
+"even if there is a \"FooBar/OtherPage\"."
+msgstr ""
+"Vous pouvez également utiliser \"/\" au début d'un lien pour indiquer "
+"précisément quelle page doit être pointée lorsqu'il y a plusieurs pages avec "
+"des noms identiques et que le lien ne pointe pas vers la bonne page par "
+"défaut. Par exemple, faire un lien depuis \"FooBar/SubPage\" vers \"/"
+"OtherPage\" pointera vers la page \"OtherPage\" à la racine du wiki même "
+"s'il existe une page \"FooBar/OtherPage\"."
+
+#. type: Plain text
+msgid ""
+"Also, if the wiki is configured with a userdir, you can link to pages within "
+"the userdir without specifying a path to them. This is to allow for easy "
+"linking to a user's page in the userdir, to sign a comment. These links are "
+"checked for last of all."
+msgstr ""
+"De plus, si le wiki est configuré avec un répertoire `userdir`, vous pouvez "
+"facilement faire des liens vers les pages dans `userdir` sans spécifier le "
+"chemin vers ces pages. Cela permet de facilement pointer vers la page d'un "
+"utilisateur dans `userdir` pour signer un commentaire. La correspondance des "
+"liens avec ces pages est testée en tout dernier lieu."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.fr.po b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
new file mode 100644
index 000000000..ac464fb18
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
@@ -0,0 +1,107 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-28 16:05+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"WikiLinks provide easy linking between pages of the wiki. To create a "
+"[[WikiLink]], just put the name of the page to link to in double brackets.  "
+"For example `\\[[WikiLink]]`."
+msgstr ""
+"Un WikiLink est un moyen simple de lier des pages entre elles. Pour créer un "
+"[[WikiLink]], il suffit de mettre le nom d'une page à lier entre double "
+"crochets. Par exemple, `\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"If you ever need to write something like `\\[[WikiLink]]` without creating a "
+"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
+msgstr ""
+"Si jamais vous avez besoin d'écrire quelque chose comme `\\[[WikiLink]]` "
+"sans créer de lien, il suffit de préfixer le mot par une barre oblique `\\`, "
+"comme `\\\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"There are some special [[SubPage/LinkingRules]] that come into play when "
+"linking between [[SubPages|SubPage]]."
+msgstr ""
+"Quelques règles spéciales, [[SubPage/LinkingRules]], entrent en jeu pour "
+"lier des sous-pages, [[SubPages|SubPage]]."
+
+#. type: Plain text
+msgid ""
+"Also, if the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il "
+"est affiché au fil du texte sur la page."
+
+#. type: Plain text
+msgid ""
+"WikiLinks are matched with page names in a case-insensitive manner, so you "
+"don't need to worry about getting the case the same, and can capitalise "
+"links at the start of a sentence, and so on."
+msgstr ""
+"La recherche de correspondance entre WikiLinks et noms de page ne tient pas "
+"compte de la casse des lettres. Inutile de s'embêter avec les majuscules et "
+"les minuscules et vous pouvez mettre une lettre capitale au lien qui se "
+"trouve en début de phrase, etc."
+
+#. type: Plain text
+msgid ""
+"It's also possible to write a WikiLink that uses something other than the "
+"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
+"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
+msgstr ""
+"Il est aussi possible d'écrire un WikiLink dont le texte n'est pas un nom de "
+"page. Ainsi, `\\[[foo_bar|SandBox]]` pointe vers la page SandBox, mais le "
+"lien apparaît comme ceci : [[foo_bar|SandBox]]."
+
+#. type: Plain text
+msgid ""
+"To link to an anchor inside a page, you can use something like `"
+"\\[[WikiLink#foo]]` ."
+msgstr ""
+"Pour pointer vers une ancre à l'intérieur d'une page, vous pouvez utiliser "
+"quelque chose comme `\\[[WikiLink#foo]]`."
+
+#. type: Title ##
+#, no-wrap
+msgid "Directives and WikiLinks"
+msgstr "Directives et WikiLinks"
+
+#. type: Plain text
+msgid ""
+"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+"used spaces to distinguish between directives and wikilinks; as a result, "
+"with that syntax in use, you cannot use spaces in WikiLinks, and must "
+"replace spaces with underscores.  The newer syntax, enabled with the "
+"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+"with `!`, and thus does not prevent links with spaces.  Future versions of "
+"ikiwiki will turn this option on by default."
+msgstr ""
+"Il existe deux syntaxes pour les [[directives|directive]]. L'ancienne "
+"syntaxe se sert d'espaces pour différencier les directives et les Wikilinks. "
+"Ainsi, avec cette syntaxe, vous ne pouvez pas utiliser d'espaces dans les "
+"WikiLinks et vous devez les remplacer par des tirets bas `_`. La nouvelle "
+"syntaxe, activée par l'option `prefix_directives` dans le fichier de "
+"configuration d'ikiwiki, préfixe les directives par un `!`, ce qui permet "
+"l'utilisation d'espaces dans les liens. Dans les futures versions d'ikiwiki, "
+"cette option sera activée par défaut."
diff --git a/po/underlays/basewiki/index.fr.po b/po/underlays/basewiki/index.fr.po
new file mode 100644
index 000000000..c63ce98cd
--- /dev/null
+++ b/po/underlays/basewiki/index.fr.po
@@ -0,0 +1,26 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-23 18:50+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid "Welcome to your new wiki."
+msgstr "Bienvenue sur votre nouveau wiki."
+
+#. type: Plain text
+msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
+msgstr "Comme tous les wikis, ce wiki possède une page [[SandBox]]."
+
+#. type: Plain text
+msgid "This wiki is powered by [[ikiwiki]]."
+msgstr "Ce wiki est propulsé par [[ikiwiki]]."
diff --git a/po/underlays/basewiki/recentchanges.fr.po b/po/underlays/basewiki/recentchanges.fr.po
new file mode 100644
index 000000000..8f12155bb
--- /dev/null
+++ b/po/underlays/basewiki/recentchanges.fr.po
@@ -0,0 +1,37 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-23 09:32+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"RecentChanges\"]]\n"
+msgstr "[[!meta title=\"RecentChanges\"]]\n"
+
+#. type: Plain text
+msgid "Recent changes to this wiki:"
+msgstr "Dernières modifications :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
+msgstr ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
diff --git a/po/underlays/basewiki/sandbox.fr.po b/po/underlays/basewiki/sandbox.fr.po
new file mode 100644
index 000000000..ab24b8c7a
--- /dev/null
+++ b/po/underlays/basewiki/sandbox.fr.po
@@ -0,0 +1,88 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-26 21:07+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: french <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"This is the SandBox, a page anyone can edit to learn how to use the wiki."
+msgstr "Voici le bac à sable, une page que tout le monde peut éditer pour apprendre à se servir du wiki."
+
+#. type: Plain text
+msgid "Here's a paragraph."
+msgstr "Voici un paragraphe."
+
+#. type: Plain text
+msgid "Here's another one with *emphasised* text."
+msgstr "Un autre avec du texte en *italique*."
+
+#. type: Title #
+#, no-wrap
+msgid "Header"
+msgstr "Titre"
+
+#. type: Title ##
+#, no-wrap
+msgid "Subheader"
+msgstr "Sous-titre"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> This is a blockquote.\n"
+">\n"
+"> This is the first level of quoting.\n"
+">\n"
+"> > This is nested blockquote.\n"
+">\n"
+"> Back to the first level.\n"
+msgstr ""
+"> Un bloc de citation.\n"
+">\n"
+"> Le premier niveau de citation.\n"
+">\n"
+"> > Une citation imbriquée.\n"
+">\n"
+"> Retour au premier niveau.\n"
+
+#. type: Plain text
+msgid "Numbered list"
+msgstr "Liste numérotée"
+
+#. type: Bullet: '1. '
+msgid "First item."
+msgstr "Premier élément."
+
+#. type: Bullet: '1. '
+msgid "Another."
+msgstr "Un autre."
+
+#. type: Bullet: '1. '
+msgid "And another.."
+msgstr "Encore un autre..."
+
+#. type: Plain text
+msgid "Bulleted list"
+msgstr "Liste avec point"
+
+#. type: Bullet: '* '
+msgid "*item*"
+msgstr "*élement*"
+
+#. type: Bullet: '* '
+msgid "item"
+msgstr "élement"
+
+#. type: Plain text
+msgid "[[ikiwiki/WikiLink]]"
+msgstr "[[ikiwiki/WikiLink]]"
diff --git a/po/underlays/basewiki/shortcuts.fr.po b/po/underlays/basewiki/shortcuts.fr.po
new file mode 100644
index 000000000..3849918e4
--- /dev/null
+++ b/po/underlays/basewiki/shortcuts.fr.po
@@ -0,0 +1,224 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"PO-Revision-Date: 2009-08-26 21:17+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(shortcut)\"\n"
+"     then=\"This wiki has shortcuts **enabled**.\"\n"
+"     else=\"This wiki has shortcuts **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(shortcut)\"\n"
+"     then=\"Les raccourcis sont **activés** dans ce wiki.\"\n"
+"     else=\"Les raccourcis sont **désactivés** dans ce wiki.\"]]\n"
+
+#. type: Plain text
+msgid "Some examples of using shortcuts include:"
+msgstr "Voici quelques exemples de raccourcis :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n"
+msgstr ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tConsultez la \\[[!cia ikiwiki desc=\"page du projet CIA pour %s\"]].\n"
+
+#. type: Plain text
+msgid "This page controls what shortcut links the wiki supports."
+msgstr "Cette page définit les raccourcis connus par ce wiki."
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgstr ""
+"[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+msgstr ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
+msgstr ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgstr ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
+msgstr ""
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+"  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+msgstr ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+" * Usage : `\\[[!debss package]]`, `\\[[!debss package#version]]`, ou `\\[[!debss package/version]]`. Consultez http://snapshot.debian.net pour d'autres précisions.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\\\"Linux bug #%s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
+"\"%s\" is replaced with the text passed to the named shortcut, after [[!"
+"wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded "
+"text. The optional `desc` parameter controls the description of the link."
+msgstr ""
+"Pour ajouter un raccourci, utilisez la [[ikiwiki/directive]] `shortcut`. "
+"Dans l'URL, \"%s\" est remplacé par le texte passé au raccourci, après "
+"l'avoir codé [[!\"wikipedia url_encoding]], et le \"%S\" est remplacé par le "
+"texte brut, non codé. La paramètre facultatif `desc` contrôle la description "
+"du lien."
+
+#. type: Plain text
+msgid ""
+"Remember that the `name` you give the shortcut will become a new [[ikiwiki/"
+"directive]].  Avoid using a `name` that conflicts with an existing "
+"directive.  These directives also accept a `desc` parameter that will "
+"override the one provided at definition time."
+msgstr ""
+"N'oubliez pas que le paramètre `name` donné au raccourci devient une "
+"nouvelle [[ikiwiki/directive]]. Évitez de donner un nom qui entre en conflit "
+"avec une directive existante. Ces directives acceptent aussi un paramètre "
+"`desc` qui primera celui fourni au moment de la définition du raccourci."
+
+#. type: Plain text
+msgid ""
+"If you come up with a shortcut that you think others might find useful, "
+"consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
+"ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include "
+"your shortcut in the standard underlay."
+msgstr ""
+"Si vous trouvez un raccourci qui vous paraît utile, proposez-le sur la [page "
+"des raccourcis du wiki d'ikiwiki](http://ikiwiki.info/shortcuts/). Ainsi les "
+"futures versions d'ikiwiki incluront automatiquement ce raccourci."
diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po
new file mode 100644
index 000000000..3321cc597
--- /dev/null
+++ b/po/underlays/basewiki/templates.fr.po
@@ -0,0 +1,241 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-23 21:20+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"This wiki has templates **enabled**.\"\n"
+"else=\"This wiki has templates **disabled**.\"\n"
+"]]\n"
+msgstr ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"Les modèles sont **activés** dans ce wiki.\"\n"
+"else=\"Les modèles sont **désactivés** dans ce wiki.\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid ""
+"Templates are files that can be filled out and inserted into pages in the "
+"wiki."
+msgstr ""
+"Les modèles sont des fichiers pouvant être remplis et insérés dans les pages "
+"du wiki."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"These templates are available for inclusion onto other pages in this wiki:"
+msgstr "Ces modèles peuvent être insérés dans d'autres pages de ce wiki :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+msgstr ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "Using a template"
+msgstr "Utiliser un modèle"
+
+#. type: Plain text
+msgid "Using a template works like this:"
+msgstr "Voici comment fonctionne un modèle :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer dans ma note.\"\"\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This fills out the [[note]] template, filling in the `text` field with the "
+"specified value, and inserts the result into the page."
+msgstr ""
+"Ceci remplit le modèle [[note]], remplaçant le champ `text` par la valeur "
+"spécifiée, et insérant le résultat dans la page."
+
+#. type: Plain text
+msgid ""
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
+msgstr ""
+"Généralement, une valeur peut inclure n'importe quelle balise qui serait "
+"autorisée dans les pages du wiki. Tripler les guillemets autour de la valeur "
+"permet même d'y inclure des guillemets. Ainsi, avec des valeurs sur "
+"plusieurs lignes, de larges morceaux de texte mis en forme peuvent être "
+"intégrés dans un modèle :"
+
+#. type: Plain text
+#, no-wrap
+msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+
+#. type: Bullet: '        * '
+msgid "\\[[Charley]]'s sister."
+msgstr "soeur de \\[[Charley]]."
+
+#. type: Bullet: '        * '
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr "\"Je veux devenir une astronaute lorsque je serai grande.\""
+
+#. type: Bullet: '        * '
+msgid "Really 8 and a half."
+msgstr "Réellement 8 ans et demi."
+
+#. type: Title ##
+#, no-wrap
+msgid "Creating a template"
+msgstr "Créer un modèle"
+
+#. type: Plain text
+msgid ""
+"To create a template, simply add a template directive to a page, and the "
+"page will provide a link that can be used to create the template. The "
+"template is a regular wiki page, located in the `templates/` subdirectory "
+"inside the source directory of the wiki."
+msgstr ""
+"Pour créer un modèle, ajoutez simplement une directive `template` à une "
+"page. La page fournira alors un lien qui peut être utilisé pour créer le "
+"modèle. Le modèle est une page de wiki régulière, enregistrée dans le sous-"
+"répertoire `templates/` du répertoire source du wiki."
+
+#. type: Plain text
+msgid ""
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
+msgstr ""
+"Le modèle utilise la syntaxe définie par le module perl [[!cpan HTML::"
+"Template]], qui permet de faire des choses plutôt complexes. Consultez sa "
+"documentation pour obtenir la syntaxe complète. Cependant, vous n'avez "
+"réellement besoin que de quelques informations :"
+
+#. type: Bullet: '* '
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr ""
+"Chaque paramètre que vous donnez à la directive `template` générera une "
+"variable dans le modèle. Il y a en plus quelques variables prédéfinies comme "
+"PAGE et BASENAME."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
+msgstr ""
+"Pour insérer la valeur d'une variable, utilisez `<TMPL_VAR variable>`. La "
+"syntaxe wiki dans la valeur sera d'abord transformée en html."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
+msgstr ""
+"Pour insérer la valeur brute d'une variable, sans que la syntaxe wiki soit "
+"convertie en html, utilisez `<TMPL_VAR raw_variable>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"NAME=\"variable\">text</TMPL_IF>`."
+msgstr ""
+"Pour écrire un bloc de texte si une variable est définie, utilisez `<TMPL_IF "
+"NAME=\"variable\">texte</TMPL_IF>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+"Pour utiliser un bloc de texte si une variable est définie et un autre dans "
+"le cas contraire, utilisez `<TMPL_IF NAME=\"variable\">texte<TMPL_ELSE>autre "
+"texte</TMPL_IF>`"
+
+#. type: Plain text
+msgid "Here's a sample template:"
+msgstr "Voici un exemple de modèle :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        <span class=\"infobox\">\n"
+"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Age: <TMPL_VAR age><br />\n"
+"        <TMPL_IF NAME=\"color\">\n"
+"        Favorite color: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF NAME=\"notes\">\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+msgstr ""
+"        <span class=\"infobox\">\n"
+"        Nom : \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Age : <TMPL_VAR age><br />\n"
+"        <TMPL_IF NAME=\"color\">\n"
+"        Couleur favorite : <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        Pas de couleur favorite.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF NAME=\"notes\">\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+
+#. type: Plain text
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
+msgstr ""
+"Le modèle rempli sera mis en forme comme le reste de la page qui le "
+"contient. Vous pouvez donc inclure des WikiLinks et toutes les autres formes "
+"de balises wiki dans les modèles. Notez cependant que de tels WikiLinks "
+"n'apparaîtront pas dans les BackLinks de la page qui utilise le modèle."
+
+#. type: Plain text
+msgid ""
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
+"ensures that if the name contains something that might be mistaken for wiki "
+"markup, it's not converted to html before being processed as a [[ikiwiki/"
+"WikiLink]]."
+msgstr ""
+"Notez l'utilisation de \"raw_name\" à l'intérieur du générateur de [[ikiwiki/"
+"WikiLink]]. Cela assure que si le nom contient quelque chose pouvant être "
+"confondu avec une balise wiki, alors il n'est pas converti en html avant "
+"d'être traité comme un [[ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates/note.fr.po b/po/underlays/basewiki/templates/note.fr.po
new file mode 100644
index 000000000..b02e62e3b
--- /dev/null
+++ b/po/underlays/basewiki/templates/note.fr.po
@@ -0,0 +1,40 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-24 00:18+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Use this template to insert a note into a page. The note will be styled to\n"
+"float to the right of other text on the page. This template has one\n"
+"parameter:\n"
+"<ul>\n"
+"<li>`text` - the text to display in the note\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
+msgstr ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Utilisez ce modèle pour insérer une note dans une page. La note sera placée à la droite du texte de la page. Ce modèle possède un paramètre :\n"
+"<ul>\n"
+"<li>`text` - le texte à afficher dans la note\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
diff --git a/po/underlays/basewiki/templates/popup.fr.po b/po/underlays/basewiki/templates/popup.fr.po
new file mode 100644
index 000000000..d2cd29118
--- /dev/null
+++ b/po/underlays/basewiki/templates/popup.fr.po
@@ -0,0 +1,46 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-24 10:27+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Use this template to create a popup window that is displayed when the mouse\n"
+"is over part of the page. This template has two parameters:\n"
+"<ul>\n"
+"<li>`mouseover` - This is the text or other content that triggers the\n"
+"popup.\n"
+"<li>`popup` - This should be the content of the popup window. It can be\n"
+"anything, even images or a whole little wiki page, but should not be too\n"
+"large for good usability.\n"
+"</ul>\n"
+"Note that browsers that do not support the CSS will display the popup\n"
+"inline in the page, inside square brackets.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
+msgstr ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Utilisez ce modèle pour créer un popup qui est affiché lorsque la souris est au dessus d'une partie de la page. Ce modèle possède deux paramètres :\n"
+"<ul>\n"
+"<li>`mouseover` - Ce paramètre indique le contenu (texte ou autre) qui déclenche le popup.\n"
+"<li>`popup` - Ce paramètre est le contenu du popup. Il peut être quelconque, aussi bien des images qu'une page de wiki complète, mais ne doit pas être trop grand pour une bonne utilisabilité.\n"
+"</ul>\n"
+"Notez que les navigateurs qui ne gèrent pas les feuilles de style CSS afficheront le popup au fil du texte dans la page, entre crochets.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
-- 
cgit v1.2.3


From 4026650c8751f29890692f10833dae2b200cfc78 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Sep 2009 15:10:13 -0400
Subject: add will's git repo

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 008f109df..16af30584 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -49,6 +49,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[chrysn]] `git://github.com/github076986099/ikiwiki.git`
 * [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git`
 * [[schmonz]] `git://github.com/schmonz/ikiwiki.git`
+* [[will]] `http://www.cse.unsw.edu.au/~willu/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 9f5cc7c9a2d41c1326a5e81657671c2f259d5922 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Sep 2009 15:36:56 -0400
Subject: remove two plugins that are unrelated to cvs

---
 IkiWiki/Plugin/rsync.pm    |  45 -----------
 IkiWiki/Plugin/unixauth.pm | 195 ---------------------------------------------
 2 files changed, 240 deletions(-)
 delete mode 100644 IkiWiki/Plugin/rsync.pm
 delete mode 100644 IkiWiki/Plugin/unixauth.pm

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
deleted file mode 100644
index 3f049457b..000000000
--- a/IkiWiki/Plugin/rsync.pm
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/perl
-package IkiWiki::Plugin::rsync;
-
-use warnings;
-use strict;
-use IkiWiki 3.00;
-
-sub import {
-	hook(type => "getsetup", id => "rsync", call => \&getsetup);
-	hook(type => "checkconfig", id => "rsync", call => \&checkconfig);
-	hook(type => "postrefresh", id => "rsync", call => \&postrefresh);
-}
-
-sub getsetup () {
-	return
-		plugin => {
-			safe => 0,
-			rebuild => 0,
-		},
-		rsync_command => {
-			type => "string",
-			example => "rsync -qa --delete /path/to/destdir/ user\@host:/path/to/docroot/",
-			description => "unattended command to upload regenerated pages",
-			safe => 0,
-			rebuild => 0,
-		},
-}
-
-sub checkconfig {
-	if (! exists $config{rsync_command} ||
-	    ! defined $config{rsync_command}) {
-		error("Must specify rsync_command");
-	}
-}
-
-sub postrefresh () {
-	system $config{rsync_command};
-	if ($? == -1) {
-		error("failed to execute rsync_command: $!");
-	} elsif ($? != 0) {
-		error(sprintf("rsync_command exited %d", $? >> 8));
-	}
-}
-
-1
diff --git a/IkiWiki/Plugin/unixauth.pm b/IkiWiki/Plugin/unixauth.pm
deleted file mode 100644
index 4f0cb4dd2..000000000
--- a/IkiWiki/Plugin/unixauth.pm
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/perl
-# Ikiwiki unixauth authentication.
-package IkiWiki::Plugin::unixauth;
-
-use warnings;
-use strict;
-use IkiWiki 2.00;
-
-sub import {
-	hook(type => "getsetup", id => "unixauth", call => \&getsetup);
-		hook(type => "formbuilder_setup", id => "unixauth",
-			call => \&formbuilder_setup);
-		hook(type => "formbuilder", id => "unixauth",
-			call => \&formbuilder);
-	hook(type => "sessioncgi", id => "unixauth", call => \&sessioncgi);
-}
-
-sub getsetup () {
-	return
-	unixauth_type => {
-			type => "string",
-			example => "checkpassword",
-			description => "type of authenticator; can be 'checkpassword' or 'pwauth'",
-			safe => 0,
-			rebuild => 1,
-	},
-	unixauth_command => {
-			type => "string",
-			example => "/path/to/checkpassword",
-			description => "full path and any arguments",
-			safe => 0,
-			rebuild => 1,
-	},
-	unixauth_requiressl => {
-			type => "boolean",
-			example => "1",
-			description => "require SSL? strongly recommended",
-			safe => 0,
-			rebuild => 1,
-	},
-	plugin => {
-			description => "Unix user authentication",
-			safe => 0,
-			rebuild => 1,
-	},
-}
-
-# Checks if a string matches a user's password, and returns true or false.
-sub checkpassword ($$;$) {
-	my $user=shift;
-	my $password=shift;
-	my $field=shift || "password";
-
-	# It's very important that the user not be allowed to log in with
-	# an empty password!
-	if (! length $password) {
-			return 0;
-	}
-
-	my $ret=0;
-	if (! exists $config{unixauth_type}) {
-			# admin needs to carefully think over his configuration
-			return 0;
-	}
-	elsif ($config{unixauth_type} eq "checkpassword") {
-			open UNIXAUTH, "|$config{unixauth_command} true 3<&0" or die("Could not run $config{unixauth_type}");
-			print UNIXAUTH "$user\0$password\0Y123456\0";
-			close UNIXAUTH;
-			$ret=!($?>>8);
-	}
-	elsif ($config{unixauth_type} eq "pwauth") {
-			open UNIXAUTH, "|$config{unixauth_command}" or die("Could not run $config{unixauth_type}");
-			print UNIXAUTH "$user\n$password\n";
-			close UNIXAUTH;
-			$ret=!($?>>8);
-	}
-	else {
-			# no such authentication type
-			return 0;
-	}
-
-	if ($ret) {
-		my $userinfo=IkiWiki::userinfo_retrieve();
-		if (! length $user || ! defined $userinfo ||
-			! exists $userinfo->{$user} || ! ref $userinfo->{$user}) {
-				IkiWiki::userinfo_setall($user, {
-					'email' => '',
-					'regdate' => time,
-				});
-		}
-	}
-
-	return $ret;
-}
-
-sub formbuilder_setup (@) {
-	my %params=@_;
-
-	my $form=$params{form};
-	my $session=$params{session};
-	my $cgi=$params{cgi};
-
-	# if not under SSL, die before even showing a login form,
-	# unless the admin explicitly says it's fine
-	if (! exists $config{unixauth_requiressl}) {
-			$config{unixauth_requiressl} = 1;
-	}
-	if ($config{unixauth_requiressl}) {
-		if ((! $config{sslcookie}) || (! exists $ENV{'HTTPS'})) {
-			die("SSL required to login. Contact your administrator.<br>");
-		}
-	}
-
-	if ($form->title eq "signin") {
-			$form->field(name => "name", required => 0);
-			$form->field(name => "password", type => "password", required => 0);
-
-			if ($form->submitted) {
-					my $submittype=$form->submitted;
-					# Set required fields based on how form was submitted.
-					my %required=(
-							"Login" => [qw(name password)],
-					);
-					foreach my $opt (@{$required{$submittype}}) {
-							$form->field(name => $opt, required => 1);
-					}
-
-					# Validate password against name for Login.
-					if ($submittype eq "Login") {
-							$form->field(
-									name => "password",
-									validate => sub {
-											checkpassword($form->field("name"), shift);
-									},
-							);
-					}
-
-					# XXX is this reachable? looks like no
-					elsif ($submittype eq "Login") {
-							$form->field(
-									name => "name",
-									validate => sub {
-											my $name=shift;
-											length $name &&
-											IkiWiki::userinfo_get($name, "regdate");
-									},
-							);
-					}
-			}
-			else {
-					# First time settings.
-					$form->field(name => "name");
-					if ($session->param("name")) {
-							$form->field(name => "name", value => $session->param("name"));
-					}
-			}
-	}
-	elsif ($form->title eq "preferences") {
-		$form->field(name => "name", disabled => 1,
-				value => $session->param("name"), force => 1,
-				fieldset => "login");
-		$form->field(name => "password", disabled => 1, type => "password",
-				fieldset => "login"),
-	}
-}
-
-sub formbuilder (@) {
-	my %params=@_;
-
-	my $form=$params{form};
-	my $session=$params{session};
-	my $cgi=$params{cgi};
-	my $buttons=$params{buttons};
-
-	if ($form->title eq "signin") {
-		if ($form->submitted && $form->validate) {
-			if ($form->submitted eq 'Login') {
-				$session->param("name", $form->field("name"));
-				IkiWiki::cgi_postsignin($cgi, $session);
-			}
-		}
-	}
-	elsif ($form->title eq "preferences") {
-		if ($form->submitted eq "Save Preferences" && $form->validate) {
-			my $user_name=$form->field('name');
-		}
-	}
-}
-
-sub sessioncgi ($$) {
-	my $q=shift;
-	my $session=shift;
-}
-
-1
-- 
cgit v1.2.3


From de7c3aa16ba46adbc3d26e4a5a06e1dcc321fa6c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Sep 2009 16:08:18 -0400
Subject: minor formatting

---
 IkiWiki/Plugin/cvs.pm | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 4735c0138..9f91c9335 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -61,7 +61,7 @@ sub getsetup () {
 		cvs_wrapper => {
 			type => "string",
 			example => "/cvs/wikirepo/CVSROOT/post-commit",
-			description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry",
+			description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry)",
 			safe => 0, # file
 			rebuild => 0,
 		},
@@ -131,7 +131,8 @@ sub cvs_shquote_commit ($) {
 		IPC::Cmd::run(command => $cmd, verbose => 0);
 	if ((grep /'$test_message'/, @$stdout_buf) > 0) {
 		return IkiWiki::possibly_foolish_untaint($message);
-	} else {
+	}
+	else {
 		return shell_quote(IkiWiki::possibly_foolish_untaint($message));
 	}
 }
@@ -242,11 +243,13 @@ sub rcs_add ($) {
 			if (defined($filemime) && $filemime eq 'text/plain') {
 				cvs_runcvs(['add', $file]) ||
 					warn("cvs add $file failed\n");
-			} else {
+			}
+			else {
 				cvs_runcvs(['add', '-kb', $file]) ||
 					warn("cvs add binary $file failed\n");
 			}
-		} else {
+		}
+		else {
 			# directory
 			cvs_runcvs(['add', $file]) ||
 				warn("cvs add $file failed\n");
@@ -360,7 +363,8 @@ sub rcs_recentchanges($) {
 		    $message[0]->{line}=~/$config{web_commit_regexp}/) {
 			$user=defined $2 ? "$2" : "$3";
 			$message[0]->{line}=$4;
-		} else {
+		}
+		else {
 			$committype="cvs";
 		}
 
@@ -370,21 +374,24 @@ sub rcs_recentchanges($) {
 		$line = <SPSVC>;
 		if ($line =~ /^Author: (.*)$/) {
 			$user = $1 unless defined $user && length $user;
-		} else {
+		}
+		else {
 			error "expected Author, got $line";
 		}
 
 		$line = <SPSVC>;
 		if ($line =~ /^Date: (.*)$/) {
 			$when = str2time($1, 'UTC');
-		} else {
+		}
+		else {
 			error "expected Date, got $line";
 		}
 
 		$line = <SPSVC>;
 		if ($line =~ /^PatchSet (.*)$/) {
 			$rev = $1;
-		} else {
+		}
+		else {
 			error "expected PatchSet, got $line";
 		}
 
@@ -422,7 +429,8 @@ sub rcs_diff ($) {
 
 	if (wantarray) {
 		return @cvsps;
-	} else {
+	}
+	else {
 		return join("", @cvsps);
 	}
 }
-- 
cgit v1.2.3


From 6fe3c6bb5f34dca6fc23ba910a9d9a583da9f4c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Sep 2009 16:10:57 -0400
Subject: ruther review

---
 doc/plugins/contrib/cvs/discussion.mdwn | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index e142452d0..b5f03ac6f 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -93,3 +93,32 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >>> if a configured post-commit hook is missing, and it seems fine,
 >>> probably also thanks to IPC::Cmd.
 >>> --[[schmonz]]
+
+----
+
+
+Further review.. --[[Joey]] 
+
+I don't understand what `cvs_shquote_commit` is
+trying to do with the test message, but it seems
+highly likely to be insecure; I never trust anything 
+that relies on safely quoting user input passed to the shell. 
+
+(As an aside, `shell_quote` can die on certian inputs.)
+
+Seems to me that, if `IPC::Cmd` exposes input to the shell
+(which I have not verified but its docs don't specify; a bad sign)
+you chose the wrong tool and ended up doing down the wrong
+route, dragging in shell quoting problems and fixes. Since you
+chose to use `IPC::Cmd`	just because you wanted to shut
+up CVS stderr, my suggestion would be to use plain `system`
+to run the command, with stderr temporarily sent to /dev/null:
+
+	open(my $savederr, ">&STDERR");
+	open(STDERR, ">", "/dev/null");
+	my $ret=system("cvs", "-Q", @_);
+	open(STDERR, ">$savederr");
+
+`cvs_runcvs` should not take an array reference. It's
+usual for this type of function to take a list of parameters
+to pass to the command.
-- 
cgit v1.2.3


From 4ded213254928f6190cfe43ce6bf4e1cb9093a8f Mon Sep 17 00:00:00 2001
From: "http://oscarjacho.myopenid.com/" <http://oscarjacho.myopenid.com/@web>
Date: Wed, 2 Sep 2009 17:17:15 -0400
Subject: Added idea on wiki based requirements management tool

---
 .../ikiwiki_as_a_requirements_management_tool.mdwn | 95 ++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn

diff --git a/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn b/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
new file mode 100644
index 000000000..083878aef
--- /dev/null
+++ b/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
@@ -0,0 +1,95 @@
+[[!template id=note text="**Table of contents** [[!toc ]]"]]
+
+Introduction
+------------
+At work textual requirements and traceability are daily use terms, often used as contracts with clients or among stakeholders, but at the moment the only way we specify requirements is via a word processor, and traceability is managed manually (ouch!) unless we use a commercial UML (Unified Modeling Language) tool that handles office files, an also allows traceability from design, code and test artifacts. But functionality of that tool is less than basic for requirements.
+
+We are considering the use of a specific requirements management tool, but the problem and something that gets me really frustrated is the extremely expensive price of the licenses of the "de facto" commercial tools we should use. One floating license for both tools (requirements management and modeling) can go beyond $20,000. Of course we can purchase cheaper ones, but I'm tired of this licensing nightmare of worrying about how many licenses are being used, praying not to exceed the limit or restarting a dead license server. We pay companies to not trust us. Taking a look at the FLOSS world doesn't seem to add any reasonable alternative.
+
+These are the raw high level features of the tool I'd like to use:
+
+ * Requirements edition
+ * Requirements attributes edition
+ * Traceability: edition, coverage analysis and navigation
+ * External traceability: from requirements in one document/module to requirements in other one (eg: software requirements tracing to system requirements). Note: a set of requirements will be called "module" hereafter in this page.
+ * Requirements identifiers management
+ * Requirements history and diff/blame
+ * Team work
+ * Easy integration with other software lifecycle tools: modeling (eg. BOUML), project management (eg. Trac)
+ * Support for other formats such as HTML, office...
+ * Filtering and searching
+ * Export facilities to create standards compliant documentation.
+
+Initial idea was to develop a simple web solution using XHTML files. These files would be created in a web broser with existing WYSIWIM editors and store all the stuff in Subversion. All requirements would be stored at the same level (no hierarchies among requirements of the same module) and atomically accessible via a simple web browser. No server side programming would be needed to read requirements. Also special XHTML files (let's call it "views") would be necessary to group requirements hierarchically in a requirements document fashion, using xinclude.
+
+When I first played with ikiwiki I was so happy that many of the ideas I worked on were already in use in this marvelous piece of software, specially the decision to use well-known RCS software to manage history instead of reinventing the wheel, opening also one interesting feature: off-line edition. Other similarity was the absence of special processing for read-only navigation.
+
+So, let's now take all the features above and describe how to make them real using ikiwiki and some simple conventions. Some features would need new functionality and improvement, I'd really appreciate additional ideas on how to better get to the point.
+
+Requirements edition
+--------------------
+Suppose that all requirements would reside under a concrete folder. We will call it "reqs", and under "reqs" we add as folders as requirements modules we want to use for a system called "foo" (eg. "foo_sss" for system requirements, "foo_srs" for software requirements...). Index file for each document shall be a page summarizing the module: number of requirements, basic coverage information... Other similar pages under the "views" folder could be used in order to have different sets of requirements including additional stuff: introduction, document identification, etc... The rest of the files - actually requirements - shall be markdown files. So editing a requirement would be as simple as adding a page to the wiki.
+
+To create the summary and views, just [[ikiwiki/directive/inline]] and [[ikiwiki/directive/pagecount]] directives could provide nice pages. The uncomfortable part is having to use many [[pagespecs|ikiwiki/PageSpec]] to create the whole views, but it actually shoud work. One possible workaround would be an external tool to handle this and create directives automatically or graphically.
+
+Requirements attributes
+-----------------------
+There are lots of useful data to associate to a requirement. Eg:
+
+ * If it is traceable or not
+ * Its criticality level
+ * Its priority
+ * If it is funtional or not
+ 
+How to implement this? Using [[ikiwiki/directive/meta]] could be a solution, not tried yet, I'd rather keep requirements content alone. Storing this information in SVN it is easy, although ikiwiki does not provide a way to do it it would imply really little effort. The requirement in itself is the content of the file; attributes are stored as key-value pairs in the file's properties. AFAIK this is a feature available only in SVN, although git has something similar (gitattributes) although path based, but anyway whichever RCS is used, a ".properties" file could be created always when a requirement file is created.
+
+Traceability: edition, coverage analysis and navigation
+--------------------------------------------------------
+This is the most important feature of a requirements engineering tool. How to do this with ikiwiki? There are some ways, from extremely simple ones to more sophisticated:
+
+ * One simple solution: Links. Just link from one requirement to another one to create a traceable directional connection
+ * One harder: file attributes (see section about requirements just above)
+
+For coverage analysis , using [/ikiwiki/directive/pagecount] is the perfect solution to summarize and show covered and uncovered requirements. We could add several pages per module - probably using template pages-  with ready made coverage analysis reports... Wow!!! [/ikiwiki/directive/linkmap] directive can show traceability information graphically.
+
+Navigating among requirements needs... Nothing!!! Just follow the links of referring pages that ikiwiki adds by default.
+
+External traceability
+---------------------
+Being just different folders under the wiki, external traceability is as easy as internal.
+
+Requirements identifiers management
+-----------------------------------
+Another useful convention: requirement identifier shall be the name of the requirements file. In ikiwiki page title is the same as requirement Id. No trouble, it works. I personally prefer to keep title as page title and create a short auto-increasing numeric codes with prefixes and/or suffixes as file name (eg. SRS_FOO_0001, SSS_FOO_002), hope to have somethig running soon.
+
+Requirements history and diff/blame
+-----------------------------------
+Out of the box! And really much more useful than average diffing components of requirement management tools. There are plenty online front ends to use and for offline work tools like meld are awesome.
+
+Team work
+---------
+Also no need to do anything, RCS software does it all. Also for experienced users merging and conflict solving can provide much more practical solutions (most requirements management tools work blocking).
+
+Easy integration with other software lifecycle tools
+----------------------------------------------------
+Modeling tools: as a general rule, store model elements in the most atomic parts: classes, enums, actors, use cases... and use again file attributes to store traceability information. Other way is transforming files representing these atomic model parts in independent mdwn files under, for example, a "mdl" folder
+
+Trac integration is so simple... As simple as any PM tool that acceses the same RCS as ikiwiki does. Diffing, blaming, even navigating directly to ikiwiki generated pages. Integration of a ticketing system will give awesome power to all the team.
+
+Support for other formats
+-------------------------
+Out of the box, at least for wiki and mathematical formats, and creating additional ones shouldn't be so difficult.
+
+Filtering and searching
+-----------------------
+Look that box in the top right corner?
+
+Export facilities
+-----------------
+Views with custom styles and html conversion tools would be enough for most purposes.
+
+That's all!
+
+One funny thing: our "de facto future" requirements management tool, after years of research included some years ago a really nice feature: a Discussion tag per each requirement... See this in ikiwiki? Again out of the box!!!
+
+Comments are really welcome!!!
-- 
cgit v1.2.3


From 086b90c313820b91596f07ed2a05671e321c6f98 Mon Sep 17 00:00:00 2001
From: "http://oscarjacho.myopenid.com/" <http://oscarjacho.myopenid.com/@web>
Date: Wed, 2 Sep 2009 17:23:02 -0400
Subject: Minor changes

---
 doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn b/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
index 083878aef..17be5b9b2 100644
--- a/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
+++ b/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
@@ -50,7 +50,7 @@ This is the most important feature of a requirements engineering tool. How to do
  * One simple solution: Links. Just link from one requirement to another one to create a traceable directional connection
  * One harder: file attributes (see section about requirements just above)
 
-For coverage analysis , using [/ikiwiki/directive/pagecount] is the perfect solution to summarize and show covered and uncovered requirements. We could add several pages per module - probably using template pages-  with ready made coverage analysis reports... Wow!!! [/ikiwiki/directive/linkmap] directive can show traceability information graphically.
+For coverage analysis , using [ikiwiki/directive/pagecount] is the perfect solution to summarize and show covered and uncovered requirements. We could add several pages per module - probably using template pages-  with ready made coverage analysis reports... Wow!!! [ikiwiki/directive/linkmap] directive can show traceability information graphically.
 
 Navigating among requirements needs... Nothing!!! Just follow the links of referring pages that ikiwiki adds by default.
 
-- 
cgit v1.2.3


From dd96853fe36102e512dea69d06514786cd9a96df Mon Sep 17 00:00:00 2001
From: "http://oscarjacho.myopenid.com/" <http://oscarjacho.myopenid.com/@web>
Date: Wed, 2 Sep 2009 17:24:47 -0400
Subject: Minor changes

---
 doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn b/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
index 17be5b9b2..6bef2619e 100644
--- a/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
+++ b/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
@@ -50,7 +50,7 @@ This is the most important feature of a requirements engineering tool. How to do
  * One simple solution: Links. Just link from one requirement to another one to create a traceable directional connection
  * One harder: file attributes (see section about requirements just above)
 
-For coverage analysis , using [ikiwiki/directive/pagecount] is the perfect solution to summarize and show covered and uncovered requirements. We could add several pages per module - probably using template pages-  with ready made coverage analysis reports... Wow!!! [ikiwiki/directive/linkmap] directive can show traceability information graphically.
+For coverage analysis , using [[ikiwiki/directive/pagecount]] is the perfect solution to summarize and show covered and uncovered requirements. We could add several pages per module - probably using template pages-  with ready made coverage analysis reports... Wow!!! [[ikiwiki/directive/linkmap]] directive can show traceability information graphically.
 
 Navigating among requirements needs... Nothing!!! Just follow the links of referring pages that ikiwiki adds by default.
 
-- 
cgit v1.2.3


From 70c9d175b56c3d7a878b8bd47eeaef5cec876c8b Mon Sep 17 00:00:00 2001
From: AlexandreDupas <AlexandreDupas@web>
Date: Thu, 3 Sep 2009 04:56:35 -0400
Subject: Using tags or links to represent attributes

---
 .../discussion.mdwn                                    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 doc/tips/ikiwiki_as_a_requirements_management_tool/discussion.mdwn

diff --git a/doc/tips/ikiwiki_as_a_requirements_management_tool/discussion.mdwn b/doc/tips/ikiwiki_as_a_requirements_management_tool/discussion.mdwn
new file mode 100644
index 000000000..94f0f8b4b
--- /dev/null
+++ b/doc/tips/ikiwiki_as_a_requirements_management_tool/discussion.mdwn
@@ -0,0 +1,18 @@
+How about using tags/links to associate attributes with requirements?
+This could be as simple as adding a link, fo e.g. :
+
+  * If it is traceable or not
+    + \[[attributes/traceable]]
+    + \[[attributes/untraceable]]
+  * Its criticality level
+    + \[[attributes/level/critical]]
+    + \[[attributes/level/important]]
+    + etc.
+  * Its priority
+    + \[[attributes/priority/low]]
+    + \[[attributes/priority/high]]
+  * If it is functional or not
+    + \[[attributes/functional]]
+    + \[[attributes/non-functional]]
+
+You just have to create pages for each attribute you want and then pagespec could be used to filter requirements by attributes. I think something similar is used to trac bug with ikiwiki (linking to a \[[done]] page, etc.).
-- 
cgit v1.2.3


From f582457ea04a6ce66a2c54ec0731e2569aa30d3f Mon Sep 17 00:00:00 2001
From: bremner <bremner@web>
Date: Thu, 3 Sep 2009 08:18:27 -0400
Subject:

---
 doc/plugins/contrib/mailbox/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/contrib/mailbox/discussion.mdwn b/doc/plugins/contrib/mailbox/discussion.mdwn
index 00fb0c05f..9520fdd70 100644
--- a/doc/plugins/contrib/mailbox/discussion.mdwn
+++ b/doc/plugins/contrib/mailbox/discussion.mdwn
@@ -3,3 +3,6 @@
 For some reason, `git fetch` from http://pivot.cs.unb.ca/git/ikimailbox.git/ didn't work very smoothly for me: it hung, and I had to restart it 3 times before the download was complete.
 
 I'm writing this just to let you know that there might be some problems with such connections to your http-server. --Ivan Z.
+> I can't replicate this (two months later!)
+> I can suggest trying the git:// url for download if you can.
+> Also, if you really want to get my attention, send me email   [[DavidBremner]]
-- 
cgit v1.2.3


From 11ed30b5a8cf21131456697b001e089208bb19ca Mon Sep 17 00:00:00 2001
From: "http://www.tychoish.com/" <http://www.tychoish.com/@web>
Date: Thu, 3 Sep 2009 22:00:29 -0400
Subject: notes on using gitosis and ikiwiki

---
 ...ki__44___gitosis_and_apache2_in_Debian_Sid.mdwn | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn b/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn
index fa8b5010e..b8e28e0a3 100644
--- a/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn
+++ b/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn
@@ -65,3 +65,32 @@ Could you please enlighten me. It should be possible seeing for example this sit
 Thanks in advance,
 
 --[[PaulePanter]]
+
+---
+
+## Current Working Notes
+
+I've spent a little time getting this working and I wanted to share my notes on this, for those that come after me. 
+
+### My Setup 
+
+- Debian Lenny
+
+- Gitosis (hand compiled, for no good reason, but it's the same version as in the repository) 
+
+- Ikiwiki 3.12 installed using packages from Sid
+
+### What Works
+
+- Everything needs to be chowned git:git (or gitosis:gitosis) by whatever gitosis runs with. This includes: 
+  - the bare repository (as always)
+  - the srcdir
+  - the destdir
+
+- Ikiwiki needs to run in gitosis' group (eg. git in my case, but probably gitosis in yours) 
+
+- ikiwiki.cgi needs be set with the wrapper mode 6755. 
+
+-- [[tychoish]]
+
+
-- 
cgit v1.2.3


From ffd2bd1eed1ab1ed88b898907b0dbbe8e4a70a67 Mon Sep 17 00:00:00 2001
From: "http://www.tychoish.com/" <http://www.tychoish.com/@web>
Date: Thu, 3 Sep 2009 22:46:06 -0400
Subject: about page update for tycho/sam

---
 doc/users/tychoish.mdwn | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/users/tychoish.mdwn b/doc/users/tychoish.mdwn
index 3439afdb3..75b285e4a 100644
--- a/doc/users/tychoish.mdwn
+++ b/doc/users/tychoish.mdwn
@@ -1,5 +1,10 @@
-I'm [tycho](http://www.tychoish.com/). 
+I'm Sam Kleinman ([tychoish](http://www.tychoish.com/)), and I use ikiwiki. 
 
-I use ikiwiki *a lot* on my local machine to organize thoughts, stage writing projects, and collect information. It's a great thing for me. Someday I'll probably get around to using it to powersome sort of collaborative fiction project. Someday. 
+I used to use ikiwiki a bunch, in a purely local setup, for various projects and personal note taking of various kinds. I've since switched to using [orgmode](http://www.orgmode.org) and a number of just regular old git repositories with some textfiles in them, which seems to work just as well for my particular use case. 
 
-Talk to you soon. 
+Currently, I'm using ikiwiki on the [cyborg institute wiki](http://www.cyborginstitute.com/wiki/) and I'm working on helping someone develop a collaborative fiction project at the [critical futures wiki](http://www.criticalfutures.com/wiki/)... and I'm thinking about other projects, but nothing that exists enough to mention here. 
+
+I hang out in #ikiwiki on oftc, and I'm working on getting some of my templates in order to share with you all. Soon. For sure. 
+
+Cheers,
+tychoish
-- 
cgit v1.2.3


From d5965f65af28174bf0b5659efe44053cb34a1fbb Mon Sep 17 00:00:00 2001
From: "http://hostmaster.blogspot.com/" <http://hostmaster.blogspot.com/@web>
Date: Fri, 4 Sep 2009 07:58:39 -0400
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 96b880b34..c6e851d39 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,6 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
+Тыц тыц 
 ----
 2009/7/13 Monday Blue...\\
 While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] Phpbb 與 Dokuwiki 之間的往來]] (External Link to //http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199// not working?), surf Internet for Wikis supporting //Creole V1.0//, found this site.
-- 
cgit v1.2.3


From 4c4c53c2923be93381eca1c3436ca6933c54b149 Mon Sep 17 00:00:00 2001
From: "http://ki.lya.online.fr/" <http://ki.lya.online.fr/@web>
Date: Fri, 4 Sep 2009 12:06:26 -0400
Subject:

---
 doc/examples/blog/posts/first__95__post.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/examples/blog/posts/first__95__post.mdwn

diff --git a/doc/examples/blog/posts/first__95__post.mdwn b/doc/examples/blog/posts/first__95__post.mdwn
new file mode 100644
index 000000000..b54cb8f92
--- /dev/null
+++ b/doc/examples/blog/posts/first__95__post.mdwn
@@ -0,0 +1 @@
+This is just a test
-- 
cgit v1.2.3


From 93bd5932ebe3b64bfed75666ba1db59bc9ad494e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 4 Sep 2009 12:42:59 -0400
Subject: Remove dup first post

This reverts commit 4c4c53c2923be93381eca1c3436ca6933c54b149.
---
 doc/examples/blog/posts/first__95__post.mdwn | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 doc/examples/blog/posts/first__95__post.mdwn

diff --git a/doc/examples/blog/posts/first__95__post.mdwn b/doc/examples/blog/posts/first__95__post.mdwn
deleted file mode 100644
index b54cb8f92..000000000
--- a/doc/examples/blog/posts/first__95__post.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-This is just a test
-- 
cgit v1.2.3


From 9de742bb0013d653c1efc3393bf13730e8f0b93d Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 4 Sep 2009 12:40:04 -0500
Subject: Stop using IPC::Cmd and String::ShellQuote, since quoting (and having
 to quote, and the possible use of the shell) sucks. Stop passing args to
 cvs_runcvs() as an arrayref, since that also sucks (and was a sop to
 IPC::Cmd). Instead, use Joey's construction for temporarily redirecting
 stderr to /dev/null. Much much simpler and better. Works on my laptop with
 bozohttpd, now to test on the NetBSD wiki.

---
 IkiWiki/Plugin/cvs.pm | 57 ++++++++++++++++-----------------------------------
 1 file changed, 18 insertions(+), 39 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 4735c0138..60f5372eb 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -100,40 +100,17 @@ sub cvs_info ($$) {
 }
 
 sub cvs_runcvs(@) {
-	my ($cmd) = @_;
-	unshift @$cmd, 'cvs', '-Q';
-
-	eval q{use IPC::Cmd};
-	error($@) if $@;
+	my @cmd = @_;
+	unshift @cmd, 'cvs', '-Q';
 
 	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
 
-	my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
-		IPC::Cmd::run(command => $cmd, verbose => 0);
-	if (! $success) {
-		warn(join(" ", @$cmd) . " exited with code $error_code\n");
-		warn(join "", @$stderr_buf);
-	}
-	return $success;
-}
-
-sub cvs_shquote_commit ($) {
-	my $message = shift;
-	my $test_message = "CVS autodiscover quoting CVS";
+	open(my $savederr, ">&STDERR");
+	open(STDERR, ">", "/dev/null");
+	my $ret = system(@cmd);
+	open(STDERR, ">$savederr");
 
-	eval q{use String::ShellQuote};
-	error($@) if $@;
-	eval q{use IPC::Cmd};
-	error($@) if $@;
-
-	my $cmd = ['echo', shell_quote($test_message)];
-	my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
-		IPC::Cmd::run(command => $cmd, verbose => 0);
-	if ((grep /'$test_message'/, @$stdout_buf) > 0) {
-		return IkiWiki::possibly_foolish_untaint($message);
-	} else {
-		return shell_quote(IkiWiki::possibly_foolish_untaint($message));
-	}
+	return ($ret == 0) ? 1 : 0;
 }
 
 sub cvs_is_controlling {
@@ -144,7 +121,7 @@ sub cvs_is_controlling {
 
 sub rcs_update () {
 	return unless cvs_is_controlling;
-	cvs_runcvs(['update', '-dP']);
+	cvs_runcvs('update', '-dP');
 }
 
 sub rcs_prepedit ($) {
@@ -188,13 +165,14 @@ sub rcs_commit ($$$;$$) {
 	if (defined $rev && defined $oldrev && $rev != $oldrev) {
 		# Merge their changes into the file that we've
 		# changed.
-		cvs_runcvs(['update', $file]) ||
+		cvs_runcvs('update', $file) ||
 			warn("cvs merge from $oldrev to $rev failed\n");
 	}
 
-	if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
+	if (! cvs_runcvs('commit', '-m',
+			 IkiWiki::possibly_foolish_untaint $message)) {
 		my $conflict=readfile("$config{srcdir}/$file");
-		cvs_runcvs(['update', '-C', $file]) ||
+		cvs_runcvs('update', '-C', $file) ||
 			warn("cvs revert failed\n");
 		return $conflict;
 	}
@@ -214,7 +192,8 @@ sub rcs_commit_staged ($$$) {
 		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
 	}
 
-	if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
+	if (! cvs_runcvs('commit', '-m',
+			 IkiWiki::possibly_foolish_untaint $message)) {
 		warn "cvs staged commit failed\n";
 		return 1; # failure
 	}
@@ -240,15 +219,15 @@ sub rcs_add ($) {
 			# file
 			my $filemime = File::MimeInfo::default($file);
 			if (defined($filemime) && $filemime eq 'text/plain') {
-				cvs_runcvs(['add', $file]) ||
+				cvs_runcvs('add', $file) ||
 					warn("cvs add $file failed\n");
 			} else {
-				cvs_runcvs(['add', '-kb', $file]) ||
+				cvs_runcvs('add', '-kb', $file) ||
 					warn("cvs add binary $file failed\n");
 			}
 		} else {
 			# directory
-			cvs_runcvs(['add', $file]) ||
+			cvs_runcvs('add', $file) ||
 				warn("cvs add $file failed\n");
 		}
 	}
@@ -260,7 +239,7 @@ sub rcs_remove ($) {
 
 	return unless cvs_is_controlling;
 
-	cvs_runcvs(['rm', '-f', $file]) ||
+	cvs_runcvs('rm', '-f', $file) ||
 		warn("cvs rm $file failed\n");
 }
 
-- 
cgit v1.2.3


From 21239db15685112254875f546e1a74e86051a933 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 4 Sep 2009 14:53:34 -0400
Subject: raking the sandbox cleaN

---
 doc/sandbox.mdwn                                   | 127 ---------------------
 doc/sandbox/Blagging_is_cool.mdwn                  |   6 -
 doc/sandbox/Bleep.mdwn                             |   3 -
 ...I_hate_making_new_blog_entries_-_sometimes.wiki |  25 ----
 ..._33____33____33__1__33__1__33____33__1five.html |  31 -----
 doc/sandbox/Test:_with_a_colon_in_its_name.mdwn    |   1 -
 doc/sandbox/Teximg.mdwn                            |   2 -
 doc/sandbox/Try_some_math_formulas.mdwn            |   6 -
 doc/sandbox/bar.mdwn                               |   1 -
 doc/sandbox/blech.mdwn                             |   1 -
 doc/sandbox/castle/discussion/jon_tests_too.mdwn   |   3 -
 doc/sandbox/castle/discussion/test_comment.mdwn    |   1 -
 doc/sandbox/check_openID.mdwn                      |   1 -
 doc/sandbox/discussion.mdwn                        |   6 -
 doc/sandbox/foo.mdwn                               |   1 -
 doc/sandbox/foobak.mdwn                            |   1 -
 doc/sandbox/hello.mdwn                             |   1 -
 .../ikiwiki_flexibility_makes_me_dream.mdwn        |   5 -
 .../discussion.mdwn                                |   1 -
 doc/sandbox/test.mdwn                              |   1 -
 doc/sandbox/test2.mdwn                             |   1 -
 doc/sandbox/test_nested_inlines.mdwn               |   3 -
 doc/sandbox/test_pi.mdwn                           |   1 -
 doc/sandbox/test_post.mdwn                         |   1 -
 doc/sandbox/testpage.mdwn                          |   1 -
 doc/sandbox/testsubpage.mdwn                       |   3 -
 doc/sandbox/this_is_pretty_cool.mdwn               |   1 -
 "doc/sandbox/\355\225\234\352\270\200.mdwn"        |   1 -
 ...0\200\355\216\230\354\235\264\354\247\200.mdwn" |   2 -
 29 files changed, 238 deletions(-)
 delete mode 100644 doc/sandbox/Blagging_is_cool.mdwn
 delete mode 100644 doc/sandbox/Bleep.mdwn
 delete mode 100644 doc/sandbox/I_hate_making_new_blog_entries_-_sometimes.wiki
 delete mode 100644 doc/sandbox/Omgwtf_a_blof_post__33____33____33____33____33__1__33__1__33__11111__33____33____33__1__33__1__33____33__1five.html
 delete mode 100644 doc/sandbox/Test:_with_a_colon_in_its_name.mdwn
 delete mode 100644 doc/sandbox/Teximg.mdwn
 delete mode 100644 doc/sandbox/Try_some_math_formulas.mdwn
 delete mode 100644 doc/sandbox/bar.mdwn
 delete mode 100644 doc/sandbox/blech.mdwn
 delete mode 100644 doc/sandbox/castle/discussion/jon_tests_too.mdwn
 delete mode 100644 doc/sandbox/castle/discussion/test_comment.mdwn
 delete mode 100644 doc/sandbox/check_openID.mdwn
 delete mode 100644 doc/sandbox/discussion.mdwn
 delete mode 100644 doc/sandbox/foo.mdwn
 delete mode 100644 doc/sandbox/foobak.mdwn
 delete mode 100644 doc/sandbox/hello.mdwn
 delete mode 100644 doc/sandbox/ikiwiki_flexibility_makes_me_dream.mdwn
 delete mode 100644 doc/sandbox/ikiwiki_flexibility_makes_me_dream/discussion.mdwn
 delete mode 100644 doc/sandbox/test.mdwn
 delete mode 100644 doc/sandbox/test2.mdwn
 delete mode 100644 doc/sandbox/test_nested_inlines.mdwn
 delete mode 100644 doc/sandbox/test_pi.mdwn
 delete mode 100644 doc/sandbox/test_post.mdwn
 delete mode 100644 doc/sandbox/testpage.mdwn
 delete mode 100644 doc/sandbox/testsubpage.mdwn
 delete mode 100644 doc/sandbox/this_is_pretty_cool.mdwn
 delete mode 100644 "doc/sandbox/\355\225\234\352\270\200.mdwn"
 delete mode 100644 "doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn"

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index c6e851d39..8b594043e 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,40 +1,7 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-Тыц тыц 
-----
-2009/7/13 Monday Blue...\\
-While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] Phpbb 與 Dokuwiki 之間的往來]] (External Link to //http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199// not working?), surf Internet for Wikis supporting //Creole V1.0//, found this site.
-
-* I thought that creole markup is used by ikiwiki...
-* Thought about using //SVN/CVS// server, however with different idea
-* Kinda curious why **Tcl** does not show her face in this Wiki arena
-* It looks like that I was wrong, from Wikipedia Creole page it mention that ikiwiki is also adopting Creole markup.
-
----
-
-Guten Morgen aus Deutschland. Wir mögen Umläuter (ich weiß, der Plural ist falsch, aber dafür hat er einen). Die sind heutzutage kein Ärgernis mehr.
-
-&amp;#x263a; becomes &#x263a; 
-
-<script>alert("If this pops, ikiwiki is not cross site scripting safe."); /* Fortunately, this does not work. */</script>
-
---- 
-I try to have a discussion page !!!
-----
-
-Testing OpenID some more..
-
-test more test
-[[中文显示]]
-
 Here's a paragraph.
 
-The following code block is pre-formatted:
-
-    Testing what
-    pre-formatted code blocks
-    look like.
-
 Here's another one with *emphasised* text.
 
 # Header
@@ -60,10 +27,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
-  3. baz
-   4. qux
-    5. quux
-     6. wibble
 
 Bulleted list
 
@@ -72,9 +35,6 @@ Bulleted list
 * item
 * one
   * two
-     * three
-       * four
-        * five
 
 ----
 
@@ -83,102 +43,15 @@ Bulleted list
 
 ----
 
-The haiku will change after every save, mind you.
-
 ## Different sorts of links:
 
 * [[Features]]
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
-* [Email](mailto:noone@invalid)
-* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
-* <a href="http://www.google.com/">plain old html link</a>
-* [[foo]]
 
 -----
 
 This SandBox is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-
---------
-
-This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
-
-But, of course, rsync is better.
-
-----
-
-Let's see what happens... ~~
-
-#中文标题一
-##中文标题二
-###中文标题三
-...
-######中文标题六
-
-###正文:
-
-君不见，黄河之水天上来，奔流到海不复回。
-
-君不见，高堂明镜悲白发，朝如青丝暮成雪。
-
-人生得意须尽欢，莫使金樽空对月。
-
-天生我材必有用，千金散尽还复来。
-
-###列表：
-
-* 天空
-
-   1. 蓝色的
-   2. 好高啊
-
-* 海洋
-
-   1. 有鱼
-       
-       * 鲸鱼
-       * 鲨鱼
-           
-
-* 大地
-
-###链接：
-
-[谷歌](http://www.google.com)
-
-###引用：
-
-> 一级引用
->
-> 一级引用
->
-> > 二级引用
->
->> 没有空格也可以
->>> 三级引用
->
-> 回到一级引用
-
-
-----
-
-
-testing
-
---
-[[!toc  levels=2]]
-
-[[Mamma Mia]]
-
-----
-
-[[!format  c """
-void main () {
-    printf("hello, world!");
-}
-"""]]
-
-
diff --git a/doc/sandbox/Blagging_is_cool.mdwn b/doc/sandbox/Blagging_is_cool.mdwn
deleted file mode 100644
index 16aafa304..000000000
--- a/doc/sandbox/Blagging_is_cool.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a testing Blag-Entry.
-/me loves blagging.
-
- * Entry one
- * entry two
-
diff --git a/doc/sandbox/Bleep.mdwn b/doc/sandbox/Bleep.mdwn
deleted file mode 100644
index 316f7291c..000000000
--- a/doc/sandbox/Bleep.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Just a test page ...
-
-... to see what happens.
diff --git a/doc/sandbox/I_hate_making_new_blog_entries_-_sometimes.wiki b/doc/sandbox/I_hate_making_new_blog_entries_-_sometimes.wiki
deleted file mode 100644
index 54914bb0b..000000000
--- a/doc/sandbox/I_hate_making_new_blog_entries_-_sometimes.wiki
+++ /dev/null
@@ -1,25 +0,0 @@
-!!!Heading Three
-
-Itemized
-* list 
-* of
-* things
-
-or not
-1. mom
-1. hi
-1. there
-
-
-
-!!!Heading Three
-
-Itemized
-* list 
-* of
-* things
-
-or not
-1. mom
-1. hi
-1. there
diff --git a/doc/sandbox/Omgwtf_a_blof_post__33____33____33____33____33__1__33__1__33__11111__33____33____33__1__33__1__33____33__1five.html b/doc/sandbox/Omgwtf_a_blof_post__33____33____33____33____33__1__33__1__33__11111__33____33____33__1__33__1__33____33__1five.html
deleted file mode 100644
index fc1757d6e..000000000
--- a/doc/sandbox/Omgwtf_a_blof_post__33____33____33____33____33__1__33__1__33__11111__33____33____33__1__33__1__33____33__1five.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-  <mrow>
-    <msup>
-      <mfenced open="(" close=")">
-        <mrow>
-          <mi>a</mi>
-          <mo>+</mo>
-
-          <mi>b</mi>
-        </mrow>
-      </mfenced>
-      <mn>2</mn>
-    </msup>
-    <mo>-</mo>
-    <msub>
-
-      <mfenced open="{" close="}">
-        <mrow>
-          <mi>x</mi>
-          <mo>+</mo>
-          <mi>y</mi>
-        </mrow>
-      </mfenced>
-
-      <mi>i</mi>
-    </msub>
-  </mrow>
-</math>
-<br>
-test <b>test</b><abbr title="test">T.</abbr> <h1>test</h1>
-<a href="https://bugzilla.mozilla.org">øđ</a>
diff --git a/doc/sandbox/Test:_with_a_colon_in_its_name.mdwn b/doc/sandbox/Test:_with_a_colon_in_its_name.mdwn
deleted file mode 100644
index b91d7cb03..000000000
--- a/doc/sandbox/Test:_with_a_colon_in_its_name.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-what happens?
diff --git a/doc/sandbox/Teximg.mdwn b/doc/sandbox/Teximg.mdwn
deleted file mode 100644
index 8483c1489..000000000
--- a/doc/sandbox/Teximg.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-[[!teximg code="E = - \frac{Z^2 \cdot  \mu \cdot e^4}{32\pi^2 \epsilon_0^2 \hbar^2 n^2}" ]]
-
diff --git a/doc/sandbox/Try_some_math_formulas.mdwn b/doc/sandbox/Try_some_math_formulas.mdwn
deleted file mode 100644
index 6c0fe6de5..000000000
--- a/doc/sandbox/Try_some_math_formulas.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-# Title with $\TeX$
-
-* How about some math?
-* $\frac{1}{2} = \frac{3}{6}$
-
-and teximg? [[!teximg  code="\frac{1}{2}"]]
diff --git a/doc/sandbox/bar.mdwn b/doc/sandbox/bar.mdwn
deleted file mode 100644
index 3163ac12e..000000000
--- a/doc/sandbox/bar.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-foo?
diff --git a/doc/sandbox/blech.mdwn b/doc/sandbox/blech.mdwn
deleted file mode 100644
index 1ec2727fd..000000000
--- a/doc/sandbox/blech.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-This just a test, but I am impressed.
diff --git a/doc/sandbox/castle/discussion/jon_tests_too.mdwn b/doc/sandbox/castle/discussion/jon_tests_too.mdwn
deleted file mode 100644
index bc051b008..000000000
--- a/doc/sandbox/castle/discussion/jon_tests_too.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-I recall testing this too, but I'm not sure where the test went. Let's try again. -- [[users/Jon]]
-
-Context: [[todo/discussion_page_as_blog/discussion/castle]]
diff --git a/doc/sandbox/castle/discussion/test_comment.mdwn b/doc/sandbox/castle/discussion/test_comment.mdwn
deleted file mode 100644
index 4dd2cb0bf..000000000
--- a/doc/sandbox/castle/discussion/test_comment.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-I like this idea of using the blog feature to handle comments. Let's see how it works.
diff --git a/doc/sandbox/check_openID.mdwn b/doc/sandbox/check_openID.mdwn
deleted file mode 100644
index 15363c985..000000000
--- a/doc/sandbox/check_openID.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-wibble
diff --git a/doc/sandbox/discussion.mdwn b/doc/sandbox/discussion.mdwn
deleted file mode 100644
index d8c565617..000000000
--- a/doc/sandbox/discussion.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-normally a sandbow doesn't have a discussion page 
-but it's a sandbox 
-
-- 
-little light 
-ikiwiki looks great 
diff --git a/doc/sandbox/foo.mdwn b/doc/sandbox/foo.mdwn
deleted file mode 100644
index e3ec71332..000000000
--- a/doc/sandbox/foo.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-a test blog in the ikiwiki sandbox!
diff --git a/doc/sandbox/foobak.mdwn b/doc/sandbox/foobak.mdwn
deleted file mode 100644
index c0b526f73..000000000
--- a/doc/sandbox/foobak.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Foobaka bakfoo.
diff --git a/doc/sandbox/hello.mdwn b/doc/sandbox/hello.mdwn
deleted file mode 100644
index a0e2270db..000000000
--- a/doc/sandbox/hello.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-hehe hohoho
diff --git a/doc/sandbox/ikiwiki_flexibility_makes_me_dream.mdwn b/doc/sandbox/ikiwiki_flexibility_makes_me_dream.mdwn
deleted file mode 100644
index 63642c71c..000000000
--- a/doc/sandbox/ikiwiki_flexibility_makes_me_dream.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-##Why?
-* Because I can do things like this
-* Because I can use my favourite SCM, as the rest of my project elements (that's the only reason I complain about Trac...)
-* Because the perfect tool does not exist, but custommizing very simple approaches like this I can build my own
-* Because I'm just adding a new topic to see how diff works
diff --git a/doc/sandbox/ikiwiki_flexibility_makes_me_dream/discussion.mdwn b/doc/sandbox/ikiwiki_flexibility_makes_me_dream/discussion.mdwn
deleted file mode 100644
index 8b604cb9f..000000000
--- a/doc/sandbox/ikiwiki_flexibility_makes_me_dream/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Perhaps
diff --git a/doc/sandbox/test.mdwn b/doc/sandbox/test.mdwn
deleted file mode 100644
index db20a2fbc..000000000
--- a/doc/sandbox/test.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-testing my openid provider @ www.steve.org.uk
diff --git a/doc/sandbox/test2.mdwn b/doc/sandbox/test2.mdwn
deleted file mode 100644
index 3e50e68f3..000000000
--- a/doc/sandbox/test2.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-this is test two, being pushed by [[tips/untrusted_git_push]].
diff --git a/doc/sandbox/test_nested_inlines.mdwn b/doc/sandbox/test_nested_inlines.mdwn
deleted file mode 100644
index 0e6074fbd..000000000
--- a/doc/sandbox/test_nested_inlines.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Testing nested inlines:
-
-[[!inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]]
diff --git a/doc/sandbox/test_pi.mdwn b/doc/sandbox/test_pi.mdwn
deleted file mode 100644
index 32b0e7f4c..000000000
--- a/doc/sandbox/test_pi.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-I tried to make a page called **testπ** and it didn't work. So this is a page called **test pi**.
diff --git a/doc/sandbox/test_post.mdwn b/doc/sandbox/test_post.mdwn
deleted file mode 100644
index b687aa253..000000000
--- a/doc/sandbox/test_post.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-hi mom!
\ No newline at end of file
diff --git a/doc/sandbox/testpage.mdwn b/doc/sandbox/testpage.mdwn
deleted file mode 100644
index b9439ad02..000000000
--- a/doc/sandbox/testpage.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Test page content.
diff --git a/doc/sandbox/testsubpage.mdwn b/doc/sandbox/testsubpage.mdwn
deleted file mode 100644
index 3db7aaaab..000000000
--- a/doc/sandbox/testsubpage.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test subpage
-
-This is a test subpage. Isn't that special?
diff --git a/doc/sandbox/this_is_pretty_cool.mdwn b/doc/sandbox/this_is_pretty_cool.mdwn
deleted file mode 100644
index 32b01f70f..000000000
--- a/doc/sandbox/this_is_pretty_cool.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-I am very impressed.
\ No newline at end of file
diff --git "a/doc/sandbox/\355\225\234\352\270\200.mdwn" "b/doc/sandbox/\355\225\234\352\270\200.mdwn"
deleted file mode 100644
index e0ba32639..000000000
--- "a/doc/sandbox/\355\225\234\352\270\200.mdwn"
+++ /dev/null
@@ -1 +0,0 @@
-~를 어떻게 할까~
diff --git "a/doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn" "b/doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn"
deleted file mode 100644
index 4fac7976c..000000000
--- "a/doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn"
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Wow test
-- 
cgit v1.2.3


From d79cf3728d9984e92e2bffd147d280a697b46fe6 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 4 Sep 2009 14:56:55 -0500
Subject: It's STDOUT we have to shut up for cvs, and $savedout has to be
 restored just so.

---
 IkiWiki/Plugin/cvs.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 60f5372eb..8409bebed 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -105,10 +105,10 @@ sub cvs_runcvs(@) {
 
 	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
 
-	open(my $savederr, ">&STDERR");
-	open(STDERR, ">", "/dev/null");
+	open(my $savedout, ">&STDOUT");
+	open(STDOUT, ">", "/dev/null");
 	my $ret = system(@cmd);
-	open(STDERR, ">$savederr");
+	open(STDOUT, ">&", $savedout);
 
 	return ($ret == 0) ? 1 : 0;
 }
-- 
cgit v1.2.3


From 127ed4d6c7a7d2cc518102757b7b4be49d20fce8 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 4 Sep 2009 15:08:48 -0500
Subject: no more IPC::Cmd or String::ShellQuote, huzzah

---
 doc/plugins/contrib/cvs.mdwn            | 4 ++--
 doc/plugins/contrib/cvs/discussion.mdwn | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index 1c43fb272..fcf5b936f 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -5,8 +5,8 @@
 This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]].
 
 ### Usage
-7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan IPC::Cmd]],
-[[!cpan String::ShellQuote]], [[!cpan File::ReadBackwards]], and
+7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan
+File::ReadBackwards]], and
 [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
 7. Adjust CVS-related parameters in your setup file.
 
diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index b5f03ac6f..1f0ce0102 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -122,3 +122,6 @@ to run the command, with stderr temporarily sent to /dev/null:
 `cvs_runcvs` should not take an array reference. It's
 usual for this type of function to take a list of parameters
 to pass to the command.
+
+> Thanks for reading carefully. I've tested your suggestions and
+> applied them on my branch. --[[schmonz]]
-- 
cgit v1.2.3


From a149d54fbf110000b3980bba87cac0e86dd03e07 Mon Sep 17 00:00:00 2001
From: "http://eric.shared.dre.am/" <http://eric.shared.dre.am/@web>
Date: Fri, 4 Sep 2009 19:17:14 -0400
Subject:

---
 ...e_link_target_search_all_paths_as_fallback.mdwn | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 doc/todo/make_link_target_search_all_paths_as_fallback.mdwn

diff --git a/doc/todo/make_link_target_search_all_paths_as_fallback.mdwn b/doc/todo/make_link_target_search_all_paths_as_fallback.mdwn
new file mode 100644
index 000000000..f971fd8e0
--- /dev/null
+++ b/doc/todo/make_link_target_search_all_paths_as_fallback.mdwn
@@ -0,0 +1,27 @@
+[[!tag wishlist]]
+
+## Idea
+
+After searching from the most local to the root for a wikilinkable page, descend into the tree of pages looking for a matching page. 
+
+For example, if I link to \[\[Pastrami\]\] from /users/eric, the current behavior is to look for 
+
+ * /users/eric/pastrami
+ * /users/pastrami
+ * /users/eric/pastrami
+
+I'd like it to find /sandwiches/pastrami. 
+
+## Issues
+
+I know this is a tougher problem, especially to scale efficiently. There is also not a clear ordering unless it is the recursive dictionary ordering (ie the order of a breadth-first search with natural ordering). It would probably require some sort of static lookup table keyed by pagename and yielding a path. This could be generated initially by a breadth-first search and then updated incrementally when pages are added/removed/renamed. In some ways a global might not be ideal, since one might argue that the link above should match /users/eric/sandwiches/pastrami before /sandwiches/pastrami. I guess you could put all matching paths in the lookup table and then evaluate the ordering at parse-time.
+
+## Motivation
+
+Since I often access my documents using a text editor, I find it useful to keep them ordered in a heirarchy, about 3 levels deep with a branching factor of perhaps 10. When linking though, I'd like the wiki to find the document for me, since I am lazy. 
+
+Also, many of my wiki pages comprise the canonical local representation of some unique entity, for example I might have /software/ikiwiki. The nesting, however, is only to aid navigation, and shouldn't be considered as part of resource's name.
+
+## Alternatives
+
+If an alias could be specified in the page body (for example, /ikiwiki for /software/ikiwiki) which would then stand in for a regular page when searching, then the navigational convenience of folders could be preserved while selectively flattening the search namespace.
-- 
cgit v1.2.3


From 507d8ace625317072bfed7925b516fe3c573a568 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 6 Sep 2009 13:26:42 -0400
Subject: thoughts on translating the templates files

---
 doc/todo/l10n.mdwn | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/doc/todo/l10n.mdwn b/doc/todo/l10n.mdwn
index fed3f63b6..a539f0424 100644
--- a/doc/todo/l10n.mdwn
+++ b/doc/todo/l10n.mdwn
@@ -14,6 +14,8 @@ and there is a po/ikiwiki.pot in the source that can be translated.
 
 ----
 
+## template i18n
+
 From [[Recai]]:
 > Here is my initial work on ikiwiki l10n infrastructure (I'm sending it
 > before finalizing, there may be errors).
@@ -64,9 +66,19 @@ Birisi[1], ki muhtemelen bu sizsiniz, <TMPL_VAR WIKINAME>[2] üzerindeki
 bulundu. Parola: <TMPL_VAR USER_PASSWORD> -- ikiwiki [1] Parolayı isteyen
 kullanıcının ait IP adresi: <TMPL_VAR REMOTE_ADDR>[2] <TMPL_VAR WIKIURL>
 
-> Looks like, tmpl_process3 cannot preserve line breaks in template files.
-> For example, it processed the following template:
-
 This could be easily worked around in tmpl_process3, but I wouldn't like to
 maintain a separate utility.
 
+----
+
+Another way to approach this would be to write a small program that outputs
+the current set of templates. Now i18n of that program is trivial,
+and it can be run once per language to generate localized templates.
+
+Then it's just a matter of installing the templates somewhere, and having
+them be used when a different language is enabled.
+
+It would make sense to make the existing `locale` setting control which
+templates are used. But the [[plugins/po]] plugin would probably want to do
+something more, and use the actual language the page is written in.
+--[[Joey]] 
-- 
cgit v1.2.3


From 8691bc006e16f17450423ef793f1e1a2626e2fe8 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Mon, 7 Sep 2009 05:53:50 -0400
Subject: Can't markup [[!table Error: ]]

---
 doc/plugins/table.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index 7b080acda..eb19323e6 100644
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -6,3 +6,5 @@ It can build HTML tables from data in CSV (comma-separated values)
 or DSV (delimiter-separated values) format.
 
 It needs the perl module [[!cpan Text::CSV]] for the CSV data.
+
+If you see `[[!table\ Error: ]]` you probably need to `sudo apt-get install libtext-csv-perl`.
-- 
cgit v1.2.3


From e95386504500492b55b9e00937f896334b13e240 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Mon, 7 Sep 2009 12:51:56 -0400
Subject: revert previous; with pkgsrc you'd need textproc/p5-Text-CSV, but
 let's not proliferate that sort of thing here

---
 doc/plugins/table.mdwn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index eb19323e6..7b080acda 100644
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -6,5 +6,3 @@ It can build HTML tables from data in CSV (comma-separated values)
 or DSV (delimiter-separated values) format.
 
 It needs the perl module [[!cpan Text::CSV]] for the CSV data.
-
-If you see `[[!table\ Error: ]]` you probably need to `sudo apt-get install libtext-csv-perl`.
-- 
cgit v1.2.3


From ca329047207dd17c984ee975d51bcec7d079ff26 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Mon, 7 Sep 2009 12:54:24 -0400
Subject: move apt-get comment here

---
 doc/plugins/table/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/table/discussion.mdwn b/doc/plugins/table/discussion.mdwn
index 16e5a5a56..99c7e059b 100644
--- a/doc/plugins/table/discussion.mdwn
+++ b/doc/plugins/table/discussion.mdwn
@@ -64,3 +64,7 @@ Do you like it? Can you implement the same in Ikiwiki? :) --[[Paweł|ptecza]]
 >> was written rather for simple usage. However cell alignment is very
 >> helpful feature, so I think the plugin should be able to do it.
 >> --[[Paweł|ptecza]]
+
+-----
+
+If you see `[[!table\ Error: ]]` you probably need to `sudo apt-get install libtext-csv-perl`.
-- 
cgit v1.2.3


From 3813632a8fe8940622f9cb40d94dbbab7e3f4194 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 7 Sep 2009 13:47:34 -0400
Subject: comment

---
 doc/plugins/table/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/table/discussion.mdwn b/doc/plugins/table/discussion.mdwn
index 99c7e059b..86572c935 100644
--- a/doc/plugins/table/discussion.mdwn
+++ b/doc/plugins/table/discussion.mdwn
@@ -68,3 +68,6 @@ Do you like it? Can you implement the same in Ikiwiki? :) --[[Paweł|ptecza]]
 -----
 
 If you see `[[!table\ Error: ]]` you probably need to `sudo apt-get install libtext-csv-perl`.
+
+> Perhaps more helpfully, ikiwiki 3.1415926 fixes display of such errors to
+> actualy include the error message. --[[Joey]] 
-- 
cgit v1.2.3


From 4601b5b6f9cd674f82e1b6ab50630d1e717fe116 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 02:25:48 -0400
Subject: Fix some typos in Czech translation (cherry picked from commit
 0f2eebc5355f1fcd64e5feb92f4aa7b2c39b4cac)

---
 po/underlays/basewiki/shortcuts.cs.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/underlays/basewiki/shortcuts.cs.po b/po/underlays/basewiki/shortcuts.cs.po
index c842e249f..7ae43e31a 100644
--- a/po/underlays/basewiki/shortcuts.cs.po
+++ b/po/underlays/basewiki/shortcuts.cs.po
@@ -198,7 +198,7 @@ msgid ""
 msgstr ""
 "Pro přidání nové zkratky použijte [[direktivu|ikiwiki/directive]] "
 "`shortcut`. Řetězec „%s“ je v adrese nahrazen textem předaným dané zkratce. "
-"Tento text je automaticky zakódován ([[! wikipedia url_encoding]]) do podoby "
+"Tento text je automaticky zakódován ([[!wikipedia url_encoding]]) do podoby "
 "vhodné pro url. Nechcete-li text kódovat, použijte „%S“. Volitelný parametr "
 "`desc` dovoluje změnit popis odkazu."
 
-- 
cgit v1.2.3


From 43176472636b3bc4c01fe159befaa03ecf5d9c73 Mon Sep 17 00:00:00 2001
From: "alicia.warner" <alicia.warner@web>
Date: Tue, 8 Sep 2009 14:12:35 -0400
Subject:

---
 doc/roadmap.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 2f79f7978..62d25675e 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -76,3 +76,5 @@ backwards compatability.
   and Jamey Sharp; support for other wikis should fit into the same
   framework.)
 * [[TODO]], [[bugs]], ...
+
+Visit the link to get some related <a href="http://www.besttermpaper.com">research papers</a>.
-- 
cgit v1.2.3


From f2e438c095adb9a53a6126f405011a3f67517343 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 14:16:19 -0400
Subject: Revert spam

This reverts commit 43176472636b3bc4c01fe159befaa03ecf5d9c73.
---
 doc/roadmap.mdwn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 62d25675e..2f79f7978 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -76,5 +76,3 @@ backwards compatability.
   and Jamey Sharp; support for other wikis should fit into the same
   framework.)
 * [[TODO]], [[bugs]], ...
-
-Visit the link to get some related <a href="http://www.besttermpaper.com">research papers</a>.
-- 
cgit v1.2.3


From c1c933ca658d3babc50da4ade20eb083f1a9c122 Mon Sep 17 00:00:00 2001
From: WikiJeanHawkins <WikiJeanHawkins@web>
Date: Tue, 8 Sep 2009 14:21:49 -0400
Subject:

---
 doc/plugins/openid.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 91fc7cddc..02b611eb0 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -25,3 +25,5 @@ url.
 
 This plugin is enabled by default, but can be turned off if you want to
 only use some other form of authentication, such as [[passwordauth]].
+
+For plugin dissertation or any other related [dissertation](http://www.bestdissertation.com), you may visit this page.
-- 
cgit v1.2.3


From 6d170066e987137e5f6ff49849c452822df86cf4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 14:27:51 -0400
Subject: Revert spam

This reverts commit c1c933ca658d3babc50da4ade20eb083f1a9c122.
---
 doc/plugins/openid.mdwn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 02b611eb0..91fc7cddc 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -25,5 +25,3 @@ url.
 
 This plugin is enabled by default, but can be turned off if you want to
 only use some other form of authentication, such as [[passwordauth]].
-
-For plugin dissertation or any other related [dissertation](http://www.bestdissertation.com), you may visit this page.
-- 
cgit v1.2.3


From 1f828d280a5085f2d9b0c69cbc0d6b4b1a40a105 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 14:38:57 -0400
Subject: update

---
 doc/plugins/po.mdwn | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 38b6b12cd..f3b70b5f7 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -317,27 +317,8 @@ text, or text in whatever single language ikiwiki is configured to "speak".
 Maybe there could be a way to switch ikiwiki to speaking another language
 when building a non-english page? Then the directives would get translated.
 
-2 test suite failures
---------------------
-
-t/po is currently failing tests 57 and 59 (and I would like to release
-soon..) --[[Joey]] 
-
-> They are failing because of commit cdc3576c8d1e (po: do not inject
-> custom bestlink function when `po_link_to` eq `default`). The test
-> suite changes `$config{po_link_to}`, but the `checkconfig` hook is
-> not re-run. I could manually run it when needed in the test-suite,
-> but this would lead to this function being injected several times,
-> and then `$origsubs{'bestlink'}` to be sometimes set to a wrong
-> value, which would break other parts of the test-suite. The best
-> solution I can think of (apart of reverting this commit or disabling
-> these two tests) is to split the test-suite into 3 parts, depending
-> on the `$config{po_link_to}` setting, either in 3 different `.t`
-> files, or inside the existing one and completely reset the IkiWiki
-> environment at the start of these parts... which I did not manage to
-> achieve in the last 2 hours :/ --[[intrigeri]]
-
->> I've reverted it. --[[Joey]] 
+(We also will need this in order to use translated templates, when they are
+available.)
 
 Documentation
 -------------
-- 
cgit v1.2.3


From 629ff41d919c1427f99fe95c5a02cbeea1243b26 Mon Sep 17 00:00:00 2001
From: "alicia.warner" <alicia.warner@web>
Date: Tue, 8 Sep 2009 14:58:37 -0400
Subject:

---
 doc/roadmap.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 2f79f7978..f924a1bc9 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -76,3 +76,6 @@ backwards compatability.
   and Jamey Sharp; support for other wikis should fit into the same
   framework.)
 * [[TODO]], [[bugs]], ...
+
+
+Click the link to get additional information for <a href="http://www.besttermpaper.com">research</a> paper writing.
-- 
cgit v1.2.3


From 064b507c534e8ed29f3ac4201300f76e32163697 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 15:02:06 -0400
Subject: Revert spam

This reverts commit 629ff41d919c1427f99fe95c5a02cbeea1243b26.
---
 doc/roadmap.mdwn | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index f924a1bc9..2f79f7978 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -76,6 +76,3 @@ backwards compatability.
   and Jamey Sharp; support for other wikis should fit into the same
   framework.)
 * [[TODO]], [[bugs]], ...
-
-
-Click the link to get additional information for <a href="http://www.besttermpaper.com">research</a> paper writing.
-- 
cgit v1.2.3


From 9c144163ea7f9fca3497becfaf50e4a1f2a8e242 Mon Sep 17 00:00:00 2001
From: "nicole.adams" <nicole.adams@web>
Date: Tue, 8 Sep 2009 15:10:06 -0400
Subject:

---
 doc/roadmap.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 2f79f7978..ab8a6a742 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -76,3 +76,4 @@ backwards compatability.
   and Jamey Sharp; support for other wikis should fit into the same
   framework.)
 * [[TODO]], [[bugs]], ...
+* Writing <a href="http://www.besttermpaper.com">research papers</a> for documentation purposes.
-- 
cgit v1.2.3


From 55474f44d93ffb35f650ab8ba8b32f4478eba1c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 15:17:39 -0400
Subject: Expand banned_users; it can now include PageSpecs, which allows
 banning by IP address.

---
 IkiWiki/CGI.pm                   | 28 +++++++++++++++++++++-------
 debian/changelog                 |  2 ++
 doc/banned_users.mdwn            |  8 +++++++-
 doc/todo/blocking_ip_ranges.mdwn |  3 +++
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index af58d7cb5..52cafade0 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -252,16 +252,30 @@ sub check_banned ($$) {
 	my $q=shift;
 	my $session=shift;
 
+	my $banned=0;
 	my $name=$session->param("name");
-	if (defined $name) {
-		if (grep { $name eq $_ } @{$config{banned_users}}) {
-			$session->delete();
-			cgi_savesession($session);
-			cgi_custom_failure(
-				$q->header(-status => "403 Forbidden"),
-				gettext("You are banned."));
+	if (defined $name && 
+	    grep { $name eq $_ } @{$config{banned_users}}) {
+		$banned=1;
+	}
+
+	foreach my $b (@{$config{banned_users}}) {
+		if (pagespec_match("", $b,
+			ip => $ENV{REMOTE_ADDR},
+			name => defined $name ? $name : "",
+		)) {
+			$banned=1;
+			last;
 		}
 	}
+
+	if ($banned) {
+		$session->delete();
+		cgi_savesession($session);
+		cgi_custom_failure(
+			$q->header(-status => "403 Forbidden"),
+			gettext("You are banned."));
+	}
 }
 
 sub cgi_getsession ($) {
diff --git a/debian/changelog b/debian/changelog
index 6109a7012..86e8513f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
 
   * Add French basewiki translation from the Debian French l10n team,
     including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
+  * Expand banned_users; it can now include PageSpecs, which
+    allows banning by IP address.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
 
diff --git a/doc/banned_users.mdwn b/doc/banned_users.mdwn
index d2bec90f0..c44f8c587 100644
--- a/doc/banned_users.mdwn
+++ b/doc/banned_users.mdwn
@@ -1,4 +1,10 @@
-Banned users can be configured in the setup file.
+Banned users can be configured in the setup file via the `banned_users`
+setting. This is a list of user names, or [[PageSpecs|ikiwiki/PageSpec]]
+to ban. Using a PageSpec is useful to block an IP address.
+
+For example:
+
+	banned_users => ['evilspammer', 'ip(192.168.1.1)'],
 
 If a banned user attempts to use the ikiwiki CGI, they will receive a 403
 Forbidden webpage indicating they are banned.
diff --git a/doc/todo/blocking_ip_ranges.mdwn b/doc/todo/blocking_ip_ranges.mdwn
index 95026eef1..ac2344ece 100644
--- a/doc/todo/blocking_ip_ranges.mdwn
+++ b/doc/todo/blocking_ip_ranges.mdwn
@@ -2,3 +2,6 @@ Admins need the ability to block IP ranges. They can already ban users.
 
 See [[fileupload]] for a propsal that grew to encompass the potential to do
 this.
+
+[[done]] (well, there is no pagespec for IP ranges yet, but we can block
+individual IPs)
-- 
cgit v1.2.3


From c2ae7966cac1bf691fcf76afafdee4a03239a231 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 15:19:16 -0400
Subject: Revert spam. This spammer's IP has now been blocked.

This reverts commit 9c144163ea7f9fca3497becfaf50e4a1f2a8e242.
---
 doc/roadmap.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index ab8a6a742..2f79f7978 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -76,4 +76,3 @@ backwards compatability.
   and Jamey Sharp; support for other wikis should fit into the same
   framework.)
 * [[TODO]], [[bugs]], ...
-* Writing <a href="http://www.besttermpaper.com">research papers</a> for documentation purposes.
-- 
cgit v1.2.3


From 93ab004cc23e183199d760f9ecd5afee260c47e9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 17:20:04 -0400
Subject: memoize template_file

This avoids a lot of unncessary stats, and trims about 1 second
off a docwiki rebuild here.
---
 IkiWiki.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b8e89b73f..01898936f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -33,6 +33,7 @@ use Memoize;
 memoize("abs2rel");
 memoize("pagespec_translate");
 memoize("file_pruned");
+memoize("template_file");
 
 sub getsetup () {
 	wikiname => {
-- 
cgit v1.2.3


From 2a99ebf2766a08f8d68a82255d1518ecac73ec84 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 17:27:37 -0400
Subject: underlay: Also allow configuring additional directories to search 
 for template files in.

---
 IkiWiki.pm                 | 10 +++++++++-
 IkiWiki/Plugin/underlay.pm | 11 +++++++++--
 debian/changelog           |  2 ++
 doc/plugins/underlay.mdwn  |  8 +++++++-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 01898936f..2f11069c6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -150,6 +150,13 @@ sub getsetup () {
 		safe => 0, # path
 		rebuild => 1,
 	},
+	templatedirs => {
+		type => "internal",
+		default => [],
+		description => "additional directories containing template files",
+		safe => 0,
+		rebuild => 0,
+	},
 	underlaydir => {
 		type => "string",
 		default => "$installdir/share/ikiwiki/basewiki",
@@ -1610,7 +1617,8 @@ sub saveindex () {
 sub template_file ($) {
 	my $template=shift;
 
-	foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
+	foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
+	                 "$installdir/share/ikiwiki/templates") {
 		return "$dir/$template" if -e "$dir/$template";
 	}
 	return;
diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 380d418fb..c59935672 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -27,14 +27,21 @@ sub getsetup () {
 			safe => 0,
 			rebuild => 1,
 		},
+		add_templates => {
+			type => "string",
+			default => [],
+			description => "extra template directories to add",
+			advanced => 1,
+			safe => 0,
+			rebuild => 1,
+		},
 }
 
 sub checkconfig () {
-	return unless exists $config{add_underlays};
-
 	foreach my $dir (@{$config{add_underlays}}) {
 		add_underlay($dir);
 	}
+	push @{$config{templatedirs}}, @{$config{add_templates}};
 }
 
 1;
diff --git a/debian/changelog b/debian/changelog
index 86e8513f7..de165e4ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
     including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
   * Expand banned_users; it can now include PageSpecs, which
     allows banning by IP address.
+  * underlay: Also allow configuring additional directories to search 
+    for template files in.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
 
diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn
index 09d096a6e..f7eafee7c 100644
--- a/doc/plugins/underlay.mdwn
+++ b/doc/plugins/underlay.mdwn
@@ -1,7 +1,7 @@
 [[!template id=plugin name=underlay author="[[Simon_McVittie|smcv]]"]]
 [[!tag type/useful]]
 
-This plugin adds an `add_underlays` option to the `.setup` file.
+This plugin adds an `add_underlays` option to the setup file.
 Its value is a list of underlay directories whose content is added to the wiki.
 
 Multiple underlays are normally set up automatically by other plugins (for
@@ -12,3 +12,9 @@ like photos or software releases.
 Directories in `add_underlays` should usually be absolute. If relative, they're
 interpreted as relative to the parent directory of the basewiki underlay, which
 is probably not particularly useful in this context.
+
+--
+
+This plugin also adds an `add_templates` option to the setup file.
+Its value is a list of template directories to look for template files in,
+if they are not present in the `templatedir`.
-- 
cgit v1.2.3


From aafd267ee099ddb8ff4129a0e4d46964be866f6d Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.Ativa>
Date: Wed, 9 Sep 2009 21:58:42 -0400
Subject: Abstract out CVS's involvement in the wrapper:

* In Wrapper.pm, add a new hook "wrapperargcheck" to examine argc/argv
  and return success or failure. In the failure case, the wrapper
  terminates.

* In cvs.pm, implement the new hook to return failure if a directory is
  being cvs added.
---
 IkiWiki/Plugin/cvs.pm | 12 ++++++++++++
 IkiWiki/Wrapper.pm    | 21 +++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 8409bebed..ff9d578e2 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -6,6 +6,7 @@ use strict;
 use IkiWiki;
 
 sub import {
+	hook(type => "wrapperargcheck", id => "cvs", call => \&wrapperargcheck);
 	hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
 	hook(type => "getsetup", id => "cvs", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -20,6 +21,17 @@ sub import {
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 }
 
+sub wrapperargcheck () {
+	my $check_args=<<"EOF";
+	int j;
+	for (j = 1; j < argc; j++)
+		if (strstr(argv[j], "New directory") != NULL)
+			return 0;
+	return 1;
+EOF
+	return $check_args;
+}
+
 sub checkconfig () {
 	if (! defined $config{cvspath}) {
 		$config{cvspath}="ikiwiki";
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index cc2223d7a..0baf112ff 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -44,17 +44,8 @@ EOF
 		$test_receive=IkiWiki::Receive::gen_wrapper();
 	}
 
-	my $check_cvs_add_dir="";
-	if ($config{rcs} eq 'cvs') {
-		$check_cvs_add_dir=<<"EOF";
-	{
-		int j;
-		for (j = 1; j < argc; j++)
-			if (strstr(argv[j], "New directory") != NULL)
-				exit(0);
-	}
-EOF
-	}
+	my $check_args="	return 0;";
+	run_hooks(wrapperargcheck => sub { $check_args = shift->(); });
 
 	my $check_commit_hook="";
 	my $pre_exec="";
@@ -128,10 +119,16 @@ addenv(char *var, char *val) {
 	newenviron[i++]=s;
 }
 
+int checkargs(int argc, char **argv) {
+$check_args
+}
+
 int main (int argc, char **argv) {
 	char *s;
 
-$check_cvs_add_dir
+	if (!checkargs(argc, argv))
+		exit(0);
+
 $check_commit_hook
 $test_receive
 $envsave
-- 
cgit v1.2.3


From 1b4c3fb551754cc70abd7a18871a79d79ac3cb5b Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.Ativa>
Date: Wed, 9 Sep 2009 22:36:23 -0400
Subject: note refactored wrapper tweakulation

---
 doc/plugins/contrib/cvs/discussion.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index 1f0ce0102..155a2289d 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -125,3 +125,19 @@ to pass to the command.
 
 > Thanks for reading carefully. I've tested your suggestions and
 > applied them on my branch. --[[schmonz]]
+
+----
+
+I've abstracted out CVS's involvement in the wrapper, adding a new
+"wrapperargcheck" hook to examine `argc/argv` and return success or
+failure (failure causes the wrapper to terminate) and implementing
+this hook in the plugin. In the non-CVS case, the check immediately
+returns success, so the added overhead is just a function call.
+
+Given how rarely anything should need to reach in and modify the
+wrapper -- I'd go so far as to say we shouldn't make it too easy
+-- I don't think it's worth the effort to try and design a more
+general-purpose way to do so. If and when some other problem thinks
+it wants to be solved by a new wrapper hook, it's easy enough to add
+one. Until then, I'd say it's more important to keep the wrapper as
+short and clear as possible. --[[schmonz]]
-- 
cgit v1.2.3


From b7415543c1ee1ee6ee0404cf781e89043de26fb7 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Wed, 9 Sep 2009 22:42:47 -0400
Subject: describe current state of wrapper modification

---
 doc/plugins/contrib/cvs.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index fcf5b936f..3d72255fe 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -22,9 +22,9 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
 * `cvs.pm` started life as a copy of [[3.14159|news/version_3.14159]]'s `svn.pm`.
 * `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata
 into `$DESTDIR`.
-* `IkiWiki/Wrapper.pm` avoids calling ikiwiki from post-commit if it's a
-directory being `cvs add`ed (this check is only compiled into the wrapper
-iff the configured VCS is "cvs").
+* `IkiWiki/Wrapper.pm` provides a new "wrapperargcheck" hook, which
+the plugin implements to avoid calling ikiwiki from post-commit
+(and locking against itself) if it's a directory being `cvs add`ed.
 * [[ikiwiki-makerepo]]:
  * creates a repository,
  * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
-- 
cgit v1.2.3


From 12bbc6c919ca5333a69715e5909263c4e9e4e514 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Wed, 9 Sep 2009 23:09:26 -0400
Subject: Add automated tests, modeled after svn's. Note the chdir() calls;
 perhaps cvs.pm should be doing pushd/popd in case the caller expects its
 working directory to be left alone.

---
 t/cvs.t | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100755 t/cvs.t

diff --git a/t/cvs.t b/t/cvs.t
new file mode 100755
index 000000000..c3612ef8c
--- /dev/null
+++ b/t/cvs.t
@@ -0,0 +1,76 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+my $dir;
+BEGIN {
+	$dir="/tmp/ikiwiki-test-cvs.$$";
+	my $cvs=`which cvs`;
+	chomp $cvs;
+	if (! -x $cvs || ! mkdir($dir)) {
+		eval q{
+			use Test::More skip_all => "cvs not available or could not make test dir"
+		}
+	}
+}
+use Test::More tests => 12;
+
+BEGIN { use_ok("IkiWiki"); }
+
+%config=IkiWiki::defaultconfig();
+$config{rcs} = "cvs";
+$config{srcdir} = "$dir/src";
+$config{cvsrepo} = "$dir/repo";
+$config{cvspath} = "ikiwiki";
+IkiWiki::loadplugins();
+IkiWiki::checkconfig();
+
+my $cvsrepo = "$dir/repo";
+
+system "cvs -d $cvsrepo init >/dev/null";
+system "mkdir $dir/ikiwiki >/dev/null";
+my $cwd = `pwd`; chomp $cwd;
+system "cd $dir/ikiwiki && cvs -d $cvsrepo import -m import ikiwiki VENDOR RELEASE >/dev/null";
+chdir $cwd;
+system "rm -rf $dir/ikiwiki >/dev/null";
+system "cvs -d $cvsrepo co -d $config{srcdir} ikiwiki >/dev/null";
+
+# Web commit
+chdir $cwd;
+my $test1 = readfile("t/test1.mdwn");
+writefile('test1.mdwn', $config{srcdir}, $test1);
+IkiWiki::rcs_add("test1.mdwn");
+IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
+
+my @changes;
+@changes = IkiWiki::rcs_recentchanges(3);
+
+is($#changes, 0);
+is($changes[0]{message}[0]{"line"}, "Added the first page");
+is($changes[0]{pages}[0]{"page"}, "test1");
+
+# Manual commit
+my $message = "Added the second page";
+
+chdir $cwd;
+my $test2 = readfile("t/test2.mdwn");
+writefile('test2.mdwn', $config{srcdir}, $test2);
+chdir $config{srcdir};
+system "cvs add test2.mdwn >/dev/null 2>&1";
+system "cvs commit -m \"$message\" test2.mdwn >/dev/null";
+
+@changes = IkiWiki::rcs_recentchanges(3);
+is($#changes, 1);
+is($changes[0]{message}[0]{"line"}, $message);
+is($changes[0]{pages}[0]{"page"}, "test2");
+is($changes[1]{pages}[0]{"page"}, "test1");
+
+# extra slashes in the path shouldn't break things
+$config{cvspath} = "/ikiwiki//";
+IkiWiki::checkconfig();
+@changes = IkiWiki::rcs_recentchanges(3);
+is($#changes, 1);
+is($changes[0]{message}[0]{"line"}, $message);
+is($changes[0]{pages}[0]{"page"}, "test2");
+is($changes[1]{pages}[0]{"page"}, "test1");
+
+system "rm -rf $dir";
-- 
cgit v1.2.3


From 689106ad3a24850543c7855b8531a1bf8dcfdb63 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Wed, 9 Sep 2009 23:17:15 -0400
Subject: automated tests added (and they highlight that the plugin should
 probably restore the caller's working directory)

---
 doc/plugins/contrib/cvs.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index 3d72255fe..947fa7268 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -32,6 +32,5 @@ the plugin implements to avoid calling ikiwiki from post-commit
 * CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below).
 
 ### To do
-* Add automated tests. (Blindly adding svn-like tests to `t/file_pruned.t` doesn't do the trick.)
 * Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records.
 * Perhaps prevent web edits from attempting to create `.../CVS/foo.mdwn` (and `.../cvs/foo.mdwn` on case-insensitive filesystems); thanks to the CVS metadata directory, the attempt will fail anyway (and much more confusingly) if we don't.
-- 
cgit v1.2.3


From 98553d15375a373bd769b82cea24b48ee9613662 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 10 Sep 2009 00:51:34 -0400
Subject: CVS operations generally need to be within CVS checkouts, so these
 chdir() calls are warranted. They shouldn't modify the caller's working
 directory, though. Use File::chdir to keep the scope of the changes
 subroutine-local. The tests now pass without resetting the working directory.

---
 IkiWiki/Plugin/cvs.pm | 12 +++++++-----
 t/cvs.t               |  9 ++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index ff9d578e2..e926425f2 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -5,6 +5,8 @@ use warnings;
 use strict;
 use IkiWiki;
 
+use File::chdir;
+
 sub import {
 	hook(type => "wrapperargcheck", id => "cvs", call => \&wrapperargcheck);
 	hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
@@ -104,7 +106,7 @@ sub cvs_info ($$) {
 	my $field=shift;
 	my $file=shift;
 
-	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+	local $CWD = $config{srcdir};
 
 	my $info=`cvs status $file`;
 	my ($ret)=$info=~/^\s*$field:\s*(\S+)/m;
@@ -115,7 +117,7 @@ sub cvs_runcvs(@) {
 	my @cmd = @_;
 	unshift @cmd, 'cvs', '-Q';
 
-	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+	local $CWD = $config{srcdir};
 
 	open(my $savedout, ">&STDOUT");
 	open(STDOUT, ">", "/dev/null");
@@ -261,7 +263,7 @@ sub rcs_rename ($$) {
 
 	return unless cvs_is_controlling;
 
-	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+	local $CWD = $config{srcdir};
 
 	if (system("mv", "$src", "$dest") != 0) {
 		warn("filesystem rename failed\n");
@@ -280,7 +282,7 @@ sub rcs_recentchanges($) {
 	eval q{use Date::Parse};
 	error($@) if $@;
 
-	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+	local $CWD = $config{srcdir};
 
 	# There's no cvsps option to get the last N changesets.
 	# Write full output to a temp file and read backwards.
@@ -400,7 +402,7 @@ sub rcs_recentchanges($) {
 sub rcs_diff ($) {
 	my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
 
-	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+	local $CWD = $config{srcdir};
 
 	# diff output is unavoidably preceded by the cvsps PatchSet entry
 	my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`;
diff --git a/t/cvs.t b/t/cvs.t
index c3612ef8c..9df62334d 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -28,14 +28,11 @@ my $cvsrepo = "$dir/repo";
 
 system "cvs -d $cvsrepo init >/dev/null";
 system "mkdir $dir/ikiwiki >/dev/null";
-my $cwd = `pwd`; chomp $cwd;
 system "cd $dir/ikiwiki && cvs -d $cvsrepo import -m import ikiwiki VENDOR RELEASE >/dev/null";
-chdir $cwd;
 system "rm -rf $dir/ikiwiki >/dev/null";
 system "cvs -d $cvsrepo co -d $config{srcdir} ikiwiki >/dev/null";
 
 # Web commit
-chdir $cwd;
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
@@ -51,12 +48,10 @@ is($changes[0]{pages}[0]{"page"}, "test1");
 # Manual commit
 my $message = "Added the second page";
 
-chdir $cwd;
 my $test2 = readfile("t/test2.mdwn");
 writefile('test2.mdwn', $config{srcdir}, $test2);
-chdir $config{srcdir};
-system "cvs add test2.mdwn >/dev/null 2>&1";
-system "cvs commit -m \"$message\" test2.mdwn >/dev/null";
+system "cd $config{srcdir} && cvs add test2.mdwn >/dev/null 2>&1";
+system "cd $config{srcdir} && cvs commit -m \"$message\" test2.mdwn >/dev/null";
 
 @changes = IkiWiki::rcs_recentchanges(3);
 is($#changes, 1);
-- 
cgit v1.2.3


From d2b57ae20fa1800d142adad5b3e43dddb97e9466 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 10 Sep 2009 00:59:05 -0400
Subject: File::chdir is needed now

---
 doc/plugins/contrib/cvs.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index 947fa7268..d45992300 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -5,8 +5,8 @@
 This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]].
 
 ### Usage
-7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan
-File::ReadBackwards]], and
+7. Install [[!cpan File::chdir]], [[!cpan File::ReadBackwards]],
+[cvsps](http://www.cobite.com/cvsps/), and
 [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
 7. Adjust CVS-related parameters in your setup file.
 
-- 
cgit v1.2.3


From b3cceb0f615089b3a144389f4593c9941a0ed777 Mon Sep 17 00:00:00 2001
From: suxx1k <suxx1k@web>
Date: Thu, 10 Sep 2009 09:50:34 -0400
Subject:

---
 doc/roadmap.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 2f79f7978..8688b856c 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -8,7 +8,7 @@ This is the roadmap for ikiwiki development.
 Released 29 April 2006.
 
 The 1.x series is no longer supported.
-
+d
 ----
 
 # 2.0
-- 
cgit v1.2.3


From 22f02603246f67117471f020a882dfa822849d18 Mon Sep 17 00:00:00 2001
From: suxx1k <suxx1k@web>
Date: Thu, 10 Sep 2009 09:51:28 -0400
Subject:

---
 doc/roadmap.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 8688b856c..a701a2685 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -7,8 +7,8 @@ This is the roadmap for ikiwiki development.
 
 Released 29 April 2006.
 
-The 1.x series is no longer supported.
-d
+The 1.X series is no longer supported.
+
 ----
 
 # 2.0
-- 
cgit v1.2.3


From 98ed7cb1d7f99790821b99b3779d6685114fa662 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 13:32:13 -0400
Subject: Fix parsing web commits from ipv6 addresses.

I weakended the regexp, so this matches ipv6 addresses too. It does not
ensure that the address is valid, but that should not matter here.

Note that addresses ending in "::" are not matched, so eg, the unspecified
address will not match -- but should never appear here anyway.
---
 IkiWiki.pm       | 2 +-
 debian/changelog | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2f11069c6..187d40a3a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -364,7 +364,7 @@ sub getsetup () {
 	},
 	web_commit_regexp => {
 		type => "internal",
-		default => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
+		default => qr/^web commit (by (.*?(?=: |$))|from ([0-9a-fA-F:.]+[0-9a-fA-F])):?(.*)/,
 		description => "regexp to parse web commits from logs",
 		safe => 0,
 		rebuild => 0,
diff --git a/debian/changelog b/debian/changelog
index de165e4ff..2e1781713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
     allows banning by IP address.
   * underlay: Also allow configuring additional directories to search 
     for template files in.
+  * Fix parsing web commits from ipv6 addresses.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
 
-- 
cgit v1.2.3


From f5bd1cf3cd4cc481cfd0bb08ee06aded56fc32ee Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 13:49:42 -0400
Subject: typo

---
 IkiWiki/Receive.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 37b6f2a62..31ab3a500 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -114,7 +114,7 @@ sub test () {
 			# by not testing the removal in such pairs of changes.
 			# (The add is still tested, just to make sure that
 			# no data is added to the repo that a web edit
-			# could add.)
+			# could not add.)
 			next if $newfiles{$file};
 
 			if (IkiWiki::Plugin::remove->can("check_canremove")) {
-- 
cgit v1.2.3


From 3ebd4e0b45a8a6bd4c12604a3bb683dcb3a60eb8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 14:04:46 -0400
Subject: Add genwrapper hook, that can be used to add code into the C wrapper.

---
 IkiWiki/Plugin/skeleton.pm.example | 5 +++++
 IkiWiki/Wrapper.pm                 | 8 ++++----
 debian/changelog                   | 1 +
 doc/plugins/write.mdwn             | 7 +++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 573510191..ddf2996d6 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -39,6 +39,7 @@ sub import {
 	hook(type => "renamepage", id => "skeleton", call => \&renamepage);
 	hook(type => "rename", id => "skeleton", call => \&rename);
 	hook(type => "savestate", id => "skeleton", call => \&savestate);
+	hook(type => "genwrapper", id => "skeleton", call => \&genwrapper);
 }
 
 sub getopt () {
@@ -239,4 +240,8 @@ sub savestate () {
 	debug("skeleton plugin running in savestate");
 }
 
+sub genwrapper () {
+	debug("skeleton plugin running in genwrapper");
+}
+
 1
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 6555fe625..cf85738d6 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -38,11 +38,12 @@ sub gen_wrapper () {
 EOF
 	}
 
-	my $test_receive="";
 	if ($config{test_receive}) {
 		require IkiWiki::Receive;
-		$test_receive=IkiWiki::Receive::gen_wrapper();
 	}
+	
+	my @wrapper_hooks;
+	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
 
 	my $check_commit_hook="";
 	my $pre_exec="";
@@ -120,7 +121,7 @@ int main (int argc, char **argv) {
 	char *s;
 
 $check_commit_hook
-$test_receive
+@wrapper_hooks
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
@@ -144,7 +145,6 @@ $pre_exec
 	exit(1);
 }
 EOF
-	close OUT;
 
 	my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
 	if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
diff --git a/debian/changelog b/debian/changelog
index 2e1781713..488aef866 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
   * underlay: Also allow configuring additional directories to search 
     for template files in.
   * Fix parsing web commits from ipv6 addresses.
+  * Add genwrapper hook, that can be used to add code into the C wrapper.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 3976f9adf..668f8d8b6 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -496,6 +496,13 @@ describes the plugin as a whole. For example:
   and undef if a rebuild could be needed in some circumstances, but is not
   strictly required.
 
+### genwrapper
+
+	hook(type => "genwrapper", id => "foo", call => \&genwrapper);
+
+This hook is used to inject C code (which it returns) into the `main`
+function of the ikiwiki wrapper when it is being generated.
+
 ## Plugin interface
 
 To import the ikiwiki plugin interface:
-- 
cgit v1.2.3


From 525d4cd037b1da19f4d54cf113212cbe452be417 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 14:06:30 -0400
Subject: new hook

---
 doc/plugins/contrib/cvs/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index 155a2289d..ace455d06 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -141,3 +141,7 @@ general-purpose way to do so. If and when some other problem thinks
 it wants to be solved by a new wrapper hook, it's easy enough to add
 one. Until then, I'd say it's more important to keep the wrapper as
 short and clear as possible. --[[schmonz]]
+
+> I've committed a slightly different hook, which should be general enough
+> that `IkiWiki::Receive` can also use it, so please adapt your code to
+> that. --[[Joey]]
-- 
cgit v1.2.3


From 8063bc3402bb1beab8ed85ecc25d19204e892060 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 10 Sep 2009 15:12:45 -0400
Subject: Catch up to the new genwrapper hook.

---
 IkiWiki/Plugin/cvs.pm | 15 ++++++++-------
 IkiWiki/Wrapper.pm    | 10 ----------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index e926425f2..3ce22203b 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -8,7 +8,7 @@ use IkiWiki;
 use File::chdir;
 
 sub import {
-	hook(type => "wrapperargcheck", id => "cvs", call => \&wrapperargcheck);
+	hook(type => "genwrapper", id => "cvs", call => \&genwrapper);
 	hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
 	hook(type => "getsetup", id => "cvs", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -23,13 +23,14 @@ sub import {
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 }
 
-sub wrapperargcheck () {
+sub genwrapper () {
 	my $check_args=<<"EOF";
-	int j;
-	for (j = 1; j < argc; j++)
-		if (strstr(argv[j], "New directory") != NULL)
-			return 0;
-	return 1;
+	{
+		int j;
+		for (j = 1; j < argc; j++)
+			if (strstr(argv[j], "New directory") != NULL)
+				exit(0);
+	}
 EOF
 	return $check_args;
 }
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 57896e262..cf85738d6 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -45,9 +45,6 @@ EOF
 	my @wrapper_hooks;
 	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
 
-	my $check_args="	return 0;";
-	run_hooks(wrapperargcheck => sub { $check_args = shift->(); });
-
 	my $check_commit_hook="";
 	my $pre_exec="";
 	if ($config{post_commit}) {
@@ -120,16 +117,9 @@ addenv(char *var, char *val) {
 	newenviron[i++]=s;
 }
 
-int checkargs(int argc, char **argv) {
-$check_args
-}
-
 int main (int argc, char **argv) {
 	char *s;
 
-	if (!checkargs(argc, argv))
-		exit(0);
-
 $check_commit_hook
 @wrapper_hooks
 $envsave
-- 
cgit v1.2.3


From 5ee980d77a614865747101615a6a795bec6f272f Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 10 Sep 2009 15:17:28 -0400
Subject: catch up to genwrapper

---
 doc/plugins/contrib/cvs.mdwn            | 3 ---
 doc/plugins/contrib/cvs/discussion.mdwn | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
index d45992300..b75929139 100644
--- a/doc/plugins/contrib/cvs.mdwn
+++ b/doc/plugins/contrib/cvs.mdwn
@@ -22,9 +22,6 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
 * `cvs.pm` started life as a copy of [[3.14159|news/version_3.14159]]'s `svn.pm`.
 * `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata
 into `$DESTDIR`.
-* `IkiWiki/Wrapper.pm` provides a new "wrapperargcheck" hook, which
-the plugin implements to avoid calling ikiwiki from post-commit
-(and locking against itself) if it's a directory being `cvs add`ed.
 * [[ikiwiki-makerepo]]:
  * creates a repository,
  * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index ace455d06..645b2388b 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -145,3 +145,5 @@ short and clear as possible. --[[schmonz]]
 > I've committed a slightly different hook, which should be general enough
 > that `IkiWiki::Receive` can also use it, so please adapt your code to
 > that. --[[Joey]]
+
+>> Done. --[[schmonz]].
-- 
cgit v1.2.3


From 078f76d7fd3f53389a3dba47338c2d32b4dbba4a Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Thu, 10 Sep 2009 16:14:29 -0400
Subject: testing

---
 doc/sandbox.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8b594043e..7b56c6803 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,6 +4,8 @@ Here's a paragraph.
 
 Here's another one with *emphasised* text.
 
+test
+
 # Header
 
 ## Subheader
-- 
cgit v1.2.3


From 26dae8f04955915f4203fab4bd5301c959f7771a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:09:19 -0400
Subject: clean up use of IkiWiki::Receive

Loading and use of IkiWiki::Receive can all be pushed into the git plugin,
rather than scattered around.

I had at first wanted to make a receive plugin and move it there,
but a plugin was not a good fit; you don't want users to have to manually
load it, and making the git plugin load the receive plugin at the right
times would need more, and ugly code.
---
 IkiWiki/Plugin/git.pm | 19 +++++++++++++++++++
 IkiWiki/Receive.pm    |  7 ++++---
 IkiWiki/Wrapper.pm    |  4 ----
 ikiwiki.in            |  4 ----
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 68b114a73..ad58231e0 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -14,6 +14,7 @@ my $no_chdir=0;
 sub import {
 	hook(type => "checkconfig", id => "git", call => \&checkconfig);
 	hook(type => "getsetup", id => "git", call => \&getsetup);
+	hook(type => "genwrapper", id => "git", call => \&genwrapper);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
 	hook(type => "rcs", id => "rcs_prepedit", call => \&rcs_prepedit);
 	hook(type => "rcs", id => "rcs_commit", call => \&rcs_commit);
@@ -41,6 +42,7 @@ sub checkconfig () {
 			wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
 		};
 	}
+
 	if (defined $config{git_test_receive_wrapper} &&
 	    length $config{git_test_receive_wrapper}) {
 		push @{$config{wrappers}}, {
@@ -49,6 +51,13 @@ sub checkconfig () {
 			wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
 		};
 	}
+	
+	# Run receive test only if being called by the wrapper, and not
+	# when generating same.
+	if ($config{test_receive} && ! exists $config{wrapper}) {
+		require IkiWiki::Receive;
+		IkiWiki::Receive::test();
+	}
 }
 
 sub getsetup () {
@@ -115,6 +124,16 @@ sub getsetup () {
 		},
 }
 
+sub genwrapper {
+	if ($config{test_receive}) {
+		require IkiWiki::Receive;
+		return IkiWiki::Receive::genwrapper();
+	}
+	else {
+		return "";
+	}
+}
+
 sub safe_git (&@) {
 	# Start a child process safely without resorting /bin/sh.
 	# Return command output or success state (in scalar context).
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 37b6f2a62..101c13ee5 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-
 package IkiWiki::Receive;
 
 use warnings;
@@ -20,9 +19,9 @@ sub trusted () {
 		! grep { $_ eq $user } @{$config{untrusted_committers}};
 }
 
-sub gen_wrapper () {
+sub genwrapper () {
 	# Test for commits from untrusted committers in the wrapper, to
-	# avoid loading ikiwiki at all for trusted commits.
+	# avoid starting ikiwiki proper at all for trusted commits.
 
 	my $ret=<<"EOF";
 	{
@@ -37,6 +36,8 @@ EOF
 			"u != $uid";
 		} @{$config{untrusted_committers}}).
 		") exit(0);\n";
+
+	
 	$ret.=<<"EOF";
 		asprintf(&s, "CALLER_UID=%i", u);
 		newenviron[i++]=s;
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index cf85738d6..ff110b5ff 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -37,10 +37,6 @@ sub gen_wrapper () {
 		addenv("$var", s);
 EOF
 	}
-
-	if ($config{test_receive}) {
-		require IkiWiki::Receive;
-	}
 	
 	my @wrapper_hooks;
 	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
diff --git a/ikiwiki.in b/ikiwiki.in
index 4e9b812f8..b8581d880 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -190,10 +190,6 @@ sub main () {
 	elsif ($config{post_commit} && ! commit_hook_enabled()) {
 		# do nothing
 	}
-	elsif ($config{test_receive}) {
-		require IkiWiki::Receive;
-		IkiWiki::Receive::test();
-	}
 	else {
 		if ($config{rebuild}) {
 			debug(gettext("rebuilding wiki.."));
-- 
cgit v1.2.3


From fa2486c5648e751d561244faec38d261cbd01b36 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:16:56 -0400
Subject: test from anon git

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 7b56c6803..22a5642da 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,7 +4,7 @@ Here's a paragraph.
 
 Here's another one with *emphasised* text.
 
-test
+test 2
 
 # Header
 
-- 
cgit v1.2.3


From 73224daf2c4da0c06e1e697a00a8d6136067d87f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:20:21 -0400
Subject: minor simplification

---
 IkiWiki/Plugin/cvs.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index dad28881d..c891174e0 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -24,7 +24,7 @@ sub import {
 }
 
 sub genwrapper () {
-	my $check_args=<<"EOF";
+	return <<EOF;
 	{
 		int j;
 		for (j = 1; j < argc; j++)
@@ -32,7 +32,6 @@ sub genwrapper () {
 				exit(0);
 	}
 EOF
-	return $check_args;
 }
 
 sub checkconfig () {
-- 
cgit v1.2.3


From 60111384a9c178b03cd778c298e28953ca80177b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:21:03 -0400
Subject: formatting

---
 IkiWiki/Plugin/cvs.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index c891174e0..d44ded505 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -298,7 +298,8 @@ sub rcs_recentchanges($) {
 	system("env TZ=UTC cvsps -q --cvs-direct -z 30 -x >$tmpfile");
 	if ($? == -1) {
 		error "couldn't run cvsps: $!\n";
-	} elsif (($? >> 8) != 0) {
+	}
+	elsif (($? >> 8) != 0) {
 		error "cvsps exited " . ($? >> 8) . ": $!\n";
 	}
 
-- 
cgit v1.2.3


From dd731d22c63a21ea7d8f5e32e72cb75f60e2d387 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:22:58 -0400
Subject: reorder vcs list

---
 doc/ikiwiki-makerepo.mdwn | 2 +-
 ikiwiki-makerepo          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn
index 13f88dc27..9e742c211 100644
--- a/doc/ikiwiki-makerepo.mdwn
+++ b/doc/ikiwiki-makerepo.mdwn
@@ -4,7 +4,7 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control
 
 # SYNOPSIS
 
-ikiwiki-makerepo svn|git|monotone|darcs srcdir repository
+ikiwiki-makerepo git|svn|monotone|darcs|cvs srcdir repository
 
 ikiwiki-makerepo bzr|mercurial srcdir
 
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index aca8da153..6951ca0de 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -6,7 +6,7 @@ srcdir="$2"
 repository="$3"
 
 usage () {
-	echo "usage: ikiwiki-makerepo cvs|svn|git|monotone|darcs srcdir repository" >&2
+	echo "usage: ikiwiki-makerepo svn|git|svn|monotone|darcs|cvs srcdir repository" >&2
 	echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2
 	exit 1
 }
-- 
cgit v1.2.3


From e3f5fdcf3789ca4f0e9704a390bf357d11160904 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:28:39 -0400
Subject: remove hook not used by cvs

---
 IkiWiki/Render.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5953b3fee..246c2260d 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -554,7 +554,6 @@ sub refresh () {
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });
 	}
-	run_hooks(postrefresh => sub { shift->() });
 }
 
 sub commandline_render () {
-- 
cgit v1.2.3


From e5d9d3cc52598c68fc91903a5ca5fd43c7d1cf21 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:31:58 -0400
Subject: add rcs/cvs

---
 doc/plugins/contrib/cvs.mdwn            |  33 -------
 doc/plugins/contrib/cvs/discussion.mdwn | 149 --------------------------------
 doc/rcs/cvs.mdwn                        |  27 ++++++
 doc/rcs/cvs/discussion.mdwn             | 149 ++++++++++++++++++++++++++++++++
 doc/rcs/details.mdwn                    |   2 +
 5 files changed, 178 insertions(+), 182 deletions(-)
 delete mode 100644 doc/plugins/contrib/cvs.mdwn
 delete mode 100644 doc/plugins/contrib/cvs/discussion.mdwn
 create mode 100644 doc/rcs/cvs.mdwn
 create mode 100644 doc/rcs/cvs/discussion.mdwn

diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn
deleted file mode 100644
index b75929139..000000000
--- a/doc/plugins/contrib/cvs.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-[[!template id=plugin name=cvs core=0 author="[[schmonz]]"]]
-
-[[!template id=gitbranch branch=schmonz author="[[schmonz]]"]]
-
-This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]].
-
-### Usage
-7. Install [[!cpan File::chdir]], [[!cpan File::ReadBackwards]],
-[cvsps](http://www.cobite.com/cvsps/), and
-[cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
-7. Adjust CVS-related parameters in your setup file.
-
-Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn't need it, but you yourself might. Here's a good general-purpose one:
-
-    cvs -q
-    checkout -P
-    update -dP
-    diff -u
-    rdiff -u
-
-### Implementation details
-* `cvs.pm` started life as a copy of [[3.14159|news/version_3.14159]]'s `svn.pm`.
-* `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata
-into `$DESTDIR`.
-* [[ikiwiki-makerepo]]:
- * creates a repository,
- * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
- * configures the post-commit hook in `CVSROOT/loginfo`.
-* CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below).
-
-### To do
-* Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records.
-* Perhaps prevent web edits from attempting to create `.../CVS/foo.mdwn` (and `.../cvs/foo.mdwn` on case-insensitive filesystems); thanks to the CVS metadata directory, the attempt will fail anyway (and much more confusingly) if we don't.
diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
deleted file mode 100644
index 645b2388b..000000000
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ /dev/null
@@ -1,149 +0,0 @@
-I've started reviewing this, and the main thing I don't like is the
-post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up.
-That just seems unnecessarily complicated. Why can't ikiwiki itself detect
-the "cvs add <directory>" call and avoid doing anything in that case?
---[[Joey]] 
-
-> The wrapper wrapper does three things:
->
-> 7. It ignores `cvs add <directory>`, since this is a weird CVS
-> behavior that ikiwiki gets confused by and doesn't need to act on.
-> 7. It prevents `cvs` locking against itself: `cvs commit` takes a
-> write lock and runs the post-commit hook, which runs `cvs update`,
-> which wants a read lock and sleeps forever -- unless the post-commit
-> hook runs in the background so the commit can "finish".
-> 7. It fails silently if the ikiwiki post-commit hook is missing.
-> CVS doesn't have any magic post-commit filenames, so hooks have to
-> be configured explicitly. I don't think a commit will actually fail
-> if a configured post-commit hook is missing (though I can't test
-> this at the moment).
->
-> Thing 1 can probably be handled within ikiwiki, if that seems less
-> gross to you.
-
->> It seems like it might be. You can use a `getopt` hook to check
->> `@ARGV` to see how it was called. --[[Joey]] 
-
->>> This does the trick iff the post-commit wrapper passes its args
->>> along. Committed on my branch. This seems potentially dangerous,
->>> since the args passed to ikiwiki are influenced by web commits.
->>> I don't see an exploit, but for paranoia's sake, maybe the wrapper
->>> should only be built with execv() if the cvs plugin is loaded?
->>> --[[schmonz]]
-
->>>> Hadn't considered that. While in wrapper mode the normal getopt is not
->>>> done, plugin getopt still runs, and so any unsafe options that 
->>>> other plugins support could be a problem if another user runs
->>>> the setuid wrapper and passes those options through. --[[Joey]]
-
->>>>> I've tried compiling the argument check into the wrapper as
->>>>> the first thing main() does, and was surprised to find that
->>>>> this doesn't prevent the `cvs add <dir>` deadlock in a web
->>>>> commit. I was convinced this'd be a reasonable solution,
->>>>> especially if conditionalized on the cvs plugin being loaded,
->>>>> but it doesn't work. And I stuck debug printfs at the beginning
->>>>> of all the rcs_foo() subs, and whatever `cvs add <dir>` is
->>>>> doing to ikiwiki isn't visible to my plugin, because none of
->>>>> those subs are getting called. Nuts. Can you think of anything
->>>>> else that might solve the problem, or should I go back to
->>>>> generating a minimal wrapper wrapper that checks for just
->>>>> this one thing? --[[schmonz]]
-
->>>>>> I don't see how there could possibly be a difference between
->>>>>> ikiwiki's C wrapper and your shell wrapper wrapper here. --[[Joey]]
-
->>>>>>> I was comparing strings overly precisely. Fixed on my branch.
->>>>>>> I've also knocked off the two most pressing to-do items. I
->>>>>>> think the plugin's ready for prime time. --[[schmonz]]
-
-> Thing 2 I'm less sure of. (I'd like to see the web UI return
-> immediately on save anyway, to a temporary "rebuilding, please wait
-> if you feel like knowing when it's done" page, but this problem
-> with CVS happens with any kind of commit, and could conceivably
-> happen with some other VCS.)
-
->> None of the other VCSes let a write lock block a read lock, apparently.
->> 
->> Anyway, re the backgrounding, when committing via the web, the
->> post-commit hook doesn't run anyway; the rendering is done via the
->> ikiwiki CGI. It would certianly be nice if it popped up a quick "working"
->> page and replaced it with the updated page when done, but that's
->> unrelated;  the post-commit
->> hook only does rendering when committing using the VCS directly. The
->> backgrounding you do actually seems safe enough -- but tacking
->> on a " &" to the ikiwiki wrapper call doesn't need a wrapper script,
->> does it? --[[Joey]]
-
->>> Nope, it works fine to append it to the `CVSROOT/loginfo` line.
->>> Fixed on my branch. --[[schmonz]]
-
-> Thing 3 I think I did in order to squelch the error messages that
-> were bollixing up the CGI. It was easy to do this in the wrapper
-> wrapper, but if that's going away, it can be done just as easily
-> with output redirection in `CVSROOT/loginfo`.
->
-> --[[schmonz]]
-
->> If the error messages screw up the CGI they must go to stdout.
->> I thought we had stderr even in the the CVS dark ages. ;-) --[[Joey]] 
-
->>> Some messages go to stderr, but definitely not all. That's why
->>> I wound up reaching for IPC::Cmd, to execute the command line
->>> safely while shutting CVS up. Anyway, I've tested what happens
->>> if a configured post-commit hook is missing, and it seems fine,
->>> probably also thanks to IPC::Cmd.
->>> --[[schmonz]]
-
-----
-
-
-Further review.. --[[Joey]] 
-
-I don't understand what `cvs_shquote_commit` is
-trying to do with the test message, but it seems
-highly likely to be insecure; I never trust anything 
-that relies on safely quoting user input passed to the shell. 
-
-(As an aside, `shell_quote` can die on certian inputs.)
-
-Seems to me that, if `IPC::Cmd` exposes input to the shell
-(which I have not verified but its docs don't specify; a bad sign)
-you chose the wrong tool and ended up doing down the wrong
-route, dragging in shell quoting problems and fixes. Since you
-chose to use `IPC::Cmd`	just because you wanted to shut
-up CVS stderr, my suggestion would be to use plain `system`
-to run the command, with stderr temporarily sent to /dev/null:
-
-	open(my $savederr, ">&STDERR");
-	open(STDERR, ">", "/dev/null");
-	my $ret=system("cvs", "-Q", @_);
-	open(STDERR, ">$savederr");
-
-`cvs_runcvs` should not take an array reference. It's
-usual for this type of function to take a list of parameters
-to pass to the command.
-
-> Thanks for reading carefully. I've tested your suggestions and
-> applied them on my branch. --[[schmonz]]
-
-----
-
-I've abstracted out CVS's involvement in the wrapper, adding a new
-"wrapperargcheck" hook to examine `argc/argv` and return success or
-failure (failure causes the wrapper to terminate) and implementing
-this hook in the plugin. In the non-CVS case, the check immediately
-returns success, so the added overhead is just a function call.
-
-Given how rarely anything should need to reach in and modify the
-wrapper -- I'd go so far as to say we shouldn't make it too easy
--- I don't think it's worth the effort to try and design a more
-general-purpose way to do so. If and when some other problem thinks
-it wants to be solved by a new wrapper hook, it's easy enough to add
-one. Until then, I'd say it's more important to keep the wrapper as
-short and clear as possible. --[[schmonz]]
-
-> I've committed a slightly different hook, which should be general enough
-> that `IkiWiki::Receive` can also use it, so please adapt your code to
-> that. --[[Joey]]
-
->> Done. --[[schmonz]].
diff --git a/doc/rcs/cvs.mdwn b/doc/rcs/cvs.mdwn
new file mode 100644
index 000000000..f0bd0f6f0
--- /dev/null
+++ b/doc/rcs/cvs.mdwn
@@ -0,0 +1,27 @@
+If you really need to, you can use [[!wikipedia desc="CVS" Concurrent Versions System]]
+with ikiwiki.
+
+### Usage
+7. Install [[!cpan File::chdir]], [[!cpan File::ReadBackwards]],
+[cvsps](http://www.cobite.com/cvsps/), and
+[cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
+7. Adjust CVS-related parameters in your setup file.
+
+Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn't need it, but you yourself might. Here's a good general-purpose one:
+
+    cvs -q
+    checkout -P
+    update -dP
+    diff -u
+    rdiff -u
+
+### Implementation details
+* [[ikiwiki-makerepo]]:
+ * creates a repository,
+ * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
+ * configures the post-commit hook in `CVSROOT/loginfo`.
+* CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below).
+
+### To do
+* Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records.
+* Perhaps prevent web edits from attempting to create `.../CVS/foo.mdwn` (and `.../cvs/foo.mdwn` on case-insensitive filesystems); thanks to the CVS metadata directory, the attempt will fail anyway (and much more confusingly) if we don't.
diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
new file mode 100644
index 000000000..645b2388b
--- /dev/null
+++ b/doc/rcs/cvs/discussion.mdwn
@@ -0,0 +1,149 @@
+I've started reviewing this, and the main thing I don't like is the
+post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up.
+That just seems unnecessarily complicated. Why can't ikiwiki itself detect
+the "cvs add <directory>" call and avoid doing anything in that case?
+--[[Joey]] 
+
+> The wrapper wrapper does three things:
+>
+> 7. It ignores `cvs add <directory>`, since this is a weird CVS
+> behavior that ikiwiki gets confused by and doesn't need to act on.
+> 7. It prevents `cvs` locking against itself: `cvs commit` takes a
+> write lock and runs the post-commit hook, which runs `cvs update`,
+> which wants a read lock and sleeps forever -- unless the post-commit
+> hook runs in the background so the commit can "finish".
+> 7. It fails silently if the ikiwiki post-commit hook is missing.
+> CVS doesn't have any magic post-commit filenames, so hooks have to
+> be configured explicitly. I don't think a commit will actually fail
+> if a configured post-commit hook is missing (though I can't test
+> this at the moment).
+>
+> Thing 1 can probably be handled within ikiwiki, if that seems less
+> gross to you.
+
+>> It seems like it might be. You can use a `getopt` hook to check
+>> `@ARGV` to see how it was called. --[[Joey]] 
+
+>>> This does the trick iff the post-commit wrapper passes its args
+>>> along. Committed on my branch. This seems potentially dangerous,
+>>> since the args passed to ikiwiki are influenced by web commits.
+>>> I don't see an exploit, but for paranoia's sake, maybe the wrapper
+>>> should only be built with execv() if the cvs plugin is loaded?
+>>> --[[schmonz]]
+
+>>>> Hadn't considered that. While in wrapper mode the normal getopt is not
+>>>> done, plugin getopt still runs, and so any unsafe options that 
+>>>> other plugins support could be a problem if another user runs
+>>>> the setuid wrapper and passes those options through. --[[Joey]]
+
+>>>>> I've tried compiling the argument check into the wrapper as
+>>>>> the first thing main() does, and was surprised to find that
+>>>>> this doesn't prevent the `cvs add <dir>` deadlock in a web
+>>>>> commit. I was convinced this'd be a reasonable solution,
+>>>>> especially if conditionalized on the cvs plugin being loaded,
+>>>>> but it doesn't work. And I stuck debug printfs at the beginning
+>>>>> of all the rcs_foo() subs, and whatever `cvs add <dir>` is
+>>>>> doing to ikiwiki isn't visible to my plugin, because none of
+>>>>> those subs are getting called. Nuts. Can you think of anything
+>>>>> else that might solve the problem, or should I go back to
+>>>>> generating a minimal wrapper wrapper that checks for just
+>>>>> this one thing? --[[schmonz]]
+
+>>>>>> I don't see how there could possibly be a difference between
+>>>>>> ikiwiki's C wrapper and your shell wrapper wrapper here. --[[Joey]]
+
+>>>>>>> I was comparing strings overly precisely. Fixed on my branch.
+>>>>>>> I've also knocked off the two most pressing to-do items. I
+>>>>>>> think the plugin's ready for prime time. --[[schmonz]]
+
+> Thing 2 I'm less sure of. (I'd like to see the web UI return
+> immediately on save anyway, to a temporary "rebuilding, please wait
+> if you feel like knowing when it's done" page, but this problem
+> with CVS happens with any kind of commit, and could conceivably
+> happen with some other VCS.)
+
+>> None of the other VCSes let a write lock block a read lock, apparently.
+>> 
+>> Anyway, re the backgrounding, when committing via the web, the
+>> post-commit hook doesn't run anyway; the rendering is done via the
+>> ikiwiki CGI. It would certianly be nice if it popped up a quick "working"
+>> page and replaced it with the updated page when done, but that's
+>> unrelated;  the post-commit
+>> hook only does rendering when committing using the VCS directly. The
+>> backgrounding you do actually seems safe enough -- but tacking
+>> on a " &" to the ikiwiki wrapper call doesn't need a wrapper script,
+>> does it? --[[Joey]]
+
+>>> Nope, it works fine to append it to the `CVSROOT/loginfo` line.
+>>> Fixed on my branch. --[[schmonz]]
+
+> Thing 3 I think I did in order to squelch the error messages that
+> were bollixing up the CGI. It was easy to do this in the wrapper
+> wrapper, but if that's going away, it can be done just as easily
+> with output redirection in `CVSROOT/loginfo`.
+>
+> --[[schmonz]]
+
+>> If the error messages screw up the CGI they must go to stdout.
+>> I thought we had stderr even in the the CVS dark ages. ;-) --[[Joey]] 
+
+>>> Some messages go to stderr, but definitely not all. That's why
+>>> I wound up reaching for IPC::Cmd, to execute the command line
+>>> safely while shutting CVS up. Anyway, I've tested what happens
+>>> if a configured post-commit hook is missing, and it seems fine,
+>>> probably also thanks to IPC::Cmd.
+>>> --[[schmonz]]
+
+----
+
+
+Further review.. --[[Joey]] 
+
+I don't understand what `cvs_shquote_commit` is
+trying to do with the test message, but it seems
+highly likely to be insecure; I never trust anything 
+that relies on safely quoting user input passed to the shell. 
+
+(As an aside, `shell_quote` can die on certian inputs.)
+
+Seems to me that, if `IPC::Cmd` exposes input to the shell
+(which I have not verified but its docs don't specify; a bad sign)
+you chose the wrong tool and ended up doing down the wrong
+route, dragging in shell quoting problems and fixes. Since you
+chose to use `IPC::Cmd`	just because you wanted to shut
+up CVS stderr, my suggestion would be to use plain `system`
+to run the command, with stderr temporarily sent to /dev/null:
+
+	open(my $savederr, ">&STDERR");
+	open(STDERR, ">", "/dev/null");
+	my $ret=system("cvs", "-Q", @_);
+	open(STDERR, ">$savederr");
+
+`cvs_runcvs` should not take an array reference. It's
+usual for this type of function to take a list of parameters
+to pass to the command.
+
+> Thanks for reading carefully. I've tested your suggestions and
+> applied them on my branch. --[[schmonz]]
+
+----
+
+I've abstracted out CVS's involvement in the wrapper, adding a new
+"wrapperargcheck" hook to examine `argc/argv` and return success or
+failure (failure causes the wrapper to terminate) and implementing
+this hook in the plugin. In the non-CVS case, the check immediately
+returns success, so the added overhead is just a function call.
+
+Given how rarely anything should need to reach in and modify the
+wrapper -- I'd go so far as to say we shouldn't make it too easy
+-- I don't think it's worth the effort to try and design a more
+general-purpose way to do so. If and when some other problem thinks
+it wants to be solved by a new wrapper hook, it's easy enough to add
+one. Until then, I'd say it's more important to keep the wrapper as
+short and clear as possible. --[[schmonz]]
+
+> I've committed a slightly different hook, which should be general enough
+> that `IkiWiki::Receive` can also use it, so please adapt your code to
+> that. --[[Joey]]
+
+>> Done. --[[schmonz]].
diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn
index 6492cf38c..013ddb745 100644
--- a/doc/rcs/details.mdwn
+++ b/doc/rcs/details.mdwn
@@ -288,3 +288,5 @@ user for cleanup.  This is less neat than it could be, in that a conflict marked
 revision gets committed to the repository.
 
 ## [[bzr]]
+
+## [[cvs]]
-- 
cgit v1.2.3


From f2f3fe8a18dabcaf6acbfbfe927e07e8d9df5a25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:34:45 -0400
Subject: changelog

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 488aef866..1aa6c1c11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
     for template files in.
   * Fix parsing web commits from ipv6 addresses.
   * Add genwrapper hook, that can be used to add code into the C wrapper.
+  * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by
+    Amitai Schlair.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
 
-- 
cgit v1.2.3


From 3b8673dbb20251bda898da4095bc2d5b1d84f482 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:40:36 -0400
Subject: add libfile-chdir-perl to build depends

This is needed for the cvs plugin to load, which is needed for the setup
file to include config stanzas for that plugin.
---
 debian/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 96ba221ff..5a0acf4c4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libtext-markdown-perl | markdown, 
   libtimedate-perl, libhtml-template-perl,
   libhtml-scrubber-perl, wdg-html-validator,
-  libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34)
+  libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34),
+  libfile-chdir-perl
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.8.1
-- 
cgit v1.2.3


From e22af796e502fb881b7a8605b87e0746190d4899 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 16:49:54 -0400
Subject: skip if cvsps is not available

---
 t/cvs.t | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/t/cvs.t b/t/cvs.t
index 9df62334d..c9caa94eb 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -6,9 +6,11 @@ BEGIN {
 	$dir="/tmp/ikiwiki-test-cvs.$$";
 	my $cvs=`which cvs`;
 	chomp $cvs;
-	if (! -x $cvs || ! mkdir($dir)) {
+	my $cvsps=`which cvsps`;
+	chomp $cvsps;
+	if (! -x $cvs || ! -x $cvsps || ! mkdir($dir)) {
 		eval q{
-			use Test::More skip_all => "cvs not available or could not make test dir"
+			use Test::More skip_all => "cvs or cvsps not available or could not make test dir"
 		}
 	}
 }
-- 
cgit v1.2.3


From fb6c6895c629f23b0a82840684fac3672b409711 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 10 Sep 2009 17:03:06 -0400
Subject: Add NetBSD-style 2-clause BSD license.

---
 IkiWiki/Plugin/cvs.pm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 3ce22203b..ccd697e1b 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -1,6 +1,34 @@
 #!/usr/pkg/bin/perl
 package IkiWiki::Plugin::cvs;
 
+# Copyright (c) 2008 Amitai Schlair
+# All rights reserved.
+#
+# This code is derived from software contributed to ikiwiki
+# by Amitai Schlair.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY IKIWIKI AND CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
 use warnings;
 use strict;
 use IkiWiki;
-- 
cgit v1.2.3


From 290db7808f8dc9ee1bfd0caa33d5c3205c0651f8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 17:03:19 -0400
Subject: update a few cvs things

---
 doc/post-commit/discussion.mdwn | 2 +-
 doc/todo/CVS_backend.mdwn       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/post-commit/discussion.mdwn b/doc/post-commit/discussion.mdwn
index c78709e94..fc0a27ee4 100644
--- a/doc/post-commit/discussion.mdwn
+++ b/doc/post-commit/discussion.mdwn
@@ -91,7 +91,7 @@ Can you offer an educated guess what's going wrong here? --[[Schmonz]]
 >>> Aaaaaand I was wrong about the second half of the conjecture being
 >>> wrong. The wrapper script wasn't correctly identifying directories;
 >>> with that fixed, everything works. I've created a
->>> [[plugins/contrib/cvs]] plugin page. Thanks for listening. :-)
+>>> [[rcs/cvs]] page. Thanks for listening. :-)
 >>> --[[Schmonz]]
 
 >> Here is a comment I committed to my laptop from Madrid Airport before
diff --git a/doc/todo/CVS_backend.mdwn b/doc/todo/CVS_backend.mdwn
index 3c6527290..c450542e2 100644
--- a/doc/todo/CVS_backend.mdwn
+++ b/doc/todo/CVS_backend.mdwn
@@ -9,6 +9,8 @@ Original discussion:
 >> No, although the existing svn backend could fairly esily be modified into
 >> a CVS backend, by someone who doesn't mind working with CVS. --[[Joey]]
 >>
->>> Wouldn't say I don't mind, but I needed it. See [[plugins/contrib/cvs]]. --[[Schmonz]]
+>>> Wouldn't say I don't mind, but I needed it. See [[rcs/cvs]]. --[[Schmonz]]
+
+[[done]]
 
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 06c712a7f0c75da344da43cd6030924b856a9439 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 17:07:21 -0400
Subject: update

---
 debian/copyright | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index b06d27f19..8f7d65322 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -164,3 +164,28 @@ License: GPL-2+
  118 Turnpike Rd., Southboro, MA 01772.
  .
  Republished with permission.
+
+Files: cvs.pm
+Copyright: © 2009 Amitai Schlair
+License: BSD-C2
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY IKIWIKI AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
-- 
cgit v1.2.3


From b2bd2e93f01979df1a25e6f349022103bc20339a Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 10 Sep 2009 17:34:52 -0400
Subject: Revivify unixauth and rsync plugins (and hook needed by rsync) lost
 in the last merge. I should really put each feature on its own git branch.

---
 IkiWiki/Plugin/rsync.pm    |  45 +++++++++++
 IkiWiki/Plugin/unixauth.pm | 195 +++++++++++++++++++++++++++++++++++++++++++++
 IkiWiki/Render.pm          |   1 +
 3 files changed, 241 insertions(+)
 create mode 100644 IkiWiki/Plugin/rsync.pm
 create mode 100644 IkiWiki/Plugin/unixauth.pm

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
new file mode 100644
index 000000000..3f049457b
--- /dev/null
+++ b/IkiWiki/Plugin/rsync.pm
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::rsync;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "rsync", call => \&getsetup);
+	hook(type => "checkconfig", id => "rsync", call => \&checkconfig);
+	hook(type => "postrefresh", id => "rsync", call => \&postrefresh);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 0,
+			rebuild => 0,
+		},
+		rsync_command => {
+			type => "string",
+			example => "rsync -qa --delete /path/to/destdir/ user\@host:/path/to/docroot/",
+			description => "unattended command to upload regenerated pages",
+			safe => 0,
+			rebuild => 0,
+		},
+}
+
+sub checkconfig {
+	if (! exists $config{rsync_command} ||
+	    ! defined $config{rsync_command}) {
+		error("Must specify rsync_command");
+	}
+}
+
+sub postrefresh () {
+	system $config{rsync_command};
+	if ($? == -1) {
+		error("failed to execute rsync_command: $!");
+	} elsif ($? != 0) {
+		error(sprintf("rsync_command exited %d", $? >> 8));
+	}
+}
+
+1
diff --git a/IkiWiki/Plugin/unixauth.pm b/IkiWiki/Plugin/unixauth.pm
new file mode 100644
index 000000000..4f0cb4dd2
--- /dev/null
+++ b/IkiWiki/Plugin/unixauth.pm
@@ -0,0 +1,195 @@
+#!/usr/bin/perl
+# Ikiwiki unixauth authentication.
+package IkiWiki::Plugin::unixauth;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+sub import {
+	hook(type => "getsetup", id => "unixauth", call => \&getsetup);
+		hook(type => "formbuilder_setup", id => "unixauth",
+			call => \&formbuilder_setup);
+		hook(type => "formbuilder", id => "unixauth",
+			call => \&formbuilder);
+	hook(type => "sessioncgi", id => "unixauth", call => \&sessioncgi);
+}
+
+sub getsetup () {
+	return
+	unixauth_type => {
+			type => "string",
+			example => "checkpassword",
+			description => "type of authenticator; can be 'checkpassword' or 'pwauth'",
+			safe => 0,
+			rebuild => 1,
+	},
+	unixauth_command => {
+			type => "string",
+			example => "/path/to/checkpassword",
+			description => "full path and any arguments",
+			safe => 0,
+			rebuild => 1,
+	},
+	unixauth_requiressl => {
+			type => "boolean",
+			example => "1",
+			description => "require SSL? strongly recommended",
+			safe => 0,
+			rebuild => 1,
+	},
+	plugin => {
+			description => "Unix user authentication",
+			safe => 0,
+			rebuild => 1,
+	},
+}
+
+# Checks if a string matches a user's password, and returns true or false.
+sub checkpassword ($$;$) {
+	my $user=shift;
+	my $password=shift;
+	my $field=shift || "password";
+
+	# It's very important that the user not be allowed to log in with
+	# an empty password!
+	if (! length $password) {
+			return 0;
+	}
+
+	my $ret=0;
+	if (! exists $config{unixauth_type}) {
+			# admin needs to carefully think over his configuration
+			return 0;
+	}
+	elsif ($config{unixauth_type} eq "checkpassword") {
+			open UNIXAUTH, "|$config{unixauth_command} true 3<&0" or die("Could not run $config{unixauth_type}");
+			print UNIXAUTH "$user\0$password\0Y123456\0";
+			close UNIXAUTH;
+			$ret=!($?>>8);
+	}
+	elsif ($config{unixauth_type} eq "pwauth") {
+			open UNIXAUTH, "|$config{unixauth_command}" or die("Could not run $config{unixauth_type}");
+			print UNIXAUTH "$user\n$password\n";
+			close UNIXAUTH;
+			$ret=!($?>>8);
+	}
+	else {
+			# no such authentication type
+			return 0;
+	}
+
+	if ($ret) {
+		my $userinfo=IkiWiki::userinfo_retrieve();
+		if (! length $user || ! defined $userinfo ||
+			! exists $userinfo->{$user} || ! ref $userinfo->{$user}) {
+				IkiWiki::userinfo_setall($user, {
+					'email' => '',
+					'regdate' => time,
+				});
+		}
+	}
+
+	return $ret;
+}
+
+sub formbuilder_setup (@) {
+	my %params=@_;
+
+	my $form=$params{form};
+	my $session=$params{session};
+	my $cgi=$params{cgi};
+
+	# if not under SSL, die before even showing a login form,
+	# unless the admin explicitly says it's fine
+	if (! exists $config{unixauth_requiressl}) {
+			$config{unixauth_requiressl} = 1;
+	}
+	if ($config{unixauth_requiressl}) {
+		if ((! $config{sslcookie}) || (! exists $ENV{'HTTPS'})) {
+			die("SSL required to login. Contact your administrator.<br>");
+		}
+	}
+
+	if ($form->title eq "signin") {
+			$form->field(name => "name", required => 0);
+			$form->field(name => "password", type => "password", required => 0);
+
+			if ($form->submitted) {
+					my $submittype=$form->submitted;
+					# Set required fields based on how form was submitted.
+					my %required=(
+							"Login" => [qw(name password)],
+					);
+					foreach my $opt (@{$required{$submittype}}) {
+							$form->field(name => $opt, required => 1);
+					}
+
+					# Validate password against name for Login.
+					if ($submittype eq "Login") {
+							$form->field(
+									name => "password",
+									validate => sub {
+											checkpassword($form->field("name"), shift);
+									},
+							);
+					}
+
+					# XXX is this reachable? looks like no
+					elsif ($submittype eq "Login") {
+							$form->field(
+									name => "name",
+									validate => sub {
+											my $name=shift;
+											length $name &&
+											IkiWiki::userinfo_get($name, "regdate");
+									},
+							);
+					}
+			}
+			else {
+					# First time settings.
+					$form->field(name => "name");
+					if ($session->param("name")) {
+							$form->field(name => "name", value => $session->param("name"));
+					}
+			}
+	}
+	elsif ($form->title eq "preferences") {
+		$form->field(name => "name", disabled => 1,
+				value => $session->param("name"), force => 1,
+				fieldset => "login");
+		$form->field(name => "password", disabled => 1, type => "password",
+				fieldset => "login"),
+	}
+}
+
+sub formbuilder (@) {
+	my %params=@_;
+
+	my $form=$params{form};
+	my $session=$params{session};
+	my $cgi=$params{cgi};
+	my $buttons=$params{buttons};
+
+	if ($form->title eq "signin") {
+		if ($form->submitted && $form->validate) {
+			if ($form->submitted eq 'Login') {
+				$session->param("name", $form->field("name"));
+				IkiWiki::cgi_postsignin($cgi, $session);
+			}
+		}
+	}
+	elsif ($form->title eq "preferences") {
+		if ($form->submitted eq "Save Preferences" && $form->validate) {
+			my $user_name=$form->field('name');
+		}
+	}
+}
+
+sub sessioncgi ($$) {
+	my $q=shift;
+	my $session=shift;
+}
+
+1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 246c2260d..5953b3fee 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -554,6 +554,7 @@ sub refresh () {
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });
 	}
+	run_hooks(postrefresh => sub { shift->() });
 }
 
 sub commandline_render () {
-- 
cgit v1.2.3


From e8bdd1e22f8d322456ca6a6928fc7049e3fd0007 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Thu, 10 Sep 2009 17:41:52 -0400
Subject: PageSpec doesn't match cvs.pm after it moved, specify it explicitly
 in the map

---
 doc/users/schmonz.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index 8273bdbb6..7ebd8311c 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -1,3 +1,3 @@
 [Amitai Schlair](http://www.columbia.edu/~ays2105/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing:
 
-[[!map pages="link(users/schmonz) and plugins/* and !*/Discussion"]]
+[[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"]]
-- 
cgit v1.2.3


From a69d628b2cc15779a23c3d5ca1b27f2bc2dad619 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 11 Sep 2009 14:13:47 -0400
Subject: Whoops, copyright 2009. /usr/bin/perl for the interpreter like other
 plugins.

---
 IkiWiki/Plugin/cvs.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 4543489a6..1a0bad75f 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -1,7 +1,7 @@
-#!/usr/pkg/bin/perl
+#!/usr/bin/perl
 package IkiWiki::Plugin::cvs;
 
-# Copyright (c) 2008 Amitai Schlair
+# Copyright (c) 2009 Amitai Schlair
 # All rights reserved.
 #
 # This code is derived from software contributed to ikiwiki
-- 
cgit v1.2.3


From 412a4dd62ade18f5e057ff3324321188245a542e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 14:44:32 -0400
Subject: review

---
 doc/plugins/contrib/rsync/discussion.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn
index 20c04af0f..9b4184e5f 100644
--- a/doc/plugins/contrib/rsync/discussion.mdwn
+++ b/doc/plugins/contrib/rsync/discussion.mdwn
@@ -46,3 +46,17 @@ The wiki now lives on (1), and clicking "edit" just works. --[[schmonz]]
 >> This plugin is definitely still useful for projects not able to use
 >> a DVCS (of which I've got at least one other), and possibly for
 >> other uses not yet imagined. ;-) --[[schmonz]]
+
+----
+
+Revew: --[[Joey]] 
+
+* I think it should not throw an error if no command is set. Just don't do anything.
+* If the rsync fails, it currently errors out, which will probably also leave
+  the wiki in a broken state, since ikiwiki will not get a chance to save
+  its state. This seems fragile; what if the laptop is offline, or the
+  server is down, etc. Maybe it should just warn if the rsync fails?
+* Is a new hook really needed? The savestate hook runs at a similar time;
+  only issue with it is that it is run even when ikiwiki has not
+  rendered any updated pages. Bah, I think you do need the new hook, how
+  annoying..
-- 
cgit v1.2.3


From 245147312d83be2293b485871a48df055cf2c6d6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 14:46:03 -0400
Subject: Updated Czech translation from Miroslav Kure. Closes: #546223

---
 debian/changelog |   1 +
 po/cs.po         | 446 ++++++++++++++++++++++++++-----------------------------
 2 files changed, 214 insertions(+), 233 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1aa6c1c11..612792b86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
   * Add genwrapper hook, that can be used to add code into the C wrapper.
   * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by
     Amitai Schlair.
+  * Updated Czech translation from Miroslav Kure. Closes: #546223
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
 
diff --git a/po/cs.po b/po/cs.po
index 398a14211..0248d5f18 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,14 +1,14 @@
 # Czech translation of ikiwiki.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the ikiwiki package.
-# Miroslav Kure <kurem@debian.cz>, 2007.
+# Miroslav Kure <kurem@debian.cz>, 2007-2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-30 15:25-0400\n"
-"PO-Revision-Date: 2007-05-09 21:21+0200\n"
+"PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,8 @@ msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
+"pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale E"
+"zkoušíte se přihlásit přes http a ne přes https"
 
 #: ../IkiWiki/CGI.pm:149
 msgid "login failed, perhaps you need to turn on cookies?"
@@ -31,7 +33,7 @@ msgstr "přihlášení selhalo; možná si musíte povolit cookies?"
 
 #: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
 msgid "Your login session has expired."
-msgstr ""
+msgstr "Vaše sezení expirovalo."
 
 #: ../IkiWiki/CGI.pm:189
 msgid "Login"
@@ -59,11 +61,11 @@ msgstr "Chyba"
 
 #: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
-msgstr ""
+msgstr "Agregace spuštěna přes web."
 
 #: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
-msgstr ""
+msgstr "Není třeba nic dělat, všechny kanály jsou aktuální!"
 
 #: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
@@ -72,7 +74,7 @@ msgstr "chybí parametr %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
-msgstr "nový zdroj"
+msgstr "nový kanál"
 
 #: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
@@ -95,35 +97,35 @@ msgstr "expiruji %s"
 #: ../IkiWiki/Plugin/aggregate.pm:475
 #, perl-format
 msgid "last checked %s"
-msgstr ""
+msgstr "poslední kontrola %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:479
 #, perl-format
 msgid "checking feed %s ..."
-msgstr "kontroluji zdroj %s ..."
+msgstr "kontroluji kanál %s ..."
 
 #: ../IkiWiki/Plugin/aggregate.pm:484
 #, perl-format
 msgid "could not find feed at %s"
-msgstr "nemohu najít zdroj na %s"
+msgstr "nemohu najít kanál na %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:503
 msgid "feed not found"
-msgstr "zdroj nebyl nalezen"
+msgstr "kanál nebyl nalezen"
 
 #: ../IkiWiki/Plugin/aggregate.pm:514
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
-msgstr "(neplatné UTF-8 bylo ze zdroje odstraněno)"
+msgstr "(neplatné UTF-8 bylo z kanálu odstraněno)"
 
 #: ../IkiWiki/Plugin/aggregate.pm:522
 #, perl-format
 msgid "(feed entities escaped)"
-msgstr ""
+msgstr "(entity byly v kanálu zakódovány)"
 
 #: ../IkiWiki/Plugin/aggregate.pm:530
 msgid "feed crashed XML::Feed!"
-msgstr "zdroj shodil XML::Feed!"
+msgstr "kanál shodil XML::Feed!"
 
 #: ../IkiWiki/Plugin/aggregate.pm:616
 #, perl-format
@@ -132,7 +134,7 @@ msgstr "vytvářím novou stránku %s"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:31
 msgid "deleting bucket.."
-msgstr ""
+msgstr "mažu bucket..."
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
 msgid "done"
@@ -141,54 +143,53 @@ msgstr "hotovo"
 #: ../IkiWiki/Plugin/amazon_s3.pm:97
 #, perl-format
 msgid "Must specify %s"
-msgstr ""
+msgstr "Musíte zadat %s"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
-#, fuzzy
 msgid "Failed to create S3 bucket: "
-msgstr "Nepodařilo se odeslat email."
+msgstr "Nepodařilo se vytvořit S3 bucket:"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
-#, fuzzy
 msgid "Failed to save file to S3: "
-msgstr "Nepodařilo se odeslat email."
+msgstr "Nepodařilo se uložit soubor na S3:"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:243
-#, fuzzy
 msgid "Failed to delete file from S3: "
-msgstr "nelze změnit velikost: %s"
+msgstr "Nelze smazat soubor z S3:"
 
 #: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
-msgstr ""
+msgstr "stránka nazvaná %s již existuje"
 
 #: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
-msgstr ""
+msgstr "zakázáno proměnnou allowed_attachments"
 
 #: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
-msgstr ""
+msgstr "chybné jméno souboru s přílohou"
 
 #: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
-msgstr ""
+msgstr "příloha nahrána"
 
 #: ../IkiWiki/Plugin/autoindex.pm:105
 msgid "automatic index generation"
-msgstr ""
+msgstr "automatické vytváření indexu"
 
 #: ../IkiWiki/Plugin/blogspam.pm:108
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
 msgstr ""
+"Je mi líto, ale podle <a href=\"http://blogspam.net/\">blogspam</a> to "
+"vypadá jako spam: "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:42
 #, perl-format
 msgid "%s from %s"
-msgstr ""
+msgstr "%s z %s"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:50
 msgid "There are no broken links!"
@@ -197,88 +198,88 @@ msgstr "Žádné porušené odkazy!"
 #: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
-msgstr ""
+msgstr "nepodporovaný formát stránky %s"
 
 #: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
-msgstr ""
+msgstr "komentář musí mít obsah"
 
 #: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
-msgstr ""
+msgstr "Anonym"
 
 #: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
-msgstr ""
+msgstr "chybný název stránky"
 
 #: ../IkiWiki/Plugin/comments.pm:345
-#, fuzzy, perl-format
+#, perl-format
 msgid "commenting on %s"
-msgstr "vytvářím %s"
+msgstr "komentář k %s"
 
 #: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
-msgstr ""
+msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat"
 
 #: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
-msgstr ""
+msgstr "komentáře na stránce „%s“ jsou uzamčeny"
 
 #: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
-msgstr ""
+msgstr "komentář uložen pro schválení"
 
 #: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
-msgstr ""
+msgstr "Váš komentář bude zobrazen po schválení moderátorem"
 
 #: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
-msgstr ""
+msgstr "Přidán komentář"
 
 #: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
-msgstr ""
+msgstr "Přidán komentář: %s"
 
 #: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
-msgstr ""
+msgstr "nejste přihlášeni jako správce"
 
 #: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
-msgstr ""
+msgstr "Schvalování komentářů"
 
 #: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
-msgstr ""
+msgstr "schvalování komentářů"
 
 #: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
-msgstr ""
+msgstr "Komentáře"
 
 #: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
 #: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
-msgstr "parametr %s je vyžadován"
+msgstr "parametr %s je povinný"
 
 #: ../IkiWiki/Plugin/cutpaste.pm:66
 msgid "no text was copied in this page"
-msgstr ""
+msgstr "na této stránce nebyl zkopírován žádný text"
 
 #: ../IkiWiki/Plugin/cutpaste.pm:69
 #, perl-format
 msgid "no text was copied in this page with id %s"
-msgstr ""
+msgstr "na této stránce nebyl zkopírován žádný text s id %s"
 
 #: ../IkiWiki/Plugin/editpage.pm:40
-#, fuzzy, perl-format
+#, perl-format
 msgid "removing old preview %s"
-msgstr "odstraňuji starou stránku %s"
+msgstr "odstraňuji starý náhled %s"
 
 #: ../IkiWiki/Plugin/editpage.pm:113
 #, perl-format
@@ -298,77 +299,72 @@ msgid "editing %s"
 msgstr "upravuji %s"
 
 #: ../IkiWiki/Plugin/edittemplate.pm:51
-#, fuzzy
 msgid "template not specified"
-msgstr "šablona %s nebyla nalezena"
+msgstr "nebyl zadán parametr template"
 
 #: ../IkiWiki/Plugin/edittemplate.pm:54
-#, fuzzy
 msgid "match not specified"
-msgstr "jméno souboru s obalem nebylo zadáno"
+msgstr "nebyl zadán parametr match"
 
 #: ../IkiWiki/Plugin/edittemplate.pm:62
 #, perl-format
 msgid "edittemplate %s registered for %s"
-msgstr ""
+msgstr "edittemplate %s byla zaregistrována pro %s"
 
 #: ../IkiWiki/Plugin/edittemplate.pm:133
-#, fuzzy
 msgid "failed to process"
-msgstr "nepodařilo se zpracovat:"
+msgstr "nepodařilo se zpracovat"
 
 #: ../IkiWiki/Plugin/format.pm:20
 msgid "must specify format and text"
-msgstr ""
+msgstr "musíte zadat formát a text"
 
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "fortune selhal"
 
 #: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
-#, fuzzy
 msgid "missing page"
-msgstr "chybí hodnoty"
+msgstr "chybějící stránka"
 
 #: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 #, perl-format
 msgid "The page %s does not exist."
-msgstr ""
+msgstr "Stránka %s neexistuje."
 
 #: ../IkiWiki/Plugin/getsource.pm:73
-#, fuzzy
 msgid "not a page"
-msgstr "nemohu číst %s: %s"
+msgstr "není stránkou"
 
 #: ../IkiWiki/Plugin/getsource.pm:75
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is an attachment, not a page."
-msgstr "%s není editovatelná stránka"
+msgstr "%s není ani příloha, ani stránka."
 
 #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
-msgstr ""
+msgstr "nejste oprávněni měnit %s"
 
 #: ../IkiWiki/Plugin/git.pm:666
 #, perl-format
 msgid "you cannot act on a file with mode %s"
-msgstr ""
+msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 
 #: ../IkiWiki/Plugin/git.pm:670
 msgid "you are not allowed to change file modes"
-msgstr ""
+msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
 #: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
-#, fuzzy, perl-format
+#, perl-format
 msgid "Must specify %s when using the %s plugin"
-msgstr "Při používání vyhledávacího modulu musíte zadat %s"
+msgstr "%s musíte zadat při každém použití modulu %s"
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
+msgstr "Nepodařilo se syntakticky rozebrat url, nelze určit doménová jméno."
 
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
@@ -381,32 +377,30 @@ msgstr "program není platným programem graphviz"
 #: ../IkiWiki/Plugin/highlight.pm:47
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
-msgstr ""
+msgstr "tohighlight obsahuje neznámý typ souboru „%s“"
 
 #: ../IkiWiki/Plugin/highlight.pm:58
 #, perl-format
 msgid "Source code: %s"
-msgstr ""
+msgstr "Zdrojový kód: %s"
 
 #: ../IkiWiki/Plugin/highlight.pm:123
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
-msgstr ""
+msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj"
 
 #: ../IkiWiki/Plugin/htmltidy.pm:50
-#, fuzzy
 msgid "htmltidy failed to parse this html"
-msgstr "nepodařilo se rozpoznat žádné smajlíky"
+msgstr "htmltidy se nepodařilo zpracovat toto html"
 
 #: ../IkiWiki/Plugin/img.pm:63
-#, fuzzy
 msgid "Image::Magick is not installed"
-msgstr "polygen není nainstalován"
+msgstr "Image::Magick není nainstalován"
 
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
-msgstr ""
+msgstr "chybné rozměry „%s“ (formát má být ŠxV)"
 
 #: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
 #: ../IkiWiki/Plugin/img.pm:135
@@ -420,32 +414,30 @@ msgid "failed to resize: %s"
 msgstr "nelze změnit velikost: %s"
 
 #: ../IkiWiki/Plugin/img.pm:152
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to determine size of image %s"
-msgstr "nelze změnit velikost: %s"
+msgstr "nelze určit velikost obrázku %s"
 
 #: ../IkiWiki/Plugin/inline.pm:92
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k wiki"
 
 #: ../IkiWiki/Plugin/inline.pm:138
-#, fuzzy
 msgid "page editing not allowed"
-msgstr "zdroj nebyl nalezen"
+msgstr "úprava stránky není povolena"
 
 #: ../IkiWiki/Plugin/inline.pm:155
-#, fuzzy
 msgid "missing pages parameter"
-msgstr "chybí parametr %s"
+msgstr "chybí parametr pages"
 
 #: ../IkiWiki/Plugin/inline.pm:191
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
-msgstr ""
+msgstr "parametry %s a %s nelze použít zároveň"
 
 #: ../IkiWiki/Plugin/inline.pm:212
 msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
 
 #: ../IkiWiki/Plugin/inline.pm:223
 #, perl-format
@@ -470,13 +462,13 @@ msgid "failed to run dot"
 msgstr "nepodařilo se spustit dot"
 
 #: ../IkiWiki/Plugin/lockedit.pm:47
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is locked and cannot be edited"
-msgstr "Stránka %s je zamknutá uživatelem %s a nelze ji měnit"
+msgstr "Stránka %s je zamknutá a nelze ji měnit"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
-msgstr ""
+msgstr "je povolen multimarkdown, ale Text::MultiMarkdown není nainstalován"
 
 #: ../IkiWiki/Plugin/mdwn.pm:67
 #, perl-format
@@ -489,14 +481,12 @@ msgid "stylesheet not found"
 msgstr "styl nebyl nalezen"
 
 #: ../IkiWiki/Plugin/meta.pm:196
-#, fuzzy
 msgid "redir page not found"
-msgstr "zdroj nebyl nalezen"
+msgstr "stránka, na kterou vede přesměrování, nebyla nalezena"
 
 #: ../IkiWiki/Plugin/meta.pm:210
-#, fuzzy
 msgid "redir cycle is not allowed"
-msgstr "zdroj nebyl nalezen"
+msgstr "cykly nejsou v přesměrování povoleny"
 
 #: ../IkiWiki/Plugin/mirrorlist.pm:42
 msgid "Mirrors"
@@ -523,13 +513,12 @@ msgid "Get an OpenID"
 msgstr "Získat OpenID"
 
 #: ../IkiWiki/Plugin/orphans.pm:45
-#, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Na každou stránku vede odkaz z jiné stránky."
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
 msgid "bad or missing template"
-msgstr ""
+msgstr "chybná nebo chybějící šablona"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:248
 msgid "Account creation successful. Now you can Login."
@@ -541,7 +530,7 @@ msgstr "Chyba při vytváření účtu."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:258
 msgid "No email address, so cannot email password reset instructions."
-msgstr ""
+msgstr "Bez e-mailové adresy nelze zaslat postup na resetování hesla."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:292
 msgid "Failed to send mail"
@@ -549,138 +538,144 @@ msgstr "Nepodařilo se odeslat email."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:294
 msgid "You have been mailed password reset instructions."
-msgstr ""
+msgstr "Postup na resetování hesla vám byl odeslán na e-mail."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:329
 msgid "incorrect password reset url"
-msgstr ""
+msgstr "chybné URL pro resetování hesla"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:332
 msgid "password reset denied"
-msgstr ""
+msgstr "resetování hesla bylo zamítnuto"
 
 #: ../IkiWiki/Plugin/pingee.pm:30
 msgid "Ping received."
-msgstr ""
+msgstr "Obdrženo pinknutí."
 
 #: ../IkiWiki/Plugin/pinger.pm:53
 msgid "requires 'from' and 'to' parameters"
-msgstr ""
+msgstr "vyžaduje parametry „from“ a „to“"
 
 #: ../IkiWiki/Plugin/pinger.pm:58
-#, fuzzy, perl-format
+#, perl-format
 msgid "Will ping %s"
-msgstr "upravuji %s"
+msgstr "Pinknu %s"
 
 #: ../IkiWiki/Plugin/pinger.pm:61
 #, perl-format
 msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
-msgstr ""
+msgstr "Ignoruji direktivu ping pro wiki %s (toto je wiki %s)"
 
 #: ../IkiWiki/Plugin/pinger.pm:77
-#, fuzzy
 msgid "LWP not found, not pinging"
-msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
+msgstr "LWP nebyl nalezen, nepinkám"
 
 #: ../IkiWiki/Plugin/po.pm:15
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
-msgstr ""
+msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35."
 
 #: ../IkiWiki/Plugin/po.pm:138
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is not a valid language code"
-msgstr "%s není editovatelná stránka"
+msgstr "%s není platným kódem jazyka"
 
 #: ../IkiWiki/Plugin/po.pm:150
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
+"%s není platnou hodnotou parametru po_link_to, používám po_link_to=default"
 
 #: ../IkiWiki/Plugin/po.pm:155
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
+"po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default"
 
 #: ../IkiWiki/Plugin/po.pm:385
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
-msgstr ""
+msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
 #: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
-#, fuzzy, perl-format
+#, perl-format
 msgid "building %s"
-msgstr "upravuji %s"
+msgstr "sestavuji %s"
 
 #: ../IkiWiki/Plugin/po.pm:426
 msgid "updated PO files"
-msgstr ""
+msgstr "aktualizovány PO soubory"
 
 #: ../IkiWiki/Plugin/po.pm:450
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
+"Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, budou "
+"odstraněny také její překlady."
 
 #: ../IkiWiki/Plugin/po.pm:470
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
+"Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
+"budou přejmenovány také její překlady."
 
 #: ../IkiWiki/Plugin/po.pm:869
 #, perl-format
 msgid "POT file (%s) does not exist"
-msgstr ""
+msgstr "POT soubor (%s) neexistuje"
 
 #: ../IkiWiki/Plugin/po.pm:883
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to copy underlay PO file to %s"
-msgstr "nelze zkompilovat %s"
+msgstr "nepodařilo se zkopírovat PO soubor na %s"
 
 #: ../IkiWiki/Plugin/po.pm:892
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to update %s"
-msgstr "nelze zkompilovat %s"
+msgstr "nepodařilo se aktualizovat %s"
 
 #: ../IkiWiki/Plugin/po.pm:898
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to copy the POT file to %s"
-msgstr "nelze zkompilovat %s"
+msgstr "nepodařilo se zkopírovat POT soubor na %s"
 
 #: ../IkiWiki/Plugin/po.pm:934
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: ../IkiWiki/Plugin/po.pm:947
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to translate %s"
-msgstr "nelze změnit velikost: %s"
+msgstr "nepodařilo se přeložit %s"
 
 #: ../IkiWiki/Plugin/po.pm:1031
 msgid "removed obsolete PO files"
-msgstr ""
+msgstr "odstraněny zastaralé PO soubory"
 
 #: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
 #: ../IkiWiki/Plugin/po.pm:1148
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to write %s"
-msgstr "nelze zapsat %s: %s"
+msgstr "nepodařilo se zapsat %s"
 
 #: ../IkiWiki/Plugin/po.pm:1106
-#, fuzzy
 msgid "failed to translate"
-msgstr "nepodařilo se spustit dot"
+msgstr "překlad se nezdařil"
 
 #: ../IkiWiki/Plugin/po.pm:1111
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to read %s"
-msgstr "nelze číst %s: %s"
+msgstr "nepodařilo se přečíst %s"
 
 #: ../IkiWiki/Plugin/po.pm:1160
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
+"neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
+"stránku"
 
 #: ../IkiWiki/Plugin/poll.pm:69
 msgid "vote"
@@ -695,9 +690,8 @@ msgid "polygen not installed"
 msgstr "polygen není nainstalován"
 
 #: ../IkiWiki/Plugin/polygen.pm:60
-#, fuzzy
 msgid "command failed"
-msgstr "fortune selhal"
+msgstr "příkaz selhal"
 
 #: ../IkiWiki/Plugin/postsparkline.pm:41
 msgid "missing formula"
@@ -774,109 +768,108 @@ msgstr "%A o poledni"
 #: ../IkiWiki/Plugin/progress.pm:34
 #, perl-format
 msgid "illegal percent value %s"
-msgstr ""
+msgstr "neplatná procentuální hodnota %s"
 
 #: ../IkiWiki/Plugin/progress.pm:59
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
-msgstr ""
+msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`"
 
 #: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
-msgstr ""
+msgstr "(Diff oříznut)"
 
 #: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
 #, perl-format
 msgid "%s does not exist"
-msgstr ""
+msgstr "%s neexistuje"
 
 #: ../IkiWiki/Plugin/remove.pm:38
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
-msgstr "Stránka %s je zamknutá uživatelem %s a nelze ji měnit"
+msgstr "%s není ve zdrojovém adresáři a proto nelze smazat"
 
 #: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is not a file"
-msgstr "%s není editovatelná stránka"
+msgstr "%s není souborem"
 
 #: ../IkiWiki/Plugin/remove.pm:134
 #, perl-format
 msgid "confirm removal of %s"
-msgstr ""
+msgstr "potvrďte odstranění %s"
 
 #: ../IkiWiki/Plugin/remove.pm:171
 msgid "Please select the attachments to remove."
-msgstr ""
+msgstr "Vyberte prosím přílohy, které se mají odstranit."
 
 #: ../IkiWiki/Plugin/remove.pm:211
 msgid "removed"
-msgstr ""
+msgstr "odstraněno"
 
 #: ../IkiWiki/Plugin/rename.pm:42
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
-msgstr ""
+msgstr "%s není ve zdrojovém adresáři a proto nelze přejmenovat"
 
 #: ../IkiWiki/Plugin/rename.pm:62
-#, fuzzy
 msgid "no change to the file name was specified"
-msgstr "jméno souboru s obalem nebylo zadáno"
+msgstr "jméno souboru nebylo změněno"
 
 #: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
-msgstr ""
+msgstr "neplatné jméno"
 
 #: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
-msgstr ""
+msgstr "%s již existuje"
 
 #: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
-msgstr ""
+msgstr "%s již na disku existuje"
 
 #: ../IkiWiki/Plugin/rename.pm:122
-#, fuzzy, perl-format
+#, perl-format
 msgid "rename %s"
-msgstr "zpracovávám %s"
+msgstr "přejmenování %s"
 
 #: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
-msgstr ""
+msgstr "Také přejmenovat podstránky a přílohy"
 
 #: ../IkiWiki/Plugin/rename.pm:247
 msgid "Only one attachment can be renamed at a time."
-msgstr ""
+msgstr "Najednou lze přejmenovat pouze jednu přílohu."
 
 #: ../IkiWiki/Plugin/rename.pm:250
 msgid "Please select the attachment to rename."
-msgstr ""
+msgstr "Vyberte přílohu, kterou chcete přejmenovat."
 
 #: ../IkiWiki/Plugin/rename.pm:347
 #, perl-format
 msgid "rename %s to %s"
-msgstr ""
+msgstr "přejmenování %s na %s"
 
 #: ../IkiWiki/Plugin/rename.pm:571
-#, fuzzy, perl-format
+#, perl-format
 msgid "update for rename of %s to %s"
-msgstr "aktualizace %s (%s) uživatelem %s"
+msgstr "aktualizace pro přejmenování %s na %s"
 
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
-msgstr ""
+msgstr "pro indexování %s je potřeba Digest::SHA1"
 
 #: ../IkiWiki/Plugin/search.pm:217
 msgid "search"
-msgstr ""
+msgstr "hledání"
 
 #: ../IkiWiki/Plugin/shortcut.pm:31
 #, perl-format
 msgid "shortcut plugin will not work without %s"
-msgstr ""
+msgstr "Modul shortcut nebude pracovat bez %s"
 
 #: ../IkiWiki/Plugin/shortcut.pm:44
 msgid "missing name or url parameter"
@@ -896,24 +889,21 @@ msgstr "nepodařilo se rozpoznat žádné smajlíky"
 
 #: ../IkiWiki/Plugin/sparkline.pm:72
 msgid "parse error"
-msgstr "chyba rozpoznávání"
+msgstr "chyba syntaktického rozboru"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-#, fuzzy
 msgid "invalid featurepoint diameter"
-msgstr "chybný průměr zvýrazněného bodu (featurepoint)"
+msgstr "chybný průměr zvýrazněného bodu"
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-#, fuzzy
 msgid "invalid featurepoint location"
-msgstr "chybné umístění zvýrazněného bodu (featurepoint)"
+msgstr "chybné umístění zvýrazněného bodu"
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
 msgid "missing values"
 msgstr "chybí hodnoty"
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
-#, fuzzy
 msgid "invalid height value"
 msgstr "chybná výška"
 
@@ -922,7 +912,6 @@ msgid "missing width parameter"
 msgstr "chybí parametr šířka (width)"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
-#, fuzzy
 msgid "invalid width value"
 msgstr "chybná šířka"
 
@@ -965,62 +954,62 @@ msgid "failed to process:"
 msgstr "nepodařilo se zpracovat:"
 
 #: ../IkiWiki/Plugin/teximg.pm:70
-#, fuzzy
 msgid "missing tex code"
-msgstr "chybí hodnoty"
+msgstr "chybí TeXový kód"
 
 #: ../IkiWiki/Plugin/teximg.pm:122
-#, fuzzy
 msgid "failed to generate image from code"
-msgstr "nelze změnit velikost: %s"
+msgstr "z kódu se nepodařilo vygenerovat obrázek"
 
 #: ../IkiWiki/Plugin/websetup.pm:89
 msgid "plugin"
-msgstr ""
+msgstr "modul"
 
 #: ../IkiWiki/Plugin/websetup.pm:108
 #, perl-format
 msgid "enable %s?"
-msgstr ""
+msgstr "povolit %s?"
 
 #: ../IkiWiki/Plugin/websetup.pm:240
 msgid "setup file for this wiki is not known"
-msgstr ""
+msgstr "konfigurační soubor této wiki je neznámý"
 
 #: ../IkiWiki/Plugin/websetup.pm:256
-#, fuzzy
 msgid "main"
-msgstr "Správce"
+msgstr "hlavní"
 
 #: ../IkiWiki/Plugin/websetup.pm:257
 msgid "plugins"
-msgstr ""
+msgstr "moduly"
 
 #: ../IkiWiki/Plugin/websetup.pm:395
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
-msgstr ""
+msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki."
 
 #: ../IkiWiki/Plugin/websetup.pm:399
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
+"Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset "
+"znovusestavit wiki."
 
 #: ../IkiWiki/Plugin/websetup.pm:436
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
+"Chyba: %s skončil s nenulovým návratovým kódem (%s). Ruším změny v konfiguraci"
 
 #: ../IkiWiki/Receive.pm:35
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
-msgstr ""
+msgstr "nemohu určit identitu nedůvěryhodného uživatele %s"
 
 #: ../IkiWiki/Receive.pm:85
-#, fuzzy, perl-format
+#, perl-format
 msgid "bad file name %s"
-msgstr "přeskakuji chybné jméno souboru %s"
+msgstr "chybné jméno souboru %s"
 
 #: ../IkiWiki/Render.pm:266
 #, perl-format
@@ -1028,6 +1017,8 @@ msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
+"v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-li "
+"to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
 
 #: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
@@ -1037,7 +1028,7 @@ msgstr "přeskakuji chybné jméno souboru %s"
 #: ../IkiWiki/Render.pm:296
 #, perl-format
 msgid "%s has multiple possible source pages"
-msgstr ""
+msgstr "%s má několik možných zdrojových stránek"
 
 #: ../IkiWiki/Render.pm:382
 #, perl-format
@@ -1050,29 +1041,29 @@ msgid "scanning %s"
 msgstr "prohledávám %s"
 
 #: ../IkiWiki/Render.pm:450
-#, fuzzy, perl-format
+#, perl-format
 msgid "building %s, which links to %s"
-msgstr "zpracovávám %s, která odkazuje na %s"
+msgstr "sestavuji %s, která odkazuje na %s"
 
 #: ../IkiWiki/Render.pm:497
-#, fuzzy, perl-format
+#, perl-format
 msgid "building %s, which depends on %s"
-msgstr "zpracovávám %s, která závisí na %s"
+msgstr "sestavuji %s, která závisí na %s"
 
 #: ../IkiWiki/Render.pm:533
-#, fuzzy, perl-format
+#, perl-format
 msgid "building %s, to update its backlinks"
-msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy"
+msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
 
 #: ../IkiWiki/Render.pm:545
-#, fuzzy, perl-format
+#, perl-format
 msgid "removing %s, no longer built by %s"
-msgstr "odstraňuji %s, již není zpracovávána %s"
+msgstr "odstraňuji %s, již není sestavována pomocí %s"
 
 #: ../IkiWiki/Render.pm:569
-#, fuzzy, perl-format
+#, perl-format
 msgid "ikiwiki: cannot build %s"
-msgstr "ikiwiki: nelze zpracovat %s"
+msgstr "ikiwiki: nelze sestavit %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
@@ -1083,21 +1074,21 @@ msgstr "nemohu číst %s: %s"
 
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
-msgstr ""
+msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)"
 
 #: ../IkiWiki/Setup/Automator.pm:71
 #, perl-format
 msgid "unsupported revision control system %s"
-msgstr ""
+msgstr "nepodporovaný systém pro správu verzí: %s"
 
 #: ../IkiWiki/Setup/Automator.pm:97
 msgid "failed to set up the repository with ikiwiki-makerepo"
-msgstr ""
+msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo"
 
 #: ../IkiWiki/Setup/Automator.pm:115
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
-msgstr ""
+msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:"
 
 #: ../IkiWiki/Wrapper.pm:16
 #, perl-format
@@ -1130,11 +1121,11 @@ msgstr "použití: ikiwiki [volby] zdroj cíl"
 
 #: ../ikiwiki.in:14
 msgid "       ikiwiki --setup configfile"
-msgstr ""
+msgstr "       ikiwiki --setup konfigurační.soubor"
 
 #: ../ikiwiki.in:91
 msgid "usage: --set var=value"
-msgstr ""
+msgstr "použití: --set proměnná=hodnota"
 
 #: ../ikiwiki.in:140
 msgid "generating wrappers.."
@@ -1142,7 +1133,7 @@ msgstr "generuji obaly..."
 
 #: ../ikiwiki.in:199
 msgid "rebuilding wiki.."
-msgstr "znovu vytvářím wiki..."
+msgstr "znovusestavuji wiki..."
 
 #: ../ikiwiki.in:202
 msgid "refreshing wiki.."
@@ -1158,65 +1149,68 @@ msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
 #: ../IkiWiki.pm:540
 msgid "cannot use multiple rcs plugins"
-msgstr ""
+msgstr "nelze použít několik rcs modulů"
 
 #: ../IkiWiki.pm:569
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
-msgstr ""
+msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
 #: ../IkiWiki.pm:1251
-#, fuzzy, perl-format
+#, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
-msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"
+msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
 #: ../IkiWiki.pm:1808
 msgid "yes"
-msgstr ""
+msgstr "ano"
 
 #: ../IkiWiki.pm:1932
-#, fuzzy, perl-format
+#, perl-format
 msgid "cannot match pages: %s"
-msgstr "nemohu číst %s: %s"
+msgstr "nelze vybrat stránky: %s"
 
 #: ../auto.setup:16
 msgid "What will the wiki be named?"
-msgstr ""
+msgstr "Jak se bude wiki jmenovat?"
 
 #: ../auto.setup:16
 msgid "wiki"
-msgstr ""
+msgstr "wiki"
 
 #: ../auto.setup:18
 msgid "What revision control system to use?"
-msgstr ""
+msgstr "Který systém pro správu verzí se má použít?"
 
 #: ../auto.setup:20
 msgid "Which user (wiki account or openid) will be admin?"
-msgstr ""
+msgstr "Který uživatel (wiki účet nebo openid) bude správce?"
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
-msgstr ""
+msgstr "Jaké je doménové jméno webového serveru?"
 
 #~ msgid "discussion"
 #~ msgstr "diskuse"
 
-#~ msgid "rendering %s"
-#~ msgstr "zpracovávám %s"
+#~ msgid "processed ok at %s"
+#~ msgstr "zpracováno ok %s"
 
-#, fuzzy
-#~ msgid "Must specify %s when using the google search plugin"
-#~ msgstr "Při používání vyhledávacího modulu musíte zadat %s"
+#~ msgid "failed to find url in html"
+#~ msgstr "v html se nepodařilo nalézt url"
 
 #~ msgid "bad size \"%s\""
 #~ msgstr "chybná velikost \"%s\""
 
-#~ msgid "failed to find url in html"
-#~ msgstr "v html se nepodařilo nalézt url"
+#~ msgid "code includes disallowed latex commands"
+#~ msgstr "kód obsahuje nepovolené příkazy LaTeXu"
 
-#~ msgid "processed ok at %s"
-#~ msgstr "zpracováno ok %s"
+#~ msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
+#~ msgstr ""
+#~ "<p class=\"error\">Chyba: %s skončil s nenulovým návratovým kódem (%s)"
+
+#~ msgid "rendering %s"
+#~ msgstr "zpracovávám %s"
 
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Vaše heslo vám bylo zasláno."
@@ -1230,20 +1224,6 @@ msgstr ""
 #~ msgid "updating hyperestraier search index"
 #~ msgstr "aktualizuji vyhledávací index hyperestraieru"
 
-#, fuzzy
-#~ msgid ""
-#~ "REV is not set, not running from mtn post-commit hook, cannot send "
-#~ "notifications"
-#~ msgstr ""
-#~ "REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat "
-#~ "oznámení"
-
-#, fuzzy
-#~ msgid "REV is not a valid revision identifier, cannot send notifications"
-#~ msgstr ""
-#~ "REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat "
-#~ "oznámení"
-
 #~ msgid ""
 #~ "REV is not set, not running from svn post-commit hook, cannot send "
 #~ "notifications"
-- 
cgit v1.2.3


From 1846bd30611c69e223e1bb8d3ff5d4b9444dd51c Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 11 Sep 2009 14:13:47 -0400
Subject: Whoops, copyright 2009. /usr/bin/perl for the interpreter like other
 plugins. (cherry picked from commit a69d628b2cc15779a23c3d5ca1b27f2bc2dad619)

---
 IkiWiki/Plugin/cvs.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 4543489a6..1a0bad75f 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -1,7 +1,7 @@
-#!/usr/pkg/bin/perl
+#!/usr/bin/perl
 package IkiWiki::Plugin::cvs;
 
-# Copyright (c) 2008 Amitai Schlair
+# Copyright (c) 2009 Amitai Schlair
 # All rights reserved.
 #
 # This code is derived from software contributed to ikiwiki
-- 
cgit v1.2.3


From 544cedaa1903c6314ed7ba98d96965a4017944ec Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 11 Sep 2009 17:34:47 -0400
Subject: response

---
 doc/plugins/contrib/rsync/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn
index 9b4184e5f..b162fbd6b 100644
--- a/doc/plugins/contrib/rsync/discussion.mdwn
+++ b/doc/plugins/contrib/rsync/discussion.mdwn
@@ -60,3 +60,9 @@ Revew: --[[Joey]]
   only issue with it is that it is run even when ikiwiki has not
   rendered any updated pages. Bah, I think you do need the new hook, how
   annoying..
+
+> * Depends whether the plugin would be on by default. If yes, then yes.
+>   If the admin has to enable it, I'd think they'd want the error.
+> * Changed the other errors to warnings.
+> * The name might be wrong: there isn't anything rsync-specific about the
+>   plugin, that's just the command I personally need to run. --[[schmonz]]
-- 
cgit v1.2.3


From 604037b0f258f91c323c07ff985e8732a6d73e86 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 11 Sep 2009 17:42:51 -0400
Subject: Don't error out, either warn or say nothing, depending.

---
 IkiWiki/Plugin/rsync.pm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 3f049457b..70dd5a4c9 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -7,7 +7,6 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "rsync", call => \&getsetup);
-	hook(type => "checkconfig", id => "rsync", call => \&checkconfig);
 	hook(type => "postrefresh", id => "rsync", call => \&postrefresh);
 }
 
@@ -26,19 +25,14 @@ sub getsetup () {
 		},
 }
 
-sub checkconfig {
-	if (! exists $config{rsync_command} ||
-	    ! defined $config{rsync_command}) {
-		error("Must specify rsync_command");
-	}
-}
-
 sub postrefresh () {
-	system $config{rsync_command};
-	if ($? == -1) {
-		error("failed to execute rsync_command: $!");
-	} elsif ($? != 0) {
-		error(sprintf("rsync_command exited %d", $? >> 8));
+	if (defined $config{rsync_command}) {
+		system $config{rsync_command};
+		if ($? == -1) {
+			warn("failed to execute rsync_command: $!");
+		} elsif ($? != 0) {
+			warn(sprintf("rsync_command exited %d", $? >> 8));
+		}
 	}
 }
 
-- 
cgit v1.2.3


From a7d7acc0f761fff16637e427f30d365b54be1a33 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 17:47:31 -0400
Subject: resp

---
 doc/plugins/contrib/rsync/discussion.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn
index b162fbd6b..6bf7a3826 100644
--- a/doc/plugins/contrib/rsync/discussion.mdwn
+++ b/doc/plugins/contrib/rsync/discussion.mdwn
@@ -66,3 +66,12 @@ Revew: --[[Joey]]
 > * Changed the other errors to warnings.
 > * The name might be wrong: there isn't anything rsync-specific about the
 >   plugin, that's just the command I personally need to run. --[[schmonz]]
+
+>> One problem with the error is that it prevents dumping a new setup file with
+>> the plugin enabled, and then editing it to configure. ie:
+
+	joey@gnu:~>ikiwiki -setup .ikiwiki/joeywiki.setup -plugin rsync -dumpsetup new.setup
+	Must specify rsync_command
+
+> rsync seems by far the most likely command, though someone might use something
+> to push via ftp instead. I think calling it rsync is ok. --[[Joey]] 
-- 
cgit v1.2.3


From dcc177440e6629c2a0314b8050c4ee8c6e14fd63 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 18:15:19 -0400
Subject: remove unixauth; I am only adding render at the moment

yeah, you need branches :P
---
 IkiWiki/Plugin/unixauth.pm | 195 ---------------------------------------------
 1 file changed, 195 deletions(-)
 delete mode 100644 IkiWiki/Plugin/unixauth.pm

diff --git a/IkiWiki/Plugin/unixauth.pm b/IkiWiki/Plugin/unixauth.pm
deleted file mode 100644
index 4f0cb4dd2..000000000
--- a/IkiWiki/Plugin/unixauth.pm
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/perl
-# Ikiwiki unixauth authentication.
-package IkiWiki::Plugin::unixauth;
-
-use warnings;
-use strict;
-use IkiWiki 2.00;
-
-sub import {
-	hook(type => "getsetup", id => "unixauth", call => \&getsetup);
-		hook(type => "formbuilder_setup", id => "unixauth",
-			call => \&formbuilder_setup);
-		hook(type => "formbuilder", id => "unixauth",
-			call => \&formbuilder);
-	hook(type => "sessioncgi", id => "unixauth", call => \&sessioncgi);
-}
-
-sub getsetup () {
-	return
-	unixauth_type => {
-			type => "string",
-			example => "checkpassword",
-			description => "type of authenticator; can be 'checkpassword' or 'pwauth'",
-			safe => 0,
-			rebuild => 1,
-	},
-	unixauth_command => {
-			type => "string",
-			example => "/path/to/checkpassword",
-			description => "full path and any arguments",
-			safe => 0,
-			rebuild => 1,
-	},
-	unixauth_requiressl => {
-			type => "boolean",
-			example => "1",
-			description => "require SSL? strongly recommended",
-			safe => 0,
-			rebuild => 1,
-	},
-	plugin => {
-			description => "Unix user authentication",
-			safe => 0,
-			rebuild => 1,
-	},
-}
-
-# Checks if a string matches a user's password, and returns true or false.
-sub checkpassword ($$;$) {
-	my $user=shift;
-	my $password=shift;
-	my $field=shift || "password";
-
-	# It's very important that the user not be allowed to log in with
-	# an empty password!
-	if (! length $password) {
-			return 0;
-	}
-
-	my $ret=0;
-	if (! exists $config{unixauth_type}) {
-			# admin needs to carefully think over his configuration
-			return 0;
-	}
-	elsif ($config{unixauth_type} eq "checkpassword") {
-			open UNIXAUTH, "|$config{unixauth_command} true 3<&0" or die("Could not run $config{unixauth_type}");
-			print UNIXAUTH "$user\0$password\0Y123456\0";
-			close UNIXAUTH;
-			$ret=!($?>>8);
-	}
-	elsif ($config{unixauth_type} eq "pwauth") {
-			open UNIXAUTH, "|$config{unixauth_command}" or die("Could not run $config{unixauth_type}");
-			print UNIXAUTH "$user\n$password\n";
-			close UNIXAUTH;
-			$ret=!($?>>8);
-	}
-	else {
-			# no such authentication type
-			return 0;
-	}
-
-	if ($ret) {
-		my $userinfo=IkiWiki::userinfo_retrieve();
-		if (! length $user || ! defined $userinfo ||
-			! exists $userinfo->{$user} || ! ref $userinfo->{$user}) {
-				IkiWiki::userinfo_setall($user, {
-					'email' => '',
-					'regdate' => time,
-				});
-		}
-	}
-
-	return $ret;
-}
-
-sub formbuilder_setup (@) {
-	my %params=@_;
-
-	my $form=$params{form};
-	my $session=$params{session};
-	my $cgi=$params{cgi};
-
-	# if not under SSL, die before even showing a login form,
-	# unless the admin explicitly says it's fine
-	if (! exists $config{unixauth_requiressl}) {
-			$config{unixauth_requiressl} = 1;
-	}
-	if ($config{unixauth_requiressl}) {
-		if ((! $config{sslcookie}) || (! exists $ENV{'HTTPS'})) {
-			die("SSL required to login. Contact your administrator.<br>");
-		}
-	}
-
-	if ($form->title eq "signin") {
-			$form->field(name => "name", required => 0);
-			$form->field(name => "password", type => "password", required => 0);
-
-			if ($form->submitted) {
-					my $submittype=$form->submitted;
-					# Set required fields based on how form was submitted.
-					my %required=(
-							"Login" => [qw(name password)],
-					);
-					foreach my $opt (@{$required{$submittype}}) {
-							$form->field(name => $opt, required => 1);
-					}
-
-					# Validate password against name for Login.
-					if ($submittype eq "Login") {
-							$form->field(
-									name => "password",
-									validate => sub {
-											checkpassword($form->field("name"), shift);
-									},
-							);
-					}
-
-					# XXX is this reachable? looks like no
-					elsif ($submittype eq "Login") {
-							$form->field(
-									name => "name",
-									validate => sub {
-											my $name=shift;
-											length $name &&
-											IkiWiki::userinfo_get($name, "regdate");
-									},
-							);
-					}
-			}
-			else {
-					# First time settings.
-					$form->field(name => "name");
-					if ($session->param("name")) {
-							$form->field(name => "name", value => $session->param("name"));
-					}
-			}
-	}
-	elsif ($form->title eq "preferences") {
-		$form->field(name => "name", disabled => 1,
-				value => $session->param("name"), force => 1,
-				fieldset => "login");
-		$form->field(name => "password", disabled => 1, type => "password",
-				fieldset => "login"),
-	}
-}
-
-sub formbuilder (@) {
-	my %params=@_;
-
-	my $form=$params{form};
-	my $session=$params{session};
-	my $cgi=$params{cgi};
-	my $buttons=$params{buttons};
-
-	if ($form->title eq "signin") {
-		if ($form->submitted && $form->validate) {
-			if ($form->submitted eq 'Login') {
-				$session->param("name", $form->field("name"));
-				IkiWiki::cgi_postsignin($cgi, $session);
-			}
-		}
-	}
-	elsif ($form->title eq "preferences") {
-		if ($form->submitted eq "Save Preferences" && $form->validate) {
-			my $user_name=$form->field('name');
-		}
-	}
-}
-
-sub sessioncgi ($$) {
-	my $q=shift;
-	my $session=shift;
-}
-
-1
-- 
cgit v1.2.3


From 2d9e97c283cb7b1ecdd524e60bddec17ee638835 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 18:19:21 -0400
Subject: chdir to the destdir before running rsync

Avoids needing to specify the path in the rsync command, can just use "."
---
 IkiWiki/Plugin/rsync.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 3f049457b..7c3fc127c 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -19,8 +19,8 @@ sub getsetup () {
 		},
 		rsync_command => {
 			type => "string",
-			example => "rsync -qa --delete /path/to/destdir/ user\@host:/path/to/docroot/",
-			description => "unattended command to upload regenerated pages",
+			example => "rsync -qa --delete . user\@host:/path/to/docroot/",
+			description => "command to run to sync updated pages",
 			safe => 0,
 			rebuild => 0,
 		},
@@ -34,6 +34,7 @@ sub checkconfig {
 }
 
 sub postrefresh () {
+	chdir($config{destdir}) || error("chdir: $!");
 	system $config{rsync_command};
 	if ($? == -1) {
 		error("failed to execute rsync_command: $!");
-- 
cgit v1.2.3


From 3c80557054fbaca6d0614e4327d49e721b9d4fdc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 18:22:06 -0400
Subject: localize user-visible warnings and tack on missing newlines

---
 IkiWiki/Plugin/rsync.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 9afbe9487..a62347a44 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -30,10 +30,10 @@ sub postrefresh () {
 		chdir($config{destdir}) || error("chdir: $!");
 		system $config{rsync_command};
 		if ($? == -1) {
-			warn("failed to execute rsync_command: $!");
+			warn(sprintf(gettext("failed to execute rsync_command: %s"), $!))."\n";
 		}
 		elsif ($? != 0) {
-			warn(sprintf("rsync_command exited %d", $? >> 8));
+			warn(sprintf(gettext("rsync_command exited %d"), $? >> 8))."\n";
 		}
 	}
 }
-- 
cgit v1.2.3


From 5b818c9f2ac9c9a2d953f29194913036ab26c225 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 18:28:35 -0400
Subject: doc update, add --exclude ikiwiki.cgi to examples

---
 IkiWiki/Plugin/rsync.pm                   |  2 +-
 doc/plugins/contrib/rsync.mdwn            | 21 ---------
 doc/plugins/contrib/rsync/discussion.mdwn | 77 -------------------------------
 doc/plugins/rsync.mdwn                    | 17 +++++++
 doc/plugins/rsync/discussion.mdwn         | 77 +++++++++++++++++++++++++++++++
 5 files changed, 95 insertions(+), 99 deletions(-)
 delete mode 100644 doc/plugins/contrib/rsync.mdwn
 delete mode 100644 doc/plugins/contrib/rsync/discussion.mdwn
 create mode 100644 doc/plugins/rsync.mdwn
 create mode 100644 doc/plugins/rsync/discussion.mdwn

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index a62347a44..f14989ff8 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -18,7 +18,7 @@ sub getsetup () {
 		},
 		rsync_command => {
 			type => "string",
-			example => "rsync -qa --delete . user\@host:/path/to/docroot/",
+			example => "rsync -qa --delete . user\@host:/path/to/docroot/ --exclude ikiwiki.cgi",
 			description => "command to run to sync updated pages",
 			safe => 0,
 			rebuild => 0,
diff --git a/doc/plugins/contrib/rsync.mdwn b/doc/plugins/contrib/rsync.mdwn
deleted file mode 100644
index 71cd63947..000000000
--- a/doc/plugins/contrib/rsync.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-[[!template id=plugin name=rsync core=0 author="[[schmonz]]"]]
-
-[[!template id=gitbranch branch=schmonz author="[[schmonz]]"]]
-
-This plugin allows ikiwiki to push generated pages to another host
-by running a command such as `rsync`.
-
-### Usage
-7. Enable automated SSH key exchange between ikiwiki and the remote
-   host. [keychain](http://www.gentoo.org/proj/en/keychain/) makes
-   it easy to use a passphrase-protected key for this purpose. It's
-   also a good idea to specify the exact command line to be permitted
-   in the remote host's `$HOME/.ssh/authorized_keys`.
-7. Set `rsync_command` in your setup file. If you're using a
-   passphrase-protected key, then set `rsync_command` to a shell
-   script which reads `keychain`'s current state before calling
-   `rsync`.
-
-### Implementation details
-* The plugin relies on a new "postrefresh" hook called at the very end of
-  `IkiWiki/Render.pm:refresh()`.
diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn
deleted file mode 100644
index 6bf7a3826..000000000
--- a/doc/plugins/contrib/rsync/discussion.mdwn
+++ /dev/null
@@ -1,77 +0,0 @@
-## A use case
-
-Why I needed this plugin: I have two web servers available to me
-for a project. Neither does everything I need, but together they
-do. (This is a bit like the [Amazon S3
-scenario](http://kitenet.net/~joey/blog/entry/running_a_wiki_on_Amazon_S3/).)
-
-Server (1) is a university web server. It provides plentiful space
-and bandwidth, easy authentication for people editing the wiki, and
-a well-known stable URL. The wiki really wants to live here and
-very easily could except that the server doesn't allow arbitrary
-CGIs.
-
-Server (2) is provided by a generous alumnus's paid [[tips/DreamHost]]
-account. Disk and particularly network usage need to be minimized
-because over some threshold it costs him. CGI, etc. are available.
-
-My plan was to host the wiki on server (1) by taking advantage of
-server (2) to store the repository, source checkout, and generated
-pages, to host the repository browser, and to handle ikiwiki's CGI
-operations. In order for this to work, web edits on (2) would need
-to automatically push any changed pages to (1).
-
-As a proof of concept, I added an rsync post-commit hook after
-ikiwiki's usual. It worked, just not for web edits, which is how
-the wiki will be used. So I wrote this plugin to finish the job.
-The wiki now lives on (1), and clicking "edit" just works. --[[schmonz]]
-
-> Just out of interest, why use `rsync` and not `git push`.  i.e. a
-> different setup to solve the same problem would be to run a
-> normal ikiwiki setup on the universities server with its git
-> repository available over ssh (same security setup your using
-> for rsync should work for git over ssh).  On the cgi-capable server,
-> when it would rsync, make it git push.  It would seem that git
-> has enough information that it should be able to be more
-> network efficient.  It also means that corruption at one end
-> wouldn't be propagated to the other end. -- [[Will]]
-
->> Hey, that's a nice solution. (The site was in svn to begin with,
->> but it's in git now.) One advantage of my approach in this particular
->> case: server (1) doesn't have `git` installed, but does have `rsync`,
->> so (1)'s environment can remain completely untweaked other than the
->> SSH arrangement. I kind of like that all the sysadmin effort is
->> contained on one host.
->>
->> This plugin is definitely still useful for projects not able to use
->> a DVCS (of which I've got at least one other), and possibly for
->> other uses not yet imagined. ;-) --[[schmonz]]
-
-----
-
-Revew: --[[Joey]] 
-
-* I think it should not throw an error if no command is set. Just don't do anything.
-* If the rsync fails, it currently errors out, which will probably also leave
-  the wiki in a broken state, since ikiwiki will not get a chance to save
-  its state. This seems fragile; what if the laptop is offline, or the
-  server is down, etc. Maybe it should just warn if the rsync fails?
-* Is a new hook really needed? The savestate hook runs at a similar time;
-  only issue with it is that it is run even when ikiwiki has not
-  rendered any updated pages. Bah, I think you do need the new hook, how
-  annoying..
-
-> * Depends whether the plugin would be on by default. If yes, then yes.
->   If the admin has to enable it, I'd think they'd want the error.
-> * Changed the other errors to warnings.
-> * The name might be wrong: there isn't anything rsync-specific about the
->   plugin, that's just the command I personally need to run. --[[schmonz]]
-
->> One problem with the error is that it prevents dumping a new setup file with
->> the plugin enabled, and then editing it to configure. ie:
-
-	joey@gnu:~>ikiwiki -setup .ikiwiki/joeywiki.setup -plugin rsync -dumpsetup new.setup
-	Must specify rsync_command
-
-> rsync seems by far the most likely command, though someone might use something
-> to push via ftp instead. I think calling it rsync is ok. --[[Joey]] 
diff --git a/doc/plugins/rsync.mdwn b/doc/plugins/rsync.mdwn
new file mode 100644
index 000000000..0ab3872d9
--- /dev/null
+++ b/doc/plugins/rsync.mdwn
@@ -0,0 +1,17 @@
+[[!template id=plugin name=rsync author="[[schmonz]]"]]
+
+This plugin allows ikiwiki to push generated pages to another host
+by running a command such as `rsync`.
+
+The command to run is specified by setting `rsync_command` in your setup
+file. The command will be run in your destdir, so something like this
+is a typical command:
+
+	rsync -qa --delete . user\@host:/path/to/docroot/ --exclude ikiwiki.cgi
+
+If using rsync over ssh, you will need to enable noninteractive ssh login
+to the remote host. It's also a good idea to specify the exact command line
+to be permitted in the remote host's `$HOME/.ssh/authorized_keys`.
+
+Be sure to exclude the `ikiwiki.cgi` wrapper from being sent to the remote
+host.
diff --git a/doc/plugins/rsync/discussion.mdwn b/doc/plugins/rsync/discussion.mdwn
new file mode 100644
index 000000000..6bf7a3826
--- /dev/null
+++ b/doc/plugins/rsync/discussion.mdwn
@@ -0,0 +1,77 @@
+## A use case
+
+Why I needed this plugin: I have two web servers available to me
+for a project. Neither does everything I need, but together they
+do. (This is a bit like the [Amazon S3
+scenario](http://kitenet.net/~joey/blog/entry/running_a_wiki_on_Amazon_S3/).)
+
+Server (1) is a university web server. It provides plentiful space
+and bandwidth, easy authentication for people editing the wiki, and
+a well-known stable URL. The wiki really wants to live here and
+very easily could except that the server doesn't allow arbitrary
+CGIs.
+
+Server (2) is provided by a generous alumnus's paid [[tips/DreamHost]]
+account. Disk and particularly network usage need to be minimized
+because over some threshold it costs him. CGI, etc. are available.
+
+My plan was to host the wiki on server (1) by taking advantage of
+server (2) to store the repository, source checkout, and generated
+pages, to host the repository browser, and to handle ikiwiki's CGI
+operations. In order for this to work, web edits on (2) would need
+to automatically push any changed pages to (1).
+
+As a proof of concept, I added an rsync post-commit hook after
+ikiwiki's usual. It worked, just not for web edits, which is how
+the wiki will be used. So I wrote this plugin to finish the job.
+The wiki now lives on (1), and clicking "edit" just works. --[[schmonz]]
+
+> Just out of interest, why use `rsync` and not `git push`.  i.e. a
+> different setup to solve the same problem would be to run a
+> normal ikiwiki setup on the universities server with its git
+> repository available over ssh (same security setup your using
+> for rsync should work for git over ssh).  On the cgi-capable server,
+> when it would rsync, make it git push.  It would seem that git
+> has enough information that it should be able to be more
+> network efficient.  It also means that corruption at one end
+> wouldn't be propagated to the other end. -- [[Will]]
+
+>> Hey, that's a nice solution. (The site was in svn to begin with,
+>> but it's in git now.) One advantage of my approach in this particular
+>> case: server (1) doesn't have `git` installed, but does have `rsync`,
+>> so (1)'s environment can remain completely untweaked other than the
+>> SSH arrangement. I kind of like that all the sysadmin effort is
+>> contained on one host.
+>>
+>> This plugin is definitely still useful for projects not able to use
+>> a DVCS (of which I've got at least one other), and possibly for
+>> other uses not yet imagined. ;-) --[[schmonz]]
+
+----
+
+Revew: --[[Joey]] 
+
+* I think it should not throw an error if no command is set. Just don't do anything.
+* If the rsync fails, it currently errors out, which will probably also leave
+  the wiki in a broken state, since ikiwiki will not get a chance to save
+  its state. This seems fragile; what if the laptop is offline, or the
+  server is down, etc. Maybe it should just warn if the rsync fails?
+* Is a new hook really needed? The savestate hook runs at a similar time;
+  only issue with it is that it is run even when ikiwiki has not
+  rendered any updated pages. Bah, I think you do need the new hook, how
+  annoying..
+
+> * Depends whether the plugin would be on by default. If yes, then yes.
+>   If the admin has to enable it, I'd think they'd want the error.
+> * Changed the other errors to warnings.
+> * The name might be wrong: there isn't anything rsync-specific about the
+>   plugin, that's just the command I personally need to run. --[[schmonz]]
+
+>> One problem with the error is that it prevents dumping a new setup file with
+>> the plugin enabled, and then editing it to configure. ie:
+
+	joey@gnu:~>ikiwiki -setup .ikiwiki/joeywiki.setup -plugin rsync -dumpsetup new.setup
+	Must specify rsync_command
+
+> rsync seems by far the most likely command, though someone might use something
+> to push via ftp instead. I think calling it rsync is ok. --[[Joey]] 
-- 
cgit v1.2.3


From a7545978c76902076b42b774938e6f60b96aa396 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 18:29:56 -0400
Subject: got rid of the postrefresh hook after all

Instead, use the change and delete hooks, and launch rsync if either hook
is called.
---
 IkiWiki/Plugin/rsync.pm | 8 ++++++--
 IkiWiki/Render.pm       | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index f14989ff8..45bff19bd 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -7,7 +7,8 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "rsync", call => \&getsetup);
-	hook(type => "postrefresh", id => "rsync", call => \&postrefresh);
+	hook(type => "change", id => "rsync", call => \&postrefresh);
+	hook(type => "delete", id => "rsync", call => \&postrefresh);
 }
 
 sub getsetup () {
@@ -25,8 +26,11 @@ sub getsetup () {
 		},
 }
 
+my $ran=0;
+
 sub postrefresh () {
-	if (defined $config{rsync_command}) {
+	if (defined $config{rsync_command} && ! $ran) {
+		$ran=1;
 		chdir($config{destdir}) || error("chdir: $!");
 		system $config{rsync_command};
 		if ($? == -1) {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5953b3fee..246c2260d 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -554,7 +554,6 @@ sub refresh () {
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });
 	}
-	run_hooks(postrefresh => sub { shift->() });
 }
 
 sub commandline_render () {
-- 
cgit v1.2.3


From 324c1fae33889ee2c187e4a47f267e23edd96f3e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 18:32:44 -0400
Subject: changelog and license

---
 debian/changelog | 2 ++
 debian/copyright | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 612792b86..b859c9aef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
   * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by
     Amitai Schlair.
   * Updated Czech translation from Miroslav Kure. Closes: #546223
+  * rsync: New plugin that allows pushing the srcdir to a remote host
+    via rsync or similar. Thanks, Amitai Schlair.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 8f7d65322..98feffc6f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -140,6 +140,10 @@ Files: wmd.pm, getsource.pm
 Copyright: © 2009 William Uther
 License: GPL-2+
 
+Files: rsync.pm
+Copyright: © 2009 Amitai Schlair
+License: BSD-C2
+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
-- 
cgit v1.2.3


From 9042a86f367654c4f872a8dcf6f78f3f0df57421 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 18:37:42 -0400
Subject: update

---
 doc/plugins/rsync.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/rsync.mdwn b/doc/plugins/rsync.mdwn
index 0ab3872d9..9bfe7303e 100644
--- a/doc/plugins/rsync.mdwn
+++ b/doc/plugins/rsync.mdwn
@@ -7,11 +7,11 @@ The command to run is specified by setting `rsync_command` in your setup
 file. The command will be run in your destdir, so something like this
 is a typical command:
 
-	rsync -qa --delete . user\@host:/path/to/docroot/ --exclude ikiwiki.cgi
+	rsync => 'rsync -qa --delete . user@host:/path/to/docroot/ --exclude ikiwiki.cgi',
 
 If using rsync over ssh, you will need to enable noninteractive ssh login
 to the remote host. It's also a good idea to specify the exact command line
 to be permitted in the remote host's `$HOME/.ssh/authorized_keys`.
 
 Be sure to exclude the `ikiwiki.cgi` wrapper from being sent to the remote
-host.
+host, as in the above example.
-- 
cgit v1.2.3


From 65bf8a278fa6a2aa13b4a1ffd98113aa1f3620f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 18:44:53 -0400
Subject: typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b859c9aef..b0ba63ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
   * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by
     Amitai Schlair.
   * Updated Czech translation from Miroslav Kure. Closes: #546223
-  * rsync: New plugin that allows pushing the srcdir to a remote host
+  * rsync: New plugin that allows pushing the destdir to a remote host
     via rsync or similar. Thanks, Amitai Schlair.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
-- 
cgit v1.2.3


From f1999df705f22638a6d9d44c728c4282e674b982 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 12 Sep 2009 00:24:57 -0400
Subject: remove cgi exclusion

Note that a typical use of this plugin is for a static site, w/o cgi
support enabled.
---
 IkiWiki/Plugin/rsync.pm | 2 +-
 doc/plugins/rsync.mdwn  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 45bff19bd..e38801e4a 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -19,7 +19,7 @@ sub getsetup () {
 		},
 		rsync_command => {
 			type => "string",
-			example => "rsync -qa --delete . user\@host:/path/to/docroot/ --exclude ikiwiki.cgi",
+			example => "rsync -qa --delete . user\@host:/path/to/docroot/",
 			description => "command to run to sync updated pages",
 			safe => 0,
 			rebuild => 0,
diff --git a/doc/plugins/rsync.mdwn b/doc/plugins/rsync.mdwn
index 9bfe7303e..e0ab96d14 100644
--- a/doc/plugins/rsync.mdwn
+++ b/doc/plugins/rsync.mdwn
@@ -7,11 +7,12 @@ The command to run is specified by setting `rsync_command` in your setup
 file. The command will be run in your destdir, so something like this
 is a typical command:
 
-	rsync => 'rsync -qa --delete . user@host:/path/to/docroot/ --exclude ikiwiki.cgi',
+	rsync => 'rsync -qa --delete . user@host:/path/to/docroot/',
 
 If using rsync over ssh, you will need to enable noninteractive ssh login
 to the remote host. It's also a good idea to specify the exact command line
 to be permitted in the remote host's `$HOME/.ssh/authorized_keys`.
 
-Be sure to exclude the `ikiwiki.cgi` wrapper from being sent to the remote
-host, as in the above example.
+A typival ikiwiki configuration when using this plugin is to disable cgi
+support, so ikiwiki builds a completely static site that can be served from
+the remote host.
-- 
cgit v1.2.3


From dad25308d2832de28d3b8151aacc3b124575733c Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 12 Sep 2009 01:32:29 -0400
Subject: typo

---
 doc/plugins/rsync.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/rsync.mdwn b/doc/plugins/rsync.mdwn
index e0ab96d14..db7fcb4f7 100644
--- a/doc/plugins/rsync.mdwn
+++ b/doc/plugins/rsync.mdwn
@@ -13,6 +13,6 @@ If using rsync over ssh, you will need to enable noninteractive ssh login
 to the remote host. It's also a good idea to specify the exact command line
 to be permitted in the remote host's `$HOME/.ssh/authorized_keys`.
 
-A typival ikiwiki configuration when using this plugin is to disable cgi
+A typical ikiwiki configuration when using this plugin is to disable cgi
 support, so ikiwiki builds a completely static site that can be served from
 the remote host.
-- 
cgit v1.2.3


From 6559e68a3dff2e934d8e586d5ab0a44bd083d278 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 12 Sep 2009 20:41:37 -0400
Subject: sort= param wishlist for map

---
 doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn

diff --git a/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn b/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn
new file mode 100644
index 000000000..3ecc6a241
--- /dev/null
+++ b/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn
@@ -0,0 +1,5 @@
+## sort= parameter
+
+Having a `sort=` parameter for the map plugin/directive would be real nice; like `inline`'s parameter, with `age`, `title`, etc.
+
+I may hack one in from `inline` if it seem within my skill level.
-- 
cgit v1.2.3


From 1c8dcc9bcd27e2bc882c84d45061fb09b5602c94 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 12 Sep 2009 20:43:07 -0400
Subject:

---
 doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn b/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn
index 3ecc6a241..f6ccaf538 100644
--- a/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn
+++ b/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn
@@ -3,3 +3,5 @@
 Having a `sort=` parameter for the map plugin/directive would be real nice; like `inline`'s parameter, with `age`, `title`, etc.
 
 I may hack one in from `inline` if it seem within my skill level.
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From 950ce19c03ed14c4ed14408384e37ee2769e8b11 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 12 Sep 2009 20:44:02 -0400
Subject:

---
 doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index 8a4b852b7..fb942a495 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -10,4 +10,8 @@ those contents instead.
 
 
 --[[madduck]]
+
+> In mine I just copied sidebar out and made some extra "sidebars", but they go elsewhere. Ugly hack, but it works. --[[simonraven]]
+
+
 [[!tag wishlist]]
-- 
cgit v1.2.3


From f146bd0cf8f8fb661fe8690cd3246aa6ba6225f4 Mon Sep 17 00:00:00 2001
From: test <test@web>
Date: Sat, 12 Sep 2009 22:55:13 -0400
Subject: test

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 22a5642da..1f842d499 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -44,7 +44,7 @@ Bulleted list
 [[!haiku hint="sandbox play"]]
 
 ----
-
+blah
 ## Different sorts of links:
 
 * [[Features]]
-- 
cgit v1.2.3


From 2b07f393511fd1bfb5fc3f1edbc2d87b061d617d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 13 Sep 2009 18:45:23 -0400
Subject: typo fixes noticed by french translators

---
 doc/ikiwiki/directive/postsparkline.mdwn | 8 ++++----
 doc/ikiwiki/directive/sparkline.mdwn     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/ikiwiki/directive/postsparkline.mdwn b/doc/ikiwiki/directive/postsparkline.mdwn
index c17d32952..318512eef 100644
--- a/doc/ikiwiki/directive/postsparkline.mdwn
+++ b/doc/ikiwiki/directive/postsparkline.mdwn
@@ -15,7 +15,7 @@ This directive uses the [[!iki plugins/sparkline desc=sparkline]] plugin to crea
 
 # usage
 
-All options aside fron the `pages`, `max`, `formula`, `time`, and `color`
+All options aside from the `pages`, `max`, `formula`, `time`, and `color`
 options are the same as in [[sparkline]] directive.
 
 You don't need to specify any data points (though you can if you want to).
@@ -24,7 +24,7 @@ times of pages matched by the specified `pages` [[ikiwiki/PageSpec]]. A
 maximum of `max` data points will be generated.
 
 The `formula` parameter controls the formula used to generate data points.
-Available forumlae:
+Available formulae:
 
 * `interval` - The height of each point represents how long it has been
   since the previous post.
@@ -32,10 +32,10 @@ Available forumlae:
   many posts were made that day.
 * `permonth` - Each point represents a month; the height represents how
   many posts were made that month.
-* `peryear` - Each point represents a day; the height represents how
+* `peryear` - Each point represents a year; the height represents how
   many posts were made that year.
 
-The `time` parameter has a default value of "ctime", since forumae use
+The `time` parameter has a default value of "ctime", since formulae use
 the creation times of pages by default. If you instead want
 them to use the modification times of pages, set it to "mtime".
 
diff --git a/doc/ikiwiki/directive/sparkline.mdwn b/doc/ikiwiki/directive/sparkline.mdwn
index 1f691e14f..e5a03f84e 100644
--- a/doc/ikiwiki/directive/sparkline.mdwn
+++ b/doc/ikiwiki/directive/sparkline.mdwn
@@ -2,7 +2,7 @@ The `sparkline` directive is supplied by the [[!iki plugins/sparkline desc=spark
 
 This directive allows for embedding sparklines into wiki pages. A
 sparkline is a small word-size graphic chart, that is designed to be
-displayes alongside text.
+displayed alongside text.
 
 # examples
 
-- 
cgit v1.2.3


From 8a5f76d74d457c89d4274168d767faa6f030218b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 13 Sep 2009 19:29:26 -0400
Subject: merge changes from l10n

---
 po/underlays/basewiki/templates.fr.po              |  6 ++----
 .../directives/ikiwiki/directive/inline.da.po      | 13 +++++++++--
 .../directives/ikiwiki/directive/pagestats.da.po   | 25 +++++++++++++++++++++-
 .../ikiwiki/directive/postsparkline.da.po          | 12 +++++------
 .../directives/ikiwiki/directive/sparkline.da.po   |  4 ++--
 5 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po
index 3321cc597..37d578ec8 100644
--- a/po/underlays/basewiki/templates.fr.po
+++ b/po/underlays/basewiki/templates.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-08-23 21:20+0200\n"
+"PO-Revision-Date: 2009-09-12 08:40+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -76,9 +76,7 @@ msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer da
 msgid ""
 "This fills out the [[note]] template, filling in the `text` field with the "
 "specified value, and inserts the result into the page."
-msgstr ""
-"Ceci remplit le modèle [[note]], remplaçant le champ `text` par la valeur "
-"spécifiée, et insérant le résultat dans la page."
+msgstr "Cette expression remplit le modèle [[note]], remplaçant le champ `text` par la valeur spécifiée, et insérant le résultat dans la page."
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/directives/ikiwiki/directive/inline.da.po b/po/underlays/directives/ikiwiki/directive/inline.da.po
index 5641508e2..9d9d6829d 100644
--- a/po/underlays/directives/ikiwiki/directive/inline.da.po
+++ b/po/underlays/directives/ikiwiki/directive/inline.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -151,7 +151,7 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"`rootpage` - Enable the postform, and allows controling where newly posted "
+"`rootpage` - Enables the postform, and allows controling where newly posted "
 "pages should go, by specifiying the page that they should be a [[SubPage]] "
 "of."
 msgstr ""
@@ -273,6 +273,15 @@ msgid ""
 "not to use `usedirs`."
 msgstr ""
 
+#. type: Bullet: '* '
+msgid ""
+"`pagenames` - If given instead of `pages`, this is interpreted as a space-"
+"separated list of links to pages (with the same [[SubPage/LinkingRules]] as "
+"in a [[ikiwiki/WikiLink]]), and they are inlined in exactly the order given: "
+"the `sort` and `pages` parameters cannot be used in conjunction with this "
+"one."
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.da.po b/po/underlays/directives/ikiwiki/directive/pagestats.da.po
index 76474b217..6514e4e22 100644
--- a/po/underlays/directives/ikiwiki/directive/pagestats.da.po
+++ b/po/underlays/directives/ikiwiki/directive/pagestats.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2009-08-15 18:54-0300\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -50,6 +50,29 @@ msgstr "Og sådan her dannes en tabel over alle sider i wikien:"
 msgid "\t\\[[!pagestats style=\"table\"]]\n"
 msgstr "\t\\[[!pagestats style=\"table\"]]\n"
 
+#. type: Plain text
+msgid ""
+"The optional `among` parameter limits counting to pages that match a "
+"[[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog "
+"entries, you could use:"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+msgid "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+
+#. type: Plain text
+msgid "or to display a cloud of tags related to Linux, you could use:"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+msgid "\t\\[[!pagestats pages=\"tags/* and not tags/linux\" among=\"tagged(linux)\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/postsparkline.da.po b/po/underlays/directives/ikiwiki/directive/postsparkline.da.po
index 4725964c2..0c53cc956 100644
--- a/po/underlays/directives/ikiwiki/directive/postsparkline.da.po
+++ b/po/underlays/directives/ikiwiki/directive/postsparkline.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2009-09-13 19:02-0300\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -66,7 +66,7 @@ msgstr "brug"
 
 #. type: Plain text
 msgid ""
-"All options aside fron the `pages`, `max`, `formula`, `time`, and `color` "
+"All options aside from the `pages`, `max`, `formula`, `time`, and `color` "
 "options are the same as in [[sparkline]] directive."
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The `formula` parameter controls the formula used to generate data points.  "
-"Available forumlae:"
+"Available formulae:"
 msgstr ""
 
 #. type: Bullet: '* '
@@ -104,14 +104,14 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"`peryear` - Each point represents a day; the height represents how many "
+"`peryear` - Each point represents a year; the height represents how many "
 "posts were made that year."
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"The `time` parameter has a default value of \"ctime\", since forumae use the "
-"creation times of pages by default. If you instead want them to use the "
+"The `time` parameter has a default value of \"ctime\", since formulae use "
+"the creation times of pages by default. If you instead want them to use the "
 "modification times of pages, set it to \"mtime\"."
 msgstr ""
 
diff --git a/po/underlays/directives/ikiwiki/directive/sparkline.da.po b/po/underlays/directives/ikiwiki/directive/sparkline.da.po
index 655b174e7..857b2a5c6 100644
--- a/po/underlays/directives/ikiwiki/directive/sparkline.da.po
+++ b/po/underlays/directives/ikiwiki/directive/sparkline.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2009-09-13 19:02-0300\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -28,7 +28,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This directive allows for embedding sparklines into wiki pages. A sparkline "
-"is a small word-size graphic chart, that is designed to be displayes "
+"is a small word-size graphic chart, that is designed to be displayed "
 "alongside text."
 msgstr ""
 
-- 
cgit v1.2.3


From 760c06d6d66b9b47ca7a72daadbeeaaec64154df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 13 Sep 2009 19:31:22 -0400
Subject: French underlays translation now at 100%

---
 .../directives/ikiwiki/directive/aggregate.fr.po   | 177 +++++++++
 .../directives/ikiwiki/directive/brokenlinks.fr.po |  51 +++
 .../directives/ikiwiki/directive/calendar.fr.po    | 130 +++++++
 .../directives/ikiwiki/directive/color.fr.po       |  74 ++++
 .../directives/ikiwiki/directive/comment.fr.po     | 121 ++++++
 .../directives/ikiwiki/directive/copy.fr.po        |  24 ++
 .../directives/ikiwiki/directive/cut.fr.po         |  25 ++
 .../directives/ikiwiki/directive/cutpaste.fr.po    | 149 ++++++++
 .../ikiwiki/directive/edittemplate.fr.po           |  90 +++++
 .../directives/ikiwiki/directive/format.fr.po      |  77 ++++
 .../directives/ikiwiki/directive/fortune.fr.po     |  36 ++
 .../directives/ikiwiki/directive/graph.fr.po       |  70 ++++
 .../directives/ikiwiki/directive/haiku.fr.po       |  49 +++
 po/underlays/directives/ikiwiki/directive/if.fr.po | 132 +++++++
 .../directives/ikiwiki/directive/img.fr.po         | 116 ++++++
 .../directives/ikiwiki/directive/inline.fr.po      | 391 +++++++++++++++++++
 .../directives/ikiwiki/directive/linkmap.fr.po     |  64 ++++
 .../ikiwiki/directive/listdirectives.fr.po         |  69 ++++
 .../directives/ikiwiki/directive/map.fr.po         |  71 ++++
 .../directives/ikiwiki/directive/meta.fr.po        | 412 +++++++++++++++++++++
 .../directives/ikiwiki/directive/more.fr.po        |  63 ++++
 .../directives/ikiwiki/directive/orphans.fr.po     |  49 +++
 .../directives/ikiwiki/directive/pagecount.fr.po   |  40 ++
 .../directives/ikiwiki/directive/pagestats.fr.po   |  71 ++++
 .../ikiwiki/directive/pagetemplate.fr.po           |  46 +++
 .../directives/ikiwiki/directive/paste.fr.po       |  26 ++
 .../directives/ikiwiki/directive/ping.fr.po        |  55 +++
 .../directives/ikiwiki/directive/poll.fr.po        |  70 ++++
 .../directives/ikiwiki/directive/polygen.fr.po     |  42 +++
 .../ikiwiki/directive/postsparkline.fr.po          | 148 ++++++++
 .../directives/ikiwiki/directive/progress.fr.po    |  52 +++
 .../directives/ikiwiki/directive/shortcut.fr.po    |  37 ++
 .../directives/ikiwiki/directive/sparkline.fr.po   | 173 +++++++++
 .../directives/ikiwiki/directive/table.fr.po       | 135 +++++++
 .../directives/ikiwiki/directive/tag.fr.po         | 107 ++++++
 .../directives/ikiwiki/directive/taglink.fr.po     |  24 ++
 .../directives/ikiwiki/directive/template.fr.po    |  54 +++
 .../ikiwiki/directive/testpagespec.fr.po           |  69 ++++
 .../directives/ikiwiki/directive/teximg.fr.po      |  72 ++++
 .../directives/ikiwiki/directive/toc.fr.po         |  59 +++
 .../directives/ikiwiki/directive/toggle.fr.po      | 110 ++++++
 .../directives/ikiwiki/directive/toggleable.fr.po  |  24 ++
 .../directives/ikiwiki/directive/version.fr.po     |  44 +++
 po/underlays/smiley/smileys.fr.po                  | 209 +++++++++++
 44 files changed, 4107 insertions(+)
 create mode 100644 po/underlays/directives/ikiwiki/directive/aggregate.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/brokenlinks.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/calendar.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/color.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/comment.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/copy.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/cut.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/cutpaste.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/edittemplate.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/format.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/fortune.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/graph.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/haiku.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/if.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/img.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/inline.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/linkmap.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/listdirectives.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/map.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/meta.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/more.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/orphans.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/pagecount.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/pagestats.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/paste.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/ping.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/poll.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/polygen.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/postsparkline.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/progress.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/shortcut.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/sparkline.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/table.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/tag.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/taglink.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/template.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/testpagespec.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/teximg.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/toc.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/toggle.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/toggleable.fr.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/version.fr.po
 create mode 100644 po/underlays/smiley/smileys.fr.po

diff --git a/po/underlays/directives/ikiwiki/directive/aggregate.fr.po b/po/underlays/directives/ikiwiki/directive/aggregate.fr.po
new file mode 100644
index 000000000..d2976e7fe
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/aggregate.fr.po
@@ -0,0 +1,177 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-05 08:43+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `aggregate` directive is supplied by the [[!iki plugins/aggregate "
+"desc=aggregate]] plugin.  This plugin requires extra setup, specifically, a "
+"cron job. See the plugin's documentation for details."
+msgstr ""
+"La directive `aggregate` est fournie par le module d'extension [[!iki "
+"plugins/aggregate desc=aggregate]]. Ce greffon demande une configuration "
+"particulière, à savoir une tâche `cron`. Consultez la documention du greffon "
+"pour des précisions."
+
+#. type: Plain text
+msgid ""
+"This directive allows content from other feeds to be aggregated into the "
+"wiki.  Aggregate a feed as follows:"
+msgstr ""
+"Cette directive permet d'assembler les contenus d'autres flux dans le wiki. "
+"Ainsi :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!aggregate name=\"example blog\" dir=\"example\"\n"
+"\tfeedurl=\"http://example.com/index.rss\"\n"
+"\turl=\"http://example.com/\" updateinterval=\"15\"]]\n"
+msgstr ""
+"\t\\[[!aggregate name=\"example blog\" dir=\"example\"\n"
+"\tfeedurl=\"http://example.com/index.rss\"\n"
+"\turl=\"http://example.com/\" updateinterval=\"15\"]]\n"
+
+#. type: Plain text
+msgid ""
+"That example aggregates posts from the specified RSS feed, updating no more "
+"frequently than once every 15 minutes (though possibly less frequently, if "
+"the cron job runs less frequently than that), and puts a page per post under "
+"the example/ directory in the wiki."
+msgstr ""
+"Dans cet exemple, les messages du flux RSS indiqué sont assemblés dans le "
+"répertoire example/ du wiki, une page par message. La fréquence de mise à "
+"jour est de 15 minutes (mais moins fréquemment si la tâche cron est exécutée "
+"moins fréquemment)."
+
+#. type: Plain text
+msgid ""
+"You can then use ikiwiki's [[inline]] directive to create a blog of one or "
+"more aggregated feeds. For example:"
+msgstr ""
+"Vous pouvez utiliser la directive [[inline]] d'ikiwiki pour créer un blog "
+"avec un ou plusieurs flux assemblés. Par exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"internal(example/*)\"]]\n"
+msgstr "\t\\[[!inline pages=\"internal(example/*)\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Note the use of `internal()` in the [[ikiwiki/PageSpec]] to match aggregated "
+"pages. By default, aggregated pages are internal pages, which prevents them "
+"from showing up directly in the wiki, and so this special [[PageSpec]] is "
+"needed to match them."
+msgstr ""
+"Notez l'utilisation de la fonction `internal()` de [[ikiwiki/PageSpec]] pour "
+"trouver les pages assemblées. Par défaut, les pages assemblées sont des "
+"pages internes, ce qui empêche qu'elles apparaissent directement dans le "
+"wiki. C'est pourquoi la fonction `internal()` est nécessaire dans la "
+"spécification [[PageSpec]] pour les trouver."
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Usage"
+
+#. type: Plain text
+msgid ""
+"Here are descriptions of all the supported parameters to the `aggregate` "
+"directive:"
+msgstr ""
+"Voici la description de tous les paramètres acceptés par cette directive :"
+
+#. type: Bullet: '* '
+msgid ""
+"`name` - A name for the feed. Each feed must have a unique name.  Required."
+msgstr "`name` - Le nom du flux. Chaque flux doit avoir un nom unique. Paramètre obligatoire."
+
+#. type: Bullet: '* '
+msgid ""
+"`url` - The url to the web page for the feed that's being aggregated.  "
+"Required."
+msgstr "`url` - L'URL de la page web contenant le flux assemblé. Paramètre obligatoire."
+
+#. type: Bullet: '* '
+msgid ""
+"`dir` - The directory in the wiki where pages should be saved. Optional, if "
+"not specified, the directory is based on the name of the feed."
+msgstr ""
+"`dir` - Le répertoire du wiki où seront sauvegardées les pages. Paramètre "
+"facultatif. S'il n'est pas indiqué, le répertoire est construit à partir du "
+"nom du flux."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedurl` - The url to the feed. Optional, if it's not specified ikiwiki "
+"will look for feeds on the `url`. RSS and atom feeds are supported."
+msgstr ""
+"`feedurl` - L'URL du flux. Paramètre facultatif. S'il n'est pas indiqué, "
+"ikiwiki cherchera le flux avec le paramètre `url`. Les flux RSS et Atom sont "
+"reconnus."
+
+#. type: Bullet: '* '
+msgid ""
+"`updateinterval` - How often to check for new posts, in minutes. Default is "
+"15 minutes."
+msgstr ""
+"`updateinterval` - Fréquence, en minutes, de la recherche des nouveaux "
+"messages. Par défaut, 15 minutes."
+
+#. type: Bullet: '* '
+msgid ""
+"`expireage` - Expire old items from this feed if they are older than a "
+"specified number of days. Default is to never expire on age."
+msgstr "`expireage` -  Éliminer les anciens messages du flux si leur ancienneté est plus grande qu'un nombre de jours donné. Par défaut, aucune élimination ne se fait sur l'ancienneté."
+
+#. type: Bullet: '* '
+msgid ""
+"`expirecount` - Expire old items from this feed if there are more than the "
+"specified number total. Oldest items will be expired first. Default is to "
+"never expire on count."
+msgstr ""
+"`expirecount` - Éliminer les anciens messages du flux si leur nombre est "
+"plus grand qu'un nombre donné. Les messages les plus anciens sont éliminés "
+"en premier. Par défaut, aucune élimination ne se fait sur le nombre."
+
+#. type: Bullet: '* '
+msgid ""
+"`tag` - A tag to tag each post from the feed with. A good tag to use is the "
+"name of the feed. Can be repeated multiple times. The [[tag]] plugin must be "
+"enabled for this to work."
+msgstr ""
+"`tag` -  Représente une étiquette avec laquelle étiqueter chaque message du "
+"flux. Le nom du flux est une bonne étiquette. Ce paramètre peut être répété. "
+"Le greffon [[tag]] doit être activé."
+
+#. type: Bullet: '* '
+msgid ""
+"`template` - Template to use for creating the aggregated pages. Defaults to "
+"aggregatepost."
+msgstr ""
+"`template` - Modèle de page à utiliser pour la création des pages "
+"assemblées. Par défaut, c'est \"aggregatepost\"."
+
+#. type: Plain text
+msgid ""
+"Note that even if you are using subversion or another revision control "
+"system, pages created by aggregation will *not* be checked into revision "
+"control."
+msgstr "Notez que même si vous utilisez subversion ou un autre système de versionnement, les pages créées par assemblage *ne* seront *pas* prises en compte par le système de contrôle de versions."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/brokenlinks.fr.po b/po/underlays/directives/ikiwiki/directive/brokenlinks.fr.po
new file mode 100644
index 000000000..b64cb0c70
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/brokenlinks.fr.po
@@ -0,0 +1,51 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-09 17:44+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `brokenlinks` directive is supplied by the [[!iki plugins/brokenlinks "
+"desc=brokenlinks]] plugin."
+msgstr ""
+"La directive `brokenlinks` est fournie par le module d'extension [[!iki "
+"plugins/brokenlinks desc=brokenlinks]]."
+
+#. type: Plain text
+msgid ""
+"This directive generates a list of broken links on pages in the wiki. This "
+"is a useful way to find pages that still need to be written, or links that "
+"are written wrong."
+msgstr ""
+"Cette directive crée une liste des liens cassés sur les pages du wiki. On "
+"peut ainsi facilement trouver les pages à écrire ou les liens mal trancrits."
+
+#. type: Plain text
+msgid ""
+"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying "
+"the pages to search for broken links, default is search them all."
+msgstr "Le paramètre optionnel \"pages\" peut être une expression [[ikiwiki/PageSpec]] indiquant dans quelles pages chercher les liens cassés. Par défaut la recherche se fait dans toutes les pages.  "
+
+#. type: Plain text
+msgid "Example:"
+msgstr "Exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n"
+msgstr "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.fr.po b/po/underlays/directives/ikiwiki/directive/calendar.fr.po
new file mode 100644
index 000000000..670c1db6f
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/calendar.fr.po
@@ -0,0 +1,130 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-07 20:27+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `calendar` directive is supplied by the [[!iki plugins/calendar "
+"desc=calendar]] plugin.  This plugin requires extra setup.  See the plugin "
+"documentation for details."
+msgstr "La directive `calendar` est fournie par le module d'extension [[!iki plugins/calendar desc=calendar]]. Ce greffon exige une configuration particulière. Consultez sa documentation pour plus de précisions."
+
+#. type: Plain text
+msgid ""
+"This directive displays a calendar, similar to the typical calendars shown "
+"on some blogs."
+msgstr ""
+"Cette directive affiche un calendrier, comparable aux calendriers affichés "
+"par certains blogs."
+
+#. type: Title #
+#, no-wrap
+msgid "examples"
+msgstr "Exemples :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!calendar ]]\n"
+msgstr "\t\\[[!calendar ]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n"
+msgstr "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and !*/Discussion\"]]\n"
+msgstr "\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and !*/Discussion\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The calendar is essentially a fancy front end to archives of previous pages, "
+"usually used for blogs. It can produce a calendar for a given month, or a "
+"list of months for a given year."
+msgstr ""
+"L'agenda, qu'on trouve habituellement dans les blogs, est essentiellement "
+"une interface agréable pour l'archive de pages précédentes. Il peut afficher "
+"un calendrier pour un mois donné ou une liste de mois pour une année donnée."
+
+#. type: Plain text
+msgid ""
+"The month format calendar simply links to any page posted on each day of the "
+"month. The year format calendar links to archive pages, with names like "
+"`archives/2007` (for all of 2007)  and `archives/2007/01` (for January, "
+"2007). For this to work, you'll need to create these archive pages. They "
+"typically use [[inline]] to display or list pages created in the given time "
+"frame."
+msgstr ""
+"Le calendrier pour un mois est simplement l'ensemble des liens vers les "
+"pages écrites chaque jour du mois. Le calendrier pour une année est "
+"l'ensemble des liens vers les pages d'archives, comme `archives/2007` (tout "
+"2007) ou `archives/2007/01` (tout janvier 2007). Pour que cela fonctionne, "
+"il faut créer ces pages d'archive, qui comporteront une directive [[inline]] "
+"pour afficher ou lister les pages créées dans l'intervalle de temps donné."
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Usage"
+
+#. type: Bullet: '* '
+msgid ""
+"`type` - Used to specify the type of calendar wanted. Can be one of \"month"
+"\" or \"year\". The default is a month view calendar."
+msgstr "`type` - Ce paramètre indique le type du calendrier. C'est soit « month » soit « year », la valeur par défaut étant le calendrier mensuel."
+
+#. type: Bullet: '* '
+msgid ""
+"`pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the "
+"month calendar. Defaults to \"*\"."
+msgstr "`pages` - Indique  une spécification [[ikiwiki/PageSpec]] pour les pages qui seront liées au calendrier. La valeur par défaut est « * »."
+
+#. type: Bullet: '* '
+msgid ""
+"`archivebase` - Configures the base of the archives hierarchy. The default "
+"is \"archives\". Note that this default can also be overridden for the whole "
+"wiki by setting `archivebase` in ikiwiki's setup file."
+msgstr "`archivebase` - Indique la racine des répertoires d'archives, « archives » par défaut. On peut changer cette valeur en renseignant `archivebase` dans le fichier de configuration d'ikiwiki."
+
+#. type: Bullet: '* '
+msgid ""
+"`year` - The year for which the calendar is requested. Defaults to the "
+"current year."
+msgstr "`year` - Indique l'année pour le calendrier annuel. La valeur par défaut est l'année en cours."
+
+#. type: Bullet: '* '
+msgid ""
+"`month` - The numeric month for which the calendar is requested, in the "
+"range 1..12. Used only for the month view calendar, and defaults to the "
+"current month."
+msgstr "`month` - Ce paramètre indique le chiffre du mois (1..12) pour le calendrier. Il n'est utilisé que pour le calendrier mensuel, et la valeur par défaut est le chiffre du mois en cours."
+
+#. type: Bullet: '* '
+msgid ""
+"`week_start_day` - A number, in the range 0..6, which represents the day of "
+"the week that the month calendar starts with. 0 is Sunday, 1 is Monday, and "
+"so on. Defaults to 0, which is Sunday."
+msgstr "`week_start_day` - Indique le chiffre (1..6) qui représente le jour par lequel commence la semaine dans le calendrier. Dimanche, c'est 0, lundi, 1, etc. La valeur par défaut est 0, dimanche."
+
+#. type: Bullet: '* '
+msgid ""
+"`months_per_row` - In the annual calendar, number of months to place in each "
+"row. Defaults to 3."
+msgstr "`months_per_row` - Ce paramètre indique, dans le calendrier annuel, le nombre de mois par ligne. La valeur par défaut est 3."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/color.fr.po b/po/underlays/directives/ikiwiki/directive/color.fr.po
new file mode 100644
index 000000000..de9e85a26
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/color.fr.po
@@ -0,0 +1,74 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-09 20:32+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `color` directive is supplied by the [[!iki plugins/color desc=color]] "
+"plugin."
+msgstr "La directive `color` est fournie par le module d'extension [[!iki plugins/color desc=color]]."
+
+#. type: Plain text
+msgid ""
+"This directive can be used to color a piece of text on a page.  It can be "
+"used to set the foreground and/or background color of the text."
+msgstr "Cette directive permet de mettre en couleur une partie d'un texte sur la page. On peut ainsi définir la couleur du texte lui-même ou la couleur du fond sur lequel le texte s'affiche."
+
+#. type: Plain text
+msgid ""
+"You can use a color name (e.g. `white`) or HTML code (e.g. `#ffffff`)  to "
+"define colors."
+msgstr "Vous pouvez utiliser le nom de la couleur (par exemple \"white\") ou bien le code HTML (`#ffffff`)."
+
+#. type: Title ##
+#, no-wrap
+msgid "examples"
+msgstr "Exemples :"
+
+#. type: Plain text
+msgid ""
+"Here the foreground color is defined as a word, while the background color "
+"is defined as a HTML color code:"
+msgstr "Voici comment définir la couleur du texte par un nom et la couleur du fond par un code HTLM :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!color foreground=white background=#ff0000 text=\"White text on red background\"]]\n"
+msgstr "\t\\[[!color foreground=white background=#ff0000 text=\"White text on red background\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The background color is missing, so the text is displayed on default "
+"background:"
+msgstr "Si la couleur de fond est absente, le texte est affiché sur la couleur de fond par défaut :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!color foreground=white text=\"White text on default color background\"]]\n"
+msgstr "\t\\[[!color foreground=white text=\"White text on default color background\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The foreground is missing, so the text has the default foreground color:"
+msgstr "Si la couleur du texte est absente, le texte possède la couleur par défaut :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!color background=#ff0000 text=\"Default color text on red background\"]]\n"
+msgstr "\t\\[[!color background=#ff0000 text=\"Default color text on red background\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/comment.fr.po b/po/underlays/directives/ikiwiki/directive/comment.fr.po
new file mode 100644
index 000000000..3c41c720a
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/comment.fr.po
@@ -0,0 +1,121 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-09 20:32+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `comment` directive is supplied by the [[!iki plugins/comments "
+"desc=comments]] plugin, and is used to add a comment to a page. Typically, "
+"the directive is the only thing on a comment page, and is filled out by the "
+"comment plugin when a user posts a comment."
+msgstr "La directive `comment` est fournie par le module d'extension [[!iki plugins/comments desc=comments]]. Elle permet l'ajout d'un commentaire sur une page. En général, la page ne comporte que la directive et c'est le greffon lui-même qui remplit la directive quand un utilisateur poste un commentaire "
+
+#. type: Plain text
+msgid "Example:"
+msgstr "Exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!comment format=mdwn\n"
+"\tusername=\"foo\"\n"
+"\tsubject=\"Bar\"\n"
+"\tdate=\"2009-06-02T19:05:01Z\"\n"
+"\tcontent=\"\"\"\n"
+msgstr ""
+"\t\\[[!comment format=mdwn\n"
+"\tusername=\"foo\"\n"
+"\tsubject=\"Bar\"\n"
+"\tdate=\"2009-06-02T19:05:01Z\"\n"
+"\tcontent=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tBlah blah.\n"
+"\t\"\"\"\n"
+msgstr ""
+"\tBlah blah.\n"
+"\t\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t]]\n"
+msgstr "\t]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Usage"
+
+#. type: Plain text
+msgid ""
+"The only required parameter is `content`, the others just add or override "
+"metadata of the comment."
+msgstr ""
+"Le seul paramètre obligatoire est `content`. les autres paramètres ajoutent "
+"ou annulent des métadonnées."
+
+#. type: Bullet: '* '
+msgid ""
+"`content` - Text to display for the comment.  Note that [[directives|ikiwiki/"
+"directive]] may not be allowed, depending on the configuration of the "
+"comment plugin."
+msgstr ""
+"`content` - Texte du commentaire à afficher. Les [[directives|ikiwiki/"
+"directive]] sont autorisées, ou non, selon la configuration du greffon "
+"« comment »."
+
+#. type: Bullet: '* '
+msgid "`format` - Specifies the markup used for the content."
+msgstr "`format` - Indique le balisage utilisé par le commentaire."
+
+#. type: Bullet: '* '
+msgid "`subject` - Subject for the comment."
+msgstr "subject` - Sujet du commentaire."
+
+#. type: Bullet: '* '
+msgid ""
+"`date` - Date the comment was posted. Can be entered in nearly any format, "
+"since it's parsed by [[!cpan TimeDate]]"
+msgstr "`date` - Indique la date du commentaire. Cette date peut utiliser presque tous les formats, puisqu'elle est analysée par [[!cpan TimeDate]]."
+
+#. type: Bullet: '* '
+msgid ""
+"`username` - Used to record the username (or OpenID)  of a logged in "
+"commenter."
+msgstr ""
+"`username` - Sert pour l'enregistrement du nom (ou OpenID) d'un commentateur "
+"présent."
+
+#. type: Bullet: '* '
+msgid ""
+"`ip` - Can be used to record the IP address of a commenter, if they posted "
+"anonymously."
+msgstr ""
+"`ip` - Permet d'enregistrer l'adresse IP d'un commentateur, s'il envoie son "
+"commentaire de façon anonyme."
+
+#. type: Bullet: '* '
+msgid ""
+"`claimedauthor` - Records the name that the user entered, if anonmous "
+"commenters are allowed to enter their (unverified)  name."
+msgstr ""
+"`claimedauthor` - Enregistre le nom donné par l'utilisateur, si les "
+"commentateurs anonymes ont la possibilité d'indiquer un nom (invérifié)."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/copy.fr.po b/po/underlays/directives/ikiwiki/directive/copy.fr.po
new file mode 100644
index 000000000..910bfa004
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/copy.fr.po
@@ -0,0 +1,24 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-09 20:38+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/cut.fr.po b/po/underlays/directives/ikiwiki/directive/cut.fr.po
new file mode 100644
index 000000000..f6e7e0ce3
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/cut.fr.po
@@ -0,0 +1,25 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-09 20:42+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
diff --git a/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po b/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po
new file mode 100644
index 000000000..6e0a45aaf
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po
@@ -0,0 +1,149 @@
+# SOME DESCRIPTIVE TITLE
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-09 21:16+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `copy`, `cut` and `paste` directives are supplied by the [[!iki plugins/"
+"cutpaste desc=cutpaste]] plugin."
+msgstr ""
+"Les directives `copy`, `cut` and `paste` sont fournies par le module "
+"d'extension [[!iki plugins/cutpaste desc=cutpaste]]."
+
+#. type: Plain text
+msgid ""
+"With these directives you can store and recall pieces of text in a page:"
+msgstr ""
+"Ces directives permettent de sauvegarder et rappeler des parties de texte "
+"d'une page."
+
+#. type: Bullet: ' * '
+msgid ""
+"`\\[[!cut id=name text=\"text\"]]` memorizes the text allowing to recall it "
+"using the given ID.  The text being cut is not included in the output."
+msgstr ""
+"`\\[[!cut id=name text=\"text\"]]` garde en mémoire le texte, qui peut être "
+"rappelé grâce à l'id. Le texte coupé n'est pas inclus dans la sortie."
+
+#. type: Bullet: ' * '
+msgid ""
+"`\\[[!copy id=name text=\"text\"]]` memorizes the text allowing to recall it "
+"using the given ID.  The text being cut *is* included in the output."
+msgstr ""
+"`\\[[!copy id=name text=\"text\"]]`  garde en mémoire le texte, qui peut "
+"être rappelé grâce à l'id. Le texte coupé *est* inclus dans la sortie.\""
+
+#. type: Bullet: ' * '
+msgid "`\\[[!paste id=name]]` is replaced by the previously memorized text."
+msgstr ""
+"`\\[[!paste id=name]]` est remplacé par le texte précédemment mis en mémoire."
+
+#. type: Plain text
+msgid ""
+"The text being cut, copied and pasted can freely include wiki markup, "
+"including more calls to cut, copy and paste."
+msgstr ""
+"Le texte coupé, copié ou collé peut être inclus dans une balise wiki, avec "
+"d'autres appels encore aux directives cut, copy et paste."
+
+#. type: Plain text
+msgid ""
+"You do not need to memorize the text before using it: a cut directive can "
+"follow the paste directive that uses its text.  In fact, this is quite "
+"useful to postpone big blocks of text like long annotations and have a more "
+"natural flow.  For example:"
+msgstr ""
+"Il n'est pas nécessaire de mettre en mémoire le texte avant de l'utiliser. "
+"Une directive « cut » peut suivre une directive « paste » qui utilise le "
+"texte. Et c'est très pratique de pouvoir différer de gros morceaux de texte "
+"comme de longues annotations et pouvoir suivre un cours plus naturel. Par "
+"exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!toggleable id=\"cut\" text=\"[[!paste id=cutlongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"copy\" text=\"[[!paste id=copylongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"paste\" text=\"[[!paste id=pastelongdesc]]\"]]\n"
+msgstr ""
+"\t\\[[!toggleable id=\"cut\" text=\"[[!paste id=cutlongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"copy\" text=\"[[!paste id=copylongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"paste\" text=\"[[!paste id=pastelongdesc]]\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t[...some time later...]\n"
+msgstr "\t[...some time later...]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!cut id=cutlongdesc text=\"\"\"\n"
+msgstr "\t\\[[!cut id=cutlongdesc text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t   blah blah blah\n"
+msgstr "\t   blah blah blah\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!cut id=copylongdesc text=\"\"\"\n"
+msgstr "\t\\[[!cut id=copylongdesc text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!cut id=pastelongdesc text=\"\"\"\n"
+msgstr "\t\\[[!cut id=pastelongdesc text=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"This can potentially be used to create loops, but ikiwiki is clever and "
+"breaks them."
+msgstr ""
+"Des boucles peuvent résulter mais ikiwiki est intelligent et les rompt."
+
+#. type: Plain text
+msgid ""
+"Since you can paste without using double quotes, copy and paste can be used "
+"to nest directives that require multiline parameters inside each other:"
+msgstr ""
+"Puisque il est possible de coller sans doubler les guillemets, ces "
+"directives copy et paste peuvent servir à emboîter des directives qui "
+"demandent des paramètres à plusieurs lignes insérés l'un dans l'autre :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toggleable id=foo text=\"\"\"\n"
+msgstr "\t\\[[!toggleable id=foo text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t  [[!toggleable id=bar text=\"[[!paste id=baz]]\"]]\n"
+msgstr "\t  [[!toggleable id=bar text=\"[[!paste id=baz]]\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!cut id=baz text=\"\"\"\n"
+msgstr "\t\\[[!cut id=baz text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tmultiline parameter!\n"
+msgstr "\tmultiline parameter!\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po b/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po
new file mode 100644
index 000000000..53e2c67dd
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po
@@ -0,0 +1,90 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-05 08:36+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate "
+"desc=edittemplate]] plugin."
+msgstr ""
+"La directive `edittemplate` est fournie par le greffon [[!iki plugins/"
+"edittemplate desc=edittemplate]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows registering template pages, that provide default "
+"content for new pages created using the web frontend. To register a "
+"template, insert a [[ikiwiki/directive/template]] directive on some other "
+"page."
+msgstr ""
+"Cette directive permet l'enregistrement de modèles de pages, qui proposent "
+"un contenu par défaut aux pages nouvellement créées avec l'interface web. "
+"Pour enregistrer un modèle, il faut insérer une directive [[ikiwiki/"
+"directive/template]] dans une quelconque autre page."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!edittemplate template=\"bugtemplate\" match=\"bugs/*\"]]\n"
+msgstr "\t\\[[!edittemplate template=\"bugtemplate\" match=\"bugs/*\"]]\n"
+
+#. type: Plain text
+msgid ""
+"In the above example, the page named \"bugtemplate\" is registered as a "
+"template to be used when any page named \"bugs/*\" is created. To avoid the "
+"directive displaying a note about the template being registered, add "
+"\"silent=yes\"."
+msgstr "Dans l'exemple ci-dessus, la page nommée « bugtemplate » est enregistrée comme modèle de page à utiliser pour toute page nommée « bugs/* » qui sera créée. Pour éviter que la directive n'affiche une note au sujet de l'enregistrement du modèle, il suffit d'activer le paramètre « silent=yes »."
+
+#. type: Plain text
+msgid ""
+"Often the template page contains a simple skeleton for a particular type of "
+"page. For the bug report pages in the above example, it might look something "
+"like:"
+msgstr "Souvent la page modèle contient le simple squelette d'une page particulière. Pour le modèle « rapport de bogue » dans l'exemple, ce squelette pourrait se présenter ainsi :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tPackage: \n"
+"\tVersion: \n"
+"\tReproducible: y/n\n"
+"\tDetails:\n"
+msgstr ""
+"\tPaquet : \n"
+"\tVersion :  \n"
+"\tReproductible : o/n\n"
+"\tDétails : \n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"The template page can also contain [[!cpan HTML::Template]] directives,\n"
+"similar to other ikiwiki [[templates]]. Currently only one variable is\n"
+"set: `<TMPL_VAR name>` is replaced with the name of the page being\n"
+"created.\n"
+msgstr "La page modèle peut aussi contenir des directives [[!cpan HTML::Template]], comparables aux autres modèles [[templates]]. Pour l'instant, une seule variable est définie : `<TMPL_VAR name>`. Elle est remplacée par le nom de la page qui est créée.\n"
+
+#. type: Plain text
+msgid ""
+"It's generally not a good idea to put the `edittemplate` directive in the "
+"template page itself, since the directive would then be included as part of "
+"the template on new pages, which would then in turn be registered as "
+"templates. If multiple pages are registered as templates for a new page, an "
+"arbitrary one is chosen, so that could get confusing."
+msgstr "Ce n'est pas une bonne idée de mettre la directive `edittemplate` dans la page modèle elle-même. En effet la directive serait alors incluse comme partie du modèle sur les nouvelles pages, qui seraient à leur tour enregistrées comme modèles. Si de nombreuses pages sont enregistrées comme modèles pour une page, un modèle est choisi au hasard et tout devient confus. "
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/format.fr.po b/po/underlays/directives/ikiwiki/directive/format.fr.po
new file mode 100644
index 000000000..93f3d5c64
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/format.fr.po
@@ -0,0 +1,77 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-10 16:32+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `format` directive is supplied by the [[!iki plugins/format "
+"desc=format]] plugin."
+msgstr "La directive `format` est fournie par le module d'extension [[!iki plugins/format desc=format]]."
+
+#. type: Plain text
+msgid ""
+"The directive allows formatting a chunk of text using any available page "
+"format. It takes two parameters. First is the type of format to use, ie the "
+"extension that would be used for a standalone file of this type.  Second is "
+"the text to format."
+msgstr "Cette directive permet de formater un texte avec tout type de format disponible. Elle possède deux paramètres. Le premier est le format à utiliser, c'est-à-dire l'extension à donner à un fichier de ce type. Le second est le texte à formater."
+
+#. type: Plain text
+msgid ""
+"For example, this will embed an otl outline inside a page using mdwn or some "
+"other format:"
+msgstr "Par exemple, pour insérer un fichier outline (.otl) dans une page qui utilise mdwn ou un autre format :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!format otl \"\"\"\n"
+msgstr "\t\\[[!format otl \"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tfoo\n"
+"\t\t1\n"
+"\t\t2\n"
+"\tbar\n"
+"\t\t3\n"
+"\t\t4\n"
+msgstr ""
+"\tfoo\n"
+"\t\t1\n"
+"\t\t2\n"
+"\tbar\n"
+"\t\t3\n"
+"\t\t4\n"
+#. type: Plain text
+msgid ""
+"Note that if the highlight plugin is enabled, this directive can also be "
+"used to display syntax highlighted code. Many languages and formats are "
+"supported. For example:"
+msgstr "Si le greffon highlight est activé, cette directive permet d'afficher un code dont la syntaxe est mise en évidence. Beaucoup de langages sont reconnus. Par exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[format perl \"\"\"\n"
+msgstr "\t\\[[format perl \"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tprint \"hello, world\\n\";\n"
+msgstr "\tprint \"hello, world\\n\";\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/fortune.fr.po b/po/underlays/directives/ikiwiki/directive/fortune.fr.po
new file mode 100644
index 000000000..7e283e9bb
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/fortune.fr.po
@@ -0,0 +1,36 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-11 07:31+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `fortune` directive is supplied by the [[!iki plugins/fortune "
+"desc=fortune]] plugin."
+msgstr "La directive `fortune` est fournie par le module d'extension [[!iki plugins/fortune desc=fortune]]."
+
+#. type: Plain text
+msgid ""
+"This just uses the `fortune` program to insert a fortune cookie into the "
+"page.  Usage:"
+msgstr "Une petite sentence est insérée sur la page grâce au programme `fortune` : "
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!fortune ]]\n"
+msgstr "\t\\[[!fortune ]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/graph.fr.po b/po/underlays/directives/ikiwiki/directive/graph.fr.po
new file mode 100644
index 000000000..9f0733ed4
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/graph.fr.po
@@ -0,0 +1,70 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-11 21:18+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `graph` directive is supplied by the [[!iki plugins/graphviz "
+"desc=graphviz]] plugin."
+msgstr "La directive `graph` est fournie par le module d'extension [[!iki plugins/graphviz desc=graphviz]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows embedding [graphviz](http://www.graphviz.org/) graphs "
+"in a page.  Example usage:"
+msgstr "Cette directive permet d'embarquer des graphiques [graphviz](http://www.graphviz.org/) sur une page. Par exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!graph src=\"a -> b -> c; a -> c;\"]]\n"
+msgstr "\t\\[[!graph src=\"a -> b -> c; a -> c;\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Note that graphs will only show up in previews if your browser has [[!"
+"wikipedia data: URI]] support, or if the same graph already exists on that "
+"page."
+msgstr "Vous ne pourrez prévisualiser les graphiques que si le navigateur gère les [[!wikipedia data: URI]], ou si le même graphique existe déjà sur la page. "
+
+#. type: Plain text
+msgid "The `graph` directive supports the following parameters:"
+msgstr "Voici les paramètres de la directive `graph` :"
+
+#. type: Bullet: '- '
+msgid "`src` - The graphviz source to render."
+msgstr "`src` - La source graphviz à afficher."
+
+#. type: Bullet: '- '
+msgid ""
+"`type` - The type of graph to render: `graph` or `digraph`.  Defaults to "
+"`digraph`."
+msgstr "`type` - Le type de graphique : `graph` ou `digraph`.  La valeur par défaut est `digraph`."
+
+#. type: Bullet: '- '
+msgid ""
+"`prog` - The graphviz program to render with: `dot`, `neato`, `fdp`, "
+"`twopi`, or `circo`.  Defaults to `dot`."
+msgstr "`prog` - Le programme graphviz à utiliser : `dot`, `neato`, `fdp`, `twopi`, ou `circo`.  La valeur par défaut est `dot`."
+
+#. type: Bullet: '- '
+msgid ""
+"`height`, `width` - Limit the size of the graph to a given height and width, "
+"in inches. You must specify both to limit the size; otherwise, graphviz will "
+"choose a size, without any limit."
+msgstr "`height`, `width` - Ces paramètres limitent la taille des graphiques, avec une hauteur et une largeur exprimées en pouce. Vous devez les indiquer tous les deux. Sinon le programme choisira une valeur sans limites."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/haiku.fr.po b/po/underlays/directives/ikiwiki/directive/haiku.fr.po
new file mode 100644
index 000000000..199d87126
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/haiku.fr.po
@@ -0,0 +1,49 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-11 21:31+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `haiku` directive is supplied by the [[!iki plugins/haiku desc=haiku]] "
+"plugin."
+msgstr "la directive `haiku` est fournie par le module d'extension [[!iki plugins/haiku desc=haiku]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows inserting a randomly generated haiku into a wiki "
+"page.  Just type:"
+msgstr "Cette directive permet l'insertion d'un haiku créé automatiquement sur une page du wiki. Il suffit d'écrire :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!haiku hint=\"argument\"]]\n"
+msgstr "\t\\[[!haiku hint=\"argument\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!haiku hint=\"argument test\"]]\n"
+msgstr "[[!haiku hint=\"argument test\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The hint parameter can be omitted, it only provides the generator a hint of "
+"what to write the haiku about. If no hint is given, it might base it on the "
+"page name. Since the vocabulary it knows is very small, many hints won't "
+"affect the result at all."
+msgstr "Le paramètre \"hint\" peut être omis. Il ne donne au générateur qu'une idée du sujet du haiku. S'il est absent, le sujet est fondé sur le nom de la page. Comme le vocabulaire du programme est assez pauvre, il est inutile de donner beaucoups d'indications sur le thème du haiku."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/if.fr.po b/po/underlays/directives/ikiwiki/directive/if.fr.po
new file mode 100644
index 000000000..7ec2e1110
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/if.fr.po
@@ -0,0 +1,132 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-28 19:19-0300\n"
+"PO-Revision-Date: 2009-09-11 21:31+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `if` directive is supplied by the [[!iki plugins/conditional "
+"desc=conditional]] plugin."
+msgstr ""
+"La directive `if` est fournie par le module d'extension [[!iki plugins/"
+"conditional desc=conditional]]."
+
+#. type: Plain text
+msgid ""
+"With this directive, you can make text be conditionally displayed on a "
+"page.  For example:"
+msgstr ""
+"Cette directive permet de faire dépendre l'affichage de texte d'une "
+"condition donnée. Par exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!if test=\"enabled(smiley)\"\n"
+"\t      then=\"The smiley plugin is enabled :-)\"\n"
+"\t      else=\"No smiley plugin here..\"]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If the specified `test` succeeds, the `then` text will be displayed, "
+"otherwise the `else` text will be displayed. The `else` part is optional."
+msgstr ""
+"Si le `test` réussit, le texte du paramètre `then` est affiché. Sinon, le "
+"texte du paramètre `else` est affiché. La partie `else` du test est "
+"facultative. "
+
+#. type: Plain text
+msgid ""
+"The `then` and `else` values can include any markup that would be allowed in "
+"the wiki page outside the template. Triple-quoting the values even allows "
+"quotes to be included."
+msgstr ""
+"Les valeurs de `then` et `else`peuvent inclure n'importe quelle balise qui "
+"serait autorisée dans les pages du wiki. Tripler les guillemets autour de la "
+"valeur permet même d'y inclure des guillemets."
+
+#. type: Plain text
+msgid ""
+"The `test` is a [[ikiwiki/PageSpec]]; if it matches any page in the wiki "
+"then it succeeds. So you can do things like testing for the existence of a "
+"page or pages, testing to see if any pages were created in a given month, "
+"and so on."
+msgstr ""
+"Le `test` est une spécification [[ikiwiki/PageSpec]]. Si une page correspond "
+"à l'expression, le test réussit. Vous pouvez ainsi tester l'existence d'une "
+"page ou de plusieurs, tester la date de création, etc."
+
+#. type: Plain text
+msgid ""
+"If you want the [[ikiwiki/PageSpec]] to only match against the page that "
+"contains the conditional, rather than matching against all pages in the "
+"wiki, set the \"all\" parameter to \"no\"."
+msgstr ""
+"Si vous voulez confronter l'expression [[ikiwiki/PageSpec]] uniquement à la "
+"page qui contient la condition plutôt qu'à toutes les pages du wiki, il faut "
+"donner la valeur \"no\" au paramètre \"all\". "
+
+#. type: Plain text
+msgid ""
+"In an `if` directive, the regular [[ikiwiki/PageSpec]] syntax is expanded "
+"with the following additional tests:"
+msgstr ""
+"Dans une directive `if`, la syntaxe normale d'une spécification [[ikiwiki/"
+"PageSpec]] est étendue avec les tests suivants : "
+
+#. type: Bullet: '* '
+msgid "enabled(plugin)"
+msgstr "enabled(greffon)"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Tests whether the specified plugin is enabled.\n"
+msgstr "Ce test vérifie si le greffon indiqué est activé.\n"
+
+#. type: Bullet: '* '
+msgid "sourcepage(glob)"
+msgstr "sourcepage(motif)"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Tests whether the glob matches the name of the page that contains the\n"
+"  conditional.\n"
+msgstr "Ce test confronte le motif donné au nom de la page qui contient la condition.\n"
+
+#. type: Bullet: '* '
+msgid "destpage(glob)"
+msgstr "destpage(motif)"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Tests whether the glob matches the name of the page that is being built.\n"
+"  That might be different than the name of the page that contains the\n"
+"  conditional, if it's being inlined into another page.\n"
+msgstr "Ce test confronte le motif donné au nom de la page qui est construite. Ce nom peut être différent du nom de la page qui contient la condition, si la page est reliée à une autre page.\n"
+
+#. type: Bullet: '* '
+msgid "included()"
+msgstr "included()"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Tests whether the page is being included onto another page.\n"
+msgstr "Ce test vérifie si la page est incluse dans une autre page.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/img.fr.po b/po/underlays/directives/ikiwiki/directive/img.fr.po
new file mode 100644
index 000000000..b3c5b7ca6
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/img.fr.po
@@ -0,0 +1,116 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-06 15:33+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `img` directive is supplied by the [[!iki plugins/img desc=img]] plugin."
+msgstr ""
+"La directive `img` est fournie par le module d'extension [[!iki plugins/img "
+"desc=img]]."
+
+#. type: Plain text
+msgid ""
+"This is an image handling directive.  While ikiwiki supports inlining full-"
+"size images by making a [[ikiwiki/WikiLink]] that points to the image, using "
+"this directive you can easily scale down an image for inclusion onto a page, "
+"providing a link to a full-size version."
+msgstr ""
+"Cette directive est consacrée à la gestion des images. Ikiwiki permet de "
+"relier des images en taille réelle en faisant un [[ikiwiki/WikiLink]] qui "
+"pointe vers l'image. Avec cette directive vous pouvez facilement réduire la "
+"taille de l'image pour permettre son inclusion dans une page, tout en créant "
+"un lien vers l'image en taille réelle."
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Usage"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!img image1.jpg size=\"200x200\" alt=\"clouds\"]]\n"
+msgstr "\t\\[[!img image1.jpg size=\"200x200\" alt=\"clouds\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The image file will be searched for using the same rules as used to find the "
+"file pointed to by a [[ikiwiki/WikiLink]]."
+msgstr ""
+"L'image est recherchée selon les mêmes règles utilisées pour chercher un "
+"fichier pointé par un [[ikiwiki/WikiLink]]."
+
+#. type: Plain text
+msgid ""
+"The `size` parameter is optional, defaulting to full size. Note that the "
+"original image's aspect ratio is always preserved, even if this means making "
+"the image smaller than the specified size. You can also specify only the "
+"width or the height, and the other value will be calculated based on it: "
+"\"200x\", \"x200\""
+msgstr ""
+"Le paramètre `size` est facultatif. Par défaut la taille est la taille "
+"réelle. Le format d'image original est toujours respecté, même si cela "
+"signifie qu'il faut rendre l'image plus petite que la taille indiquée. Vous "
+"pouvez spécifier seulement la hauteur ou la largeur, et l'autre valeur sera "
+"calculée selon le format d'image, \"200x\", \"x200\"."
+
+#. type: Plain text
+msgid ""
+"You can also pass `alt`, `title`, `class`, `align` and `id` parameters.  "
+"These are passed through unchanged to the html img tag. If you include a "
+"`caption` parameter, the caption will be displayed centered beneath the "
+"image."
+msgstr ""
+"Vous pouvez aussi spécifier les paramètres `alt`, `title`, `class`, `align` "
+"et `id`. Ils sont passés inchangés à la balise HTML « img ». Si vous ajoutez "
+"un paramètre `caption`, le sous-titre sera centré sous l'image."
+
+#. type: Plain text
+msgid ""
+"The `link` parameter is used to control whether the scaled down image links "
+"to the full size version. By default it does; set \"link=somepage\" to link "
+"to another page instead, or \"link=no\" to disable the link, or "
+"\"link=http://url\" to link to a given url."
+msgstr ""
+"Le paramètre `link` contrôle la liaison entre l'image réduite et l'image à "
+"taille réelle. Par défaut il les relie. Vous pouvez définir \"link=somepage"
+"\" pour créer un lien vers une autre page, \"link=no\" pour désactiver le "
+"lien ou encore \"link=http://url\"  pour créer un lien vers une URL."
+
+#. type: Plain text
+msgid ""
+"You can also set default values that will be applied to all later images on "
+"the page, unless overridden. Useful when including many images on a page."
+msgstr ""
+"Vous pouvez aussi définir des valeurs par défaut qui seront utilisées pour "
+"toutes les images, sauf si ces valeurs sont annulées. C'est très utile quand "
+"on insère beaucoup d'images sur une page."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!img defaults size=200x200 alt=\"wedding photo\"]]\n"
+"\t\\[[!img photo1.jpg]]\n"
+"\t\\[[!img photo2.jpg]]\n"
+"\t\\[[!img photo3.jpg size=200x600]]\n"
+msgstr ""
+"\t\\[[!img defaults size=200x200 alt=\"wedding photo\"]]\n"
+"\t\\[[!img photo1.jpg]]\n"
+"\t\\[[!img photo2.jpg]]\n"
+"\t\\[[!img photo3.jpg size=200x600]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/inline.fr.po b/po/underlays/directives/ikiwiki/directive/inline.fr.po
new file mode 100644
index 000000000..4e0976735
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/inline.fr.po
@@ -0,0 +1,391 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"PO-Revision-Date: 2009-09-05 11:08+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `inline` directive is supplied by the [[!iki plugins/inline "
+"desc=inline]] plugin."
+msgstr ""
+"La directive `inline` est fournie par le module d'extension [[!iki plugins/"
+"inline desc=inline]]."
+
+#. type: Plain text
+msgid ""
+"This is a directive that allows including one wiki page inside another.  The "
+"most common use of inlining is generating blogs and RSS or Atom feeds."
+msgstr ""
+"Cette directive permet l'inclusion d'une page de wiki dans une autre. "
+"L'utilisation la plus fréquente de cette directive est la création de blog "
+"ou de flux Atom ou RSS."
+
+#. type: Plain text
+msgid "Example:"
+msgstr "Exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" rootpage=\"blog\"]]\n"
+msgstr "\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" rootpage=\"blog\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Any pages that match the specified [[PageSpec]] (in the example, any "
+"[[SubPage]] of \"blog\") will be part of the blog, and the newest 10 of them "
+"will appear in the page. Note that if files that are not pages match the "
+"[[PageSpec]], they will be included in the feed using RSS enclosures, which "
+"is useful for podcasting."
+msgstr ""
+"Toute page correspondant à la spécification, [[PageSpec]], (dans l'exemple, "
+"toute [[SubPage]] de \"blog\") fera partie du blog et les dix dernières "
+"pages apparaîtront dans la page. Notez que les fichiers qui, sans être des "
+"pages, correspondent à la spécification, seront inclus dans la diffusion par "
+"RSS, ce qui est utile pour le « podcasting »."
+
+#. type: Plain text
+msgid ""
+"The optional `rootpage` parameter tells the wiki that new posts to this blog "
+"should default to being [[SubPages|SubPage]] of \"blog\", and enables a form "
+"at the top of the blog that can be used to add new items."
+msgstr ""
+"Le paramètre facultatif `rootpage` indique que les nouveaux messages de ce "
+"blog seront des sous-pages [[SubPages|SubPage]] de \"blog\". Il active aussi "
+"un formulaire en haut de la page du blog qui permet l'écriture de nouveaux "
+"messages."
+
+#. type: Plain text
+msgid ""
+"If you want your blog to have an archive page listing every post ever made "
+"to it, you can accomplish that like this:"
+msgstr ""
+"Si vous voulez que le blog possède une page d'archive, listant tous les "
+"messages déjà envoyés, voici ce qu'il faut faire :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n"
+msgstr "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n"
+
+#. type: Plain text
+msgid ""
+"You can even create an automatically generated list of all the pages on the "
+"wiki, with the most recently added at the top, like this:"
+msgstr ""
+"Vous pouvez même créer une liste de toutes les pages du wiki, les plus "
+"récentes en tête, comme cela :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n"
+msgstr "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If you want to be able to add pages to a given blog feed by tagging them, "
+"you can do that too. To tag a page, just make it link to a page or pages "
+"that represent its tags. Then use the special `link()` [[PageSpec]] to match "
+"all pages that have a given tag:"
+msgstr ""
+"Vous pouvez aussi ajouter des pages à un blog donné en les étiquetant. Pour "
+"étiqueter une page, il suffit de la lier à une ou plusieurs pages qui "
+"représentent cette étiquette. Puis, il faut utiliser une spécification "
+"[[PageSpec]] avec la fonction spéciale `link()` pour trouver toutes les "
+"pages correspondant à cette étiquette."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"link(life)\"]]\n"
+msgstr "\t\\[[!inline pages=\"link(rugby)\"]]\n"
+
+#. type: Plain text
+msgid "Or include some tags and exclude others:"
+msgstr ""
+"Vous pouvez aussi inclure certaines étiquettes et en exclure d'autres :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n"
+msgstr "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Usage"
+
+#. type: Plain text
+msgid ""
+"There are many parameters you can use with the `inline` directive. These are "
+"the commonly used ones:"
+msgstr ""
+"Il est possible d'utiliser beaucoup de paramètres avec la directive "
+"`inline`. Voici les plus communs :"
+
+#. type: Bullet: '* '
+msgid "`pages` - A [[PageSpec]] of the pages to inline."
+msgstr "`pages` - Une spécification [[PageSpec]] des pages à relier."
+
+#. type: Bullet: '* '
+msgid ""
+"`show` - Specify the maximum number of matching pages to inline.  Default is "
+"10, unless archiving, when the default is to show all.  Set to 0 to show all "
+"matching pages."
+msgstr ""
+"`show` - Indique le nombre maximun de pages correspondantes à relier. Par "
+"défaut, ce nombre vaut 10 sauf pour l'archivage où toutes les pages sont "
+"reliées. La valeur 0 permet d'afficher toutes les pages correspondantes."
+
+#. type: Bullet: '* '
+msgid ""
+"`archive` - If set to \"yes\", only list page titles and some metadata, not "
+"full contents."
+msgstr ""
+"`archive` - Quand ce paramètre vaut \"yes\", on ne liste que le titre des "
+"pages et certaines métadonnées, pas tout le contenu des pages."
+
+#. type: Bullet: '* '
+msgid ""
+"`description` - Sets the description of the rss feed if one is generated.  "
+"Defaults to the name of the wiki."
+msgstr ""
+"`description` - donne le nom du flux RSS créé. Par défaut, c'est le nom du "
+"wiki."
+
+#. type: Bullet: '* '
+msgid ""
+"`skip` - Specify a number of pages to skip displaying. Can be useful to "
+"produce a feed that only shows archived pages."
+msgstr ""
+"`skip` - Indique un nombre de pages à ne pas afficher. C'est utile pour "
+"produire un flux qui ne montre que les pages archivées."
+
+#. type: Bullet: '* '
+msgid ""
+"`postform` - Set to \"yes\" to enable a form to post new pages to a blog."
+msgstr ""
+"`postform` - Quand ce paramètre vaut \"yes\", le formulaire qui permet de "
+"créer de nouvelles pages sur un blog est activé."
+
+#. type: Bullet: '* '
+msgid "`postformtext` - Set to specify text that is displayed in a postform."
+msgstr "`postformtext` - Spécifie le texte affiché par le formulaire."
+
+#. type: Bullet: '* '
+msgid ""
+"`rootpage` - Enables the postform, and allows controling where newly posted "
+"pages should go, by specifiying the page that they should be a [[SubPage]] "
+"of."
+msgstr ""
+"`rootpage` - Active le formulaire et indique l'endroit où les nouveaux "
+"messages seront placés, en donnant la page dont ils seront des sous-pages."
+
+#. type: Plain text
+msgid "Here are some less often needed parameters:"
+msgstr "Voici quelques paramètres moins nécessaires :"
+
+#. type: Bullet: '* '
+msgid ""
+"`actions` - If set to \"yes\" add links to the bottom of the inlined pages "
+"for editing and discussion (if they would be shown at the top of the page "
+"itself)."
+msgstr ""
+"`actions` - Quand ce paramètre vaut \"yes\", des liens permettant la "
+"modification et la discussion sont ajoutés au bas des pages reliées plutôt "
+"qu'en haut."
+
+#. type: Bullet: '* '
+msgid ""
+"`rss` - controls generation of an rss feed. If the wiki is configured to "
+"generate rss feeds by default, set to \"no\" to disable. If the wiki is "
+"configured to `allowrss`, set to \"yes\" to enable."
+msgstr ""
+"`rss` - Contrôler la création d'un flux RSS. Si le wiki est configuré par "
+"défaut pour créer des flux rss, le mettre à \"no\" désactive la création de "
+"flux. Si le wiki est configuré avec  l'option `allowrss`, le mettre à \"yes"
+"\" active la création de flux rss. "
+
+#. type: Bullet: '* '
+msgid ""
+"`atom` - controls generation of an atom feed. If the wiki is configured to "
+"generate atom feeds by default, set to \"no\" to disable. If the wiki is "
+"configured to `allowatom`, set to \"yes\" to enable."
+msgstr ""
+"`atom` - Contrôler la création d'un flux Atom. Si le wiki est configuré par "
+"défaut pour créer des flux Atom, le mettre à \"no\" désactive la création de "
+"flux. Si le wiki est configuré avec l'option `allowatom`, le mettre à \"yes"
+"\" active la création de flux Atom."
+
+#. type: Bullet: '* '
+msgid ""
+"`feeds` - controls generation of all types of feeds. Set to \"no\" to "
+"disable generating any feeds."
+msgstr ""
+"`feeds` - Contrôler la création de tout type de flux. Le mettre à \"no\" "
+"pour désactiver la création de flux."
+
+#. type: Bullet: '* '
+msgid ""
+"`emptyfeeds` - Set to \"no\" to disable generation of empty feeds.  Has no "
+"effect if `rootpage` or `postform` is set."
+msgstr ""
+"`emptyfeeds` - Mettre ce paramètre à \"no\" pour désactiver toute création "
+"de flux vides. N'a aucun effet si le paramètre `rootpage` ou le paramètre "
+"`postform` est activé."
+
+#. type: Bullet: '* '
+msgid ""
+"`template` - Specifies the template to fill out to display each inlined "
+"page. By default the `inlinepage` template is used, while the `archivepage` "
+"template is used for archives. Set this parameter to use some other, custom "
+"template, such as the `titlepage` template that only shows post titles or "
+"the `microblog` template, optimised for microblogging. Note that you should "
+"still set `archive=yes` if your custom template does not include the page "
+"content."
+msgstr ""
+"`template` - Ce paramètre indique le modèle de page à utiliser pour chaque "
+"page reliée. Par défaut le modèle utilisé est `inlinepage`. Pour les "
+"archives, le modèle utilisé est `archivepage`. Il est possible d'utiliser "
+"d'autres modèles comme `titlepage` qui n'affiche que le titre des messages, "
+"ou `microblog`, optimisé pour le « microblogging », et même de créer vos "
+"propres modèles. Notez que vous devez quand même activer le paramètre "
+"archive, `archive=yes`, si votre modèle n'inclut pas le contenu de la page."
+
+#. type: Bullet: '* '
+msgid ""
+"`raw` - Rather than the default behavior of creating a blog, if raw is set "
+"to \"yes\", the page will be included raw, without additional markup around "
+"it, as if it were a literal part of the source of the inlining page."
+msgstr ""
+"`raw` - Si ce paramètre vaut \"yes\", la page sera incluse sous sa forme "
+"« brute », sans balisage supplémentaire, comme si elle faisait partie de la "
+"source de la page dans laquelle elle est incluse. Le comportement par défaut "
+"de ce paramètre est de créer un blog."
+
+#. type: Bullet: '* '
+msgid ""
+"`sort` - Controls how inlined pages are sorted. The default, \"age\" is to "
+"sort newest created pages first. Setting it to \"title\" will sort pages by "
+"title, and \"mtime\" sorts most recently modified pages first. If [[!cpan "
+"Sort::Naturally]] is installed, `sort` can be set to \"title_natural\" to "
+"sort by title with numbers treated as such (\"1 2 9 10 20\" instead of \"1 "
+"10 2 20 9\")."
+msgstr ""
+"`sort` - Ce paramètre contrôle la façon de trier les pages reliées. Avec le "
+"critère par défaut, \"age\", les pages les plus récentes sont classées en "
+"premier.  Avec le critère \"title\", les pages seront classées par titre. "
+"Avec le critère \"mtime\", les pages les plus récemment modifiées seront "
+"classées en premier. Si le module [[!cpan Sort::Naturally]] est installé, on "
+"peut utiliser le critère \"title_natural\" pour trier par titre avec nombres "
+"ordonnés numériquement (\"1 2 9 10 20\" au lieu de \"1 10 2 20 9\")."
+
+#. type: Bullet: '* '
+msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed."
+msgstr ""
+"`reverse` - Si ce paramètre vaut \"yes\", l'ordre de classement est renversé."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedshow` - Specify the maximum number of matching pages to include in the "
+"rss/atom feeds. The default is the same as the `show` value above."
+msgstr ""
+"`feedshow` - Indique le nombre maximun de pages à inclure dans le flux RSS/"
+"Atom. La valeur par défaut est la même que celle du paramètre `show`."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedonly` - Only generate the feed, do not display the pages inline on the "
+"page."
+msgstr ""
+"`feedonly` - Ne créer que le flux, ne pas afficher les pages reliées sur la "
+"page."
+
+#. type: Bullet: '* '
+msgid ""
+"`quick` - Build archives in quick mode, without reading page contents for "
+"metadata. By default, this also turns off generation of any feeds."
+msgstr ""
+"`quick` - Construire l'archive en mode rapide, sans chercher les métadonnées "
+"dans le contenu des pages. Par défaut, cela désactive la création de flux."
+
+#. type: Bullet: '* '
+msgid ""
+"`timeformat` - Use this to specify how to display the time or date for pages "
+"in the blog. The format string is passed to the strftime(3) function."
+msgstr ""
+"`timeformat` - Ce paramètre permet d'indiquer la manière d'afficher l'heure "
+"ou la date dans les pages de blog. Le format est passé à la fonction strftime"
+"(3)."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom "
+"feeds. The default is the same as the `pages` value above, and only pages "
+"matched by that value are included, but some of those can be excluded by "
+"specifying a tighter [[PageSpec]] here."
+msgstr ""
+"`feedpages` - Une spécification [[PageSpec]] des pages à inclure dans le "
+"flux rss/atom. Par défaut, cette valeur est la même que celle du paramètre "
+"`pages` et seules les pages correspondantes sont incluses, mais une "
+"spécification plus précise peut en exclure certaines."
+
+#. type: Bullet: '* '
+msgid ""
+"`guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`), "
+"the Atom feed will have this as its `<id>`. The default is to use the URL of "
+"the page containing the `inline` directive."
+msgstr ""
+"`guid` - Si une URI est donnée (peut-être un UUID préfixé, `urn:uuid:`), le "
+"flux Atom aura cet identifiant, son `<id>`. Par défaut, l'URL de la page "
+"contenant la directive `inline` est utilisée."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedfile` - Can be used to change the name of the file generated for the "
+"feed. This is particularly useful if a page contains multiple feeds.  For "
+"example, set \"feedfile=feed\" to cause it to generate `page/feed.atom` and/"
+"or `page/feed.rss`. This option is not supported if the wiki is configured "
+"not to use `usedirs`."
+msgstr ""
+"`feedfile` - On peut utiliser ce paramètre pour changer le nom du fichier "
+"créé pour le flux. C'est très utile dans le cas d'une page qui contient "
+"plusieurs flux. Par exemple, indiquez \"feedfile=feed\" pour créer un "
+"fichier `page/feed.atom` ou `page/feed.rss`. Si le wiki est configuré pour "
+"ne pas utiliser `usedirs`, ce paramètre ne fonctionne pas."
+
+#. type: Bullet: '* '
+msgid ""
+"`pagenames` - If given instead of `pages`, this is interpreted as a space-"
+"separated list of links to pages (with the same [[SubPage/LinkingRules]] as "
+"in a [[ikiwiki/WikiLink]]), and they are inlined in exactly the order given: "
+"the `sort` and `pages` parameters cannot be used in conjunction with this "
+"one."
+msgstr ""
+"`pagenames` - Si ce paramètre est utilisé à la place de `pages`, il est "
+"interprété comme une liste de liens, séparés par des espaces, avec les mêmes "
+"règles [[SubPage/LinkingRules]] que dans un [[ikiwiki/WikiLink]]. Ces liens "
+"sont reliés dans l'ordre dans lequel ils sont listés : les paramètres `sort` "
+"et `pages` ne peuvent pas être utilisés en même temps."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"A related directive is the [[ikiwiki/directive/edittemplate]] directive, "
+"which allows default text for a new page to be specified."
+msgstr ""
+"Une directive apparentée à cette directive est [[ikiwiki/directive/"
+"edittemplate]], qui permet d'indiquer un texte par défaut pour la nouvelle "
+"page."
diff --git a/po/underlays/directives/ikiwiki/directive/linkmap.fr.po b/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
new file mode 100644
index 000000000..f0bd3f11c
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
@@ -0,0 +1,64 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-11 21:16+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `linkmap` directive is supplied by the [[!iki plugins/linkmap "
+"desc=linkmap]] plugin."
+msgstr "\"La directive `linkmap` est fournie par le module d'extension [[!iki plugins/linkmap desc=linkmap]]."
+
+#. type: Plain text
+msgid ""
+"This directive uses [graphviz](http://www.graphviz.org/) to generate a graph "
+"showing the links between a set of pages in the wiki. Example usage:"
+msgstr "Cette directive utilise le programme [graphviz](http://www.graphviz.org/) pour créer un graphique montrant les liens existants entre certaines pages du wiki. Par exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n"
+msgstr "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Only links between mapped pages will be shown; links pointing to or from "
+"unmapped pages will be omitted. If the pages to include are not specified, "
+"the links between all pages (and other files) in the wiki are mapped. For "
+"best results, only a small set of pages should be mapped, since otherwise "
+"the map can become very large, unwieldy, and complicated. Also, the map is "
+"rebuilt whenever one of the mapped pages is changed, which can make the wiki "
+"a bit slow."
+msgstr "Seuls les liens entre les pages recherchées sont montrés. Des liens existants entre des pages non recherchées sont ignorés. Si les pages à rechercher ne sont pas spécifiées, les liens entre toutes les pages (et tous les fichiers) du wiki seront affichés. Pour des résultats corrects, il vaut mieux définir l'ensemble des pages à rechercher. Sinon, le diagramme deviendra très grand, illisible et compliqué. De plus le diagramme est reconstruit à chaque modification d'une page faisant partie de l'ensemble, ce qui peut rendre le wiki un peu lent."
+
+#. type: Plain text
+msgid ""
+"Here are descriptions of all the supported parameters to the `linkmap` "
+"directive:"
+msgstr "Voici la description des paramètres de la directive `linkmap` :"
+
+#. type: Bullet: '* '
+msgid "`pages` - A [[ikiwiki/PageSpec]] of the pages to map."
+msgstr "`pages` - Une spéfication [[ikiwiki/PageSpec]] des pages à rechercher."
+
+#. type: Bullet: '* '
+msgid ""
+"`height`, `width` - Limit the size of the map to a given height and width, "
+"in inches. Both must be specified for the limiting to take effect, otherwise "
+"the map's size is not limited."
+msgstr "`height`, `width` - Ces paramètres limitent la taille du diagramme, avec une hauteur et une largeur exprimées en pouce. Vous devez les indiquer tous les deux. Sinon le programme choisira une valeur sans limites."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/listdirectives.fr.po b/po/underlays/directives/ikiwiki/directive/listdirectives.fr.po
new file mode 100644
index 000000000..86f7cdda9
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/listdirectives.fr.po
@@ -0,0 +1,69 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 09:56+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `listdirectives` directive is supplied by the [[!iki plugins/"
+"listdirectives desc=listdirectives]] plugin."
+msgstr ""
+"La directive `listdirectives` est fournie par le module d'extension [[!iki "
+"plugins/listdirectives desc=listdirectives]]."
+
+#. type: Plain text
+msgid ""
+"This directive generates a list of available [[directives|ikiwiki/"
+"directive]]."
+msgstr ""
+"Cette directive crée une liste des [[directives|ikiwiki/directive]] "
+"disponibles."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!listdirectives]]\n"
+msgstr "\t\\[[!listdirectives]]\n"
+
+#. type: Plain text
+msgid ""
+"There is one optional keyword argument, `generated`.  Normally the "
+"`listdirectives` directive will list all built in directives and directives "
+"directly registered by plugins.  With this keyword, `listdirectives` will "
+"also list directives generated later.  For example, all [[shortcuts]] are "
+"directives generated in turn by the `shortcut` directive.  They will only be "
+"listed if the `generated` argument is supplied."
+msgstr ""
+"Il n'y a qu'un seul paramètre facultatif, `generated`. Toutes les directives "
+"internes et les directives déclarées par les greffons seront listées. Avec "
+"ce paramètre, `listdirectives` listera aussi les directives qui viendront à "
+"être créées. Par exemple, tous les raccourcis [[shortcuts]] sont des "
+"directives créées par la directive `shortcut`. Ils seront listés si le "
+"paramètre `generated` est fourni."
+
+#. type: Plain text
+#, no-wrap
+msgid "    \\[[!listdirectives generated]]\n"
+msgstr "    \\[[!listdirectives generated]]\n"
+
+#. type: Plain text
+msgid ""
+"This extended list is often quite long, and often contains many undocumented "
+"directives."
+msgstr ""
+"Cette liste est souvent très longue. Elle contient aussi beaucoup de "
+"directives non documentées."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/map.fr.po b/po/underlays/directives/ikiwiki/directive/map.fr.po
new file mode 100644
index 000000000..d1f4ee0c1
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/map.fr.po
@@ -0,0 +1,71 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-06 09:09+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\\n\"\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `map` directive is supplied by the [[!iki plugins/map desc=map]] plugin."
+msgstr ""
+"La directive `map` est fournie par le module d'extension [[!iki plugins/map "
+"desc=map]]."
+
+#. type: Plain text
+msgid ""
+"This directive generates a hierarchical page map for the wiki. Example usage:"
+msgstr ""
+"Cette directive crée une représentation hiérarchisée des pages du wiki. "
+"Voici un exemple d'utilisation :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\"]]\n"
+msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If the pages to include are not specified, all pages (and other files) in "
+"the wiki are mapped."
+msgstr ""
+"Si les pages à inclure ne sont pas spécifiées, toutes les pages (et tous les "
+"fichiers) sont pris en compte."
+
+#. type: Plain text
+msgid ""
+"By default, the names of pages are shown in the map. The `show` parameter "
+"can be used to show the titles or descriptions of pages instead (as set by "
+"the [[meta]] directive). For example:"
+msgstr ""
+"Par défaut, les noms des pages sont utilisés dans la représentation. Le "
+"paramètre `show` permet d'utiliser à la place le titre des pages ou leur "
+"description lorsqu'ils ont été définis avec la directive [[meta]]. Par "
+"exemple : "
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
+msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
+
+#. type: Plain text
+msgid ""
+"Hint: To limit the map to displaying pages less than a certain level deep, "
+"use a [[ikiwiki/PageSpec]] like this: `pages=\"* and !*/*/*\"`"
+msgstr ""
+"Pour n'afficher les pages que jusqu'à un certain niveau de profondeur, vous "
+"pouvez utiliser une spécification [[ikiwiki/PageSpec]] comme celle-ci : "
+"`pages=\\\"* and !*/*/*\\\"`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/meta.fr.po b/po/underlays/directives/ikiwiki/directive/meta.fr.po
new file mode 100644
index 000000000..a8039c04f
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/meta.fr.po
@@ -0,0 +1,412 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-06 08:44+0200\n"
+"Last-Translator:  Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `meta` directive is supplied by the [[!iki plugins/meta desc=meta]] "
+"plugin."
+msgstr ""
+"La directive `meta` est fournie par le module d'extension [[!iki plugins/"
+"meta desc=meta]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows inserting arbitrary metadata into the source of a "
+"page.  Enter the metadata as follows:"
+msgstr ""
+"Cette directive permet l'insertion de métadonnées quelconques dans la source "
+"d'une page. Voici comment procéder : "
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!meta field=\"value\"]]\n"
+"\t\\[[!meta field=\"value\" param=\"value\" param=\"value\"]]\n"
+msgstr ""
+"\t\\[[!meta field=\"valeur\"]]\n"
+"\t\\[[!meta field=\"valeur\" param=\"valeur\" param=\"valeur\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The first form sets a given field to a given value, while the second form "
+"also specifies some additional sub-parameters."
+msgstr ""
+"La première expression donne une valeur à un champ, tandis que la seconde "
+"définit également des sous-paramètres."
+
+#. type: Plain text
+msgid ""
+"The field values are treated as HTML entity-escaped text, so you can include "
+"a quote in the text by writing `&quot;` and so on."
+msgstr ""
+"La valeur d'un champ est traitée comme du texte codé en HTML. Vous pouvez "
+"inclure un guillemet en écrivant `&quot;` par exemple. "
+
+#. type: Plain text
+msgid "Supported fields:"
+msgstr "Champs reconnus :"
+
+#. type: Bullet: '* '
+msgid "title"
+msgstr "title"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Overrides the title of the page, which is generally the same as the\n"
+"  page name.\n"
+msgstr ""
+"  La valeur de ce champ remplace le titre d'une page, qui est en général\n"
+"  le nom de la page.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Note that if the title is overridden, a \"title_overridden\" variable will\n"
+"  be set to a true value in the template; this can be used to format things\n"
+"  differently in this case.\n"
+msgstr ""
+"  Si le titre est remplacé, une variable « title_overridden » est définie avec une valeur *true*\n"
+"  dans le modèle de page. On peut se servir de cette variable pour formater le texte différemment.\n"
+
+#. type: Bullet: '* '
+msgid "license"
+msgstr "license"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a license for the page, for example, \"GPL\". Can contain\n"
+"  WikiLinks and arbitrary markup.\n"
+msgstr ""
+"  Indique la license de la page, par exemple « GPL ». Peut contenir des WikiLinks\n"
+"  et des balises quelconques.\n"
+
+#. type: Bullet: '* '
+msgid "copyright"
+msgstr "copyright"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies the copyright of the page, for example, \"Copyright 2007 by\n"
+"  Joey Hess\". Can contain WikiLinks and arbitrary markup.\n"
+msgstr ""
+"  Indique le copyright de la page, par exemple « Copyright 2007 by Joey Hess ».\n"
+"  Peut contenir des WikiLinks et des balises quelconques.\n"
+
+#. type: Bullet: '* '
+msgid "author"
+msgstr "author"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Specifies the author of a page.\n"
+msgstr "  L'auteur de la page.\n"
+
+#. type: Bullet: '* '
+msgid "authorurl"
+msgstr "authorurl"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Specifies an url for the author of a page.\n"
+msgstr "  Indique une URL pour l'auteur de la page.\n"
+
+#. type: Bullet: '* '
+msgid "description"
+msgstr "description"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a \"description\" of the page. You could use this to provide\n"
+"  a summary, for example, to be picked up by the [[map]] directive.\n"
+msgstr ""
+"  Donne une « description » de la page. On peut s'en servir pour donner un résumé,\n"
+"  qui sera utilisé par la directive [[map]].\n"
+
+#. type: Bullet: '* '
+msgid "permalink"
+msgstr "permalink"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a permanent link to the page, if different than the page\n"
+"  generated by ikiwiki.\n"
+msgstr "  Indique un lien permanent vers la page, si différent de la page créée par ikiwiki.\n"
+
+#. type: Bullet: '* '
+msgid "date"
+msgstr "date"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies the creation date of the page. The date can be entered in\n"
+"  nearly any format, since it's parsed by [[!cpan TimeDate]].\n"
+msgstr ""
+"  Indique la date de création de la page. Tous les formats de date sont reconnus, puisque la valeur\n"
+"  de ce champ est analysée par [[!cpan TimeDate]].\n"
+
+#. type: Bullet: '* '
+msgid "stylesheet"
+msgstr "stylesheet"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Adds a stylesheet to a page. The stylesheet is treated as a wiki link to\n"
+"  a `.css` file in the wiki, so it cannot be used to add links to external\n"
+"  stylesheets. Example:\n"
+msgstr ""
+"  Ajoute une feuille de style à la page. La feuille de style est traitée \n"
+"  comme un lien wiki vers un fichier `.css` dans le wiki. On ne peut donc pas\n"
+"  ajouter de liens vers des feuilles de style externes. Par exemple :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n"
+"\ttitle=\"somestyle\"]]\n"
+msgstr ""
+"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n"
+"\ttitle=\"somestyle\"]]\n"
+
+#. type: Bullet: '* '
+msgid "openid"
+msgstr "openid"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Adds html &lt;link&gt; tags to perform OpenID delegation to an external\n"
+"  OpenID server. This lets you use an ikiwiki page as your OpenID.\n"
+msgstr ""
+"  Ajoute des balises HTML &lt;link&gt; pour réaliser une délégation OpenID\n"
+"  à un serveur OpenID externe. Cela permet d'utiliser une page de wiki comme\n"
+"  votre identifiant OpenID.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  By default this will delegate for both `openid` and `openid2`. To only\n"
+"  delegate for one, add a parameter such as `delegate=openid`.\n"
+msgstr ""
+"  Par défaut la délégation se fera pour `openid` et `openid2`. Pour n'en choisir qu'un,\n"
+"  ajoutez par exemple ce paramètre : `delegate=openid`.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  An optional `xrds-location`\n"
+"  parameter lets you specify the location of any [eXtensible Resource\n"
+"  DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).\n"
+msgstr ""
+"  Un paramètre facultatif `xrds-location` permet d'indiquer l'adresse de tout\n"
+"  [eXtensible Resource DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Example:\n"
+msgstr "  Exemple :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\\\[[!meta openid=\"http://joeyh.myopenid.com/\"\n"
+"\tserver=\"http://www.myopenid.com/server\"\n"
+"\txrds-location=\"http://www.myopenid.com/xrds?username=joeyh.myopenid.com\"\"]]\n"
+msgstr ""
+"\t\\\\[[!meta openid=\"http://joeyh.myopenid.com/\"\n"
+"\tserver=\"http://www.myopenid.com/server\"\n"
+"\txrds-location=\"http://www.myopenid.com/xrds?username=joeyh.myopenid.com\"\"]]\n"
+
+#. type: Bullet: '* '
+msgid "link"
+msgstr "link"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a link to another page. This can be used as a way to make the\n"
+"  wiki treat one page as linking to another without displaying a user-visible\n"
+"  [[ikiwiki/WikiLink]]:\n"
+msgstr ""
+"  Indique un lien vers une autre page. C'est une façon de lier deux pages\n"
+"  sans afficher un [[ikiwiki/WikiLink]] qui serait visible par l'utilisateur :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "       \\[[!meta link=otherpage]]\n"
+msgstr "       \\[[!meta link=otherpage]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  It can also be used to insert a html &lt;link&gt; tag. For example:\n"
+msgstr "  On peut aussi s'en servir pour insérer une balise HTML &lt;link&gt;. Par exemple :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "       \\[[!meta link=\"http://joeyh.myopenid.com/\" rel=\"openid.delegate\"]]\n"
+msgstr "       \\[[!meta link=\"http://joeyh.myopenid.com/\" rel=\"openid.delegate\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  However, this latter syntax won't be allowed if the \n"
+"  [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled, since it can be used to\n"
+"  insert unsafe content.\n"
+msgstr ""
+"  Cependant cette expression ne sera pas permise si le greffon \n"
+"  [[!iki plugins/htmlscrubber desc=htmlscrubber]] est activé,\n"
+"  car il permet d'insérer des contenus non sécurisés.\n"
+
+#. type: Bullet: '* '
+msgid "redir"
+msgstr "redir"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Causes the page to redirect to another page in the wiki.\n"
+msgstr "  Rend possible la redirection d'une page vers une autre dans le wiki.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  \t\\[[!meta redir=otherpage]]\n"
+msgstr "  \t\\[[!meta redir=otherpage]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Optionally, a delay (in seconds) can be specified. The default is to\n"
+"  redirect without delay.\n"
+msgstr "  Un délai (en seconde) peut être indiqué. Par défaut, il n'y a pas de délai.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  It can also be used to redirect to an external url. For example:\n"
+msgstr "  Une redirection vers une URL externe est aussi possible. Par exemple :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  \t\\[[!meta redir=\"http://example.com/\"]]\n"
+msgstr "  \t\\[[!meta redir=\"http://example.com/\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  For both cases, an anchor to jump to inside the destination page may also be\n"
+"  specified using the common `#ANCHOR` syntax.\n"
+msgstr ""
+"  Dans les deux cas, on peut indiquer une ancre à l'intérieur de la page visée,\n"
+"  avec la syntaxe habituelle `#ANCHOR`.\n"
+
+#. type: Bullet: '* '
+msgid "robots"
+msgstr "robots"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Causes the robots meta tag to be written:\n"
+msgstr "  Permet l'écriture de l'étiquette robots :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "        \\[[!meta robots=\"index, nofollow\"]]\n"
+msgstr "        \\[[!meta robots=\"index, nofollow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Valid values for the attribute are: \"index\", \"noindex\", \"follow\", and\n"
+"  \"nofollow\". Multiple comma-separated values are allowed, but obviously only\n"
+"  some combinations make sense. If there is no robots meta tag, \"index,\n"
+"  follow\" is used as the default.\n"
+msgstr ""
+"  L'attribut peut prendre les valeurs suivantes : \"index\", \"noindex\", \"follow\"\n"
+"  et \"nofollow\". On peut indiquer plusieurs valeurs, séparées par une virgule.\n"
+"  Seules quelques combinaisons cependant ont du sens. Si l'étiquette robots\n"
+"  n'existe pas, \"index, follow\" est utilisée par défaut.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  The value is escaped, but its contents are not otherwise checked.\n"
+msgstr "  La valeur est protégée mais son contenu n'est pas vérifié.\n"
+
+#. type: Bullet: '* '
+msgid "guid"
+msgstr "guid"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a globally unique ID for a page. This guid should be a URI\n"
+"  (in particular, it can be `urn:uuid:` followed by a UUID, as per\n"
+"  [[!rfc 4122]]), and it will be used to identify the page's entry in RSS\n"
+"  and Atom feeds. If not given, the default is to use the page's URL as its\n"
+"  guid.\n"
+msgstr ""
+"  Indique l'identificateur unique (*GUID*) d'une page. Cet identificateur\n"
+"  doit être un URI, en particulier, il peut être de la forme `urn:uuid:` suivi\n"
+"  d'un UUID, comme indiqué dans le [[!rfc 4122]]). Il permet l'identification d'une\n"
+"  page pour un flux RSS ou Atom. S'il n'est pas donné, l'URL de la page\n"
+"  est utilisée comme GUID.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  This is mostly useful when a page has moved, to keep the guids for\n"
+"  pages unchanged and avoid_flooding_aggregators\n"
+"  (see [[!iki tips/howto_avoid_flooding_aggregators]]).\n"
+msgstr ""
+"  Sa principale utilisation est de garder inchangés les identificateurs des pages\n"
+"  qui ont été déplacées, évitant ainsi l'engorgement des agrégateurs.\n"
+"  Consultez [[!iki tips/howto_avoid_flooding_aggregators]]).\n"
+
+#. type: Bullet: '* '
+msgid "updated"
+msgstr "updated"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a fake modification time for a page, to be output into RSS and\n"
+"  Atom feeds. This is useful to avoid flooding aggregators that sort by\n"
+"  modification time, like Planet: for instance, when editing an old blog post\n"
+"  to add tags, you could set `updated` to be one second later than the original\n"
+"  value. The date/time can be given in any format that\n"
+"  [[!cpan TimeDate]] can understand, just like the `date` field.\n"
+msgstr ""
+"  Indique une date de modification fausse pour une page qui doit être affichée\n"
+"  dans les flux RSS ou Atom. Cela permet d'éviter l'engorgement des agrégateurs\n"
+"  qui classent les pages par date de modification, comme Planet par exemple.\n"
+"  Pour ajouter des étiquettes à un ancien message, vous pouvez mettre une valeur\n"
+"  supérieure d'une seconde à l'ancienne valeur. Tous les formats de date reconnus par\n"
+"  [[!cpan TimeDate]] sont acceptés, tout comme pour le paramètre `date`.\n"
+
+#. type: Plain text
+msgid ""
+"If the field is not one of the above predefined fields, the metadata will be "
+"written to the generated html page as a &lt;meta&gt; header. However, this "
+"won't be allowed if the [[!iki plugins/htmlscrubber desc=htmlscrubber]] "
+"plugin is enabled, since it can be used to insert unsafe content."
+msgstr "Si le paramètre n'est pas l'un de ceux définis précédemment, les metadonnées seront écrites sur la page HTML créée sous forme d' en-tête &lt;meta&gt;. Cependant cette expression ne sera pas permise si le greffon [[!iki plugins/htmlscrubber desc=htmlscrubber]] est activé, car il permet d'insérer des contenus non sécurisés."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/more.fr.po b/po/underlays/directives/ikiwiki/directive/more.fr.po
new file mode 100644
index 000000000..2c0c791d7
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/more.fr.po
@@ -0,0 +1,63 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-07 17:07+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `more` directive is supplied by the [[!iki plugins/more desc=more]] "
+"plugin."
+msgstr ""
+"La directive `more` est fournie par le module d'extension [[!iki plugins/"
+"more desc=more]]."
+
+#. type: Plain text
+msgid ""
+"This directive provides a way to have a \"more\" link on a post in a blog, "
+"that leads to the full version of the page. Use it like this:"
+msgstr ""
+"Cette directive permet d'insérer un lien \"more\" sur le message d'un blog. "
+"Ce lien pointe vers la version complète de la page. Voici comment "
+"l'utiliser :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!more linktext=\"click for more\" text=\"\"\"\n"
+msgstr "\t\\[[!more linktext=\"click for more\" text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tThis is the rest of my post. Not intended for people catching up on\n"
+"\ttheir blogs at 30,000 feet. Because I like to make things\n"
+"\tdifficult.\n"
+msgstr ""
+"\tVoici la suite du message. Ce n'est pas à l'intention des gens rattrapant\n"
+"\tleur retard dans la lecture de leurs blogs à 10000 mètres d'altitude. Parce que\n"
+"\tj'aime rendre les choses difficiles.\n"
+
+#. type: Plain text
+msgid "If the `linktext` parameter is omitted it defaults to just \"more\"."
+msgstr ""
+"Si le paramètre `linktext` est omis, la valeur par défaut du lien est \"more"
+"\"."
+
+#. type: Plain text
+msgid ""
+"Note that you can accomplish something similar using a [[toggle]] instead."
+msgstr "Vous pouvez obtenir quelque chose de semblable avec [[toggle]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/orphans.fr.po b/po/underlays/directives/ikiwiki/directive/orphans.fr.po
new file mode 100644
index 000000000..c14826900
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/orphans.fr.po
@@ -0,0 +1,49 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 11:38+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `orphans` directive is supplied by the [[!iki plugins/orphans "
+"desc=orphans]] plugin."
+msgstr "La directive `orphans` est fournie par le module d'extension [[!iki plugins/orphans desc=orphans]]."
+
+#. type: Plain text
+msgid ""
+"This directive generates a list of possibly orphaned pages -- pages that no "
+"other page links to. Example:"
+msgstr "Cette directive crée une liste des pages probablement orphelines, c'est-à-dire des pages qui ne sont liées à aucune autre page. Exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!orphans pages=\"* and !blog/*\"]]\n"
+msgstr "\t\\[[!orphans pages=\"* and !blog/*\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying "
+"the pages to check for orphans, default is search them all."
+msgstr "Le paramètre facultatif \"pages\" peut être une spécification [[ikiwiki/PageSpec]] indiquant un ensemble de pages à vérifier. Par défaut la recherche se fait dans toutes les pages. "
+
+#. type: Plain text
+msgid ""
+"Note that it takes backlinks into account, but does not count inlining a "
+"page as linking to it, so will generally count many blog-type pages as "
+"orphans."
+msgstr "Notez que les rétroliens sont pris en compte. Mais relier une page à une autre n'est pas considéré comme un lien et les pages d'un blog seront comptées parmi les pages orphelines."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/pagecount.fr.po b/po/underlays/directives/ikiwiki/directive/pagecount.fr.po
new file mode 100644
index 000000000..c6167f50b
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/pagecount.fr.po
@@ -0,0 +1,40 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 11:46+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `pagecount` directive is supplied by the [[!iki plugins/pagecount "
+"desc=pagecount]] plugin."
+msgstr "La directive `pagecount` est fournie par le module d'extension [[!iki plugins/pagecount desc=pagecount]]. "
+
+#. type: Plain text
+msgid "This directive counts pages currently in the wiki. Example:"
+msgstr "Cette directive compte les pages du wiki. Exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagecount pages=\"*\"]]\n"
+msgstr "\t\\[[!pagecount pages=\"*\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying "
+"the pages to count, default is to count them all."
+msgstr "Le paramètre facultatif \"pages\" peut être une spécification [[ikiwiki/PageSpec]] indiquant un ensemble de pages à compter. Par défaut toutes les pages du wiki sont comptées."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.fr.po b/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
new file mode 100644
index 000000000..11c3a0b8b
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
@@ -0,0 +1,71 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 12:02+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `pagestats` directive is supplied by the [[!iki plugins/pagestats "
+"desc=pagestats]] plugin."
+msgstr "La directive `pagestats` est fournie par le module d'extension [[!iki plugins/pagestats desc=pagestats]]."
+
+#. type: Plain text
+msgid ""
+"This directive can generate stats about how pages link to each other. It can "
+"produce either a tag cloud, or a table counting the number of links to each "
+"page."
+msgstr "Cette directive permet de créer des statistiques sur les pages et la façon dont elles sont liées. Elle affiche soit un nuage d'étiquettes, soit un tableau montrant le nombre de liens de chaque page."
+
+#. type: Plain text
+msgid "Here's how to use it to create a [[tag]] cloud:"
+msgstr "Voici comment afficher un nuage d'étiquettes [[tag]] :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+
+#. type: Plain text
+msgid "And here's how to create a table of all the pages on the wiki:"
+msgstr "Et voici comment créer le tableau :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagestats style=\"table\"]]\n"
+msgstr "\t\\[[!pagestats style=\"table\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The optional `among` parameter limits counting to pages that match a "
+"[[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog "
+"entries, you could use:"
+msgstr "Le paramètre facultatif `among` permet d'utiliser une spécification [[ikiwiki/PageSpec]] pour limiter l'ensemble des pages à compter. Par exemple, pour afficher un nuage avec les étiquettes utilisées dans un blog, on peut écrire : "
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n"
+
+#. type: Plain text
+msgid "or to display a cloud of tags related to Linux, you could use:"
+msgstr "Pour afficher un nuage avec les étiquettes consacrées à Linux, écrivez :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagestats pages=\"tags/* and not tags/linux\" among=\"tagged(linux)\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/* and not tags/linux\" among=\"tagged(linux)\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po b/po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po
new file mode 100644
index 000000000..34a516344
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po
@@ -0,0 +1,46 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 12:17+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate "
+"desc=pagetemplate]] plugin."
+msgstr "La directive `pagetemplate` est fournie par le module d'extension [[!iki plugins/pagetemplate desc=pagetemplate]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows a page to be created using a different wikitemplates.  "
+"The page text is inserted into the template, so the template controls the "
+"overall look and feel of the wiki page. This is in contrast to the [[ikiwiki/"
+"directive/template]] directive, which allows inserting templates _into_ the "
+"body of a page."
+msgstr "Cette directive permet de créer des pages avec un modèle de page différent. Le texte de la page est inséré dans le modèle. Ainsi le modèle commande l'allure générale de la page. Cette directive agit différemment de la directive [[ikiwiki/directive/template]] qui permet d'insérer des modèles _à l'intérieur_ du corps d'une page."
+
+#. type: Plain text
+msgid ""
+"This directive can only reference templates that are already installed by "
+"the system administrator, typically into the `/usr/share/ikiwiki/templates` "
+"directory. Example:"
+msgstr "Cette directive ne peut appeler que des modèles déjà installés par l'administrateur, en général dans le répertoire `/usr/share/ikiwiki/templates`. Exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n"
+msgstr "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/paste.fr.po b/po/underlays/directives/ikiwiki/directive/paste.fr.po
new file mode 100644
index 000000000..8afabb529
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/paste.fr.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/directives/ikiwiki/directive/ping.fr.po b/po/underlays/directives/ikiwiki/directive/ping.fr.po
new file mode 100644
index 000000000..253502ad4
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/ping.fr.po
@@ -0,0 +1,55 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 14:25+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `ping` directive is supplied by the [[!iki plugins/pinger desc=pinger]] "
+"plugin."
+msgstr "La directive `ping` est fournie par le module d'extension [[!iki plugins/pinger desc=pinger]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows ikiwiki to be configured to hit a URL each time it "
+"updates the wiki. One way to use this is in conjunction with the [[!iki "
+"plugins/pingee desc=pingee]] plugin to set up a loosely coupled mirror "
+"network, or a branched version of a wiki. By pinging the mirror or branch "
+"each time the main wiki changes, it can be kept up-to-date."
+msgstr "Cette directive permet de configurer ikiwiki pour qu'il visite une URL à chaque mise à jour du wiki. Utilisée avec le greffon [[!iki plugins/pingee desc=pingee]], elle permet de mettre en place un réseau avec des miroirs couplés ou une version « branche » d'un wiki. En visitant le miroir ou la branche à chaque modification du wiki principal, ils peuvent être gardés à jour. "
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        \\[[!ping from=\"http://mywiki.com/\"\n"
+"        to=\"http://otherwiki.com/ikiwiki.cgi?do=ping\"]]\n"
+msgstr ""
+"        \\[[!ping from=\"http://mywiki.com/\"\n"
+"        to=\"http://otherwiki.com/ikiwiki.cgi?do=ping\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The \"from\" parameter must be identical to the url of the wiki that is "
+"doing the pinging. This is used to prevent ping loops."
+msgstr "Le paramètre \"from\" doit être identique à l'URL du wiki qui effectue le *ping*, de manière à éviter les boucles."
+
+#. type: Plain text
+msgid ""
+"The \"to\" parameter is the url to ping. The example shows how to ping "
+"another ikiwiki instance."
+msgstr "Le paramètre \"to\" est l'URL à visiter. L'exemple montre comment visiter une autre instance d'ikiwiki."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/poll.fr.po b/po/underlays/directives/ikiwiki/directive/poll.fr.po
new file mode 100644
index 000000000..47c8d8d2f
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/poll.fr.po
@@ -0,0 +1,70 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 14:50+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `poll` directive is supplied by the [[!iki plugins/poll desc=poll]] "
+"plugin."
+msgstr "La directive `poll` est fournie par le module d'extension [[!iki plugins/poll desc=poll]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows you to create online polls in the wiki. Here's an "
+"example use:"
+msgstr "Cette directive permet d'organiser des sondages en ligne sur le wiki. Voici un exemple d'utilisation :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!poll 0 \"red\" 0 \"green\" 0 \"blue\"]]\n"
+msgstr "\t\\[[!poll 0 \"red\" 0 \"green\" 0 \"blue\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The numbers indicate how many users voted for that choice. When a user votes "
+"for a choice in the poll, the page is modified and the number incremented."
+msgstr "Chaque chiffre indique le nombre d'utilisateurs qui ont voté pour ce choix. Quand quelqu'un vote pour un choix, la page est modifiée et le nombre augmente. "
+
+#. type: Plain text
+msgid ""
+"While some basic precautions are taken to prevent users from accidentially "
+"voting twice, this sort of poll should not be counted on to be very "
+"accurate; all the usual concerns about web based polling apply. Unless the "
+"page that the poll is in is locked, users can even edit the page and change "
+"the numbers!"
+msgstr "Des précautions élémentaires sont prises pour éviter qu'on puisse voter deux fois. Cependant ce type de consultation n'est pas très précis et les préventions habituelles contre les sondages en ligne s'appliquent aussi. Quand la page du sondage n'est pas verrouillée, les utilisateurs peuvent même modifier la page et changer les chiffres !"
+
+#. type: Plain text
+msgid "Parameters:"
+msgstr "Paramètres :"
+
+#. type: Bullet: '* '
+msgid ""
+"`open` - Whether voting is still open. Set to \"no\" to close the poll to "
+"voting."
+msgstr "`open` - Indique s'il est possible de voter. Il faut indiquer la valeur \"no\" pour terminer la consultation."
+
+#. type: Bullet: '* '
+msgid ""
+"`total` - Show total number of votes at bottom of poll. Default is \"yes\"."
+msgstr "`total` -  Affiche le nombre total de votes au bas de la consultation. La valeur par défaut est \"yes\"."
+
+#. type: Bullet: '* '
+msgid "`percent` - Whether to display percents. Default is \"yes\"."
+msgstr "`percent` -  Indique s'il faut montrer des pourcentages. La valeur par défaut est \"yes\"."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/polygen.fr.po b/po/underlays/directives/ikiwiki/directive/polygen.fr.po
new file mode 100644
index 000000000..dc4f71d87
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/polygen.fr.po
@@ -0,0 +1,42 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 15:04+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `polygen` directive is supplied by the [[!iki plugins/polygen "
+"desc=polygen]] plugin."
+msgstr "La directive `polygen` est fournie par le module d'extension [[!iki plugins/polygen desc=polygen]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows inserting text generated by polygen into a wiki page.  "
+"For example:"
+msgstr "Cette directive permet l'insertion d'un texte créé par polygen dans une page de wiki. Par exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!polygen grammar=\"genius\"]]\n"
+msgstr "\t\\[[!polygen grammar=\"genius\"]]\n"
+
+#. type: Plain text
+msgid ""
+"It's also possible to specify a starting nonterminal for the grammar by "
+"including `symbol=\"text\"` in the directive."
+msgstr "Il est aussi possible d'indiquer un symbole non-terminal pour la grammaire en incluant `symbol=\"text\"` dans la directive."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/postsparkline.fr.po b/po/underlays/directives/ikiwiki/directive/postsparkline.fr.po
new file mode 100644
index 000000000..65a0cd29f
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/postsparkline.fr.po
@@ -0,0 +1,148 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-09-13 19:02-0300\n"
+"PO-Revision-Date: 2009-09-12 21:10+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `postsparkline` directive is supplied by the [[!iki plugins/"
+"postsparkline desc=postsparkline]] plugin."
+msgstr ""
+"La directive `postsparkline` est fournie par le module d'extension [[!iki "
+"plugins/postsparkline desc=postsparkline]."
+
+#. type: Plain text
+msgid ""
+"This directive uses the [[!iki plugins/sparkline desc=sparkline]] plugin to "
+"create a [[sparkline]] of statistics about a set of pages, such as posts to "
+"a blog."
+msgstr ""
+"Cette directive se sert du greffon [[!iki plugins/sparkline desc=sparkline]] "
+"pour créer une [[sparkline]], c'est-à-dire un mini graphique de statistiques "
+"au sujet d'un ensemble de pages, comme par exemple les messages d'un blog."
+
+#. type: Title #
+#, no-wrap
+msgid "examples"
+msgstr "Exemples"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tPost interval: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=100\n"
+"\tformula=interval style=bar barwidth=2 barspacing=1 height=13]]\n"
+msgstr ""
+"\tPost interval: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=100\n"
+"\tformula=interval style=bar barwidth=2 barspacing=1 height=13]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tPosts per month this year: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=12\n"
+"\tformula=permonth style=bar barwidth=2 barspacing=1 height=13]]\n"
+msgstr ""
+"\tPosts per month this year: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=12\n"
+"\tformula=permonth style=bar barwidth=2 barspacing=1 height=13]]\n"
+
+#. type: Title #
+#, no-wrap
+msgid "usage"
+msgstr "Usage"
+
+#. type: Plain text
+msgid ""
+"All options aside from the `pages`, `max`, `formula`, `time`, and `color` "
+"options are the same as in [[sparkline]] directive."
+msgstr ""
+"Toutes les options, à part les options  `pages`, `max`, `formula`, `time` et "
+"`color` sont les mêmes que dans la directive  [[sparkline]]."
+
+#. type: Plain text
+msgid ""
+"You don't need to specify any data points (though you can if you want to).  "
+"Instead, data points are automatically generated based on the creation times "
+"of pages matched by the specified `pages` [[ikiwiki/PageSpec]]. A maximum of "
+"`max` data points will be generated."
+msgstr ""
+"Vous n'avez pas besoin d'indiquer des points de données. Mais c'est "
+"possible. En fait, les points de données sont automatiquement créés à partir "
+"des dates de création des pages correspondant à la spécification [[ikiwiki/"
+"PageSpec]] `pages`. Un maximum `max` de points de données est créé."
+
+#. type: Plain text
+msgid ""
+"The `formula` parameter controls the formula used to generate data points.  "
+"Available formulae:"
+msgstr ""
+"Le paramètre `formula` précise la formule utilisée pour créer les points de "
+"données. Les formules disponibles sont les suivantes :"
+
+#. type: Bullet: '* '
+msgid ""
+"`interval` - The height of each point represents how long it has been since "
+"the previous post."
+msgstr ""
+"`interval` -  La hauteur de chaque point représente sa durée par rapport au "
+"précédent message."
+
+#. type: Bullet: '* '
+msgid ""
+"`perday` - Each point represents a day; the height represents how many posts "
+"were made that day."
+msgstr ""
+"`perday` - Chaque point représente un jour. La hauteur représente le nombre "
+"de messages envoyés ce jour."
+
+#. type: Bullet: '* '
+msgid ""
+"`permonth` - Each point represents a month; the height represents how many "
+"posts were made that month."
+msgstr ""
+"`permonth` -  Chaque point représente un mois. La hauteur représente le "
+"nombre de messages envoyés ce mois."
+
+#. type: Bullet: '* '
+msgid ""
+"`peryear` - Each point represents a year; the height represents how many "
+"posts were made that year."
+msgstr ""
+"`peryear` - Chaque point représente une année. La hauteur représente le "
+"nombre de messages envoyés cette année."
+
+#. type: Plain text
+msgid ""
+"The `time` parameter has a default value of \"ctime\", since formulae use "
+"the creation times of pages by default. If you instead want them to use the "
+"modification times of pages, set it to \"mtime\"."
+msgstr ""
+"Le paramètre `time` possède une valeur par défaut, \"ctime\",  puisque les "
+"formules utilisent par défaut la date de création des pages. Si vous "
+"préférez qu'elles utilisent la date de modification, passez la valeur du "
+"paramètre à \"mtime\"."
+
+#. type: Plain text
+msgid ""
+"To change the color used to draw the sparkline, use the `color` parameter.  "
+"For example, \"color=red\"."
+msgstr ""
+"Pour modifier la couleur de la ligne-étincelle, utilisez le paramètre "
+"`color`. Par exemple, \"color=red\"."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/progress.fr.po b/po/underlays/directives/ikiwiki/directive/progress.fr.po
new file mode 100644
index 000000000..7f5160dde
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/progress.fr.po
@@ -0,0 +1,52 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 15:20+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `progress` directive is supplied by the [[!iki plugins/progress "
+"desc=progress]] plugin."
+msgstr "La directive `progress` est fournie par le module d'extension [[!iki plugins/progress desc=progress]]."
+
+#. type: Plain text
+msgid "This directive generates a progress bar."
+msgstr "Cette directive affiche une barre de progression."
+
+#. type: Plain text
+msgid ""
+"There are two possible parameter sets.  The first is a single parameter "
+"\"percent\" which holds a percentage figure of how complete the progress bar "
+"is."
+msgstr "Deux ensembles de paramètres sont disponibles. le premier est composé d'un seul paramètre \"percent\" qui indique le pourcentage de remplissage de la barre."
+
+#. type: Plain text
+msgid ""
+"The second possible set of parameters is a pair of [[ikiwiki/PageSpec]]s, "
+"`totalpages` and `donepages`. The directive counts the number of pages in "
+"each pagespec and shows the percentage of the total pages that are done."
+msgstr "Le second ensemble est composé de deux spécifications [[ikiwiki/PageSpec]], `totalpages` et `donepages`. La directive compte le nombre de pages correspondant à chaque spécification et affiche le pourcentage de pages déjà traitées."
+
+#. type: Plain text
+msgid "For example, to show what percentage of pages have discussion pages:"
+msgstr "Par exemple, pour afficher le pourcentage de pages qui possèdent des pages discussion :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!progress totalpages=\"* and !*/Discussion\" donepages=\"*/Discussion\"]]\n"
+msgstr "\t\\[[!progress totalpages=\"* and !*/Discussion\" donepages=\"*/Discussion\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/shortcut.fr.po b/po/underlays/directives/ikiwiki/directive/shortcut.fr.po
new file mode 100644
index 000000000..0f1e2ead1
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/shortcut.fr.po
@@ -0,0 +1,37 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-10 17:19+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `shortcut` directive is supplied by the [[!iki plugins/shortcut "
+"desc=shortcut]] plugin."
+msgstr "La directive `shortcut` est fournie par le module d'extension [[!iki plugins/shortcut desc=shortcut]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows external links to commonly linked to sites to be made "
+"more easily using shortcuts."
+msgstr "Cette directive permet l'utilisation de raccourcis. Un raccourci est un lien externe qui permet de renvoyer facilement à des sites connus."
+
+#. type: Plain text
+msgid ""
+"The available shortcuts are defined on the [[shortcuts]] page in the wiki. "
+"The `shortcut` directive can only be used on that page."
+msgstr "Les raccourcis disponibles sont définis sur la page [[shortcuts]] du wiki. La directive `shortcut` ne peut être utilisée que sur cette page."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/sparkline.fr.po b/po/underlays/directives/ikiwiki/directive/sparkline.fr.po
new file mode 100644
index 000000000..3f3c74601
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/sparkline.fr.po
@@ -0,0 +1,173 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-09-13 19:02-0300\n"
+"PO-Revision-Date: 2009-09-12 18:44+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `sparkline` directive is supplied by the [[!iki plugins/sparkline "
+"desc=sparkline]] plugin."
+msgstr ""
+"La directive `sparkline` est fournie par le module d'extension [[!iki "
+"plugins/sparkline desc=sparkline]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows for embedding sparklines into wiki pages. A sparkline "
+"is a small word-size graphic chart, that is designed to be displayed "
+"alongside text."
+msgstr ""
+"Cette directive permet d'embarquer des lignes-étincelles (*sparklines*) ou "
+"mini graphiques dans les pages d'un wiki. Une ligne-étincelle est un mini "
+"graphique, simple et proche d'un mot, affichable au fil du texte."
+
+#. type: Title #
+#, no-wrap
+msgid "examples"
+msgstr "Exemples"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!sparkline 1 3 5 -3 10 0 width=40 height=16\n"
+"\tfeaturepoint=\"4,-3,red,3\" featurepoint=\"5,10,green,3\"]]\n"
+msgstr ""
+"\t\\[[!sparkline 1 3 5 -3 10 0 width=40 height=16\n"
+"\tfeaturepoint=\"4,-3,red,3\" featurepoint=\"5,10,green,3\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This creates a simple line graph, graphing several points.  It will be drawn "
+"40 pixels wide and 16 pixels high. The high point in the line has a green "
+"marker, and the low point has a red marker."
+msgstr ""
+"Cet exemple affiche un mini graphique de plusieurs points. Sa largeur est de "
+"40 pixels et sa hauteur, 16 pixels. Le *haut* est désigné par un point vert "
+"et le *bas* par un point rouge."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar barwidth=2\n"
+"\tbarspacing=1 height=13]]\n"
+msgstr ""
+"\t\\[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar barwidth=2\n"
+"\tbarspacing=1 height=13]]\n"
+
+#. type: Plain text
+msgid ""
+"This more complex example generates a bar graph.  The bars are 2 pixels "
+"wide, and separated by one pixel, and the graph is 13 pixels tall. Width is "
+"determined automatically for bar graphs. The points with negative values are "
+"colored red, instead of the default black."
+msgstr ""
+"Cet exemple plus complexe engendre un graphique avec barres. La largeur des "
+"barres est de 2 pixels avec une séparation de 1 pixel et la hauteur du "
+"graphique est de 13 pixels. La largeur du graphique avec barres est "
+"déterminée automatiquement. Les points dont la valeur est négative sont en "
+"rouge, au lieu du noir, valeur par défaut."
+
+#. type: Title #
+#, no-wrap
+msgid "usage"
+msgstr "Usage"
+
+#. type: Plain text
+msgid ""
+"The form for the data points is \"x,y\", or just \"y\" if the x values don't "
+"matter. Bar graphs can also add \"(color)\" to specify a color for that bar."
+msgstr ""
+"Le format des points de données est \"x,y\" ou simplement \"y\" si la valeur "
+"\"x\" n'importe pas. On peut aussi ajouter un paramètre \"(color)\" pour "
+"spécifier la couleur d'une barre."
+
+#. type: Plain text
+msgid ""
+"The following named parameters are recognised. Most of these are the same as "
+"those used by the underlying sparkline library, which is documented in more "
+"detail in [its wiki](http://sparkline.wikispaces.com/usage)."
+msgstr ""
+"Les paramètres suivants sont reconnus. La plupart d'entre eux sont les mêmes "
+"que ceux de la bibliothèque sparkline sous-jacente. Cette bibliothèque les "
+"documente avec plus de précisions dans [son wiki](http://sparkline."
+"wikispaces.com/usage)."
+
+#. type: Bullet: '* '
+msgid "`style` - Either \"line\" (the default) or \"bar\"."
+msgstr "style` - soit \"line\" (valeur par défaut) ou \"bar\"."
+
+#. type: Bullet: '* '
+msgid "`width` - Width of the graph in pixels. Only needed for line graphs."
+msgstr ""
+"`width` - largeur du graphique en pixels. Nécessaire seulement pour les "
+"graphiques ligne."
+
+#. type: Bullet: '* '
+msgid "`height` - Height of the graph in pixels. Defaults to 16."
+msgstr ""
+"`height` - Hauteur du graphique en pixels. La valeur par défaut est 16."
+
+#. type: Bullet: '* '
+msgid "`barwidth` - Width of bars in a bar graph. Default is 1 pixel."
+msgstr ""
+"`barwidth` - Largeur des barres dans un graphique à barres.  La valeur par "
+"défaut est 1 pixel."
+
+#. type: Bullet: '* '
+msgid ""
+"`barspacing` - Spacing between bars in a bar graph, in pixels. Default is 1 "
+"pixel."
+msgstr ""
+"`barspacing` - Espacement entre les barres dans un graphique à barres.  La "
+"valeur par défaut est 1 pixel."
+
+#. type: Bullet: '* '
+msgid ""
+"`ymin`, `ymax` - Minimum and maximum values for the Y axis. This is normally "
+"calculated automatically, but can be explicitly specified to get the same "
+"values for multiple related graphs."
+msgstr ""
+"`ymin`, `ymax` - Valeurs minimum et maximum pour l'axe des Y. Elles sont "
+"normalement calculées automatiquement mais on peut vouloir les préciser pour "
+"obtenir les mêmes valeurs pour plusieurs graphiques apparentés."
+
+#. type: Bullet: '* '
+msgid ""
+"`featurepoint` - Adds a circular marker to a line graph, with optional text. "
+"This can be used to label significant points."
+msgstr ""
+"`featurepoint` - Ajoute un cercle sur un graphique ligne, avec un texte "
+"facultatif. On peut ainsi mettre en évidence certains points significatifs."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  The value is a comma-delimited list of parameters specifying the feature\n"
+"  point: X value, Y value, color name, circle diameter, text (optional),\n"
+"  and text location (optional). Example: `featurepoint=\"3,5,blue,3\"`\n"
+msgstr ""
+"  La valeur est une liste de paramètres, séparés par des virgules, spécifiant\n"
+"  le point à cercler : valeur X, valeur Y, couleur, diamètre du cercle, texte (facultatif),\n"
+"  et position du texte (facultatif). Exemple : `featurepoint=\"3,5,blue,3\"`.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Available values for the text location are: \"top\", \"right\", \"bottom\", and\n"
+"  \"left\".\n"
+msgstr "Les valeurs disponibles pour la position du texte sont : \"top\", \"right\", \"bottom\" et \"left\".\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/table.fr.po b/po/underlays/directives/ikiwiki/directive/table.fr.po
new file mode 100644
index 000000000..479da205b
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/table.fr.po
@@ -0,0 +1,135 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 09:25+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `table` directive is supplied by the [[!iki plugins/table desc=table]] "
+"plugin."
+msgstr ""
+"La directive `table` est fournie par le module d'extension [[!iki plugins/"
+"table desc=table]]."
+
+#. type: Plain text
+msgid ""
+"This directive can build HTML tables from data in CSV (comma-separated "
+"values)  or DSV (delimiter-separated values) format."
+msgstr ""
+"Cette directive permet l'affichage de tableau HTML à partir de données au "
+"format CSV (comma-separated values) ou DSV (delimiter-separated values)."
+
+#. type: Title ##
+#, no-wrap
+msgid "examples"
+msgstr "exemples"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!table data=\"\"\"\n"
+msgstr "\t\\[[!table data=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tCustomer|Amount\n"
+"\tFulanito|134,34\n"
+"\tMenganito|234,56\n"
+"\tMenganito|234,56\n"
+msgstr ""
+"\tCustomer|Amount\n"
+"\tFulanito|134,34\n"
+"\tMenganito|234,56\n"
+"\tMenganito|234,56\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!table class=\"book_record\" format=csv file=\"data/books/record1\"]]\n"
+msgstr "\t\\[[!table class=\"book_record\" format=csv file=\"data/books/record1\"]]\n"
+
+#. type: Plain text
+msgid "In this second example the `record1` page should be similar to:"
+msgstr "Dans cet exemple, la page `record1` devrait ressembler à :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\"Title\",\"Perl Best Practices\"\n"
+"\t\"Author\",\"Damian Conway\"\n"
+"\t\"Publisher\",\"O’Reilly\"\n"
+msgstr ""
+"\t\"Title\",\"Perl Best Practices\"\n"
+"\t\"Author\",\"Damian Conway\"\n"
+"\t\"Publisher\",\"O’Reilly\"\n"
+
+#. type: Plain text
+msgid ""
+"To make a cell span multiple columns, follow it with one or more empty "
+"cells. For example:"
+msgstr ""
+"Pour qu'une cellule s'étende sur plusieurs colonnes, il faut la faire suivre "
+"par une cellule vide, ou plusieurs. Par exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tleft||right|\n"
+"\ta|b|c|d\n"
+"\tthis cell spans 4 columns|||\n"
+msgstr ""
+"\tleft||right|\n"
+"\ta|b|c|d\n"
+"\tcette cellule prend 4 colonnes|||\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Usage"
+
+#. type: Bullet: '* '
+msgid "`data` - Values for the table."
+msgstr "`data` - Valeurs pour le tableau."
+
+#. type: Bullet: '* '
+msgid "`file` - A file in the wiki containing the data."
+msgstr "`file` - Fichier dans le wiki contenant les données."
+
+#. type: Bullet: '* '
+msgid ""
+"`format` - The format of the data, either \"csv\", \"dsv\", or \"auto\" (the "
+"default)."
+msgstr ""
+"`format` - Le format des données, \"csv\", \"dsv\", ou \"auto\" (valeur par "
+"défaut)."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* `delimiter` - The character used to separate fields. By default,\n"
+"   DSV format uses a pipe (`|`), and CSV uses a comma (`,`).\n"
+"* `class` - A CSS class for the table html element.\n"
+"* `header` - By default, or if set to \"row\", the first data line is used\n"
+"  as the table header. Set it to \"no\" to make a table without a header, or\n"
+"  \"column\" to make the first column be the header.\n"
+msgstr ""
+"* `delimiter` - Le caractère servant à délimiter les champs. Par défaut, le format CSV utilise une virgule (`,`)\n"
+"   et le format DSV utilise une barre verticale (`|`).\n"
+"* `class` - Une classe CSS pour l'élément HTML table.\n"
+"* `header` - Par défaut, ou si sa valeur est \"row\", la première ligne des données est utilisée\n"
+"   comme en-tête du tableau. Si la valeur est \"no\", le tableau n'a pas d'en-tête et si la valeur\n"
+"   est \"column\", la première colonne constitue l'en-tête.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/tag.fr.po b/po/underlays/directives/ikiwiki/directive/tag.fr.po
new file mode 100644
index 000000000..2a798bb1b
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/tag.fr.po
@@ -0,0 +1,107 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-01 16:20+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `tag` and `taglink` directives are supplied by the [[!iki plugins/tag "
+"desc=tag]] plugin."
+msgstr ""
+"Les directives `tag` et `taglink` sont fournies par le module d'extension [[!"
+"iki plugins/tag desc=tag]]."
+
+#. type: Plain text
+msgid "These directives allow tagging pages. List tags as follows:"
+msgstr "Elles permettent d'étiqueter les pages. Ainsi :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!tag tech life linux]]\n"
+msgstr "\t\\[[!tag tech life linux]]\n"
+
+#. type: Plain text
+msgid ""
+"The tags work the same as if you had put a (hidden) [[ikiwiki/WikiLink]] on "
+"the page for each tag, so you can use a [[ikiwiki/PageSpec]] match all pages "
+"that are tagged with a given tag, for example. The tags will also show up on "
+"blog entries and at the bottom of the tagged pages, as well as in RSS and "
+"Atom feeds."
+msgstr ""
+"Les étiquettes sont comme des [[ikiwiki/WikiLink]] (cachés) sur une page. "
+"Vous pouvez donc utiliser une spécification [[ikiwiki/PageSpec]] pour "
+"trouver toutes les pages possédant une étiquette particulière. Les "
+"étiquettes apparaissent sur les messages des blogs, au bas des pages "
+"étiquetées ainsi que dans les flux RSS et Atom."
+
+#. type: Plain text
+msgid ""
+"If you want a visible [[ikiwiki/WikiLink]] along with the tag, use taglink "
+"instead:"
+msgstr ""
+"Si vous voulez que l'étiquette soit visible comme un [[ikiwiki/WikiLink]], "
+"utilisez taglink :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!taglink foo]]\n"
+"\t\\[[!taglink tagged_as_foo|foo]]\n"
+msgstr ""
+"\t\\[[!taglink foo]]\n"
+"\t\\[[!taglink tagged_as_foo|foo]]\n"
+
+#. type: Plain text
+msgid ""
+"Note that if the wiki is configured to use a tagbase, then the tags will be "
+"located under a base directory, such as \"tags/\". This is a useful way to "
+"avoid having to write the full path to tags, if you want to keep them "
+"grouped together out of the way."
+msgstr ""
+"Si le wiki utilise un répertoire d'étiquettes, les étiquettes seront alors "
+"dans un répertoire, comme « tags/ ». C'est une façon pratique d'éviter "
+"l'écriture de l'adresse entière des étiquettes, si vous voulez les "
+"rassembler dans un seul endroit. "
+
+#. type: Plain text
+msgid ""
+"Bear in mind that specifying a tagbase means you will need to incorporate it "
+"into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is "
+"`tag`, you would match pages tagged \"foo\" with `link(tag/foo)`."
+msgstr ""
+"S'il existe un répertoire d'étiquettes, vous devrez le spécifier dans la "
+"fonction spéciale `link()` d'une [[ikiwiki/PageSpec]] : par exemple, si le "
+"répertoire d'étiquettes est `tag`, vous chercherez les pages étiquetées "
+"« foo » avec `link(tag/foo)`."
+
+#. type: Plain text
+msgid ""
+"If you want to override the tagbase for a particular tag, you can use "
+"something like this:"
+msgstr ""
+"Si pour une étiquette vous voulez éviter le répertoire d'étiquettes, vous "
+"pouvez écrire quelque chose comme ça :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!tag ./foo]]\n"
+"\t\\[[!taglink /foo]]\n"
+msgstr ""
+"\t\\[[!tag ./foo]]\n"
+"\t\\[[!taglink /foo]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/taglink.fr.po b/po/underlays/directives/ikiwiki/directive/taglink.fr.po
new file mode 100644
index 000000000..5f2e53dda
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/taglink.fr.po
@@ -0,0 +1,24 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/tag]]\n"
+msgstr "[[!meta redir=/ikiwiki/directive/tag]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/template.fr.po b/po/underlays/directives/ikiwiki/directive/template.fr.po
new file mode 100644
index 000000000..96a91ad23
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/template.fr.po
@@ -0,0 +1,54 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 08:39+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `template` directive is supplied by the [[!iki plugins/template "
+"desc=template]] plugin."
+msgstr "La directive `template` est fournie par le module d'extension [[!iki plugins/template desc=template]]."
+
+#. type: Plain text
+msgid ""
+"[[Templates]] are files that can be filled out and inserted into pages in "
+"the wiki, by using the template directive. The directive has an `id` "
+"parameter that identifies the template to use. The remaining parameters are "
+"used to fill out the template."
+msgstr "Les modèles de page [[Templates]] sont des fichiers pouvant être remplis et insérés dans les pages du wiki, avec la directive template. Cette directive possède un paramètre `id` qui identifie le modèle à utiliser. Les autres paramètres servent à remplir le modèle."
+
+#. type: Plain text
+msgid "Example:"
+msgstr "Exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+msgstr "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This fills out the `note` template, filling in the `text` field with the "
+"specified value, and inserts the result into the page."
+msgstr "Cette expression remplit le modèle `note`, remplaçant le champ `text` par la valeur spécifiée, et insérant le résultat dans la page."
+
+#. type: Plain text
+msgid ""
+"For a list of available templates, and details about how to create more, see "
+"the [[templates]] page."
+msgstr "Consultez la page [[templates]] pour connaître les modèles de page disponibles et la manière d'en créer d'autres."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/testpagespec.fr.po b/po/underlays/directives/ikiwiki/directive/testpagespec.fr.po
new file mode 100644
index 000000000..cd3b00ef9
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/testpagespec.fr.po
@@ -0,0 +1,69 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-12 08:25+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `testpagespec` directive is supplied by the [[!iki plugins/testpagespec "
+"desc=testpagespec]] plugin."
+msgstr "La directive `testpagespec` est fournie par le module d'extension [[!iki plugins/testpagespec desc=testpagespec]]."
+
+#. type: Plain text
+msgid ""
+"This directive allows testing a [[ikiwiki/PageSpec]] to see if it matches a "
+"page, and to see the part that matches, or causes the match to fail."
+msgstr "Cette directive permet de confronter une spécification [[ikiwiki/PageSpec]] et une page, puis de voir quelle partie correspond ou quelle partie provoque l'échec du test."
+
+#. type: Plain text
+msgid "Example uses:"
+msgstr "Exemples :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!testpagespec pagespec=\"foopage and barpage\" match=\"foopage\"]]\n"
+msgstr "\t\\[[!testpagespec pagespec=\"foopage and barpage\" match=\"foopage\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This will print out something like \"no match: barpage does not match foopage"
+"\", highlighting which part of the [[ikiwiki/PageSpec]] is causing the match "
+"to fail."
+msgstr " Cette expression affichera quelque chose comme \"no match: barpage does not match foopage\", mettant en évidence la partie de la spécification [[ikiwiki/PageSpec]] qui provoque l'échec."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!testpagespec pagespec=\"foopage or !bar*\" match=\"barpage\"]]\n"
+msgstr "\t\\[[!testpagespec pagespec=\"foopage or !bar*\" match=\"barpage\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This will print out something like \"no match: bar* matches barpage\", since "
+"the part of the [[ikiwiki/PageSpec]] that fails is this negated match."
+msgstr "Cette expression affichera quelque chose comme \"no match: bar* matches barpage\", puisque la  partie de la spécification [[ikiwiki/PageSpec]] qui fait échouer le test est le motif nié."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!testpagespec pagespec=\"foopage or barpage\" match=\"barpage\"]]\n"
+msgstr "\t\\[[!testpagespec pagespec=\"foopage or barpage\" match=\"barpage\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This will print out something like \"match: barpage matches barpage\", "
+"indicating the part of the [[ikiwiki/PageSpec]] that caused it to match."
+msgstr "Cette expression affichera quelque chose comme \"match: barpage matches barpage\", indiquant la  partie de la spécification [[ikiwiki/PageSpec]] qui fait réussir le test."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/teximg.fr.po b/po/underlays/directives/ikiwiki/directive/teximg.fr.po
new file mode 100644
index 000000000..e98d40e91
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/teximg.fr.po
@@ -0,0 +1,72 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-10 17:05+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `teximg` directive is supplied by the [[!iki plugins/teximg "
+"desc=teximg]] plugin."
+msgstr "La directive `teximg` est fournie par le module d'extension [[!iki plugins/teximg desc=teximg]]."
+
+#. type: Plain text
+msgid "This directive renders LaTeX formulas into images."
+msgstr "Cette directive transforme les formules LaTeX en images."
+
+#. type: Title ##
+#, no-wrap
+msgid "examples"
+msgstr "Exemples :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\"]]\n"
+"\t\\[[!teximg code=\"E = - \\frac{Z^2 \\cdot  \\mu \\cdot e^4}{32\\pi^2 \\epsilon_0^2 \\hbar^2 n^2}\" ]]\n"
+msgstr ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\"]]\n"
+"\t\\[[!teximg code=\"E = - \\frac{Z^2 \\cdot  \\mu \\cdot e^4}{32\\pi^2 \\epsilon_0^2 \\hbar^2 n^2}\" ]]\n"
+
+#. type: Plain text
+msgid "To scale the image, use height=x:"
+msgstr "Pour ajuster une image, utilisez height=x :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"17\"]]\n"
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"8\"]]\n"
+msgstr ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"17\"]]\n"
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"8\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If no height is chosen the default height 12 is used. Valid heights are: 8, "
+"9, 10, 11, 12, 14, 17, 20. If another height is entered, the closest "
+"available height is used."
+msgstr "Si aucune hauteur n'est choisie, la valeur par défaut est 12. Voici les valeurs reconnues : 8, 9, 10, 11, 12, 14, 17, 20. Si une autre valeur est donnée, la valeur la plus proche est choisie."
+
+#. type: Plain text
+msgid "To add an alt text to the image, use alt=\"text\":"
+msgstr "Pour ajouter un texte à l'image, utilisez  alt=\"text\" :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!teximg code=\"\\frac{1}{2}\" alt=\"1/2\"]]\n"
+msgstr "\t\\[[!teximg code=\"\\frac{1}{2}\" alt=\"1/2\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/toc.fr.po b/po/underlays/directives/ikiwiki/directive/toc.fr.po
new file mode 100644
index 000000000..9391c7a7f
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/toc.fr.po
@@ -0,0 +1,59 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-10 16:50+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `toc` directive is supplied by the [[!iki plugins/toc desc=toc]] plugin."
+msgstr "La directive `toc` est fournie par le module d'extension [[!iki plugins/toc desc=toc]]."
+
+#. type: Plain text
+msgid "Add a table of contents to a page:"
+msgstr "Voici comment ajouter une table des matières sur une page :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc ]]\n"
+msgstr "\t\\[[!toc ]]\n"
+
+#. type: Plain text
+msgid ""
+"The table of contents will be automatically generated based on the headers "
+"of the page. By default only the largest headers present on the page will be "
+"shown; to control how many levels of headers are shown, use the `levels` "
+"parameter:"
+msgstr "La  table des matières sera automatiquement créée à partir des en-têtes de la page. Par défaut seuls les plus grands en-têtes présents sur la page sont affichés. Pour choisir un niveau d'en-tête, il faut utiliser le paramètre `levels` :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc levels=2]]\n"
+msgstr "\t\\[[!toc levels=2]]\n"
+
+#. type: Plain text
+msgid ""
+"The toc directive will take the level of the first header as the topmost "
+"level, even if there are higher levels seen later in the file."
+msgstr "La directive `toc` choisit le niveau du premier en-tête comme le premier niveau, même si des niveaux plus élévés sont rencontrés plus tard dans le fichier."
+
+#. type: Plain text
+msgid ""
+"The table of contents will be created as an ordered list. If you want an "
+"unordered list instead, you can change the list-style in your local style "
+"sheet."
+msgstr "La table des matières est une liste ordonnée. Si vous voulez une liste non numérotée, il faut changer le style de liste dans la feuille de style locale."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/toggle.fr.po b/po/underlays/directives/ikiwiki/directive/toggle.fr.po
new file mode 100644
index 000000000..4b06e8f4a
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/toggle.fr.po
@@ -0,0 +1,110 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki     \n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-09 16:37+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `toggle` and `toggleable` directives are supplied by the [[!iki plugins/"
+"toggle desc=toggle]] plugin."
+msgstr ""
+"Les directives `toggle` et `toggleable` sont fournies par le module "
+"d'extension [[!iki plugins/toggle desc=toggle]]."
+
+#. type: Plain text
+msgid ""
+"With these directives you can create links on pages that, when clicked, "
+"toggle display of other parts of the page."
+msgstr ""
+"Ces directives permettent de créer des liens qui, lorsque vous cliquez "
+"dessus, basculent l'affichage sur d'autres parties de la page. "
+
+#. type: Plain text
+msgid ""
+"It uses javascript to accomplish this; browsers without javascript will "
+"always see the full page content."
+msgstr ""
+"Javascript est nécessaire pour cela. Les navigateurs qui ne disposent de "
+"javascript affichent toujours la page entière."
+
+#. type: Plain text
+msgid "Example use:"
+msgstr "Exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toggle id=\"ipsum\" text=\"show\"]]\n"
+msgstr "\t\\[[!toggle id=\"ipsum\" text=\"show\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toggleable id=\"ipsum\" text=\"\"\"\n"
+msgstr "\t\\[[!toggleable id=\"ipsum\" text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\n"
+"\teiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim\n"
+"\tad minim veniam, quis nostrud exercitation ullamco laboris nisi ut\n"
+"\taliquip ex ea commodo consequat.\n"
+msgstr ""
+"\tLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\n"
+"\teiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim\n"
+"\tad minim veniam, quis nostrud exercitation ullamco laboris nisi ut\n"
+"\taliquip ex ea commodo consequat.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t[[!toggle id=\"ipsum\" text=\"hide\"]]\n"
+msgstr "\t[[!toggle id=\"ipsum\" text=\"hide\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Note that you can include wiki markup in the toggleable text, including even "
+"additional toggles, as shown in the above example."
+msgstr ""
+"Vous pouvez inclure des balises wiki dans le texte du lien, et même d'autres "
+"liens de ce type, comme le montre l'exemple ci-dessus."
+
+#. type: Plain text
+msgid ""
+"Also, the toggle and the togglable definitions do not need to be next to "
+"each other, but can be located anywhere on the page. There can also be "
+"mutiple toggles that all toggle a single togglable."
+msgstr ""
+"Il n'est pas nécessaire que les textes des directives toggle et togglable "
+"soient proches, ils peuvent être partout sur la page. Il peut même y avoir "
+"de multiples textes qui renvoient tous à un seul texte de la directive "
+"toggleable."
+
+#. type: Plain text
+msgid ""
+"The id has a default value of \"default\", so can be omitted in simple cases."
+msgstr ""
+"La valeur par défaut du paramètre « id » est \"default\", et peut être omis "
+"dans les cas les plus simples."
+
+#. type: Plain text
+msgid ""
+"If you'd like a toggleable to be displayed by default, and toggle to hidden, "
+"then pass a parameter \"open=yes\" when setting up the toggleable."
+msgstr ""
+"Si vous voulez un affichage d'un texte par défaut et qui bascule vers un "
+"état caché, il suffit de passer le paramètre \"open=yes\" quand vous "
+"définissez la directive toggleable."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/toggleable.fr.po b/po/underlays/directives/ikiwiki/directive/toggleable.fr.po
new file mode 100644
index 000000000..58ba0db5f
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/toggleable.fr.po
@@ -0,0 +1,24 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-09 16:42+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/toggle]]\n"
+msgstr "[[!meta redir=/ikiwiki/directive/toggle]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/version.fr.po b/po/underlays/directives/ikiwiki/directive/version.fr.po
new file mode 100644
index 000000000..525012dc3
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/version.fr.po
@@ -0,0 +1,44 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-10 16:32+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"The `version` directive is supplied by the [[!iki plugins/version "
+"desc=version]] plugin."
+msgstr "La directive `version` est fournie par le module d'extension [[!iki plugins/version desc=version]]."
+
+#. type: Plain text
+msgid "This directive allows inserting the version of ikiwiki onto a page."
+msgstr "Cette directive permet d'insérer la version d'ikiwiki sur une page."
+
+#. type: Plain text
+msgid ""
+"Whenever ikiwiki is upgraded to a new version, the page will be rebuilt, "
+"updating the version number."
+msgstr "À chaque mise à niveau d'ikiwiki, la page est reconstruite, modifiant par là le numéro de version."
+
+#. type: Plain text
+msgid "Use is simple:"
+msgstr "Simple est son utilisation :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!version ]]\n"
+msgstr "\t\\[[!version ]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/smiley/smileys.fr.po b/po/underlays/smiley/smileys.fr.po
new file mode 100644
index 000000000..25633e392
--- /dev/null
+++ b/po/underlays/smiley/smileys.fr.po
@@ -0,0 +1,209 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-13 07:48+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"This page is used to control what smileys are supported by the wiki.  Just "
+"write the text of a smiley to display it."
+msgstr ""
+"Cette page enregistre les smileys reconnus dans ce wiki. Il suffit d'écrire "
+"le texte du smiley pour l'afficher."
+
+#. type: Bullet: '* '
+msgid "\\\\:)\t[[smileys/smile.png]]"
+msgstr "\\\\:)\t[[smileys/smile.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-)\t[[smileys/smile.png]]"
+msgstr "\\\\:-)\t[[smileys/smile.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:D\t[[smileys/biggrin.png]]"
+msgstr "\\\\:D\t[[smileys/biggrin.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-D\t[[smileys/biggrin.png]]"
+msgstr "\\\\:-D\t[[smileys/biggrin.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\B)\t[[smileys/smile2.png]]"
+msgstr "\\\\B)\t[[smileys/smile2.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\B-)\t[[smileys/smile2.png]]"
+msgstr "\\\\B-)\t[[smileys/smile2.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:))\t[[smileys/smile3.png]]"
+msgstr "\\\\:))\t[[smileys/smile3.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-))\t[[smileys/smile3.png]]"
+msgstr "\\\\:-))\t[[smileys/smile3.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\;)\t[[smileys/smile4.png]]"
+msgstr "\\\\;)\t[[smileys/smile4.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\;-)\t[[smileys/smile4.png]]"
+msgstr "\\\\;-)\t[[smileys/smile4.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:\\\t[[smileys/ohwell.png]]"
+msgstr "\\\\:\\\t[[smileys/ohwell.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-\\\t[[smileys/ohwell.png]]"
+msgstr "\\\\:-\\\t[[smileys/ohwell.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:/\t[[smileys/ohwell.png]]"
+msgstr "\\\\:/\t[[smileys/ohwell.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-/\t[[smileys/ohwell.png]]"
+msgstr "\\\\:-/\t[[smileys/ohwell.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:|\t[[smileys/neutral.png]]"
+msgstr "\\\\:|\t[[smileys/neutral.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-|\t[[smileys/neutral.png]]"
+msgstr "\\\\:-|\t[[smileys/neutral.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\>:>\t[[smileys/devil.png]]"
+msgstr "\\\\>:>\t[[smileys/devil.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\X-(\t[[smileys/angry.png]]"
+msgstr "\\\\X-(\t[[smileys/angry.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\<:(\t[[smileys/frown.png]]"
+msgstr "\\\\<:(\t[[smileys/frown.png]"
+
+#. type: Bullet: '* '
+msgid "\\\\:(\t[[smileys/sad.png]]"
+msgstr "\\\\:(\t[[smileys/sad.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-(\t[[smileys/sad.png]]"
+msgstr "\\\\:-(\t[[smileys/sad.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-?\t[[smileys/tongue.png]]"
+msgstr "\\\\:-?\t[[smileys/tongue.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-P\t[[smileys/tongue.png]]"
+msgstr "\\\\:-P\t[[smileys/tongue.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:o\t[[smileys/redface.png]]"
+msgstr "\\\\:o\t[[smileys/redface.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\|)\t[[smileys/tired.png]]"
+msgstr "\\\\|)\t[[smileys/tired.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\|-)\t[[smileys/tired.png]]"
+msgstr "\\\\|-)\t[[smileys/tired.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{OK}\t[[smileys/thumbs-up.png]]"
+msgstr "\\\\{OK}\t[[smileys/thumbs-up.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{X}\t[[smileys/icon-error.png]]"
+msgstr "\\\\{X}\t[[smileys/icon-error.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{i}\t[[smileys/icon-info.png]]"
+msgstr "\\\\{i}\t[[smileys/icon-info.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\(./)\t[[smileys/checkmark.png]]"
+msgstr "\\\\(./)\t[[smileys/checkmark.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\(!)\t[[smileys/idea.png]]"
+msgstr "\\\\(!)\t[[smileys/idea.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\[!]\t[[smileys/attention.png]]"
+msgstr "\\\\[!]\t[[smileys/attention.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\/!\\\t[[smileys/alert.png]]"
+msgstr "\\\\/!\\\t[[smileys/alert.png]"
+
+#. type: Bullet: '* '
+msgid "\\\\(?)\t[[smileys/question.png]]"
+msgstr "\\\\(?)\t[[smileys/question.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{x}\t[[smileys/star_on.png]]"
+msgstr "\\\\{x}\t[[smileys/star_on.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{*}\t[[smileys/star_on.png]]"
+msgstr "\\\\{*}\t[[smileys/star_on.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{o}\t[[smileys/star_off.png]]"
+msgstr "\\\\{o}\t[[smileys/star_off.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{1}\t[[smileys/prio1.png]]"
+msgstr "\\\\{1}\t[[smileys/prio1.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{2}\t[[smileys/prio2.png]]"
+msgstr "\\\\{2}\t[[smileys/prio2.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{3}\t[[smileys/prio3.png]]"
+msgstr "\\\\{3}\t[[smileys/prio3.png]]"
+
+#. type: Plain text
+msgid "For example: {x} B) {x}"
+msgstr "Par exemple : {x} B) {x}"
+
+#. type: Plain text
+msgid ""
+"To change the supported smileys, just edit the lists on this page.  Note "
+"that the format is important; each list item should start with the text that "
+"is turned into the smiley, escaped so that users can see what produces it, "
+"followed by a [[ikiwiki/WikiLink]] to the image to display."
+msgstr ""
+"Pour ajouter un smiley, il suffit de modifier cette page. Il est très "
+"important de respecter le format. Chaque élément de la liste doit commencer "
+"par le texte qui sera transformé en smiley, texte protégé pour que les "
+"utilisateurs voient bien ce qui produit le smiley, suivi d'un [[ikiwiki/"
+"WikiLink]] vers l'image à afficher."
+
+#. type: Plain text
+msgid ""
+"/!\\ Bear in mind that the link to the image needs to be written in a way "
+"that will work if it's copied to other pages on the wiki. So be sure to "
+"include the smileys directory in the path to the file."
+msgstr ""
+"/!\\ Le lien vers l'image doit être écrit de manière à continuer de "
+"fonctionner s'il est copié sur d'autres pages du wiki. Aussi, il faut "
+"inclure le répertoire smileys dans l'adresse du fichier."
-- 
cgit v1.2.3


From 87c3370e04fdcecb6f296f3e5e0f6b7414e8fa3e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 13 Sep 2009 19:33:19 -0400
Subject: note french is complete

---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0ba63ea6..be7c97119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 ikiwiki (3.14159265) UNRELEASED; urgency=low
 
-  * Add French basewiki translation from the Debian French l10n team,
-    including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
+  * Add complete French basewiki and underlays translation from the Debian
+    French l10n team, including Philippe Batailler, Alexandre Dupas, and
+    Steve Petruzzello.
   * Expand banned_users; it can now include PageSpecs, which
     allows banning by IP address.
   * underlay: Also allow configuring additional directories to search 
-- 
cgit v1.2.3


From b94c1ccd552f70b8ecce8f414563b4c6b6385e08 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 13 Sep 2009 19:40:42 -0400
Subject: fix CVS prune test

The regexp only matches things inside the CVS directory, not
just "CVS" by itself. I changed the test to not test that it will be
pruned.
---
 t/file_pruned.t | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/t/file_pruned.t b/t/file_pruned.t
index a05ad548f..00542d580 100755
--- a/t/file_pruned.t
+++ b/t/file_pruned.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 27;
+use Test::More tests => 26;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -9,8 +9,7 @@ BEGIN { use_ok("IkiWiki"); }
 
 ok(IkiWiki::file_pruned("src/.ikiwiki/", "src"));
 ok(IkiWiki::file_pruned("src/.ikiwiki/index", "src"));
-ok(IkiWiki::file_pruned("src/CVS", "src"));
-ok(IkiWiki::file_pruned("src/subdir/CVS", "src"));
+ok(IkiWiki::file_pruned("src/CVS/foo", "src"));
 ok(IkiWiki::file_pruned("src/subdir/CVS/foo", "src"));
 ok(IkiWiki::file_pruned("src/.svn", "src"));
 ok(IkiWiki::file_pruned("src/subdir/.svn", "src"));
-- 
cgit v1.2.3


From af26398c14fe9de4e884e03df7125642ac9cdd82 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 13 Sep 2009 20:20:21 -0400
Subject: avoid tempfile warning

Allow tempfile to open the file, so it doesn't warn about possible
insecurity. This probably fixes a real, but unlikely security hole too.
---
 IkiWiki/Plugin/cvs.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 1a0bad75f..f6db8bc98 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -322,7 +322,7 @@ sub rcs_recentchanges($) {
 	eval q{use File::ReadBackwards};
 	error($@) if $@;
 
-	my (undef, $tmpfile) = tempfile(OPEN=>0);
+	my ($tmphandle, $tmpfile) = tempfile();
 	system("env TZ=UTC cvsps -q --cvs-direct -z 30 -x >$tmpfile");
 	if ($? == -1) {
 		error "couldn't run cvsps: $!\n";
-- 
cgit v1.2.3


From 400aef4eeca6ca5dceb1f3998531f49cc204a23a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Sep 2009 15:55:06 -0400
Subject: merge Typos and format fix from l10n wiki

---
 po/underlays/directives/ikiwiki/directive/cutpaste.fr.po |  2 +-
 po/underlays/directives/ikiwiki/directive/if.fr.po       | 16 +++++++++++-----
 po/underlays/directives/ikiwiki/directive/linkmap.fr.po  |  2 +-
 .../directives/ikiwiki/directive/sparkline.fr.po         |  6 ++++--
 po/underlays/directives/ikiwiki/directive/toggle.fr.po   |  6 ++----
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po b/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po
index 6e0a45aaf..6c21f517e 100644
--- a/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po
@@ -43,7 +43,7 @@ msgid ""
 "using the given ID.  The text being cut *is* included in the output."
 msgstr ""
 "`\\[[!copy id=name text=\"text\"]]`  garde en mémoire le texte, qui peut "
-"être rappelé grâce à l'id. Le texte coupé *est* inclus dans la sortie.\""
+"être rappelé grâce à l'id. Le texte coupé *est* inclus dans la sortie."
 
 #. type: Bullet: ' * '
 msgid "`\\[[!paste id=name]]` is replaced by the previously memorized text."
diff --git a/po/underlays/directives/ikiwiki/directive/if.fr.po b/po/underlays/directives/ikiwiki/directive/if.fr.po
index 7ec2e1110..8a5f88dc4 100644
--- a/po/underlays/directives/ikiwiki/directive/if.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/if.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2009-08-28 19:19-0300\n"
-"PO-Revision-Date: 2009-09-11 21:31+0200\n"
+"PO-Revision-Date: 2009-09-14 17:13+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -36,6 +36,9 @@ msgid ""
 "\t      then=\"The smiley plugin is enabled :-)\"\n"
 "\t      else=\"No smiley plugin here..\"]]\n"
 msgstr ""
+"\t\\[[!if test=\"enabled(smiley)\"\n"
+"\t      then=\"Le greffon smiley est activé :-)\"\n"
+"\t      else=\"Pas de greffon smiley ici...\"]]\n"
 
 #. type: Plain text
 msgid ""
@@ -92,7 +95,7 @@ msgstr "enabled(greffon)"
 #. type: Plain text
 #, no-wrap
 msgid "  Tests whether the specified plugin is enabled.\n"
-msgstr "Ce test vérifie si le greffon indiqué est activé.\n"
+msgstr "  Ce test vérifie si le greffon indiqué est activé.\n"
 
 #. type: Bullet: '* '
 msgid "sourcepage(glob)"
@@ -103,7 +106,7 @@ msgstr "sourcepage(motif)"
 msgid ""
 "  Tests whether the glob matches the name of the page that contains the\n"
 "  conditional.\n"
-msgstr "Ce test confronte le motif donné au nom de la page qui contient la condition.\n"
+msgstr "  Ce test confronte le motif donné au nom de la page qui contient la condition.\n"
 
 #. type: Bullet: '* '
 msgid "destpage(glob)"
@@ -115,7 +118,10 @@ msgid ""
 "  Tests whether the glob matches the name of the page that is being built.\n"
 "  That might be different than the name of the page that contains the\n"
 "  conditional, if it's being inlined into another page.\n"
-msgstr "Ce test confronte le motif donné au nom de la page qui est construite. Ce nom peut être différent du nom de la page qui contient la condition, si la page est reliée à une autre page.\n"
+msgstr ""
+"  Ce test confronte le motif donné au nom de la page qui est construite.\n"
+"  Ce nom peut être différent du nom de la page qui contient la condition,\n"
+"  si la page est reliée à une autre page.\n"
 
 #. type: Bullet: '* '
 msgid "included()"
@@ -124,7 +130,7 @@ msgstr "included()"
 #. type: Plain text
 #, no-wrap
 msgid "  Tests whether the page is being included onto another page.\n"
-msgstr "Ce test vérifie si la page est incluse dans une autre page.\n"
+msgstr "  Ce test vérifie si la page est incluse dans une autre page.\n"
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/linkmap.fr.po b/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
index f0bd3f11c..7d73de65b 100644
--- a/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
@@ -49,7 +49,7 @@ msgstr "Voici la description des paramètres de la directive `linkmap` :"
 
 #. type: Bullet: '* '
 msgid "`pages` - A [[ikiwiki/PageSpec]] of the pages to map."
-msgstr "`pages` - Une spéfication [[ikiwiki/PageSpec]] des pages à rechercher."
+msgstr "`pages` - Une spécification [[ikiwiki/PageSpec]] des pages à rechercher."
 
 #. type: Bullet: '* '
 msgid ""
diff --git a/po/underlays/directives/ikiwiki/directive/sparkline.fr.po b/po/underlays/directives/ikiwiki/directive/sparkline.fr.po
index 3f3c74601..7bb7e5ce9 100644
--- a/po/underlays/directives/ikiwiki/directive/sparkline.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/sparkline.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "POT-Creation-Date: 2009-09-13 19:02-0300\n"
-"PO-Revision-Date: 2009-09-12 18:44+0200\n"
+"PO-Revision-Date: 2009-09-14 17:29+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -165,7 +165,9 @@ msgstr ""
 msgid ""
 "  Available values for the text location are: \"top\", \"right\", \"bottom\", and\n"
 "  \"left\".\n"
-msgstr "Les valeurs disponibles pour la position du texte sont : \"top\", \"right\", \"bottom\" et \"left\".\n"
+msgstr ""
+"  Les valeurs disponibles pour la position du texte sont : \"top\", \"right\", \"bottom\"\n"
+"  et \"left\".\n"
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/toggle.fr.po b/po/underlays/directives/ikiwiki/directive/toggle.fr.po
index 4b06e8f4a..a4200687f 100644
--- a/po/underlays/directives/ikiwiki/directive/toggle.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/toggle.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki     \n"
 "POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-09 16:37+0200\n"
+"PO-Revision-Date: 2009-09-14 17:28+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,9 +33,7 @@ msgstr ""
 msgid ""
 "It uses javascript to accomplish this; browsers without javascript will "
 "always see the full page content."
-msgstr ""
-"Javascript est nécessaire pour cela. Les navigateurs qui ne disposent de "
-"javascript affichent toujours la page entière."
+msgstr "Javascript est nécessaire pour cela. Les navigateurs qui ne disposent pas de javascript affichent toujours la page entière."
 
 #. type: Plain text
 msgid "Example use:"
-- 
cgit v1.2.3


From 5f06f80de51f7ea986a8f630377e67e99ba6de35 Mon Sep 17 00:00:00 2001
From: gsliepen <gsliepen@web>
Date: Tue, 15 Sep 2009 07:26:47 -0400
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index e1e25a045..d38bc5015 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -46,6 +46,7 @@ Projects & Organizations
 * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
+* [Tinc VPN](http://tinc-vpn.org/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From d9b665d83b7a8d71bc68a33a5c61d63f178de4a3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 15 Sep 2009 19:17:20 -0400
Subject: merge fixes from l10n wiki

---
 .../directives/ikiwiki/directive/cutpaste.fr.po    | 18 ++++------------
 po/underlays/directives/ikiwiki/directive/if.fr.po |  4 ++--
 .../ikiwiki/directive/postsparkline.fr.po          | 24 ++++++---------------
 .../directives/ikiwiki/directive/sparkline.fr.po   | 25 ++++++----------------
 po/underlays/smiley/smileys.fr.po                  |  4 ++--
 5 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po b/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po
index 6c21f517e..6a5a54a6b 100644
--- a/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/cutpaste.fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-09 21:16+0200\n"
+"PO-Revision-Date: 2009-09-16 07:37+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -41,9 +41,7 @@ msgstr ""
 msgid ""
 "`\\[[!copy id=name text=\"text\"]]` memorizes the text allowing to recall it "
 "using the given ID.  The text being cut *is* included in the output."
-msgstr ""
-"`\\[[!copy id=name text=\"text\"]]`  garde en mémoire le texte, qui peut "
-"être rappelé grâce à l'id. Le texte coupé *est* inclus dans la sortie."
+msgstr "`\\[[!copy id=name text=\"text\"]]` garde en mémoire le texte, qui peut être rappelé grâce à l'id. Le texte coupé *est* inclus dans la sortie."
 
 #. type: Bullet: ' * '
 msgid "`\\[[!paste id=name]]` is replaced by the previously memorized text."
@@ -64,12 +62,7 @@ msgid ""
 "follow the paste directive that uses its text.  In fact, this is quite "
 "useful to postpone big blocks of text like long annotations and have a more "
 "natural flow.  For example:"
-msgstr ""
-"Il n'est pas nécessaire de mettre en mémoire le texte avant de l'utiliser. "
-"Une directive « cut » peut suivre une directive « paste » qui utilise le "
-"texte. Et c'est très pratique de pouvoir différer de gros morceaux de texte "
-"comme de longues annotations et pouvoir suivre un cours plus naturel. Par "
-"exemple :"
+msgstr "Il n'est pas nécessaire de mettre en mémoire le texte avant de l'utiliser. Une directive « cut » peut suivre une directive « paste » qui utilise le texte. Pouvoir différer de gros morceaux de texte comme de longues annotations et pouvoir suivre un cours plus naturel est très pratique. Par exemple :"
 
 #. type: Plain text
 #, no-wrap
@@ -118,10 +111,7 @@ msgstr ""
 msgid ""
 "Since you can paste without using double quotes, copy and paste can be used "
 "to nest directives that require multiline parameters inside each other:"
-msgstr ""
-"Puisque il est possible de coller sans doubler les guillemets, ces "
-"directives copy et paste peuvent servir à emboîter des directives qui "
-"demandent des paramètres à plusieurs lignes insérés l'un dans l'autre :"
+msgstr "Puisqu'il est possible de coller sans doubler les guillemets, ces directives copy et paste peuvent servir à emboîter des directives qui demandent des paramètres à plusieurs lignes insérés l'un dans l'autre :"
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/if.fr.po b/po/underlays/directives/ikiwiki/directive/if.fr.po
index 8a5f88dc4..011c3dd6f 100644
--- a/po/underlays/directives/ikiwiki/directive/if.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/if.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2009-08-28 19:19-0300\n"
-"PO-Revision-Date: 2009-09-14 17:13+0200\n"
+"PO-Revision-Date: 2009-09-16 16:14+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgid ""
 "the wiki page outside the template. Triple-quoting the values even allows "
 "quotes to be included."
 msgstr ""
-"Les valeurs de `then` et `else`peuvent inclure n'importe quelle balise qui "
+"Les valeurs de `then` et `else` peuvent inclure n'importe quelle balise qui "
 "serait autorisée dans les pages du wiki. Tripler les guillemets autour de la "
 "valeur permet même d'y inclure des guillemets."
 
diff --git a/po/underlays/directives/ikiwiki/directive/postsparkline.fr.po b/po/underlays/directives/ikiwiki/directive/postsparkline.fr.po
index 65a0cd29f..fe62de4ac 100644
--- a/po/underlays/directives/ikiwiki/directive/postsparkline.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/postsparkline.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "POT-Creation-Date: 2009-09-13 19:02-0300\n"
-"PO-Revision-Date: 2009-09-12 21:10+0200\n"
+"PO-Revision-Date: 2009-09-15 08:04+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -77,11 +77,7 @@ msgid ""
 "Instead, data points are automatically generated based on the creation times "
 "of pages matched by the specified `pages` [[ikiwiki/PageSpec]]. A maximum of "
 "`max` data points will be generated."
-msgstr ""
-"Vous n'avez pas besoin d'indiquer des points de données. Mais c'est "
-"possible. En fait, les points de données sont automatiquement créés à partir "
-"des dates de création des pages correspondant à la spécification [[ikiwiki/"
-"PageSpec]] `pages`. Un maximum `max` de points de données est créé."
+msgstr "Vous n'avez pas besoin d'indiquer des points de données. Mais c'est possible si vous le souhaitez. En fait, les points de données sont automatiquement créés à partir des dates de création des pages correspondant à la spécification [[ikiwiki/PageSpec]] `pages`. Un maximum de `max` points de données sont créés."
 
 #. type: Plain text
 msgid ""
@@ -95,33 +91,25 @@ msgstr ""
 msgid ""
 "`interval` - The height of each point represents how long it has been since "
 "the previous post."
-msgstr ""
-"`interval` -  La hauteur de chaque point représente sa durée par rapport au "
-"précédent message."
+msgstr "`interval` -  La hauteur de chaque point représente la durée depuis le précédent message."
 
 #. type: Bullet: '* '
 msgid ""
 "`perday` - Each point represents a day; the height represents how many posts "
 "were made that day."
-msgstr ""
-"`perday` - Chaque point représente un jour. La hauteur représente le nombre "
-"de messages envoyés ce jour."
+msgstr "`perday` - Chaque point représente un jour. La hauteur représente le nombre de messages envoyés ce jour-là."
 
 #. type: Bullet: '* '
 msgid ""
 "`permonth` - Each point represents a month; the height represents how many "
 "posts were made that month."
-msgstr ""
-"`permonth` -  Chaque point représente un mois. La hauteur représente le "
-"nombre de messages envoyés ce mois."
+msgstr "`permonth` -  Chaque point représente un mois. La hauteur représente le nombre de messages envoyés pendant ce mois."
 
 #. type: Bullet: '* '
 msgid ""
 "`peryear` - Each point represents a year; the height represents how many "
 "posts were made that year."
-msgstr ""
-"`peryear` - Chaque point représente une année. La hauteur représente le "
-"nombre de messages envoyés cette année."
+msgstr "`peryear` - Chaque point représente une année. La hauteur représente le nombre de messages envoyés pendant cette année."
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/directives/ikiwiki/directive/sparkline.fr.po b/po/underlays/directives/ikiwiki/directive/sparkline.fr.po
index 7bb7e5ce9..9c35b5497 100644
--- a/po/underlays/directives/ikiwiki/directive/sparkline.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/sparkline.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "POT-Creation-Date: 2009-09-13 19:02-0300\n"
-"PO-Revision-Date: 2009-09-14 17:29+0200\n"
+"PO-Revision-Date: 2009-09-15 08:12+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -70,12 +70,7 @@ msgid ""
 "wide, and separated by one pixel, and the graph is 13 pixels tall. Width is "
 "determined automatically for bar graphs. The points with negative values are "
 "colored red, instead of the default black."
-msgstr ""
-"Cet exemple plus complexe engendre un graphique avec barres. La largeur des "
-"barres est de 2 pixels avec une séparation de 1 pixel et la hauteur du "
-"graphique est de 13 pixels. La largeur du graphique avec barres est "
-"déterminée automatiquement. Les points dont la valeur est négative sont en "
-"rouge, au lieu du noir, valeur par défaut."
+msgstr "Cet exemple plus complexe engendre un histogramme. La largeur des barres est de 2 pixels avec une séparation de 1 pixel et la hauteur du graphique est de 13 pixels. La largeur de l'histogramme est déterminée automatiquement. Les points dont la valeur est négative sont en rouge, au lieu de noir, valeur par défaut."
 
 #. type: Title #
 #, no-wrap
@@ -96,15 +91,11 @@ msgid ""
 "The following named parameters are recognised. Most of these are the same as "
 "those used by the underlying sparkline library, which is documented in more "
 "detail in [its wiki](http://sparkline.wikispaces.com/usage)."
-msgstr ""
-"Les paramètres suivants sont reconnus. La plupart d'entre eux sont les mêmes "
-"que ceux de la bibliothèque sparkline sous-jacente. Cette bibliothèque les "
-"documente avec plus de précisions dans [son wiki](http://sparkline."
-"wikispaces.com/usage)."
+msgstr "Les paramètres suivants sont reconnus. La plupart d'entre eux sont les mêmes que ceux de la bibliothèque sparkline sous-jacente et sont documentés avec plus de précisions dans [son wiki](http://sparkline.wikispaces.com/usage)."
 
 #. type: Bullet: '* '
 msgid "`style` - Either \"line\" (the default) or \"bar\"."
-msgstr "style` - soit \"line\" (valeur par défaut) ou \"bar\"."
+msgstr "`style` - soit \"line\" (valeur par défaut) ou \"bar\"."
 
 #. type: Bullet: '* '
 msgid "`width` - Width of the graph in pixels. Only needed for line graphs."
@@ -119,17 +110,13 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid "`barwidth` - Width of bars in a bar graph. Default is 1 pixel."
-msgstr ""
-"`barwidth` - Largeur des barres dans un graphique à barres.  La valeur par "
-"défaut est 1 pixel."
+msgstr "`barwidth` - Largeur des barres dans un histogramme.  La valeur par défaut est 1 pixel."
 
 #. type: Bullet: '* '
 msgid ""
 "`barspacing` - Spacing between bars in a bar graph, in pixels. Default is 1 "
 "pixel."
-msgstr ""
-"`barspacing` - Espacement entre les barres dans un graphique à barres.  La "
-"valeur par défaut est 1 pixel."
+msgstr "`barspacing` - Espacement entre les barres dans un histogramme.  La valeur par défaut est 1 pixel."
 
 #. type: Bullet: '* '
 msgid ""
diff --git a/po/underlays/smiley/smileys.fr.po b/po/underlays/smiley/smileys.fr.po
index 25633e392..44cde929c 100644
--- a/po/underlays/smiley/smileys.fr.po
+++ b/po/underlays/smiley/smileys.fr.po
@@ -95,7 +95,7 @@ msgstr "\\\\X-(\t[[smileys/angry.png]]"
 
 #. type: Bullet: '* '
 msgid "\\\\<:(\t[[smileys/frown.png]]"
-msgstr "\\\\<:(\t[[smileys/frown.png]"
+msgstr "\\\\<:(\t[[smileys/frown.png]]"
 
 #. type: Bullet: '* '
 msgid "\\\\:(\t[[smileys/sad.png]]"
@@ -151,7 +151,7 @@ msgstr "\\\\[!]\t[[smileys/attention.png]]"
 
 #. type: Bullet: '* '
 msgid "\\\\/!\\\t[[smileys/alert.png]]"
-msgstr "\\\\/!\\\t[[smileys/alert.png]"
+msgstr "\\\\/!\\\t[[smileys/alert.png]]"
 
 #. type: Bullet: '* '
 msgid "\\\\(?)\t[[smileys/question.png]]"
-- 
cgit v1.2.3


From 36094d76742872e3a894a15775832e8ba8261bbf Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Wed, 16 Sep 2009 23:34:27 -0400
Subject: Resolving WikiLinks in rst -- WIP

---
 doc/plugins/rst/discussion.mdwn | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn
index 9909784d5..af96edc6a 100644
--- a/doc/plugins/rst/discussion.mdwn
+++ b/doc/plugins/rst/discussion.mdwn
@@ -41,3 +41,33 @@ such since they are inline elements in the text.. But images work fine in
 rst's syntax.. what about using rst syntax for wikilinks as well?
 Is it possible to inject something into the parser to turn unmached links
 ``WikiLink`_` into ikiwiki links? --ulrik
+
+------
+
+Resolving WikiLinks in rst
+==========================
+
+I wanted to look into if we can hook into rst and influence how links are resolved.
+It turns out it is possible, and I have a working WIP for the rst plugin that does this.
+
+My work in progress for `/usr/lib/ikiwiki/plugins/rst` is here: http://kaizer.se/wiki/rst.py  
+*Warning, written in the middle of the night just to test if it works!*
+
+It basically matches normal rst links just like ikiwiki would match a wikilink
+if it existed.
+I can't read perl so I haven't found out so much. The plugin successfully registers backlinks using
+`proxy.rpc('add_link', on_page, bestlink)` (since the destination page will be rebuilt to update),
+but the backlinks don't show up.
+
+I converted one of my pages to rst:
+
+Before: http://kaizer.se/wiki/kupfer-mdwn  
+After: http://kaizer.se/wiki/kupfer-rst  
+
+I need help on a couple of points
+
+* How to fix the backlinks with `add_link`?
+* How to generate NonExistingLinks using the plugin API?
+* Can we include this in ikiwiki's rst if it is not too hairy?
+
+--ulrik
-- 
cgit v1.2.3


From 628f07f4c881031ab91fc436cf244b91541f0ea8 Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Thu, 17 Sep 2009 11:18:19 -0400
Subject: add repo with one patch

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 16af30584..5b71f4065 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -50,6 +50,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git`
 * [[schmonz]] `git://github.com/schmonz/ikiwiki.git`
 * [[will]] `http://www.cse.unsw.edu.au/~willu/ikiwiki.git`
+* [[kaizer.se]] `git://github.com/engla/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From b9d2ee880ccfe54035a7c5e2d14917d84ec8fd45 Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Thu, 17 Sep 2009 11:29:23 -0400
Subject: Resolve native reStructuredText links to ikiwiki pages

---
 ...ve_reStructuredText_links_to_ikiwiki_pages.mdwn | 124 +++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
new file mode 100644
index 000000000..c90261dc3
--- /dev/null
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -0,0 +1,124 @@
+I have a working minimal implementation letting the rst renderer resolve undefined native rST links to ikiwiki pages. I have posted it as one patch at:
+
+Preview commit: http://github.com/engla/ikiwiki/commit/486fd79e520da1d462f00f40e7a90ab07e9c6fdf  
+Repository: git://github.com/engla/ikiwiki.git  
+
+Design issues of the patch:
+
+Right now it changes rendering so that undefined pages (previous errors) are resolved to either ikiwiki pages or link to "#". It could be changed (trivially) so that undefined pages give the same error as before. Since it only resolves links that would previously error out, impact on current installations should be minimal.
+
+I don't know why backlinks don't show up with the patch as it is; they are registered, but not rendered on the linked-to page.
+
+Desing issues in general:
+
+We resolve rST links without definition, we don't help resolving defined relative links, so we don't support specifying link name and target separately.
+
+Many other issues with rST are of course unresolved, but some might be solved by implementing custom rST directives (which is a supported extension mechanism).
+
+Patch follows:
+
+----
+<pre>
+	From 486fd79e520da1d462f00f40e7a90ab07e9c6fdf Mon Sep 17 00:00:00 2001
+	From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
+	Date: Thu, 17 Sep 2009 15:18:50 +0200
+	Subject: [PATCH] rst: Resolve native reStructuredText links to ikiwiki pages
+
+	Links in rST use syntax `Like This`_ or OneWordLink_, and are
+	generally used for relative or absolue links, with an auxiliary
+	definition:
+
+	.. _`Like This`: http://ikiwiki.info
+	.. _OneWordLink: relative
+
+	We can hook into docutils to resolve unresolved links so that rST
+	links without definition can be resolved to wiki pages. This enables
+	WikiLink_ to link to [[WikiLink]] (if no .. _WikiLink is specified).
+
+	Comparing to Ikiwiki's wikilinks
+
+	[[blogging|blog]] specifies a link to the page blog, with the name
+	blogging. In rST we should use blogging_
+
+	.. _blogging: blog
+
+	*However*, note that this patch does not hook into this. What we
+	resolve in this patch is finding the appropriate "_blogging" if it is
+	not found, not resolving the address 'blog'.
+	---
+	 plugins/rst |   46 +++++++++++++++++++++++++++++++++++++++++-----
+	 1 files changed, 41 insertions(+), 5 deletions(-)
+
+	diff --git a/plugins/rst b/plugins/rst
+	index a2d07eb..a74baa8 100755
+	--- a/plugins/rst
+	+++ b/plugins/rst
+	@@ -6,22 +6,58 @@
+	 # based a little bit on rst.pm by Sergio Talens-Oliag, but only a little bit. :)
+	 #
+	 # Copyright © martin f. krafft <madduck@madduck.net>
+	+# Copyright © Ulrik Sverdrup <ulrik.sverdrup@gmail.com>, 2009
+	+#
+	 # Released under the terms of the GNU GPL version 2
+	 #
+	+
+	 __name__ = 'rst'
+	 __description__ = 'xml-rpc-based ikiwiki plugin to process RST files'
+	-__version__ = '0.3'
+	+__version__ = '0.3+'
+	 __author__ = 'martin f. krafft <madduck@madduck.net>'
+	 __copyright__ = 'Copyright © ' + __author__
+	 __licence__ = 'GPLv2'
+	 
+	 from docutils.core import publish_parts;
+	+from docutils.writers import html4css1
+	 from proxy import IkiWikiProcedureProxy
+	 
+	-def rst2html(proxy, *kwargs):
+	-    # FIXME arguments should be treated as a hash, the order could change
+	-    # at any time and break this.
+	-    parts = publish_parts(kwargs[3], writer_name='html',
+	+class IkiwikiWriter(html4css1.Writer):
+	+    def resolve_node(self, node):
+	+        refname = node.get('refname', None)
+	+        if not refname:
+	+            return False
+	+
+	+        bestlink = self.proxy.rpc('bestlink', self.page, refname)
+	+
+	+        node.resolved = 1
+	+        node['class'] = 'wiki'
+	+        del node['refname']
+	+
+	+        if not bestlink:
+	+            rel_url = "#"
+	+        else:
+	+            rel_url = self.proxy.rpc('urlto', bestlink, self.page)
+	+            self.proxy.rpc('add_link', self.page, bestlink)
+	+        node['refuri'] = rel_url
+	+        self.proxy.rpc('debug', "Emitting link %s => %s" % (refname, rel_url))
+	+        return True
+	+
+	+    resolve_node.priority = 1
+	+
+	+    def __init__(self, proxy, page):
+	+        html4css1.Writer.__init__(self)
+	+        self.proxy = proxy
+	+        self.page = page
+	+        self.unknown_reference_resolvers = (self.resolve_node, )
+	+
+	+def rst2html(proxy, *args):
+	+    # args is a list paired by key, value, so we turn it into a dict
+	+    kwargs = dict((k, v) for k, v in zip(*[iter(args)]*2))
+	+    page = kwargs['page']
+	+
+	+    parts = publish_parts(kwargs['content'],
+	+                          writer=IkiwikiWriter(proxy, page),
+	                           settings_overrides = { 'halt_level': 6
+	                                                , 'file_insertion_enabled': 0
+	                                                , 'raw_enabled': 1
+	-- 
+	1.6.4
+
+</pre>
+----
-- 
cgit v1.2.3


From 5946a54ec793fa89bdb9a116d74684a93a9696bd Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Thu, 17 Sep 2009 11:33:12 -0400
Subject: see Resolve native reStructuredText links to ikiwiki pages

---
 doc/plugins/rst/discussion.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn
index af96edc6a..38fbed6d6 100644
--- a/doc/plugins/rst/discussion.mdwn
+++ b/doc/plugins/rst/discussion.mdwn
@@ -50,8 +50,8 @@ Resolving WikiLinks in rst
 I wanted to look into if we can hook into rst and influence how links are resolved.
 It turns out it is possible, and I have a working WIP for the rst plugin that does this.
 
-My work in progress for `/usr/lib/ikiwiki/plugins/rst` is here: http://kaizer.se/wiki/rst.py  
-*Warning, written in the middle of the night just to test if it works!*
+My work in progress for `/usr/lib/ikiwiki/plugins/rst` is here: 
+[[todo/Resolve native reStructuredText links to ikiwiki pages]]
 
 It basically matches normal rst links just like ikiwiki would match a wikilink
 if it existed.
-- 
cgit v1.2.3


From 470712618401fb3cd322c84d1c57e4b8835850d5 Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Thu, 17 Sep 2009 12:07:23 -0400
Subject: The page is rST-parsed once in 'scan' and once in 'htmlize' (the
 first to generate backlinks). Can the parse output be safely reused?

---
 doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index c90261dc3..7adcb5c09 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -7,7 +7,7 @@ Design issues of the patch:
 
 Right now it changes rendering so that undefined pages (previous errors) are resolved to either ikiwiki pages or link to "#". It could be changed (trivially) so that undefined pages give the same error as before. Since it only resolves links that would previously error out, impact on current installations should be minimal.
 
-I don't know why backlinks don't show up with the patch as it is; they are registered, but not rendered on the linked-to page.
+The page is rST-parsed once in 'scan' and once in 'htmlize' (the first to generate backlinks). Can the parse output be safely reused?
 
 Desing issues in general:
 
-- 
cgit v1.2.3


From 356188f7c65c0e9b78e8be1e477acb785d48d3c2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 17 Sep 2009 12:42:40 -0400
Subject: response

---
 doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 7adcb5c09..c98723f2d 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -9,6 +9,11 @@ Right now it changes rendering so that undefined pages (previous errors) are res
 
 The page is rST-parsed once in 'scan' and once in 'htmlize' (the first to generate backlinks). Can the parse output be safely reused?
 
+> The page content fed to htmlize may be different than that fed to scan,
+> as directives can change the content. If you cached the input and output
+> at scan time, you could reuse the cached data at htmlize time for inputs
+> that are the same -- but that could be a very big cache! --[[Joey]] 
+
 Desing issues in general:
 
 We resolve rST links without definition, we don't help resolving defined relative links, so we don't support specifying link name and target separately.
-- 
cgit v1.2.3


From 28f893d120633dbfd3e85f4063b90f255f058d9b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 17 Sep 2009 12:45:04 -0400
Subject: reduce name to \w+ so gitremotes will parse it

---
 doc/git.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 5b71f4065..a3b56c682 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -50,7 +50,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git`
 * [[schmonz]] `git://github.com/schmonz/ikiwiki.git`
 * [[will]] `http://www.cse.unsw.edu.au/~willu/ikiwiki.git`
-* [[kaizer.se]] `git://github.com/engla/ikiwiki.git`
+* [[kaizer]] `git://github.com/engla/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From fc1cc57cdca9a7bdab41f0d63e34a98a2d7c78e5 Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Thu, 17 Sep 2009 15:38:40 -0400
Subject: about replacements in rst (renaming links)

---
 ...Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index c98723f2d..642382b47 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -18,6 +18,16 @@ Desing issues in general:
 
 We resolve rST links without definition, we don't help resolving defined relative links, so we don't support specifying link name and target separately.
 
+> I found out this is possible by using rST subsitutions. So to do [[Version history...|releases]]
+> you would use:
+> 
+> `|releases|_`  
+> `.. |releases| replace:: Version history...`  
+> Which does not seem to have an inline replacement. Using non-resolved links there is the alternative:
+>
+> ``Version history <releases/>`_`. --ulrik [kaizer.se]
+
+
 Many other issues with rST are of course unresolved, but some might be solved by implementing custom rST directives (which is a supported extension mechanism).
 
 Patch follows:
-- 
cgit v1.2.3


From b7db2ca37f400e09a663b01800e3bc5477a304df Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Thu, 17 Sep 2009 15:42:34 -0400
Subject: word use, equivalent is better.

---
 doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 642382b47..aa96fc431 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -23,7 +23,7 @@ We resolve rST links without definition, we don't help resolving defined relativ
 > 
 > `|releases|_`  
 > `.. |releases| replace:: Version history...`  
-> Which does not seem to have an inline replacement. Using non-resolved links there is the alternative:
+> Which does not seem to have an inline equivalent. Using non-resolved links there is the alternative:
 >
 > ``Version history <releases/>`_`. --ulrik [kaizer.se]
 
-- 
cgit v1.2.3


From 2fc62b2787d43b91e946862910497d823eb86418 Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Thu, 17 Sep 2009 16:44:33 -0400
Subject: raw escape with roles

---
 doc/bugs/rst_tweak.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/bugs/rst_tweak.mdwn b/doc/bugs/rst_tweak.mdwn
index 9d433e24e..8667a459b 100644
--- a/doc/bugs/rst_tweak.mdwn
+++ b/doc/bugs/rst_tweak.mdwn
@@ -41,3 +41,12 @@ what is supposed to happen? --Peter
 > That's why the [[plugin_page|plugins/rst]] has its note about 
 > issues with wikilinks and directives. You'd have to put those inside
 > raw directives yourself to avoid rst escaping their result. --[[Joey]]
+
+You can also create a raw "role" which is at least easier than raw directives.
+
+	.. role:: ikiwiki(raw)
+	   :format: html
+
+	:ikiwiki:`\[[WikiLink]]`
+
+A role assigns meaning to interpreted text (for example :acronym:`ABC`) or :PEP:`8`. --ulrik [kaizer.se]
-- 
cgit v1.2.3


From e19d0c5bbdcd45d810688f990381b639485434bb Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Fri, 18 Sep 2009 16:08:16 +0200
Subject: on caching

---
 .../Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index aa96fc431..c8d7ba5ed 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -14,6 +14,12 @@ The page is rST-parsed once in 'scan' and once in 'htmlize' (the first to genera
 > at scan time, you could reuse the cached data at htmlize time for inputs
 > that are the same -- but that could be a very big cache! --[[Joey]] 
 
+>> I would propose using a simple heuristic: If you see `[[` anywhere on the
+>> page, don't cache it. It would be an effective cache for pure-rst wikis
+>> (without any ikiwiki directives or wikilinks).
+>> However, I think that if the cache does not work for a big load, it should
+>> not work at all; small loads are small so they don't matter. --ulrik
+
 Desing issues in general:
 
 We resolve rST links without definition, we don't help resolving defined relative links, so we don't support specifying link name and target separately.
-- 
cgit v1.2.3


From 5cd338fe16ede5aa1dbbf80cdfe027f8bfa09cd3 Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Fri, 18 Sep 2009 16:10:43 +0200
Subject: escape markup (oops)

---
 doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index c8d7ba5ed..682229469 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -14,7 +14,7 @@ The page is rST-parsed once in 'scan' and once in 'htmlize' (the first to genera
 > at scan time, you could reuse the cached data at htmlize time for inputs
 > that are the same -- but that could be a very big cache! --[[Joey]] 
 
->> I would propose using a simple heuristic: If you see `[[` anywhere on the
+>> I would propose using a simple heuristic: If you see \[[ anywhere on the
 >> page, don't cache it. It would be an effective cache for pure-rst wikis
 >> (without any ikiwiki directives or wikilinks).
 >> However, I think that if the cache does not work for a big load, it should
-- 
cgit v1.2.3


From 25eafa8522a9480ca2abb6df45a613ac3d0b9880 Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Fri, 18 Sep 2009 16:46:41 +0200
Subject: Refactor, and Propose :wiki: syntax for rST wikilinks

---
 ...ve_reStructuredText_links_to_ikiwiki_pages.mdwn | 112 +++++++++++++++++----
 1 file changed, 94 insertions(+), 18 deletions(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 682229469..49be3f30a 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -1,28 +1,84 @@
-I have a working minimal implementation letting the rst renderer resolve undefined native rST links to ikiwiki pages. I have posted it as one patch at:
+_NB! this page has been refactored, hopefully it is clearer now_  
+_I propose putting discussion posts somewhere in the vincity of
+the secttion Individual reStructuredText Issues_
 
-Preview commit: http://github.com/engla/ikiwiki/commit/486fd79e520da1d462f00f40e7a90ab07e9c6fdf  
-Repository: git://github.com/engla/ikiwiki.git  
+**Goal**
 
-Design issues of the patch:
+To be able to use rst as a first-class markup language in ikiwiki. I think
+most believe this is almost impossible (ikiwiki is built around markdown).
 
-Right now it changes rendering so that undefined pages (previous errors) are resolved to either ikiwiki pages or link to "#". It could be changed (trivially) so that undefined pages give the same error as before. Since it only resolves links that would previously error out, impact on current installations should be minimal.
+**Design**
 
-The page is rST-parsed once in 'scan' and once in 'htmlize' (the first to generate backlinks). Can the parse output be safely reused?
+**WikiLinks**, first and foremost, are needed for a wiki. rST already allows
+specifying absolue and relative URL links, and relative links can be used to
+tie together wiki of rst documents.
 
-> The page content fed to htmlize may be different than that fed to scan,
-> as directives can change the content. If you cached the input and output
-> at scan time, you could reuse the cached data at htmlize time for inputs
-> that are the same -- but that could be a very big cache! --[[Joey]] 
+1. Below are links to a small, working implementation for resolving
+   undefined rST references using ikiwiki's mechanism. This is **Proposal 1**
+   for rst WikiLinks.
 
->> I would propose using a simple heuristic: If you see \[[ anywhere on the
->> page, don't cache it. It would be an effective cache for pure-rst wikis
->> (without any ikiwiki directives or wikilinks).
->> However, I think that if the cache does not work for a big load, it should
->> not work at all; small loads are small so they don't matter. --ulrik
+2. Looking over at rST-using systems such as trac and MoinMoin; I think it
+   would be wiser to implement wikilinks by the `:role:` mechanism, together
+   with allowing a custom URL scheme to point to wiki links. This is
+   **Proposal 2**.
+
+        This is a simple wiki page, with :wiki:`WikiLinks` and other_ links
+	
+        .. _other: wiki:wikilink
+
+Benefits of using a `:role:` and a `wiki: page/subpage` URL scheme are
+following:
+
+1. rST documents taken out of the context (the wiki) will not fail as bad as
+   if they have lots of Proposal-1 links: They look just the same as valid
+   references, and you have to edit them all.
+   In contrast, should the `:wiki:` role disappear, one line is enough
+   to redefined it and silence all the warnings for the document:
+
+        .. role:: wiki (title)
+
+*Implementation* there is no implementation of Proposal 2 but it should be
+doable; adding a local role is trivial. Rewriting `wiki:` links could be
+done in the format phase(?).
+
+Now **Directives**: As it is now, ikiwiki goes though (roughly):
+filter, preprocess, htmlize, format as major stages of content
+transformation. rST has major problems to work with any HTML that enters the
+picture before it.
+
+1. Formatting rST in `htmlize` (as is done now): Raw html can be escaped by
+   raw blocks:
+
+        .. raw:: html
+   	
+	        \[[!inline and do stuff]]
+
+   (This can be simplified to alias the above as `.. ikiwiki::`)
+   This escape method works, if ikwiki can be persuaded to maintain the
+   indent when inserting html, so that it stays inside the raw block.
+
+2. Formatting rST in `filter` (idea)
+   1. rST does not have to see any HTML (raw not needed)
+   2. rST directives can alias ikiwiki syntax:
+     
+        ..ikiwiki:: inline pages= ...
 
-Desing issues in general:
+   3. Using rST directives as ikiwiki directives can be complicated;
+      but rST directives allow a direct line (after :: on first line),
+      an option list, and a content block.
 
-We resolve rST links without definition, we don't help resolving defined relative links, so we don't support specifying link name and target separately.
+
+**Discussion**
+
+I guess you (or someone) has been through this before and knows why it
+simply won't work. But I hoped there was something original in the above;
+and I know there are wiki installations where rST works. --ulrik
+
+**Individual reStructuredText Issues**
+
+* We resolve rST links without definition, we don't help resolving defined
+  relative links, so we don't support specifying link name and target
+  separately.
 
 > I found out this is possible by using rST subsitutions. So to do [[Version history...|releases]]
 > you would use:
@@ -33,8 +89,28 @@ We resolve rST links without definition, we don't help resolving defined relativ
 >
 > ``Version history <releases/>`_`. --ulrik [kaizer.se]
 
+**A first implementation: Resolving unmatched links**
+
+I have a working minimal implementation letting the rst renderer resolve
+undefined native rST links to ikiwiki pages. I have posted it as one patch at:
+
+Preview commit: http://github.com/engla/ikiwiki/commit/486fd79e520da1d462f00f40e7a90ab07e9c6fdf  
+Repository: git://github.com/engla/ikiwiki.git  
+
+Design issues of the patch:
+
+The page is rST-parsed once in 'scan' and once in 'htmlize' (the first to generate backlinks). Can the parse output be safely reused?
+
+> The page content fed to htmlize may be different than that fed to scan,
+> as directives can change the content. If you cached the input and output
+> at scan time, you could reuse the cached data at htmlize time for inputs
+> that are the same -- but that could be a very big cache! --[[Joey]] 
 
-Many other issues with rST are of course unresolved, but some might be solved by implementing custom rST directives (which is a supported extension mechanism).
+>> I would propose using a simple heuristic: If you see \[[ anywhere on the
+>> page, don't cache it. It would be an effective cache for pure-rst wikis
+>> (without any ikiwiki directives or wikilinks).
+>> However, I think that if the cache does not work for a big load, it should
+>> not work at all; small loads are small so they don't matter. --ulrik
 
 Patch follows:
 
-- 
cgit v1.2.3


From 18151b8152f01421bb42ab62d9fabd56038126e1 Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Fri, 18 Sep 2009 20:07:18 +0200
Subject: about default-role

---
 .../Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 49be3f30a..ba9440b43 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -23,9 +23,16 @@ tie together wiki of rst documents.
    **Proposal 2**.
 
         This is a simple wiki page, with :wiki:`WikiLinks` and other_ links
-	
+        
         .. _other: wiki:wikilink
 
+        We can get rid of the role part as well for WikiLinks::
+        
+            .. default-role:: wiki
+        
+        Enables `WikiLinks` but does not impact references such as ``other``
+        This can be made the default for ikiwiki.
+
 Benefits of using a `:role:` and a `wiki: page/subpage` URL scheme are
 following:
 
-- 
cgit v1.2.3


From ada46376cc91c754710fea138f619de72d042ec2 Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Fri, 18 Sep 2009 20:07:34 -0400
Subject: Toggle inserts javascript in wrong place

---
 doc/bugs/toggle_expects_body_element_without_attributes.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/bugs/toggle_expects_body_element_without_attributes.mdwn

diff --git a/doc/bugs/toggle_expects_body_element_without_attributes.mdwn b/doc/bugs/toggle_expects_body_element_without_attributes.mdwn
new file mode 100644
index 000000000..6cb03e934
--- /dev/null
+++ b/doc/bugs/toggle_expects_body_element_without_attributes.mdwn
@@ -0,0 +1 @@
+The toggle plugins checks for a `<body>` in the page; if not found, javascript tags are inserted at the top of the document. Since my page uses `<body onload="javascript:fixLinks()">`; a plain `<body>` is not found and I get script links before the docstring declaration. Please see the source of the following toggle-using page: http://kaizer.se/wiki/kupfer/ -- ulrik [kaizer.se]
-- 
cgit v1.2.3


From 6c4a2a88a871af5ac42cd80aa48684b114849e3d Mon Sep 17 00:00:00 2001
From: "http://davrieb.livejournal.com/" <http://davrieb.livejournal.com/@web>
Date: Sat, 19 Sep 2009 01:45:55 -0400
Subject:

---
 doc/forum/How_does_ikiwiki_remember_times__63__.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
index 5522cbf45..cb14df77f 100644
--- a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
+++ b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
@@ -87,3 +87,21 @@ Do I have it right?
     $EDITOR "$pagename"
 
 >>>>> -- [[Jon]]
+
+> A quick workaround for me to get modification times right is the following
+> little zsh script, which unfortynately only works for git:
+
+    #!/usr/bin/env zsh
+    
+    set +x
+    
+    for FILE in **/*(.); do
+      TIMES="`git log --follow  --pretty=format:%ai $FILE`"
+      #CTIME="`echo $TIMES | tail -n1`"
+      MTIME="`echo $TIMES | head -n1`"
+    
+      echo  touch -m -d "$MTIME" $FILE
+      touch -m -d "$MTIME" $FILE
+    
+    done
+
-- 
cgit v1.2.3


From f8bc52eea3b39a989a7dd8ab2b1746266d208d71 Mon Sep 17 00:00:00 2001
From: "http://davrieb.livejournal.com/" <http://davrieb.livejournal.com/@web>
Date: Sat, 19 Sep 2009 01:49:16 -0400
Subject: fix a typo and remove commneted out ctime line

---
 doc/forum/How_does_ikiwiki_remember_times__63__.mdwn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
index cb14df77f..9685a6859 100644
--- a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
+++ b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
@@ -89,7 +89,7 @@ Do I have it right?
 >>>>> -- [[Jon]]
 
 > A quick workaround for me to get modification times right is the following
-> little zsh script, which unfortynately only works for git:
+> little zsh script, which unfortunately only works for git:
 
     #!/usr/bin/env zsh
     
@@ -97,7 +97,6 @@ Do I have it right?
     
     for FILE in **/*(.); do
       TIMES="`git log --follow  --pretty=format:%ai $FILE`"
-      #CTIME="`echo $TIMES | tail -n1`"
       MTIME="`echo $TIMES | head -n1`"
     
       echo  touch -m -d "$MTIME" $FILE
-- 
cgit v1.2.3


From 3b33b3cc3f3dd76b501ac237fe18bd7e5f823234 Mon Sep 17 00:00:00 2001
From: "http://certifi.ca/lunix" <http://certifi.ca/lunix@web>
Date: Sat, 19 Sep 2009 05:32:22 -0400
Subject: question about using 404 and search

---
 doc/forum/missing_pages_redirected_to_search.mdwn | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/forum/missing_pages_redirected_to_search.mdwn

diff --git a/doc/forum/missing_pages_redirected_to_search.mdwn b/doc/forum/missing_pages_redirected_to_search.mdwn
new file mode 100644
index 000000000..cd544ecaf
--- /dev/null
+++ b/doc/forum/missing_pages_redirected_to_search.mdwn
@@ -0,0 +1,4 @@
+Is it possible to have any missing pages(404's) redirected to the search(omega) ?  
+So if someone comes to my site with http://example.com/foo_was_here it would result in 'foo_was_here' being passed as a search parameter to omega ?  --[Mick](http://www.lunix.com.au)
+
+
-- 
cgit v1.2.3


From 8ae7356b09ffa78fb174dde7c5c31c08177eb6db Mon Sep 17 00:00:00 2001
From: "http://davrieb.livejournal.com/" <http://davrieb.livejournal.com/@web>
Date: Sat, 19 Sep 2009 19:46:06 -0400
Subject: some script cleanup

---
 doc/forum/How_does_ikiwiki_remember_times__63__.mdwn | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
index 9685a6859..df9636a1e 100644
--- a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
+++ b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
@@ -96,11 +96,13 @@ Do I have it right?
     set +x
     
     for FILE in **/*(.); do
-      TIMES="`git log --follow  --pretty=format:%ai $FILE`"
+      TIMES="`git log --pretty=format:%ai $FILE`"
       MTIME="`echo $TIMES | head -n1`"
     
-      echo  touch -m -d "$MTIME" $FILE
-      touch -m -d "$MTIME" $FILE
+      if [ ! -z $MTIME ]; then
+        echo  touch -m -d "$MTIME" $FILE
+        touch -m -d "$MTIME" $FILE
+      fi
     
     done
 
-- 
cgit v1.2.3


From 76871bb0526b3caabfdd8baec5faba4a732339ae Mon Sep 17 00:00:00 2001
From: "http://bob-bernstein.myopenid.com/"
 <http://bob-bernstein.myopenid.com/@web>
Date: Sat, 19 Sep 2009 20:37:27 -0400
Subject:

---
 doc/css/discussion.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/css/discussion.mdwn

diff --git a/doc/css/discussion.mdwn b/doc/css/discussion.mdwn
new file mode 100644
index 000000000..c80aa86bc
--- /dev/null
+++ b/doc/css/discussion.mdwn
@@ -0,0 +1,7 @@
+I must be doing something wrong. Running setup:
+
+$ ikiwiki --setup MyIkiwiki.setup
+
+overwrites my local.css with the default (empty) version.
+
+I am using ikiwiki_3.1415926.tar.gz installed into /usr/local.
-- 
cgit v1.2.3


From d51ea7ae56907c8b0ede419546f13dd8ac1fb81d Mon Sep 17 00:00:00 2001
From: "http://bob-bernstein.myopenid.com/"
 <http://bob-bernstein.myopenid.com/@web>
Date: Sat, 19 Sep 2009 23:53:58 -0400
Subject:

---
 doc/css/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/css/discussion.mdwn b/doc/css/discussion.mdwn
index c80aa86bc..c97682e71 100644
--- a/doc/css/discussion.mdwn
+++ b/doc/css/discussion.mdwn
@@ -5,3 +5,6 @@ $ ikiwiki --setup MyIkiwiki.setup
 overwrites my local.css with the default (empty) version.
 
 I am using ikiwiki_3.1415926.tar.gz installed into /usr/local.
+
+---
+Sorry. Never mind. RTFM. --refresh duh.
-- 
cgit v1.2.3


From 254046edcb4c2ed66bf14dbe3526d39acac9cfe3 Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Mon, 21 Sep 2009 23:50:42 +0200
Subject: Posting patch series for rst Wikilinks and Preproc indent

---
 ...ve_reStructuredText_links_to_ikiwiki_pages.mdwn | 163 ++++++---------------
 1 file changed, 42 insertions(+), 121 deletions(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index ba9440b43..54d9a6c4b 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -2,12 +2,14 @@ _NB! this page has been refactored, hopefully it is clearer now_
 _I propose putting discussion posts somewhere in the vincity of
 the secttion Individual reStructuredText Issues_
 
+## Design ##
+
 **Goal**
 
 To be able to use rst as a first-class markup language in ikiwiki. I think
 most believe this is almost impossible (ikiwiki is built around markdown).
 
-**Design**
+## Wikilinks ##
 
 **WikiLinks**, first and foremost, are needed for a wiki. rST already allows
 specifying absolue and relative URL links, and relative links can be used to
@@ -44,9 +46,37 @@ following:
 
         .. role:: wiki (title)
 
-*Implementation* there is no implementation of Proposal 2 but it should be
-doable; adding a local role is trivial. Rewriting `wiki:` links could be
-done in the format phase(?).
+### Implementation ###
+
+Implementation of Proposal-2 wikilinks are in the branch
+[rst-wikilinks][rst-wl]
+
+
+        This is a simple wiki page, with :wiki:`WikiLinks` and |named| links
+        
+        .. |named| wiki:: Some Page
+
+        We can get rid of the role part as well for WikiLinks::
+        
+            .. default-role:: wiki
+        
+        Enables `WikiLinks` but does not impact references such as ``named``
+        This can be made the default for ikiwiki.
+
+[rst-wl]: http://github.com/engla/ikiwiki/commits/rst-wikilinks
+
+On top of **rst-wikilinks** is [rst-customize][rst-custom] which adds two
+power user features: Global (python) file to read in custom directives
+(unsafe), and a wikifile as "header" file for all parsed .rst files (safe,
+but disruptive since all .rst depend on it). Well, the customizations have
+to be picked and chosen from this, but at least the global python file can
+be very convenient.
+
+Some rst-custom [examples are here](http://kaizer.se/wiki/rst_examples/)
+
+[rst-custom]: http://github.com/engla/ikiwiki/commits/rst-customize
+
+## Directives ##
 
 Now **Directives**: As it is now, ikiwiki goes though (roughly):
 filter, preprocess, htmlize, format as major stages of content
@@ -74,8 +104,13 @@ picture before it.
       but rST directives allow a direct line (after :: on first line),
       an option list, and a content block.
 
+### Implementation ###
+
+Preserving indents in the preprocessor are in branch [pproc-indent][ppi]
 
-**Discussion**
+[ppi]: http://github.com/engla/ikiwiki/commits/pproc-indent
+
+## Discussion ##
 
 I guess you (or someone) has been through this before and knows why it
 simply won't work. But I hoped there was something original in the above;
@@ -86,15 +121,8 @@ and I know there are wiki installations where rST works. --ulrik
 * We resolve rST links without definition, we don't help resolving defined
   relative links, so we don't support specifying link name and target
   separately.
-
-> I found out this is possible by using rST subsitutions. So to do [[Version history...|releases]]
-> you would use:
-> 
-> `|releases|_`  
-> `.. |releases| replace:: Version history...`  
-> Which does not seem to have an inline equivalent. Using non-resolved links there is the alternative:
->
-> ``Version history <releases/>`_`. --ulrik [kaizer.se]
+  
+  * Resolved by |replacement| links with the wiki:: directive.
 
 **A first implementation: Resolving unmatched links**
 
@@ -119,110 +147,3 @@ The page is rST-parsed once in 'scan' and once in 'htmlize' (the first to genera
 >> However, I think that if the cache does not work for a big load, it should
 >> not work at all; small loads are small so they don't matter. --ulrik
 
-Patch follows:
-
-----
-<pre>
-	From 486fd79e520da1d462f00f40e7a90ab07e9c6fdf Mon Sep 17 00:00:00 2001
-	From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
-	Date: Thu, 17 Sep 2009 15:18:50 +0200
-	Subject: [PATCH] rst: Resolve native reStructuredText links to ikiwiki pages
-
-	Links in rST use syntax `Like This`_ or OneWordLink_, and are
-	generally used for relative or absolue links, with an auxiliary
-	definition:
-
-	.. _`Like This`: http://ikiwiki.info
-	.. _OneWordLink: relative
-
-	We can hook into docutils to resolve unresolved links so that rST
-	links without definition can be resolved to wiki pages. This enables
-	WikiLink_ to link to [[WikiLink]] (if no .. _WikiLink is specified).
-
-	Comparing to Ikiwiki's wikilinks
-
-	[[blogging|blog]] specifies a link to the page blog, with the name
-	blogging. In rST we should use blogging_
-
-	.. _blogging: blog
-
-	*However*, note that this patch does not hook into this. What we
-	resolve in this patch is finding the appropriate "_blogging" if it is
-	not found, not resolving the address 'blog'.
-	---
-	 plugins/rst |   46 +++++++++++++++++++++++++++++++++++++++++-----
-	 1 files changed, 41 insertions(+), 5 deletions(-)
-
-	diff --git a/plugins/rst b/plugins/rst
-	index a2d07eb..a74baa8 100755
-	--- a/plugins/rst
-	+++ b/plugins/rst
-	@@ -6,22 +6,58 @@
-	 # based a little bit on rst.pm by Sergio Talens-Oliag, but only a little bit. :)
-	 #
-	 # Copyright © martin f. krafft <madduck@madduck.net>
-	+# Copyright © Ulrik Sverdrup <ulrik.sverdrup@gmail.com>, 2009
-	+#
-	 # Released under the terms of the GNU GPL version 2
-	 #
-	+
-	 __name__ = 'rst'
-	 __description__ = 'xml-rpc-based ikiwiki plugin to process RST files'
-	-__version__ = '0.3'
-	+__version__ = '0.3+'
-	 __author__ = 'martin f. krafft <madduck@madduck.net>'
-	 __copyright__ = 'Copyright © ' + __author__
-	 __licence__ = 'GPLv2'
-	 
-	 from docutils.core import publish_parts;
-	+from docutils.writers import html4css1
-	 from proxy import IkiWikiProcedureProxy
-	 
-	-def rst2html(proxy, *kwargs):
-	-    # FIXME arguments should be treated as a hash, the order could change
-	-    # at any time and break this.
-	-    parts = publish_parts(kwargs[3], writer_name='html',
-	+class IkiwikiWriter(html4css1.Writer):
-	+    def resolve_node(self, node):
-	+        refname = node.get('refname', None)
-	+        if not refname:
-	+            return False
-	+
-	+        bestlink = self.proxy.rpc('bestlink', self.page, refname)
-	+
-	+        node.resolved = 1
-	+        node['class'] = 'wiki'
-	+        del node['refname']
-	+
-	+        if not bestlink:
-	+            rel_url = "#"
-	+        else:
-	+            rel_url = self.proxy.rpc('urlto', bestlink, self.page)
-	+            self.proxy.rpc('add_link', self.page, bestlink)
-	+        node['refuri'] = rel_url
-	+        self.proxy.rpc('debug', "Emitting link %s => %s" % (refname, rel_url))
-	+        return True
-	+
-	+    resolve_node.priority = 1
-	+
-	+    def __init__(self, proxy, page):
-	+        html4css1.Writer.__init__(self)
-	+        self.proxy = proxy
-	+        self.page = page
-	+        self.unknown_reference_resolvers = (self.resolve_node, )
-	+
-	+def rst2html(proxy, *args):
-	+    # args is a list paired by key, value, so we turn it into a dict
-	+    kwargs = dict((k, v) for k, v in zip(*[iter(args)]*2))
-	+    page = kwargs['page']
-	+
-	+    parts = publish_parts(kwargs['content'],
-	+                          writer=IkiwikiWriter(proxy, page),
-	                           settings_overrides = { 'halt_level': 6
-	                                                , 'file_insertion_enabled': 0
-	                                                , 'raw_enabled': 1
-	-- 
-	1.6.4
-
-</pre>
-----
-- 
cgit v1.2.3


From c399f65b627064de80107f8ee695a9a811604bcd Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Mon, 21 Sep 2009 19:39:03 -0400
Subject: a remark about pproc-indent: I'm not a perl coder.

---
 doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 54d9a6c4b..d5c92ed6f 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -108,6 +108,9 @@ picture before it.
 
 Preserving indents in the preprocessor are in branch [pproc-indent][ppi]
 
+(These simple patches come with a warning: _Those are the first lines of
+Perl I've ever written!_)
+
 [ppi]: http://github.com/engla/ikiwiki/commits/pproc-indent
 
 ## Discussion ##
-- 
cgit v1.2.3


From d163b06cd6c4a3018a10ced73ec2e74108c3da2a Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Tue, 22 Sep 2009 07:52:10 -0400
Subject: What is missing: Create-links, htmllink

---
 doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index d5c92ed6f..4bde25bd2 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -76,6 +76,10 @@ Some rst-custom [examples are here](http://kaizer.se/wiki/rst_examples/)
 
 [rst-custom]: http://github.com/engla/ikiwiki/commits/rst-customize
 
+**What is missing?** links to nonexistant pages are not resolved.
+Perhaps the "link resolver" part should use Ikiwiki's htmllink instead
+of its simple subsitutions.
+
 ## Directives ##
 
 Now **Directives**: As it is now, ikiwiki goes though (roughly):
-- 
cgit v1.2.3


From 92b3be2f3ef4123f2e5d9afb761cfd7251c2511d Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Tue, 22 Sep 2009 17:17:11 -0400
Subject: rst-wikilinks uses 'htmllink'

---
 .../Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 4bde25bd2..1782af824 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -65,6 +65,11 @@ Implementation of Proposal-2 wikilinks are in the branch
 
 [rst-wl]: http://github.com/engla/ikiwiki/commits/rst-wikilinks
 
+**rst-wikilinks** patch series includes changes at the end to use ikiwiki's
+'htmllink' for the links (which is the only sane thing to do to work in all configurations).
+This means a :wiki:`Link` should render just exactly like [[Link]] whether
+the target exists or not.
+
 On top of **rst-wikilinks** is [rst-customize][rst-custom] which adds two
 power user features: Global (python) file to read in custom directives
 (unsafe), and a wikifile as "header" file for all parsed .rst files (safe,
@@ -76,10 +81,6 @@ Some rst-custom [examples are here](http://kaizer.se/wiki/rst_examples/)
 
 [rst-custom]: http://github.com/engla/ikiwiki/commits/rst-customize
 
-**What is missing?** links to nonexistant pages are not resolved.
-Perhaps the "link resolver" part should use Ikiwiki's htmllink instead
-of its simple subsitutions.
-
 ## Directives ##
 
 Now **Directives**: As it is now, ikiwiki goes though (roughly):
-- 
cgit v1.2.3


From bac0174b786a10d3cb8277bfa519918bd38762c4 Mon Sep 17 00:00:00 2001
From: brush <brush@web>
Date: Tue, 22 Sep 2009 18:49:03 -0400
Subject: installation attachments q's

---
 doc/plugins/contrib/album/discussion.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/plugins/contrib/album/discussion.mdwn

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
new file mode 100644
index 000000000..ee3aa6ce4
--- /dev/null
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -0,0 +1,7 @@
+thanks for this plugin.  it might help me in my application, which is to provide album/galleries which can be edited (ie. new images added, taken away, etc.) through web interface.
+
+i have two challenges: firstly, for installation, i'm not sure what all the files are that need to be downloaded (because of my setup i can't easily pull the repo).  so far i have Ikiwiki/Plugins/album.pm; ikiwiki-album; and 4 files in templates/  any others?
+
+secondly: barring the CGI interface for editing the album, which would be great, is there at least a way to use attachment plugin or any other to manually add images and then create viewers for them?
+
+i'm new to ikiwiki, apologies if this is dealt with elsewhere.  -brush
-- 
cgit v1.2.3


From 82ad4f57d67fa6a210436621dcb72404a099da8a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 23 Sep 2009 13:33:15 -0400
Subject: response

---
 doc/css/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/css/discussion.mdwn b/doc/css/discussion.mdwn
index c97682e71..dc9663e56 100644
--- a/doc/css/discussion.mdwn
+++ b/doc/css/discussion.mdwn
@@ -8,3 +8,11 @@ I am using ikiwiki_3.1415926.tar.gz installed into /usr/local.
 
 ---
 Sorry. Never mind. RTFM. --refresh duh.
+
+> Hmm, well. Using --refresh is a good thing because it allow ikiwiki to
+> update a site quicker. But, it must only be hiding the real problem.
+> Sounds like you are trying to edit local.css directly inside
+> the destdir. But ikiwiki has a local.css located in its basewiki,
+> so when you rebuild your local mods are lost. Fix is to put you
+> locally modified local.css inside the srcdir, along with the other pages
+> of your wiki. --[[Joey]] 
-- 
cgit v1.2.3


From 01a9a12bbfbc21b45c59e4bbc52fbf488776d386 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 23 Sep 2009 13:46:32 -0400
Subject: auto.setup, auto-blog.setup: Fix sanitization of entered wikiname.
 Closes: #547378

---
 IkiWiki/Setup/Automator.pm | 15 ++++++++++-----
 auto-blog.setup            | 15 ++++++++-------
 auto.setup                 | 15 ++++++++-------
 debian/changelog           |  2 ++
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 742d67666..d1594d7ea 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -24,15 +24,20 @@ sub prettydir ($) {
 	return $dir;
 }
 
-sub import (@) {
-	my $this=shift;
-	IkiWiki::Setup::merge({@_});
+sub sanitize_wikiname ($) {
+	my $wikiname=shift;
 
 	# Sanitize this to avoid problimatic directory names.
-	$config{wikiname}=~s/[^-A-Za-z0-9_]//g;
-	if (! length $config{wikiname}) {
+	$wikiname=~s/[^-A-Za-z0-9_]//g;
+	if (! length $wikiname) {
 		error gettext("you must enter a wikiname (that contains alphanumerics)");
 	}
+	return $wikiname;
+}
+
+sub import (@) {
+	my $this=shift;
+	IkiWiki::Setup::merge({@_});
 
 	# Avoid overwriting any existing files.
 	foreach my $key (qw{srcdir destdir repository dumpsetup}) {
diff --git a/auto-blog.setup b/auto-blog.setup
index 3ef734b39..cf77b3bf7 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -15,6 +15,7 @@ require IkiWiki::Setup::Automator;
 
 our $wikiname=IkiWiki::Setup::Automator::ask(
 	gettext("What will the blog be named?"), gettext("blog"));
+our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
 our $rcs=IkiWiki::Setup::Automator::ask(
 	gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(
@@ -27,13 +28,13 @@ IkiWiki::Setup::Automator->import(
 	wikiname => $wikiname,
 	adminuser => [$admin],
 	rcs => $rcs,
-	srcdir => "$ENV{HOME}/$wikiname",
-	destdir => "$ENV{HOME}/public_html/$wikiname",
-	repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs),
-	dumpsetup => "$ENV{HOME}/$wikiname.setup",
-	url => "http://$domain/~$ENV{USER}/$wikiname",
-	cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
-	cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
+	srcdir => "$ENV{HOME}/$wikiname_short",
+	destdir => "$ENV{HOME}/public_html/$wikiname_short",
+	repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs),
+	dumpsetup => "$ENV{HOME}/$wikiname_short.setup",
+	url => "http://$domain/~$ENV{USER}/$wikiname_short",
+	cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
+	cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",
 	adminemail => "$ENV{USER}\@$domain",
 	add_plugins => [qw{goodstuff websetup comments blogspam}],
 	disable_plugins => [qw{}],
diff --git a/auto.setup b/auto.setup
index b3d2513d9..dc2b19992 100644
--- a/auto.setup
+++ b/auto.setup
@@ -14,6 +14,7 @@ require IkiWiki::Setup::Automator;
 
 our $wikiname=IkiWiki::Setup::Automator::ask(
 	gettext("What will the wiki be named?"), gettext("wiki"));
+our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
 our $rcs=IkiWiki::Setup::Automator::ask(
 	gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(
@@ -26,13 +27,13 @@ IkiWiki::Setup::Automator->import(
 	wikiname => $wikiname,
 	adminuser => [$admin],
 	rcs => $rcs,
-	srcdir => "$ENV{HOME}/$wikiname",
-	destdir => "$ENV{HOME}/public_html/$wikiname",
-	repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs),
-	dumpsetup => "$ENV{HOME}/$wikiname.setup",
-	url => "http://$domain/~$ENV{USER}/$wikiname",
-	cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
-	cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
+	srcdir => "$ENV{HOME}/$wikiname_short",
+	destdir => "$ENV{HOME}/public_html/$wikiname_short",
+	repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs),
+	dumpsetup => "$ENV{HOME}/$wikiname_short.setup",
+	url => "http://$domain/~$ENV{USER}/$wikiname_short",
+	cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
+	cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",
 	adminemail => "$ENV{USER}\@$domain",
 	add_plugins => [qw{goodstuff websetup}],
 	disable_plugins => [qw{}],
diff --git a/debian/changelog b/debian/changelog
index be7c97119..bcdbd865c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
   * Updated Czech translation from Miroslav Kure. Closes: #546223
   * rsync: New plugin that allows pushing the destdir to a remote host
     via rsync or similar. Thanks, Amitai Schlair.
+  * auto.setup, auto-blog.setup: Fix sanitization of entered wikiname.
+    Closes: #547378
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
 
-- 
cgit v1.2.3


From 3f5a646a41bf00cd9ad3d99be214434dee10787a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 23 Sep 2009 14:56:18 -0400
Subject: avoid ugly messages when running ikiwiki -setup on a *directory*

---
 IkiWiki/Setup.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 6ee112096..8a25ecc57 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -20,8 +20,9 @@ sub load ($) {
 	my $code;
 	{
 		local $/=undef;
-		$code=<IN>;
+		$code=<IN> || error("$setup: $!");
 	}
+	
 	($code)=$code=~/(.*)/s;
 	close IN;
 
-- 
cgit v1.2.3


From 34991b7d35a3e0e4c42fcd0c946e2ef8265245de Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 23 Sep 2009 15:11:51 -0400
Subject: otl: Avoid globally filtering non-otl pages

Through a complex chain of circumstances, that filtering was causing
dumpsetup to trigger undefined warning messages from the po plugin. But
anyway, munging the otl in htmlize is less error-prone and less expensive,
a win all around.
---
 IkiWiki/Plugin/otl.pm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm
index c68fcbbe3..3ab2441bf 100644
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -9,9 +9,7 @@ use open qw{:utf8 :std};
 
 sub import {
 	hook(type => "getsetup", id => "otl", call => \&getsetup);
-	hook(type => "filter", id => "otl", call => \&filter);
 	hook(type => "htmlize", id => "otl", call => \&htmlize);
-
 }
 
 sub getsetup () {
@@ -22,22 +20,16 @@ sub getsetup () {
 		},
 }
 
-sub filter (@) {
+sub htmlize (@) {
 	my %params=@_;
-        
-	# Munge up check boxes to look a little bit better. This is a hack.
+	
+	# Munge up check boxes to look a little bit better.
 	my $checked=htmllink($params{page}, $params{page},
 		"smileys/star_on.png", linktext => "[X]");
 	my $unchecked=htmllink($params{page}, $params{page},
 		"smileys/star_off.png", linktext => "[_]");
 	$params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
 	$params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg;
-        
-	return $params{content};
-}
-
-sub htmlize (@) {
-	my %params=@_;
 
 	# Can't use open2 since otl2html doesn't play nice with buffering.
 	# Instead, fork off a child process that will run otl2html and feed
-- 
cgit v1.2.3


From 655e2ddc1f44236d3396be722d55a0afd755d39d Mon Sep 17 00:00:00 2001
From: NicolasLimare <NicolasLimare@web>
Date: Thu, 24 Sep 2009 06:22:13 -0400
Subject: images are not always scaled *down*

---
 doc/ikiwiki/directive/img.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/img.mdwn b/doc/ikiwiki/directive/img.mdwn
index 66efd008e..94cc754bd 100644
--- a/doc/ikiwiki/directive/img.mdwn
+++ b/doc/ikiwiki/directive/img.mdwn
@@ -22,7 +22,7 @@ You can also pass `alt`, `title`, `class`, `align` and `id` parameters.
 These are passed through unchanged to the html img tag. If you include a
 `caption` parameter, the caption will be displayed centered beneath the image.
 
-The `link` parameter is used to control whether the scaled down image links
+The `link` parameter is used to control whether the scaled image links
 to the full size version. By default it does; set "link=somepage" to link
 to another page instead, or "link=no" to disable the link, or
 "link=http://url" to link to a given url.
-- 
cgit v1.2.3


From 095a385c99eed6c3cba931bc8c14fa00827b5f7a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 24 Sep 2009 19:04:42 -0400
Subject: releasing version 3.14159265

---
 debian/NEWS      |  2 +-
 debian/changelog |  4 +--
 debian/control   |  2 +-
 po/bg.po         | 68 ++++++++++++++++++++++++++--------------------
 po/cs.po         | 83 ++++++++++++++++++++++++++++++++------------------------
 po/da.po         | 68 ++++++++++++++++++++++++++--------------------
 po/de.po         | 68 ++++++++++++++++++++++++++--------------------
 po/es.po         | 68 ++++++++++++++++++++++++++--------------------
 po/fr.po         | 68 ++++++++++++++++++++++++++--------------------
 po/gu.po         | 68 ++++++++++++++++++++++++++--------------------
 po/ikiwiki.pot   | 68 ++++++++++++++++++++++++++--------------------
 po/it.po         | 68 ++++++++++++++++++++++++++--------------------
 po/pl.po         | 68 ++++++++++++++++++++++++++--------------------
 po/sv.po         | 68 ++++++++++++++++++++++++++--------------------
 po/vi.po         | 68 ++++++++++++++++++++++++++--------------------
 15 files changed, 480 insertions(+), 359 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 535708872..808105fd5 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (3.1415926) UNRELEASED; urgency=low
+ikiwiki (3.1415926) unstable; urgency=low
 
   In order to fix a performance bug, all wikis need to be rebuilt on
   upgrade to this version. If you listed your wiki in
diff --git a/debian/changelog b/debian/changelog
index bcdbd865c..d50d31721 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.14159265) UNRELEASED; urgency=low
+ikiwiki (3.14159265) unstable; urgency=low
 
   * Add complete French basewiki and underlays translation from the Debian
     French l10n team, including Philippe Batailler, Alexandre Dupas, and
@@ -17,7 +17,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
   * auto.setup, auto-blog.setup: Fix sanitization of entered wikiname.
     Closes: #547378
 
- -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 24 Sep 2009 18:50:43 -0400
 
 ikiwiki (3.1415926) unstable; urgency=high
 
diff --git a/debian/control b/debian/control
index 5a0acf4c4..3e2fdc537 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libfile-chdir-perl
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
 Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki
diff --git a/po/bg.po b/po/bg.po
index d21205272..88d66b072 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr ""
 
@@ -51,11 +51,11 @@ msgstr ""
 msgid "Preferences saved."
 msgstr "Предпочитанията са запазени."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Грешка"
 
@@ -137,7 +137,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "готово"
 
@@ -348,18 +348,18 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -875,6 +875,16 @@ msgstr ""
 msgid "update for rename of %s to %s"
 msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "грешка при запис на файла „%s”: %s"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1026,12 +1036,12 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
@@ -1095,20 +1105,20 @@ msgstr "ikiwiki: неуспех при обновяване на страниц
 msgid "cannot read %s: %s"
 msgstr "грешка при четене на „%s”: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1127,13 +1137,13 @@ msgid "wrapper filename not specified"
 msgstr "не е указан файл на обвивката"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "крешка при компилиране на файла %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "успешно генериране на %s"
@@ -1154,43 +1164,43 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Дискусия"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
@@ -1203,15 +1213,15 @@ msgstr ""
 msgid "wiki"
 msgstr ""
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr ""
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 0248d5f18..9bd80d2bb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -24,14 +24,14 @@ msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
-"pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale E"
-"zkoušíte se přihlásit přes http a ne přes https"
+"pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale "
+"Ezkoušíte se přihlásit přes http a ne přes https"
 
 #: ../IkiWiki/CGI.pm:149
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "přihlášení selhalo; možná si musíte povolit cookies?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr "Vaše sezení expirovalo."
 
@@ -51,11 +51,11 @@ msgstr "Správce"
 msgid "Preferences saved."
 msgstr "Nastavení uloženo."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Chyba"
 
@@ -136,7 +136,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr "mažu bucket..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "hotovo"
 
@@ -341,18 +341,18 @@ msgstr "není stránkou"
 msgid "%s is an attachment, not a page."
 msgstr "%s není ani příloha, ani stránka."
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "nejste oprávněni měnit %s"
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
@@ -612,8 +612,8 @@ msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
-"Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, budou "
-"odstraněny také její překlady."
+"Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
+"budou odstraněny také její překlady."
 
 #: ../IkiWiki/Plugin/po.pm:470
 msgid ""
@@ -857,6 +857,16 @@ msgstr "přejmenování %s na %s"
 msgid "update for rename of %s to %s"
 msgstr "aktualizace pro přejmenování %s na %s"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "nepodařilo se přečíst %s"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -999,14 +1009,15 @@ msgstr ""
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
-"Chyba: %s skončil s nenulovým návratovým kódem (%s). Ruším změny v konfiguraci"
+"Chyba: %s skončil s nenulovým návratovým kódem (%s). Ruším změny v "
+"konfiguraci"
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr "nemohu určit identitu nedůvěryhodného uživatele %s"
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, perl-format
 msgid "bad file name %s"
 msgstr "chybné jméno souboru %s"
@@ -1017,8 +1028,8 @@ msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
-"v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-li "
-"to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
+"v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-"
+"li to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
 
 #: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
 #, perl-format
@@ -1072,20 +1083,20 @@ msgstr "ikiwiki: nelze sestavit %s"
 msgid "cannot read %s: %s"
 msgstr "nemohu číst %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)"
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nepodporovaný systém pro správu verzí: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:"
@@ -1104,13 +1115,13 @@ msgid "wrapper filename not specified"
 msgstr "jméno souboru s obalem nebylo zadáno"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "nelze zkompilovat %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s byl úspěšně vytvořen"
@@ -1131,41 +1142,41 @@ msgstr "použití: --set proměnná=hodnota"
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "znovusestavuji wiki..."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskuse"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr "nelze použít několik rcs modulů"
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
@@ -1178,15 +1189,15 @@ msgstr "Jak se bude wiki jmenovat?"
 msgid "wiki"
 msgstr "wiki"
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr "Který systém pro správu verzí se má použít?"
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr "Který uživatel (wiki účet nebo openid) bude správce?"
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr "Jaké je doménové jméno webového serveru?"
 
diff --git a/po/da.po b/po/da.po
index c7cbbb352..b15cb27ff 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr "Din kørsel (login session) er udløbet"
 
@@ -55,11 +55,11 @@ msgstr "Admin"
 msgid "Preferences saved."
 msgstr "Indstillinger gemt"
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Fejl"
 
@@ -140,7 +140,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "færdig"
 
@@ -349,18 +349,18 @@ msgstr "kan ikke få sider til at passe sammen: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Du har ikke lov til at ændre %s"
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "du kan ikke påvirke en fil med modus %s"
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
@@ -872,6 +872,16 @@ msgstr "omdøb %s til %s"
 msgid "update for rename of %s to %s"
 msgstr "opdatering til omdøbning af %s til %s"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "læsning af %s mislykkedes"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1017,12 +1027,12 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, perl-format
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
@@ -1088,20 +1098,20 @@ msgstr "ikiwiki: kan ikke danne %s"
 msgid "cannot read %s: %s"
 msgstr "kan ikke læse %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)"
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "revisionskontrolsystem %s ikke understøttet"
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes"
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:"
@@ -1120,13 +1130,13 @@ msgid "wrapper filename not specified"
 msgstr "wrapper-navn ikke angivet"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "kompilering af %s mislykkedes"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "Korrekt bygget %s"
@@ -1147,42 +1157,42 @@ msgstr "brug: --set var=værdi"
 msgid "generating wrappers.."
 msgstr "bygger wrappers.."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
@@ -1195,15 +1205,15 @@ msgstr "Hvad skal wikien hedde?"
 msgid "wiki"
 msgstr "wiki"
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr "Hvilket revisionskontrolsystem skal bruges?"
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er webserverens domænenavn?"
 
diff --git a/po/de.po b/po/de.po
index 13a7355bb..fb9e3964d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -32,7 +32,7 @@ msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr "Ihre Anmeldezeit ist abgelaufen."
 
@@ -52,11 +52,11 @@ msgstr "Administrator"
 msgid "Preferences saved."
 msgstr "Einstellungen gespeichert."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Fehler"
 
@@ -137,7 +137,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr "lösche Behälter (bucket)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "fertig"
 
@@ -347,18 +347,18 @@ msgstr "Kann die Seiten nicht zuordnen: %s"
 msgid "%s is an attachment, not a page."
 msgstr "Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Sie dürfen %s nicht verändern"
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
@@ -878,6 +878,16 @@ msgstr "benenne %s in %s um"
 msgid "update for rename of %s to %s"
 msgstr "aktualisiert zum Umbenennen von %s nach %s"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "lesen von %s fehlgeschlagen"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1025,13 +1035,13 @@ msgstr ""
 "Fehler: %s endet mit nicht Null (%s). Die Änderungen an der Konfiguration "
 "wurden verworfen."
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 "id des nicht vertrauenswürdigen Absenders %s konnte nicht feststellt werden"
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, perl-format
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
@@ -1097,21 +1107,21 @@ msgstr "ikiwiki: kann %s nicht erzeugen"
 msgid "cannot read %s: %s"
 msgstr "kann %s nicht lesen: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)"
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nicht unterstütztes Versionskontrollsystem %s"
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen"
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1132,13 +1142,13 @@ msgid "wrapper filename not specified"
 msgstr "Dateiname des Wrappers nicht angegeben"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "erzeugen von %s fehlgeschlagen"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s wurde erfolgreich erstellt"
@@ -1159,44 +1169,44 @@ msgstr "Aufruf: --set Variable=Wert"
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper.."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
@@ -1209,15 +1219,15 @@ msgstr "Wie soll das Wiki heißen?"
 msgid "wiki"
 msgstr "Wiki"
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr "Welches Versionskontrollsystem soll verwandt werden?"
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?"
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
 
diff --git a/po/es.po b/po/es.po
index 56d7e62bd..f9497325e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -36,7 +36,7 @@ msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr "Su registro en el sistema ha expirado."
 
@@ -56,11 +56,11 @@ msgstr "Administración"
 msgid "Preferences saved."
 msgstr "Las preferencias se han guardado."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Error"
 
@@ -142,7 +142,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "completado"
 
@@ -351,18 +351,18 @@ msgstr "no encuentro páginas coincidentes: %s"
 msgid "%s is an attachment, not a page."
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No puede cambiar %s"
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "no puede actuar sobre un archivo con permisos %s"
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
@@ -875,6 +875,16 @@ msgstr "%s cambia de nombre a %s"
 msgid "update for rename of %s to %s"
 msgstr "actualizado el cambio de nombre de %s a %s"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "no puedo leer de %s: %s "
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1026,12 +1036,12 @@ msgstr ""
 "Error: el programa %s finaliza con un código mayor que cero (%s). Descarto "
 "los cambios en la configuración."
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, perl-format
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
@@ -1099,20 +1109,20 @@ msgstr "ikiwiki: no puedo convertir la página %s"
 msgid "cannot read %s: %s"
 msgstr "no puedo leer el archivo %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)"
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "el sistema de control de versiones %s no está soportado"
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1133,13 +1143,13 @@ msgid "wrapper filename not specified"
 msgstr "el programa envoltorio no ha sido especificado"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "ha fallado la compilación del programa %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "creado con éxito el programa envoltorio %s"
@@ -1160,45 +1170,45 @@ msgstr "uso: --set variable=valor"
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
@@ -1211,18 +1221,18 @@ msgstr "¿ Qué nombre tendrá el wiki ?"
 msgid "wiki"
 msgstr "wiki"
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr "¿ Qué sistema de control de versiones empleará ?"
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 #, fuzzy
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 "¿ Qué usuario del wiki (ó qué identificador openid) será el empleado como "
 "administrador ? "
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
diff --git a/po/fr.po b/po/fr.po
index 75142e55c..19a6c103b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Échec de l'identification, vous devez autoriser les cookies."
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr "Session d'authentification expirée."
 
@@ -53,11 +53,11 @@ msgstr "Administrateur"
 msgid "Preferences saved."
 msgstr "Les préférences ont été enregistrées."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Erreur"
 
@@ -138,7 +138,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "Suppression du compartiment S3 (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "Terminé"
 
@@ -343,18 +343,18 @@ msgstr "Ce n'est pas une page."
 msgid "%s is an attachment, not a page."
 msgstr "%s est une pièce jointe, pas une page."
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Vous n'êtes pas autorisé à modifier %s"
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
@@ -876,6 +876,16 @@ msgstr "Renomme %s en %s"
 msgid "update for rename of %s to %s"
 msgstr "mise à jour, suite au changement de %s en %s"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "Impossible de lire %s"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1021,13 +1031,13 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées."
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 "Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)"
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, perl-format
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
@@ -1093,22 +1103,22 @@ msgstr "ikiwiki : impossible de reconstruire %s"
 msgid "cannot read %s: %s"
 msgstr "Lecture impossible de %s : %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Vous devez spécifier un nom de wiki (contenant des caractères "
 "alphanumériques)"
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "Système de contrôle de version non reconnu : %s"
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1130,13 +1140,13 @@ msgid "wrapper filename not specified"
 msgstr "Le nom du fichier CGI n'a pas été indiqué"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Échec de la compilation de %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s a été créé avec succès"
@@ -1157,42 +1167,42 @@ msgstr "Syntaxe : -- set var=valeur"
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
@@ -1205,15 +1215,15 @@ msgstr "Nom du wiki :"
 msgid "wiki"
 msgstr "wiki"
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr "Système de contrôle de version utilisé :"
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
diff --git a/po/gu.po b/po/gu.po
index 9dd1d0114..cdb613f9d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr ""
 
@@ -50,11 +50,11 @@ msgstr ""
 msgid "Preferences saved."
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -135,7 +135,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -346,18 +346,18 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -865,6 +865,16 @@ msgstr ""
 msgid "update for rename of %s to %s"
 msgstr "%s નો સુધારો %s નાં %s વડે"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "%s વાંચવામાં નિષ્ફળ: %s"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1012,12 +1022,12 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
@@ -1081,20 +1091,20 @@ msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
 msgid "cannot read %s: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1113,13 +1123,13 @@ msgid "wrapper filename not specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
@@ -1140,41 +1150,41 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
@@ -1187,15 +1197,15 @@ msgstr ""
 msgid "wiki"
 msgstr ""
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr ""
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 7903fa19d..1190ffd52 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr ""
 
@@ -50,11 +50,11 @@ msgstr ""
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr ""
 
@@ -338,18 +338,18 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -845,6 +845,16 @@ msgstr ""
 msgid "update for rename of %s to %s"
 msgstr ""
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -986,12 +996,12 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, perl-format
 msgid "bad file name %s"
 msgstr ""
@@ -1055,20 +1065,20 @@ msgstr ""
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1087,13 +1097,13 @@ msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -1114,41 +1124,41 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
@@ -1161,14 +1171,14 @@ msgstr ""
 msgid "wiki"
 msgstr ""
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr ""
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index a44199dae..72ebeb033 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr "La sessione è scaduta."
 
@@ -49,11 +49,11 @@ msgstr "Amministrazione"
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Errore"
 
@@ -135,7 +135,7 @@ msgstr "creazione nuova pagina %s"
 msgid "deleting bucket.."
 msgstr "eliminazione contenitore..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "fatto"
 
@@ -340,18 +340,18 @@ msgstr "non è una pagina"
 msgid "%s is an attachment, not a page."
 msgstr "%s è un allegato, non una pagina."
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "non è permesso modificare %s"
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "non è permesso lavorare su un file in modalità %s"
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
@@ -870,6 +870,16 @@ msgstr "rinomina %s in %s"
 msgid "update for rename of %s to %s"
 msgstr "aggiornamento per rinomina di %s in %s"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "impossibile leggere %s"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1015,12 +1025,12 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr "impossibile determinare l'id del committer non fidato %s"
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, perl-format
 msgid "bad file name %s"
 msgstr "nome file %s scorretto"
@@ -1086,20 +1096,20 @@ msgstr "ikiwiki: impossibile compilare %s"
 msgid "cannot read %s: %s"
 msgstr "impossibile leggere %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)"
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "sistema di controllo di revisione %s non supportato"
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "impossibile creare un repository tramite ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1119,13 +1129,13 @@ msgid "wrapper filename not specified"
 msgstr "nome del file del contenitore non specificato"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "errore nel compilare %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s generato con successo"
@@ -1146,41 +1156,41 @@ msgstr "utilizzo: --set var=valore"
 msgid "generating wrappers.."
 msgstr "generazione contenitori..."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "ricostruzione wiki..."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Discussione"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr "impossibile usare più plugin rcs"
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
@@ -1193,15 +1203,15 @@ msgstr "Quale sarà il nome del wiki?"
 msgid "wiki"
 msgstr "wiki"
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr "Che sistema di controllo di revisione usare?"
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr "Qual è il nome del dominio del server web?"
 
diff --git a/po/pl.po b/po/pl.po
index 23f1af5f6..f3c752aea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -32,7 +32,7 @@ msgstr ""
 "Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są "
 "ciasteczka (ang. cookies)"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr ""
 
@@ -53,11 +53,11 @@ msgstr ""
 msgid "Preferences saved."
 msgstr "Preferencje zapisane."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Błąd"
 
@@ -139,7 +139,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "gotowe"
 
@@ -350,18 +350,18 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -880,6 +880,16 @@ msgstr ""
 msgid "update for rename of %s to %s"
 msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "awaria w trakcie odczytu %s: %s"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1034,12 +1044,12 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
@@ -1103,20 +1113,20 @@ msgstr "ikiwiki: awaria w trakcie tworzenia %s"
 msgid "cannot read %s: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1135,13 +1145,13 @@ msgid "wrapper filename not specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "awaria w trakcie kompilowania %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "pomyślnie utworzono %s"
@@ -1162,43 +1172,43 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Dyskusja"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
@@ -1211,15 +1221,15 @@ msgstr ""
 msgid "wiki"
 msgstr ""
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr ""
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index b81830763..6424c6df2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr ""
 
@@ -50,11 +50,11 @@ msgstr ""
 msgid "Preferences saved."
 msgstr "Inställningar sparades."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Fel"
 
@@ -136,7 +136,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "klar"
 
@@ -347,18 +347,18 @@ msgstr "kan inte läsa %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -870,6 +870,16 @@ msgstr ""
 msgid "update for rename of %s to %s"
 msgstr "uppdatering av %s, %s av %s"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "misslyckades med att skriva %s: %s"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1021,12 +1031,12 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
@@ -1090,20 +1100,20 @@ msgstr "ikiwiki: kan inte rita upp %s"
 msgid "cannot read %s: %s"
 msgstr "kan inte läsa %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1122,13 +1132,13 @@ msgid "wrapper filename not specified"
 msgstr "filnamn för wrapper har inte angivits"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "misslyckades med att kompilera %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "generering av %s lyckades"
@@ -1149,41 +1159,41 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
@@ -1196,15 +1206,15 @@ msgstr ""
 msgid "wiki"
 msgstr ""
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr ""
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 6f50e2c65..8e6edd432 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 15:25-0400\n"
+"POT-Creation-Date: 2009-09-24 18:53-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
 msgid "Your login session has expired."
 msgstr ""
 
@@ -51,11 +51,11 @@ msgstr ""
 msgid "Preferences saved."
 msgstr "Tùy thích đã được lưu."
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:277
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
 msgid "Error"
 msgstr "Lỗi"
 
@@ -137,7 +137,7 @@ msgstr "đang tạo trang mới %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "xong"
 
@@ -348,18 +348,18 @@ msgstr "không thể đọc %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:685
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:689
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -871,6 +871,16 @@ msgstr ""
 msgid "update for rename of %s to %s"
 msgstr "cập nhật %2$s của %1$s bởi %3$s"
 
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, fuzzy, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr "lỗi ghi %s: %s"
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
@@ -1022,12 +1032,12 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
@@ -1091,20 +1101,20 @@ msgstr "ikiwiki: không thể vẽ %s"
 msgid "cannot read %s: %s"
 msgstr "không thể đọc %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:34
+#: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:71
+#: ../IkiWiki/Setup/Automator.pm:76
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:97
+#: ../IkiWiki/Setup/Automator.pm:102
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:120
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1123,13 +1133,13 @@ msgid "wrapper filename not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:148
 #, perl-format
 msgid "failed to compile %s"
 msgstr "lỗi biên dịch %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:168
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s đã được tạo ra"
@@ -1150,41 +1160,41 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
-#: ../IkiWiki.pm:225
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Thảo luận"
 
-#: ../IkiWiki.pm:494
+#: ../IkiWiki.pm:502
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
-#: ../IkiWiki.pm:540
+#: ../IkiWiki.pm:548
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:569
+#: ../IkiWiki.pm:577
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1251
+#: ../IkiWiki.pm:1259
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1808
+#: ../IkiWiki.pm:1817
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1941
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
@@ -1197,15 +1207,15 @@ msgstr ""
 msgid "wiki"
 msgstr ""
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr ""
 
-#: ../auto.setup:20
+#: ../auto.setup:21
 msgid "Which user (wiki account or openid) will be admin?"
 msgstr ""
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""
 
-- 
cgit v1.2.3


From 9540b7e5715ae5886345cdd9c392a92550f7b4bd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 24 Sep 2009 19:05:58 -0400
Subject: add news item for ikiwiki 3.14159265

---
 doc/news/version_3.141.mdwn      | 28 ----------------------------
 doc/news/version_3.14159265.mdwn | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 28 deletions(-)
 delete mode 100644 doc/news/version_3.141.mdwn
 create mode 100644 doc/news/version_3.14159265.mdwn

diff --git a/doc/news/version_3.141.mdwn b/doc/news/version_3.141.mdwn
deleted file mode 100644
index ac76ce023..000000000
--- a/doc/news/version_3.141.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-ikiwiki 3.141 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * comment: Make comment directives no longer use the internal "\_comment"
-     form, and document the comment directive syntax.
-   * Avoid relying on translators preserving the case when translating
-     "discussion", which caused Discussion pages to get unwanted Discussion
-     links.
-   * Tighten up matching of bare words inside directives; do not
-     allow an unterminated triple string to be treated as a series
-     of bare words. Fixes runaway regexp recursion/backtracking
-     in strange situations.
-   * Setup automator: Check that each plugin added to the generated
-     setup file can be loaded and that its config is ok. If a plugin
-     fails for any reason, disable it in the generated file.
-     Closes: [532001](http://bugs.debian.org/532001)
-   * pagecount: Fix broken optimisation for * pagespec.
-   * goto: Support being passed a page title that is not a valid page
-     name, to support several cases including mercurial's long user
-     names on the RecentChanges page, and urls with spaces being handled
-     by the 404 plugin.
-   * Optimise use of gettext, and avoid ugly warnings if Locale::gettext
-     is not available. Closes: #[532285](http://bugs.debian.org/532285)
-   * meta: Add openid delegate parameter to allow delegating only
-     openid or openid2.
-   * Disable the Preferences link if no plugin with an auth hook is enabled.
-   * Updated French translation. Closes: #[532654](http://bugs.debian.org/532654)
-   * aggregate: Fix storing of changed md5.
-   * aggregate: Avoid resetting ctime when an item md5 changes."""]]
diff --git a/doc/news/version_3.14159265.mdwn b/doc/news/version_3.14159265.mdwn
new file mode 100644
index 000000000..ed46b09ea
--- /dev/null
+++ b/doc/news/version_3.14159265.mdwn
@@ -0,0 +1,18 @@
+ikiwiki 3.14159265 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Add complete French basewiki and underlays translation from the Debian
+     French l10n team, including Philippe Batailler, Alexandre Dupas, and
+     Steve Petruzzello.
+   * Expand banned\_users; it can now include PageSpecs, which
+     allows banning by IP address.
+   * underlay: Also allow configuring additional directories to search
+     for template files in.
+   * Fix parsing web commits from ipv6 addresses.
+   * Add genwrapper hook, that can be used to add code into the C wrapper.
+   * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by
+     Amitai Schlair.
+   * Updated Czech translation from Miroslav Kure. Closes: #[546223](http://bugs.debian.org/546223)
+   * rsync: New plugin that allows pushing the destdir to a remote host
+     via rsync or similar. Thanks, Amitai Schlair.
+   * auto.setup, auto-blog.setup: Fix sanitization of entered wikiname.
+     Closes: #[547378](http://bugs.debian.org/547378)"""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 0b0116cb986bf5840c8e40e57f5a45501c3d22f6 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 25 Sep 2009 06:35:43 +0200
Subject: create myself a user page

and link from my signatures so far
---
 doc/forum/How_does_ikiwiki_remember_times__63__.mdwn | 1 +
 doc/plugins/tag/discussion.mdwn                      | 2 +-
 doc/users/David_Riebenbauer.mdwn                     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 doc/users/David_Riebenbauer.mdwn

diff --git a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
index df9636a1e..6ce576db1 100644
--- a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
+++ b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
@@ -106,3 +106,4 @@ Do I have it right?
     
     done
 
+> --[[David_Riebenbauer]]
diff --git a/doc/plugins/tag/discussion.mdwn b/doc/plugins/tag/discussion.mdwn
index b6dab5358..03dcb7b2f 100644
--- a/doc/plugins/tag/discussion.mdwn
+++ b/doc/plugins/tag/discussion.mdwn
@@ -16,7 +16,7 @@ Thanks. That works fine.
 
 @Ben: could you publish the code for that?
 
---David Riebenbauer <davrieb@htu.tugraz.at>
+--[[David_Riebenbauer]]
 
 AOLMODE=true echo "I too would really like this feature, which would make cgi free life much 
 better" --[[DavidBremner]]
diff --git a/doc/users/David_Riebenbauer.mdwn b/doc/users/David_Riebenbauer.mdwn
new file mode 100644
index 000000000..657314ee1
--- /dev/null
+++ b/doc/users/David_Riebenbauer.mdwn
@@ -0,0 +1,2 @@
+Runs ikiwiki on his [homepage](http://liegesta.at/) and can be reached through
+davrieb@liegesta.at
-- 
cgit v1.2.3


From 9106d3218c7b32f3fe74aab4ff044e7449a8d4da Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 25 Sep 2009 06:48:39 +0200
Subject: fix email address linking

---
 doc/users/David_Riebenbauer.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/David_Riebenbauer.mdwn b/doc/users/David_Riebenbauer.mdwn
index 657314ee1..372a28588 100644
--- a/doc/users/David_Riebenbauer.mdwn
+++ b/doc/users/David_Riebenbauer.mdwn
@@ -1,2 +1,2 @@
 Runs ikiwiki on his [homepage](http://liegesta.at/) and can be reached through
-davrieb@liegesta.at
+<davrieb@liegesta.at>
-- 
cgit v1.2.3


From be47e501c32cec7660129f430a4f93ee7fe8d3ff Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 25 Sep 2009 14:19:49 -0400
Subject: reply to potential album user

---
 doc/plugins/contrib/album/discussion.mdwn | 46 +++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index ee3aa6ce4..7a3c19cf6 100644
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -1,7 +1,53 @@
 thanks for this plugin.  it might help me in my application, which is to provide album/galleries which can be edited (ie. new images added, taken away, etc.) through web interface.
 
+> That's my goal eventually, too. Perhaps you can help to
+> design/write this plugin? At the moment I'm mostly
+> waiting for a design "sanity check" from [[Joey]],
+> but any feedback you can provide on the design would
+> also be helpful. --[[smcv]]
+
 i have two challenges: firstly, for installation, i'm not sure what all the files are that need to be downloaded (because of my setup i can't easily pull the repo).  so far i have Ikiwiki/Plugins/album.pm; ikiwiki-album; and 4 files in templates/  any others?
 
+> Those are all the added files; ikiwiki-album isn't strictly
+> needed (IkiWiki itself doesn't use that code, but you can
+> use it to turn a directory full of images into correct
+> input for the album plugin).
+>
+> You probably also want the album plugin's expanded version of
+> style.css (or put its extra rules in your local.css).
+> Without that, your albums will be quite ugly.
+>
+> There aren't currently any other files modified by my branch.
+> --[[smcv]]
+
 secondly: barring the CGI interface for editing the album, which would be great, is there at least a way to use attachment plugin or any other to manually add images and then create viewers for them?
 
+> Images are just attachments, and viewers are pages (any supported
+> format, but .html will be fastest to render). Attach each image,
+> then write a page for each image containing the
+> \[[!albumimage]] directive (usually it will *only* contain that
+> directive).
+>
+> The script ikiwiki-album can help you to do this in a git/svn/etc.
+> tree; doing it over the web will be a lot of work (until I get
+> the CGI interface written), but it should already be possible!
+>
+> The structure is something like this:
+> 
+> * album.mdwn (contains the \[[!album]] directive, and perhaps also
+>   some \[[!albumsection]] directives)
+> * album/a.jpg
+> * album/a.html (contains the \[[!albumimage]] directive for a.jpg)
+> * album/b.jpg
+> * album/b.html (contains the \[[!albumimage]] directive for b.jpg)
+>
+> Have a look at ikiwiki-album to see how the directives are meant to
+> work in practice.
+>
+> --[[smcv]]
+
 i'm new to ikiwiki, apologies if this is dealt with elsewhere.  -brush
+
+> This plugin is pretty ambitious, and is unfinished, so I'd recommend
+> playing with  a normal IkiWiki installation for a bit, then trying
+> out this plugin when you've mastered the basics of IkiWiki. --[[smcv]]
-- 
cgit v1.2.3


From 9d96253d2b10f5bf56b7bd64635754508d969cb6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 25 Sep 2009 15:41:13 -0400
Subject: add comments page to example blog, listing all comments

---
 doc/examples/blog/comments.mdwn | 3 +++
 doc/examples/blog/index.mdwn    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 doc/examples/blog/comments.mdwn

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
new file mode 100644
index 000000000..c46f95df7
--- /dev/null
+++ b/doc/examples/blog/comments.mdwn
@@ -0,0 +1,3 @@
+This page will show all comments made to posts in my [[blog|index]].
+
+[[!inline pages="*/Discussion or internal(./posts/*/comment_*)"]]
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 84c732dd1..aef46eb68 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -3,7 +3,7 @@
 Welcome to my blog.
 
 Have a look at the most recent posts below, or browse the tag cloud on the
-right. An archive of all [[posts]] is also available.
+right. Archives of all [[posts]] and all [[comments]] are also available.
 
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
-- 
cgit v1.2.3


From 5b14129e0b03e66013c8ab2adbf65cae00b623fd Mon Sep 17 00:00:00 2001
From: "95.88.220.68" <95.88.220.68@web>
Date: Fri, 25 Sep 2009 18:59:26 -0400
Subject: poll vote (Accept only password logins)

---
 doc/news/openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 79eeaec01..d61266133 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 63 "Accept only OpenID for logins" 20 "Accept only password logins" 36 "Accept both"]]
+[[!poll 63 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]]
-- 
cgit v1.2.3


From 490b17dc1582c7ce4e9f9a78c10954b10ee7c2a2 Mon Sep 17 00:00:00 2001
From: "121.21.240.138" <121.21.240.138@web>
Date: Fri, 25 Sep 2009 23:25:19 -0400
Subject: poll vote (Accept only OpenID for logins)

---
 doc/news/openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index d61266133..4f1ee7bf7 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 63 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]]
+[[!poll 64 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]]
-- 
cgit v1.2.3


From cd296bb7762f8fc2f2e767e9d3c54a00ee1fb063 Mon Sep 17 00:00:00 2001
From: "http://openid2.kisikew.org/simonraven"
 <http://openid2.kisikew.org/simonraven@web>
Date: Sat, 26 Sep 2009 15:02:52 -0400
Subject:

---
 doc/users/simonraven.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/users/simonraven.mdwn b/doc/users/simonraven.mdwn
index 5fc24711e..85c530fbe 100644
--- a/doc/users/simonraven.mdwn
+++ b/doc/users/simonraven.mdwn
@@ -6,3 +6,8 @@ New ikiwiki site at my web site, blog, kisikew.org home site, for indigenews, an
 
 Maintain my own branch, partly to learn about VCS, git, ikiwiki, Debian packaging, and Perl. I don't recommend anyone pull from it, as I use third-party plugins included on this site that people may not want in a default installation of ikiwiki. This is why I don't push to Joey's -- so it's nothing personal, I just don't want to mess things up for other people, from my mistakes and stumbles.
 
+### Logins here
+
+[[http://openid2.kisikew.org/simonraven|http://openid2.kisikew.org/simonraven]]
+
+[[simonraven|simonraven]]
-- 
cgit v1.2.3


From 3440a015ba7f4995f5a9c54c5ffff4aeec54ca54 Mon Sep 17 00:00:00 2001
From: "http://openid2.kisikew.org/simonraven"
 <http://openid2.kisikew.org/simonraven@web>
Date: Sat, 26 Sep 2009 15:05:57 -0400
Subject:

---
 doc/users/simonraven.mdwn | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/users/simonraven.mdwn b/doc/users/simonraven.mdwn
index 85c530fbe..5fc24711e 100644
--- a/doc/users/simonraven.mdwn
+++ b/doc/users/simonraven.mdwn
@@ -6,8 +6,3 @@ New ikiwiki site at my web site, blog, kisikew.org home site, for indigenews, an
 
 Maintain my own branch, partly to learn about VCS, git, ikiwiki, Debian packaging, and Perl. I don't recommend anyone pull from it, as I use third-party plugins included on this site that people may not want in a default installation of ikiwiki. This is why I don't push to Joey's -- so it's nothing personal, I just don't want to mess things up for other people, from my mistakes and stumbles.
 
-### Logins here
-
-[[http://openid2.kisikew.org/simonraven|http://openid2.kisikew.org/simonraven]]
-
-[[simonraven|simonraven]]
-- 
cgit v1.2.3


From 217141eb1a12d5f49616f907c127b74d9d9f0aab Mon Sep 17 00:00:00 2001
From: "http://bruno.boulgour.com/" <http://bruno.boulgour.com/@web>
Date: Sun, 27 Sep 2009 16:43:50 -0400
Subject:

---
 doc/bugs/libdir_not_used_in_wrappers.mdwn | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 doc/bugs/libdir_not_used_in_wrappers.mdwn

diff --git a/doc/bugs/libdir_not_used_in_wrappers.mdwn b/doc/bugs/libdir_not_used_in_wrappers.mdwn
new file mode 100644
index 000000000..baca5750e
--- /dev/null
+++ b/doc/bugs/libdir_not_used_in_wrappers.mdwn
@@ -0,0 +1,28 @@
+If I install ikiwiki in a user directory (let's say /home/bruno/ikiwiki) with all perl modules (thoses coming from Bundle::Ikiwiki and Bundle::Ikiwiki:Extras) inside that directory (in /home/bruno/ikiwiki/lib/perl5) then the generated CGI wrapper generated does not work even if I make libdir point to that directory. The error reported explain that wrapper <code>Can't locate IkiWiki.pm in @INC</code>.
+
+This is bad when you try to install Ikiwiki in such a way (everything needed by ikiwiki in one single directory) since ikiwiki is unusable in such case.
+
+Situations where this behavior (everything in one directory) may be wanted include installing latest ikiwiki on Debian stable, Ubuntu or more simply installing it on any hosting provider without root access. 
+
+Here is a simple patch correcting that behavior.
+
+<pre>
+---
+ IkiWiki/Wrapper.pm |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
+index ff110b5..5289966 100644
+--- a/IkiWiki/Wrapper.pm
++++ b/IkiWiki/Wrapper.pm
+@@ -121,6 +121,7 @@ $check_commit_hook
+ $envsave
+        newenviron[i++]="HOME=$ENV{HOME}";
+        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
++       newenviron[i++]="PERL5LIB=$config{libdir}";
+        newenviron[i]=NULL;
+        environ=newenviron;
+ 
+-- 
+1.6.0.4
+</pre>
-- 
cgit v1.2.3


From 362033885f8eb68addd3ef5e53a22a772cfe5fd7 Mon Sep 17 00:00:00 2001
From: "http://bruno.boulgour.com/" <http://bruno.boulgour.com/@web>
Date: Sun, 27 Sep 2009 16:48:04 -0400
Subject:

---
 doc/bugs/libdir_not_used_in_wrappers.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/libdir_not_used_in_wrappers.mdwn b/doc/bugs/libdir_not_used_in_wrappers.mdwn
index baca5750e..d3baa0bfb 100644
--- a/doc/bugs/libdir_not_used_in_wrappers.mdwn
+++ b/doc/bugs/libdir_not_used_in_wrappers.mdwn
@@ -1,3 +1,5 @@
+[[!tag patch wishlist]]
+
 If I install ikiwiki in a user directory (let's say /home/bruno/ikiwiki) with all perl modules (thoses coming from Bundle::Ikiwiki and Bundle::Ikiwiki:Extras) inside that directory (in /home/bruno/ikiwiki/lib/perl5) then the generated CGI wrapper generated does not work even if I make libdir point to that directory. The error reported explain that wrapper <code>Can't locate IkiWiki.pm in @INC</code>.
 
 This is bad when you try to install Ikiwiki in such a way (everything needed by ikiwiki in one single directory) since ikiwiki is unusable in such case.
@@ -26,3 +28,5 @@ index ff110b5..5289966 100644
 -- 
 1.6.0.4
 </pre>
+
+-- [[/users/bbb]]
-- 
cgit v1.2.3


From 40947d522ccdc4187fd6fcb16c5865085fe393c7 Mon Sep 17 00:00:00 2001
From: "http://bruno.boulgour.com/" <http://bruno.boulgour.com/@web>
Date: Sun, 27 Sep 2009 16:49:43 -0400
Subject:

---
 doc/bugs/libdir_not_used_in_wrappers.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/libdir_not_used_in_wrappers.mdwn b/doc/bugs/libdir_not_used_in_wrappers.mdwn
index d3baa0bfb..05ccf44c9 100644
--- a/doc/bugs/libdir_not_used_in_wrappers.mdwn
+++ b/doc/bugs/libdir_not_used_in_wrappers.mdwn
@@ -1,6 +1,6 @@
 [[!tag patch wishlist]]
 
-If I install ikiwiki in a user directory (let's say /home/bruno/ikiwiki) with all perl modules (thoses coming from Bundle::Ikiwiki and Bundle::Ikiwiki:Extras) inside that directory (in /home/bruno/ikiwiki/lib/perl5) then the generated CGI wrapper generated does not work even if I make libdir point to that directory. The error reported explain that wrapper <code>Can't locate IkiWiki.pm in @INC</code>.
+If I install ikiwiki in a user directory (let's say /home/bruno/ikiwiki) with all perl modules (thoses coming from Bundle::Ikiwiki and Bundle::Ikiwiki:Extras) inside that directory (in /home/bruno/ikiwiki/lib/perl5) then the generated CGI wrapper does not work even if I make libdir point to that directory. The error reported explain that wrapper <code>Can't locate IkiWiki.pm in @INC</code>.
 
 This is bad when you try to install Ikiwiki in such a way (everything needed by ikiwiki in one single directory) since ikiwiki is unusable in such case.
 
-- 
cgit v1.2.3


From bfad3f23d07ab58502a507fcdaf9254b08f4f23d Mon Sep 17 00:00:00 2001
From: "http://certifi.ca/lunix" <http://certifi.ca/lunix@web>
Date: Sun, 27 Sep 2009 18:05:52 -0400
Subject: rename forum/missing_pages_redirected_to_search.mdwn to
 forum/missing_pages_redirected_to_search-SOLVED.mdwn

---
 doc/forum/missing_pages_redirected_to_search-SOLVED.mdwn | 4 ++++
 doc/forum/missing_pages_redirected_to_search.mdwn        | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 doc/forum/missing_pages_redirected_to_search-SOLVED.mdwn
 delete mode 100644 doc/forum/missing_pages_redirected_to_search.mdwn

diff --git a/doc/forum/missing_pages_redirected_to_search-SOLVED.mdwn b/doc/forum/missing_pages_redirected_to_search-SOLVED.mdwn
new file mode 100644
index 000000000..cd544ecaf
--- /dev/null
+++ b/doc/forum/missing_pages_redirected_to_search-SOLVED.mdwn
@@ -0,0 +1,4 @@
+Is it possible to have any missing pages(404's) redirected to the search(omega) ?  
+So if someone comes to my site with http://example.com/foo_was_here it would result in 'foo_was_here' being passed as a search parameter to omega ?  --[Mick](http://www.lunix.com.au)
+
+
diff --git a/doc/forum/missing_pages_redirected_to_search.mdwn b/doc/forum/missing_pages_redirected_to_search.mdwn
deleted file mode 100644
index cd544ecaf..000000000
--- a/doc/forum/missing_pages_redirected_to_search.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Is it possible to have any missing pages(404's) redirected to the search(omega) ?  
-So if someone comes to my site with http://example.com/foo_was_here it would result in 'foo_was_here' being passed as a search parameter to omega ?  --[Mick](http://www.lunix.com.au)
-
-
-- 
cgit v1.2.3


From ba4071bde21a199e77f15b54d8785debc69613e6 Mon Sep 17 00:00:00 2001
From: "http://certifi.ca/lunix" <http://certifi.ca/lunix@web>
Date: Sun, 27 Sep 2009 18:06:19 -0400
Subject: updated with nginx  solution

---
 .../missing_pages_redirected_to_search-SOLVED.mdwn | 34 +++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/doc/forum/missing_pages_redirected_to_search-SOLVED.mdwn b/doc/forum/missing_pages_redirected_to_search-SOLVED.mdwn
index cd544ecaf..3af83396c 100644
--- a/doc/forum/missing_pages_redirected_to_search-SOLVED.mdwn
+++ b/doc/forum/missing_pages_redirected_to_search-SOLVED.mdwn
@@ -1,4 +1,36 @@
 Is it possible to have any missing pages(404's) redirected to the search(omega) ?  
-So if someone comes to my site with http://example.com/foo_was_here it would result in 'foo_was_here' being passed as a search parameter to omega ?  --[Mick](http://www.lunix.com.au)
+So if someone comes to my site with http://example.com/foo_was_here it would result in 'foo_was_here' being passed as a search parameter to omega ?  --[Mick](http://www.lunix.com.au)  
 
+##DONE  
+
+I use nginx instead of apache.   
+Just add the following to the `server` block outside of any location block in nginx.conf  
+You must also make sure you have setup and enabled the search plugin(omega)
+
+    error_page  404              /ikiwiki.cgi?P=$uri;
+
+
+My full nginx.conf  
+
+    server {
+            listen  [::]:80; #IPv6 capable
+            server_name  www.lunix.com.au;
+            access_log  /var/log/nginx/www.lunix.com.au-access.log  main;
+            error_log  /var/log/nginx/www.lunix.com.au-error.log warn;
+            error_page  404              /ikiwiki.cgi?P=$uri;
+   
+    location / {
+                    root    /home/lunix/public_html/lunix;
+                    index  index.html index.htm;
+    }
+   
+    location ~ ikiwiki\.cgi$ {
+                    root    /home/lunix/public_html/lunix;
+                    include /etc/nginx/fastcgi_params.cgi;
+    
+                    fastcgi_pass   127.0.0.1:9999;
+                    fastcgi_param  SCRIPT_FILENAME  /home/lunix/public_html/lunix$fastcgi_script_name;  # same path as above
+            }
+    }
+    
 
-- 
cgit v1.2.3


From 2acaa15830760695eb673ddb0b17aed715e97f3c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 27 Sep 2009 17:40:41 -0400
Subject: parentlinks: Add has_parentlinks template parameter to allow styling
 the toplevel index differently etc.

---
 IkiWiki/Plugin/parentlinks.pm | 7 +++++--
 debian/changelog              | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index 1ee69cbff..b01d76f80 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -55,8 +55,11 @@ sub pagetemplate (@) {
         my $page=$params{page};
         my $template=$params{template};
 
-	if ($template->query(name => "parentlinks")) {
-		$template->param(parentlinks => [parentlinks($page)]);
+	if ($template->query(name => "parentlinks") ||
+ 	   $template->query(name => "has_parentlinks")) {
+		my @links=[parentlinks($page)];
+		$template->param(parentlinks => \@links);
+		$template->param(has_parentlinks => (@links > 0));
 	}
 }
 
diff --git a/debian/changelog b/debian/changelog
index d50d31721..2e27d623e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.14159266) UNRELEASED; urgency=low
+
+  * parentlinks: Add has_parentlinks template parameter to allow styling
+    the toplevel index differently etc.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
+
 ikiwiki (3.14159265) unstable; urgency=low
 
   * Add complete French basewiki and underlays translation from the Debian
-- 
cgit v1.2.3


From 6c418c284877f5ddf4795594bc9ac43de63de9cb Mon Sep 17 00:00:00 2001
From: "http://bruno.boulgour.com/" <http://bruno.boulgour.com/@web>
Date: Sun, 27 Sep 2009 20:30:50 -0400
Subject: removed

---
 doc/bugs/libdir_not_used_in_wrappers.mdwn | 32 -------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 doc/bugs/libdir_not_used_in_wrappers.mdwn

diff --git a/doc/bugs/libdir_not_used_in_wrappers.mdwn b/doc/bugs/libdir_not_used_in_wrappers.mdwn
deleted file mode 100644
index 05ccf44c9..000000000
--- a/doc/bugs/libdir_not_used_in_wrappers.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-[[!tag patch wishlist]]
-
-If I install ikiwiki in a user directory (let's say /home/bruno/ikiwiki) with all perl modules (thoses coming from Bundle::Ikiwiki and Bundle::Ikiwiki:Extras) inside that directory (in /home/bruno/ikiwiki/lib/perl5) then the generated CGI wrapper does not work even if I make libdir point to that directory. The error reported explain that wrapper <code>Can't locate IkiWiki.pm in @INC</code>.
-
-This is bad when you try to install Ikiwiki in such a way (everything needed by ikiwiki in one single directory) since ikiwiki is unusable in such case.
-
-Situations where this behavior (everything in one directory) may be wanted include installing latest ikiwiki on Debian stable, Ubuntu or more simply installing it on any hosting provider without root access. 
-
-Here is a simple patch correcting that behavior.
-
-<pre>
----
- IkiWiki/Wrapper.pm |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
-index ff110b5..5289966 100644
---- a/IkiWiki/Wrapper.pm
-+++ b/IkiWiki/Wrapper.pm
-@@ -121,6 +121,7 @@ $check_commit_hook
- $envsave
-        newenviron[i++]="HOME=$ENV{HOME}";
-        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
-+       newenviron[i++]="PERL5LIB=$config{libdir}";
-        newenviron[i]=NULL;
-        environ=newenviron;
- 
--- 
-1.6.0.4
-</pre>
-
--- [[/users/bbb]]
-- 
cgit v1.2.3


From f42215cb65173299bca13cd8bafabdcb9ad2ab2d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 27 Sep 2009 20:53:02 -0400
Subject: img: Correct bug in image size calculation code.

If an image was resized smaller, with width and height specified to values
that did not fit its aspect ratio, the image tag with/height were not
adjusted to the actual size imagemagick chooses.

This was broken by 03449610d6c666ba24bea68f01d896613e522278.

To fix it right, it unfortunatly needs to always read the src image now,
in order to determine if the image is being displayed larger, or resized
smaller. When resized smaller, it then always uses the size of the
thumbnail, while for larger it calculates the size.

(Only way to get rid of this sometimes extra image read would be to change
it to not allow displaying images larger.)
---
 IkiWiki/Plugin/img.pm | 109 +++++++++++++++++++++++++-------------------------
 debian/changelog      |   1 +
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 9ae85c4e6..223b5a11f 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -63,8 +63,9 @@ sub preprocess (@) {
 	error gettext("Image::Magick is not installed") if $@;
 	my $im = Image::Magick->new;
 	my $imglink;
-	my $r;
-
+	my $r = $im->Read($srcfile);
+	error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
+	
 	my ($dwidth, $dheight);
 
 	if ($params{size} ne 'full') {
@@ -74,69 +75,71 @@ sub preprocess (@) {
 		error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
 			unless (defined $w && defined $h &&
 			        (length $w || length $h));
-
-		my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
-		$imglink = "$dir/${w}x${h}-$base";
 		
-		will_render($params{page}, $imglink);
-
-		if (-e $outfile && (-M $srcfile >= -M $outfile)) {
-			$r = $im->Read($outfile);
-			error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
+		if ((length $w && $w > $im->Get("width")) ||
+		    (length $h && $h > $im->Get("height"))) {
+		    	# resizing larger
+			$imglink = $file;
+
+			# don't generate larger image, just set display size
+			if (length $w && length $h) {
+				($dwidth, $dheight)=($w, $h);
+			}
+			# avoid division by zero on 0x0 image
+			elsif ($im->Get("width") == 0 || $im->Get("height") == 0) {
+				($dwidth, $dheight)=(0, 0);
+			}
+			# calculate unspecified size from the other one, preserving
+			# aspect ratio
+			elsif (length $w) {
+				$dwidth=$w;
+				$dheight=$w / $im->Get("width") * $im->Get("height");
+			}
+			elsif (length $h) {
+				$dheight=$h;
+				$dwidth=$h / $im->Get("height") * $im->Get("width");
+			}
 		}
 		else {
-			$r = $im->Read($srcfile);
-			error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
-
-			# don't resize any larger
-			my ($rw, $rh) = ($w, $h);
-			if ((length $rw && $rw > $im->Get("width")) ||
-			    (length $rh && $rh > $im->Get("height"))) {
-				$rw=$im->Get("width");
-				$rh=$im->Get("height");
-			}
-
-			$r = $im->Resize(geometry => "${rw}x${rh}");
-			error sprintf(gettext("failed to resize: %s"), $r) if $r;
+			# resizing smaller
+			my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
+			$imglink = "$dir/${w}x${h}-$base";
+		
+			will_render($params{page}, $imglink);
 
-			# don't actually write file in preview mode
-			if (! $params{preview}) {
-				my @blob = $im->ImageToBlob();
-				writefile($imglink, $config{destdir}, $blob[0], 1);
+			if (-e $outfile && (-M $srcfile >= -M $outfile)) {
+				$im = Image::Magick->new;
+				$r = $im->Read($outfile);
+				error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
+		
+				$dwidth = $im->Get("width");
+				$dheight = $im->Get("height");
 			}
 			else {
-				$imglink = $file;
+				($dwidth, $dheight)=($w, $h);
+				$r = $im->Resize(geometry => "${w}x${h}");
+				error sprintf(gettext("failed to resize: %s"), $r) if $r;
+
+				# don't actually write file in preview mode
+				if (! $params{preview}) {
+					my @blob = $im->ImageToBlob();
+					writefile($imglink, $config{destdir}, $blob[0], 1);
+				}
+				else {
+					$imglink = $file;
+				}
 			}
 		}
-
-		# since we don't really resize larger, set the display
-		# size, so the browser can scale the image up if necessary
-		if (length $w && length $h) {
-			($dwidth, $dheight)=($w, $h);
-		}
-		# avoid division by zero on 0x0 image
-		elsif ($im->Get("width") == 0 || $im->Get("height") == 0) {
-			($dwidth, $dheight)=(0, 0);
-		}
-		# calculate unspecified size from the other one, preserving
-		# aspect ratio
-		elsif (length $w) {
-			$dwidth=$w;
-			$dheight=$w / $im->Get("width") * $im->Get("height");
-		}
-		elsif (length $h) {
-			$dheight=$h;
-			$dwidth=$h / $im->Get("height") * $im->Get("width");
-		}
-
 	}
 	else {
-		$r = $im->Read($srcfile);
-		error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 		$imglink = $file;
 		$dwidth = $im->Get("width");
 		$dheight = $im->Get("height");
 	}
+	
+	if (! defined($dwidth) || ! defined($dheight)) {
+		error sprintf(gettext("failed to determine size of image %s"), $file)
+	}
 
 	my ($fileurl, $imgurl);
 	if (! $params{preview}) {
@@ -148,10 +151,6 @@ sub preprocess (@) {
 		$imgurl="$config{url}/$imglink";
 	}
 
-	if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
-		error sprintf(gettext("failed to determine size of image %s"), $file)
-	}
-
 	my $imgtag='<img src="'.$imgurl.
 		'" width="'.$dwidth.
 		'" height="'.$dheight.'"'.
diff --git a/debian/changelog b/debian/changelog
index 2e27d623e..d2ff88a2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
 
   * parentlinks: Add has_parentlinks template parameter to allow styling
     the toplevel index differently etc.
+  * img: Correct bug in image size calculation code.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
-- 
cgit v1.2.3


From 7cb620d0e8ed922184d3f1cc38d849665cf8d742 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 27 Sep 2009 20:57:27 -0400
Subject: img: Fix dependency code for full size images.

I had assumed that an image shown full size did not need add_depends, since
a change would not need a change to the displaying page.

But this is not true if the image is modified and its size changes. Then
the page needs to update its img tag to reflect the current size.
---
 IkiWiki/Plugin/img.pm | 3 +--
 debian/changelog      | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 223b5a11f..e2f541506 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -44,6 +44,7 @@ sub preprocess (@) {
 	}
 
 	add_link($params{page}, $image);
+	add_depends($params{page}, $image);
 
 	# optimisation: detect scan mode, and avoid generating the image
 	if (! defined wantarray) {
@@ -69,8 +70,6 @@ sub preprocess (@) {
 	my ($dwidth, $dheight);
 
 	if ($params{size} ne 'full') {
-		add_depends($params{page}, $image);
-
 		my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
 		error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
 			unless (defined $w && defined $h &&
diff --git a/debian/changelog b/debian/changelog
index d2ff88a2a..44c810b00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * parentlinks: Add has_parentlinks template parameter to allow styling
     the toplevel index differently etc.
   * img: Correct bug in image size calculation code.
+  * img: Fix dependency code for full size images.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
-- 
cgit v1.2.3


From 3525a6b7f23421779091daad7a1e19b02d7db141 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 28 Sep 2009 16:21:03 -0400
Subject: toggle, relativedate: Support templates that add attributes to the
 body tag.

---
 IkiWiki/Plugin/relativedate.pm                               | 2 +-
 IkiWiki/Plugin/toggle.pm                                     | 2 +-
 debian/changelog                                             | 2 ++
 doc/bugs/toggle_expects_body_element_without_attributes.mdwn | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 3e33cd5c3..06df2efd5 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -26,7 +26,7 @@ sub getsetup () {
 sub format (@) {
         my %params=@_;
 
-	if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
+	if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
 		# no </body> tag, probably in preview mode
 		$params{content}=include_javascript($params{page}, 1).$params{content};
 	}
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index aae8cdf84..ef066a42f 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -68,7 +68,7 @@ sub format (@) {
 
 	if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
 		$params{content}=~s/<div class="toggleableend">//g;
-		if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
+		if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
 			# no </body> tag, probably in preview mode
 			$params{content}=include_javascript($params{page}, 1).$params{content};
 		}
diff --git a/debian/changelog b/debian/changelog
index 44c810b00..b368618b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
     the toplevel index differently etc.
   * img: Correct bug in image size calculation code.
   * img: Fix dependency code for full size images.
+  * toggle, relativedate: Support templates that add attributes
+    to the body tag.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
diff --git a/doc/bugs/toggle_expects_body_element_without_attributes.mdwn b/doc/bugs/toggle_expects_body_element_without_attributes.mdwn
index 6cb03e934..0b39346f4 100644
--- a/doc/bugs/toggle_expects_body_element_without_attributes.mdwn
+++ b/doc/bugs/toggle_expects_body_element_without_attributes.mdwn
@@ -1 +1,3 @@
 The toggle plugins checks for a `<body>` in the page; if not found, javascript tags are inserted at the top of the document. Since my page uses `<body onload="javascript:fixLinks()">`; a plain `<body>` is not found and I get script links before the docstring declaration. Please see the source of the following toggle-using page: http://kaizer.se/wiki/kupfer/ -- ulrik [kaizer.se]
+
+[[fixed|done]] --[[Joey]] 
-- 
cgit v1.2.3


From 936110ddb3acf67ac950a960b5c39bfc860a17ea Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Sat, 19 Sep 2009 00:17:18 +0200
Subject: rst: Introduce _to_dict to turn argument list into keword args
 (cherry picked from commit 7d788655104089b5747a5ff1a4c5106eac871c14)

---
 plugins/rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/rst b/plugins/rst
index a2d07ebcf..449dba415 100755
--- a/plugins/rst
+++ b/plugins/rst
@@ -18,16 +18,20 @@ __licence__ = 'GPLv2'
 from docutils.core import publish_parts;
 from proxy import IkiWikiProcedureProxy
 
-def rst2html(proxy, *kwargs):
-    # FIXME arguments should be treated as a hash, the order could change
-    # at any time and break this.
-    parts = publish_parts(kwargs[3], writer_name='html',
+def rst2html(proxy, *args):
+    kwargs = _to_dict(args)
+    parts = publish_parts(kwargs["content"],
+                          writer_name="html",
                           settings_overrides = { 'halt_level': 6
                                                , 'file_insertion_enabled': 0
                                                , 'raw_enabled': 1
                                                })
     return '\n'.join(parts['html_body'].splitlines()[1:-1])
 
+def _to_dict(args):
+    # args is a list paired by key, value, so we turn it into a dict
+    return dict((k, v) for k, v in zip(*[iter(args)]*2))
+
 def getsetup(proxy, *kwargs):
     return 'plugin', { 'safe' : 1, 'rebuild' : 1 }
 
-- 
cgit v1.2.3


From 2736055af532feeb20e23ea49be8115486777439 Mon Sep 17 00:00:00 2001
From: "http://mhymn.pip.verisignlabs.com/"
 <http://mhymn.pip.verisignlabs.com/@web>
Date: Tue, 29 Sep 2009 09:50:51 -0400
Subject: removing extra space to avoid mistakes

---
 doc/tips/github.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/github.mdwn b/doc/tips/github.mdwn
index c3fdab734..9bdf15751 100644
--- a/doc/tips/github.mdwn
+++ b/doc/tips/github.mdwn
@@ -24,7 +24,7 @@ for more space, or you can migrate your site elsewhere.
 ## Local Setup
 
 * On your laptop, create two empty git repositories to correspond to the github repositories: <br />
-	`YOU = your github username here` <br />
+	`YOU=your github username here` <br />
 	`mkdir ~/$YOU.github.com` <br />
 	`cd ~/$YOU.github.com` <br />
 	`git init` <br />
-- 
cgit v1.2.3


From d00ccc2f65a915a284b564cc39568fa316c48c57 Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Tue, 29 Sep 2009 12:22:21 -0400
Subject: point backports to lenny instead of etch

---
 doc/download.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 015c87f1b..8f5004ca9 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -16,8 +16,8 @@ To install with apt, if using Debian or Ubuntu:
 
 Or download the deb from <http://packages.debian.org/unstable/web/ikiwiki>.
 
-There is a backport of a recent version of ikiwiki for Debian 4.0 at
-<http://packages.debian.org/etch-backports/ikiwiki>.
+There is a backport of a recent version of ikiwiki for Debian 5.0 at
+<http://packages.debian.org/lenny-backports/ikiwiki>.
 
 Fedora versions 8 and newer have RPMs of ikiwiki available.
 
-- 
cgit v1.2.3


From 89577c689c8d1306bbf4c95fd26d9caa50eefabb Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Tue, 29 Sep 2009 12:41:10 -0400
Subject: test backlinks

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1f842d499..9dc808219 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -48,6 +48,7 @@ blah
 ## Different sorts of links:
 
 * [[Features]]
+* <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
-- 
cgit v1.2.3


From 9bea3db4f37a934846cf8d3ac9f57a615bdad422 Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Tue, 29 Sep 2009 13:20:13 -0400
Subject: short report so that others know when they encouter this.

---
 doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn

diff --git a/doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn b/doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn
new file mode 100644
index 000000000..0b3d4fb2a
--- /dev/null
+++ b/doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn
@@ -0,0 +1,11 @@
+Upgrading to `librpc-xml-perl` 0.69-1 on debian breaks external XML-RPC plugins (such as [[rst]]).
+Refresing the wiki fails with an error message like this:
+
+    RPC::XML::Parser::new: This method should have
+    been overridden by the RPC::XML::Parser class at
+    /usr/share/perl5/RPC/XML/Parser.pm line 46, <GEN1> line 30.
+
+It appears an incompatible change in the library creates this problem.
+
+`librpc-xml-perl` version 0.67-1 works. The easiest solution is to downgrade to this version,
+or disable XML-RPC plugins if they are not needed.
-- 
cgit v1.2.3


From 1f929e7f6404dc260ebd7818c83ca87e52da6c41 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 29 Sep 2009 13:33:23 -0400
Subject: typo

---
 IkiWiki/Plugin/parentlinks.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index b01d76f80..e678a057d 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -57,7 +57,7 @@ sub pagetemplate (@) {
 
 	if ($template->query(name => "parentlinks") ||
  	   $template->query(name => "has_parentlinks")) {
-		my @links=[parentlinks($page)];
+		my @links=parentlinks($page);
 		$template->param(parentlinks => \@links);
 		$template->param(has_parentlinks => (@links > 0));
 	}
-- 
cgit v1.2.3


From ac8ecdcf68b89544d126032718e225add0a09238 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 29 Sep 2009 13:35:30 -0400
Subject: Support RPC::XML 0.69's incompatable object instantiation method.

---
 IkiWiki/Plugin/external.pm | 21 ++++++++++++++++-----
 debian/changelog           |  1 +
 plugins/externaldemo       | 15 +++++++++++++--
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 0d292dfc2..ec91c79db 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -8,7 +8,6 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use RPC::XML;
-use RPC::XML::Parser;
 use IPC::Open2;
 use IO::Handle;
 
@@ -55,7 +54,19 @@ sub rpc_call ($$;@) {
 		$plugin->{accum}.=$_;
 		while ($plugin->{accum} =~ /^\s*(<\?xml\s.*?<\/(?:methodCall|methodResponse)>)\n(.*)/s) {
 			$plugin->{accum}=$2;
-			my $r = RPC::XML::Parser->new->parse($1);
+			my $parser;
+			eval q{
+				use RPC::XML::ParserFactory;
+				$parser = RPC::XML::ParserFactory->new;
+			};
+			if ($@) {
+				# old interface
+				eval q{
+					use RPC::XML::Parser;
+					$parser = RPC::XML::Parser->new;
+				};
+			}
+			my $r=$parser->parse($1);
 			error("XML RPC parser failure: $r") unless ref $r;
 			if ($r->isa('RPC::XML::response')) {
 				my $value=$r->value;
@@ -72,9 +83,9 @@ sub rpc_call ($$;@) {
 
 					# XML-RPC v1 does not allow for
 					# nil/null/None/undef values to be
-					# transmitted, so until
-					# XML::RPC::Parser honours v2
-					# (<nil/>), external plugins send
+					# transmitted. The <nil/> extension
+					# is the right fix, but for
+					# back-compat, let external plugins send
 					# a hash with one key "null" pointing
 					# to an empty string.
 					if (exists $hash{null} &&
diff --git a/debian/changelog b/debian/changelog
index b368618b4..b948aaf56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * img: Fix dependency code for full size images.
   * toggle, relativedate: Support templates that add attributes
     to the body tag.
+  * Support RPC::XML 0.69's incompatable object instantiation method.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
diff --git a/plugins/externaldemo b/plugins/externaldemo
index be7aba8b9..24861dcc9 100755
--- a/plugins/externaldemo
+++ b/plugins/externaldemo
@@ -8,7 +8,6 @@ use strict;
 print STDERR "externaldemo plugin running as pid $$\n";
 
 use RPC::XML;
-use RPC::XML::Parser;
 use IO::Handle;
 
 # autoflush stdout
@@ -31,7 +30,19 @@ sub rpc_read {
 			$accum=$2; # the rest
 	
 			# Now parse the XML RPC.
-			my $r = RPC::XML::Parser->new->parse($1);
+			my $parser;
+			eval q{
+				use RPC::XML::ParserFactory;
+				$parser = RPC::XML::ParserFactory->new;
+			};
+			if ($@) {
+				# old interface
+				eval q{
+					use RPC::XML::Parser;
+					$parser = RPC::XML::Parser->new;
+				};
+			}
+			my $r=$parser->parse($1);
 			if (! ref $r) {
 				die "error: XML RPC parse failure $r";
 			}
-- 
cgit v1.2.3


From 9ed7ee836e977c8a2ea746c27b1638328ec44364 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 29 Sep 2009 13:36:09 -0400
Subject: fixed

---
 doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn b/doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn
index 0b3d4fb2a..d8def82aa 100644
--- a/doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn
+++ b/doc/bugs/librpc-xml-perl_0.69_breaks_XML-RPC_plugins.mdwn
@@ -9,3 +9,5 @@ It appears an incompatible change in the library creates this problem.
 
 `librpc-xml-perl` version 0.67-1 works. The easiest solution is to downgrade to this version,
 or disable XML-RPC plugins if they are not needed.
+
+[[fixed|done]] --[[Joey]] 
-- 
cgit v1.2.3


From 2aa93377e8845b4dd19af5a470e270c23e4e7e15 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 30 Sep 2009 13:57:36 -0400
Subject: comments and some code review

---
 ...ve_reStructuredText_links_to_ikiwiki_pages.mdwn | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 1782af824..5f21b2272 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -109,6 +109,25 @@ picture before it.
       but rST directives allow a direct line (after :: on first line),
       an option list, and a content block.
 
+> You've done a lot of work already, but ...
+> 
+> The filter approach seems much simpler than the other approaches
+> for users to understand, since they can just use identical ikiwiki
+> markup on rst pages as they would use anywhere else. This is very desirable
+> if the wiki allows rst in addition to mdwn, since then users don't have
+> to learn two completly different ways of doing wikilinks and directives.
+> I also wonder if even those familiar with rst would find entirely natural
+> the ways you've found to shoehorn in wikilinks, named wikilinks, and ikiwiki
+> directives?
+> 
+> Htmlize in filter avoids these problems. It also leaves open the possibility
+> that ikiwiki could become smarter about the rendering chain later, and learn
+> to use a better order for rst (ie, htmlize first). If that later happened,
+> the htmlize in filter hack could go away. --[[Joey]] 
+
+> (BTW, the [[plugins/txt]] plugin already does html formatting
+> in filter, for similar reasons.) --[[Joey]]
+
 ### Implementation ###
 
 Preserving indents in the preprocessor are in branch [pproc-indent][ppi]
@@ -116,6 +135,20 @@ Preserving indents in the preprocessor are in branch [pproc-indent][ppi]
 (These simple patches come with a warning: _Those are the first lines of
 Perl I've ever written!_)
 
+> This seems like a good idea, since it solves issues for eg, indented
+> directives in mdwn as well. But, looking at the diff, I see a clear bug:
+>
+>	-                               return "[[!$command <span class=\"error\">".
+>	+                               $result = "[[!$command <span class=\"error\">".
+> 
+> That makes it go on and parse an infinitely nested directive chain, instead
+> of immediatly throwing an error.
+> 
+> Also, it seems that the "indent" matching in the regexps may be too broad,
+> wouldn't it also match whitespace before a directive that was not at the beginning 
+> of a line, and treat it as an indent? With some bad luck, that could cause mdwn
+> to put the indented output in a pre block. --[[Joey]] 
+
 [ppi]: http://github.com/engla/ikiwiki/commits/pproc-indent
 
 ## Discussion ##
-- 
cgit v1.2.3


From caa3818effe74c52fc783e31c51f0566c7805e62 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 30 Sep 2009 15:17:03 -0400
Subject: thoughts

---
 doc/plugins/contrib/album/discussion.mdwn | 33 +++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index 7a3c19cf6..5fb91c5a4 100644
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -51,3 +51,36 @@ i'm new to ikiwiki, apologies if this is dealt with elsewhere.  -brush
 > This plugin is pretty ambitious, and is unfinished, so I'd recommend
 > playing with  a normal IkiWiki installation for a bit, then trying
 > out this plugin when you've mastered the basics of IkiWiki. --[[smcv]]
+
+----
+
+You had wanted my feedback on the design of this. I have not looked at the
+code or tried it yet, but here goes. --[[Joey]]	
+
+* Needing to create the albumimage "viewer" pages for each photo
+  seems like it will become a pain. Everyone will need to come up
+  with their own automation for it, and then there's the question
+  of how to automate it when uploading attachments.
+* With each viewer page having next/prev links, I can see how you
+  were having the scalability issues with ikiwiki's data structures
+  earlier!
+* And doesn't each viewer page really depend on every other page in the
+  same albumsection? If a new page is added, the next/prev links
+  may need to be updated, for example. If so, there will be much
+  unnecessary rebuilding.
+* One thing I do like about having individual pages per image is
+  that they can each have their own comments, etc.
+* Seems possibly backwards that the albumimage controls what album
+  an image appears in. Two use cases -- 1: I may want to make a locked
+  album, but then anyone who can write to any other page on the wiki can
+  add an image to it. 2: I may want an image to appear in more than one
+  album. Think tags. So it seems it would be better to have the album
+  directive control what pages it includes (a la inline).
+* Putting a few of the above thoughts together, my ideal album system
+  seems to be one where I can just drop the images into a directory and
+  have them appear in the album index, as well as each generate their own wiki
+  page. Plus some way I can, later, edit metadata for captions,
+  etc. (Real pity we can't just put arbitrary metadata into the images
+  themselves.) This is almost pointing toward making the images first-class
+  wiki page sources. Hey, it worked for po! :) But the metadata and editing
+  problems probably don't really allow that.
-- 
cgit v1.2.3


From 4f37413050d4c17cb428820991541595e4645c66 Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Wed, 30 Sep 2009 20:54:21 +0200
Subject: Comment, type, discuss and otherwise type wayy to much sorry!!

---
 ...ve_reStructuredText_links_to_ikiwiki_pages.mdwn | 71 ++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 5f21b2272..4468ce1e9 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -128,6 +128,54 @@ picture before it.
 > (BTW, the [[plugins/txt]] plugin already does html formatting
 > in filter, for similar reasons.) --[[Joey]]
 
+>> Thank you for the comments! Forget the work, it's not so much.
+>> I'd rank the :wiki: link addition pretty high, and the other changes way
+>> behind that:
+>>
+>> The :wiki:`Wiki Link` syntax is *very* appropriate as rst syntax
+>> since it fits well with other uses of roles (notice that :RFC:`822`
+>> inserts a link to RFC822 etc, and that the default role is a *title* role
+>> (title of some work); thus very appropriate for medium-specific links like
+>> wiki links. So I'd rank :wiki: links a worthwhile addition regardless of
+>> outcome here, since it's a very rst-like alternative for those who wish to
+>> use more rst-like syntax (and documents degrades better outside the wiki as
+>> noted).
+>>
+>> The named link syntax (just like the :wiki: role) are inspired from trac
+>> and a good fit, but only if the wiki is committed to using only rst,
+>> which I don't think is the case.
+>>
+>> The rst-customize changes are very useful for custom directive
+>> installations (like the sourcecode directive, or shortcut roles I show
+>> in the examples page), but there might be a way for the user to inject
+>> docutils addons that I'm missing (one very ugly way would be to stick
+>> them in sitecustomize.py which affects all Python programs).
+>>
+>> With the presented changes, I already have a working RestructuredText
+>> wiki, but I'm admitting that using .. raw:: html around all directives is
+>> very ugly (I use few directives: inline, toggle, meta, tag, map)
+>>
+>> On filter/htmlize: Well **rst** is clearly antisocial: It can't see HTML,
+>> and ikiwiki directives are wrappend in paragraph tags. (For wikilinks
+>> this is probably no problem). So the suggestion about `.. ikiwiki:` is
+>> partly because it looks good in rst syntax, but also since it would emit
+>> a div to wrap around the element instead of a paragraph.
+>>
+>> I don't know if you mean that rst could be reordered to do htmlize before
+>> other phases? rst must be before any preprocess hook to avoid seeing any
+>> HTML.
+>>
+>> With the presented changes, I already have a working RestructuredText
+>> wiki, but I'm admitting that using .. raw:: html around all directives is
+>> very ugly (I use few directives: inline, toggle, meta, tag, map)
+>>
+>> If I'm thinking right, processing to HTML already in filter means any
+>> processing in scan can be reused directly (or skipped if it's legal to
+>> emit 'add_link' in filter.)
+>>
+>> -- [[ulrik]] 
+
+
 ### Implementation ###
 
 Preserving indents in the preprocessor are in branch [pproc-indent][ppi]
@@ -148,6 +196,29 @@ Perl I've ever written!_)
 > wouldn't it also match whitespace before a directive that was not at the beginning 
 > of a line, and treat it as an indent? With some bad luck, that could cause mdwn
 > to put the indented output in a pre block. --[[Joey]] 
+>
+>> You are probably right about the bug. I'm not quite sure what the nested
+>> directives examples looks like, but I must have overlooked how the
+>> recursion counter works; I thought simply changing if to elif the next
+>> few lines would solve that. I'm sorry for that!
+>>
+>> We don't have to change the `$handle` function at all, if it is possible
+>> to do the indent substitution all in one line instead of passing it to
+>> handle, I don't know if it is possible to turn:
+>>
+>> 		$content =~ s{$regex}{$handle->($1, $2, $3, $4, $5)}eg;
+>>
+>> into
+>>
+>> 		$content =~ s{$regex}{s/^/$1/gm{$handle->($2, $3, $4, $5)}}eg;
+>>
+>> Well, no idea how that would be expressed, but I mean, replace the indent
+>> directly in $handle's return value.
+>>
+>> The indent-catching regex is wrong in the way you mention, it has been
+>> nagigng my mind a bit as well; I think matching start of line + spaces
+>> and tabs is the only thing we want.
+>> -- [[ulrik]]
 
 [ppi]: http://github.com/engla/ikiwiki/commits/pproc-indent
 
-- 
cgit v1.2.3


From 0159612ee0b3c18c9b1aca6245d6c97e9af14a24 Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Wed, 30 Sep 2009 15:29:40 -0400
Subject: minimal user page for this guy

---
 doc/users/ulrik.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/users/ulrik.mdwn

diff --git a/doc/users/ulrik.mdwn b/doc/users/ulrik.mdwn
new file mode 100644
index 000000000..02e1c1cbd
--- /dev/null
+++ b/doc/users/ulrik.mdwn
@@ -0,0 +1,3 @@
+I use ikiwiki for a small personal website at <http://kaizer.se/wiki/>
+
+I have proposed some patches for ikiwiki: <http://kaizer.se/wiki/hacks/ikiwiki_rst/> (subject to change)
-- 
cgit v1.2.3


From e04e9ccea930aefb3b1dbeb8203dce8c6f8bef13 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 30 Sep 2009 15:39:51 -0400
Subject: response

---
 ..._native_reStructuredText_links_to_ikiwiki_pages.mdwn | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 4468ce1e9..0f8e63aae 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -77,6 +77,9 @@ but disruptive since all .rst depend on it). Well, the customizations have
 to be picked and chosen from this, but at least the global python file can
 be very convenient.
 
+> Did you consider just including the global rst header text into an item
+> in the setup file? --[[Joey]] 
+
 Some rst-custom [examples are here](http://kaizer.se/wiki/rst_examples/)
 
 [rst-custom]: http://github.com/engla/ikiwiki/commits/rst-customize
@@ -141,6 +144,11 @@ picture before it.
 >> use more rst-like syntax (and documents degrades better outside the wiki as
 >> noted).
 >>
+>>> Unsure about the degredation argument. It will work some of
+>>> the time, but ikiwiki's [[ikiwiki/subpage/linkingrules]]
+>>> are sufficiently different from normal html relative link
+>>> rules that it often won't work. --[[Joey]]
+>> 
 >> The named link syntax (just like the :wiki: role) are inspired from trac
 >> and a good fit, but only if the wiki is committed to using only rst,
 >> which I don't think is the case.
@@ -165,9 +173,11 @@ picture before it.
 >> other phases? rst must be before any preprocess hook to avoid seeing any
 >> HTML.
 >>
->> With the presented changes, I already have a working RestructuredText
->> wiki, but I'm admitting that using .. raw:: html around all directives is
->> very ugly (I use few directives: inline, toggle, meta, tag, map)
+>>> One of my long term goals is to refactor all the code in ikiwiki
+>>> that manually runs the various stages of the render pipeline,
+>>> into one centralized place. Once that's done, that place can get
+>>> smart about what order to run the stages, and use a different
+>>> order for rst. --[[Joey]]
 >>
 >> If I'm thinking right, processing to HTML already in filter means any
 >> processing in scan can be reused directly (or skipped if it's legal to
@@ -175,6 +185,7 @@ picture before it.
 >>
 >> -- [[ulrik]] 
 
+>>> Seems it could be, yes. --[[Joey]]
 
 ### Implementation ###
 
-- 
cgit v1.2.3


From e7de3f0762d9b9ae64bd40d9fe07b00d9d6dc4d7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 30 Sep 2009 15:45:16 -0400
Subject: furthermore

---
 .../Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 0f8e63aae..bee57f7e7 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -226,10 +226,16 @@ Perl I've ever written!_)
 >> Well, no idea how that would be expressed, but I mean, replace the indent
 >> directly in $handle's return value.
 >>
+>> Yes, in effect just `indent($1, handle->($2,$,4))` --[[Joey]] 
+>>
 >> The indent-catching regex is wrong in the way you mention, it has been
 >> nagigng my mind a bit as well; I think matching start of line + spaces
 >> and tabs is the only thing we want.
 >> -- [[ulrik]]
+>> 
+>>> Well, seems you want to match the indent at the start of the line containing
+>>> the directive, even if the directive does not start the line. That would
+>>> be quite hard to make a regexp do, though. --[[Joey]]
 
 [ppi]: http://github.com/engla/ikiwiki/commits/pproc-indent
 
-- 
cgit v1.2.3


From f8ad5988da8676bfeff6db9375f2518a12f79a48 Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Wed, 30 Sep 2009 21:59:11 +0200
Subject: clarifications. and indent one of joey's oneliner responses.

---
 ...ative_reStructuredText_links_to_ikiwiki_pages.mdwn | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index bee57f7e7..084f03304 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -79,6 +79,14 @@ be very convenient.
 
 > Did you consider just including the global rst header text into an item
 > in the setup file? --[[Joey]] 
+>
+>> Then `rst_header` would not be much different from the python script
+>> `rst_customize`. rst_header is as safe as other files (though disruptive
+>> as noted), so it should/could be a editable file in the Wiki. A Python
+>> script of course can not be. There is nothing you can do in the
+>> rst_header (that you sensibly would do, I think) that couldn't be done in
+>> the Python script. `rst_header` has very limited use, but it is another
+>> possibility, mainly for the user-editable aspect. --[[ulrik]]
 
 Some rst-custom [examples are here](http://kaizer.se/wiki/rst_examples/)
 
@@ -148,6 +156,15 @@ picture before it.
 >>> the time, but ikiwiki's [[ikiwiki/subpage/linkingrules]]
 >>> are sufficiently different from normal html relative link
 >>> rules that it often won't work. --[[Joey]]
+>>>
+>>>> With degradation I mean that if you take a file out of the wiki; the
+>>>> links degrade to stylized text. If using default role, they degrade to
+>>>> :title: which renders italicized text (which I find is exactly
+>>>> appropriate). There is no way for them to degrade into links, except of
+>>>> course if you reimplement the :wiki: role. You can also respecify
+>>>> either the default role (the `wikilink` syntax) or the :wiki: role (the
+>>>> :wiki:`wikilink` syntax) to any other markup, for example None.
+>>>> --[[ulrik]]
 >> 
 >> The named link syntax (just like the :wiki: role) are inspired from trac
 >> and a good fit, but only if the wiki is committed to using only rst,
@@ -226,7 +243,7 @@ Perl I've ever written!_)
 >> Well, no idea how that would be expressed, but I mean, replace the indent
 >> directly in $handle's return value.
 >>
->> Yes, in effect just `indent($1, handle->($2,$,4))` --[[Joey]] 
+>>> Yes, in effect just `indent($1, handle->($2,$,4))` --[[Joey]] 
 >>
 >> The indent-catching regex is wrong in the way you mention, it has been
 >> nagigng my mind a bit as well; I think matching start of line + spaces
-- 
cgit v1.2.3


From d4511f730e1c159f570c8d39eb5a3aa1de7f641a Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Thu, 1 Oct 2009 05:36:09 -0400
Subject: add my openid

---
 doc/users/weakish.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/users/weakish.mdwn b/doc/users/weakish.mdwn
index ccd5665ad..30a14d303 100644
--- a/doc/users/weakish.mdwn
+++ b/doc/users/weakish.mdwn
@@ -1 +1,3 @@
 email: weakish@gmail.com
+
+openid: <http://weakish.pigro.net>
-- 
cgit v1.2.3


From 13940c57736a28803f11c871cada7a6e8734f029 Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Thu, 1 Oct 2009 05:48:09 -0400
Subject: [patch] add an option to determine whether put autoindex pages in
 repo or not

---
 doc/plugins/autoindex/discussion.mdwn | 56 +++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
index 82e30aab1..2d6b6f1f0 100644
--- a/doc/plugins/autoindex/discussion.mdwn
+++ b/doc/plugins/autoindex/discussion.mdwn
@@ -5,3 +5,59 @@ The reason being that I have a lot of directories which need to be autoindexed,
 but I would prefer if the index files didn't clutter up my git repository.
 
 even without that feature the plugin is a great help, thanks
+
+
+------
+
+If you just don't want to clutter your git repo, below it's a patch does the following:
+
+* If you set autoindex_commit to 0 in your ikiwiki.setup file, we *do* place auto-generated markdown files in the **wiki source** but *not* in the **repo**
+
+* If you set autoindex_commit to 1 (this is the default), auto-generated index files will be put in the repo provided you enabled rcs backend.
+
+<pre>
+--- autoindex.pm.orig	2009-10-01 17:13:51.000000000 +0800
++++ autoindex.pm	2009-10-01 17:21:09.000000000 +0800
+@@ -17,6 +17,13 @@
+ 			safe => 1,
+ 			rebuild => 0,
+ 		},
++        autoindex_commit => {
++            type => 'boolean',
++            default => 1,
++            description => 'commit generated autoindex pages into RCS',
++            safe => 0,
++            rebuild => 0,
++        },
+ }
+ 
+ sub genindex ($) {
+@@ -25,7 +32,7 @@
+ 	my $template=template("autoindex.tmpl");
+ 	$template->param(page => $page);
+ 	writefile($file, $config{srcdir}, $template->output);
+-	if ($config{rcs}) {
++	if ($config{rcs} and $config{autoindex_commit}) {
+ 		IkiWiki::rcs_add($file);
+ 	}
+ }
+@@ -94,13 +101,13 @@
+ 	}
+ 	
+ 	if (@needed) {
+-		if ($config{rcs}) {
++		if ($config{rcs} and $config{autoindex_commit}) {
+ 			IkiWiki::disable_commit_hook();
+ 		}
+ 		foreach my $page (@needed) {
+ 			genindex($page);
+ 		}
+-		if ($config{rcs}) {
++		if ($config{rcs} and $config{autoindex_commit}) {
+ 			IkiWiki::rcs_commit_staged(
+ 				gettext("automatic index generation"),
+ 				undef, undef);
+</pre>
+
+ 
+Warning:  I guess this patch may work, but I *haven't tested it yet*.  -- [[weakish]]
-- 
cgit v1.2.3


From bef2011cbdbe49cc2ec988ddfdf1b9a13f880b3b Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Thu, 1 Oct 2009 05:57:53 -0400
Subject: checking external links seems not practical

---
 doc/ikiwiki/directive/brokenlinks/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ikiwiki/directive/brokenlinks/discussion.mdwn b/doc/ikiwiki/directive/brokenlinks/discussion.mdwn
index 65e97cff6..34760584d 100644
--- a/doc/ikiwiki/directive/brokenlinks/discussion.mdwn
+++ b/doc/ikiwiki/directive/brokenlinks/discussion.mdwn
@@ -1 +1,3 @@
 Would it be possible to have such a thing also checking for external links? -- [[user/emptty]]
+
+> I guess this is not very practical.  For internal wiki links, we only need to check if the linked source file exist or not.  But for external links, we have to ping every links, which will slow down the build process a lot.  --[[weakish]]
-- 
cgit v1.2.3


From 1837abd404b6707aea6eaf0fdd0a95ee984dc455 Mon Sep 17 00:00:00 2001
From: "http://certifi.ca/lunix" <http://certifi.ca/lunix@web>
Date: Thu, 1 Oct 2009 08:07:38 -0400
Subject: empty page

---
 doc/users/Mick_Pollard.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/Mick_Pollard.mdwn

diff --git a/doc/users/Mick_Pollard.mdwn b/doc/users/Mick_Pollard.mdwn
new file mode 100644
index 000000000..9c558e357
--- /dev/null
+++ b/doc/users/Mick_Pollard.mdwn
@@ -0,0 +1 @@
+.
-- 
cgit v1.2.3


From f62de29638ec3d8d1d2e27601b0096cf865c48cc Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Thu, 1 Oct 2009 08:12:49 -0400
Subject: documentation seems inaccurate

---
 doc/plugins/sidebar/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/plugins/sidebar/discussion.mdwn

diff --git a/doc/plugins/sidebar/discussion.mdwn b/doc/plugins/sidebar/discussion.mdwn
new file mode 100644
index 000000000..78af3525c
--- /dev/null
+++ b/doc/plugins/sidebar/discussion.mdwn
@@ -0,0 +1,3 @@
+> Warning: Any change to the sidebar will cause a rebuild of the whole wiki, since every page includes a copy that has to be updated. This can especially be a problem if the sidebar includes inline or map directives, since any changes to pages inlined or mapped onto the sidebar will change the sidebar and cause a full wiki rebuild.
+
+I tried exactly that, namely having an inline in my sidebar to include an rss feed from some other side. I think the complete wiki rebuild should be doable every few days when a new article appears in that feed. But contrary to that warning there is no complete wiki rebuild, only the sidebar page is rebuilt by the "ikiwiki --aggregate" from cron. Is that a bug or a feature?
-- 
cgit v1.2.3


From 9584dfddd89a0b65632201c6aa280b7c5bc964f2 Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Thu, 1 Oct 2009 14:55:36 +0200
Subject: Link to trac's Wiki-RestructuredText syntax description

---
 .../Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 084f03304..afe50cf07 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -166,9 +166,9 @@ picture before it.
 >>>> :wiki:`wikilink` syntax) to any other markup, for example None.
 >>>> --[[ulrik]]
 >> 
->> The named link syntax (just like the :wiki: role) are inspired from trac
->> and a good fit, but only if the wiki is committed to using only rst,
->> which I don't think is the case.
+>> The named link syntax (just like the :wiki: role) are inspired from
+>> [trac][tracrst] and a good fit, but only if the wiki is committed to
+>> using only rst, which I don't think is the case.
 >>
 >> The rst-customize changes are very useful for custom directive
 >> installations (like the sourcecode directive, or shortcut roles I show
@@ -204,6 +204,8 @@ picture before it.
 
 >>> Seems it could be, yes. --[[Joey]]
 
+[tracrst]: http://trac.edgewall.org/wiki/WikiRestructuredText
+
 ### Implementation ###
 
 Preserving indents in the preprocessor are in branch [pproc-indent][ppi]
-- 
cgit v1.2.3


From 4b8dd763729fccc1a36b3d128ea0f7957f3e537a Mon Sep 17 00:00:00 2001
From: test <test@web>
Date: Thu, 1 Oct 2009 15:28:31 -0400
Subject:

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9dc808219..b0862f28f 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -44,7 +44,7 @@ Bulleted list
 [[!haiku hint="sandbox play"]]
 
 ----
-blah
+
 ## Different sorts of links:
 
 * [[Features]]
-- 
cgit v1.2.3


From 009f7ffded7446f1b3954ab1973faed5b96acf4d Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Fri, 2 Oct 2009 15:03:14 +0200
Subject: link to docutils mailing list discussion. also ask about
 <p>[[!directives]]</p>

---
 ...e_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index afe50cf07..e42f22970 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -87,6 +87,17 @@ be very convenient.
 >> rst_header (that you sensibly would do, I think) that couldn't be done in
 >> the Python script. `rst_header` has very limited use, but it is another
 >> possibility, mainly for the user-editable aspect. --[[ulrik]]
+>>
+>> (I foresaw only two things to be added to the rst_header: the default
+>> role could be configured there (as with rst_wikirole), and if you have a
+>> meta-role like :shortcut:, shortcuts could be defined there.)
+>
+> I have some discussion on the [docutils mailing list][dml], the developers
+> of docutils seems to favor "Proposal 1", while I defend my ideas. They
+> want all users of ReST to use only the basic featureset to remain
+> compatible, of course. -- [[ulrik]]
+
+[dml]: http://thread.gmane.org/gmane.text.docutils.user/5376
 
 Some rst-custom [examples are here](http://kaizer.se/wiki/rst_examples/)
 
@@ -203,6 +214,11 @@ picture before it.
 >> -- [[ulrik]] 
 
 >>> Seems it could be, yes. --[[Joey]]
+>>>
+>>>> It is not clear how we can work around reST wrapping directives with
+>>>> paragraph tags. Also, some escaping of xml characters & <> might
+>>>> happen, but I can't imagine right now what breakage can come from that.
+>>>> -- [[ulrik]]
 
 [tracrst]: http://trac.edgewall.org/wiki/WikiRestructuredText
 
-- 
cgit v1.2.3


From e29950ded621525bef0d2981b8d3cad4ea395cf1 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 09:08:22 -0400
Subject: remove unintended wikilink

---
 doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn b/doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn
index 88dbfc39b..262aa24fc 100644
--- a/doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn
+++ b/doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn
@@ -2,7 +2,7 @@ it appears that unicode characters in the title that are unicode letters are spa
 
 > Filenames can have any alphanumerics in them without the __ escaping.
 > Your locale determines whether various unicode characters are considered
-> alphanumeric. In other words, it just looks at the [[:alpha:]] character
+> alphanumeric. In other words, it just looks at the \[[:alpha:]] character
 > class, whatever your locale defines it to be. --[[Joey]]
 
 this is not a problem per se, but (at least with git backend) the recent changes missinterpret the file name character set (it seems to read the filenames as latin1) and both display wrong titles and create broken links.
-- 
cgit v1.2.3


From d902444875abfe77811e3ef488535a82bb5e579b Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 09:11:11 -0400
Subject: remove some unintended wikilinks

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index b3fe9f86c..e2eb56d47 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -286,7 +286,7 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	}
 	
 	
-	# Called to handle bookmarks like [[#heading]] or <span class="createlink"><a href="http://u32.net/cgi-bin/ikiwiki.cgi?page=%20text%20&amp;from=Mediawiki_Plugin%2Fmediawiki&amp;do=create" rel="nofollow">?</a>#a</span>
+	# Called to handle bookmarks like \[[#heading]] or <span class="createlink"><a href="http://u32.net/cgi-bin/ikiwiki.cgi?page=%20text%20&amp;from=Mediawiki_Plugin%2Fmediawiki&amp;do=create" rel="nofollow">?</a>#a</span>
 	sub generate_fragment_link
 	{
 	   my $url = shift;
@@ -316,10 +316,10 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	
 	   # Ikiwiki's link link plugin wrecks this line when displaying on the site.
 	   # Until the code highlighter plugin can turn off link finding,
-	   # always escape double brackets in double quotes: [[
+	   # always escape double brackets in double quotes: \[[
 	   if($inlink eq '..') {
-	      # Mediawiki doesn't touch links like [[..#hi|ho]].
-	      return "[[" . $inlink . ($anchor?"#$anchor":"") .
+	      # Mediawiki doesn't touch links like \[[..#hi|ho]].
+	      return "\[[" . $inlink . ($anchor?"#$anchor":"") .
 	         ($title?"|$title":"") . "]]" . $trailing;
 	   }
 	
@@ -380,7 +380,7 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	      add_depends($page, $redir_page);
 	      my $link=bestlink($page, underscorize(translate_path($page,$redir_page)));
 	      if (! length $link) {
-	         return "<b>Redirect Error:</b> <nowiki>[[$redir_page]] not found.</nowiki>";
+	         return "<b>Redirect Error:</b> <nowiki>\[[$redir_page]] not found.</nowiki>";
 	      }
 	
 	      $value=urlto($link, $page);
@@ -393,7 +393,7 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	      my %seen;
 	      while (exists $pagestate{$at}{mediawiki}{redir}) {
 	         if ($seen{$at}) {
-	            return "<b>Redirect Error:</b> cycle found on <nowiki>[[$at]]</nowiki>";
+	            return "<b>Redirect Error:</b> cycle found on <nowiki>\[[$at]]</nowiki>";
 	         }
 	         $seen{$at}=1;
 	         $at=$pagestate{$at}{mediawiki}{redir};
-- 
cgit v1.2.3


From 827c2c8bbe35da51fe3615a2b9a4207e5c56c09c Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Fri, 2 Oct 2009 09:56:37 -0400
Subject: add link

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index d38bc5015..a98abf578 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -126,6 +126,7 @@ Personal sites and blogs
 * [tumashu's page](http://tumashu.github.com) This is my personal site in github  created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master)  
 * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
+* [Weakish Jiang's Homepage](http://weakish.pigro.net)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 0c6648f02c56a867d1078832921b185c3fce310d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 12:37:53 -0400
Subject: mirrorlist: Display nothing if list is empty.

---
 IkiWiki/Plugin/mirrorlist.pm | 3 ++-
 debian/changelog             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index 737dcf767..d0a6107ef 100644
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -29,7 +29,8 @@ sub pagetemplate (@) {
 	my %params=@_;
         my $template=$params{template};
 	
-	if ($template->query(name => "extrafooter")) {
+	if ($template->query(name => "extrafooter") &&
+	    keys %{$config{mirrorlist}} > 0) {
 		my $value=$template->param("extrafooter");
 		$value.=mirrorlist($params{page});
 		$template->param(extrafooter => $value);
diff --git a/debian/changelog b/debian/changelog
index b948aaf56..b6383bacb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * toggle, relativedate: Support templates that add attributes
     to the body tag.
   * Support RPC::XML 0.69's incompatable object instantiation method.
+  * mirrorlist: Display nothing if list is empty.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
-- 
cgit v1.2.3


From b9b06d9303179833129adb3c93cc97d13188b3d2 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 13:53:52 -0400
Subject:

---
 doc/users/jon.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 551d4764a..a3b37bc55 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -25,3 +25,5 @@ I am also working on some ikiwiki hacks:
 * a system for [[forum/managing_todo_lists]] (see also
   [[todo/interactive todo lists]] and <http://dev.jmtd.net/outliner/> for the
   current WIP).
+
+I am currently mostly interested in ikiwiki usability issues:
-- 
cgit v1.2.3


From b9b4bb5cb924ce74b2eb8a9cd5e25fb4bed69ef9 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 14:20:35 -0400
Subject: weird tag/brokenlinks bug

---
 doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn

diff --git a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
new file mode 100644
index 000000000..4b9743094
--- /dev/null
+++ b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
@@ -0,0 +1,11 @@
+After several runs of ikiwiki --refresh, the page I use with the [[plugin/brokenlinks]] directive on it accumulates multiple repeated lists of pages on the RHS. For example:
+
+ * ?freebies from free kilowatts, free kilowatts, free kilowatts, free kilowatts, free kilowatts
+
+In this case the page "free kilowatts" has one link to "freebies" (it's tagged freebies).
+
+I think this may just be links caused by tags, actually.
+
+ikiwiki version 3.14159265.
+
+-- [[Jon]]
-- 
cgit v1.2.3


From b2f3514029a17a6cd6e1f4b6b85fe9f4e0317d49 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 14:22:47 -0400
Subject: opinion about login page clarity

---
 doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn

diff --git a/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn b/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
new file mode 100644
index 000000000..b06743951
--- /dev/null
+++ b/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
@@ -0,0 +1,6 @@
+When multiple login methods are enabled, the ikiwiki login page lists one form per method, e.g.
+
+ * one for openid
+ * one for local user/password store
+
+Followed by the "login" button underneath. It's not obvious to anyone unfamiliar with the software that these are distinct forms, or that there are multiple ways of logging in, etc. -- [[Jon]]
-- 
cgit v1.2.3


From e0bb2396b59ab42d47d6c3b721008d741247c132 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 14:24:03 -0400
Subject: +bugs/ the login page is unclear when multiple methods exist

---
 doc/users/jon.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index a3b37bc55..960486b0c 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -27,3 +27,5 @@ I am also working on some ikiwiki hacks:
   current WIP).
 
 I am currently mostly interested in ikiwiki usability issues:
+
+ * [[bugs/the login page is unclear when multiple methods exist]]
-- 
cgit v1.2.3


From 10ef2091362d623a848c6b17f2f70c725f93dd75 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 15:02:02 -0400
Subject: followup

---
 doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
index 4b9743094..395c7789e 100644
--- a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
+++ b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
@@ -9,3 +9,12 @@ I think this may just be links caused by tags, actually.
 ikiwiki version 3.14159265.
 
 -- [[Jon]]
+
+> Is it possible that you upgraded from a version older than 3.12,
+> and have not rebuilt your wiki since, but just refreshed? And did not run
+> `ikiwiki-transition deduplinks`? If so, suggest you rebuild the wiki,
+> or run that, either would probably fix the problem.
+> 
+> If you can get to the problem after rebuilding with the current ikiwiki, 
+> and then refreshing a few times, I guess I will need a copy of the wiki
+> source and the `.ikiwiki` directory to reproduce this. --[[Joey]] 
-- 
cgit v1.2.3


From 49f0745050e6b844592c0352a852d2956239690c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 15:05:40 -0400
Subject: didn't we already close this bug? Yes, we did. hmm

---
 .../the_login_page_is_unclear_when_multiple_methods_exist.mdwn    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn b/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
index b06743951..9985c13a0 100644
--- a/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
+++ b/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
@@ -4,3 +4,11 @@ When multiple login methods are enabled, the ikiwiki login page lists one form p
  * one for local user/password store
 
 Followed by the "login" button underneath. It's not obvious to anyone unfamiliar with the software that these are distinct forms, or that there are multiple ways of logging in, etc. -- [[Jon]]
+
+> As discussed in [[login_page_non-obvious_with_openid]],
+> architectural reasons disallow multiple forms, with multiple
+> submit buttons. But the default style sheet includes
+> a styling for the openid portion of the form that makes
+> it visually distinct from the rest of the form. I'm sure the styling
+> could be improved, but the current form does not seem too non-obvious
+> to me, or to naive users in the field. --[[Joey]]
-- 
cgit v1.2.3


From 4f9c5896b242ac08be181047ad426bd458a0bf49 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 15:15:23 -0400
Subject: add bug about transitive dependencies

---
 doc/bugs/transitive_dependencies.mdwn         | 47 +++++++++++++++++++++++++++
 doc/plugins/sidebar/discussion.mdwn           |  2 ++
 doc/todo/tracking_bugs_with_dependencies.mdwn |  5 +--
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 doc/bugs/transitive_dependencies.mdwn

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
new file mode 100644
index 000000000..c61afe81e
--- /dev/null
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -0,0 +1,47 @@
+If a sidebar contains a map, or inline (etc), one would expect a
+change/add/remove of any of the mapped/inlined pages to cause a full wiki
+rebuild. But this does not happen.
+
+If page A inlines page B, which inlines page C, a change to C will cause B
+to be updated, but A will not "notice" that this means A needs to be
+updated.
+
+One way to look at this bug is that it's a bug in where dependencies are
+recorded when preprocessing the rendered or sidebar page. The current code
+does:
+
+	add_depends($params{page}, $somepage);
+
+Where `$params{page}` is page B. If this is changed to `$params{destpage}`,
+then the dependency is added to page A, and updates to C cause it to
+change. This does result in the page A's getting lots more dependency info
+recorded than before (essentially a copy of all the B's dependency info).
+
+It's also a fragile, since all plugins that handle dependencies have to be
+changed, and do this going forward. And it seems non-obvious that this should
+be done. Or really, whether to use `page` or `destpage` there. Currently,
+making the "wrong" choice and using `destpage` instead of `page` (which nearly
+everything uses) will just result in semi-redundant dependency info being
+recorded. If we make destpage mandatory to fix this, goofing up will lead to
+this bug coming back. Ugh.
+
+Another approach to fix it could be to say that anything that causes a
+rebuild of B is treated as a change of B. Then when C is changed, B is
+rebuilt due to dependencies, and in turn this means A is rebuild because B
+"changed". 
+
+This is essentially what is done with wikilinks now, and why, if a sidebar
+links to page C, add/remove of C causes all pages to be rebuilt, as seen 
+here:
+
+	removing old page meep
+	building sidebar.mdwn, which links to meep
+	building TourBusStop.mdwn, which depends on sidebar
+	building contact.mdwn, which depends on sidebar
+	...
+
+The only downside I can see with this approach is that it involves more work.
+Does the dep resolver have to keep looping until no new pages are rebuilt?
+Seems worth a try to implement this approach.
+
+--[[Joey]] 
diff --git a/doc/plugins/sidebar/discussion.mdwn b/doc/plugins/sidebar/discussion.mdwn
index 78af3525c..eb441529c 100644
--- a/doc/plugins/sidebar/discussion.mdwn
+++ b/doc/plugins/sidebar/discussion.mdwn
@@ -1,3 +1,5 @@
 > Warning: Any change to the sidebar will cause a rebuild of the whole wiki, since every page includes a copy that has to be updated. This can especially be a problem if the sidebar includes inline or map directives, since any changes to pages inlined or mapped onto the sidebar will change the sidebar and cause a full wiki rebuild.
 
 I tried exactly that, namely having an inline in my sidebar to include an rss feed from some other side. I think the complete wiki rebuild should be doable every few days when a new article appears in that feed. But contrary to that warning there is no complete wiki rebuild, only the sidebar page is rebuilt by the "ikiwiki --aggregate" from cron. Is that a bug or a feature?
+
+> It's a bug, discussed in [[bugs/transitive_dependencies]]. --[[Joey]] 
diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index bfdbf0875..3894df5f6 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -472,10 +472,7 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>>> possibly by adding a dependency of the second type along with the dependency of the first type.
 
 >>>>>> An example of the current system not tracking enough data is 
->>>>>> where A inlines B which inlines C. A change to C will cause B to
->>>>>> rebuild, but A will not "notice" that B has implicitly changed.
->>>>>> That example suggests it might be fixable without explicitly storing
->>>>>> data, by causing a rebuild of B to be treated as a change to B.
+>>>>>> described in [[bugs/transitive_dependencies]].
 >>>>>> --[[Joey]] 
 
 >>>>> The second type of dependency is a little more tricky.  For each page, we'd need a list of pagespecs that
-- 
cgit v1.2.3


From 71eabd44d5749ec5000e4f32c8dfc19a16aef297 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 15:38:04 -0400
Subject: handle transitive dependencies by re-running dep resolver

This is a rather expensive solution to the transitive dependency problem.
---
 IkiWiki/Render.pm | 81 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 246c2260d..c58f33d68 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -455,50 +455,55 @@ sub refresh () {
 	}
 
 	if (%rendered || @del || @internal) {
-		my @changed=(keys %rendered, @del);
-
- 		my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
- 
-		# rebuild dependant pages
-		foreach my $f (@$files) {
-			next if $rendered{$f};
-			my $p=pagename($f);
-			my $reason = undef;
-
-			if (exists $depends_simple{$p}) {
-				foreach my $d (keys %{$depends_simple{$p}}) {
-					if (exists $lcchanged{$d}) {
-						$reason = $d;
-						last;
+		my @changed;
+		my $changes;
+		do {
+			$changes=0;
+			@changed=(keys %rendered, @del);
+	 		my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
+
+			# rebuild dependant pages
+			foreach my $f (@$files) {
+				next if $rendered{$f};
+				my $p=pagename($f);
+				my $reason = undef;
+	
+				if (exists $depends_simple{$p}) {
+					foreach my $d (keys %{$depends_simple{$p}}) {
+						if (exists $lcchanged{$d}) {
+							$reason = $d;
+							last;
+						}
 					}
 				}
-			}
-
-			if (exists $depends{$p} && ! defined $reason) {
-				D: foreach my $d (keys %{$depends{$p}}) {
-					my $sub=pagespec_translate($d);
-					next if $@ || ! defined $sub;
-
-					# only consider internal files
-					# if the page explicitly depends
-					# on such files
-					foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
-						next if $file eq $f;
-						my $page=pagename($file);
-						if ($sub->($page, location => $p)) {
-							$reason = $page;
-							last D;
+	
+				if (exists $depends{$p} && ! defined $reason) {
+					D: foreach my $d (keys %{$depends{$p}}) {
+						my $sub=pagespec_translate($d);
+						next if $@ || ! defined $sub;
+	
+						# only consider internal files
+						# if the page explicitly depends
+						# on such files
+						foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
+							next if $file eq $f;
+							my $page=pagename($file);
+							if ($sub->($page, location => $p)) {
+								$reason = $page;
+								last D;
+							}
 						}
 					}
 				}
+	
+				if (defined $reason) {
+					debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+					render($f);
+					$rendered{$f}=1;
+					$changes++;
+				}
 			}
-
-			if (defined $reason) {
-				debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
-				render($f);
-				$rendered{$f}=1;
-			}
-		}
+		} while $changes;
 		
 		# handle backlinks; if a page has added/removed links,
 		# update the pages it links to
-- 
cgit v1.2.3


From 52134dc0ef22d4848ea90042be12175788ac4348 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 15:41:09 -0400
Subject: minor optimisation

As soon as a change happens, we know we will need to rescan all
dependencies from the start, so bail out of the current scan partway to
avoid doing redundant work.

Only problem with this is that ikiwiki sometimes ends up printing out
dependencies that, while correct, are not obvious. Before:

building B, which depends on A
building C, which depends on A
building D, which depends on A

After:

building B, which depends on A
building C, which depends on B
building D, which depends on C
---
 IkiWiki/Render.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c58f33d68..09b646f75 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -501,6 +501,7 @@ sub refresh () {
 					render($f);
 					$rendered{$f}=1;
 					$changes++;
+					last;
 				}
 			}
 		} while $changes;
-- 
cgit v1.2.3


From 53a8aeb1d1cfd42ae069e173437b34489d28d157 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 15:45:14 -0400
Subject: implemented one fix in transitive-dependencies branch, but not really
 happy with it

---
 doc/bugs/transitive_dependencies.mdwn | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
index c61afe81e..89f0d7085 100644
--- a/doc/bugs/transitive_dependencies.mdwn
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -25,9 +25,15 @@ everything uses) will just result in semi-redundant dependency info being
 recorded. If we make destpage mandatory to fix this, goofing up will lead to
 this bug coming back. Ugh.
 
-Another approach to fix it could be to say that anything that causes a
+----
+
+## rebuild = change approach
+
+[[!template id=gitbranch branch=master/transitive-dependencies author="[[joey]]"]]
+
+Another approach to fix it is to say that anything that causes a
 rebuild of B is treated as a change of B. Then when C is changed, B is
-rebuilt due to dependencies, and in turn this means A is rebuild because B
+rebuilt due to dependencies, and in turn this means A is rebuilt because B
 "changed". 
 
 This is essentially what is done with wikilinks now, and why, if a sidebar
@@ -40,8 +46,17 @@ here:
 	building contact.mdwn, which depends on sidebar
 	...
 
-The only downside I can see with this approach is that it involves more work.
-Does the dep resolver have to keep looping until no new pages are rebuilt?
-Seems worth a try to implement this approach.
+Downsides here:
+
+* Means a minimum of 2x as much time spent resolving dependencies,
+  at least in my simple implementation, which re-runs the dependency
+  resolution loop until no new pages are rebuilt.
+* Causes extra work for some transitive dependencies that we don't
+  actually care about. For example, changing index causes
+  plugins/brokenlinks to update in the first pass; if there's a second
+  pass, plugins/map is then updated, because it depends on plugins/brokenlinks.
+  (Of course, this is just a special case of the issue that a real
+  modification to plugins/brokenlinks causes an unnecessary update of plugins/map,
+  because we have only one kind of dependency.)
 
 --[[Joey]] 
-- 
cgit v1.2.3


From 537824a2791485536746e78b27d232e868560171 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 15:46:27 -0400
Subject: fix branch name

---
 doc/bugs/transitive_dependencies.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
index 89f0d7085..e3043b61b 100644
--- a/doc/bugs/transitive_dependencies.mdwn
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -29,7 +29,7 @@ this bug coming back. Ugh.
 
 ## rebuild = change approach
 
-[[!template id=gitbranch branch=master/transitive-dependencies author="[[joey]]"]]
+[[!template id=gitbranch branch=origin/transitive-dependencies author="[[joey]]"]]
 
 Another approach to fix it is to say that anything that causes a
 rebuild of B is treated as a change of B. Then when C is changed, B is
-- 
cgit v1.2.3


From 4c88d42762380928d352a26a4faaffb88cbb2406 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 15:48:47 -0400
Subject: mention loop optimisation

---
 doc/bugs/transitive_dependencies.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
index e3043b61b..d5571cb6a 100644
--- a/doc/bugs/transitive_dependencies.mdwn
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -51,6 +51,8 @@ Downsides here:
 * Means a minimum of 2x as much time spent resolving dependencies,
   at least in my simple implementation, which re-runs the dependency
   resolution loop until no new pages are rebuilt.
+  (I added an optimisation that gets it down to 1.5X as much work on
+  average, still 2x as much worst case.)
 * Causes extra work for some transitive dependencies that we don't
   actually care about. For example, changing index causes
   plugins/brokenlinks to update in the first pass; if there's a second
-- 
cgit v1.2.3


From 8bb94bb197714fcac1ac48f9b330bef4d17dd800 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 15:56:44 -0400
Subject: split out dependency type issue into its own todo

---
 doc/todo/dependency_types.mdwn | 83 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 doc/todo/dependency_types.mdwn

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
new file mode 100644
index 000000000..db7d06914
--- /dev/null
+++ b/doc/todo/dependency_types.mdwn
@@ -0,0 +1,83 @@
+Moved this relevant discussion to here from
+[[tracking_bugs_with_dependencies]]: --[[Joey]]
+
+>>  it seems that there are two types of dependency, and ikiwiki
+>>  currently only handles one of them.  The first type is "Rebuild this
+>>  page when any of these other pages changes" - ikiwiki handles this.
+>>  The second type is "rebuild this page when set of pages referred to by
+>>  this pagespec changes" - ikiwiki doesn't seem to handle this.  I
+>>  suspect that named pagespecs would make that second type of dependency
+>>  more important.  I'll try to come up with a good example. -- [[Will]]
+
+>>> Hrm, I was going to build an example of this with backlinks, but it
+>>> looks like that is handled as a special case at the moment (line 458 of
+>>> render.pm).  I'll see if I can breapk
+>>> things another way.  Fixing this properly would allow removal of that special case. -- [[Will]]
+
+>>>> I can't quite understand the distinction you're trying to draw
+>>>> between the two types of dependencies. Backlinks are a very special
+>>>> case though and I'll be suprised if they fit well into pagespecs.
+>>>> --[[Joey]] 
+
+>>>>> The issue is that the existential pagespec matching allows you to build things that have similar
+>>>>> problems to backlinks.
+>>>>> e.g. the following inline:
+
+    \[[!inline pages="define(~done, link(done)) and link(~done)" archive=yes]]
+
+>>>>> includes any page that links to a page that links to done.  Now imagine I add a new link to 'done' on
+>>>>> some random page somewhere - a page which some other page links to which didn't previously get included - the set of pages accepted by the pagespec, and hence the set of
+>>>>> pages inlined, will change.  But, there is no dependency anywhere on the page that I altered, so
+>>>>> ikiwiki will not rebuild the page with the inline in it.  What is happening is that the page that I altered affects
+>>>>> the set of pages matched by the pagespec without itself being matched by the pagespec, and hence included in the dependency list.
+
+>>>>> To make this work well, I think you need to recognise two types of dependencies for each page (and no
+>>>>> special cases for particular types of links, eg backlinks).  The first type of dependency says, "The content of
+>>>>> this page depends upon the content of these other pages".  The `add_depends()` in the shortcuts
+>>>>> plugin is of this form: any time the shortcuts page is edited, any page with a shortcut on it
+>>>>> is rebuilt.  The inline plugin also needs to add dependencies of this form to detect when the inlined
+>>>>> content changes.  By contrast, the map plugin does not need a dependency of this form, because it
+>>>>> doesn't actually care about the content of any pages, just which pages it needs to include (which we'll handle next).
+
+>>>>> The second type of dependency says, "The content of this page depends upon the exact set of pages matched
+>>>>> by this pagespec".  The first type of dependency was about the content of some pages, the second type is about
+>>>>> which pages get matched by a pagespec.  This is the type of dependency tracking that the map plugin needs.
+>>>>> If the set of pages matched by map pagespec changes, then the page with the map on it needs to be rebuilt to show a different list of pages.
+>>>>> Inline needs this type of dependency as well as the previous type - This type handles a change in which pages
+>>>>> are inlined, the previous type handles a change in the content of any of those pages.  Shortcut does not need this type of
+>>>>> dependency.  Most of the places that use `add_depends()` seem to need this type of dependency rather than the first type.
+
+>>>>>> Note that inline and map currently achieve the second type of dependency by
+>>>>>> explicitly calling `add_depends` for each page the displayed.
+>>>>>> If any of those pages are removed, the regular pagespec would not
+>>>>>> match them -- since they're gone. However, the explicit dependency
+>>>>>> on them does cause them to match. It's an ugly corner I'd like to
+>>>>>> get rid of. --[[Joey]]
+
+>>>>> Implementation Details:  The first type of dependency can be handled very similarly to the current
+>>>>> dependency system.  You just need to keep a list of pages that the content depends upon.  You could
+>>>>> keep that list as a pagespec, but if you do this you might want to check that the pagespec doesn't change,
+>>>>> possibly by adding a dependency of the second type along with the dependency of the first type.
+
+>>>>>> An example of the current system not tracking enough data is 
+>>>>>> described in [[bugs/transitive_dependencies]].
+>>>>>> --[[Joey]] 
+
+>>>>> The second type of dependency is a little more tricky.  For each page, we'd need a list of pagespecs that
+>>>>> the page depended on, and for each pagespec you'd want to store the list of pages that currently match it.
+>>>>> On refresh, you'd need to check each pagespec to see if the set of pages that match it has changed, and if
+>>>>> that set has changed, then rebuild the dependent page(s).  Oh, and for this second type of dependency, I
+>>>>> don't think you can merge pagespecs.  If I wanted to know if either "\*" or "link(done)" changes, then just checking
+>>>>> to see if the set of pages matched by "\* or link(done)" changes doesn't work.
+
+>>>>> The current system works because even though you usually want dependencies of the second type, the set of pages
+>>>>> referred to by a pagespec can only change if one of those pages itself changes.  i.e. A dependency check of the
+>>>>> first type will catch a dependency change of the second type with current pagespecs.
+>>>>> This doesn't work with backlinks, and it doesn't work with existential matching.  Backlinks are currently special-cased.  I don't know
+>>>>> how to special-case existential matching - I suspect you're better off just getting the dependency tracking right.
+
+>>>>> I also tried to come up with other possible solutions: e.g. can we find the dependencies for a pagespec?  That
+>>>>> would be the set of pages where a change on one of those pages could lead to a change in the set of pages matched by the pagespec.
+>>>>> For old-style pagespecs without backlinks, the dependency set for a pagespec is the same as the set of pages the pagespec matches.
+>>>>> Unfortunately, with existential matching, the set of pages that each
+>>>>> pagespec depends upon can quickly become "*", which is not very useful.  -- [[Will]]
-- 
cgit v1.2.3


From 8c2d221ca93ed6fbe8f093408c4e2cea835e5b4c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 16:17:56 -0400
Subject: split off todo item for multiple dependency types

---
 doc/bugs/transitive_dependencies.mdwn         |  2 +-
 doc/todo/dependency_types.mdwn                | 46 +++++++++++++-
 doc/todo/tracking_bugs_with_dependencies.mdwn | 86 ++-------------------------
 3 files changed, 50 insertions(+), 84 deletions(-)

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
index d5571cb6a..546f4f3aa 100644
--- a/doc/bugs/transitive_dependencies.mdwn
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -59,6 +59,6 @@ Downsides here:
   pass, plugins/map is then updated, because it depends on plugins/brokenlinks.
   (Of course, this is just a special case of the issue that a real
   modification to plugins/brokenlinks causes an unnecessary update of plugins/map,
-  because we have only one kind of dependency.)
+  because we have [[only_one_kind_of_dependency|todo/dependency_types]].)
 
 --[[Joey]] 
diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index db7d06914..6d722aab9 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -1,5 +1,24 @@
-Moved this relevant discussion to here from
-[[tracking_bugs_with_dependencies]]: --[[Joey]]
+Ikiwiki currently only has one type of dependency between pages
+(plus wikilinks special cased in on the side). This has resulted in various
+problems, and it's seemed for a long time to me that ikiwiki needs to get
+smarter about what types of dependencies are supported.
+
+### unnecessary work
+
+The current single dependency type causes the depending page to be rebuilt
+whenever a matching dependency is added, removed, or *modified*. But a
+great many things don't care about the modification case, and often cause
+unnecessary page rebuilds:
+
+* meta only cares if the pages are added or removed. Content change does
+  not matter (unless show=title is used).
+* brokenlinks, orphans, pagecount, ditto
+* inline in archive mode cares about page title, author changing, but
+  not content. (Ditto for meta with show=title.)
+* Causes extra work when solving the [[bug/transitive_dependencies]]
+  problem.
+
+### two types of dependencies needed for [[tracking_bugs_with_dependencies]]
 
 >>  it seems that there are two types of dependency, and ikiwiki
 >>  currently only handles one of them.  The first type is "Rebuild this
@@ -81,3 +100,26 @@ Moved this relevant discussion to here from
 >>>>> For old-style pagespecs without backlinks, the dependency set for a pagespec is the same as the set of pages the pagespec matches.
 >>>>> Unfortunately, with existential matching, the set of pages that each
 >>>>> pagespec depends upon can quickly become "*", which is not very useful.  -- [[Will]]
+
+### proposal
+
+I propose the following. --[[Joey]] 
+
+* Add a second type of dependency, call it an "contentless dependency".
+* `add_depends` defaults to adding a regular ("full") dependency, as
+  before. (So nothing breaks.)
+* `add_depends($page, $spec, content => 0)` adds an contentless dependency.
+* Contentless dependencies are stored in `%depends_contentless` and
+  `%depends_contentless_simple`, which are stored in the index similarly
+  to the existing hashes.
+* `refresh` only looks at added/removed pages when resolving contentless
+  dependencies.
+
+This seems straightforwardly doable. I'd like [[Will]]'s feedback on it, if
+possible. The type types of dependencies I am proposing are not identical
+to the two types he talks about above, but I hope are close enough that
+they can be used.
+
+This doesn't deal with the stuff that only depend on the metadata of a
+page, as collected in the scan pass, changing. But it does leave a window
+open for adding such a dependency type later.
diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 3894df5f6..5f3ece290 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -360,7 +360,10 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 > --[[Joey]] 
 
 >>  There is one issue that I've been thinking about that I haven't raised anywhere (or checked myself), and that is how this all interacts with page dependencies.
->>  Firstly, I'm not sure anymore that the `pagespec_merge` function will continue to work in all cases.
+>> 
+>>> I've moved the discussion of that to [[dependency_types]]. --[[Joey]] 
+>>
+>>  I'm not sure anymore that the `pagespec_merge` function will continue to work in all cases.
 
 >>> The problem I can see there is that if two pagespecs
 >>> get merged and both use `~foo` but define it differently,
@@ -413,86 +416,7 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>> My [[remove-pagespec-merge|should_optimise_pagespecs]] branch has now
 >>> solved all this by deleting the offending function :-) --[[smcv]]
 
->>  Secondly, it seems that there are two types of dependency, and ikiwiki
->>  currently only handles one of them.  The first type is "Rebuild this
->>  page when any of these other pages changes" - ikiwiki handles this.
->>  The second type is "rebuild this page when set of pages referred to by
->>  this pagespec changes" - ikiwiki doesn't seem to handle this.  I
->>  suspect that named pagespecs would make that second type of dependency
->>  more important.  I'll try to come up with a good example. -- [[Will]]
-
->>> Hrm, I was going to build an example of this with backlinks, but it
->>> looks like that is handled as a special case at the moment (line 458 of
->>> render.pm).  I'll see if I can breapk
->>> things another way.  Fixing this properly would allow removal of that special case. -- [[Will]]
-
->>>> I can't quite understand the distinction you're trying to draw
->>>> between the two types of dependencies. Backlinks are a very special
->>>> case though and I'll be suprised if they fit well into pagespecs.
->>>> --[[Joey]] 
-
->>>>> The issue is that the existential pagespec matching allows you to build things that have similar
->>>>> problems to backlinks.
->>>>> e.g. the following inline:
-
-    \[[!inline pages="define(~done, link(done)) and link(~done)" archive=yes]]
-
->>>>> includes any page that links to a page that links to done.  Now imagine I add a new link to 'done' on
->>>>> some random page somewhere - a page which some other page links to which didn't previously get included - the set of pages accepted by the pagespec, and hence the set of
->>>>> pages inlined, will change.  But, there is no dependency anywhere on the page that I altered, so
->>>>> ikiwiki will not rebuild the page with the inline in it.  What is happening is that the page that I altered affects
->>>>> the set of pages matched by the pagespec without itself being matched by the pagespec, and hence included in the dependency list.
-
->>>>> To make this work well, I think you need to recognise two types of dependencies for each page (and no
->>>>> special cases for particular types of links, eg backlinks).  The first type of dependency says, "The content of
->>>>> this page depends upon the content of these other pages".  The `add_depends()` in the shortcuts
->>>>> plugin is of this form: any time the shortcuts page is edited, any page with a shortcut on it
->>>>> is rebuilt.  The inline plugin also needs to add dependencies of this form to detect when the inlined
->>>>> content changes.  By contrast, the map plugin does not need a dependency of this form, because it
->>>>> doesn't actually care about the content of any pages, just which pages it needs to include (which we'll handle next).
-
->>>>> The second type of dependency says, "The content of this page depends upon the exact set of pages matched
->>>>> by this pagespec".  The first type of dependency was about the content of some pages, the second type is about
->>>>> which pages get matched by a pagespec.  This is the type of dependency tracking that the map plugin needs.
->>>>> If the set of pages matched by map pagespec changes, then the page with the map on it needs to be rebuilt to show a different list of pages.
->>>>> Inline needs this type of dependency as well as the previous type - This type handles a change in which pages
->>>>> are inlined, the previous type handles a change in the content of any of those pages.  Shortcut does not need this type of
->>>>> dependency.  Most of the places that use `add_depends()` seem to need this type of dependency rather than the first type.
-
->>>>>> Note that inline and map currently achieve the second type of dependency by
->>>>>> explicitly calling `add_depends` for each page the displayed.
->>>>>> If any of those pages are removed, the regular pagespec would not
->>>>>> match them -- since they're gone. However, the explicit dependency
->>>>>> on them does cause them to match. It's an ugly corner I'd like to
->>>>>> get rid of. --[[Joey]]
-
->>>>> Implementation Details:  The first type of dependency can be handled very similarly to the current
->>>>> dependency system.  You just need to keep a list of pages that the content depends upon.  You could
->>>>> keep that list as a pagespec, but if you do this you might want to check that the pagespec doesn't change,
->>>>> possibly by adding a dependency of the second type along with the dependency of the first type.
-
->>>>>> An example of the current system not tracking enough data is 
->>>>>> described in [[bugs/transitive_dependencies]].
->>>>>> --[[Joey]] 
-
->>>>> The second type of dependency is a little more tricky.  For each page, we'd need a list of pagespecs that
->>>>> the page depended on, and for each pagespec you'd want to store the list of pages that currently match it.
->>>>> On refresh, you'd need to check each pagespec to see if the set of pages that match it has changed, and if
->>>>> that set has changed, then rebuild the dependent page(s).  Oh, and for this second type of dependency, I
->>>>> don't think you can merge pagespecs.  If I wanted to know if either "\*" or "link(done)" changes, then just checking
->>>>> to see if the set of pages matched by "\* or link(done)" changes doesn't work.
-
->>>>> The current system works because even though you usually want dependencies of the second type, the set of pages
->>>>> referred to by a pagespec can only change if one of those pages itself changes.  i.e. A dependency check of the
->>>>> first type will catch a dependency change of the second type with current pagespecs.
->>>>> This doesn't work with backlinks, and it doesn't work with existential matching.  Backlinks are currently special-cased.  I don't know
->>>>> how to special-case existential matching - I suspect you're better off just getting the dependency tracking right.
-
->>>>> I also tried to come up with other possible solutions: e.g. can we find the dependencies for a pagespec?  That
->>>>> would be the set of pages where a change on one of those pages could lead to a change in the set of pages matched by the pagespec.
->>>>> For old-style pagespecs without backlinks, the dependency set for a pagespec is the same as the set of pages the pagespec matches.
->>>>> Unfortunately, with existential matching, the set of pages that each
->>>>> pagespec depends upon can quickly become "*", which is not very useful.  -- [[Will]]
+
 
 Patch updated to use closures rather than inline generated code for named pagespecs.  Also includes some new use of ErrorReason where appropriate. -- [[Will]]
 
-- 
cgit v1.2.3


From 1df5c5a22c7e04635c669f7d977da0318dfde9cf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 16:22:47 -0400
Subject: fix

---
 doc/todo/dependency_types.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 6d722aab9..215a65c8a 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -15,7 +15,7 @@ unnecessary page rebuilds:
 * brokenlinks, orphans, pagecount, ditto
 * inline in archive mode cares about page title, author changing, but
   not content. (Ditto for meta with show=title.)
-* Causes extra work when solving the [[bug/transitive_dependencies]]
+* Causes extra work when solving the [[bugs/transitive_dependencies]]
   problem.
 
 ### two types of dependencies needed for [[tracking_bugs_with_dependencies]]
-- 
cgit v1.2.3


From c1ca46a785164eec099e003c0883245ca728e461 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 17:23:37 -0400
Subject: response

---
 doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
index 395c7789e..2091570d1 100644
--- a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
+++ b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
@@ -18,3 +18,5 @@ ikiwiki version 3.14159265.
 > If you can get to the problem after rebuilding with the current ikiwiki, 
 > and then refreshing a few times, I guess I will need a copy of the wiki
 > source and the `.ikiwiki` directory to reproduce this. --[[Joey]] 
+
+>> Hi Joey, thanks for your response. I've reproduced it post rebuild and after having ran ikiwiki-transition and many refreshes (both resulting from content changes and otherwise) unfortunately, with ikiwiki 3.14159265 (different machine to above report, though). I will contact you privately to provide a git URL and a copy of my .ikiwiki. -- [[Jon]]
-- 
cgit v1.2.3


From a56fd6fde977cc48170b61d3518b13a3e1e1a936 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 17:25:18 -0400
Subject: +bugs/ backlinks onhover thing can go weird

---
 doc/users/jon.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 960486b0c..e37090485 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -29,3 +29,4 @@ I am also working on some ikiwiki hacks:
 I am currently mostly interested in ikiwiki usability issues:
 
  * [[bugs/the login page is unclear when multiple methods exist]]
+ * [[bugs/backlinks onhover thing can go weird]]
-- 
cgit v1.2.3


From 1d0d98eec4370f6daaf513f9553c5813e57e837e Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 17:30:46 -0400
Subject: wishlist/todo item: disable/enable directives by pagespec

---
 doc/todo/pagespec_to_disable_ikiwiki_directives.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/todo/pagespec_to_disable_ikiwiki_directives.mdwn

diff --git a/doc/todo/pagespec_to_disable_ikiwiki_directives.mdwn b/doc/todo/pagespec_to_disable_ikiwiki_directives.mdwn
new file mode 100644
index 000000000..4211c2d10
--- /dev/null
+++ b/doc/todo/pagespec_to_disable_ikiwiki_directives.mdwn
@@ -0,0 +1,5 @@
+I would like some pages (identified by pagespec) to not expand ikiwiki directives (wikilinks, or \[[!, or both, or perhaps either).
+
+I will tag this [[wishlist]]. It's something I might try myself. It's part of my thinking about how to handle [[comments]], as I'm still ruminating on alternatives to [[smcv]]'s approach. (with the greatest of respect to smcv!) (Perhaps my attempt will try to factor out the no-directives-allowed logic from the comments plugin).
+
+ -- [[Jon]]
-- 
cgit v1.2.3


From 1ead5f7987ef06f872fb638777d6621f06eb6caf Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 2 Oct 2009 17:31:40 -0400
Subject:

---
 doc/users/jon.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index e37090485..b873a51e1 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -21,7 +21,7 @@ I am also working on some ikiwiki hacks:
 * an alternative approach to [[plugins/comments]] (see
   [[todo/more flexible inline postform]] for one piece of the puzzle;
   <http://dev.jmtd.net/comments/> for some investigation into making the post
-  form more integrated)
+  form more integrated); possibly also [[todo/pagespec to disable ikiwiki directives]]
 * a system for [[forum/managing_todo_lists]] (see also
   [[todo/interactive todo lists]] and <http://dev.jmtd.net/outliner/> for the
   current WIP).
-- 
cgit v1.2.3


From 06a1ad7e760258eb0689e327825c15e2aa5234b2 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Fri, 2 Oct 2009 18:28:11 -0400
Subject: Add reference to new plugin

---
 doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn

diff --git a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
new file mode 100644
index 000000000..4cfbbbf3c
--- /dev/null
+++ b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
@@ -0,0 +1,5 @@
+At the moment, IkiWiki allows you to set the template for individual pages using the [[plugins/pagetemplate]] directive/plugin, but not for whole sections of the wiki.
+
+I've written a new plugin, sectiontemplate, available in the `page_tmpl` branch of my git repository that allows setting the template by pagespec in the config file.
+
+-- [[Will]]
-- 
cgit v1.2.3


From 7ef22f25969741fb7aed9be650dd026dd6dddcc9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 18:45:56 -0400
Subject: improve wording

---
 doc/ikiwiki/directive/pagetemplate.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/pagetemplate.mdwn b/doc/ikiwiki/directive/pagetemplate.mdwn
index 0e4066f34..8ad901c1a 100644
--- a/doc/ikiwiki/directive/pagetemplate.mdwn
+++ b/doc/ikiwiki/directive/pagetemplate.mdwn
@@ -1,6 +1,8 @@
 The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate desc=pagetemplate]] plugin.
 
-This directive allows a page to be created using a different wikitemplates.
+This directive allows a page to be displayed using a different template than
+the default `page.tmpl` template.
+
 The page text is inserted into the template, so the template controls the
 overall look and feel of the wiki page. This is in contrast to the
 [[ikiwiki/directive/template]] directive, which allows inserting templates
-- 
cgit v1.2.3


From 6e133959bc69877459fec2ea32788d0656b92168 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 18:47:15 -0400
Subject: fix wording here too

---
 doc/plugins/pagetemplate.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/pagetemplate.mdwn b/doc/plugins/pagetemplate.mdwn
index afd5eb500..53f069d0d 100644
--- a/doc/plugins/pagetemplate.mdwn
+++ b/doc/plugins/pagetemplate.mdwn
@@ -2,8 +2,8 @@
 [[!tag type/chrome]]
 
 This plugin provides the [[ikiwiki/directive/pagetemplate]]
-[[ikiwiki/directive]], which allows a page to be created using a different
-[[template|wikitemplates]].
+[[ikiwiki/directive]], which allows a page to be displayed
+using a different [[template|wikitemplates]] than the default.
 
 This plugin can only use templates that are already installed in
 `/usr/share/ikiwiki/templates` (or wherever ikiwiki is configured to look for
-- 
cgit v1.2.3


From db64972b65c7504b6d2bbed69e438203eef0a518 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 18:51:52 -0400
Subject: combine with pagetemplate?

---
 doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
index 4cfbbbf3c..ed9740068 100644
--- a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
+++ b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
@@ -3,3 +3,9 @@ At the moment, IkiWiki allows you to set the template for individual pages using
 I've written a new plugin, sectiontemplate, available in the `page_tmpl` branch of my git repository that allows setting the template by pagespec in the config file.
 
 -- [[Will]]
+
+> This is an excellent idea and looks ready for merging.
+> Before I do though, would it perhaps make sense to merge
+> this in with the pagetemplate plugin? They do such a similar thing,
+> and unless letting users control the template by editing a page is not
+> wanted, I can't see any reason not to combine them. --[[Joey]] 
-- 
cgit v1.2.3


From 9673806a6d94b320bf2289dd091175a742bcee26 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 18:58:07 -0400
Subject: consistency with edittemplate?

---
 doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
index ed9740068..b9c397358 100644
--- a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
+++ b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
@@ -8,4 +8,10 @@ I've written a new plugin, sectiontemplate, available in the `page_tmpl` branch
 > Before I do though, would it perhaps make sense to merge
 > this in with the pagetemplate plugin? They do such a similar thing,
 > and unless letting users control the template by editing a page is not
-> wanted, I can't see any reason not to combine them. --[[Joey]] 
+> wanted, I can't see any reason not to combine them. --[[Joey]]
+
+> One other idea is moving the pagespec from setup file to a directive.
+> The edittemplate plugin does that, and it might be nice
+> to be consistent with that. To implement it, you'd have to
+> make the scan hook store the template pagespecs in `%pagestate`,
+> so a bit more complicated. --[[Joey]] 
-- 
cgit v1.2.3


From 5de7ba82911ee1ab966a755e97931d5b6a3bacb1 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Sat, 3 Oct 2009 01:39:06 -0400
Subject: response

---
 doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
index b9c397358..cd57c1257 100644
--- a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
+++ b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
@@ -15,3 +15,11 @@ I've written a new plugin, sectiontemplate, available in the `page_tmpl` branch
 > to be consistent with that. To implement it, you'd have to
 > make the scan hook store the template pagespecs in `%pagestate`,
 > so a bit more complicated. --[[Joey]] 
+
+>> I started with the pagetemplate plugin, which is why they're so similar.  I guess they could be combined.
+>> I had a brief think about having the specs and templates defined in a directive rather than the config file, but it got tricky.
+>> How do you know what needs to be rebuilt when?  There is probably a solution, maybe even an obvious one, but I thought that getting something done was more important than polishing it.
+>> In the worst case, admins can always use the web interface to change the setup :).
+
+>> I wanted this to put comments on my new blog, and was more interested in that goal than this subgoal.  I've moved most of my web pages to IkiWiki and there is only one small part that is the blog.
+>> I wanted to use [[Disqus comments|tips/Adding_Disqus_to_your_wiki/]], but only on the blog pages.  (I'm using Disqus rather than IkiWiki comments because I don't want to have to deal with spam, security, etc.  I'll happily just let someone else host the comments.) -- [[Will]]
-- 
cgit v1.2.3


From e4eca63767a497ef696bb7757763f138114581e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 14:01:19 -0400
Subject: do not need to qualify %links

---
 IkiWiki.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 85d8eea68..974e36902 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -544,12 +544,12 @@ sub loadplugins () {
 	}
 	
 	if ($config{rcs}) {
-		if (exists $IkiWiki::hooks{rcs}) {
+		if (exists $hooks{rcs}) {
 			error(gettext("cannot use multiple rcs plugins"));
 		}
 		loadplugin($config{rcs});
 	}
-	if (! exists $IkiWiki::hooks{rcs}) {
+	if (! exists $hooks{rcs}) {
 		loadplugin("norcs");
 	}
 
-- 
cgit v1.2.3


From ffa73790b5c381df6e0385995b720dd24188969b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 14:14:30 -0400
Subject: Fix a bug that could lead to duplicate links being recorded for tags.

Here I was bitten by perl's aliasing of foreach variables
to the loop array contents, and match_link accidentially changed
the contents of %links.

In Jon's testcase, a tag added an absolute link, which was
made relative by the above bug, and then the link was added
again in preprocess, and turned into a duplicate.
---
 IkiWiki.pm                                            | 6 +++---
 debian/changelog                                      | 2 ++
 doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 974e36902..2637f6017 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2052,10 +2052,10 @@ sub match_link ($$;@) {
 		else {
 			return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
 				if match_glob($p, $link, %params);
-			$p=~s/^\///;
+			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
-				if match_glob($p, $link, %params);
+			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link")
+				if match_glob($p_rel, $link, %params);
 		}
 	}
 	return IkiWiki::FailReason->new("$page does not link to $link");
diff --git a/debian/changelog b/debian/changelog
index b6383bacb..ca5409af7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
     to the body tag.
   * Support RPC::XML 0.69's incompatable object instantiation method.
   * mirrorlist: Display nothing if list is empty.
+  * Fix a bug that could lead to duplicate links being recorded
+    for tags.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
diff --git a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
index 2091570d1..d07b2381d 100644
--- a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
+++ b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
@@ -20,3 +20,6 @@ ikiwiki version 3.14159265.
 > source and the `.ikiwiki` directory to reproduce this. --[[Joey]] 
 
 >> Hi Joey, thanks for your response. I've reproduced it post rebuild and after having ran ikiwiki-transition and many refreshes (both resulting from content changes and otherwise) unfortunately, with ikiwiki 3.14159265 (different machine to above report, though). I will contact you privately to provide a git URL and a copy of my .ikiwiki. -- [[Jon]]
+
+>>> Found the bug that was causing duplicates to get in, and fixed it.
+>>> [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 743f69c675de6bdf240a2980e0924ed9d3bb782b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 15:31:51 -0400
Subject: add dependency type parameters to add_depends

Dependency types are represented by bits in the values of the %depends
and %depends_simple hashes.

Change the dependslist array saved to the index to a depends hash.
depends_simple is also converted from an array to a hash.

Note that the depends field used to be a string, and we still
have compat code to handle upgrades from that, as well as from the arrays.
I didn't use ikiwiki-transition because I don't want ikiwiki to break if
users forget to run it; also we're going to recommend a full rebuild on
upgrade to this version to get the improved dependency handling. So
this compat code can be removed or moved to ikiwiki-transition later.
---
 IkiWiki.pm | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2637f6017..67149bc8b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -28,6 +28,10 @@ our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
 
+# Page dependency types.
+our $DEPEND_EXISTS=1;
+our $DEPEND_CONTENT=2;
+
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
@@ -1524,18 +1528,28 @@ sub loadindex () {
 				$links{$page}=$d->{links};
 				$oldlinks{$page}=[@{$d->{links}}];
 			}
-			if (exists $d->{depends_simple}) {
+			if (ref $d->{depends_simple} eq 'ARRAY') {
+				# old format
 				$depends_simple{$page}={
 					map { $_ => 1 } @{$d->{depends_simple}}
 				};
 			}
+			elsif (exists $d->{depends_simple}) {
+				$depends{$page}=$d->{depends_simple};
+			}
 			if (exists $d->{dependslist}) {
+				# old format
 				$depends{$page}={
-					map { $_ => 1 } @{$d->{dependslist}}
+					map { $_ => $DEPEND_CONTENT | $DEPEND_EXISTS }
+						@{$d->{dependslist}}
 				};
 			}
+			elsif (exists $d->{depends} && ! ref $d->{depends}) {
+				# old format
+				$depends{$page}={$d->{depends} => $DEPEND_CONTENT | $DEPEND_EXISTS};
+			}
 			elsif (exists $d->{depends}) {
-				$depends{$page}={$d->{depends} => 1};
+				$depends{$page}=$d->{depends};
 			}
 			if (exists $d->{state}) {
 				$pagestate{$page}=$d->{state};
@@ -1581,11 +1595,11 @@ sub saveindex () {
 		};
 
 		if (exists $depends{$page}) {
-			$index{page}{$src}{dependslist} = [ keys %{$depends{$page}} ];
+			$index{page}{$src}{depends} = $depends{$page};
 		}
 
 		if (exists $depends_simple{$page}) {
-			$index{page}{$src}{depends_simple} = [ keys %{$depends_simple{$page}} ];
+			$index{page}{$src}{depends_simple} = $depends_simple{$page};
 		}
 
 		if (exists $pagestate{$page}) {
@@ -1753,20 +1767,28 @@ sub rcs_receive () {
 	$hooks{rcs}{rcs_receive}{call}->();
 }
 
-sub add_depends ($$) {
+sub add_depends ($$;@) {
 	my $page=shift;
 	my $pagespec=shift;
 
+	my $deptype=$DEPEND_CONTENT | $DEPEND_EXISTS;
+	if (@_) {
+		my %params=@_;
+		if (defined $params{content} && $params{content} == 0) {
+			$deptype=$deptype & ~$DEPEND_CONTENT;
+		}
+	}
+
 	if ($pagespec =~ /$config{wiki_file_regexp}/ &&
 		$pagespec !~ /[\s*?()!]/) {
 		# a simple dependency, which can be matched by string eq
-		$depends_simple{$page}{lc $pagespec} = 1;
+		$depends_simple{$page}{lc $pagespec} |= $deptype;
 		return 1;
 	}
 
 	return unless pagespec_valid($pagespec);
 
-	$depends{$page}{$pagespec} = 1;
+	$depends{$page}{$pagespec} |= $deptype;
 	return 1;
 }
 
-- 
cgit v1.2.3


From dc4e44adf13bc20c0a801f2b176370f330841098 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 15:36:23 -0400
Subject: pagecount: Use contentless dependency

This will avoid lots of unnecessary updates of pages using the pagecount
directive. Yay!
---
 IkiWiki/Plugin/pagecount.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 5a2301af4..17eda0618 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -23,8 +23,8 @@ sub preprocess (@) {
 	$params{pages}="*" unless defined $params{pages};
 	
 	# Needs to update count whenever a page is added or removed, so
-	# register a dependency.
-	add_depends($params{page}, $params{pages});
+	# register a contentless dependency.
+	add_depends($params{page}, $params{pages}, content => 0);
 	
 	my @pages;
 	if ($params{pages} eq "*") {
-- 
cgit v1.2.3


From 5c9f65a67294e3e7b2759306c182b7eedc93093d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 15:37:15 -0400
Subject: set dependency hash value properly for new dependency types

Just "1" won't cut it anymore; we need to list all the dependency types.
---
 ikiwiki-transition | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 8a20cf655..c50a748e8 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -299,7 +299,7 @@ sub oldloadindex {
 			$pagemtime{$page}=$items{mtime}[0];
 			$oldlinks{$page}=[@{$items{link}}];
 			$links{$page}=[@{$items{link}}];
-			$depends{$page}={ $items{depends}[0] => 1 } if exists $items{depends};
+			$depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_EXISTS } if exists $items{depends};
 			$destsources{$_}=$page foreach @{$items{dest}};
 			$renderedfiles{$page}=[@{$items{dest}}];
 			$pagecase{lc $page}=$page;
-- 
cgit v1.2.3


From fd9d9680242c0d1c835fc56f969f8e2a2618a5de Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 15:37:57 -0400
Subject: document add_depends dependency type interface

---
 doc/plugins/write.mdwn | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 668f8d8b6..c244c1f2f 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -609,10 +609,17 @@ page created from it. (Ie, it appends ".html".)
 Use this when constructing the filename of a html file. Use `urlto` when
 generating a link to a page.
 
-#### `add_depends($$)`
+#### `add_depends($$;@)`
 
 Makes the specified page depend on the specified [[ikiwiki/PageSpec]].
 
+Additional named parameters can be passed, to indicate what type of
+dependency this is.
+
+Currently, only a "content" parameter is specified. If set to 0, the
+dependency does not involve the content of pages matching the PageSpec, but
+only their existence.
+
 #### `pagespec_match($$;@)`
 
 Passed a page name, and [[ikiwiki/PageSpec]], returns true if the
-- 
cgit v1.2.3


From 49b71d0615f3ec995e8958ede6baaae8524d1986 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 15:38:18 -0400
Subject: update

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ca5409af7..bec1a61d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * mirrorlist: Display nothing if list is empty.
   * Fix a bug that could lead to duplicate links being recorded
     for tags.
+  * Added support framework for multiple types of dependencies.
+  * Allow declaring that a dependency does not encompass the content of a
+    page. (By passing content => 0 to add_depends.)
+  * pagecount: Use a contentless dependency, which makes this
+    directive much less expensive to use, since page edits will
+    no longer trigger an unnecessary update of the page count.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
-- 
cgit v1.2.3


From 26dbc09bd88ba6c33c18995c2b028726c370012f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 15:46:53 -0400
Subject: implement support for DEPEND_EXISTS

Preliminary support, anyway.

If a dependency only includes DEPEND_EXISTS, then only changes that
involved adding or deleting a page can trigger it.

This is complicated by internal pages, since the code did not previously
differentiate between add, delete, and change of internal pages.
Now it tracks change separately from add+delete, so DEPEND_EXISTS pagespecs
that actually match internal pages (which will probably be quite rare in
practice) should work.
---
 IkiWiki/Render.pm | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 246c2260d..9e00428c2 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -342,7 +342,7 @@ sub refresh () {
 	run_hooks(refresh => sub { shift->() });
 	my ($files, $exists)=find_src_files();
 
-	my (%rendered, @add, @del, @internal);
+	my (%rendered, @add, @del, @internal, @internal_change);
 	# check for added or removed pages
 	foreach my $file (@$files) {
 		my $page=pagename($file);
@@ -407,7 +407,7 @@ sub refresh () {
 	    	    $forcerebuild{$page}) {
 			$pagemtime{$page}=$stat[9];
 			if (isinternal($page)) {
-				push @internal, $file;
+				push @internal_change, $file;
 				# Preprocess internal page in scan-only mode.
 				preprocess($page, $page, readfile($srcfile), 1);
 			}
@@ -429,7 +429,7 @@ sub refresh () {
 		render($file);
 		$rendered{$file}=1;
 	}
-	foreach my $file (@internal) {
+	foreach my $file (@internal, @internal_change) {
 		# internal pages are not rendered
 		my $page=pagename($file);
 		delete $depends{$page};
@@ -454,10 +454,12 @@ sub refresh () {
 		}
 	}
 
-	if (%rendered || @del || @internal) {
+	if (%rendered || @del || @internal || @internal_change) {
 		my @changed=(keys %rendered, @del);
+		my @exists_changed=(@add, @del);
 
- 		my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
+		my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
+		my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
  
 		# rebuild dependant pages
 		foreach my $f (@$files) {
@@ -467,7 +469,13 @@ sub refresh () {
 
 			if (exists $depends_simple{$p}) {
 				foreach my $d (keys %{$depends_simple{$p}}) {
-					if (exists $lcchanged{$d}) {
+					if ($depends_simple{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
+						if (exists $lc_exists_changed{$d}) {
+							$reason = $d;
+							last;
+						}
+					}
+					elsif (exists $lc_changed{$d}) {
 						$reason = $d;
 						last;
 					}
@@ -479,10 +487,26 @@ sub refresh () {
 					my $sub=pagespec_translate($d);
 					next if $@ || ! defined $sub;
 
+					my @candidates;
+					if ($depends{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
+						@candidates=@exists_changed;
+					}
+					else {
+						@candidates=@changed;
+					}
 					# only consider internal files
 					# if the page explicitly depends
 					# on such files
-					foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
+					if ($d =~ /internal\(/) {
+						if ($depends{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
+							push @candidates, @internal;
+						}
+						else {
+							push @candidates, @internal, @internal_change;
+						}
+					}
+
+					foreach my $file (@candidates) {
 						next if $file eq $f;
 						my $page=pagename($file);
 						if ($sub->($page, location => $p)) {
-- 
cgit v1.2.3


From 6eaf9e40154050936ad9184d64295664da2cc83c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 15:55:11 -0400
Subject: orphans and brokenlinks cannot use contentless dependency

Tried a contentless dep and it does not work; changes to links in pages
are not noticed. Drat.
---
 IkiWiki/Plugin/brokenlinks.pm | 4 ++--
 IkiWiki/Plugin/orphans.pm     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index eb698b0be..b8ed2b8de 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -23,8 +23,8 @@ sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a page is added or removed, so
-	# register a dependency.
+	# Needs to update whenever a page is changed, 
+	# added or removed, in order to see the link changes.
 	add_depends($params{page}, $params{pages});
 	
 	my @broken;
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 711226772..d981670e7 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -23,8 +23,8 @@ sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a page is added or removed, so
-	# register a dependency.
+	# Needs to update whenever a page is changed, added, or removed,
+	# in order to see the link changes.
 	add_depends($params{page}, $params{pages});
 	
 	my @orphans;
-- 
cgit v1.2.3


From c7bdd17087475ef0e659cb5f3b204e2619929dff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 17:17:48 -0400
Subject: clarify

---
 doc/ikiwiki/directive/pagestats.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn
index 426f3e4af..66f851dbd 100644
--- a/doc/ikiwiki/directive/pagestats.mdwn
+++ b/doc/ikiwiki/directive/pagestats.mdwn
@@ -12,7 +12,7 @@ And here's how to create a table of all the pages on the wiki:
 
 	\[[!pagestats style="table"]]
 
-The optional `among` parameter limits counting to pages that match a
+The optional `among` parameter limits display to pages that match a
 [[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog
 entries, you could use:
 
-- 
cgit v1.2.3


From bd958f91a2b71761e9aa20fa25a6702dab3b4b8d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 17:38:47 -0400
Subject: did a scratch implementation of dependancy types, but found it more
 complex

---
 doc/todo/dependency_types.mdwn | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 215a65c8a..6218222f7 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -12,7 +12,7 @@ unnecessary page rebuilds:
 
 * meta only cares if the pages are added or removed. Content change does
   not matter (unless show=title is used).
-* brokenlinks, orphans, pagecount, ditto
+* brokenlinks, orphans, pagecount, ditto (generally)
 * inline in archive mode cares about page title, author changing, but
   not content. (Ditto for meta with show=title.)
 * Causes extra work when solving the [[bugs/transitive_dependencies]]
@@ -109,9 +109,6 @@ I propose the following. --[[Joey]]
 * `add_depends` defaults to adding a regular ("full") dependency, as
   before. (So nothing breaks.)
 * `add_depends($page, $spec, content => 0)` adds an contentless dependency.
-* Contentless dependencies are stored in `%depends_contentless` and
-  `%depends_contentless_simple`, which are stored in the index similarly
-  to the existing hashes.
 * `refresh` only looks at added/removed pages when resolving contentless
   dependencies.
 
@@ -121,5 +118,35 @@ to the two types he talks about above, but I hope are close enough that
 they can be used.
 
 This doesn't deal with the stuff that only depend on the metadata of a
-page, as collected in the scan pass, changing. But it does leave a window
+page, as collected in the scan pass, changing.  But it does leave a window
 open for adding such a dependency type later.
+
+----
+
+I implemented the above in a branch.
+[[!template id=gitbranch branch=origin/dependency-types author="[[joey]]"]]
+
+Then I found some problems:
+
+* pagestats is often used with a pagespec that uses `tagged()`.
+  A pure contentless dependency does not work for that, it needs to look
+  at link info.
+* orphans and brokenlinks cannot use contentless dependencies because they
+  need to update when links change.
+* Something simple like pagecount, that seems like it could use a
+  contentless dependency, can have a pagespec that uses metadata, like
+  `author()` or `copyright()`.
+
+Now I'm thinking about having a contentless dependency look at page
+metadata, and fire if the metadata changes. And it seems links should
+either be included in that, or there should be a way to make a dependency
+that fires when a page's links change. (And what about backlinks?)
+
+It's easy to see when a page's links change, since there is `%oldlinks`.
+To see when metadata is changed is harder, since it's stored in the
+pagestate by the meta plugin.
+
+(Alternative: Make add_depends look at the pagespec. Ie, if it is a simple
+page name, or a glob, we know a contentless dependency can be valid.
+If's more complex, convert the dependency from contentless to full. Finding
+a non-ad-hoc, non-sucky way to do that could be hard.)
-- 
cgit v1.2.3


From ba11568f1e1e0b0da0490d817262f13539736262 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Oct 2009 17:43:23 -0400
Subject: response

---
 doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
index cd57c1257..d0c09796f 100644
--- a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
+++ b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
@@ -23,3 +23,9 @@ I've written a new plugin, sectiontemplate, available in the `page_tmpl` branch
 
 >> I wanted this to put comments on my new blog, and was more interested in that goal than this subgoal.  I've moved most of my web pages to IkiWiki and there is only one small part that is the blog.
 >> I wanted to use [[Disqus comments|tips/Adding_Disqus_to_your_wiki/]], but only on the blog pages.  (I'm using Disqus rather than IkiWiki comments because I don't want to have to deal with spam, security, etc.  I'll happily just let someone else host the comments.) -- [[Will]]
+
+>>> Yes, handing the rebuild is a good reason not to use directives for
+>>> this.
+>>>
+>>> I do still think combining this with pagetemplate would be good.
+>>> --[[Joey]] 
-- 
cgit v1.2.3


From 7b692b5d6ec2c1cf86b627c4e3ed7a5d0a751580 Mon Sep 17 00:00:00 2001
From: "http://kaizer.se/" <http://kaizer.se/@web>
Date: Sun, 4 Oct 2009 14:43:38 -0400
Subject: Updated pproc-indent by catching only indent at beginning of line

---
 ...esolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index e42f22970..ca7b282fa 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -271,6 +271,17 @@ Perl I've ever written!_)
 >>> Well, seems you want to match the indent at the start of the line containing
 >>> the directive, even if the directive does not start the line. That would
 >>> be quite hard to make a regexp do, though. --[[Joey]]
+>>
+>> I wasted a long time getting the simpler `indent($1, handle->($2,$,4))` to
+>> work (remember, I don't know perl at all). Somehow `$1` does not arrive, I
+>> made a simple testcase that worked, and I conclude something inside $handle
+>> results in the value of $1 not arriving as it should!
+>>
+>> Anyway, instead a very simple incremental patch is in [pproc-indent][ppi]
+>> where the indentation regex is `(^[ \t]+|)` instead, which seems to work
+>> very well (and the regex is multiline now as well). I'm happy to rebase the
+>> changes if you want or you can just squash the four patches 1+3 => 1+1
+>> -- [[ulrik]]
 
 [ppi]: http://github.com/engla/ikiwiki/commits/pproc-indent
 
-- 
cgit v1.2.3


From 5fd230f9688bf7400f5ef962073bac8bc031e738 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 15:34:42 -0400
Subject: detect pagespecs that require content dependencies

When adding a contentless dependency, the pagespec also needs to be one
that does not look at any page content information.

As a first approximation of that, only allow glob-based pagespecs in
contentless dependencies. While there are probably a few other types of
pagespecs that can match contentless, this will work for most of them.
---
 IkiWiki.pm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 67149bc8b..56e2d4e71 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1774,7 +1774,8 @@ sub add_depends ($$;@) {
 	my $deptype=$DEPEND_CONTENT | $DEPEND_EXISTS;
 	if (@_) {
 		my %params=@_;
-		if (defined $params{content} && $params{content} == 0) {
+		if (defined $params{content} && $params{content} == 0 &&
+		    pagespec_contentless($pagespec)) {
 			$deptype=$deptype & ~$DEPEND_CONTENT;
 		}
 	}
@@ -1974,6 +1975,20 @@ sub pagespec_valid ($) {
 	return ! $@;
 }
 
+sub pagespec_contentless ($) {
+	my $spec=shift;
+
+	while ($spec=~m{
+		(\w+)\([^\)]*\) # only match pagespec functions
+	}igx) {
+		# only glob and internal can be matched contentless
+		# (first approximation)
+		return 0 if $1 ne "glob" && $1 ne "internal";
+	}
+
+	return 1;
+}
+
 sub glob2re ($) {
 	my $re=quotemeta(shift);
 	$re=~s/\\\*/.*/g;
-- 
cgit v1.2.3


From daafdf1acb426e0abae218a04c8b22e8b9885354 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 15:43:38 -0400
Subject: optimise add_depends for simple pagespecs

We don't need to check if the pagespec is contentless; all simple ones are.
---
 IkiWiki.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 56e2d4e71..c059a9b9f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1771,18 +1771,19 @@ sub add_depends ($$;@) {
 	my $page=shift;
 	my $pagespec=shift;
 
+	my $simple=$pagespec =~ /$config{wiki_file_regexp}/ &&
+		$pagespec !~ /[\s*?()!]/;
+
 	my $deptype=$DEPEND_CONTENT | $DEPEND_EXISTS;
 	if (@_) {
 		my %params=@_;
 		if (defined $params{content} && $params{content} == 0 &&
-		    pagespec_contentless($pagespec)) {
+		    ($simple || pagespec_contentless($pagespec))) {
 			$deptype=$deptype & ~$DEPEND_CONTENT;
 		}
 	}
 
-	if ($pagespec =~ /$config{wiki_file_regexp}/ &&
-		$pagespec !~ /[\s*?()!]/) {
-		# a simple dependency, which can be matched by string eq
+	if ($simple) {
 		$depends_simple{$page}{lc $pagespec} |= $deptype;
 		return 1;
 	}
-- 
cgit v1.2.3


From 2fbfcd16e6d5717fea7b23d7fa82961222a6e32f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 15:46:23 -0400
Subject: map: Use a contentless dependency unless show= is specified.

This makes simple maps efficient enough that they can be used on sidebars!
---
 IkiWiki/Plugin/map.pm | 8 ++++----
 debian/changelog      | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 54146dc46..682960777 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -68,13 +68,13 @@ sub preprocess (@) {
 	}
 
 	# Needs to update whenever a page is added or removed (or in some
-	# cases, when its content changes, if show=title), so register a
-	# dependency.
-	add_depends($params{page}, $params{pages});
+	# cases, when its content changes, if show= is specified), so
+	# register a dependency.
+	add_depends($params{page}, $params{pages}, content => exists $params{show});
 	# Explicitly add all currently shown pages, to detect when pages
 	# are removed.
 	foreach my $item (keys %mapitems) {
-		add_depends($params{page}, $item);
+		add_depends($params{page}, $item, content => exists $params{show});
 	}
 
 	# Create the map.
diff --git a/debian/changelog b/debian/changelog
index bec1a61d3..ae39d4847 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * pagecount: Use a contentless dependency, which makes this
     directive much less expensive to use, since page edits will
     no longer trigger an unnecessary update of the page count.
+  * map: Use a contentless dependency unless show= is specified.
+    This makes simple maps efficient enough that they can be used on sidebars!
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
-- 
cgit v1.2.3


From 6f1ebdd6922a2c96fd57c71cd2052992d13f9c22 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 15:53:54 -0400
Subject: update

---
 doc/todo/dependency_types.mdwn | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 6218222f7..58b5ee955 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -10,7 +10,7 @@ whenever a matching dependency is added, removed, or *modified*. But a
 great many things don't care about the modification case, and often cause
 unnecessary page rebuilds:
 
-* meta only cares if the pages are added or removed. Content change does
+* map only cares if the pages are added or removed. Content change does
   not matter (unless show=title is used).
 * brokenlinks, orphans, pagecount, ditto (generally)
 * inline in archive mode cares about page title, author changing, but
@@ -128,14 +128,11 @@ I implemented the above in a branch.
 
 Then I found some problems:
 
-* pagestats is often used with a pagespec that uses `tagged()`.
-  A pure contentless dependency does not work for that, it needs to look
-  at link info.
-* orphans and brokenlinks cannot use contentless dependencies because they
-  need to update when links change.
 * Something simple like pagecount, that seems like it could use a
   contentless dependency, can have a pagespec that uses metadata, like
   `author()` or `copyright()`.
+* pagestats, orphans and brokenlinks cannot use contentless dependencies
+  because they need to update when links change.
 
 Now I'm thinking about having a contentless dependency look at page
 metadata, and fire if the metadata changes. And it seems links should
@@ -146,7 +143,14 @@ It's easy to see when a page's links change, since there is `%oldlinks`.
 To see when metadata is changed is harder, since it's stored in the
 pagestate by the meta plugin.
 
-(Alternative: Make add_depends look at the pagespec. Ie, if it is a simple
-page name, or a glob, we know a contentless dependency can be valid.
-If's more complex, convert the dependency from contentless to full. Finding
-a non-ad-hoc, non-sucky way to do that could be hard.)
+Quick alternative: Make add_depends look at the pagespec. Ie, if it
+is a simple page name, or a glob, we know a contentless dependency
+can be valid. If's more complex, convert the dependency from
+contentless to full.
+
+There is a lot to dislike about this method. Its parsing of the
+pagespec, as currently implemented, does not let plugins add new types of
+pagespecs that are contentless. Its pagespec parsing is also subject to
+false negatives (though these should be somewhat rare, and no false
+positives). Still, it does work, and it makes things like simple maps and
+pagecounts much more efficient.
-- 
cgit v1.2.3


From da5c12e9ebb6bad5e73b0b709d0bcc82657ac8e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:01:56 -0400
Subject: expand the set of things that can be matched contentless

---
 IkiWiki.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c059a9b9f..5e5dc739d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1982,9 +1982,7 @@ sub pagespec_contentless ($) {
 	while ($spec=~m{
 		(\w+)\([^\)]*\) # only match pagespec functions
 	}igx) {
-		# only glob and internal can be matched contentless
-		# (first approximation)
-		return 0 if $1 ne "glob" && $1 ne "internal";
+		return 0 unless $1=~/^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
 	}
 
 	return 1;
-- 
cgit v1.2.3


From e529c561f548fa2d277b8cb7c123c3a46a0427a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:03:01 -0400
Subject: inline: Use a contentless dependency in quick mode.

---
 IkiWiki/Plugin/inline.pm | 7 +++----
 debian/changelog         | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index ccfadfd69..5133c4ba6 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -197,7 +197,7 @@ sub preprocess_inline (@) {
 		        split ' ', $params{pagenames};
 	}
 	else {
-		add_depends($params{page}, $params{pages});
+		add_depends($params{page}, $params{pages}, content => ! $quick);
 
 		@list = pagespec_match_list(
 			[ grep { $_ ne $params{page} } keys %pagesources ],
@@ -248,10 +248,9 @@ sub preprocess_inline (@) {
 	}
 
 	# Explicitly add all currently displayed pages as dependencies, so
-	# that if they are removed or otherwise changed, the inline will be
-	# sure to be updated.
+	# that if they are removed, the inline will be sure to be updated.
 	foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
-		add_depends($params{page}, $p);
+		add_depends($params{page}, $p, content => ! $quick);
 	}
 	
 	if ($feeds && exists $params{feedpages}) {
diff --git a/debian/changelog b/debian/changelog
index ae39d4847..9d03ae990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
     no longer trigger an unnecessary update of the page count.
   * map: Use a contentless dependency unless show= is specified.
     This makes simple maps efficient enough that they can be used on sidebars!
+  * inline: Use a contentless dependency in quick mode.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
-- 
cgit v1.2.3


From a6689f9c7a1ecad02b51962c0858df47352c4648 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:05:41 -0400
Subject: calendar: all dependencies are contentless

---
 IkiWiki/Plugin/calendar.pm | 21 ++++++++++++---------
 debian/changelog           |  6 +++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 5d16dff75..a5cc20882 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -104,19 +104,22 @@ sub format_month (@) {
 			"$archivebase/$year/".sprintf("%02d", $month),
 			linktext => " $monthname ");
 	}
-	add_depends($params{page}, "$archivebase/$year/".sprintf("%02d", $month));
+	add_depends($params{page}, "$archivebase/$year/".sprintf("%02d", $month),
+		content => 0);
 	if (exists $cache{$pagespec}{"$pyear/$pmonth"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/" . sprintf("%02d", $pmonth),
 			linktext => " $pmonthname ");
 	}
-	add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth));
+	add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth),
+		content => 0);
 	if (exists $cache{$pagespec}{"$nyear/$nmonth"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/" . sprintf("%02d", $nmonth),
 			linktext => " $nmonthname ");
 	}
-	add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth));
+	add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth),
+		content => 0);
 
 	# Start producing the month calendar
 	$calendar=<<EOF;
@@ -209,11 +212,11 @@ EOF
 
 	# Add dependencies to update the calendar whenever pages
 	# matching the pagespec are added or removed.
-	add_depends($params{page}, $params{pages});
+	add_depends($params{page}, $params{pages}, content => 0);
 	# Explicitly add all currently linked pages as dependencies, so
 	# that if they are removed, the calendar will be sure to be updated.
 	foreach my $p (@list) {
-		add_depends($params{page}, $p);
+		add_depends($params{page}, $p, content => 0);
 	}
 
 	return $calendar;
@@ -246,19 +249,19 @@ sub format_year (@) {
 			"$archivebase/$year",
 			linktext => "$year");
 	}
-	add_depends($params{page}, "$archivebase/$year");
+	add_depends($params{page}, "$archivebase/$year", content => 0);
 	if (exists $cache{$pagespec}{"$pyear"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear",
 			linktext => "\&larr;");
 	}
-	add_depends($params{page}, "$archivebase/$pyear");
+	add_depends($params{page}, "$archivebase/$pyear", content => 0);
 	if (exists $cache{$pagespec}{"$nyear"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear",
 			linktext => "\&rarr;");
 	}
-	add_depends($params{page}, "$archivebase/$nyear");
+	add_depends($params{page}, "$archivebase/$nyear", content => 0);
 
 	# Start producing the year calendar
 	$calendar=<<EOF;
@@ -310,7 +313,7 @@ EOF
 		else {
 			$calendar.=qq{\t<td class="$tag">$monthabbr</td>\n};
 		}
-		add_depends($params{page}, "$archivebase/$year/$mtag");
+		add_depends($params{page}, "$archivebase/$year/$mtag", content => 0);
 
 		$calendar.=qq{\t</tr>\n} if ($month % $params{months_per_row} == 0);
 	}
diff --git a/debian/changelog b/debian/changelog
index 9d03ae990..1a76303b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * Added support framework for multiple types of dependencies.
   * Allow declaring that a dependency does not encompass the content of a
     page. (By passing content => 0 to add_depends.)
-  * pagecount: Use a contentless dependency, which makes this
-    directive much less expensive to use, since page edits will
-    no longer trigger an unnecessary update of the page count.
+  * pagecount, calendar: Use a contentless dependency, which makes these
+    directives much less expensive to use, since page edits will
+    no longer trigger an unnecessary update.
   * map: Use a contentless dependency unless show= is specified.
     This makes simple maps efficient enough that they can be used on sidebars!
   * inline: Use a contentless dependency in quick mode.
-- 
cgit v1.2.3


From ce78b699278be0797316518079474bc776d657ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:07:02 -0400
Subject: edittemplate: contentless dependency

This one is unlikely to matter much, but yeah, it's contentless.
---
 IkiWiki/Plugin/edittemplate.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 0bafc95d0..89d450725 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -58,7 +58,7 @@ sub preprocess (@) {
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
 
 	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-	add_depends($params{page}, $link);
+	add_depends($params{page}, $link, content => 0);
 	return sprintf(gettext("edittemplate %s registered for %s"),
 		htmllink($params{page}, $params{destpage}, $link),
 	       	$params{match});
-- 
cgit v1.2.3


From de6eba6ddde9f6d4577b49b204dcdd9f1a203ed4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:10:34 -0400
Subject: not a contentless dependency

needs link info
---
 IkiWiki/Plugin/linkmap.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 941ed5f36..d0671ae0e 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -28,8 +28,8 @@ sub preprocess (@) {
 
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a page is added or removed, so
-	# register a dependency.
+	# Needs to update whenever a page is added, removed, or
+	# its links change, so register a dependency.
 	add_depends($params{page}, $params{pages});
 	
 	# Can't just return the linkmap here, since the htmlscrubber
-- 
cgit v1.2.3


From 2af988b86fca6d2ca9476ae698cf1e840969af78 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:11:10 -0400
Subject: listdirectives: contentless dependency

Another one that probably doesn't matter, but for completness.
---
 IkiWiki/Plugin/listdirectives.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index bd73f1a04..96150f986 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -84,7 +84,7 @@ sub preprocess (@) {
 	foreach my $plugin (@pluginlist) {
 		$result .= '<li class="listdirectives">';
 		my $link=linkpage($config{directive_description_dir}."/".$plugin);
-		add_depends($params{page}, $link);
+		add_depends($params{page}, $link, content => 0);
 		$result .= htmllink($params{page}, $params{destpage}, $link);
 		$result .= '</li>';
 	}
-- 
cgit v1.2.3


From 66852de77553a6131569436d4531c69a4515a4d3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:12:05 -0400
Subject: meta redir dependency is contentless

---
 IkiWiki/Plugin/meta.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 514b09369..eef3013a0 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -195,7 +195,7 @@ sub preprocess (@) {
 			if (! length $link) {
 				error gettext("redir page not found")
 			}
-			add_depends($page, $link);
+			add_depends($page, $link, content => 0);
 
 			$value=urlto($link, $page);
 			$value.='#'.$redir_anchor if defined $redir_anchor;
-- 
cgit v1.2.3


From 7982c3c1773feef0d7f248ff3efe09dd2cd94ad8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:16:50 -0400
Subject: postsparkline and progress: also contentless dependencies

---
 IkiWiki/Plugin/postsparkline.pm | 2 +-
 IkiWiki/Plugin/progress.pm      | 4 ++--
 debian/changelog                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index d2e5c2378..694d39575 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -48,7 +48,7 @@ sub preprocess (@) {
 		error gettext("unknown formula");
 	}
 
-	add_depends($params{page}, $params{pages});
+	add_depends($params{page}, $params{pages}, content => 0);
 
 	my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } 
 		pagespec_match_list(
diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 76d994acc..3b664f4cb 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -36,8 +36,8 @@ sub preprocess (@) {
 		$fill.="%";
 	}
 	elsif (defined $params{totalpages} and defined $params{donepages}) {
-		add_depends($params{page}, $params{totalpages});
-		add_depends($params{page}, $params{donepages});
+		add_depends($params{page}, $params{totalpages}, content => 0);
+		add_depends($params{page}, $params{donepages}, content => 0);
 
 		my @pages=keys %pagesources;
 		my $totalcount=0;
diff --git a/debian/changelog b/debian/changelog
index 1a76303b1..0e9bf512b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * Added support framework for multiple types of dependencies.
   * Allow declaring that a dependency does not encompass the content of a
     page. (By passing content => 0 to add_depends.)
-  * pagecount, calendar: Use a contentless dependency, which makes these
-    directives much less expensive to use, since page edits will
-    no longer trigger an unnecessary update.
+  * pagecount, calendar, postsparkline, progress: Use a contentless dependency,
+    which makes these directives much less expensive to use, since page
+    edits will no longer trigger an unnecessary update.
   * map: Use a contentless dependency unless show= is specified.
     This makes simple maps efficient enough that they can be used on sidebars!
   * inline: Use a contentless dependency in quick mode.
-- 
cgit v1.2.3


From a8af271e5aed1c4aef3f66cee0847d609aedc705 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:28:14 -0400
Subject: document effect of contentless dependencies on sidebar efficiency

---
 doc/plugins/sidebar.mdwn | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/sidebar.mdwn b/doc/plugins/sidebar.mdwn
index 36982eff3..4e356d65a 100644
--- a/doc/plugins/sidebar.mdwn
+++ b/doc/plugins/sidebar.mdwn
@@ -16,6 +16,10 @@ will turn off the sidebar altogether.
 
 Warning: Any change to the sidebar will cause a rebuild of the whole wiki,
 since every page includes a copy that has to be updated. This can
-especially be a problem if the sidebar includes [[inline]] or [[map]]
-directives, since any changes to pages inlined or mapped onto the sidebar
+especially be a problem if the sidebar includes an [[ikiwiki/directive/inline]]
+directive, since any changes to pages inlined into the sidebar
 will change the sidebar and cause a full wiki rebuild.
+
+Instead, if you include a [[ikiwiki/directive/map]] directive on the sidebar,
+and it does not use the `show` parameter, only adding or removing pages
+included in the map will cause a full rebuild. Modifying pages will not.
-- 
cgit v1.2.3


From 4a20402ba0da25b5f47aaa5c6bc7b9184816cd50 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:36:39 -0400
Subject: update

---
 doc/bugs/transitive_dependencies.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
index 546f4f3aa..b073f190b 100644
--- a/doc/bugs/transitive_dependencies.mdwn
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -52,7 +52,8 @@ Downsides here:
   at least in my simple implementation, which re-runs the dependency
   resolution loop until no new pages are rebuilt.
   (I added an optimisation that gets it down to 1.5X as much work on
-  average, still 2x as much worst case.)
+  average, still 2x as much worst case. I suppose building a directed
+  graph and traversing it would be theoretically more efficient.)
 * Causes extra work for some transitive dependencies that we don't
   actually care about. For example, changing index causes
   plugins/brokenlinks to update in the first pass; if there's a second
@@ -60,5 +61,7 @@ Downsides here:
   (Of course, this is just a special case of the issue that a real
   modification to plugins/brokenlinks causes an unnecessary update of plugins/map,
   because we have [[only_one_kind_of_dependency|todo/dependency_types]].)
+  (Fixed now for cases like this one where contenless dependencies avoid
+  the unnecessary work.)
 
 --[[Joey]] 
-- 
cgit v1.2.3


From b0314296a8a3bf4293850003790bedec44911796 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 16:40:36 -0400
Subject: update

---
 doc/bugs/transitive_dependencies.mdwn | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
index b073f190b..9586bc9b0 100644
--- a/doc/bugs/transitive_dependencies.mdwn
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -1,5 +1,5 @@
 If a sidebar contains a map, or inline (etc), one would expect a
-change/add/remove of any of the mapped/inlined pages to cause a full wiki
+add/remove of any of the mapped/inlined pages to cause a full wiki
 rebuild. But this does not happen.
 
 If page A inlines page B, which inlines page C, a change to C will cause B
@@ -55,13 +55,14 @@ Downsides here:
   average, still 2x as much worst case. I suppose building a directed
   graph and traversing it would be theoretically more efficient.)
 * Causes extra work for some transitive dependencies that we don't
-  actually care about. For example, changing index causes
+  actually care about. This is amelorated, but not solved by 
+  the current work on [[todo/dependency_types]].
+  For example, changing index causes
   plugins/brokenlinks to update in the first pass; if there's a second
-  pass, plugins/map is then updated, because it depends on plugins/brokenlinks.
+  pass, plugins/map is no longer updated (contentless dependencies FTW),
+  but plugins is, because it depends on plugins/brokenlinks.
   (Of course, this is just a special case of the issue that a real
-  modification to plugins/brokenlinks causes an unnecessary update of plugins/map,
-  because we have [[only_one_kind_of_dependency|todo/dependency_types]].)
-  (Fixed now for cases like this one where contenless dependencies avoid
-  the unnecessary work.)
+  modification to plugins/brokenlinks causes an unnecessary update of
+  plugins, and could be solved by adding more dependency types.)
 
 --[[Joey]] 
-- 
cgit v1.2.3


From b4c8cc90726cb953898b14f378881bddd224a22c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 17:38:10 -0400
Subject: update

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 0e9bf512b..21641434b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * map: Use a contentless dependency unless show= is specified.
     This makes simple maps efficient enough that they can be used on sidebars!
   * inline: Use a contentless dependency in quick mode.
+  * Transitive dependencies are now correctly supported.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
-- 
cgit v1.2.3


From be032a7b87d1080f1a54327346cb5b40432a056c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 20:30:21 -0400
Subject: rework dependency types code

Simplify, change default content depends number to 1,
change interface to make more sense.
---
 IkiWiki.pm                       | 35 +++++++++++++++--------------------
 IkiWiki/Plugin/calendar.pm       | 18 +++++++++---------
 IkiWiki/Plugin/edittemplate.pm   |  2 +-
 IkiWiki/Plugin/listdirectives.pm |  2 +-
 IkiWiki/Plugin/meta.pm           |  2 +-
 IkiWiki/Plugin/pagecount.pm      |  4 ++--
 IkiWiki/Plugin/postsparkline.pm  |  2 +-
 IkiWiki/Plugin/progress.pm       |  4 ++--
 IkiWiki/Render.pm                | 28 +++++++++++++---------------
 doc/plugins/write.mdwn           | 15 +++++++++------
 ikiwiki-transition               |  2 +-
 11 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5e5dc739d..c1d07531e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -29,8 +29,8 @@ our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
 
 # Page dependency types.
-our $DEPEND_EXISTS=1;
-our $DEPEND_CONTENT=2;
+our $DEPEND_CONTENT=1;
+our $DEPEND_PRESENCE=2;
 
 # Optimisation.
 use Memoize;
@@ -1540,13 +1540,13 @@ sub loadindex () {
 			if (exists $d->{dependslist}) {
 				# old format
 				$depends{$page}={
-					map { $_ => $DEPEND_CONTENT | $DEPEND_EXISTS }
+					map { $_ => $DEPEND_CONTENT }
 						@{$d->{dependslist}}
 				};
 			}
 			elsif (exists $d->{depends} && ! ref $d->{depends}) {
 				# old format
-				$depends{$page}={$d->{depends} => $DEPEND_CONTENT | $DEPEND_EXISTS};
+				$depends{$page}={$d->{depends} => $DEPEND_CONTENT };
 			}
 			elsif (exists $d->{depends}) {
 				$depends{$page}=$d->{depends};
@@ -1771,16 +1771,23 @@ sub add_depends ($$;@) {
 	my $page=shift;
 	my $pagespec=shift;
 
+	# Is the pagespec a simple page name?
 	my $simple=$pagespec =~ /$config{wiki_file_regexp}/ &&
 		$pagespec !~ /[\s*?()!]/;
 
-	my $deptype=$DEPEND_CONTENT | $DEPEND_EXISTS;
+	my $deptype=$DEPEND_CONTENT;
 	if (@_) {
 		my %params=@_;
-		if (defined $params{content} && $params{content} == 0 &&
-		    ($simple || pagespec_contentless($pagespec))) {
-			$deptype=$deptype & ~$DEPEND_CONTENT;
+		
+		# Is the pagespec limited to terms that will continue
+		# to match pages as long as those pages exist?
+		my $limited=1;
+		while ($limited && $pagespec=~m/(\w+)\([^\)]*\)/g) {
+			$limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
 		}
+
+		$deptype=$deptype & ~$DEPEND_CONTENT & $DEPEND_PRESENCE
+			if $params{presence} && $limited;
 	}
 
 	if ($simple) {
@@ -1976,18 +1983,6 @@ sub pagespec_valid ($) {
 	return ! $@;
 }
 
-sub pagespec_contentless ($) {
-	my $spec=shift;
-
-	while ($spec=~m{
-		(\w+)\([^\)]*\) # only match pagespec functions
-	}igx) {
-		return 0 unless $1=~/^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
-	}
-
-	return 1;
-}
-
 sub glob2re ($) {
 	my $re=quotemeta(shift);
 	$re=~s/\\\*/.*/g;
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index a5cc20882..a1117992a 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -105,21 +105,21 @@ sub format_month (@) {
 			linktext => " $monthname ");
 	}
 	add_depends($params{page}, "$archivebase/$year/".sprintf("%02d", $month),
-		content => 0);
+		presence => 1);
 	if (exists $cache{$pagespec}{"$pyear/$pmonth"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/" . sprintf("%02d", $pmonth),
 			linktext => " $pmonthname ");
 	}
 	add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth),
-		content => 0);
+		presence => 1);
 	if (exists $cache{$pagespec}{"$nyear/$nmonth"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/" . sprintf("%02d", $nmonth),
 			linktext => " $nmonthname ");
 	}
 	add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth),
-		content => 0);
+		presence => 1);
 
 	# Start producing the month calendar
 	$calendar=<<EOF;
@@ -212,11 +212,11 @@ EOF
 
 	# Add dependencies to update the calendar whenever pages
 	# matching the pagespec are added or removed.
-	add_depends($params{page}, $params{pages}, content => 0);
+	add_depends($params{page}, $params{pages}, presence => 1);
 	# Explicitly add all currently linked pages as dependencies, so
 	# that if they are removed, the calendar will be sure to be updated.
 	foreach my $p (@list) {
-		add_depends($params{page}, $p, content => 0);
+		add_depends($params{page}, $p, presence => 1);
 	}
 
 	return $calendar;
@@ -249,19 +249,19 @@ sub format_year (@) {
 			"$archivebase/$year",
 			linktext => "$year");
 	}
-	add_depends($params{page}, "$archivebase/$year", content => 0);
+	add_depends($params{page}, "$archivebase/$year", presence => 1);
 	if (exists $cache{$pagespec}{"$pyear"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear",
 			linktext => "\&larr;");
 	}
-	add_depends($params{page}, "$archivebase/$pyear", content => 0);
+	add_depends($params{page}, "$archivebase/$pyear", presence => 1);
 	if (exists $cache{$pagespec}{"$nyear"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear",
 			linktext => "\&rarr;");
 	}
-	add_depends($params{page}, "$archivebase/$nyear", content => 0);
+	add_depends($params{page}, "$archivebase/$nyear", presence => 1);
 
 	# Start producing the year calendar
 	$calendar=<<EOF;
@@ -313,7 +313,7 @@ EOF
 		else {
 			$calendar.=qq{\t<td class="$tag">$monthabbr</td>\n};
 		}
-		add_depends($params{page}, "$archivebase/$year/$mtag", content => 0);
+		add_depends($params{page}, "$archivebase/$year/$mtag", presence => 1);
 
 		$calendar.=qq{\t</tr>\n} if ($month % $params{months_per_row} == 0);
 	}
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 89d450725..2dd1dbe68 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -58,7 +58,7 @@ sub preprocess (@) {
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
 
 	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-	add_depends($params{page}, $link, content => 0);
+	add_depends($params{page}, $link, presence => 1);
 	return sprintf(gettext("edittemplate %s registered for %s"),
 		htmllink($params{page}, $params{destpage}, $link),
 	       	$params{match});
diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index 96150f986..4023ed7d7 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -84,7 +84,7 @@ sub preprocess (@) {
 	foreach my $plugin (@pluginlist) {
 		$result .= '<li class="listdirectives">';
 		my $link=linkpage($config{directive_description_dir}."/".$plugin);
-		add_depends($params{page}, $link, content => 0);
+		add_depends($params{page}, $link, presence => 1);
 		$result .= htmllink($params{page}, $params{destpage}, $link);
 		$result .= '</li>';
 	}
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index eef3013a0..9b041a748 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -195,7 +195,7 @@ sub preprocess (@) {
 			if (! length $link) {
 				error gettext("redir page not found")
 			}
-			add_depends($page, $link, content => 0);
+			add_depends($page, $link, presence => 1);
 
 			$value=urlto($link, $page);
 			$value.='#'.$redir_anchor if defined $redir_anchor;
diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 17eda0618..80561350b 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -23,8 +23,8 @@ sub preprocess (@) {
 	$params{pages}="*" unless defined $params{pages};
 	
 	# Needs to update count whenever a page is added or removed, so
-	# register a contentless dependency.
-	add_depends($params{page}, $params{pages}, content => 0);
+	# register a presence dependency.
+	add_depends($params{page}, $params{pages}, presence => 1);
 	
 	my @pages;
 	if ($params{pages} eq "*") {
diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 694d39575..3205958d4 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -48,7 +48,7 @@ sub preprocess (@) {
 		error gettext("unknown formula");
 	}
 
-	add_depends($params{page}, $params{pages}, content => 0);
+	add_depends($params{page}, $params{pages}, presence => 1);
 
 	my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } 
 		pagespec_match_list(
diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 3b664f4cb..26c537a84 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -36,8 +36,8 @@ sub preprocess (@) {
 		$fill.="%";
 	}
 	elsif (defined $params{totalpages} and defined $params{donepages}) {
-		add_depends($params{page}, $params{totalpages}, content => 0);
-		add_depends($params{page}, $params{donepages}, content => 0);
+		add_depends($params{page}, $params{totalpages}, presence => 1);
+		add_depends($params{page}, $params{donepages}, presence => 1);
 
 		my @pages=keys %pagesources;
 		my $totalcount=0;
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 3fc750925..cf0c3fe08 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -473,13 +473,11 @@ sub refresh () {
 	
 				if (exists $depends_simple{$p}) {
 					foreach my $d (keys %{$depends_simple{$p}}) {
-						if ($depends_simple{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
-							if (exists $lc_exists_changed{$d}) {
-								$reason = $d;
-								last;
-							}
-						}
-						elsif (exists $lc_changed{$d}) {
+						if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
+						     exists $lc_changed{$d})
+						    ||
+						    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
+						     exists $lc_exists_changed{$d})) {
 							$reason = $d;
 							last;
 						}
@@ -492,22 +490,22 @@ sub refresh () {
 						next if $@ || ! defined $sub;
 	
 						my @candidates;
-						if ($depends{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
-							@candidates=@exists_changed;
-						}
-						else {
+						if ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
 							@candidates=@changed;
 						}
+						elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+							@candidates=@exists_changed;
+						}
 						# only consider internal files
 						# if the page explicitly depends
 						# on such files
 						if ($d =~ /internal\(/) {
-							if ($depends{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
-								push @candidates, @internal;
-							}
-							else {
+							if ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
 								push @candidates, @internal, @internal_change;
 							}
+							elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+								push @candidates, @internal;
+							}
 						}
 	
 						foreach my $file (@candidates) {
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index c244c1f2f..73db6f12a 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -613,12 +613,15 @@ generating a link to a page.
 
 Makes the specified page depend on the specified [[ikiwiki/PageSpec]].
 
-Additional named parameters can be passed, to indicate what type of
-dependency this is.
-
-Currently, only a "content" parameter is specified. If set to 0, the
-dependency does not involve the content of pages matching the PageSpec, but
-only their existence.
+By default, dependencies are full content dependencies, meaning that the
+page will be updated whenever anything matching the PageSpec is modified.
+This default can be overridden by additional named parameters, which can be
+used to indicate weaker types of dependencies:
+
+* `presence` if set to true, only the presence of a matching page triggers
+  the dependency.
+* `links` if set to true, any change in the text of links on a matching page
+  triggers the dependency
 
 #### `pagespec_match($$;@)`
 
diff --git a/ikiwiki-transition b/ikiwiki-transition
index c50a748e8..1bebb1176 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -299,7 +299,7 @@ sub oldloadindex {
 			$pagemtime{$page}=$items{mtime}[0];
 			$oldlinks{$page}=[@{$items{link}}];
 			$links{$page}=[@{$items{link}}];
-			$depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_EXISTS } if exists $items{depends};
+			$depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT } if exists $items{depends};
 			$destsources{$_}=$page foreach @{$items{dest}};
 			$renderedfiles{$page}=[@{$items{dest}}];
 			$pagecase{lc $page}=$page;
-- 
cgit v1.2.3


From d0f116478cdd8841c7905f2629bb679f7f36a5a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 20:34:43 -0400
Subject: update

---
 debian/changelog | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21641434b..7ca0d9e42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,14 +11,14 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * Fix a bug that could lead to duplicate links being recorded
     for tags.
   * Added support framework for multiple types of dependencies.
-  * Allow declaring that a dependency does not encompass the content of a
-    page. (By passing content => 0 to add_depends.)
-  * pagecount, calendar, postsparkline, progress: Use a contentless dependency,
+  * Allow declaring that a dependency is only affected by page presence.
+    (By passing presence => 1 to add_depends.)
+  * pagecount, calendar, postsparkline, progress: Use a presence dependency,
     which makes these directives much less expensive to use, since page
     edits will no longer trigger an unnecessary update.
-  * map: Use a contentless dependency unless show= is specified.
-    This makes simple maps efficient enough that they can be used on sidebars!
-  * inline: Use a contentless dependency in quick mode.
+  * map: Use a presence dependency unless show= is specified.
+    This makes maps efficient enough that they can be used on sidebars!
+  * inline: Use a presence dependency in quick mode.
   * Transitive dependencies are now correctly supported.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
-- 
cgit v1.2.3


From d797b9ab0e4d7323ad769229dc98f57dc4f08f02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 20:35:02 -0400
Subject: remove /i from regexp

Nothing case-oriented going on in here.
---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2637f6017..97d84c9de 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1870,7 +1870,7 @@ sub pagespec_translate ($) {
 			[^\s()]+	# any other text
 		)
 		\s*		# ignore whitespace
-	}igx) {
+	}gx) {
 		my $word=$1;
 		if (lc $word eq 'and') {
 			$code.=' &&';
-- 
cgit v1.2.3


From bcad00b0467c9435636dff3feb540d17fb2296d4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 20:35:26 -0400
Subject: update, add spec for link dependencies

---
 doc/todo/dependency_types.mdwn | 43 ++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 58b5ee955..f13f1448e 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -105,11 +105,11 @@ unnecessary page rebuilds:
 
 I propose the following. --[[Joey]] 
 
-* Add a second type of dependency, call it an "contentless dependency".
+* Add a second type of dependency, call it an "presence dependency".
 * `add_depends` defaults to adding a regular ("full") dependency, as
   before. (So nothing breaks.)
-* `add_depends($page, $spec, content => 0)` adds an contentless dependency.
-* `refresh` only looks at added/removed pages when resolving contentless
+* `add_depends($page, $spec, presence => 0)` adds an presence dependency.
+* `refresh` only looks at added/removed pages when resolving presence
   dependencies.
 
 This seems straightforwardly doable. I'd like [[Will]]'s feedback on it, if
@@ -129,28 +129,47 @@ I implemented the above in a branch.
 Then I found some problems:
 
 * Something simple like pagecount, that seems like it could use a
-  contentless dependency, can have a pagespec that uses metadata, like
+  presence dependency, can have a pagespec that uses metadata, like
   `author()` or `copyright()`.
-* pagestats, orphans and brokenlinks cannot use contentless dependencies
+* pagestats, orphans and brokenlinks cannot use presence dependencies
   because they need to update when links change.
 
-Now I'm thinking about having a contentless dependency look at page
+Now I'm thinking about having a special dependency look at page
 metadata, and fire if the metadata changes. And it seems links should
 either be included in that, or there should be a way to make a dependency
 that fires when a page's links change. (And what about backlinks?)
 
 It's easy to see when a page's links change, since there is `%oldlinks`.
 To see when metadata is changed is harder, since it's stored in the
-pagestate by the meta plugin.
+pagestate by the meta plugin. Also, there are many different types of
+metadata, that would need to be matched with the pagespecs somehow.
 
 Quick alternative: Make add_depends look at the pagespec. Ie, if it
-is a simple page name, or a glob, we know a contentless dependency
+is a simple page name, or a glob, we know a presence dependency
 can be valid. If's more complex, convert the dependency from
-contentless to full.
+presence to full.
 
-There is a lot to dislike about this method. Its parsing of the
-pagespec, as currently implemented, does not let plugins add new types of
-pagespecs that are contentless. Its pagespec parsing is also subject to
+There is a lot to dislike about this method. Its parsing of the pagespec,
+as currently implemented, does not let plugins add new types of pagespecs
+that only care about presence. Its pagespec parsing is also subject to
 false negatives (though these should be somewhat rare, and no false
 positives). Still, it does work, and it makes things like simple maps and
 pagecounts much more efficient.
+
+---- 
+
+Link dependencies:
+
+* `add_depends($page, $spec, links => 1, presence => 1)`
+  adds a links + presence dependency.
+* `refresh` only rebuilds a page with a links dependency if
+  pages matched by the pagespec gain or lose links. (What the link
+  actually points to may change independent of this, due to changes
+  elsewhere, without it firing.)
+* So, brokenlinks can fire whenever any links in any of the
+  pages it's tracking change, or when pages are added or
+  removed.
+
+TODO: How to determine if a pagespec is valid to be used with a links
+dependency? Use the same simple pagespecs that are valid for presence
+dependencies?
-- 
cgit v1.2.3


From 36c605cadace789d14354a1c835457f5f23ee1c2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 23:27:00 -0400
Subject: add test suite for add_depends

and found a bug in my bitmath..
---
 IkiWiki.pm      |  2 +-
 t/add_depends.t | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 t/add_depends.t

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 9591a8160..0bb0c1746 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1786,7 +1786,7 @@ sub add_depends ($$;@) {
 			$limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
 		}
 
-		$deptype=$deptype & ~$DEPEND_CONTENT & $DEPEND_PRESENCE
+		$deptype=$deptype & ~$DEPEND_CONTENT | $DEPEND_PRESENCE
 			if $params{presence} && $limited;
 	}
 
diff --git a/t/add_depends.t b/t/add_depends.t
new file mode 100644
index 000000000..935a57944
--- /dev/null
+++ b/t/add_depends.t
@@ -0,0 +1,68 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 50;
+
+BEGIN { use_ok("IkiWiki"); }
+%config=IkiWiki::defaultconfig();
+$config{srcdir}=$config{destdir}="/dev/null";
+IkiWiki::checkconfig();
+
+# avoids adding an unparseable pagespec
+ok(! add_depends("foo", "foo and (bar"));
+ok(! add_depends("foo", "foo another"));
+
+# simple and not-so-simple dependencies split
+ok(add_depends("foo", "*"));
+ok(add_depends("foo", "bar"));
+ok(add_depends("foo", "BAZ"));
+ok(exists $IkiWiki::depends_simple{foo}{"bar"});
+ok(exists $IkiWiki::depends_simple{foo}{"baz"}); # lowercase
+ok(! exists $IkiWiki::depends_simple{foo}{"*"});
+ok(! exists $IkiWiki::depends{foo}{"bar"});
+ok(! exists $IkiWiki::depends{foo}{"baz"});
+
+# default dependencies are content dependencies
+ok($IkiWiki::depends{foo}{"*"} & $IkiWiki::DEPEND_CONTENT);
+ok(! ($IkiWiki::depends{foo}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+ok($IkiWiki::depends_simple{foo}{"bar"} & $IkiWiki::DEPEND_CONTENT);
+ok(! ($IkiWiki::depends_simple{foo}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+
+# adding other dep types standalone
+ok(add_depends("foo2", "*", presence => 1));
+ok(add_depends("foo2", "bar", links => 1));
+ok($IkiWiki::depends{foo2}{"*"} & $IkiWiki::DEPEND_PRESENCE);
+ok(! ($IkiWiki::depends{foo2}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+ok($IkiWiki::depends_simple{foo2}{"bar"} & $IkiWiki::DEPEND_LINKS);
+ok(! ($IkiWiki::depends_simple{foo2}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
+
+# adding combined dep types
+ok(add_depends("foo2", "baz", links => 1, presence => 1));
+ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_LINKS);
+ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_PRESENCE);
+ok(! ($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_CONTENT));
+
+# adding a pagespec that requires page metadata should cause a fallback to
+# a content dependency
+foreach my $spec ("* and ! link(bar)", "* or link(bar)", "unknownspec()",
+	"title(hi)",
+	"* or backlink(yo)", # this one could actually be acceptably be
+	                     # detected to not need a content dep .. in
+			     # theory!
+	) {
+	ok(add_depends("foo3", $spec, presence => 1));
+	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_CONTENT);
+	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+}
+
+# adding dep types to existing dependencies should merge the flags
+ok(add_depends("foo2", "baz"));
+ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_LINKS);
+ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_PRESENCE);
+ok(($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_CONTENT));
+ok(add_depends("foo2", "bar", presence => 1)); # had only links before
+ok($IkiWiki::depends_simple{foo2}{"bar"} & ($IkiWiki::DEPEND_LINKS | $IkiWiki::DEPEND_PRESENCE));
+ok(! ($IkiWiki::depends_simple{foo2}{"bar"} & $IkiWiki::DEPEND_CONTENT));
+ok(add_depends("foo", "bar", links => 1)); # had only content before
+ok($IkiWiki::depends{foo}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS));
+ok(! ($IkiWiki::depends{foo}{"*"} & $IkiWiki::DEPEND_PRESENCE));
-- 
cgit v1.2.3


From 204e733d795d94218465982701cdb8a776893ba0 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 5 Oct 2009 15:17:11 +0100
Subject: good work, thank you!

---
 doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
index d07b2381d..7fe92f7a9 100644
--- a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
+++ b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn
@@ -23,3 +23,5 @@ ikiwiki version 3.14159265.
 
 >>> Found the bug that was causing duplicates to get in, and fixed it.
 >>> [[done]] --[[Joey]] 
+
+>>>> Good work Joey, thanks! -- [[Jon]]
-- 
cgit v1.2.3


From bccea01c07a112f4ded504724557085c870b56f6 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 5 Oct 2009 15:27:03 +0100
Subject: would you accept patches for this?

---
 doc/todo/CSS_classes_for_links.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/todo/CSS_classes_for_links.mdwn b/doc/todo/CSS_classes_for_links.mdwn
index 5013a9d12..43a480be8 100644
--- a/doc/todo/CSS_classes_for_links.mdwn
+++ b/doc/todo/CSS_classes_for_links.mdwn
@@ -75,3 +75,20 @@ I find CSS3 support still spotty...  Here are some notes on how to do this in Ik
 > [[rel_attribute|rel_attribute_for_links]] now that CSS can use.)
 > 
 > --[[Joey]]
+
+>> I had a little look at this, last weekend. I added a class definition to
+>> the `htmllink` call in `linkify` in `link.pm`. It works pretty well, but
+>> I'd also need to adjust other `htmllink` calls (map, inline, etc.). I found
+>> other methods (CSS3 selectors, etc.) to be unreliable.
+>> 
+>> Would you potentially accept a patch that added `class="internal"` to
+>> various `htmllink` calls in ikiwiki?
+>> 
+>> How configurable do you think this behaviour should be? I'm considering a
+>> config switch to enable or disable this behaviour, or possibly a
+>> configurable list of class names to append for internal links (defaulting
+>> to an empty list for backwards compatibility)>
+>> 
+>> As an alternative to patching the uses of `htmllink`, what do you think
+>> about patching `htmllink` itself? Are there circumstances where it might be
+>> used to generate a non-internal link? -- [[Jon]]
-- 
cgit v1.2.3


From b8fae0ec3986b675d055a55fa986388d6c35658f Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 5 Oct 2009 15:27:41 +0100
Subject: another UI issue I'm interested in

---
 doc/users/jon.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index b873a51e1..54f1ac383 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -30,3 +30,4 @@ I am currently mostly interested in ikiwiki usability issues:
 
  * [[bugs/the login page is unclear when multiple methods exist]]
  * [[bugs/backlinks onhover thing can go weird]]
+ * [[todo/CSS classes for links]]
-- 
cgit v1.2.3


From 89b65695e778699742bcf93b0ab0304fd53e30ca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 13:40:35 -0400
Subject: typos

---
 IkiWiki/Render.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index cf0c3fe08..324ef24fa 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -490,7 +490,7 @@ sub refresh () {
 						next if $@ || ! defined $sub;
 	
 						my @candidates;
-						if ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
+						if ($depends{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
 							@candidates=@changed;
 						}
 						elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
@@ -500,7 +500,7 @@ sub refresh () {
 						# if the page explicitly depends
 						# on such files
 						if ($d =~ /internal\(/) {
-							if ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
+							if ($depends{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
 								push @candidates, @internal, @internal_change;
 							}
 							elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
-- 
cgit v1.2.3


From 666a9613a12e3b3d36cdd1e818c44f1890f05b0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 14:08:46 -0400
Subject: implement links dependencies

Involved some code refactoring so that same code that detects
link changes for backlinks updating can be used for link dependency
checking. The nice thing is that link dep checking is thus
comopletly free!
---
 IkiWiki.pm        |   3 ++
 IkiWiki/Render.pm | 111 ++++++++++++++++++++++++++++++------------------------
 2 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0bb0c1746..b895e12fc 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -31,6 +31,7 @@ our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
 # Page dependency types.
 our $DEPEND_CONTENT=1;
 our $DEPEND_PRESENCE=2;
+our $DEPEND_LINKS=4;
 
 # Optimisation.
 use Memoize;
@@ -1788,6 +1789,8 @@ sub add_depends ($$;@) {
 
 		$deptype=$deptype & ~$DEPEND_CONTENT | $DEPEND_PRESENCE
 			if $params{presence} && $limited;
+		$deptype=$deptype & ~$DEPEND_CONTENT | $DEPEND_LINKS
+			if $params{links} && $limited;
 	}
 
 	if ($simple) {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 324ef24fa..4e8aae3bc 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -58,6 +58,37 @@ sub backlinks ($) {
 	return @links;
 }
 
+sub find_changed_links (@_) {
+	my %linkchanged;
+	my %linkchangers;
+	foreach my $file (@_) {
+		my $page=pagename($file);
+		
+		if (exists $links{$page}) {
+			foreach my $link (map { bestlink($page, $_) } @{$links{$page}}) {
+				if (length $link &&
+				    (! exists $oldlinks{$page} ||
+				     ! grep { bestlink($page, $_) eq $link } @{$oldlinks{$page}})) {
+					$linkchanged{$link}=1;
+					$linkchangers{lc($page)}=1;
+				}
+			}
+		}
+		if (exists $oldlinks{$page}) {
+			foreach my $link (map { bestlink($page, $_) } @{$oldlinks{$page}}) {
+				if (length $link &&
+				    (! exists $links{$page} || 
+				     ! grep { bestlink($page, $_) eq $link } @{$links{$page}})) {
+					$linkchanged{$link}=1;
+					$linkchangers{lc($page)}=1;
+				}
+			}
+		}
+	}
+
+	return \%linkchanged, \%linkchangers;
+}
+
 sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
@@ -455,10 +486,12 @@ sub refresh () {
 	}
 
 	if (%rendered || @del || @internal || @internal_change) {
-		my @changed;
-		my $changes;
+		my @changed=(keys %rendered, @del);
+		my ($linkchanged, $linkchangers)=find_changed_links(@changed);
+
+		my $unsettled;
 		do {
-			$changes=0;
+			$unsettled=0;
 			@changed=(keys %rendered, @del);
 			my @exists_changed=(@add, @del);
 	
@@ -474,10 +507,14 @@ sub refresh () {
 				if (exists $depends_simple{$p}) {
 					foreach my $d (keys %{$depends_simple{$p}}) {
 						if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
-						     exists $lc_changed{$d})
+						     $lc_changed{$d})
 						    ||
 						    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
-						     exists $lc_exists_changed{$d})) {
+						     $lc_exists_changed{$d})
+					     	    ||
+						    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
+						     $linkchangers->{$d})
+				     		) {
 							$reason = $d;
 							last;
 						}
@@ -489,29 +526,30 @@ sub refresh () {
 						my $sub=pagespec_translate($d);
 						next if $@ || ! defined $sub;
 	
-						my @candidates;
-						if ($depends{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
-							@candidates=@changed;
-						}
-						elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
-							@candidates=@exists_changed;
-						}
 						# only consider internal files
 						# if the page explicitly depends
 						# on such files
-						if ($d =~ /internal\(/) {
-							if ($depends{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
-								push @candidates, @internal, @internal_change;
-							}
-							elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
-								push @candidates, @internal;
-							}
+						my $internal_dep=$d =~ /internal\(/;
+
+						my @candidates;
+						if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+							@candidates=@exists_changed;
+	 						push @candidates, @internal
+								if $internal_dep;
 						}
-	
+						if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
+							@candidates=@changed;
+							push @candidates, @internal, @internal_change
+								if $internal_dep;
+						}
+
 						foreach my $file (@candidates) {
 							next if $file eq $f;
 							my $page=pagename($file);
 							if ($sub->($page, location => $p)) {
+								if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
+									next unless $linkchangers->{lc($page)};
+								}
 								$reason = $page;
 								last D;
 							}
@@ -523,39 +561,14 @@ sub refresh () {
 					debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
 					render($f);
 					$rendered{$f}=1;
-					$changes++;
+					$unsettled=1;
 					last;
 				}
 			}
-		} while $changes;
+		} while $unsettled;
 		
-		# handle backlinks; if a page has added/removed links,
-		# update the pages it links to
-		my %linkchanged;
-		foreach my $file (@changed) {
-			my $page=pagename($file);
-			
-			if (exists $links{$page}) {
-				foreach my $link (map { bestlink($page, $_) } @{$links{$page}}) {
-					if (length $link &&
-					    (! exists $oldlinks{$page} ||
-					     ! grep { bestlink($page, $_) eq $link } @{$oldlinks{$page}})) {
-						$linkchanged{$link}=1;
-					}
-				}
-			}
-			if (exists $oldlinks{$page}) {
-				foreach my $link (map { bestlink($page, $_) } @{$oldlinks{$page}}) {
-					if (length $link &&
-					    (! exists $links{$page} || 
-					     ! grep { bestlink($page, $_) eq $link } @{$links{$page}})) {
-						$linkchanged{$link}=1;
-					}
-				}
-			}
-		}
-
-		foreach my $link (keys %linkchanged) {
+		# update backlinks at end
+		foreach my $link (keys %{$linkchanged}) {
 		    	my $linkfile=$pagesources{$link};
 			if (defined $linkfile) {
 				next if $rendered{$linkfile};
-- 
cgit v1.2.3


From e96992bbc8fc37040eda5119c475ff4174c43339 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 14:33:42 -0400
Subject: fix add_depends to new api

---
 IkiWiki/Plugin/inline.pm | 4 ++--
 IkiWiki/Plugin/map.pm    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 5133c4ba6..cebd9037c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -197,7 +197,7 @@ sub preprocess_inline (@) {
 		        split ' ', $params{pagenames};
 	}
 	else {
-		add_depends($params{page}, $params{pages}, content => ! $quick);
+		add_depends($params{page}, $params{pages}, presence => $quick);
 
 		@list = pagespec_match_list(
 			[ grep { $_ ne $params{page} } keys %pagesources ],
@@ -250,7 +250,7 @@ sub preprocess_inline (@) {
 	# Explicitly add all currently displayed pages as dependencies, so
 	# that if they are removed, the inline will be sure to be updated.
 	foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
-		add_depends($params{page}, $p, content => ! $quick);
+		add_depends($params{page}, $p, presence => $quick);
 	}
 	
 	if ($feeds && exists $params{feedpages}) {
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 682960777..625cfdfca 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -70,11 +70,11 @@ sub preprocess (@) {
 	# Needs to update whenever a page is added or removed (or in some
 	# cases, when its content changes, if show= is specified), so
 	# register a dependency.
-	add_depends($params{page}, $params{pages}, content => exists $params{show});
+	add_depends($params{page}, $params{pages}, presence => ! exists $params{show});
 	# Explicitly add all currently shown pages, to detect when pages
 	# are removed.
 	foreach my $item (keys %mapitems) {
-		add_depends($params{page}, $item, content => exists $params{show});
+		add_depends($params{page}, $item, presence => ! exists $params{show});
 	}
 
 	# Create the map.
-- 
cgit v1.2.3


From c6bf4228d5c988e715ff08a9374b72ce054daa2c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:01:05 -0400
Subject: make links dependencies fire if broken links change

---
 IkiWiki/Render.pm      | 41 ++++++++++++++++++++++++++++-------------
 doc/plugins/write.mdwn |  6 ++++--
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 4e8aae3bc..599bb26e2 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -63,24 +63,39 @@ sub find_changed_links (@_) {
 	my %linkchangers;
 	foreach my $file (@_) {
 		my $page=pagename($file);
-		
+	
 		if (exists $links{$page}) {
-			foreach my $link (map { bestlink($page, $_) } @{$links{$page}}) {
-				if (length $link &&
-				    (! exists $oldlinks{$page} ||
-				     ! grep { bestlink($page, $_) eq $link } @{$oldlinks{$page}})) {
-					$linkchanged{$link}=1;
-					$linkchangers{lc($page)}=1;
+			foreach my $l (@{$links{$page}}) {
+				my $link=bestlink($page, $l);
+				if (length $link) {
+					if (! exists $oldlinks{$page} ||
+					    ! grep { bestlink($page, $_) eq $link } @{$oldlinks{$page}}) {
+						$linkchanged{$link}=1;
+						$linkchangers{lc($page)}=1;
+					}
+				}
+				else {
+					if (! grep { lc $_ eq lc $l } @{$oldlinks{$page}}) {
+						$linkchangers{lc($page)}=1
+					}
 				}
+				
 			}
 		}
 		if (exists $oldlinks{$page}) {
-			foreach my $link (map { bestlink($page, $_) } @{$oldlinks{$page}}) {
-				if (length $link &&
-				    (! exists $links{$page} || 
-				     ! grep { bestlink($page, $_) eq $link } @{$links{$page}})) {
-					$linkchanged{$link}=1;
-					$linkchangers{lc($page)}=1;
+			foreach my $l (@{$oldlinks{$page}}) {
+				my $link=bestlink($page, $l);
+				if (length $link) {
+					if (! exists $links{$page} || 
+					    ! grep { bestlink($page, $_) eq $link } @{$links{$page}}) {
+						$linkchanged{$link}=1;
+						$linkchangers{lc($page)}=1;
+					}
+				}
+				else {
+					if (! grep { lc $_ eq lc $l } @{$links{$page}}) {
+						$linkchangers{lc($page)}=1
+					}
 				}
 			}
 		}
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 73db6f12a..133030f08 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -620,8 +620,10 @@ used to indicate weaker types of dependencies:
 
 * `presence` if set to true, only the presence of a matching page triggers
   the dependency.
-* `links` if set to true, any change in the text of links on a matching page
-  triggers the dependency
+* `links` if set to true, any change to links on a matching page
+  triggers the dependency. This includes when a link is added, removed,
+  or changes what it points to due to other changes. It does not include
+  the addition or removal of a duplicate link.
 
 #### `pagespec_match($$;@)`
 
-- 
cgit v1.2.3


From 846026b20be2ab177eb58d3add468419625c3cc1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:08:57 -0400
Subject: update

---
 debian/changelog | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ca0d9e42..0255ac5d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,14 +11,17 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * Fix a bug that could lead to duplicate links being recorded
     for tags.
   * Added support framework for multiple types of dependencies.
-  * Allow declaring that a dependency is only affected by page presence.
-    (By passing presence => 1 to add_depends.)
+  * Allow declaring that a dependency is only affected by page presence
+    or changes to its links.
+    (By passing presence => 1 or links => 1 to add_depends.)
   * pagecount, calendar, postsparkline, progress: Use a presence dependency,
     which makes these directives much less expensive to use, since page
     edits will no longer trigger an unnecessary update.
   * map: Use a presence dependency unless show= is specified.
     This makes maps efficient enough that they can be used on sidebars!
   * inline: Use a presence dependency in quick mode.
+  * brokenlinks: Use a link dependency.
+    This makes it much more efficient, only updating when really necessary.
   * Transitive dependencies are now correctly supported.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
-- 
cgit v1.2.3


From f41caf57eabdaa2345eba1718450af686dca3971 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:09:09 -0400
Subject: use links dependency

---
 IkiWiki/Plugin/brokenlinks.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index b8ed2b8de..9e65f52c6 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -23,9 +23,8 @@ sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a page is changed, 
-	# added or removed, in order to see the link changes.
-	add_depends($params{page}, $params{pages});
+	# Needs to update whenever the links on a page change.
+	add_depends($params{page}, $params{pages}, links => 1);
 	
 	my @broken;
 	foreach my $link (keys %IkiWiki::brokenlinks) {
-- 
cgit v1.2.3


From 7123178732674268a1dce09277536dcdc68825f5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:14:18 -0400
Subject: oprhans: Use a combination of precense and link dependencies.

This makes it more efficient.

It also fixes a longstanding bug, where if only a small set of pages were
considered by orphans, changes to links on other pages failed to cause an
update.
---
 IkiWiki/Plugin/orphans.pm | 10 +++++++---
 debian/changelog          |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index d981670e7..ae330b23b 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -23,9 +23,13 @@ sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a page is changed, added, or removed,
-	# in order to see the link changes.
-	add_depends($params{page}, $params{pages});
+	# Needs to update whenever a link changes, on any page
+	# since any page could link to one of the pages we're
+	# considering as orphans.
+	add_depends($params{page}, "*", links => 1);
+	# Also needs to update whenever potential orphans are added or
+	# removed.
+	add_depends($params{page}, $params{pages}, presence => 1);
 	
 	my @orphans;
 	foreach my $page (pagespec_match_list(
diff --git a/debian/changelog b/debian/changelog
index 0255ac5d0..363bb9dbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * inline: Use a presence dependency in quick mode.
   * brokenlinks: Use a link dependency.
     This makes it much more efficient, only updating when really necessary.
+  * oprhans: Use a combination of precense and link dependencies.
+    This makes it more efficient. It also fixes a longstanding bug,
+    where if only a small set of pages were considered by orphans,
+    changes to links on other pages failed to cause an update.
   * Transitive dependencies are now correctly supported.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
-- 
cgit v1.2.3


From fc864515b857694da6752879edeb2f82fd12e3a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:16:14 -0400
Subject: omit forum and javascript from list

---
 doc/plugins/orphans.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/plugins/orphans.mdwn b/doc/plugins/orphans.mdwn
index ea7c4df13..8c0d0b933 100644
--- a/doc/plugins/orphans.mdwn
+++ b/doc/plugins/orphans.mdwn
@@ -10,5 +10,6 @@ Here's a list of orphaned pages on this wiki:
 
 [[!orphans pages="* and !news/* and !todo/* and !bugs/* and !users/* and
 !recentchanges and !examples/* and !tips/* and !sandbox/* and !templates/* and
+!forum/* and !*.js
 !wikiicons/* and !plugins/*"]]
 """]]
-- 
cgit v1.2.3


From dc6fab3824c9848cdaf8b252253d690f96573d25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:17:36 -0400
Subject: syntax

---
 doc/plugins/orphans.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/orphans.mdwn b/doc/plugins/orphans.mdwn
index 8c0d0b933..e403c2d18 100644
--- a/doc/plugins/orphans.mdwn
+++ b/doc/plugins/orphans.mdwn
@@ -10,6 +10,6 @@ Here's a list of orphaned pages on this wiki:
 
 [[!orphans pages="* and !news/* and !todo/* and !bugs/* and !users/* and
 !recentchanges and !examples/* and !tips/* and !sandbox/* and !templates/* and
-!forum/* and !*.js
+!forum/* and !*.js and
 !wikiicons/* and !plugins/*"]]
 """]]
-- 
cgit v1.2.3


From d6cdced589f31471622ed481f88e33e070388c27 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:22:17 -0400
Subject: fix documentation of quick

It *always* turns off feeds, because feeds require a look
at all pages.
---
 doc/ikiwiki/directive/inline.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn
index 99f795972..4e087ab6c 100644
--- a/doc/ikiwiki/directive/inline.mdwn
+++ b/doc/ikiwiki/directive/inline.mdwn
@@ -98,7 +98,7 @@ Here are some less often needed parameters:
 * `feedonly` - Only generate the feed, do not display the pages inline on
   the page.
 * `quick` - Build archives in quick mode, without reading page contents for
-  metadata. By default, this also turns off generation of any feeds.
+  metadata. This also turns off generation of any feeds.
 * `timeformat` - Use this to specify how to display the time or date for pages
   in the blog. The format string is passed to the strftime(3) function.
 * `feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom
-- 
cgit v1.2.3


From f7d04d106721a6bff6dfd4a0a7aa162cd2ce5536 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:26:15 -0400
Subject: switch plugins page to use a map instead of an inline

A map just seems a better fit for reference, since it deliniates the
contrib plugins better, and orders better.

It also has the advantage of being less expensive, since the plugins page
does not need to update when eg, the pagecount page changes.

Only downside is, no rss feed of new plugins. Which I know a few people
were subscribed to.
---
 doc/plugins.mdwn         | 6 ++----
 doc/plugins/contrib.mdwn | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn
index 527568208..bd7ee538b 100644
--- a/doc/plugins.mdwn
+++ b/doc/plugins.mdwn
@@ -13,7 +13,5 @@ will fit most uses of ikiwiki.
 
 ## Plugin directory
 
-[[!inline pages="plugins/* and !plugins/type/* and !plugins/write and 
-!plugins/write/* and !plugins/contrib and !plugins/install and !*/Discussion"
-feedpages="created_after(plugins/graphviz)" archive="yes" sort=title
-rootpage="plugins/contrib" postformtext="Add a new plugin named:" show=0]]
+[[!map pages="plugins/* and !plugins/type/* and !plugins/write and 
+!plugins/write/* and !plugins/contrib and !plugins/install and !*/Discussion"]]
diff --git a/doc/plugins/contrib.mdwn b/doc/plugins/contrib.mdwn
index a03e6a95d..ac6c1b751 100644
--- a/doc/plugins/contrib.mdwn
+++ b/doc/plugins/contrib.mdwn
@@ -1,6 +1,4 @@
 These plugins are provided by third parties and are not currently
 included in ikiwiki. See [[install]] for installation help.
 
-[[!inline pages="plugins/contrib/* and !*/Discussion" 
-feedpages="created_after(plugins/contrib/navbar)" archive="yes"
-rootpage="plugins/contrib" postformtext="Add a new plugin named:" show=0]]
+[[!map pages="plugins/contrib/* and !*/Discussion"]]
-- 
cgit v1.2.3


From e7144e918f0d15a9bbb1a4842ff7300ce61a1886 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:36:51 -0400
Subject: clarify amoung

I found it really hard to understand from the old description..
---
 doc/ikiwiki/directive/pagestats.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn
index 66f851dbd..f14c80b07 100644
--- a/doc/ikiwiki/directive/pagestats.mdwn
+++ b/doc/ikiwiki/directive/pagestats.mdwn
@@ -12,13 +12,13 @@ And here's how to create a table of all the pages on the wiki:
 
 	\[[!pagestats style="table"]]
 
-The optional `among` parameter limits display to pages that match a
-[[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog
-entries, you could use:
+The optional `among` parameter limits the pages whose outgoing links are
+considered. For instance, to display a cloud of tags used on blog
+entries, while ignoring other pages that use those tags, you could use:
 
 	\[[!pagestats pages="tags/*" among="blog/posts/*"]]
 
-or to display a cloud of tags related to Linux, you could use:
+Or to display a cloud of tags related to Linux, you could use:
 
 	\[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]]
 
-- 
cgit v1.2.3


From 61a36de432c58a8d7703b1ecc5d5704981e10e2d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:40:18 -0400
Subject: closures

---
 doc/bugs/transitive_dependencies.mdwn | 2 +-
 doc/todo/dependency_types.mdwn        | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
index 9586bc9b0..0a2e9ec28 100644
--- a/doc/bugs/transitive_dependencies.mdwn
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -65,4 +65,4 @@ Downsides here:
   modification to plugins/brokenlinks causes an unnecessary update of
   plugins, and could be solved by adding more dependency types.)
 
---[[Joey]] 
+[[done]] --[[Joey]] 
diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index f13f1448e..f46a6a7c6 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -162,14 +162,13 @@ Link dependencies:
 
 * `add_depends($page, $spec, links => 1, presence => 1)`
   adds a links + presence dependency.
-* `refresh` only rebuilds a page with a links dependency if
-  pages matched by the pagespec gain or lose links. (What the link
-  actually points to may change independent of this, due to changes
-  elsewhere, without it firing.)
+* Use backlinks change code to detect changes to link dependencies too.
 * So, brokenlinks can fire whenever any links in any of the
   pages it's tracking change, or when pages are added or
   removed.
 
 TODO: How to determine if a pagespec is valid to be used with a links
 dependency? Use the same simple pagespecs that are valid for presence
-dependencies?
+dependencies? Seems ok.
+
+[[done]]
-- 
cgit v1.2.3


From c869398e2b5e202145ad3c14d96d520779a462e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:43:37 -0400
Subject: typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 363bb9dbd..abbd87abc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * inline: Use a presence dependency in quick mode.
   * brokenlinks: Use a link dependency.
     This makes it much more efficient, only updating when really necessary.
-  * oprhans: Use a combination of precense and link dependencies.
+  * orphans: Use a combination of precense and link dependencies.
     This makes it more efficient. It also fixes a longstanding bug,
     where if only a small set of pages were considered by orphans,
     changes to links on other pages failed to cause an update.
-- 
cgit v1.2.3


From c21f9e70936566daaf06fff21349f4584ee42906 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 15:44:26 -0400
Subject: pagestats: Use a combination of precense and link dependencies.

This makes it more efficient.

It also fixes the same bug that I fixed in orphans recently,
that only changes to the set of displayed pages were considered (or amoung),
which missed changes to links on other pages to those.

Probably this bug was never noticed because pagestats is most often put
on a blog type page, which gets updated anyway when posts change,
and thus the tag cloud was updated.
---
 IkiWiki/Plugin/pagestats.pm | 11 +++++++----
 debian/changelog            |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 874ead7e6..00b919325 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -35,10 +35,13 @@ sub preprocess (@) {
 	$params{pages}="*" unless defined $params{pages};
 	my $style = ($params{style} or 'cloud');
 	
-	# Needs to update whenever a page is added or removed, so
-	# register a dependency.
-	add_depends($params{page}, $params{pages});
-	add_depends($params{page}, $params{among}) if exists $params{among};
+	# Needs to update whenever a page is added or removed.
+	add_depends($params{page}, $params{pages}, exists => 1);
+	# Also needs to update when any page with links changes, 
+	# in case the links point to our displayed pages.
+	# (Amoung limits this further.)
+	add_depends($params{page}, exists $params{among} ? $params{among} : "*",
+		links => 1); 
 	
 	my %counts;
 	my $max = 0;
diff --git a/debian/changelog b/debian/changelog
index abbd87abc..000203405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,9 +22,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * inline: Use a presence dependency in quick mode.
   * brokenlinks: Use a link dependency.
     This makes it much more efficient, only updating when really necessary.
-  * orphans: Use a combination of precense and link dependencies.
-    This makes it more efficient. It also fixes a longstanding bug,
-    where if only a small set of pages were considered by orphans,
+  * orphans, pagestats: Use a combination of precense and link dependencies.
+    This makes them more efficient. It also fixes a longstanding bug,
+    where if only a small set of pages were considered by orphans/pagestats,
     changes to links on other pages failed to cause an update.
   * Transitive dependencies are now correctly supported.
 
-- 
cgit v1.2.3


From 3a188c047b4fed29865e7516f3b208901b22161d Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 5 Oct 2009 16:08:19 -0400
Subject: thoughts about renaming the actual images to .albumimage

---
 doc/plugins/contrib/album/discussion.mdwn | 127 ++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index 5fb91c5a4..a613bb2d2 100644
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -61,21 +61,59 @@ code or tried it yet, but here goes. --[[Joey]]
   seems like it will become a pain. Everyone will need to come up
   with their own automation for it, and then there's the question
   of how to automate it when uploading attachments.
+
+> There's already a script (ikiwiki-album) to populate a git
+> checkout with skeleton "viewer" pages; I was planning to make a
+> specialized CGI interface for albums after getting feedback from
+> you (since the requirements for that CGI interface change depending
+> on the implementation). I agree that this is ugly, though. -s
+
 * With each viewer page having next/prev links, I can see how you
   were having the scalability issues with ikiwiki's data structures
   earlier!
+
+> Yeah, I think they're a basic requirement from a UI point of view
+> though (although they don't necessarily have to be full wikilinks).
+> -s
+
 * And doesn't each viewer page really depend on every other page in the
   same albumsection? If a new page is added, the next/prev links
   may need to be updated, for example. If so, there will be much
   unnecessary rebuilding.
+
+> albumsections are just a way to insert headings into the flow of
+> photos, so they don't actually affect dependencies.
+>
+> One non-obvious constraint of ikiwiki's current design is that
+> everything "off-page" necessary to build any page has to happen
+> at scan time, which has caused a few strange design decisions,
+> like the fact that each viewer controls what album it's in.
+>
+> It's difficult for the contents of the album to just be a
+> pagespec, like for inline, because pagespecs can depend on
+> metadata, which is gathered in arbitrary order at scan time;
+> so the earliest you can safely apply a pagespec to the wiki
+> contents to get a concrete list of pages is at rebuild time.
+>
+> (This stalled my attempt at a trail plugin, too.) -s
+
 * One thing I do like about having individual pages per image is
   that they can each have their own comments, etc.
+
+> Yes; also, they can be wikilinked. I consider those to be
+> UI requirements. -s
+
 * Seems possibly backwards that the albumimage controls what album
   an image appears in. Two use cases -- 1: I may want to make a locked
   album, but then anyone who can write to any other page on the wiki can
   add an image to it. 2: I may want an image to appear in more than one
   album. Think tags. So it seems it would be better to have the album
   directive control what pages it includes (a la inline).
+
+> See note above about pagespecs not being very safe early on.
+> You did merge my inline-with-pagenames feature, which is safe to use
+> at scan time, though.
+
 * Putting a few of the above thoughts together, my ideal album system
   seems to be one where I can just drop the images into a directory and
   have them appear in the album index, as well as each generate their own wiki
@@ -84,3 +122,92 @@ code or tried it yet, but here goes. --[[Joey]]
   themselves.) This is almost pointing toward making the images first-class
   wiki page sources. Hey, it worked for po! :) But the metadata and editing
   problems probably don't really allow that.
+
+> Putting a JPEG in the web form is not an option from my point of
+> view :-) but perhaps there could just be a "web-editable" flag supplied
+> by plugins, and things could be changed to respect it.
+>
+> In a way, what you really want for metadata is to have it in the album
+> page, so you can batch-edit the whole lot by editing one file (this
+> does mean that editing the album necessarily causes each of its viewers
+> to be rebuilt, but in practice that happens anyway). -s
+
+----
+
+Trying to use the "special extension" design:
+
+Suppose that each viewer is a JPEG-or-GIF-or-something, with extension
+".albumimage". We have a gallery "memes" with three images, badger,
+mushroom and snake.
+
+Files in git repo:
+
+* index.mdwn
+* memes.mdwn
+* memes/badger.albumimage (a renamed JPEG)
+* memes/badger/comment_1._comment
+* memes/badger/comment_2._comment
+* memes/mushroom.albumimage (a renamed GIF)
+* memes/mushroom.meta (sidecar file with metadata)
+* memes/snake.albumimage (a renamed video)
+
+Files in web content:
+
+* index.html
+* memes/index.html
+* memes/96x96-badger.jpg (from img)
+* memes/96x96-mushroom.jpg (from img)
+* memes/96x96-snake.jpg (from img, hacked up to use totem-video-thumbnailer :-) )
+* memes/badger/index.html (including comments)
+* memes/badger.jpg
+* memes/mushroom/index.html
+* memes/mushroom.gif
+* memes/snake/index.html
+* memes/snake.mov
+
+ispage("memes/badger") (etc.) must be true, to make the above rendering
+happen, so albumimage needs to be a "page" extension.
+
+To not confuse other plugins, album should probably have a filter() hook
+that turns .albumimage files into HTML? That'd probably be a reasonable
+way to get them rendered anyway.
+
+do=edit&page=memes/badger needs to not put the JPG in a text box: somehow
+divert or override the normal edit CGI by telling it that .albumimage
+files are not editable in the usual way?
+
+Every image needs to depend on, and link to, the next and previous images,
+which is a bit tricky. In previous thinking about this I'd been applying
+the overly strict constraint that the ordered sequence of pages in each
+album must be known at scan time. However, that's not *necessarily* needed:
+the album and each photo could collect an unordered superset of dependencies
+at scan time, and at rebuild time that could be refined to be the exact set,
+in order. Perhaps restricting to "the images in an album A must match A/*"
+would be useful; then the unordered superset could just be "A/*". Your
+"albums via tags" idea would be nice too though, particularly for feature
+parity with e.g. Facebook: "photos of Joey" -> "tags/joey and albumimage()"
+maybe?
+
+If images are allowed to be considered to be part of more than one album,
+then a pretty and usable UI becomes harder - "next/previous" expands into
+"next photo in holidays/2009/germany / next photo in tagged/smcv / ..."
+and it could get quite hard to navigate. Perhaps next/previous links could
+be displayed only for the closest ancestor (in URL space) that is an
+album, or something?
+
+Requiring renaming is awkward for non-technical Windows/Mac users, with both
+platforms' defaults being to hide extensions; however, this could be
+circumvented by adding some sort of hook in attachment to turn things into
+a .albumimage at upload time, and declaring that using git/svn/... without
+extensions visible is a "don't do that then" situation :-)
+
+Ideally attachment could also be configured to upload into a specified
+underlay, so that photos don't have to be in your source-code control
+(you might want that, but I don't!).
+
+Things that would be nice, and are probably possible:
+
+* make the "Edit page" link on viewers divert to album-specific CGI instead
+  of just failing or not appearing
+* some way to deep-link to memes/badger.jpg with a wikilink, without knowing a
+  priori that it's secretly a JPEG
-- 
cgit v1.2.3


From 4b2eaac156433d6e16b4b63660654bb26561b77f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 16:18:54 -0400
Subject: response

---
 doc/todo/CSS_classes_for_links.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/todo/CSS_classes_for_links.mdwn b/doc/todo/CSS_classes_for_links.mdwn
index 43a480be8..38db87724 100644
--- a/doc/todo/CSS_classes_for_links.mdwn
+++ b/doc/todo/CSS_classes_for_links.mdwn
@@ -92,3 +92,12 @@ I find CSS3 support still spotty...  Here are some notes on how to do this in Ik
 >> As an alternative to patching the uses of `htmllink`, what do you think
 >> about patching `htmllink` itself? Are there circumstances where it might be
 >> used to generate a non-internal link? -- [[Jon]]
+
+>>> I think that the minimum configurability to get something that
+>>> can be used by CSS to style the links however the end user wants
+>>> is the best thing to shoot for. Ideally, no configurability. And
+>>> a tip or something documenting how to use the classes in your CSS
+>>> to style links so that eg, external links have a warning icon.
+>>> 
+>>> `htmllink` can never be used to generate an external link. So,
+>>> patching it seems the best approach. --[[Joey]] 
-- 
cgit v1.2.3


From 786dcf15c4117f9ae6b000318ac9809399df4d69 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 16:47:12 -0400
Subject: responses, questions, ideas

---
 doc/plugins/contrib/album/discussion.mdwn | 45 ++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index a613bb2d2..5c8e74fa6 100644
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -76,6 +76,12 @@ code or tried it yet, but here goes. --[[Joey]]
 > though (although they don't necessarily have to be full wikilinks).
 > -s
 
+>> I think that with the new dependency types system, the dependencies for
+>> these can be presence dependencies, which will probably help with
+>> avoiding rebuilds of a page if the next/prev page is changed.
+>> (Unless you use img to make the thumbnails for those links, then it
+>> would rebuild the thumbnails anyway. Have not looked at the code.) --[[Joey]] 
+
 * And doesn't each viewer page really depend on every other page in the
   same albumsection? If a new page is added, the next/prev links
   may need to be updated, for example. If so, there will be much
@@ -97,6 +103,11 @@ code or tried it yet, but here goes. --[[Joey]]
 >
 > (This stalled my attempt at a trail plugin, too.) -s
 
+>> Not sure I understand why these need to look at pagespecs at scan time?
+>> Also, note that it is fairly doable to detect if a pagespec uses such
+>> metadata. Er, I mean, I have a cheezy hack in `add_depends` now that does
+>> it to deal with a similar case. --[[Joey]] 
+
 * One thing I do like about having individual pages per image is
   that they can each have their own comments, etc.
 
@@ -131,6 +142,15 @@ code or tried it yet, but here goes. --[[Joey]]
 > page, so you can batch-edit the whole lot by editing one file (this
 > does mean that editing the album necessarily causes each of its viewers
 > to be rebuilt, but in practice that happens anyway). -s
+>
+>> Yes, that would make some sense.. It also allows putting one image in
+>> two albums, with different caption etc. (Maybe for different audiences.)
+>>
+>> It would probably be possible to add a new dependency type, and thus
+>> make ikiwiki smart about noticing whether the metadata has actually
+>> changed, and only update those viewers where it has. But the dependency
+>> type stuff is still very new, and not plugin friendly .. so only just
+>> possible, --[[Joey]] 
 
 ----
 
@@ -140,6 +160,10 @@ Suppose that each viewer is a JPEG-or-GIF-or-something, with extension
 ".albumimage". We have a gallery "memes" with three images, badger,
 mushroom and snake.
 
+> An alternative might be to use ".album.jpg", and ".album.gif"
+> etc as the htmlize extensions. May need some fixes to ikiwiki to support
+> that. --[[Joey]] 
+
 Files in git repo:
 
 * index.mdwn
@@ -172,6 +196,10 @@ To not confuse other plugins, album should probably have a filter() hook
 that turns .albumimage files into HTML? That'd probably be a reasonable
 way to get them rendered anyway.
 
+> I guess that is needed to avoid preprocess, scan, etc trying to process
+> the image, as well as eg, smiley trying to munge it in sanitize.
+> --[[Joey]] 
+
 do=edit&page=memes/badger needs to not put the JPG in a text box: somehow
 divert or override the normal edit CGI by telling it that .albumimage
 files are not editable in the usual way?
@@ -182,7 +210,14 @@ the overly strict constraint that the ordered sequence of pages in each
 album must be known at scan time. However, that's not *necessarily* needed:
 the album and each photo could collect an unordered superset of dependencies
 at scan time, and at rebuild time that could be refined to be the exact set,
-in order. Perhaps restricting to "the images in an album A must match A/*"
+in order.
+
+> Why do you need to collect this info at scan time? You can determine it
+> at build time via `pagespec_match_list`, surely .. maybe with some
+> memoization to avoid each image in an album building the same list.
+> I sense that I may be missing a subtelty though. --[[Joey]] 
+
+Perhaps restricting to "the images in an album A must match A/*"
 would be useful; then the unordered superset could just be "A/*". Your
 "albums via tags" idea would be nice too though, particularly for feature
 parity with e.g. Facebook: "photos of Joey" -> "tags/joey and albumimage()"
@@ -195,12 +230,20 @@ and it could get quite hard to navigate. Perhaps next/previous links could
 be displayed only for the closest ancestor (in URL space) that is an
 album, or something?
 
+> Ugh, yeah, that is a problem. Perhaps wanting to support that was just
+> too ambitious. --[[Joey]] 
+
 Requiring renaming is awkward for non-technical Windows/Mac users, with both
 platforms' defaults being to hide extensions; however, this could be
 circumvented by adding some sort of hook in attachment to turn things into
 a .albumimage at upload time, and declaring that using git/svn/... without
 extensions visible is a "don't do that then" situation :-)
 
+> Or extend `pagetype` so it can do the necessary matching without
+> renaming. Maybe by allowing a subdirectory to be specified along
+> with an extension. (Or allow specifying a full pagespec,
+> but I hesitate to seriously suggest that.) --[[Joey]] 
+
 Ideally attachment could also be configured to upload into a specified
 underlay, so that photos don't have to be in your source-code control
 (you might want that, but I don't!).
-- 
cgit v1.2.3


From f1864a64ee7592d54a332fcab27d451f29c7aab6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 16:48:15 -0400
Subject: typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 000203405..ab235484d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * inline: Use a presence dependency in quick mode.
   * brokenlinks: Use a link dependency.
     This makes it much more efficient, only updating when really necessary.
-  * orphans, pagestats: Use a combination of precense and link dependencies.
+  * orphans, pagestats: Use a combination of presence and link dependencies.
     This makes them more efficient. It also fixes a longstanding bug,
     where if only a small set of pages were considered by orphans/pagestats,
     changes to links on other pages failed to cause an update.
-- 
cgit v1.2.3


From a4df28f42a96a2412665fc9aeeccc93a160d02f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 16:51:33 -0400
Subject: add rebuild handing

---
 debian/NEWS      | 10 ++++++++++
 debian/changelog |  2 ++
 debian/postinst  |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/NEWS b/debian/NEWS
index 808105fd5..520f38815 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+ikiwiki (3.14159266) UNRELEASED; urgency=low
+
+  To take advantage of significant performance improvements, all
+  wikis need to be rebuilt on upgrade to this version. If you
+  listed your wiki in /etc/ikiwiki/wikilist this will be done
+  automatically when the Debian package is upgraded. Or use
+  ikiwiki-mass-rebuild to force a rebuild.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 05 Oct 2009 16:48:59 -0400
+
 ikiwiki (3.1415926) unstable; urgency=low
 
   In order to fix a performance bug, all wikis need to be rebuilt on
diff --git a/debian/changelog b/debian/changelog
index ab235484d..89d377769 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
     where if only a small set of pages were considered by orphans/pagestats,
     changes to links on other pages failed to cause an update.
   * Transitive dependencies are now correctly supported.
+  * Rebuild wikis on upgrade to this version to get improved dependency
+    info.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
diff --git a/debian/postinst b/debian/postinst
index 2ba26e5b6..dd4be6e0e 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=3.1415926
+firstcompat=3.14159266
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then
-- 
cgit v1.2.3


From 031d1bf5046ab77c796477a19967e7c0c512c417 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 17:03:16 -0400
Subject: use among limit for correctness

---
 IkiWiki/Plugin/pagestats.pm | 2 +-
 doc/plugins.mdwn            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 00b919325..0765c1cfa 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -39,7 +39,7 @@ sub preprocess (@) {
 	add_depends($params{page}, $params{pages}, exists => 1);
 	# Also needs to update when any page with links changes, 
 	# in case the links point to our displayed pages.
-	# (Amoung limits this further.)
+	# (Among limits this further.)
 	add_depends($params{page}, exists $params{among} ? $params{among} : "*",
 		links => 1); 
 	
diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn
index bd7ee538b..697b4a219 100644
--- a/doc/plugins.mdwn
+++ b/doc/plugins.mdwn
@@ -1,7 +1,7 @@
 Most of ikiwiki's [[features]] are implemented as plugins. Many of these 
 plugins are included with ikiwiki.
 
-[[!pagestats pages="plugins/type/* and !plugins/type/slow"]]
+[[!pagestats pages="plugins/type/* and !plugins/type/slow" among="plugins/*"]]
 
 There's documentation if you want to [[write]] your own plugins, or you can
 [[install]] plugins [[contributed|contrib]] by others.
-- 
cgit v1.2.3


From ba71687077f0acd902294f9081eff11f7e843532 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 17:10:00 -0400
Subject: note that this old bug affects more stuff now

---
 doc/bugs/bestlink_change_update_issue.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/bestlink_change_update_issue.mdwn b/doc/bugs/bestlink_change_update_issue.mdwn
index 5ce4a93d2..fee65c0de 100644
--- a/doc/bugs/bestlink_change_update_issue.mdwn
+++ b/doc/bugs/bestlink_change_update_issue.mdwn
@@ -11,3 +11,6 @@ calculation in refresh(), which doesn't detect that the link has changed in
 this case.
 
 Still true in 1.43 although the code is much different now..
+
+> Still true as of 031d1bf5046ab77c796477a19967e7c0c512c417, 
+> and now this same problem also affects link dependencies.
-- 
cgit v1.2.3


From bf10130165f2696666e273b5ea29348089496c1c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 17:11:03 -0400
Subject: close

---
 doc/bugs/cgi_does_not_use_templatedir_overlay.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/cgi_does_not_use_templatedir_overlay.mdwn b/doc/bugs/cgi_does_not_use_templatedir_overlay.mdwn
index eb300e7c4..d86a3ac3e 100644
--- a/doc/bugs/cgi_does_not_use_templatedir_overlay.mdwn
+++ b/doc/bugs/cgi_does_not_use_templatedir_overlay.mdwn
@@ -20,3 +20,7 @@ However, when I make a change via the CGI (which has been created by the last se
 > problems; it could check if the templatedir exists, and check that it's
 > readable. This would add some extra system calls to every ikiwiki run,
 > and I'm not convinced it's worth it. --[[Joey]]
+
+>> Closing this bug since I never heard back that it was not one
+>> of the above two problems, and I consider both problems local
+>> configuration errors. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 4dd289ba312126a3eaad84638fb290f94ecfcf42 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 17:12:38 -0400
Subject: fixed a while ago

---
 doc/bugs/git_utf8.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/git_utf8.mdwn b/doc/bugs/git_utf8.mdwn
index dc8df1dab..39903d51c 100644
--- a/doc/bugs/git_utf8.mdwn
+++ b/doc/bugs/git_utf8.mdwn
@@ -6,3 +6,7 @@ appearing.
 
 Probably git's output needs to be force encoded to utf-8.
 --[[Joey]]
+
+> I did that in 4ac0b2953131d7a53562ab8918c8e5a49952d8ac , [[done]]
+> --[[Joey]] 
+
-- 
cgit v1.2.3


From cdd7334c3185eb7c35237e1ea1c11ed0da494029 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 17:15:37 -0400
Subject: close

---
 doc/bugs/discussion_of_what__63__.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/discussion_of_what__63__.mdwn b/doc/bugs/discussion_of_what__63__.mdwn
index 2f469fed9..763e599bf 100644
--- a/doc/bugs/discussion_of_what__63__.mdwn
+++ b/doc/bugs/discussion_of_what__63__.mdwn
@@ -1,3 +1,7 @@
 When searching in ikiwiki, sometimes discussion pages turn up. However, they are only titled "discussion".
 In order to know what topic they are discussing, you have to look at the URL. Shouldn't they be titled
 "foo/discussion" or "discussion of foo" or something? Thanks, --[[perolofsson]]
+
+> This bug was filed when ikiwiki still used hyperestradier.
+> Now that it uses xapian, the search results include the full
+> page name, which seems sufficient to call this [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 7a520974b59c1a498232512978e4abd926292066 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 17:44:15 -0400
Subject: uh oh, this affects link deps

---
 doc/bugs/bestlink_change_update_issue.mdwn | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/bugs/bestlink_change_update_issue.mdwn b/doc/bugs/bestlink_change_update_issue.mdwn
index fee65c0de..211a78332 100644
--- a/doc/bugs/bestlink_change_update_issue.mdwn
+++ b/doc/bugs/bestlink_change_update_issue.mdwn
@@ -1,16 +1,15 @@
 * Has bugs updating things if the bestlink of a page changes due to
   adding/removing a page. For example, if Foo/Bar links to "Baz", which is
   Foo/Baz, and Foo/Bar/Baz gets added, it will update the links in Foo/Bar
-  to point to it, but will forget to update the linkbacks in Foo/Baz.
+  to point to it, but will forget to update the backlinks in Foo/Baz.
 
-* And if Foo/Bar/Baz is then removed, it forgets to update Foo/Bar to link
-  back to Foo/Baz.
+* And if Foo/Bar/Baz is then removed, Foo/Bar gets a broken link,
+  instead of changing back to linking to Foo/Baz.
 
-As of 1.33, this is still true. The buggy code is the %linkchanged
-calculation in refresh(), which doesn't detect that the link has changed in
-this case.
+This old bug still exists as of 031d1bf5046ab77c796477a19967e7c0c512c417.
+and now this same problem also affects link dependencies.
 
-Still true in 1.43 although the code is much different now..
-
-> Still true as of 031d1bf5046ab77c796477a19967e7c0c512c417, 
-> and now this same problem also affects link dependencies.
+(Some of) The buggy code is in `find_changed_links`
+which doesn't detect that the link has changed in
+this case, because when it looks at where the `%oldlinks` link to,
+it does so after having updated state to add/remove the page.
-- 
cgit v1.2.3


From 0cb9e588e4253d317945399120a1ef5780b59d7a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 20:54:38 -0400
Subject: add among limit to pagestats

---
 doc/examples/blog/index.mdwn | 2 +-
 doc/examples/blog/tags.mdwn  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index aef46eb68..01b714fcd 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,4 +1,4 @@
-[[!pagestats pages="./tags/*"]]
+[[!pagestats pages="./tags/*" among="./posts/*"]]
 
 Welcome to my blog.
 
diff --git a/doc/examples/blog/tags.mdwn b/doc/examples/blog/tags.mdwn
index 53cc8d368..b5eca5b71 100644
--- a/doc/examples/blog/tags.mdwn
+++ b/doc/examples/blog/tags.mdwn
@@ -1,3 +1,3 @@
-[[!pagestats pages="./tags/*"]]
+[[!pagestats pages="./tags/*" among="./posts/*"]]
 
 On the right you can see the tag cloud for this blog.
-- 
cgit v1.2.3


From fd7b5767d3d377185838895d04f51288f0889a59 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 21:24:55 -0400
Subject: new link change detection method and general code rework

This new method for determining when links on pages
have changed should be more efficient, since it avoids
double calculation of the bestlinks.

It also allows collecting data about the old links, before
the scan pass, so the data is accurate when pages move around
and bestlinks change.

Also got some code back to a saner indent level.
---
 IkiWiki/Render.pm | 242 ++++++++++++++++++++++++++----------------------------
 1 file changed, 116 insertions(+), 126 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 599bb26e2..fe0b3138a 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -58,52 +58,6 @@ sub backlinks ($) {
 	return @links;
 }
 
-sub find_changed_links (@_) {
-	my %linkchanged;
-	my %linkchangers;
-	foreach my $file (@_) {
-		my $page=pagename($file);
-	
-		if (exists $links{$page}) {
-			foreach my $l (@{$links{$page}}) {
-				my $link=bestlink($page, $l);
-				if (length $link) {
-					if (! exists $oldlinks{$page} ||
-					    ! grep { bestlink($page, $_) eq $link } @{$oldlinks{$page}}) {
-						$linkchanged{$link}=1;
-						$linkchangers{lc($page)}=1;
-					}
-				}
-				else {
-					if (! grep { lc $_ eq lc $l } @{$oldlinks{$page}}) {
-						$linkchangers{lc($page)}=1
-					}
-				}
-				
-			}
-		}
-		if (exists $oldlinks{$page}) {
-			foreach my $l (@{$oldlinks{$page}}) {
-				my $link=bestlink($page, $l);
-				if (length $link) {
-					if (! exists $links{$page} || 
-					    ! grep { bestlink($page, $_) eq $link } @{$links{$page}}) {
-						$linkchanged{$link}=1;
-						$linkchangers{lc($page)}=1;
-					}
-				}
-				else {
-					if (! grep { lc $_ eq lc $l } @{$links{$page}}) {
-						$linkchangers{lc($page)}=1
-					}
-				}
-			}
-		}
-	}
-
-	return \%linkchanged, \%linkchangers;
-}
-
 sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
@@ -389,6 +343,7 @@ sub refresh () {
 	my ($files, $exists)=find_src_files();
 
 	my (%rendered, @add, @del, @internal, @internal_change);
+
 	# check for added or removed pages
 	foreach my $file (@$files) {
 		my $page=pagename($file);
@@ -452,10 +407,11 @@ sub refresh () {
 		    $stat[9] > $pagemtime{$page} ||
 	    	    $forcerebuild{$page}) {
 			$pagemtime{$page}=$stat[9];
+
 			if (isinternal($page)) {
-				push @internal_change, $file;
 				# Preprocess internal page in scan-only mode.
 				preprocess($page, $page, readfile($srcfile), 1);
+				push @internal_change, $file;
 			}
 			else {
 				push @needsbuild, $file;
@@ -464,7 +420,19 @@ sub refresh () {
 	}
 	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
 
-	# scan and render files
+	# before scanning, make a note of where pages'
+	# old links pointed
+	my %oldlink_targets;
+	foreach my $file (@needsbuild, @del) {
+		my $page=pagename($file);
+		if (exists $oldlinks{$page}) {
+			foreach my $l (@{$oldlinks{$page}}) {
+				$oldlink_targets{$page}{$l}=bestlink($page, $l);
+			}
+		}
+	}
+
+	# scan and render changed files
 	foreach my $file (@needsbuild) {
 		debug(sprintf(gettext("scanning %s"), $file));
 		scan($file);
@@ -499,99 +467,121 @@ sub refresh () {
 			}
 		}
 	}
-
-	if (%rendered || @del || @internal || @internal_change) {
+	
+	# determine which links, on what pages, have changed
+	my %backlinkchanged;
+	my %linkchangers;
+	foreach my $file (@needsbuild, @del) {
+		my $page=pagename($file);
+		my %link_targets;
+		if (exists $links{$page}) {
+			foreach my $l (@{$links{$page}}) {
+				my $target=bestlink($page, $l);
+				if (! exists $oldlink_targets{$page}{$l} ||
+				    $target ne $oldlink_targets{$page}{$l}) {
+					$backlinkchanged{$l}=1;
+					$linkchangers{lc($page)}=1;
+				}
+				delete $oldlink_targets{$page}{$l};
+			}
+		}
+		if (exists $oldlink_targets{$page} &&
+		    %{$oldlink_targets{$page}}) {
+			foreach my $target (keys %{$oldlink_targets{$page}}) {
+				$backlinkchanged{$target}=1;
+			}
+			$linkchangers{lc($page)}=1;
+		}
+	}
+	%oldlink_targets=();
+		
+	# rebuild dependant pages, recursively
+	my $deps=(@needsbuild || @del || @internal || @internal_change);
+	do {
+		$deps=0;
 		my @changed=(keys %rendered, @del);
-		my ($linkchanged, $linkchangers)=find_changed_links(@changed);
-
-		my $unsettled;
-		do {
-			$unsettled=0;
-			@changed=(keys %rendered, @del);
-			my @exists_changed=(@add, @del);
+		my @exists_changed=(@add, @del);
 	
-			my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
-			my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
+		my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
+		my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
 	 
-			# rebuild dependant pages
-			foreach my $f (@$files) {
-				next if $rendered{$f};
-				my $p=pagename($f);
-				my $reason = undef;
+		foreach my $f (@$files) {
+			next if $rendered{$f};
+			my $p=pagename($f);
+			my $reason = undef;
 	
-				if (exists $depends_simple{$p}) {
-					foreach my $d (keys %{$depends_simple{$p}}) {
-						if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
-						     $lc_changed{$d})
-						    ||
-						    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
-						     $lc_exists_changed{$d})
-					     	    ||
-						    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
-						     $linkchangers->{$d})
-				     		) {
-							$reason = $d;
-							last;
-						}
+			if (exists $depends_simple{$p}) {
+				foreach my $d (keys %{$depends_simple{$p}}) {
+					if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
+					     $lc_changed{$d})
+					    ||
+					    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
+					     $lc_exists_changed{$d})
+				     	    ||
+					    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
+					     $linkchangers{$d})
+			     		) {
+						$reason = $d;
+						last;
 					}
 				}
+			}
 	
-				if (exists $depends{$p} && ! defined $reason) {
-					D: foreach my $d (keys %{$depends{$p}}) {
-						my $sub=pagespec_translate($d);
-						next if $@ || ! defined $sub;
-	
-						# only consider internal files
-						# if the page explicitly depends
-						# on such files
-						my $internal_dep=$d =~ /internal\(/;
-
-						my @candidates;
-						if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
-							@candidates=@exists_changed;
-	 						push @candidates, @internal
-								if $internal_dep;
-						}
-						if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
-							@candidates=@changed;
-							push @candidates, @internal, @internal_change
-								if $internal_dep;
-						}
+			if (exists $depends{$p} && ! defined $reason) {
+				D: foreach my $d (keys %{$depends{$p}}) {
+					my $sub=pagespec_translate($d);
+					next if $@ || ! defined $sub;
+
+					# only consider internal files
+					# if the page explicitly depends
+					# on such files
+					my $internal_dep=$d =~ /internal\(/;
+
+					my @candidates;
+					if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+						@candidates=@exists_changed;
+ 						push @candidates, @internal
+							if $internal_dep;
+					}
+					if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
+						@candidates=@changed;
+						push @candidates, @internal, @internal_change
+							if $internal_dep;
+					}
 
-						foreach my $file (@candidates) {
-							next if $file eq $f;
-							my $page=pagename($file);
-							if ($sub->($page, location => $p)) {
-								if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
-									next unless $linkchangers->{lc($page)};
-								}
-								$reason = $page;
-								last D;
+					foreach my $file (@candidates) {
+						next if $file eq $f;
+						my $page=pagename($file);
+						if ($sub->($page, location => $p)) {
+							if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
+								next unless $linkchangers{lc($page)};
 							}
+							$reason = $page;
+							last D;
 						}
 					}
 				}
-	
-				if (defined $reason) {
-					debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
-					render($f);
-					$rendered{$f}=1;
-					$unsettled=1;
-					last;
-				}
 			}
-		} while $unsettled;
-		
-		# update backlinks at end
-		foreach my $link (keys %{$linkchanged}) {
-		    	my $linkfile=$pagesources{$link};
-			if (defined $linkfile) {
-				next if $rendered{$linkfile};
-				debug(sprintf(gettext("building %s, to update its backlinks"), $linkfile));
-				render($linkfile);
-				$rendered{$linkfile}=1;
+	
+			if (defined $reason) {
+				debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+				render($f);
+				$rendered{$f}=1;
+				$deps=1;
+				last;
 			}
 		}
+	} while $deps;
+
+	# update backlinks
+	foreach my $link (keys %backlinkchanged) {
+		my $linkfile=$pagesources{$link};
+		if (defined $linkfile) {
+			next if $rendered{$linkfile};
+			debug(sprintf(gettext("building %s, to update its backlinks"), $linkfile));
+			render($linkfile);
+			$rendered{$linkfile}=1;
+		}
 	}
 
 	# remove no longer rendered files
-- 
cgit v1.2.3


From 534518792d95fb51f6d49c0c48f3f8b3b7398df3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 22:30:14 -0400
Subject: update

---
 doc/bugs/bestlink_change_update_issue.mdwn | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/doc/bugs/bestlink_change_update_issue.mdwn b/doc/bugs/bestlink_change_update_issue.mdwn
index 211a78332..8a526e821 100644
--- a/doc/bugs/bestlink_change_update_issue.mdwn
+++ b/doc/bugs/bestlink_change_update_issue.mdwn
@@ -3,13 +3,27 @@
   Foo/Baz, and Foo/Bar/Baz gets added, it will update the links in Foo/Bar
   to point to it, but will forget to update the backlinks in Foo/Baz.
 
+  The buggy code is in `refresh()`, when it determines what
+  links, on what pages, have changed. It only looks at
+  changed/added/deleted pages when doing this. But when Foo/Bar/Baz
+  is added, Foo/Bar is not changed -- so the change it its
+  backlinks is not noticed.
+
+  To fix this, it needs to consider, when rebuilding Foo/Bar for the changed
+  links, what oldlinks Foo/Bar had. If one of the oldlinks linked to
+  Foo/Baz, and not links to Foo/Bar/Baz, it could then rebuild Foo/Baz.
+
+  Problem is that in order to do that, it needs to be able to tell that
+  the oldlinks linked to Foo/Baz. Which would mean either calculating
+  all links before the scan phase, or keeping a copy of the backlinks
+  from the last build, and using that. The first option would be a lot
+  of work for this minor issue.. it might be less expensive to just rebuild
+  *all* pages that Foo/Bar links to.
+
+  Keeping a copy of the backlinks has some merit. It could also be
+  incrementally updated.
+
 * And if Foo/Bar/Baz is then removed, Foo/Bar gets a broken link,
   instead of changing back to linking to Foo/Baz.
 
 This old bug still exists as of 031d1bf5046ab77c796477a19967e7c0c512c417.
-and now this same problem also affects link dependencies.
-
-(Some of) The buggy code is in `find_changed_links`
-which doesn't detect that the link has changed in
-this case, because when it looks at where the `%oldlinks` link to,
-it does so after having updated state to add/remove the page.
-- 
cgit v1.2.3


From 9f4c5d2466b71d6a80fc1af3c1d0367aafde3112 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 22:59:33 -0400
Subject: new todo

---
 doc/todo/cache_backlinks.mdwn | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 doc/todo/cache_backlinks.mdwn

diff --git a/doc/todo/cache_backlinks.mdwn b/doc/todo/cache_backlinks.mdwn
new file mode 100644
index 000000000..dc13d464e
--- /dev/null
+++ b/doc/todo/cache_backlinks.mdwn
@@ -0,0 +1,25 @@
+I'm thinking about caching the backlinks between runs. --[[Joey]] 
+
+* It would save some time (spent resolving every single link
+  on every page, every run). The cached backlinks could be
+  updated by only updating backlinks from changed pages.
+  (Saved time is less than 1/10th of a second for docwiki.)
+
+* It may allow attacking [[bugs/bestlink_change_update_issue]],
+  since that seems to need a copy of the old backlinks.
+  Actually, just the next change will probably solve that:
+
+* It should allow removing the `%oldlink_targets`, `%backlinkchanged`,
+  and `%linkchangers` calculation code. Instead, just generate
+  a record of which pages' backlinks have changed when updating
+  the backlinks, and then rebuild those pages.
+
+Proposal:
+
+* Store a page's backlinks in the index, same as everything else.
+
+* Do *something* to generate or store the `%brokenlinks` data.
+  This is currently generated when calculating backlinks, and
+  is only used by the brokenlinks plugin. It's not the right
+  "shape" to be stored in the index, but could be changed around
+  to fit.
-- 
cgit v1.2.3


From 577eed0e7efaf1844d5e3f18a95e699f1bc831c5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 23:54:29 -0400
Subject: split up refresh

I'd rather have the global variables than the 300 line function
---
 IkiWiki/Render.pm | 303 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 157 insertions(+), 146 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fe0b3138a..c07be98f8 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,7 +7,9 @@ use strict;
 use IkiWiki;
 use Encode;
 
-my %backlinks;
+my (%backlinks, %rendered, @new, @del, @internal, @internal_change, @files,
+	%page_exists, %oldlink_targets, @needsbuild, %backlinkchanged,
+	%linkchangers);
 our %brokenlinks;
 my $links_calculated=0;
 
@@ -147,6 +149,8 @@ sub genpage ($$) {
 sub scan ($) {
 	my $file=shift;
 
+	debug(sprintf(gettext("scanning %s"), $file));
+
 	my $type=pagetype($file);
 	if (defined $type) {
 		my $srcfile=srcfile($file);
@@ -202,8 +206,11 @@ sub fast_file_copy (@) {
 	}
 }
 
-sub render ($) {
+sub render ($$) {
 	my $file=shift;
+	return if $rendered{$file};
+	debug(shift);
+	$rendered{$file}=1;
 	
 	my $type=pagetype($file);
 	my $srcfile=srcfile($file);
@@ -273,7 +280,7 @@ sub srcdir_check () {
 }
 
 sub find_src_files () {
-	my (@files, %pages);
+	my @ret;
 	eval q{use File::Find};
 	error($@) if $@;
 	find({
@@ -290,12 +297,12 @@ sub find_src_files () {
 				}
 				else {
 					$f=~s/^\Q$config{srcdir}\E\/?//;
-					push @files, $f;
-					my $pagename = pagename($f);
-					if ($pages{$pagename}) {
-						debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
+					push @ret, $f;
+					my $page = pagename($f);
+					if ($page_exists{$page}) {
+						debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 					}
-					$pages{$pagename}=1;
+					$page_exists{$page}=1;
 				}
 			}
 		},
@@ -321,9 +328,9 @@ sub find_src_files () {
 						if (! -l "$config{srcdir}/$f" && 
 						    ! -e _) {
 						    	my $page=pagename($f);
-							if (! $pages{$page}) {
-								push @files, $f;
-								$pages{$page}=1;
+							if (! $page_exists{$page}) {
+								push @ret, $f;
+								$page_exists{$page}=1;
 							}
 						}
 					}
@@ -331,21 +338,11 @@ sub find_src_files () {
 			},
 		}, $dir);
 	};
-
-	# Returns a list of all source files found, and a hash of 
-	# the corresponding page names.
-	return \@files, \%pages;
+	return \@ret;
 }
 
-sub refresh () {
-	srcdir_check();
-	run_hooks(refresh => sub { shift->() });
-	my ($files, $exists)=find_src_files();
-
-	my (%rendered, @add, @del, @internal, @internal_change);
-
-	# check for added or removed pages
-	foreach my $file (@$files) {
+sub process_new_files () {
+	foreach my $file (@files) {
 		my $page=pagename($file);
 		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
 			# the page has changed its type
@@ -357,7 +354,7 @@ sub refresh () {
 				push @internal, $file;
 			}
 			else {
-				push @add, $file;
+				push @new, $file;
 				if ($config{getctime} && -e "$config{srcdir}/$file") {
 					eval {
 						my $time=rcs_getctime("$config{srcdir}/$file");
@@ -374,8 +371,11 @@ sub refresh () {
 			}
 		}
 	}
+}
+
+sub process_del_files () {
 	foreach my $page (keys %pagemtime) {
-		if (! $exists->{$page}) {
+		if (! $page_exists{$page}) {
 			if (isinternal($page)) {
 				push @internal, $pagesources{$page};
 			}
@@ -397,10 +397,10 @@ sub refresh () {
 			}
 		}
 	}
+}
 
-	# find changed and new files
-	my @needsbuild;
-	foreach my $file (@$files) {
+sub find_needsbuild () {
+	foreach my $file (@files) {
 		my $page=pagename($file);
 		my ($srcfile, @stat)=srcfile_stat($file);
 		if (! exists $pagemtime{$page} ||
@@ -418,11 +418,9 @@ sub refresh () {
 			}
 		}
 	}
-	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
+}
 
-	# before scanning, make a note of where pages'
-	# old links pointed
-	my %oldlink_targets;
+sub calculate_old_links () {
 	foreach my $file (@needsbuild, @del) {
 		my $page=pagename($file);
 		if (exists $oldlinks{$page}) {
@@ -431,46 +429,42 @@ sub refresh () {
 			}
 		}
 	}
+}
 
-	# scan and render changed files
-	foreach my $file (@needsbuild) {
-		debug(sprintf(gettext("scanning %s"), $file));
-		scan($file);
-	}
-	calculate_links();
-	foreach my $file (@needsbuild) {
-		debug(sprintf(gettext("building %s"), $file));
-		render($file);
-		$rendered{$file}=1;
+sub derender_internal ($) {
+	my $file=shift;
+	my $page=pagename($file);
+	delete $depends{$page};
+	delete $depends_simple{$page};
+	foreach my $old (@{$renderedfiles{$page}}) {
+		delete $destsources{$old};
 	}
-	foreach my $file (@internal, @internal_change) {
-		# internal pages are not rendered
-		my $page=pagename($file);
-		delete $depends{$page};
-		delete $depends_simple{$page};
-		foreach my $old (@{$renderedfiles{$page}}) {
-			delete $destsources{$old};
+	$renderedfiles{$page}=[];
+}
+
+sub render_linkers () {
+	foreach my $f (@new, @del) {
+		my $p=pagename($f);
+		foreach my $page (keys %{$backlinks{$p}}) {
+			my $file=$pagesources{$page};
+			render($file, sprintf(gettext("building %s, which links to %s"), $file, $p));
 		}
-		$renderedfiles{$page}=[];
 	}
-	
-	# rebuild pages that link to added or removed pages
-	if (@add || @del) {
-		foreach my $f (@add, @del) {
-			my $p=pagename($f);
-			foreach my $page (keys %{$backlinks{$p}}) {
-				my $file=$pagesources{$page};
-				next if $rendered{$file};
-		   		debug(sprintf(gettext("building %s, which links to %s"), $file, $p));
-				render($file);
-				$rendered{$file}=1;
+}
+
+sub remove_unrendered () {
+	foreach my $src (keys %rendered) {
+		my $page=pagename($src);
+		foreach my $file (@{$oldrenderedfiles{$page}}) {
+			if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
+				debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page));
+				prune($config{destdir}."/".$file);
 			}
 		}
 	}
-	
-	# determine which links, on what pages, have changed
-	my %backlinkchanged;
-	my %linkchangers;
+}
+
+sub calculate_changed_links () {
 	foreach my $file (@needsbuild, @del) {
 		my $page=pagename($file);
 		my %link_targets;
@@ -493,107 +487,124 @@ sub refresh () {
 			$linkchangers{lc($page)}=1;
 		}
 	}
-	%oldlink_targets=();
-		
-	# rebuild dependant pages, recursively
-	my $deps=(@needsbuild || @del || @internal || @internal_change);
-	do {
-		$deps=0;
-		my @changed=(keys %rendered, @del);
-		my @exists_changed=(@add, @del);
+}
+
+sub render_dependent () {
+	my @changed=(keys %rendered, @del);
+	my @exists_changed=(@new, @del);
 	
-		my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
-		my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
+	my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
+	my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
 	 
-		foreach my $f (@$files) {
-			next if $rendered{$f};
-			my $p=pagename($f);
-			my $reason = undef;
+	foreach my $f (@files) {
+		next if $rendered{$f};
+		my $p=pagename($f);
+		my $reason = undef;
 	
-			if (exists $depends_simple{$p}) {
-				foreach my $d (keys %{$depends_simple{$p}}) {
-					if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
-					     $lc_changed{$d})
-					    ||
-					    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
-					     $lc_exists_changed{$d})
-				     	    ||
-					    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
-					     $linkchangers{$d})
-			     		) {
-						$reason = $d;
-						last;
-					}
+		if (exists $depends_simple{$p}) {
+			foreach my $d (keys %{$depends_simple{$p}}) {
+				if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
+				     $lc_changed{$d})
+				    ||
+				    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
+				     $lc_exists_changed{$d})
+			     	    ||
+				    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
+				     $linkchangers{$d})
+		     		) {
+					$reason = $d;
+					last;
 				}
 			}
+		}
 	
-			if (exists $depends{$p} && ! defined $reason) {
-				D: foreach my $d (keys %{$depends{$p}}) {
-					my $sub=pagespec_translate($d);
-					next if $@ || ! defined $sub;
-
-					# only consider internal files
-					# if the page explicitly depends
-					# on such files
-					my $internal_dep=$d =~ /internal\(/;
-
-					my @candidates;
-					if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
-						@candidates=@exists_changed;
- 						push @candidates, @internal
-							if $internal_dep;
-					}
-					if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
-						@candidates=@changed;
-						push @candidates, @internal, @internal_change
-							if $internal_dep;
-					}
+		if (exists $depends{$p} && ! defined $reason) {
+			D: foreach my $d (keys %{$depends{$p}}) {
+				my $sub=pagespec_translate($d);
+				next if $@ || ! defined $sub;
+
+				# only consider internal files
+				# if the page explicitly depends
+				# on such files
+				my $internal_dep=$d =~ /internal\(/;
+
+				my @candidates;
+				if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+					@candidates=@exists_changed;
+ 					push @candidates, @internal
+						if $internal_dep;
+				}
+				if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
+					@candidates=@changed;
+					push @candidates, @internal, @internal_change
+						if $internal_dep;
+				}
 
-					foreach my $file (@candidates) {
-						next if $file eq $f;
-						my $page=pagename($file);
-						if ($sub->($page, location => $p)) {
-							if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
-								next unless $linkchangers{lc($page)};
-							}
-							$reason = $page;
-							last D;
+				foreach my $file (@candidates) {
+					next if $file eq $f;
+					my $page=pagename($file);
+					if ($sub->($page, location => $p)) {
+						if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
+							next unless $linkchangers{lc($page)};
 						}
+						$reason = $page;
+						last D;
 					}
 				}
 			}
+		}
 	
-			if (defined $reason) {
-				debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
-				render($f);
-				$rendered{$f}=1;
-				$deps=1;
-				last;
-			}
+		if (defined $reason) {
+			render($f, sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+			return 1;
 		}
-	} while $deps;
+	}
 
-	# update backlinks
+	return 0;
+}
+
+sub render_backlinks () {
 	foreach my $link (keys %backlinkchanged) {
 		my $linkfile=$pagesources{$link};
 		if (defined $linkfile) {
-			next if $rendered{$linkfile};
-			debug(sprintf(gettext("building %s, to update its backlinks"), $linkfile));
-			render($linkfile);
-			$rendered{$linkfile}=1;
+			render($linkfile, sprintf(gettext("building %s, to update its backlinks"), $linkfile));
 		}
 	}
+}
 
-	# remove no longer rendered files
-	foreach my $src (keys %rendered) {
-		my $page=pagename($src);
-		foreach my $file (@{$oldrenderedfiles{$page}}) {
-			if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
-				debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page));
-				prune($config{destdir}."/".$file);
-			}
-		}
+sub refresh () {
+	srcdir_check();
+	run_hooks(refresh => sub { shift->() });
+	@files=@{find_src_files()};
+	process_new_files();
+	process_del_files();
+	find_needsbuild();
+	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
+	calculate_old_links();
+
+	foreach my $file (@needsbuild) {
+		scan($file);
+	}
+
+	calculate_links();
+
+	foreach my $file (@needsbuild) {
+		render($file, sprintf(gettext("building %s"), $file));
+	}
+
+	foreach my $file (@internal, @internal_change) {
+		derender_internal($file);
 	}
+	
+	calculate_changed_links();
+	render_linkers();
+	
+	if (@needsbuild || @del || @internal || @internal_change) {
+		1 while render_dependent();
+	}
+
+	render_backlinks();
+	remove_unrendered();
 
 	if (@del) {
 		run_hooks(delete => sub { shift->(@del) });
-- 
cgit v1.2.3


From 96b1f9519270db39d4056878907dec2d6976fce4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 00:06:37 -0400
Subject: refresh refactor 2

killed one global
---
 IkiWiki/Render.pm | 86 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c07be98f8..5336d4f54 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -8,7 +8,7 @@ use IkiWiki;
 use Encode;
 
 my (%backlinks, %rendered, @new, @del, @internal, @internal_change, @files,
-	%page_exists, %oldlink_targets, @needsbuild, %backlinkchanged,
+	%page_exists, %oldlink_targets, %backlinkchanged,
 	%linkchangers);
 our %brokenlinks;
 my $links_calculated=0;
@@ -400,6 +400,7 @@ sub process_del_files () {
 }
 
 sub find_needsbuild () {
+	my @needsbuild;
 	foreach my $file (@files) {
 		my $page=pagename($file);
 		my ($srcfile, @stat)=srcfile_stat($file);
@@ -418,15 +419,15 @@ sub find_needsbuild () {
 			}
 		}
 	}
+	return @needsbuild;
 }
 
-sub calculate_old_links () {
-	foreach my $file (@needsbuild, @del) {
-		my $page=pagename($file);
-		if (exists $oldlinks{$page}) {
-			foreach my $l (@{$oldlinks{$page}}) {
-				$oldlink_targets{$page}{$l}=bestlink($page, $l);
-			}
+sub calculate_old_links ($) {
+	my $file=shift;
+	my $page=pagename($file);
+	if (exists $oldlinks{$page}) {
+		foreach my $l (@{$oldlinks{$page}}) {
+			$oldlink_targets{$page}{$l}=bestlink($page, $l);
 		}
 	}
 }
@@ -442,13 +443,12 @@ sub derender_internal ($) {
 	$renderedfiles{$page}=[];
 }
 
-sub render_linkers () {
-	foreach my $f (@new, @del) {
-		my $p=pagename($f);
-		foreach my $page (keys %{$backlinks{$p}}) {
-			my $file=$pagesources{$page};
-			render($file, sprintf(gettext("building %s, which links to %s"), $file, $p));
-		}
+sub render_linkers ($) {
+	my $f=shift;
+	my $p=pagename($f);
+	foreach my $page (keys %{$backlinks{$p}}) {
+		my $file=$pagesources{$page};
+		render($file, sprintf(gettext("building %s, which links to %s"), $file, $p));
 	}
 }
 
@@ -464,28 +464,26 @@ sub remove_unrendered () {
 	}
 }
 
-sub calculate_changed_links () {
-	foreach my $file (@needsbuild, @del) {
-		my $page=pagename($file);
-		my %link_targets;
-		if (exists $links{$page}) {
-			foreach my $l (@{$links{$page}}) {
-				my $target=bestlink($page, $l);
-				if (! exists $oldlink_targets{$page}{$l} ||
-				    $target ne $oldlink_targets{$page}{$l}) {
-					$backlinkchanged{$l}=1;
-					$linkchangers{lc($page)}=1;
-				}
-				delete $oldlink_targets{$page}{$l};
+sub calculate_changed_links ($) {
+	my $file=shift;
+	my $page=pagename($file);
+	if (exists $links{$page}) {
+		foreach my $l (@{$links{$page}}) {
+			my $target=bestlink($page, $l);
+			if (! exists $oldlink_targets{$page}{$l} ||
+			    $target ne $oldlink_targets{$page}{$l}) {
+				$backlinkchanged{$l}=1;
+				$linkchangers{lc($page)}=1;
 			}
+			delete $oldlink_targets{$page}{$l};
 		}
-		if (exists $oldlink_targets{$page} &&
-		    %{$oldlink_targets{$page}}) {
-			foreach my $target (keys %{$oldlink_targets{$page}}) {
-				$backlinkchanged{$target}=1;
-			}
-			$linkchangers{lc($page)}=1;
+	}
+	if (exists $oldlink_targets{$page} &&
+	    %{$oldlink_targets{$page}}) {
+		foreach my $target (keys %{$oldlink_targets{$page}}) {
+			$backlinkchanged{$target}=1;
 		}
+		$linkchangers{lc($page)}=1;
 	}
 }
 
@@ -578,9 +576,13 @@ sub refresh () {
 	@files=@{find_src_files()};
 	process_new_files();
 	process_del_files();
-	find_needsbuild();
+
+	my @needsbuild=find_needsbuild();
 	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
-	calculate_old_links();
+
+	foreach my $file (@needsbuild, @del) {
+		calculate_old_links($file);
+	}
 
 	foreach my $file (@needsbuild) {
 		scan($file);
@@ -591,13 +593,17 @@ sub refresh () {
 	foreach my $file (@needsbuild) {
 		render($file, sprintf(gettext("building %s"), $file));
 	}
-
 	foreach my $file (@internal, @internal_change) {
 		derender_internal($file);
 	}
-	
-	calculate_changed_links();
-	render_linkers();
+
+	foreach my $file (@needsbuild, @del) {
+		calculate_changed_links($file);
+	}
+
+	foreach my $file (@new, @del) {
+		render_linkers($file);
+	}
 	
 	if (@needsbuild || @del || @internal || @internal_change) {
 		1 while render_dependent();
-- 
cgit v1.2.3


From 2a0e6b782c90e92ee038c8db69032cab3f5431f2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 02:00:34 -0400
Subject: refactor 3

Only left one new global
---
 IkiWiki/Render.pm | 185 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 106 insertions(+), 79 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5336d4f54..7f311ddf9 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,9 +7,7 @@ use strict;
 use IkiWiki;
 use Encode;
 
-my (%backlinks, %rendered, @new, @del, @internal, @internal_change, @files,
-	%page_exists, %oldlink_targets, %backlinkchanged,
-	%linkchangers);
+my (%backlinks, %rendered);
 our %brokenlinks;
 my $links_calculated=0;
 
@@ -280,7 +278,8 @@ sub srcdir_check () {
 }
 
 sub find_src_files () {
-	my @ret;
+	my @files;
+	my %pages;
 	eval q{use File::Find};
 	error($@) if $@;
 	find({
@@ -297,12 +296,12 @@ sub find_src_files () {
 				}
 				else {
 					$f=~s/^\Q$config{srcdir}\E\/?//;
-					push @ret, $f;
+					push @files, $f;
 					my $page = pagename($f);
-					if ($page_exists{$page}) {
+					if ($pages{$page}) {
 						debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 					}
-					$page_exists{$page}=1;
+					$pages{$page}=1;
 				}
 			}
 		},
@@ -328,9 +327,9 @@ sub find_src_files () {
 						if (! -l "$config{srcdir}/$f" && 
 						    ! -e _) {
 						    	my $page=pagename($f);
-							if (! $page_exists{$page}) {
-								push @ret, $f;
-								$page_exists{$page}=1;
+							if (! $pages{$page}) {
+								push @files, $f;
+								$pages{$page}=1;
 							}
 						}
 					}
@@ -338,11 +337,15 @@ sub find_src_files () {
 			},
 		}, $dir);
 	};
-	return \@ret;
+	return \@files, \%pages;
 }
 
-sub process_new_files () {
-	foreach my $file (@files) {
+sub find_new_files ($) {
+	my $files=shift;
+	my @new;
+	my @internal_new;
+
+	foreach my $file (@$files) {
 		my $page=pagename($file);
 		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
 			# the page has changed its type
@@ -351,7 +354,7 @@ sub process_new_files () {
 		$pagesources{$page}=$file;
 		if (! $pagemtime{$page}) {
 			if (isinternal($page)) {
-				push @internal, $file;
+				push @internal_new, $file;
 			}
 			else {
 				push @new, $file;
@@ -371,13 +374,19 @@ sub process_new_files () {
 			}
 		}
 	}
+
+	return \@new, \@internal_new;
 }
 
-sub process_del_files () {
+sub find_del_files ($) {
+	my $pages=shift;
+	my @del;
+	my @internal_del;
+
 	foreach my $page (keys %pagemtime) {
-		if (! $page_exists{$page}) {
+		if (! $pages->{$page}) {
 			if (isinternal($page)) {
-				push @internal, $pagesources{$page};
+				push @internal_del, $pagesources{$page};
 			}
 			else {
 				debug(sprintf(gettext("removing old page %s"), $page));
@@ -397,11 +406,15 @@ sub process_del_files () {
 			}
 		}
 	}
+
+	return \@del, \@internal_del;
 }
 
-sub find_needsbuild () {
-	my @needsbuild;
-	foreach my $file (@files) {
+sub find_changed ($) {
+	my $files=shift;
+	my @changed;
+	my @internal_changed;
+	foreach my $file (@$files) {
 		my $page=pagename($file);
 		my ($srcfile, @stat)=srcfile_stat($file);
 		if (! exists $pagemtime{$page} ||
@@ -412,24 +425,28 @@ sub find_needsbuild () {
 			if (isinternal($page)) {
 				# Preprocess internal page in scan-only mode.
 				preprocess($page, $page, readfile($srcfile), 1);
-				push @internal_change, $file;
+				push @internal_changed, $file;
 			}
 			else {
-				push @needsbuild, $file;
+				push @changed, $file;
 			}
 		}
 	}
-	return @needsbuild;
+	return \@changed, \@internal_changed;
 }
 
-sub calculate_old_links ($) {
-	my $file=shift;
-	my $page=pagename($file);
-	if (exists $oldlinks{$page}) {
-		foreach my $l (@{$oldlinks{$page}}) {
-			$oldlink_targets{$page}{$l}=bestlink($page, $l);
+sub calculate_old_links ($$) {
+	my ($changed, $del)=@_;
+	my %oldlink_targets;
+	foreach my $file (@$changed, @$del) {
+		my $page=pagename($file);
+		if (exists $oldlinks{$page}) {
+			foreach my $l (@{$oldlinks{$page}}) {
+				$oldlink_targets{$page}{$l}=bestlink($page, $l);
+			}
 		}
 	}
+	return \%oldlink_targets;
 }
 
 sub derender_internal ($) {
@@ -464,37 +481,48 @@ sub remove_unrendered () {
 	}
 }
 
-sub calculate_changed_links ($) {
-	my $file=shift;
-	my $page=pagename($file);
-	if (exists $links{$page}) {
-		foreach my $l (@{$links{$page}}) {
-			my $target=bestlink($page, $l);
-			if (! exists $oldlink_targets{$page}{$l} ||
-			    $target ne $oldlink_targets{$page}{$l}) {
-				$backlinkchanged{$l}=1;
-				$linkchangers{lc($page)}=1;
+sub calculate_changed_links ($$$) {
+	my ($changed, $del, $oldlink_targets)=@_;
+
+	my (%backlinkchanged, %linkchangers);
+
+	foreach my $file (@$changed, @$del) {
+		my $page=pagename($file);
+
+		if (exists $links{$page}) {
+			foreach my $l (@{$links{$page}}) {
+				my $target=bestlink($page, $l);
+				if (! exists $oldlink_targets->{$page}{$l} ||
+				    $target ne $oldlink_targets->{$page}{$l}) {
+					$backlinkchanged{$l}=1;
+					$linkchangers{lc($page)}=1;
+				}
+				delete $oldlink_targets->{$page}{$l};
 			}
-			delete $oldlink_targets{$page}{$l};
 		}
-	}
-	if (exists $oldlink_targets{$page} &&
-	    %{$oldlink_targets{$page}}) {
-		foreach my $target (keys %{$oldlink_targets{$page}}) {
-			$backlinkchanged{$target}=1;
+		if (exists $oldlink_targets->{$page} &&
+		    %{$oldlink_targets->{$page}}) {
+			foreach my $target (keys %{$oldlink_targets->{$page}}) {
+				$backlinkchanged{$target}=1;
+			}
+			$linkchangers{lc($page)}=1;
 		}
-		$linkchangers{lc($page)}=1;
 	}
+
+	return \%backlinkchanged, \%linkchangers;
 }
 
-sub render_dependent () {
-	my @changed=(keys %rendered, @del);
-	my @exists_changed=(@new, @del);
+sub render_dependent ($$$$$$$) {
+	my ($files, $new, $internal_new, $del, $internal_del,
+		$internal_changed, $linkchangers)=@_;
+
+	my @changed=(keys %rendered, @$del);
+	my @exists_changed=(@$new, @$del);
 	
 	my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
 	my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
 	 
-	foreach my $f (@files) {
+	foreach my $f (@$files) {
 		next if $rendered{$f};
 		my $p=pagename($f);
 		my $reason = undef;
@@ -508,7 +536,7 @@ sub render_dependent () {
 				     $lc_exists_changed{$d})
 			     	    ||
 				    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
-				     $linkchangers{$d})
+				     $linkchangers->{$d})
 		     		) {
 					$reason = $d;
 					last;
@@ -529,12 +557,12 @@ sub render_dependent () {
 				my @candidates;
 				if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
 					@candidates=@exists_changed;
- 					push @candidates, @internal
+ 					push @candidates, @$internal_new, @$internal_del
 						if $internal_dep;
 				}
 				if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
 					@candidates=@changed;
-					push @candidates, @internal, @internal_change
+					push @candidates, @$internal_new, @$internal_del, @$internal_changed
 						if $internal_dep;
 				}
 
@@ -543,7 +571,7 @@ sub render_dependent () {
 					my $page=pagename($file);
 					if ($sub->($page, location => $p)) {
 						if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
-							next unless $linkchangers{lc($page)};
+							next unless $linkchangers->{lc($page)};
 						}
 						$reason = $page;
 						last D;
@@ -561,8 +589,9 @@ sub render_dependent () {
 	return 0;
 }
 
-sub render_backlinks () {
-	foreach my $link (keys %backlinkchanged) {
+sub render_backlinks ($) {
+	my $backlinkchanged=shift;
+	foreach my $link (keys %$backlinkchanged) {
 		my $linkfile=$pagesources{$link};
 		if (defined $linkfile) {
 			render($linkfile, sprintf(gettext("building %s, to update its backlinks"), $linkfile));
@@ -573,47 +602,45 @@ sub render_backlinks () {
 sub refresh () {
 	srcdir_check();
 	run_hooks(refresh => sub { shift->() });
-	@files=@{find_src_files()};
-	process_new_files();
-	process_del_files();
-
-	my @needsbuild=find_needsbuild();
-	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
-
-	foreach my $file (@needsbuild, @del) {
-		calculate_old_links($file);
-	}
-
-	foreach my $file (@needsbuild) {
+	my ($files, $pages)=find_src_files();
+	my ($new, $internal_new)=find_new_files($files);
+	my ($del, $internal_del)=find_del_files($pages);
+	my ($changed, $internal_changed)=find_changed($files);
+	run_hooks(needsbuild => sub { shift->($changed) });
+	my $oldlink_targets=calculate_old_links($changed, $del);
+
+	foreach my $file (@$changed) {
 		scan($file);
 	}
 
 	calculate_links();
 
-	foreach my $file (@needsbuild) {
+	foreach my $file (@$changed) {
 		render($file, sprintf(gettext("building %s"), $file));
 	}
-	foreach my $file (@internal, @internal_change) {
+	foreach my $file (@$internal_new, @$internal_del, @$internal_changed) {
 		derender_internal($file);
 	}
 
-	foreach my $file (@needsbuild, @del) {
-		calculate_changed_links($file);
-	}
+	my ($backlinkchanged, $linkchangers)=calculate_changed_links($changed,
+		$del, $oldlink_targets);
 
-	foreach my $file (@new, @del) {
+	foreach my $file (@$new, @$del) {
 		render_linkers($file);
 	}
 	
-	if (@needsbuild || @del || @internal || @internal_change) {
-		1 while render_dependent();
+	if (@$changed || @$internal_changed ||
+	    @$del || @$internal_del || @$internal_new) {
+		1 while render_dependent($files, $new, $internal_new,
+			$del, $internal_del, $internal_changed,
+			$linkchangers);
 	}
 
-	render_backlinks();
+	render_backlinks($backlinkchanged);
 	remove_unrendered();
 
-	if (@del) {
-		run_hooks(delete => sub { shift->(@del) });
+	if (@$del) {
+		run_hooks(delete => sub { shift->(@$del) });
 	}
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });
-- 
cgit v1.2.3


From 2494a23fdd911eb7e85f2ea66607b4e08d87e927 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 04:45:57 -0400
Subject: fix handling of links+content dependency

Such a dependency is unlikely, but can happen.
---
 IkiWiki/Render.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7f311ddf9..e86314107 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -570,7 +570,8 @@ sub render_dependent ($$$$$$$) {
 					next if $file eq $f;
 					my $page=pagename($file);
 					if ($sub->($page, location => $p)) {
-						if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
+						if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
+						    ! $depends{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
 							next unless $linkchangers->{lc($page)};
 						}
 						$reason = $page;
-- 
cgit v1.2.3


From af85f62d6fd7c3b437fa527bff3392616d3513dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 17:47:10 -0400
Subject: linkmap: Use a combination of presence and link dependencies.

This makes the map be regenerated much less frequently, so larger maps are
more practical to use now.
---
 IkiWiki/Plugin/linkmap.pm          | 6 +++---
 debian/changelog                   | 3 +++
 doc/ikiwiki/directive/linkmap.mdwn | 4 +---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index d0671ae0e..d7ba68da9 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -28,9 +28,9 @@ sub preprocess (@) {
 
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a page is added, removed, or
-	# its links change, so register a dependency.
-	add_depends($params{page}, $params{pages});
+	# Needs to update whenever a relevant page is added, or removed, or
+	# its links change.
+	add_depends($params{page}, $params{pages}, presence => 1, links => 1);
 	
 	# Can't just return the linkmap here, since the htmlscrubber
 	# scrubs out all <object> tags (with good reason!)
diff --git a/debian/changelog b/debian/changelog
index 89d377769..a006d3177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
     This makes them more efficient. It also fixes a longstanding bug,
     where if only a small set of pages were considered by orphans/pagestats,
     changes to links on other pages failed to cause an update.
+  * linkmap: Use a combination of presence and link dependencies.
+    This makes the map be regenerated much less frequently, so larger
+    maps are more practical to use now.
   * Transitive dependencies are now correctly supported.
   * Rebuild wikis on upgrade to this version to get improved dependency
     info.
diff --git a/doc/ikiwiki/directive/linkmap.mdwn b/doc/ikiwiki/directive/linkmap.mdwn
index db79a1491..38cf0fd11 100644
--- a/doc/ikiwiki/directive/linkmap.mdwn
+++ b/doc/ikiwiki/directive/linkmap.mdwn
@@ -9,9 +9,7 @@ Only links between mapped pages will be shown; links pointing to or from
 unmapped pages will be omitted. If the pages to include are not specified,
 the links between all pages (and other files) in the wiki are mapped. For
 best results, only a small set of pages should be mapped, since otherwise
-the map can become very large, unwieldy, and complicated. Also, the map is
-rebuilt whenever one of the mapped pages is changed, which can make the
-wiki a bit slow.
+the map can become very large, unwieldy, and complicated.
 
 Here are descriptions of all the supported parameters to the `linkmap`
 directive:
-- 
cgit v1.2.3


From ba1dfb4ec665f95b4f4217360e08109bcbf7f41b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 18:09:46 -0400
Subject: fix support of a single dependency that combines links and exists
 types

This is very common, and the code has to test each type differently, since
the list of candidates to test, as well as the test, will vary per type.
Much happier with this code now.
---
 IkiWiki/Render.pm | 65 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 25 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e86314107..8f9cbf673 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -545,38 +545,53 @@ sub render_dependent ($$$$$$$) {
 		}
 	
 		if (exists $depends{$p} && ! defined $reason) {
-			D: foreach my $d (keys %{$depends{$p}}) {
-				my $sub=pagespec_translate($d);
+			foreach my $dep (keys %{$depends{$p}}) {
+				my $sub=pagespec_translate($dep);
 				next if $@ || ! defined $sub;
 
 				# only consider internal files
 				# if the page explicitly depends
 				# on such files
-				my $internal_dep=$d =~ /internal\(/;
-
-				my @candidates;
-				if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
-					@candidates=@exists_changed;
- 					push @candidates, @$internal_new, @$internal_del
-						if $internal_dep;
-				}
-				if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
-					@candidates=@changed;
-					push @candidates, @$internal_new, @$internal_del, @$internal_changed
-						if $internal_dep;
-				}
-
-				foreach my $file (@candidates) {
-					next if $file eq $f;
-					my $page=pagename($file);
-					if ($sub->($page, location => $p)) {
-						if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
-						    ! $depends{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
-							next unless $linkchangers->{lc($page)};
+				my $internal_dep=$dep =~ /internal\(/;
+
+				my $in=sub {
+					my $list=shift;
+					my $type=shift;
+					foreach my $file ($list) {
+						next if $file eq $f;
+						my $page=pagename($file);
+						if ($sub->($page, location => $p)) {
+							if ($type == $IkiWiki::DEPEND_LINKS) {
+								next unless $linkchangers->{lc($page)};
+							}
+							return $page;
 						}
-						$reason = $page;
-						last D;
 					}
+					return undef;
+				};
+
+				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_CONTENT) {
+					last if $reason =
+						$in->(\@changed, $IkiWiki::DEPEND_CONTENT);
+					last if $internal_dep && ($reason =
+						$in->($internal_new, $IkiWiki::DEPEND_CONTENT) ||
+						$in->($internal_del, $IkiWiki::DEPEND_CONTENT) ||
+						$in->($internal_changed, $IkiWiki::DEPEND_CONTENT));
+				}
+				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_PRESENCE) {
+					last if $reason = 
+						$in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
+					last if $internal_dep && ($reason =
+						$in->($internal_new, $IkiWiki::DEPEND_PRESENCE) ||
+						$in->($internal_del, $IkiWiki::DEPEND_PRESENCE));
+				}
+				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_LINKS) {
+					last if $reason =
+						$in->(\@changed, $IkiWiki::DEPEND_LINKS);
+					last if $internal_dep && ($reason =
+						$in->($internal_new, $IkiWiki::DEPEND_LINKS) ||
+						$in->($internal_del, $IkiWiki::DEPEND_LINKS) ||
+						$in->($internal_changed, $IkiWiki::DEPEND_LINKS));
 				}
 			}
 		}
-- 
cgit v1.2.3


From 348a6aaee3c13e0afababc4b9bb41743d7227f12 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 18:20:11 -0400
Subject: pagespec for links dependencies

---
 doc/todo/dependency_types.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index f46a6a7c6..19294bba0 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -166,9 +166,10 @@ Link dependencies:
 * So, brokenlinks can fire whenever any links in any of the
   pages it's tracking change, or when pages are added or
   removed.
-
-TODO: How to determine if a pagespec is valid to be used with a links
-dependency? Use the same simple pagespecs that are valid for presence
-dependencies? Seems ok.
+* To determine if a pagespec is valid to be used with a links dependency,
+  use the same set that are valid for presence dependencies. But also
+  allow `backlinks()` to be used in it, since that matches pages
+  that the page links to, which is just what link dependencies are
+  triggered on.
 
 [[done]]
-- 
cgit v1.2.3


From 15fd89d64deaeeee921a02b240d5036bbd896f89 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 18:41:09 -0400
Subject: presence dependencies not needed

Using just a link dependency is sufficient, since
---
 IkiWiki/Plugin/linkmap.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index d7ba68da9..b8b4cf40d 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -28,9 +28,8 @@ sub preprocess (@) {
 
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a relevant page is added, or removed, or
-	# its links change.
-	add_depends($params{page}, $params{pages}, presence => 1, links => 1);
+	# Needs to update whenever a relevant page's links change.
+	add_depends($params{page}, $params{pages}, links => 1);
 	
 	# Can't just return the linkmap here, since the htmlscrubber
 	# scrubs out all <object> tags (with good reason!)
-- 
cgit v1.2.3


From 62cc2afcaa7d09f73cb00a7efb15502406743178 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 18:44:34 -0400
Subject: update to test backlinks() pagespecs

---
 t/add_depends.t | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 t/add_depends.t

diff --git a/t/add_depends.t b/t/add_depends.t
old mode 100644
new mode 100755
index 935a57944..68429b24a
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 50;
+use Test::More tests => 85;
 
 BEGIN { use_ok("IkiWiki"); }
 %config=IkiWiki::defaultconfig();
@@ -42,19 +42,6 @@ ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_LINKS);
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_PRESENCE);
 ok(! ($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_CONTENT));
 
-# adding a pagespec that requires page metadata should cause a fallback to
-# a content dependency
-foreach my $spec ("* and ! link(bar)", "* or link(bar)", "unknownspec()",
-	"title(hi)",
-	"* or backlink(yo)", # this one could actually be acceptably be
-	                     # detected to not need a content dep .. in
-			     # theory!
-	) {
-	ok(add_depends("foo3", $spec, presence => 1));
-	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-}
-
 # adding dep types to existing dependencies should merge the flags
 ok(add_depends("foo2", "baz"));
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_LINKS);
@@ -66,3 +53,35 @@ ok(! ($IkiWiki::depends_simple{foo2}{"bar"} & $IkiWiki::DEPEND_CONTENT));
 ok(add_depends("foo", "bar", links => 1)); # had only content before
 ok($IkiWiki::depends{foo}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS));
 ok(! ($IkiWiki::depends{foo}{"*"} & $IkiWiki::DEPEND_PRESENCE));
+
+# adding a pagespec that requires page metadata should cause a fallback to
+# a content dependency
+foreach my $spec ("* and ! link(bar)", "* or link(bar)", "unknownspec()",
+	"title(hi)",
+	"* or unknown(yo)", # this one could actually be acceptably be
+	                    # detected to not need a content dep .. in
+			    # theory!
+	) {
+	ok(add_depends("foo3", $spec, presence => 1));
+	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_CONTENT);
+	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+	ok(add_depends("foo4", $spec, links => 1));
+	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_CONTENT);
+	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+}
+
+# a pagespec with backlinks() in it is acceptable for a links dependency,
+# but not a presence dependency
+foreach my $spec ("index or (backlink(index) and !*.png)", "backlink(foo)") {
+	ok(add_depends("foo5", $spec, presence => 1));
+	ok($IkiWiki::depends{foo5}{$spec} & $IkiWiki::DEPEND_CONTENT);
+	ok(! ($IkiWiki::depends{foo5}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+	ok(add_depends("foo6", $spec, links => 1));
+	ok($IkiWiki::depends{foo6}{$spec} & $IkiWiki::DEPEND_LINKS);
+	ok(! ($IkiWiki::depends{foo6}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
+	# combining both ends up with a content+links dependency
+	ok(add_depends("foo7", $spec, presence => 1, links => 1));
+	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_LINKS);
+	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE));
+}
-- 
cgit v1.2.3


From 03ae087b437ce7a91253fe256facf59b971ae3fc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 18:44:59 -0400
Subject: support backlink() in pagespecs for links dependencies

---
 IkiWiki.pm | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b895e12fc..78592e6ad 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1776,21 +1776,42 @@ sub add_depends ($$;@) {
 	my $simple=$pagespec =~ /$config{wiki_file_regexp}/ &&
 		$pagespec !~ /[\s*?()!]/;
 
-	my $deptype=$DEPEND_CONTENT;
+	my $deptype=0;
 	if (@_) {
 		my %params=@_;
 		
-		# Is the pagespec limited to terms that will continue
-		# to match pages as long as those pages exist?
-		my $limited=1;
-		while ($limited && $pagespec=~m/(\w+)\([^\)]*\)/g) {
-			$limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
+		if ($params{presence}) {
+ 			# Is the pagespec limited to terms that will continue
+			# to match pages as long as those pages exist?
+			my $presence_limited=1;
+			while ($presence_limited && $pagespec=~m/(\w+)\([^\)]*\)/g) {
+				$presence_limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
+			}
+			if ($presence_limited) {
+				$deptype=$deptype | $DEPEND_PRESENCE;
+			}
+			else {
+				$deptype=$deptype | $DEPEND_CONTENT;
+			}
 		}
-
-		$deptype=$deptype & ~$DEPEND_CONTENT | $DEPEND_PRESENCE
-			if $params{presence} && $limited;
-		$deptype=$deptype & ~$DEPEND_CONTENT | $DEPEND_LINKS
-			if $params{links} && $limited;
+		if ($params{links}) {
+ 			# Is the pagespec limited to terms that will continue
+			# to match pages as long as those pages exist and
+			# link to the same places?
+			my $links_limited=1;
+			while ($links_limited && $pagespec=~m/(\w+)\([^\)]*\)/g) {
+				$links_limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after|backlink)$/;
+			}
+			if ($links_limited) {
+				$deptype=$deptype | $DEPEND_LINKS;
+			}
+			else {
+				$deptype=$deptype | $DEPEND_CONTENT;
+			}
+		}
+	}
+	else {
+		$deptype=$DEPEND_CONTENT;
 	}
 
 	if ($simple) {
-- 
cgit v1.2.3


From ee56af29e189a7ca0f2a814a76d9086b6f41af9a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 18:45:22 -0400
Subject: typo

---
 IkiWiki/Render.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8f9cbf673..e28381c33 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -557,7 +557,7 @@ sub render_dependent ($$$$$$$) {
 				my $in=sub {
 					my $list=shift;
 					my $type=shift;
-					foreach my $file ($list) {
+					foreach my $file (@$list) {
 						next if $file eq $f;
 						my $page=pagename($file);
 						if ($sub->($page, location => $p)) {
-- 
cgit v1.2.3


From e45e23a7f1018e1639b1ce1fdec1b2319050641d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 19:03:23 -0400
Subject: oops!!

---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 78592e6ad..7348ea2f7 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1536,7 +1536,7 @@ sub loadindex () {
 				};
 			}
 			elsif (exists $d->{depends_simple}) {
-				$depends{$page}=$d->{depends_simple};
+				$depends_simple{$page}=$d->{depends_simple};
 			}
 			if (exists $d->{dependslist}) {
 				# old format
-- 
cgit v1.2.3


From 7a8b492bcce45123cef45ebe6f97cd70b38b9db7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 19:07:52 -0400
Subject: add_depends should default to content dependencies if unknown type
 specified

---
 IkiWiki.pm      | 4 +---
 t/add_depends.t | 7 ++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7348ea2f7..7b1d24c6a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1810,9 +1810,7 @@ sub add_depends ($$;@) {
 			}
 		}
 	}
-	else {
-		$deptype=$DEPEND_CONTENT;
-	}
+	$deptype=$DEPEND_CONTENT unless $deptype;
 
 	if ($simple) {
 		$depends_simple{$page}{lc $pagespec} |= $deptype;
diff --git a/t/add_depends.t b/t/add_depends.t
index 68429b24a..2d686a17d 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 85;
+use Test::More tests => 88;
 
 BEGIN { use_ok("IkiWiki"); }
 %config=IkiWiki::defaultconfig();
@@ -85,3 +85,8 @@ foreach my $spec ("index or (backlink(index) and !*.png)", "backlink(foo)") {
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE));
 }
+
+# content is the default if unknown types are entered
+ok(add_depends("foo8", "*", presenCe => 1));
+ok($IkiWiki::depends{foo8}{"*"} & $IkiWiki::DEPEND_CONTENT);
+ok(! ($IkiWiki::depends{foo8}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-- 
cgit v1.2.3


From a5d825f28632655b608564893428ef9142dddb04 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 19:24:17 -0400
Subject: linkmap: does need presence deps

Otherwise, removal of a page with no links will not be noticed,
since no links will change.
---
 IkiWiki/Plugin/linkmap.pm | 5 +++--
 debian/changelog          | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index b8b4cf40d..d7ba68da9 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -28,8 +28,9 @@ sub preprocess (@) {
 
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a relevant page's links change.
-	add_depends($params{page}, $params{pages}, links => 1);
+	# Needs to update whenever a relevant page is added, or removed, or
+	# its links change.
+	add_depends($params{page}, $params{pages}, presence => 1, links => 1);
 	
 	# Can't just return the linkmap here, since the htmlscrubber
 	# scrubs out all <object> tags (with good reason!)
diff --git a/debian/changelog b/debian/changelog
index a006d3177..dc6ee0a81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
     where if only a small set of pages were considered by orphans/pagestats,
     changes to links on other pages failed to cause an update.
   * linkmap: Use a combination of presence and link dependencies.
-    This makes the map be regenerated much less frequently, so larger
-    maps are more practical to use now.
+    This makes the map be regenerated much less frequently in many cases,
+    so larger maps are more practical to use now.
   * Transitive dependencies are now correctly supported.
   * Rebuild wikis on upgrade to this version to get improved dependency
     info.
-- 
cgit v1.2.3


From 77598dfa9fccb668345198ea169cf7cf00b9845e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 19:29:28 -0400
Subject: linkmap, pagestats: avoid using %links to get a list of pages

When a page is deleted, it is removed from %pagesources, but
not from %links. So use the former.
---
 IkiWiki/Plugin/linkmap.pm   | 2 +-
 IkiWiki/Plugin/pagestats.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index d7ba68da9..3d20a6521 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -56,7 +56,7 @@ sub genmap ($) {
 
 	# Get all the items to map.
 	my %mapitems = ();
-	foreach my $item (keys %links) {
+	foreach my $item (keys %pagesources) {
 		if (pagespec_match($item, $params{pages}, location => $params{page})) {
 			$mapitems{$item}=urlto($item, $params{destpage});
 		}
diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 0765c1cfa..afe4eeaf2 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -45,7 +45,7 @@ sub preprocess (@) {
 	
 	my %counts;
 	my $max = 0;
-	foreach my $page (pagespec_match_list([keys %links],
+	foreach my $page (pagespec_match_list([keys %pagesources],
 			$params{pages}, location => $params{page})) {
 		use IkiWiki::Render;
 
-- 
cgit v1.2.3


From 0582365a56aedaee8dd53ec2f86ea189aff01a38 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 20:19:17 -0400
Subject: notes on removal problem

---
 doc/todo/dependency_types.mdwn | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index f13f1448e..59ccc7591 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -158,7 +158,7 @@ pagecounts much more efficient.
 
 ---- 
 
-Link dependencies:
+### Link dependencies
 
 * `add_depends($page, $spec, links => 1, presence => 1)`
   adds a links + presence dependency.
@@ -173,3 +173,33 @@ Link dependencies:
 TODO: How to determine if a pagespec is valid to be used with a links
 dependency? Use the same simple pagespecs that are valid for presence
 dependencies?
+
+----
+
+### the removal problem
+
+So far I have not addressed fixing the removal problem (which Will
+discusses above).
+
+Summary of problem: A has a dependency on a pagespec such as
+"bugs/* and !link(done)". B currently matches. Then B is updated,
+in a way that makes A's dependency not match it (ie, it links to done).
+Now A is not updated, because ikiwiki does not realize that it
+depended on B before.
+
+This was worked around to fix [[bugs/inline_page_not_updated_on_removal]]
+by inline and map adding explicit dependencies on each page that appears
+on them. Then a change to B triggers the explicit dep. While this works,
+it's 1) ugly 2) probably not implemented by all plugins that could
+be affected by this problem (ie, linkmap) and 3) is most of the reason why
+we grew the complication of `depends_simple`.
+
+One way to fix this is to include with each dependency, a list of pages
+that currently match it. If the list changes, the dependency is triggered.
+
+Should be doable, but seems to involve a more work than
+currently. Consider that a dependency on "bugs/*" currently
+is triggered by just checking until *one* page is found to match it.
+But to store the list, *every* page would have to be tried against it.
+Unless the list can somehow be intelligently updated, looking at only the
+changed pages. 
-- 
cgit v1.2.3


From d8607f5e73990e7802e03eef2065ebac102fbd2f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Oct 2009 20:20:05 -0400
Subject: update

---
 doc/todo/dependency_types.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 59ccc7591..7e940543c 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -169,10 +169,11 @@ pagecounts much more efficient.
 * So, brokenlinks can fire whenever any links in any of the
   pages it's tracking change, or when pages are added or
   removed.
-
-TODO: How to determine if a pagespec is valid to be used with a links
-dependency? Use the same simple pagespecs that are valid for presence
-dependencies?
+* To determine if a pagespec is valid to be used with a links dependency,
+  use the same set that are valid for presence dependencies. But also
+  allow `backlinks()` to be used in it, since that matches pages
+  that the page links to, which is just what link dependencies are
+  triggered on.
 
 ----
 
-- 
cgit v1.2.3


From 3d609928e5d166897f26d2afe1b39e518f67a22c Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Wed, 7 Oct 2009 02:40:32 -0400
Subject: Comments (maybe not so helpful - sorry)

---
 doc/todo/dependency_types.mdwn | 61 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 7e940543c..0503b47af 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -156,6 +156,67 @@ false negatives (though these should be somewhat rare, and no false
 positives). Still, it does work, and it makes things like simple maps and
 pagecounts much more efficient.
 
+----
+
+#### Will's first pass feedback.
+
+If the API is going to be updated, then it would be good to make it forward compatible.
+I'd like for the API to be extendible to what is useful for complex pagespecs, even if we
+that is a little redundant at the moment.
+
+My attempt to play with this is in my git repo.  [[!template id=gitbranch branch=origin/depends-spec author="[[will]]"]]
+That branch is a little out of date, but if you just look at the changes in IkiWiki.pm you'll see the concept I was looking at.
+I added an "add_depends_spec()" function that adds a dependency on the pagespec passed to it.  If the set of matched pages
+changes, then the dependent page is rebuilt.  At the moment the implementation uses the same hack used by map and inline -
+just add all the pages that currently exist as traditional content dependencies.
+
+Getting back to commenting on your proposal:
+
+Just talking about the definition of a "presence dependency" for the moment, and ignoring implementation.  Is a
+"presence dependency" supposed to cause an update when a page disappears?  I assume so.  Is a presence dependency
+supposed to cause an update when a pages existence hasn't changed, but it no longer matches the pagespec.
+(e.g. you use `created_before(test_page)` in a pagespec, and there was a page, `new_page`, that was created
+after `test_page`.  `new_page` will not match the spec.  Now we'll delete and then re-create `test_page`.  Now
+`new_page` will match the spec, and yet `new_page` itself hasn't changed.  Nor has its 'presence' - it was present
+before and it is present now.  Should this cause a re-build of any page that has a 'presence' dependency on the spec?
+
+I think that is another version of the problem you encountered with meta-data.
+
+In the longer term I was thinking we'd have to introduce a concept of 'internal pagespec dependencies'.  Note that I'm
+defining 'internal' pagespec dependencies differently to the pagespec dependencies I defined above.  Perhaps an example:
+If you had a pagespec that was `created_before(test_page)`, then you could list all pages created before `test_page`
+with a `map` directive.  The map directive would add a pagespec dependency on `created_before(test_page)`.
+Internally, there would be a second page-spec parsing function that discovers which pages a given pagespec
+depends on.  As well as the function `match_created_before()`, we'd have to add a new function `depend_created_before()`.
+This new function would return a list of pages, which when any of them change, the output of `match_created_before()`
+would change.  In this example, it would just return `test_page`.
+
+These lists of dependent pages could just be concatenated for every `match_...()` function in a pagespec - you can ignore
+the boolean formula aspects of the pagespec for this.  If a content dependency were added on these pages, then I think 
+the correct rebuilds would occur.  
+
+In all, this is a surprisingly difficult problem to solve perfectly.  Consider the following case:
+
+PageA.mdwn:
+
+> [ShavesSelf]
+
+PageB.mdwn
+
+> Doesn't shave self.
+
+ShavedByBob.mdwn:
+
+> [!include pages="!link(ShavesSelf)"]
+
+Does ShavedByBob.mdwn include itself?
+
+(Yeah - in IkiWiki currently links are included by include, but the idea holds.  I had a good example a while back, but I can't think of it right now.)
+
+sigh.
+
+-- [[Will]]
+
 ---- 
 
 ### Link dependencies
-- 
cgit v1.2.3


From 66e894c8771c5a5dfbd4cb92f826d4d397b2256f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 13:35:48 -0400
Subject: thoughts

---
 doc/todo/dependency_types.mdwn | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 0503b47af..9d649e1e0 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -170,6 +170,11 @@ I added an "add_depends_spec()" function that adds a dependency on the pagespec
 changes, then the dependent page is rebuilt.  At the moment the implementation uses the same hack used by map and inline -
 just add all the pages that currently exist as traditional content dependencies.
 
+> As I note below, a problem with this approach is that it has to try
+> matching the pagespec against every page, redundantly with the work done
+> by the plugin. (But there are ways to avoid that redundant matching.)
+> --[[Joey]] 
+
 Getting back to commenting on your proposal:
 
 Just talking about the definition of a "presence dependency" for the moment, and ignoring implementation.  Is a
@@ -180,6 +185,11 @@ after `test_page`.  `new_page` will not match the spec.  Now we'll delete and th
 `new_page` will match the spec, and yet `new_page` itself hasn't changed.  Nor has its 'presence' - it was present
 before and it is present now.  Should this cause a re-build of any page that has a 'presence' dependency on the spec?
 
+> Yes, a presence dep will trigger when a page is added, or removed. 
+
+> Your example is valid.. but it's also not handled right by normal,
+> (content) dependencies, for the same reasons. --[[Joey]]
+
 I think that is another version of the problem you encountered with meta-data.
 
 In the longer term I was thinking we'd have to introduce a concept of 'internal pagespec dependencies'.  Note that I'm
@@ -217,6 +227,19 @@ sigh.
 
 -- [[Will]]
 
+> I have also been thinking about some sort of analysis pass over pagespecs
+> to determine what metadata, pages, etc they depend on. It is indeed
+> tricky to do. Even if it's just limited to returning a list of pages
+> as you suggest.
+>
+> Consider: For a `*` glob, it has to return a list of all pages
+> in the wiki. Which is expensive. And what if the pagespec is
+> something like `* and backlink(index)`? Without analyising the
+> boolean relationship between terms, the returned list 
+> will have many more items in it than it should. Or do we not make
+> globs return their matches? (If so we have to deal with those
+> with one of the other methods disucssed.) --[[Joey]] 
+
 ---- 
 
 ### Link dependencies
@@ -259,9 +282,22 @@ we grew the complication of `depends_simple`.
 One way to fix this is to include with each dependency, a list of pages
 that currently match it. If the list changes, the dependency is triggered.
 
-Should be doable, but seems to involve a more work than
+Should be doable, but may involve more work than
 currently. Consider that a dependency on "bugs/*" currently
 is triggered by just checking until *one* page is found to match it.
 But to store the list, *every* page would have to be tried against it.
 Unless the list can somehow be intelligently updated, looking at only the
-changed pages. 
+changed pages.
+
+----
+
+What if there were a function that added a dependency, and at the same time
+returned a list of pages matching the pagespec? Plugins that use this would
+be exactly the ones, like inline and map, for which this is a problem, and
+which already do a match pass over all pages.
+
+Adding explicit dependencies during this pass would thus be nearly free.
+Not 100% free since it would add explicit deps for things that are not
+shown on an inline that limits its display to the first sorted N items.
+I suppose we could reach 100% free by making the function also handle
+sorting and limiting, though that could be overkill.
-- 
cgit v1.2.3


From a48b59a4afd01f3f53466eae83bb2b52244ee8e1 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Wed, 7 Oct 2009 19:53:28 +0200
Subject: Use %S instead of %s for the debbug shortcut, so that things like
 [[!debbug 522689#38]] work as expected.

---
 doc/shortcuts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 500146a31..4213295ad 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -18,7 +18,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]]
 * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]]
 * [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]]
-* [[!shortcut name=debbug url="http://bugs.debian.org/%s" desc="bug #%s"]]
+* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="bug #%s"]]
 * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
 * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
 * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]
-- 
cgit v1.2.3


From 93ddca3e9c420f334cc0bebd53945633452513a3 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Wed, 7 Oct 2009 19:54:46 +0200
Subject: Make it obvious for the reader of the rendered page that the debbug
 shortcut links to Debian bug reports.

---
 doc/shortcuts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 4213295ad..ad3f2a890 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -18,7 +18,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]]
 * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]]
 * [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]]
-* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="bug #%s"]]
+* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
 * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
 * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
 * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]
-- 
cgit v1.2.3


From 0fb4474cf82ffe0ccd2b206843ba4f61160e4cf8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 13:55:02 -0400
Subject: limit to discussion pages of blog posts, not whole wiki

---
 doc/examples/blog/comments.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index c46f95df7..4735dea08 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,3 +1,3 @@
 This page will show all comments made to posts in my [[blog|index]].
 
-[[!inline pages="*/Discussion or internal(./posts/*/comment_*)"]]
+[[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]]
-- 
cgit v1.2.3


From 136979fac670b6476069a63385d3e5e53643b68e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 14:08:03 -0400
Subject: fix backlink new change detection code

---
 IkiWiki/Render.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e28381c33..79935f323 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -494,7 +494,7 @@ sub calculate_changed_links ($$$) {
 				my $target=bestlink($page, $l);
 				if (! exists $oldlink_targets->{$page}{$l} ||
 				    $target ne $oldlink_targets->{$page}{$l}) {
-					$backlinkchanged{$l}=1;
+					$backlinkchanged{$target}=1;
 					$linkchangers{lc($page)}=1;
 				}
 				delete $oldlink_targets->{$page}{$l};
@@ -502,7 +502,7 @@ sub calculate_changed_links ($$$) {
 		}
 		if (exists $oldlink_targets->{$page} &&
 		    %{$oldlink_targets->{$page}}) {
-			foreach my $target (keys %{$oldlink_targets->{$page}}) {
+			foreach my $target (values %{$oldlink_targets->{$page}}) {
 				$backlinkchanged{$target}=1;
 			}
 			$linkchangers{lc($page)}=1;
-- 
cgit v1.2.3


From 8fa0cfced9a3d0f79cbf7867e354530d11f9f211 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 14:11:35 -0400
Subject: remove test case for closed bug

---
 doc/bugs/Inline_doesn__39__t_wikilink_to_pages.mdwn | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/bugs/Inline_doesn__39__t_wikilink_to_pages.mdwn b/doc/bugs/Inline_doesn__39__t_wikilink_to_pages.mdwn
index 32f9f1245..13b80b436 100644
--- a/doc/bugs/Inline_doesn__39__t_wikilink_to_pages.mdwn
+++ b/doc/bugs/Inline_doesn__39__t_wikilink_to_pages.mdwn
@@ -2,10 +2,6 @@ It seems that the [[ikiwiki/directive/inline]] directive doesn't generate wikili
 
 \[[!inline pages="bugs/* and !*/discussion and backlink(bugs)" feeds=no postform=no archive=yes show="10"]]
 
-But here it is:
-
-[[!inline pages="bugs/* and !*/discussion and backlink(bugs)" feeds=no postform=no archive=yes show="10"]]
-
 and note that it only included the 'normal' wikilinks (and also note that this page is not marked done even though the done page is inlined).
 One might also wonder if inline would make this page link to any internal links on those inlined pages too, but I think
 that would be overkill.
-- 
cgit v1.2.3


From a09c79ccf1b9523c4b82db8846435c81f7404d44 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 14:25:45 -0400
Subject: problem with explicit, presence dependencies

---
 doc/todo/dependency_types.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 9d649e1e0..7714f2891 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -301,3 +301,22 @@ Not 100% free since it would add explicit deps for things that are not
 shown on an inline that limits its display to the first sorted N items.
 I suppose we could reach 100% free by making the function also handle
 sorting and limiting, though that could be overkill.
+
+----
+
+Found a further complication in presence dependencies. Map now uses
+presence dependencies when adding its explicit dependencies on pages. But
+this defeats the purpose of the explicit dependencies! Because, now,
+when B is changed to not match a pagespec, the A's presence dep does
+not fire.
+
+I didn't think things through when switching it to use presense
+dependencies there. But, if I change it to use full dependencies, then all
+the work that was done to allow map to use presence dependencies for its
+main pagespec is for naught. The map will once again have to update
+whenever *any* content of the page changes.
+
+This points toward the conclusion that explicit dependencies, however they
+are added, are not the right solution at all. Some other approach, such as
+maintaining the list of pages that match a dependency, and noticing when it
+changes, is needed.
-- 
cgit v1.2.3


From 88a244a523f1b5ebe804d169fa38c11ff7760acc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 14:30:19 -0400
Subject: close

---
 doc/bugs/debbug_shortcut_should_expand_differently.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/debbug_shortcut_should_expand_differently.mdwn b/doc/bugs/debbug_shortcut_should_expand_differently.mdwn
index d34c40244..b93b20a32 100644
--- a/doc/bugs/debbug_shortcut_should_expand_differently.mdwn
+++ b/doc/bugs/debbug_shortcut_should_expand_differently.mdwn
@@ -9,3 +9,9 @@ instead of
   There are problems with code. bug #123456 is a good example of...
 
 Thanks, --[[madduck]]
+
+> Tschwinge changed it to expand to "Debian bug #xxxx". Which happens to
+> sidestep the start of sentence problem. I think it makes sense to be
+> explicit about whose bug it is, in general -- but you can always edit the
+> shortcuts page for your own wiki to use something shorter and more
+> implicit. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 7abd079bc081d3f929b0b187336a276d00f6eff8 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Wed, 7 Oct 2009 15:22:32 -0400
Subject:

---
 doc/sandbox.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b0862f28f..242ffb327 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -55,6 +55,10 @@ Bulleted list
 
 -----
 
+[[!progress percent=27]]
+
+-----
+
 This SandBox is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-- 
cgit v1.2.3


From 4e7e4e43065f7335c1aee1d36f2dd740543d1332 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 18:04:13 -0400
Subject: a theory of pagespec influence lists, for Will's perusal

---
 doc/todo/dependency_types.mdwn | 141 +++++++++++++++++++++++++++++++++--------
 1 file changed, 116 insertions(+), 25 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 7714f2891..dca873f34 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -188,7 +188,8 @@ before and it is present now.  Should this cause a re-build of any page that has
 > Yes, a presence dep will trigger when a page is added, or removed. 
 
 > Your example is valid.. but it's also not handled right by normal,
-> (content) dependencies, for the same reasons. --[[Joey]]
+> (content) dependencies, for the same reasons. Still, I think I've
+> addressed it with the pagespec influence stuff below. --[[Joey]]
 
 I think that is another version of the problem you encountered with meta-data.
 
@@ -229,16 +230,7 @@ sigh.
 
 > I have also been thinking about some sort of analysis pass over pagespecs
 > to determine what metadata, pages, etc they depend on. It is indeed
-> tricky to do. Even if it's just limited to returning a list of pages
-> as you suggest.
->
-> Consider: For a `*` glob, it has to return a list of all pages
-> in the wiki. Which is expensive. And what if the pagespec is
-> something like `* and backlink(index)`? Without analyising the
-> boolean relationship between terms, the returned list 
-> will have many more items in it than it should. Or do we not make
-> globs return their matches? (If so we have to deal with those
-> with one of the other methods disucssed.) --[[Joey]] 
+> tricky to do. More thoughts on influence lists a bit below. --[[Joey]] 
 
 ---- 
 
@@ -291,26 +283,13 @@ changed pages.
 
 ----
 
-What if there were a function that added a dependency, and at the same time
-returned a list of pages matching the pagespec? Plugins that use this would
-be exactly the ones, like inline and map, for which this is a problem, and
-which already do a match pass over all pages.
-
-Adding explicit dependencies during this pass would thus be nearly free.
-Not 100% free since it would add explicit deps for things that are not
-shown on an inline that limits its display to the first sorted N items.
-I suppose we could reach 100% free by making the function also handle
-sorting and limiting, though that could be overkill.
-
-----
-
 Found a further complication in presence dependencies. Map now uses
 presence dependencies when adding its explicit dependencies on pages. But
 this defeats the purpose of the explicit dependencies! Because, now,
 when B is changed to not match a pagespec, the A's presence dep does
 not fire.
 
-I didn't think things through when switching it to use presense
+I didn't think things through when switching it to use presence
 dependencies there. But, if I change it to use full dependencies, then all
 the work that was done to allow map to use presence dependencies for its
 main pagespec is for naught. The map will once again have to update
@@ -320,3 +299,115 @@ This points toward the conclusion that explicit dependencies, however they
 are added, are not the right solution at all. Some other approach, such as
 maintaining the list of pages that match a dependency, and noticing when it
 changes, is needed.
+
+----
+
+### pagespec influence lists
+
+I'm using this term for the concept of a list of pages whose modification
+can indirectly influence what pages a pagespec matches.
+
+#### Examples
+
+* The pagespec "created_before(foo)" has an influence list that contains foo.
+  The removal or (re)creation of foo changes what pages match it.
+
+* The pagespec "foo" has an empty influence list. This is because a
+  modification/creation/removal of foo directly changes what the pagespec
+  matches.
+
+* The pagespec "*" has an empty influence list, for the same reason.
+  Avoiding including every page in the wiki into its influence list is
+  very important!
+
+* The pagespec "title(foo)" has an influence list that contains every page
+  that currently matches it. A change to any matching page can change its
+  title. Why is that considered an indirect influence? Well, the pagespec
+  might be used in a presence dependency, and so its title changing
+  would not directly affect the dependency.
+
+* The pagespec "backlink(index)" has an influence list
+  that contains index (because a change to index changes the backlinks).
+
+* The pagespec "link(done)" has an influence list that
+  contains every page that it matches. A change to any matching page can
+  remove a link and make it not match any more, and so the list is needed
+  due to the removal problem.
+
+#### Low-level Calculation
+
+One way to calculate a pagespec's influence would be to
+expand the SuccessReason and FailReason objects used and returned
+by `pagespec_match`. Make the objects be created with an
+influence list included, and when the objects are ANDed or ORed
+together, combine the influence lists.
+
+That would have the benefit of allowing just using the existing `match_*`
+functions, with minor changes to a few of them to gather influence info.
+
+But does it work? Let's try some examples:
+
+Consider "bugs/* and link(done) and backlink(index)".
+
+Its influence list contains index, and it contains all pages that the whole
+pagespec matches. It should, ideally, not contain all pages that link
+to done. There are a lot of such pages, and only a subset influence this
+pagespec.
+
+When matching this pagespec against a page, the `link` will put the page
+on the list. The `backlink` will put index on the list, and they will be
+anded together and combined. If we combine the influences from each
+successful match, we get the right result.
+
+Now consider "bugs/* and link(done) and !backlink(index)".
+
+It influence list is the same as the previous one, even though a term has
+been negated. Because a change to index still influences it, though in a
+different way.
+
+If negation of a SuccessReason preserves the influence list, the right
+influence list will be calculated.
+
+Consider "bugs/* and (link(done) or backlink(index))"
+and      "bugs/* and (backlink(index) or link(done))'
+
+Its clear that the influence lists for these are identical. And they
+contain index, plus all matching pages.
+
+When matching the first against page P, the `link` will put P on the list.
+The OR needs to be a non-short-circuiting type. (In perl, `or`, not `||` --
+so, `pagespec_translate` will need to be changed to not use `||`.)
+Given that, the `backlink` will always be evalulated, and will put index
+onto the influence list. If we combine the influences from each
+successful match, we get the right result.
+
+#### High-level Calculation and Storage
+
+Calculating the full influence list for a pagespec requires trying to match
+it against every page in the wiki. 
+
+I'd like to avoid doing such expensive matching redundantly. So add a
+`pagespec_match_all`, which returns a list of all pages in the whole
+wiki that match the pagespec, and also adds the pagespec as a dependency,
+and while it's at it, calculates and stores the influence list.
+
+It could have an optional sort parameter, and limit parameter, to control
+how many items to return and the sort order. So when inline wants to
+display the 10 newest, only the influence lists for those ten are added.
+
+If `pagespec_match_depends` can be used by all plugins, then great,
+influences are automatically calculated, no extra work needs to be done.
+
+If not, and some plugins still need to use `pagespec_match_list` or
+`pagespec_match`, and `add_depends`, then I guess that `add_depends` can do
+a slightly more expensive influence calculation.
+
+Bonus: If `add_depends` is doing an influence calculation, then I can remove
+the nasty hack it currently uses to decide if a given pagespec is safe to use
+with an existence or links dependency.
+
+Where to store the influence list? Well, it appears that we can just add
+(content) dependencies for each item on the list, to the page's
+regular list of simple dependencies. So, the data stored ends up looking
+just like what is stored today by the explicit dependency hacks. Except,
+it's calculated more smartly, and is added automatically.
-- 
cgit v1.2.3


From 4528b95d2562831208d490ef378a089631000767 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 18:06:49 -0400
Subject: mention that pagespec_match returns an overloaded value

---
 doc/plugins/write.mdwn | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 668f8d8b6..8e8c3311e 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -609,15 +609,31 @@ page created from it. (Ie, it appends ".html".)
 Use this when constructing the filename of a html file. Use `urlto` when
 generating a link to a page.
 
-#### `add_depends($$)`
+#### `add_depends($$;@)`
 
 Makes the specified page depend on the specified [[ikiwiki/PageSpec]].
 
+By default, dependencies are full content dependencies, meaning that the
+page will be updated whenever anything matching the PageSpec is modified.
+This default can be overridden by additional named parameters, which can be
+used to indicate weaker types of dependencies:
+
+* `presence` if set to true, only the presence of a matching page triggers
+  the dependency.
+* `links` if set to true, any change to links on a matching page
+  triggers the dependency. This includes when a link is added, removed,
+  or changes what it points to due to other changes. It does not include
+  the addition or removal of a duplicate link.
+
 #### `pagespec_match($$;@)`
 
-Passed a page name, and [[ikiwiki/PageSpec]], returns true if the
+Passed a page name, and [[ikiwiki/PageSpec]], returns a true value if the
 [[ikiwiki/PageSpec]] matches the page.
 
+Note that the return value is overloaded. If stringified, it will be a
+message indicating why the PageSpec succeeded, or failed, to match the
+page.
+
 Additional named parameters can be passed, to further limit the match.
 The most often used is "location", which specifies the location the
 PageSpec should match against. If not passed, relative PageSpecs will match
-- 
cgit v1.2.3


From c72fda7d695142cc29ac986125234140f6414d97 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 19:40:44 -0400
Subject: make success and failreason objects carry an influences hash

The hash will be used used to record a set of pages that influenced the
result of a pagespec match.

The influences are merged together when boolean and/or are encountered
in a pagespec. That means using a non-short-circuiting OR operator. And
so I use & and | when translating pagespecs, since those bitwise operators
can be overloaded. ("and" and "or" cannot, apparently).
---
 IkiWiki.pm         | 34 +++++++++++++++++++---------------
 t/pagespec_match.t |  6 +++++-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7b1d24c6a..73d2a9763 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1926,10 +1926,10 @@ sub pagespec_translate ($) {
 	}gx) {
 		my $word=$1;
 		if (lc $word eq 'and') {
-			$code.=' &&';
+			$code.=' &';
 		}
 		elsif (lc $word eq 'or') {
-			$code.=' ||';
+			$code.=' |';
 		}
 		elsif ($word eq "(" || $word eq ")" || $word eq "!") {
 			$code.=' '.$word;
@@ -2015,36 +2015,40 @@ sub glob2re ($) {
 package IkiWiki::FailReason;
 
 use overload (
-	'""'	=> sub { ${$_[0]} },
+	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 0 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::SuccessReason'},
+	'&'	=> sub { $_[0][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[0] },
+	'|'	=> sub { $_[1][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[1] },
 	fallback => 1,
 );
 
-sub new {
-	my $class = shift;
-	my $value = shift;
-	return bless \$value, $class;
-}
-
-package IkiWiki::ErrorReason;
-
-our @ISA = 'IkiWiki::FailReason';
+our @ISA = 'IkiWiki::SuccessReason';
 
 package IkiWiki::SuccessReason;
 
 use overload (
-	'""'	=> sub { ${$_[0]} },
+	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 1 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::FailReason'},
+	'&'	=> sub { $_[1][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[1] },
+	'|'	=> sub { $_[0][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[0] },
 	fallback => 1,
 );
 
 sub new {
 	my $class = shift;
 	my $value = shift;
-	return bless \$value, $class;
-};
+	return bless [$value, {@_}], $class;
+}
+
+sub influences {
+	return keys %{$_[0][1]};
+}
+
+package IkiWiki::ErrorReason;
+
+our @ISA = 'IkiWiki::FailReason';
 
 package IkiWiki::PageSpec;
 
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 64408f489..a1fcba7c8 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 54;
+use Test::More tests => 56;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -88,3 +88,7 @@ ok(! pagespec_match("foo", "no_such_function(foo)"), "foo");
 my $ret=pagespec_match("foo", "(invalid");
 ok(! $ret, "syntax error");
 ok($ret =~ /syntax error/, "error message");
+
+my $ret=pagespec_match("foo", "bar or foo");
+ok($ret, "simple match");
+is($ret, "foo matches foo", "stringified return");
-- 
cgit v1.2.3


From 4002d7c1a4657e769b036c6e76106991ec5c3897 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 20:31:13 -0400
Subject: add influence info to match_*

Also update docs, test suite.
---
 IkiWiki.pm             | 24 ++++++++++++------------
 IkiWiki/Plugin/meta.pm |  8 ++++----
 debian/changelog       |  2 ++
 doc/plugins/write.mdwn |  7 +++++++
 t/pagespec_match.t     | 15 +++++++++++++--
 5 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 73d2a9763..9c386e154 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2039,7 +2039,7 @@ use overload (
 sub new {
 	my $class = shift;
 	my $value = shift;
-	return bless [$value, {@_}], $class;
+	return bless [$value, {map { $_ => 1 } @_}], $class;
 }
 
 sub influences {
@@ -2099,23 +2099,23 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links") unless $links && @{$links};
+	return IkiWiki::FailReason->new("$page has no links", $link) unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
 		if (length $bestlink) {
-			return IkiWiki::SuccessReason->new("$page links to $link")
+			return IkiWiki::SuccessReason->new("$page links to $link", $page)
 				if $bestlink eq IkiWiki::bestlink($page, $p);
 		}
 		else {
-			return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
+			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page)
 				if match_glob($p, $link, %params);
 			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link")
+			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page)
 				if match_glob($p_rel, $link, %params);
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link");
+	return IkiWiki::FailReason->new("$page does not link to $link", $page);
 }
 
 sub match_backlink ($$;@) {
@@ -2131,14 +2131,14 @@ sub match_created_before ($$;@) {
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
-			return IkiWiki::SuccessReason->new("$page created before $testpage");
+			return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage);
 		}
 		else {
-			return IkiWiki::FailReason->new("$page not created before $testpage");
+			return IkiWiki::FailReason->new("$page not created before $testpage", $testpage);
 		}
 	}
 	else {
-		return IkiWiki::ErrorReason->new("$testpage does not exist");
+		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);
 	}
 }
 
@@ -2151,14 +2151,14 @@ sub match_created_after ($$;@) {
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
-			return IkiWiki::SuccessReason->new("$page created after $testpage");
+			return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage);
 		}
 		else {
-			return IkiWiki::FailReason->new("$page not created after $testpage");
+			return IkiWiki::FailReason->new("$page not created after $testpage", $testpage);
 		}
 	}
 	else {
-		return IkiWiki::ErrorReason->new("$testpage does not exist");
+		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);
 	}
 }
 
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 9b041a748..a8ee5bc85 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -291,21 +291,21 @@ sub match {
 
 	if (defined $val) {
 		if ($val=~/^$re$/i) {
-			return IkiWiki::SuccessReason->new("$re matches $field of $page");
+			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page);
 		}
 		else {
-			return IkiWiki::FailReason->new("$re does not match $field of $page");
+			return IkiWiki::FailReason->new("$re does not match $field of $page", $page);
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$page does not have a $field");
+		return IkiWiki::FailReason->new("$page does not have a $field", $page);
 	}
 }
 
 package IkiWiki::PageSpec;
 
 sub match_title ($$;@) {
-	IkiWiki::Plugin::meta::match("title", @_);	
+	IkiWiki::Plugin::meta::match("title", @_);
 }
 
 sub match_author ($$;@) {
diff --git a/debian/changelog b/debian/changelog
index dc6ee0a81..565a0cffa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * Transitive dependencies are now correctly supported.
   * Rebuild wikis on upgrade to this version to get improved dependency
     info.
+  * Plugins providing PageSpec `match_*` functions should pass additional
+    influence information when creating result objects.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 8e8c3311e..6b47033e5 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -982,6 +982,13 @@ an IkiWiki::FailReason object if the match fails. If the match cannot be
 attempted at all, for any page, it can instead return an
 IkiWiki::ErrorReason object explaining why.
 
+When constructing these objects, you should also include a list of any
+pages whose contents or other metadata influenced the result of the match.
+For example, "backlink(foo)" is influenced by the contents of page foo;
+"link(foo)" and "title(bar)" are influenced by the contents of any
+page they match; "created_before(foo)" is influenced by the metadata of
+foo; while "glob(*)" is not influenced by the contents of any page.
+
 ### Setup plugins
 
 The ikiwiki setup file is loaded using a pluggable mechanism. If you look
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index a1fcba7c8..f73bfdfe1 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 56;
+use Test::More tests => 61;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -89,6 +89,17 @@ my $ret=pagespec_match("foo", "(invalid");
 ok(! $ret, "syntax error");
 ok($ret =~ /syntax error/, "error message");
 
-my $ret=pagespec_match("foo", "bar or foo");
+$ret=pagespec_match("foo", "bar or foo");
 ok($ret, "simple match");
 is($ret, "foo matches foo", "stringified return");
+
+$ret=pagespec_match("foo", "link(bar)");
+is(join(",", $ret->influences), 'foo', "link is influenced by the page with the link");
+$ret=pagespec_match("bar", "backlink(foo)");
+is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link");
+$ret=pagespec_match("bar", "backlink(foo)");
+is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link");
+$ret=pagespec_match("bar", "created_before(foo)");
+is(join(",", $ret->influences), 'foo', "created_before is influenced by the comparison page");
+$ret=pagespec_match("bar", "created_after(foo)");
+is(join(",", $ret->influences), 'foo', "created_after is influenced by the comparison page");
-- 
cgit v1.2.3


From 54fb82a5a47078f6865ed5bf7d7c09db4bf34e22 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 20:35:26 -0400
Subject: more influences tests

---
 t/pagespec_match.t | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index f73bfdfe1..1a0db1cef 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 61;
+use Test::More tests => 64;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -103,3 +103,9 @@ $ret=pagespec_match("bar", "created_before(foo)");
 is(join(",", $ret->influences), 'foo', "created_before is influenced by the comparison page");
 $ret=pagespec_match("bar", "created_after(foo)");
 is(join(",", $ret->influences), 'foo', "created_after is influenced by the comparison page");
+$ret=pagespec_match("bar", "link(quux) and created_after(foo)");
+is(join(",", sort $ret->influences), 'foo,quux', "influences add up over AND");
+$ret=pagespec_match("bar", "link(quux) and created_after(foo)");
+is(join(",", sort $ret->influences), 'foo,quux', "influences add up over OR");
+$ret=pagespec_match("bar", "!link(quux) and !created_after(foo)");
+is(join(",", sort $ret->influences), 'foo,quux', "influences unaffected by negation");
-- 
cgit v1.2.3


From 43a8b40032c3774e0f5105ca5cbeb7a40fdc6893 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 20:36:25 -0400
Subject: influences calculation implemented

---
 doc/todo/dependency_types.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index dca873f34..a6260821e 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -381,6 +381,8 @@ Given that, the `backlink` will always be evalulated, and will put index
 onto the influence list. If we combine the influences from each
 successful match, we get the right result.
 
+> This is implemented, seems to work ok. --[[Joey]] 
+
 #### High-level Calculation and Storage
 
 Calculating the full influence list for a pagespec requires trying to match
-- 
cgit v1.2.3


From bb389a5ae25461ed20e2d28b18ea8b08f5f36473 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 21:13:10 -0400
Subject: convert add_depends to use influences

No more horrible special-case pagespec parsing.

OTOH, matching over all pages to determine influences is a lot of work.
---
 IkiWiki.pm      | 52 +++++++++++-----------------------
 t/add_depends.t | 86 ++++++++++++++++++++++++++++++---------------------------
 2 files changed, 62 insertions(+), 76 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 9c386e154..7adc63139 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1772,52 +1772,32 @@ sub add_depends ($$;@) {
 	my $page=shift;
 	my $pagespec=shift;
 
-	# Is the pagespec a simple page name?
-	my $simple=$pagespec =~ /$config{wiki_file_regexp}/ &&
-		$pagespec !~ /[\s*?()!]/;
-
 	my $deptype=0;
 	if (@_) {
 		my %params=@_;
 		
-		if ($params{presence}) {
- 			# Is the pagespec limited to terms that will continue
-			# to match pages as long as those pages exist?
-			my $presence_limited=1;
-			while ($presence_limited && $pagespec=~m/(\w+)\([^\)]*\)/g) {
-				$presence_limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
-			}
-			if ($presence_limited) {
-				$deptype=$deptype | $DEPEND_PRESENCE;
-			}
-			else {
-				$deptype=$deptype | $DEPEND_CONTENT;
-			}
-		}
-		if ($params{links}) {
- 			# Is the pagespec limited to terms that will continue
-			# to match pages as long as those pages exist and
-			# link to the same places?
-			my $links_limited=1;
-			while ($links_limited && $pagespec=~m/(\w+)\([^\)]*\)/g) {
-				$links_limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after|backlink)$/;
-			}
-			if ($links_limited) {
-				$deptype=$deptype | $DEPEND_LINKS;
-			}
-			else {
-				$deptype=$deptype | $DEPEND_CONTENT;
-			}
-		}
+		$deptype=$deptype | $DEPEND_PRESENCE if $params{presence};
+		$deptype=$deptype | $DEPEND_LINKS if $params{links};
 	}
 	$deptype=$DEPEND_CONTENT unless $deptype;
 
-	if ($simple) {
+	# Is the pagespec a simple page name?
+	if ($pagespec =~ /$config{wiki_file_regexp}/ &&
+	    $pagespec !~ /[\s*?()!]/) {
 		$depends_simple{$page}{lc $pagespec} |= $deptype;
 		return 1;
 	}
 
-	return unless pagespec_valid($pagespec);
+	# Analyse the pagespec, and match it against all pages
+	# to get a list of influences, and add explicit 
+	# content dependencies for those.
+	my $sub=pagespec_translate($pagespec);
+	return if $@;
+	foreach my $p (keys %pagesources) {
+		my $r=$sub->($p, location => $page );
+		map { $depends_simple{$page}{lc $_} |= $DEPEND_CONTENT } $r->influences
+			if $r;
+	}
 
 	$depends{$page}{$pagespec} |= $deptype;
 	return 1;
@@ -2099,7 +2079,7 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links", $link) unless $links && @{$links};
+	return IkiWiki::FailReason->new("$page has no links", $page) unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
 		if (length $bestlink) {
diff --git a/t/add_depends.t b/t/add_depends.t
index 2d686a17d..d49aa74ce 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -8,25 +8,27 @@ BEGIN { use_ok("IkiWiki"); }
 $config{srcdir}=$config{destdir}="/dev/null";
 IkiWiki::checkconfig();
 
+$pagesources{"foo$_"}="foo$_.mdwn" for 0..9;
+
 # avoids adding an unparseable pagespec
-ok(! add_depends("foo", "foo and (bar"));
-ok(! add_depends("foo", "foo another"));
+ok(! add_depends("foo0", "foo and (bar"));
+ok(! add_depends("foo0", "foo another"));
 
 # simple and not-so-simple dependencies split
-ok(add_depends("foo", "*"));
-ok(add_depends("foo", "bar"));
-ok(add_depends("foo", "BAZ"));
-ok(exists $IkiWiki::depends_simple{foo}{"bar"});
-ok(exists $IkiWiki::depends_simple{foo}{"baz"}); # lowercase
-ok(! exists $IkiWiki::depends_simple{foo}{"*"});
-ok(! exists $IkiWiki::depends{foo}{"bar"});
-ok(! exists $IkiWiki::depends{foo}{"baz"});
+ok(add_depends("foo0", "*"));
+ok(add_depends("foo0", "bar"));
+ok(add_depends("foo0", "BAZ"));
+ok(exists $IkiWiki::depends_simple{foo0}{"bar"});
+ok(exists $IkiWiki::depends_simple{foo0}{"baz"}); # lowercase
+ok(! exists $IkiWiki::depends_simple{foo0}{"*"});
+ok(! exists $IkiWiki::depends{foo0}{"bar"});
+ok(! exists $IkiWiki::depends{foo0}{"baz"});
 
 # default dependencies are content dependencies
-ok($IkiWiki::depends{foo}{"*"} & $IkiWiki::DEPEND_CONTENT);
-ok(! ($IkiWiki::depends{foo}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-ok($IkiWiki::depends_simple{foo}{"bar"} & $IkiWiki::DEPEND_CONTENT);
-ok(! ($IkiWiki::depends_simple{foo}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+ok($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_CONTENT);
+ok(! ($IkiWiki::depends{foo0}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+ok($IkiWiki::depends_simple{foo0}{"bar"} & $IkiWiki::DEPEND_CONTENT);
+ok(! ($IkiWiki::depends_simple{foo0}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
 
 # adding other dep types standalone
 ok(add_depends("foo2", "*", presence => 1));
@@ -50,43 +52,47 @@ ok(($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_CONTENT));
 ok(add_depends("foo2", "bar", presence => 1)); # had only links before
 ok($IkiWiki::depends_simple{foo2}{"bar"} & ($IkiWiki::DEPEND_LINKS | $IkiWiki::DEPEND_PRESENCE));
 ok(! ($IkiWiki::depends_simple{foo2}{"bar"} & $IkiWiki::DEPEND_CONTENT));
-ok(add_depends("foo", "bar", links => 1)); # had only content before
-ok($IkiWiki::depends{foo}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS));
-ok(! ($IkiWiki::depends{foo}{"*"} & $IkiWiki::DEPEND_PRESENCE));
+ok(add_depends("foo0", "bar", links => 1)); # had only content before
+ok($IkiWiki::depends{foo0}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS));
+ok(! ($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_PRESENCE));
 
-# adding a pagespec that requires page metadata should cause a fallback to
-# a content dependency
-foreach my $spec ("* and ! link(bar)", "* or link(bar)", "unknownspec()",
-	"title(hi)",
-	"* or unknown(yo)", # this one could actually be acceptably be
-	                    # detected to not need a content dep .. in
-			    # theory!
-	) {
+# Adding a pagespec that requires page metadata should add the influence
+# as an explicit content dependency.
+$links{foo0}=$links{foo9}=[qw{bar baz}];
+foreach my $spec ("* and ! link(bar)", "* or link(bar)") {
 	ok(add_depends("foo3", $spec, presence => 1));
-	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_CONTENT);
 	ok(add_depends("foo4", $spec, links => 1));
-	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends{foo4}{$spec} & $IkiWiki::DEPEND_LINKS);
+	ok(! ($IkiWiki::depends{foo4}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
+	ok($IkiWiki::depends_simple{foo4}{foo4} == $IkiWiki::DEPEND_CONTENT);
 }
 
-# a pagespec with backlinks() in it is acceptable for a links dependency,
-# but not a presence dependency
-foreach my $spec ("index or (backlink(index) and !*.png)", "backlink(foo)") {
+# a pagespec with backlinks() will add as an influence the page with the links
+$links{foo0}=[qw{foo5 foo7}];
+foreach my $spec ("bugs or (backlink(foo0) and !*.png)", "backlink(foo)") {
 	ok(add_depends("foo5", $spec, presence => 1));
-	ok($IkiWiki::depends{foo5}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok(! ($IkiWiki::depends{foo5}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends{foo5}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok(! ($IkiWiki::depends{foo5}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_CONTENT);
 	ok(add_depends("foo6", $spec, links => 1));
 	ok($IkiWiki::depends{foo6}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo6}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
-	# combining both ends up with a content+links dependency
+	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_CONTENT);
 	ok(add_depends("foo7", $spec, presence => 1, links => 1));
-	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_LINKS);
-	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE));
+	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_CONTENT));
+	ok($IkiWiki::depends_simple{foo7}{foo0} == $IkiWiki::DEPEND_CONTENT);
+	ok(add_depends("foo8", $spec));
+	ok($IkiWiki::depends{foo8}{$spec} & $IkiWiki::DEPEND_CONTENT);
+	ok(! ($IkiWiki::depends{foo8}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo8}{foo0} == $IkiWiki::DEPEND_CONTENT);
 }
 
 # content is the default if unknown types are entered
-ok(add_depends("foo8", "*", presenCe => 1));
-ok($IkiWiki::depends{foo8}{"*"} & $IkiWiki::DEPEND_CONTENT);
-ok(! ($IkiWiki::depends{foo8}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+ok(add_depends("foo9", "*", presenCe => 1));
+ok($IkiWiki::depends{foo9}{"*"} & $IkiWiki::DEPEND_CONTENT);
+ok(! ($IkiWiki::depends{foo9}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-- 
cgit v1.2.3


From f7601954a862afd4c5a5b9ba83480af0472e1cf9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 21:26:50 -0400
Subject: update

---
 doc/todo/dependency_types.mdwn | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index a6260821e..3bb1b5452 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -238,10 +238,7 @@ sigh.
 
 * `add_depends($page, $spec, links => 1, presence => 1)`
   adds a links + presence dependency.
-* `refresh` only rebuilds a page with a links dependency if
-  pages matched by the pagespec gain or lose links. (What the link
-  actually points to may change independent of this, due to changes
-  elsewhere, without it firing.)
+* Use backlinks change code to detect changes to link dependencies too.
 * So, brokenlinks can fire whenever any links in any of the
   pages it's tracking change, or when pages are added or
   removed.
@@ -413,3 +410,14 @@ Where to store the influence list? Well, it appears that we can just add
 regular list of simple dependencies. So, the data stored ends up looking
 just like what is stored today by the explicit dependency hacks. Except,
 it's calculated more smartly, and is added automatically.
+
+> I've implemented influence calculation in `add_depends`. As expected,
+> it means rather a lot more work, and makes some things much slower.
+> Optimisation via `pagespec_match_depends` next.. --[[Joey]] 
+
+#### Influence types
+
+Note that influences can also have types, same as dependency types.
+For example, "backlink(foo)" has an influence of foo, of type links.
+"created_before(foo)" also is influenced by foo, but it's a presence
+type. Etc.
-- 
cgit v1.2.3


From 5f9860e65c65aa769f11e550e63cc164b1519710 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 21:48:03 -0400
Subject: add type info to influence information

---
 IkiWiki.pm             | 49 ++++++++++++++++++++++++++++++-------------------
 IkiWiki/Plugin/meta.pm |  6 +++---
 doc/plugins/write.mdwn |  6 +++---
 docwiki.setup          |  2 +-
 t/add_depends.t        | 14 +++++++-------
 t/pagespec_match.t     | 32 ++++++++++++++++----------------
 6 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7adc63139..39a43ddbe 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1795,8 +1795,10 @@ sub add_depends ($$;@) {
 	return if $@;
 	foreach my $p (keys %pagesources) {
 		my $r=$sub->($p, location => $page );
-		map { $depends_simple{$page}{lc $_} |= $DEPEND_CONTENT } $r->influences
-			if $r;
+		my %i=$r->influences;
+		foreach my $i (keys %i) {
+			$depends_simple{$page}{lc $i} |= $i{$i};
+		}
 	}
 
 	$depends{$page}{$pagespec} |= $deptype;
@@ -1998,8 +2000,8 @@ use overload (
 	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 0 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::SuccessReason'},
-	'&'	=> sub { $_[0][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[0] },
-	'|'	=> sub { $_[1][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[1] },
+	'&'	=> sub { $_[0]->merge_influences($_[1]); $_[0] },
+	'|'	=> sub { $_[1]->merge_influences($_[0]); $_[1] },
 	fallback => 1,
 );
 
@@ -2011,19 +2013,27 @@ use overload (
 	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 1 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::FailReason'},
-	'&'	=> sub { $_[1][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[1] },
-	'|'	=> sub { $_[0][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[0] },
+	'&'	=> sub { $_[1]->merge_influences($_[0]); $_[1] },
+	'|'	=> sub { $_[0]->merge_influences($_[1]); $_[0] },
 	fallback => 1,
 );
 
 sub new {
 	my $class = shift;
 	my $value = shift;
-	return bless [$value, {map { $_ => 1 } @_}], $class;
+	return bless [$value, {@_}], $class;
 }
 
 sub influences {
-	return keys %{$_[0][1]};
+	return %{$_[0][1]};
+}
+
+sub merge_influences {
+	my $this=shift;
+	my $other=shift;
+	foreach my $influence (keys %{$other->[1]}) {
+		$this->[1]{$influence} |= $other->[1]{$influence};
+	}
 }
 
 package IkiWiki::ErrorReason;
@@ -2079,23 +2089,24 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links", $page) unless $links && @{$links};
+	return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS)
+		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
 		if (length $bestlink) {
-			return IkiWiki::SuccessReason->new("$page links to $link", $page)
+			return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS)
 				if $bestlink eq IkiWiki::bestlink($page, $p);
 		}
 		else {
-			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page)
+			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS)
 				if match_glob($p, $link, %params);
 			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page)
+			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS)
 				if match_glob($p_rel, $link, %params);
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link", $page);
+	return IkiWiki::FailReason->new("$page does not link to $link", $page => $IkiWiki::DEPEND_LINKS);
 }
 
 sub match_backlink ($$;@) {
@@ -2111,14 +2122,14 @@ sub match_created_before ($$;@) {
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
-			return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage);
+			return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);
 		}
 		else {
-			return IkiWiki::FailReason->new("$page not created before $testpage", $testpage);
+			return IkiWiki::FailReason->new("$page not created before $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);
 		}
 	}
 	else {
-		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);
+		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage => $IkiWiki::DEPEND_PRESENCE);
 	}
 }
 
@@ -2131,14 +2142,14 @@ sub match_created_after ($$;@) {
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
-			return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage);
+			return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);
 		}
 		else {
-			return IkiWiki::FailReason->new("$page not created after $testpage", $testpage);
+			return IkiWiki::FailReason->new("$page not created after $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);
 		}
 	}
 	else {
-		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);
+		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage => $IkiWiki::DEPEND_PRESENCE);
 	}
 }
 
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index a8ee5bc85..c160e7eba 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -291,14 +291,14 @@ sub match {
 
 	if (defined $val) {
 		if ($val=~/^$re$/i) {
-			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page);
+			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT);
 		}
 		else {
-			return IkiWiki::FailReason->new("$re does not match $field of $page", $page);
+			return IkiWiki::FailReason->new("$re does not match $field of $page", $page => $IkiWiki::DEPEND_CONTENT);
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$page does not have a $field", $page);
+		return IkiWiki::FailReason->new("$page does not have a $field", $page => $IkiWiki::DEPEND_CONTENT);
 	}
 }
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 6b47033e5..232430079 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -982,9 +982,9 @@ an IkiWiki::FailReason object if the match fails. If the match cannot be
 attempted at all, for any page, it can instead return an
 IkiWiki::ErrorReason object explaining why.
 
-When constructing these objects, you should also include a list of any
-pages whose contents or other metadata influenced the result of the match.
-For example, "backlink(foo)" is influenced by the contents of page foo;
+When constructing these objects, you should also include information about
+of any pages whose contents or other metadata influenced the result of the
+match. For example, "backlink(foo)" is influenced by the contents of page foo;
 "link(foo)" and "title(bar)" are influenced by the contents of any
 page they match; "created_before(foo)" is influenced by the metadata of
 foo; while "glob(*)" is not influenced by the contents of any page.
diff --git a/docwiki.setup b/docwiki.setup
index 52421e501..41c07f024 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -16,5 +16,5 @@ use IkiWiki::Setup::Standard {
 	userdir => "users",
 	usedirs => 0,
 	prefix_directives => 1,
-	add_plugins => [qw{goodstuff version haiku polygen fortune}],
+	add_plugins => [qw{linkmap goodstuff version haiku polygen fortune}],
 }
diff --git a/t/add_depends.t b/t/add_depends.t
index d49aa74ce..9f426187b 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -57,17 +57,17 @@ ok($IkiWiki::depends{foo0}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_L
 ok(! ($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_PRESENCE));
 
 # Adding a pagespec that requires page metadata should add the influence
-# as an explicit content dependency.
+# as an explicit dependency. In the case of a link, a links dependency.
 $links{foo0}=$links{foo9}=[qw{bar baz}];
 foreach my $spec ("* and ! link(bar)", "* or link(bar)") {
 	ok(add_depends("foo3", $spec, presence => 1));
 	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
 	ok(add_depends("foo4", $spec, links => 1));
 	ok($IkiWiki::depends{foo4}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo4}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
-	ok($IkiWiki::depends_simple{foo4}{foo4} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo4}{foo4} == $IkiWiki::DEPEND_LINKS);
 }
 
 # a pagespec with backlinks() will add as an influence the page with the links
@@ -76,20 +76,20 @@ foreach my $spec ("bugs or (backlink(foo0) and !*.png)", "backlink(foo)") {
 	ok(add_depends("foo5", $spec, presence => 1));
 	ok($IkiWiki::depends{foo5}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo5}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
 	ok(add_depends("foo6", $spec, links => 1));
 	ok($IkiWiki::depends{foo6}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo6}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
-	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
 	ok(add_depends("foo7", $spec, presence => 1, links => 1));
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_CONTENT));
-	ok($IkiWiki::depends_simple{foo7}{foo0} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo7}{foo0} == $IkiWiki::DEPEND_LINKS);
 	ok(add_depends("foo8", $spec));
 	ok($IkiWiki::depends{foo8}{$spec} & $IkiWiki::DEPEND_CONTENT);
 	ok(! ($IkiWiki::depends{foo8}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo8}{foo0} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo8}{foo0} == $IkiWiki::DEPEND_LINKS);
 }
 
 # content is the default if unknown types are entered
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 1a0db1cef..36fa04370 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -93,19 +93,19 @@ $ret=pagespec_match("foo", "bar or foo");
 ok($ret, "simple match");
 is($ret, "foo matches foo", "stringified return");
 
-$ret=pagespec_match("foo", "link(bar)");
-is(join(",", $ret->influences), 'foo', "link is influenced by the page with the link");
-$ret=pagespec_match("bar", "backlink(foo)");
-is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link");
-$ret=pagespec_match("bar", "backlink(foo)");
-is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link");
-$ret=pagespec_match("bar", "created_before(foo)");
-is(join(",", $ret->influences), 'foo', "created_before is influenced by the comparison page");
-$ret=pagespec_match("bar", "created_after(foo)");
-is(join(",", $ret->influences), 'foo', "created_after is influenced by the comparison page");
-$ret=pagespec_match("bar", "link(quux) and created_after(foo)");
-is(join(",", sort $ret->influences), 'foo,quux', "influences add up over AND");
-$ret=pagespec_match("bar", "link(quux) and created_after(foo)");
-is(join(",", sort $ret->influences), 'foo,quux', "influences add up over OR");
-$ret=pagespec_match("bar", "!link(quux) and !created_after(foo)");
-is(join(",", sort $ret->influences), 'foo,quux', "influences unaffected by negation");
+my %i=pagespec_match("foo", "link(bar)")->influences;
+is(join(",", keys %i), 'foo', "link is influenced by the page with the link");
+%i=pagespec_match("bar", "backlink(foo)")->influences;
+is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link");
+%i=pagespec_match("bar", "backlink(foo)")->influences;
+is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link");
+%i=pagespec_match("bar", "created_before(foo)")->influences;
+is(join(",", keys %i), 'foo', "created_before is influenced by the comparison page");
+%i=pagespec_match("bar", "created_after(foo)")->influences;
+is(join(",", keys %i), 'foo', "created_after is influenced by the comparison page");
+%i=pagespec_match("bar", "link(quux) and created_after(foo)")->influences;
+is(join(",", sort keys %i), 'bar,foo', "influences add up over AND");
+%i=pagespec_match("bar", "link(quux) and created_after(foo)")->influences;
+is(join(",", sort keys %i), 'bar,foo', "influences add up over OR");
+%i=pagespec_match("bar", "!link(quux) and !created_after(foo)")->influences;
+is(join(",", sort keys %i), 'bar,foo', "influences unaffected by negation");
-- 
cgit v1.2.3


From 957ded9d64ca6abf0127c5c49e24177685bac5ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 21:57:31 -0400
Subject: remove explicit addition of dependencies for displayed pages

that hack is not needed, thanks to pagespec influences calculation
---
 IkiWiki/Plugin/calendar.pm | 5 -----
 IkiWiki/Plugin/inline.pm   | 6 ------
 IkiWiki/Plugin/map.pm      | 5 -----
 3 files changed, 16 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index a1117992a..ec8e232e1 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -213,11 +213,6 @@ EOF
 	# Add dependencies to update the calendar whenever pages
 	# matching the pagespec are added or removed.
 	add_depends($params{page}, $params{pages}, presence => 1);
-	# Explicitly add all currently linked pages as dependencies, so
-	# that if they are removed, the calendar will be sure to be updated.
-	foreach my $p (@list) {
-		add_depends($params{page}, $p, presence => 1);
-	}
 
 	return $calendar;
 }
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index cebd9037c..fc4e00a83 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -247,12 +247,6 @@ sub preprocess_inline (@) {
 		@list=@list[0..$params{show} - 1];
 	}
 
-	# Explicitly add all currently displayed pages as dependencies, so
-	# that if they are removed, the inline will be sure to be updated.
-	foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
-		add_depends($params{page}, $p, presence => $quick);
-	}
-	
 	if ($feeds && exists $params{feedpages}) {
 		@feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
 	}
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 625cfdfca..46f11dc89 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -71,11 +71,6 @@ sub preprocess (@) {
 	# cases, when its content changes, if show= is specified), so
 	# register a dependency.
 	add_depends($params{page}, $params{pages}, presence => ! exists $params{show});
-	# Explicitly add all currently shown pages, to detect when pages
-	# are removed.
-	foreach my $item (keys %mapitems) {
-		add_depends($params{page}, $item, presence => ! exists $params{show});
-	}
 
 	# Create the map.
 	my $parent="";
-- 
cgit v1.2.3


From 0cb08c9a4b558c3a0a13c5652b0e0a37ae548199 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 22:08:19 -0400
Subject: bugfix

---
 IkiWiki.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 39a43ddbe..c250d50ad 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1795,6 +1795,7 @@ sub add_depends ($$;@) {
 	return if $@;
 	foreach my $p (keys %pagesources) {
 		my $r=$sub->($p, location => $page );
+		next unless $r;
 		my %i=$r->influences;
 		foreach my $i (keys %i) {
 			$depends_simple{$page}{lc $i} |= $i{$i};
-- 
cgit v1.2.3


From 61105cca4f219323a0b490e6251ac60abc549c2a Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Thu, 8 Oct 2009 01:33:23 -0400
Subject: Questions...

---
 doc/todo/dependency_types.mdwn | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 3bb1b5452..01205f178 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -222,7 +222,7 @@ ShavedByBob.mdwn:
 
 Does ShavedByBob.mdwn include itself?
 
-(Yeah - in IkiWiki currently links are included by include, but the idea holds.  I had a good example a while back, but I can't think of it right now.)
+(Yeah - in IkiWiki currently links are *not* included by include, but the idea holds.  I had a good example a while back, but I can't think of it right now.)
 
 sigh.
 
@@ -232,6 +232,10 @@ sigh.
 > to determine what metadata, pages, etc they depend on. It is indeed
 > tricky to do. More thoughts on influence lists a bit below. --[[Joey]] 
 
+>> The big part of what makes this tricky is that there may be cycles in the
+>> dependency graph.  This can lead to situations where the result is just not
+>> well defined.  This is what I was trying to get at above. -- [[Will]]
+
 ---- 
 
 ### Link dependencies
@@ -304,6 +308,20 @@ changes, is needed.
 I'm using this term for the concept of a list of pages whose modification
 can indirectly influence what pages a pagespec matches.
 
+> Trying to make a formal definition of this: (Note, I'm using the term sets rather than lists, but they're roughly equivalent)
+>
+>  * Let the *matching set* for a pagespec be the set of pages that the pagespec matches.
+>  * Let a *complete influence set* for a pagespec be the set of all pages whose alteration might change the matching set of that pagespec.
+>  * Let the *direct influence set* be the intersection of the matching set and the complete influence set.
+>  * Let the *indirect influence set* be the compliment of the direct influence set with respect to the complete influence set.
+>
+> Is that a fair definition?  I don't think it quite matches your examples below unfortunately.
+> I was unsure if I should insert the word 'existing' in there in a few places.  As it stands, these definitions could include sets of pages that don't exist, e.g. "*".
+> The one I'm least sure of is the definition of the direct influence set.  It feels like you want something
+> like "the traditional set of things we thought about that could cause a pagespec to change", but that definition
+> is not very formal and I suspect will lead to problems.  Something like "The set of pages matched by the globs in the pagespec" might be closer?
+> --[[Will]]
+
 #### Examples
 
 * The pagespec "created_before(foo)" has an influence list that contains foo.
@@ -331,6 +349,10 @@ can indirectly influence what pages a pagespec matches.
   remove a link and make it not match any more, and so the list is needed
   due to the removal problem.
 
+>> Why doesn't this include every page?  If I change a page that doesn't have a link to
+>> 'done' to include a link to 'done', then it will now match...  or is that considered a
+>> 'direct match'? -- [[Will]]
+
 #### Low-level Calculation
 
 One way to calculate a pagespec's influence would be to
@@ -421,3 +443,8 @@ Note that influences can also have types, same as dependency types.
 For example, "backlink(foo)" has an influence of foo, of type links.
 "created_before(foo)" also is influenced by foo, but it's a presence
 type. Etc.
+
+> This is an interesting concept that I hadn't considered.  It might
+> allow significant computational savings, but I suspect will be tricky
+> to implement. -- [[Will]]
+
-- 
cgit v1.2.3


From b91ccb4963fe7074b64cb538a2439d4cb9dad45e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 04:06:53 -0400
Subject: update

---
 doc/todo/dependency_types.mdwn | 57 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 01205f178..d3ffdf7b2 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -236,6 +236,9 @@ sigh.
 >> dependency graph.  This can lead to situations where the result is just not
 >> well defined.  This is what I was trying to get at above. -- [[Will]]
 
+>>> Hmm, I'm not seeing cycles be a problem, at least with the current
+>>> pagespec terms. --[[Joey]] 
+
 ---- 
 
 ### Link dependencies
@@ -322,6 +325,17 @@ can indirectly influence what pages a pagespec matches.
 > is not very formal and I suspect will lead to problems.  Something like "The set of pages matched by the globs in the pagespec" might be closer?
 > --[[Will]]
 
+>> I appreciate the formalism! 
+>>
+>> Only existing pages need to be in these sets, because if a page is added
+>> in the future, the existing dependency code will always test to see
+>> if it matches. So it will be in the maching set (or not) at that point.
+>>
+>> The problem with your definition of direct influence set seems to be
+>> that it doesn't allow `link()` and `title()` to have as an indirect
+>> influence, the page that matches. But I'm quite sure we need those.
+>>  --[[Joey]] 
+
 #### Examples
 
 * The pagespec "created_before(foo)" has an influence list that contains foo.
@@ -337,9 +351,8 @@ can indirectly influence what pages a pagespec matches.
 
 * The pagespec "title(foo)" has an influence list that contains every page
   that currently matches it. A change to any matching page can change its
-  title. Why is that considered an indirect influence? Well, the pagespec
-  might be used in a presence dependency, and so its title changing
-  would not directly affect the dependency.
+  title, making it not match any more, and so the list is needed due to the
+  removal problem.
 
 * The pagespec "backlink(index)" has an influence list
   that contains index (because a change to index changes the backlinks).
@@ -353,6 +366,10 @@ can indirectly influence what pages a pagespec matches.
 >> 'done' to include a link to 'done', then it will now match...  or is that considered a
 >> 'direct match'? -- [[Will]]
 
+>>> The regular dependency calculation code will check if every changed
+>>> page matches every dependency. So it will notice the link was added.
+>>> --[[Joey]] 
+
 #### Low-level Calculation
 
 One way to calculate a pagespec's influence would be to
@@ -404,13 +421,29 @@ successful match, we get the right result.
 
 #### High-level Calculation and Storage
 
-Calculating the full influence list for a pagespec requires trying to match
-it against every page in the wiki. 
-
-I'd like to avoid doing such expensive matching redundantly. So add a
-`pagespec_match_all`, which returns a list of all pages in the whole
-wiki that match the pagespec, and also adds the pagespec as a dependency,
-and while it's at it, calculates and stores the influence list.
+Naively calculating the full influence list for a pagespec requires trying
+to match it against every page in the wiki. I'd like to avoid doing such
+expensive matching redundantly.
+
+It may be possible, for some types of pagespecs, to just try matching a
+single, arbitrary page against it, and know the full influence list has
+been obtained. It seems to be that case that if a pagespec has any
+influences, matching any page will return at least one. So if none are
+returned, we can skip trying other pages.
+
+If the influence list does not include the page that was tried, we know
+that the pagespec does not things like `link()` and `title()`, that are
+influenced by the page's own content. So it *might* be safe to not try
+matching any more pages in this case too. I think it would work for all
+current pagespec terms. There might be a hypothetical term where this
+optimisation doesn't work. We could add a special case to ensure it can
+work: If a term declares it is unfluenced by "", then it means it is
+always influenced by the matching page.
+
+Anyway, this seems worth doing: Add a `pagespec_match_all`, which returns a
+list of all pages in the whole wiki that match the pagespec, and also adds
+the pagespec as a dependency, and while it's at it, calculates and stores
+the influence list.
 
 It could have an optional sort parameter, and limit parameter, to control
 how many items to return and the sort order. So when inline wants to
@@ -435,7 +468,7 @@ it's calculated more smartly, and is added automatically.
 
 > I've implemented influence calculation in `add_depends`. As expected,
 > it means rather a lot more work, and makes some things much slower.
-> Optimisation via `pagespec_match_depends` next.. --[[Joey]] 
+> Optimisations next.. --[[Joey]] 
 
 #### Influence types
 
@@ -448,3 +481,5 @@ type. Etc.
 > allow significant computational savings, but I suspect will be tricky
 > to implement. -- [[Will]]
 
+>> It was actually really easy to implement it, assuming I picked the right
+>> dependency types of course. --[[Joey]]
-- 
cgit v1.2.3


From 808c699961eae0de7125812d4f1c51ecd5fc6c18 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 8 Oct 2009 06:38:40 -0400
Subject:

---
 doc/todo/dependency_types.mdwn | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index d3ffdf7b2..97cff97c5 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -279,7 +279,7 @@ One way to fix this is to include with each dependency, a list of pages
 that currently match it. If the list changes, the dependency is triggered.
 
 Should be doable, but may involve more work than
-currently. Consider that a dependency on "bugs/*" currently
+currently. Consider that a dependency on `bugs/*` currently
 is triggered by just checking until *one* page is found to match it.
 But to store the list, *every* page would have to be tried against it.
 Unless the list can somehow be intelligently updated, looking at only the
@@ -417,7 +417,10 @@ Given that, the `backlink` will always be evalulated, and will put index
 onto the influence list. If we combine the influences from each
 successful match, we get the right result.
 
-> This is implemented, seems to work ok. --[[Joey]] 
+> This is implemented, seems to work ok. --[[Joey]]
+
+> `or` short-circuits too, but the implementation correctly uses `|`,
+> which I assume is what you meant. --[[smcv]]
 
 #### High-level Calculation and Storage
 
-- 
cgit v1.2.3


From 57d694046f6cd76543720615ba6913ed6dc96423 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Thu, 8 Oct 2009 07:26:01 -0400
Subject: Tweaks

---
 doc/todo/dependency_types.mdwn | 46 +++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 97cff97c5..d31797f3d 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -239,6 +239,21 @@ sigh.
 >>> Hmm, I'm not seeing cycles be a problem, at least with the current
 >>> pagespec terms. --[[Joey]] 
 
+>>>> Oh, they're not with current pagespec terms.  But this is really close to extending to handle
+>>>> functional pagespecs, etc.  And I think I'd like to think about that now.
+>>>>
+>>>> Having said that, I don't want to hold you up - you seem to be making progress.  The best is
+>>>> the enemy of the good, etc. etc.
+>>>>
+>>>> For my part, I'm imagining we have two more constructs in IkiWiki:
+>>>>
+>>>>  * A map directive that actually wikilinks to the pages it links to, and
+>>>>  * A `match_sharedLink(pageX)` matching function that matches pageY if both pageX and pageY each have links to any same third page, pageZ.
+>>>>
+>>>> With those two constructs, one page changing might change the set of pages included in a map somewhere, which might then change the set of pages matched by some other pagespec, which might then...
+>>>>
+>>>> --[[Will]]
+
 ---- 
 
 ### Link dependencies
@@ -313,16 +328,13 @@ can indirectly influence what pages a pagespec matches.
 
 > Trying to make a formal definition of this: (Note, I'm using the term sets rather than lists, but they're roughly equivalent)
 >
->  * Let the *matching set* for a pagespec be the set of pages that the pagespec matches.
->  * Let a *complete influence set* for a pagespec be the set of all pages whose alteration might change the matching set of that pagespec.
->  * Let the *direct influence set* be the intersection of the matching set and the complete influence set.
->  * Let the *indirect influence set* be the compliment of the direct influence set with respect to the complete influence set.
+>  * Let the *matching set* for a pagespec be the set of existing pages that the pagespec matches.
+>  * Let a *influence set* for a pagespec be the set of all pages, *p*, whose alteration might:
+>    * cause the pagespec to include or exclude a page other than *p*, or
+>    * cause the pagespec to exclude *p*.
+>
+>> \[Will snipped some stuff and edited the formal definition]
 >
-> Is that a fair definition?  I don't think it quite matches your examples below unfortunately.
-> I was unsure if I should insert the word 'existing' in there in a few places.  As it stands, these definitions could include sets of pages that don't exist, e.g. "*".
-> The one I'm least sure of is the definition of the direct influence set.  It feels like you want something
-> like "the traditional set of things we thought about that could cause a pagespec to change", but that definition
-> is not very formal and I suspect will lead to problems.  Something like "The set of pages matched by the globs in the pagespec" might be closer?
 > --[[Will]]
 
 >> I appreciate the formalism! 
@@ -331,11 +343,24 @@ can indirectly influence what pages a pagespec matches.
 >> in the future, the existing dependency code will always test to see
 >> if it matches. So it will be in the maching set (or not) at that point.
 >>
+>>> Hrm, I agree with you in general, but I think I can come up with nasty counter-examples.  What about a pagespec
+>>> of "!backlink(bogus)" where the page bogus doesn't exist?  In this case, the page 'bogus' needs to be in the influence
+>>> set even though it doesn't exist.
+>>>
+>>> Also, I would really like the formalism to include the whole dependency system, not just any additions to it.  That will make
+>>> the whole thing much easier to reason about.
+>>
 >> The problem with your definition of direct influence set seems to be
 >> that it doesn't allow `link()` and `title()` to have as an indirect
 >> influence, the page that matches. But I'm quite sure we need those.
 >>  --[[Joey]] 
 
+>>> I see what you mean.  Does the revised definition capture this effectively?
+>>> The problem with this revised definition is that it still doesn't match your examples below.
+>>> My revised definition will include pretty much all currently matching pages to be in the influence list
+>>> because deletion of any of them would cause a change in which pages are matched - the removal problem.
+>>> -- [[Will]]
+
 #### Examples
 
 * The pagespec "created_before(foo)" has an influence list that contains foo.
@@ -349,6 +374,9 @@ can indirectly influence what pages a pagespec matches.
   Avoiding including every page in the wiki into its influence list is
   very important!
 
+>>> So, why don't the above influence lists contain the currently matched pages?
+>>> Don't you need this to handle the removal problem? -- [[Will]]
+
 * The pagespec "title(foo)" has an influence list that contains every page
   that currently matches it. A change to any matching page can change its
   title, making it not match any more, and so the list is needed due to the
-- 
cgit v1.2.3


From 79f3e32ea7adf3e5adbef0a8c9c68cd32a67cac4 Mon Sep 17 00:00:00 2001
From: "http://www.larted.org.uk/~dom/" <http://www.larted.org.uk/~dom/@web>
Date: Thu, 8 Oct 2009 11:38:34 -0400
Subject: add cpanrt

---
 doc/shortcuts.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index ad3f2a890..b84d71c3d 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -59,6 +59,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]]
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
+* [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-- 
cgit v1.2.3


From e82aeb3e4359d3d07f6dbbee7c12cbcbbc1aa4b4 Mon Sep 17 00:00:00 2001
From: "http://shoorick.livejournal.com/"
 <http://shoorick.livejournal.com/@web>
Date: Thu, 8 Oct 2009 13:07:41 -0400
Subject:

---
 doc/bugs/Another_UTF-8_problem.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/Another_UTF-8_problem.mdwn b/doc/bugs/Another_UTF-8_problem.mdwn
index 031576f00..d67ed2fa0 100644
--- a/doc/bugs/Another_UTF-8_problem.mdwn
+++ b/doc/bugs/Another_UTF-8_problem.mdwn
@@ -11,3 +11,6 @@ with my pretty standard Ubuntu gutsy Firefox installation?  --[[tschwinge]]
 > removed that line to fix it. --[[Joey]]
 
 [[!tag done]]
+
+Now we test it for Cyrillic and Western letters:
+Протестируем кириллицу и ещё «_другие_» буквы: grüne Öl & hôtel — 3² × 2° --Shoorick
-- 
cgit v1.2.3


From f2b3d1341447cbf29189ab490daae418fbe5d02d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 13:38:46 -0400
Subject: fix handling of influences of pagespecs that fail to match

If a pagespec fails to match, I had been throwing the influences away, but
that is not right. Consider `backlink(foo)`, where foo does not exist.
It still needs to be added as an influence, because if it is created, it
will influence the pagespec to match.

But with that fix, `link(bar)` had as influences all pages, whether they
link to bar or not. Which is not necessary, because modifiying a page to
add a link to bar will directly cause the pagespec to match.

So, in match_link (and all the match_* functions for page metadata),
only return an influence if the match succeeds.

match_backlink had been implemented as the inverse of match_link, but that
is no longer completly true. While match_link does not return an influence
on failure, match_backlink does.

match_created_before/after also return the influence on failure, this way
if created_after(foo) currently fails because foo does not exist, it will
still update the page with the pagespec if foo is created.
---
 IkiWiki.pm             | 21 ++++++++++++++-------
 IkiWiki/Plugin/meta.pm |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c250d50ad..2064c881a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1789,13 +1789,12 @@ sub add_depends ($$;@) {
 	}
 
 	# Analyse the pagespec, and match it against all pages
-	# to get a list of influences, and add explicit 
-	# content dependencies for those.
+	# to get a list of influences, and add explicit dependencies
+	# for those.
 	my $sub=pagespec_translate($pagespec);
 	return if $@;
 	foreach my $p (keys %pagesources) {
 		my $r=$sub->($p, location => $page );
-		next unless $r;
 		my %i=$r->influences;
 		foreach my $i (keys %i) {
 			$depends_simple{$page}{lc $i} |= $i{$i};
@@ -2026,7 +2025,13 @@ sub new {
 }
 
 sub influences {
-	return %{$_[0][1]};
+	my $this=shift;
+	if (! @_) {
+		return %{$this->[1]};
+	}
+	else {
+		$this->[1]={@_};
+	}
 }
 
 sub merge_influences {
@@ -2090,7 +2095,7 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS)
+	return IkiWiki::FailReason->new("$page has no links")
 		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
@@ -2107,11 +2112,13 @@ sub match_link ($$;@) {
 				if match_glob($p_rel, $link, %params);
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link", $page => $IkiWiki::DEPEND_LINKS);
+	return IkiWiki::FailReason->new("$page does not link to $link");
 }
 
 sub match_backlink ($$;@) {
-	return match_link($_[1], $_[0], @_);
+	my $ret=match_link($_[1], $_[0], @_);
+	$ret->influences($_[1] => $IkiWiki::DEPEND_LINKS);
+	return $ret;
 }
 
 sub match_created_before ($$;@) {
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index c160e7eba..da3e62233 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -294,11 +294,11 @@ sub match {
 			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT);
 		}
 		else {
-			return IkiWiki::FailReason->new("$re does not match $field of $page", $page => $IkiWiki::DEPEND_CONTENT);
+			return IkiWiki::FailReason->new("$re does not match $field of $page");
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$page does not have a $field", $page => $IkiWiki::DEPEND_CONTENT);
+		return IkiWiki::FailReason->new("$page does not have a $field");
 	}
 }
 
-- 
cgit v1.2.3


From 3baf6980aa5725b647bf72452be2c05db1ad0bff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 13:54:51 -0400
Subject: update

---
 doc/todo/dependency_types.mdwn | 55 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index d31797f3d..cce5997e8 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -254,6 +254,14 @@ sigh.
 >>>>
 >>>> --[[Will]]
 
+>>>>> I think that should be supported by [[bugs/transitive_dependencies]].
+>>>>> At least in the current implementation, which considers each page
+>>>>> that is rendered to be changed, and rebuilds pages that are dependent
+>>>>> on it, in a loop. An alternate implementation, which could be faster,
+>>>>> is to construct a directed graph and traverse it just once. Sounds
+>>>>> like that would probably not support what you want to do.
+>>>>> --[[Joey]]
+
 ---- 
 
 ### Link dependencies
@@ -347,6 +355,13 @@ can indirectly influence what pages a pagespec matches.
 >>> of "!backlink(bogus)" where the page bogus doesn't exist?  In this case, the page 'bogus' needs to be in the influence
 >>> set even though it doesn't exist.
 >>>
+>>>> I think you're right, this is a case that the current code is not
+>>>> handling. Actually, I made all the pagespecs return influences
+>>>> even if the influence was not present or did not match. But, it
+>>>> currently only records influences as dependencies when a pagespec
+>>>> successfully matches. Now I'm sure that is wrong, and I've removed
+>>>> that false optimisation. I've updated some of the below. --[[Joey]]
+>>>
 >>> Also, I would really like the formalism to include the whole dependency system, not just any additions to it.  That will make
 >>> the whole thing much easier to reason about.
 >>
@@ -364,7 +379,8 @@ can indirectly influence what pages a pagespec matches.
 #### Examples
 
 * The pagespec "created_before(foo)" has an influence list that contains foo.
-  The removal or (re)creation of foo changes what pages match it.
+  The removal or (re)creation of foo changes what pages match it. Note that
+  this is true even if the pagespec currently fails to match.
 
 * The pagespec "foo" has an empty influence list. This is because a
   modification/creation/removal of foo directly changes what the pagespec
@@ -377,13 +393,27 @@ can indirectly influence what pages a pagespec matches.
 >>> So, why don't the above influence lists contain the currently matched pages?
 >>> Don't you need this to handle the removal problem? -- [[Will]]
 
+>>>> The removal problem is slightly confusingly named, since it does not
+>>>> affect pages that were matched by a glob and have been removed. Such
+>>>> pages can be handled without being influences, because ikiwiki knows
+>>>> they have been removed, and so can still match them against the
+>>>> pagespec, and see they used to match; and thus knows that the
+>>>> dependency has triggered.
+>>>>
+>>>> Maybe the thing to do is consider this an optimisation, where such
+>>>> pages are influences, but ikiwiki is able to implicitly find them,
+>>>> so they do not need to be explicitly stored. --[[Joey]]
+
 * The pagespec "title(foo)" has an influence list that contains every page
   that currently matches it. A change to any matching page can change its
   title, making it not match any more, and so the list is needed due to the
-  removal problem.
+  removal problem. A page that does not have a matching title is not an
+  influence, because modifying the page to change its title directly
+  changes what the pagespec matches.
 
 * The pagespec "backlink(index)" has an influence list
   that contains index (because a change to index changes the backlinks).
+  Note that this is true even if the backlink currently fails.
 
 * The pagespec "link(done)" has an influence list that
   contains every page that it matches. A change to any matching page can
@@ -450,6 +480,27 @@ successful match, we get the right result.
 > `or` short-circuits too, but the implementation correctly uses `|`,
 > which I assume is what you meant. --[[smcv]]
 
+>> Er, yeah. --[[Joey]] 
+
+----
+
+What about: "!link(done)"
+
+Specifically, I want to make sure it works now that I've changed
+`match_link` to only return a page as an influence if it *does*
+link to done.
+
+So, when matching against page P, that does not link to done,
+there are no influences, and the pagespec matches. If P is later
+changed to add a link to done, then the dependency resolver will directly
+notice that.
+
+When matching against page P, that does link to done, P
+is an influence, and the pagespec does not match. If P is later changed
+to not link to done, the influence will do its job.
+
+Looks good!
+
 #### High-level Calculation and Storage
 
 Naively calculating the full influence list for a pagespec requires trying
-- 
cgit v1.2.3


From 3948b422381a0f05225aaf8b973d0cd54f089348 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 15:33:47 -0400
Subject: found a way to get false positive influences

---
 doc/todo/dependency_types.mdwn | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index cce5997e8..56153239f 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -501,6 +501,34 @@ to not link to done, the influence will do its job.
 
 Looks good!
 
+----
+
+Here is a case where this approach has some false positives.
+
+"bugs/* and link(patch)"
+
+This finds as influences all pages that link to patch, even
+if they are not under bugs/, and so can never match.
+
+To fix this, the influence calculation would need to consider boolean
+operators. Currently, this turns into roughly:
+
+`FailReason() & SuccessReason(patch)`
+
+Let's say that the glob instead returns a HardFailReason, which when
+ANDed with another object, drops their influences. (But when ORed, combines
+them.) Fixes the above, but does it always work?
+
+"(bugs/* or link(patch)) and backlink(index)" =>
+`( HardFailReason() | SuccessReason(patch) ) & SuccessReason(index)`` =>
+`SuccessReason(patch) & SuccessReason(index)` =>
+SuccessReason(patch, index) => right
+
+"(bugs/* and link(patch)) or backlink(index)" =>
+`( HardFailReason() & SuccessReason(patch) ) | SuccessReason(index)`` =>
+`HardFailReason() | SuccessReason(index)` =>
+`SuccessReason(index)` => right
+
 #### High-level Calculation and Storage
 
 Naively calculating the full influence list for a pagespec requires trying
-- 
cgit v1.2.3


From c57908b9d073500608d656adaf2bd3048c8cef67 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 16:49:03 -0400
Subject: change how dependency types are specified to add_depends

Also, this fixes 2 bugs in dependency info.
---
 IkiWiki/Plugin/brokenlinks.pm    |  2 +-
 IkiWiki/Plugin/calendar.pm       | 17 +++++++++--------
 IkiWiki/Plugin/edittemplate.pm   |  2 +-
 IkiWiki/Plugin/inline.pm         |  7 ++++++-
 IkiWiki/Plugin/linkmap.pm        |  2 +-
 IkiWiki/Plugin/listdirectives.pm |  2 +-
 IkiWiki/Plugin/map.pm            |  3 ++-
 IkiWiki/Plugin/meta.pm           |  2 +-
 IkiWiki/Plugin/orphans.pm        |  4 ++--
 IkiWiki/Plugin/pagecount.pm      |  2 +-
 IkiWiki/Plugin/pagestats.pm      |  4 ++--
 IkiWiki/Plugin/postsparkline.pm  |  2 +-
 IkiWiki/Plugin/progress.pm       |  4 ++--
 13 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 9e65f52c6..62a0a42f4 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -24,7 +24,7 @@ sub preprocess (@) {
 	$params{pages}="*" unless defined $params{pages};
 	
 	# Needs to update whenever the links on a page change.
-	add_depends($params{page}, $params{pages}, links => 1);
+	add_depends($params{page}, $params{pages}, deptype("links"));
 	
 	my @broken;
 	foreach my $link (keys %IkiWiki::brokenlinks) {
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index ec8e232e1..c99170f92 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -105,21 +105,21 @@ sub format_month (@) {
 			linktext => " $monthname ");
 	}
 	add_depends($params{page}, "$archivebase/$year/".sprintf("%02d", $month),
-		presence => 1);
+		deptype("presence"));
 	if (exists $cache{$pagespec}{"$pyear/$pmonth"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/" . sprintf("%02d", $pmonth),
 			linktext => " $pmonthname ");
 	}
 	add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth),
-		presence => 1);
+		deptype("presence"));
 	if (exists $cache{$pagespec}{"$nyear/$nmonth"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/" . sprintf("%02d", $nmonth),
 			linktext => " $nmonthname ");
 	}
 	add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth),
-		presence => 1);
+		deptype("presence"));
 
 	# Start producing the month calendar
 	$calendar=<<EOF;
@@ -212,7 +212,7 @@ EOF
 
 	# Add dependencies to update the calendar whenever pages
 	# matching the pagespec are added or removed.
-	add_depends($params{page}, $params{pages}, presence => 1);
+	add_depends($params{page}, $params{pages}, deptype("presence"));
 
 	return $calendar;
 }
@@ -244,19 +244,19 @@ sub format_year (@) {
 			"$archivebase/$year",
 			linktext => "$year");
 	}
-	add_depends($params{page}, "$archivebase/$year", presence => 1);
+	add_depends($params{page}, "$archivebase/$year", deptype("presence");
 	if (exists $cache{$pagespec}{"$pyear"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear",
 			linktext => "\&larr;");
 	}
-	add_depends($params{page}, "$archivebase/$pyear", presence => 1);
+	add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
 	if (exists $cache{$pagespec}{"$nyear"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear",
 			linktext => "\&rarr;");
 	}
-	add_depends($params{page}, "$archivebase/$nyear", presence => 1);
+	add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
 
 	# Start producing the year calendar
 	$calendar=<<EOF;
@@ -308,7 +308,8 @@ EOF
 		else {
 			$calendar.=qq{\t<td class="$tag">$monthabbr</td>\n};
 		}
-		add_depends($params{page}, "$archivebase/$year/$mtag", presence => 1);
+		add_depends($params{page}, "$archivebase/$year/$mtag",
+			deptype("presence"));
 
 		$calendar.=qq{\t</tr>\n} if ($month % $params{months_per_row} == 0);
 	}
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 2dd1dbe68..7d2eba194 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -58,7 +58,7 @@ sub preprocess (@) {
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
 
 	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-	add_depends($params{page}, $link, presence => 1);
+	add_depends($params{page}, $link, deptype("presence"));
 	return sprintf(gettext("edittemplate %s registered for %s"),
 		htmllink($params{page}, $params{destpage}, $link),
 	       	$params{match});
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index fc4e00a83..be1781520 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -195,9 +195,14 @@ sub preprocess_inline (@) {
 
 		@list = map { bestlink($params{page}, $_) }
 		        split ' ', $params{pagenames};
+
+		foreach my $p (@list) {
+			add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
+		}
 	}
 	else {
-		add_depends($params{page}, $params{pages}, presence => $quick);
+		add_depends($params{page}, $params{pages},
+			deptype($quick ? "presence" : "content"));
 
 		@list = pagespec_match_list(
 			[ grep { $_ ne $params{page} } keys %pagesources ],
diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 3d20a6521..28e4cfa13 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -30,7 +30,7 @@ sub preprocess (@) {
 	
 	# Needs to update whenever a relevant page is added, or removed, or
 	# its links change.
-	add_depends($params{page}, $params{pages}, presence => 1, links => 1);
+	add_depends($params{page}, $params{pages}, deptype("presence", "links"));
 	
 	# Can't just return the linkmap here, since the htmlscrubber
 	# scrubs out all <object> tags (with good reason!)
diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index 4023ed7d7..09f08c567 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -84,7 +84,7 @@ sub preprocess (@) {
 	foreach my $plugin (@pluginlist) {
 		$result .= '<li class="listdirectives">';
 		my $link=linkpage($config{directive_description_dir}."/".$plugin);
-		add_depends($params{page}, $link, presence => 1);
+		add_depends($params{page}, $link, deptype("presence"));
 		$result .= htmllink($params{page}, $params{destpage}, $link);
 		$result .= '</li>';
 	}
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 46f11dc89..19872e51c 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -70,7 +70,8 @@ sub preprocess (@) {
 	# Needs to update whenever a page is added or removed (or in some
 	# cases, when its content changes, if show= is specified), so
 	# register a dependency.
-	add_depends($params{page}, $params{pages}, presence => ! exists $params{show});
+	add_depends($params{page}, $params{pages},
+		deptype(exists $params{show} ? "content" : "presence");
 
 	# Create the map.
 	my $parent="";
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index da3e62233..c675880b3 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -195,7 +195,7 @@ sub preprocess (@) {
 			if (! length $link) {
 				error gettext("redir page not found")
 			}
-			add_depends($page, $link, presence => 1);
+			add_depends($page, $link, deptype("presence"));
 
 			$value=urlto($link, $page);
 			$value.='#'.$redir_anchor if defined $redir_anchor;
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index ae330b23b..93b8ec440 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -26,10 +26,10 @@ sub preprocess (@) {
 	# Needs to update whenever a link changes, on any page
 	# since any page could link to one of the pages we're
 	# considering as orphans.
-	add_depends($params{page}, "*", links => 1);
+	add_depends($params{page}, "*", deptype("links"));
 	# Also needs to update whenever potential orphans are added or
 	# removed.
-	add_depends($params{page}, $params{pages}, presence => 1);
+	add_depends($params{page}, $params{pages}, deptype("presence"));
 	
 	my @orphans;
 	foreach my $page (pagespec_match_list(
diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 80561350b..419f2d535 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -24,7 +24,7 @@ sub preprocess (@) {
 	
 	# Needs to update count whenever a page is added or removed, so
 	# register a presence dependency.
-	add_depends($params{page}, $params{pages}, presence => 1);
+	add_depends($params{page}, $params{pages}, deptype("presence"));
 	
 	my @pages;
 	if ($params{pages} eq "*") {
diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index afe4eeaf2..cd0bdb085 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -36,12 +36,12 @@ sub preprocess (@) {
 	my $style = ($params{style} or 'cloud');
 	
 	# Needs to update whenever a page is added or removed.
-	add_depends($params{page}, $params{pages}, exists => 1);
+	add_depends($params{page}, $params{pages}, deptype("presence"));
 	# Also needs to update when any page with links changes, 
 	# in case the links point to our displayed pages.
 	# (Among limits this further.)
 	add_depends($params{page}, exists $params{among} ? $params{among} : "*",
-		links => 1); 
+		deptype("links")); 
 	
 	my %counts;
 	my $max = 0;
diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 3205958d4..ea73e9180 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -48,7 +48,7 @@ sub preprocess (@) {
 		error gettext("unknown formula");
 	}
 
-	add_depends($params{page}, $params{pages}, presence => 1);
+	add_depends($params{page}, $params{pages}, deptype("presence"));
 
 	my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } 
 		pagespec_match_list(
diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 26c537a84..6da3e4f71 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -36,8 +36,8 @@ sub preprocess (@) {
 		$fill.="%";
 	}
 	elsif (defined $params{totalpages} and defined $params{donepages}) {
-		add_depends($params{page}, $params{totalpages}, presence => 1);
-		add_depends($params{page}, $params{donepages}, presence => 1);
+		add_depends($params{page}, $params{totalpages}, deptype("presence"));
+		add_depends($params{page}, $params{donepages}, deptype("presence"));
 
 		my @pages=keys %pagesources;
 		my $totalcount=0;
-- 
cgit v1.2.3


From 5e236f5d25b68f5fb4a421b24470419c6042cb1c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 16:49:53 -0400
Subject: add use_pagespec and deptype functions

---
 IkiWiki.pm             | 135 +++++++++++++++++++++++++++++++++++++++++--------
 debian/changelog       |   4 +-
 doc/plugins/write.mdwn |  61 +++++++++++++++++-----
 t/use_pagespec.t       |  30 +++++++++++
 4 files changed, 194 insertions(+), 36 deletions(-)
 create mode 100755 t/use_pagespec.t

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2064c881a..c787612e1 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -17,11 +17,12 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %forcerebuild %loaded_plugins};
 
 use Exporter q{import};
-our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
-                 pagespec_match_list bestlink htmllink readfile writefile
-		 pagetype srcfile pagename displaytime will_render gettext urlto
-		 targetpage add_underlay pagetitle titlepage linkpage
-		 newpagefile inject add_link
+our @EXPORT = qw(hook debug error template htmlpage deptype use_pagespec
+                 add_depends pagespec_match pagespec_match_list bestlink
+		 htmllink readfile writefile pagetype srcfile pagename
+		 displaytime will_render gettext urlto targetpage
+		 add_underlay pagetitle titlepage linkpage newpagefile
+		 inject add_link
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
@@ -1768,18 +1769,10 @@ sub rcs_receive () {
 	$hooks{rcs}{rcs_receive}{call}->();
 }
 
-sub add_depends ($$;@) {
+sub add_depends ($$;$) {
 	my $page=shift;
 	my $pagespec=shift;
-
-	my $deptype=0;
-	if (@_) {
-		my %params=@_;
-		
-		$deptype=$deptype | $DEPEND_PRESENCE if $params{presence};
-		$deptype=$deptype | $DEPEND_LINKS if $params{links};
-	}
-	$deptype=$DEPEND_CONTENT unless $deptype;
+	my $deptype=shift || $DEPEND_CONTENT;
 
 	# Is the pagespec a simple page name?
 	if ($pagespec =~ /$config{wiki_file_regexp}/ &&
@@ -1791,18 +1784,118 @@ sub add_depends ($$;@) {
 	# Analyse the pagespec, and match it against all pages
 	# to get a list of influences, and add explicit dependencies
 	# for those.
+	#my $sub=pagespec_translate($pagespec);
+	#return if $@;
+	#foreach my $p (keys %pagesources) {
+	#	my $r=$sub->($p, location => $page );
+	#	my %i=$r->influences;
+	#	foreach my $i (keys %i) {
+	#		$depends_simple{$page}{lc $i} |= $i{$i};
+	#	}
+	#}
+	print STDERR "warning: use of add_depends; influences not tracked\n";
+
+	$depends{$page}{$pagespec} |= $deptype;
+	return 1;
+}
+
+sub use_pagespec ($$;@) {
+	my $page=shift;
+	my $pagespec=shift;
+	my %params=@_;
+
 	my $sub=pagespec_translate($pagespec);
-	return if $@;
-	foreach my $p (keys %pagesources) {
-		my $r=$sub->($p, location => $page );
-		my %i=$r->influences;
+	error "syntax error in pagespec \"$pagespec\""
+		if $@ || ! defined $sub;
+
+	my @candidates;
+	if (exists $params{limit}) {
+		@candidates=grep { $params{limit}->($_) } keys %pagesources;
+	}
+	else {
+		@candidates=keys %pagesources;
+	}
+
+	if (defined $params{sort}) {
+		my $f;
+		if ($params{sort} eq 'title') {
+			$f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) };
+		}
+		elsif ($params{sort} eq 'title_natural') {
+			eval q{use Sort::Naturally};
+			if ($@) {
+				error(gettext("Sort::Naturally needed for title_natural sort"));
+			}
+			$f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) };
+                }
+		elsif ($params{sort} eq 'mtime') {
+			$f=sub { $pagemtime{$b} <=> $pagemtime{$a} };
+		}
+		elsif ($params{sort} eq 'age') {
+			$f=sub { $pagectime{$b} <=> $pagectime{$a} };
+		}
+		else {
+			error sprintf(gettext("unknown sort type %s"), $params{sort});
+		}
+		@candidates = sort { &$f } @candidates;
+	}
+
+	@candidates=reverse(@candidates) if $params{reverse};
+	
+	my @matches;
+	my $firstfail;
+	my $count=0;
+	foreach my $p (@candidates) {
+		my $r=$sub->($p, location => $page);
+		if ($r) {
+			push @matches, [$p, $r];
+			last if defined $params{num} && ++$count == $params{num};
+		}
+		elsif (! defined $firstfail) {
+			$firstfail=$r;
+		}
+	}
+	
+	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
+
+	my @ret;
+	if (@matches) {
+		# Add all influences from successful matches.
+		foreach my $m (@matches) {
+			push @ret, $m->[0];
+			my %i=$m->[1]->influences;
+			foreach my $i (keys %i) {
+				$depends_simple{$page}{lc $i} |= $i{$i};
+			}
+		}
+	}
+	elsif (defined $firstfail) {
+		# Add influences from one failure. (Which one should not
+		# matter; all should have the same influences.)
+		my %i=$firstfail->influences;
 		foreach my $i (keys %i) {
 			$depends_simple{$page}{lc $i} |= $i{$i};
 		}
+		error(sprintf(gettext("cannot match pages: %s"), $firstfail));
 	}
 
-	$depends{$page}{$pagespec} |= $deptype;
-	return 1;
+	return @ret;
+}
+
+sub deptype (@) {
+	my $deptype=0;
+	foreach my $type (@_) {
+		if ($type eq 'presence') {
+			$deptype |= $DEPEND_PRESENCE;
+		}
+		elsif ($type eq 'links') { 
+			$deptype |= $DEPEND_LINKS;
+		}
+		elsif ($type eq 'content') {
+			$deptype |= $DEPEND_CONTENT;
+		}
+	}
+	return $deptype;
 }
 
 sub file_pruned ($$) {
diff --git a/debian/changelog b/debian/changelog
index 565a0cffa..12ddebac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,6 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * Added support framework for multiple types of dependencies.
   * Allow declaring that a dependency is only affected by page presence
     or changes to its links.
-    (By passing presence => 1 or links => 1 to add_depends.)
   * pagecount, calendar, postsparkline, progress: Use a presence dependency,
     which makes these directives much less expensive to use, since page
     edits will no longer trigger an unnecessary update.
@@ -34,6 +33,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
     info.
   * Plugins providing PageSpec `match_*` functions should pass additional
     influence information when creating result objects.
+  * Added `use_pagespec` function, that plugins can use to find a list
+    of matching pages and add dependencies and influences, all at once,
+    and efficiently.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 232430079..3d5650758 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -609,21 +609,52 @@ page created from it. (Ie, it appends ".html".)
 Use this when constructing the filename of a html file. Use `urlto` when
 generating a link to a page.
 
-#### `add_depends($$;@)`
+### `deptype(@)`
+
+Use this function to generate ikiwiki's internal representation of a
+dependency type from one or more of these keywords:
+
+* `content` is the default. Any change to the content
+  of a page triggers the dependency.
+* `presence` is only triggered by a change to the presence
+  of a page.
+* `links` is only triggered by a change to the links of a page.
+  This includes when a link is added, removed, or changes what
+  it points to due to other changes. It does not include the
+  addition or removal of a duplicate link.
+
+If multiple types are specified, they are combined.
+
+#### `use_pagespec($$;@)`
+
+Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages
+in the wiki that match the [[ikiwiki/PageSpec]]. 
+
+The page will automatically be made to depend on the specified
+[[ikiwiki/PageSpec]], so `add_depends` does not need to be called. This
+is significantly more efficient than calling `add_depends`
+followed by `pagespec_match_list`. You should use this anytime a plugin
+needs to match a set of pages and generate something based on that list.
+
+Additional named parameters can be specified:
+
+* `deptype` optionally specifies the type of dependency to add. Use the
+  `deptype` function to generate a dependency type.
+* `limit` is a reference to a function, that is called and passed a page,
+  and must return true for the page to be included.
+* `sort` specifies a sort order for the list. See
+  [[ikiwiki/PageSpec/sorting]] for the avilable sort methods.
+* `reverse` if true, sorts in reverse.
+* `num` if nonzero, specifies the maximum number of matching pages that
+  will be returned.
+
+#### `add_depends($$;$)`
 
 Makes the specified page depend on the specified [[ikiwiki/PageSpec]].
 
 By default, dependencies are full content dependencies, meaning that the
 page will be updated whenever anything matching the PageSpec is modified.
-This default can be overridden by additional named parameters, which can be
-used to indicate weaker types of dependencies:
-
-* `presence` if set to true, only the presence of a matching page triggers
-  the dependency.
-* `links` if set to true, any change to links on a matching page
-  triggers the dependency. This includes when a link is added, removed,
-  or changes what it points to due to other changes. It does not include
-  the addition or removal of a duplicate link.
+This can be overridden by passing a `deptype` value as the third parameter.
 
 #### `pagespec_match($$;@)`
 
@@ -984,10 +1015,12 @@ IkiWiki::ErrorReason object explaining why.
 
 When constructing these objects, you should also include information about
 of any pages whose contents or other metadata influenced the result of the
-match. For example, "backlink(foo)" is influenced by the contents of page foo;
-"link(foo)" and "title(bar)" are influenced by the contents of any
-page they match; "created_before(foo)" is influenced by the metadata of
-foo; while "glob(*)" is not influenced by the contents of any page.
+match. Do this by passing a list of pages, followed by `deptype` values.
+
+For example, "backlink(foo)" is influenced by the contents of page foo;
+"link(foo)" and "title(bar)" are influenced by the contents of any page
+they match; "created_before(foo)" is influenced by the metadata of foo;
+while "glob(*)" is not influenced by the contents of any page.
 
 ### Setup plugins
 
diff --git a/t/use_pagespec.t b/t/use_pagespec.t
new file mode 100755
index 000000000..7b904075e
--- /dev/null
+++ b/t/use_pagespec.t
@@ -0,0 +1,30 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 64;
+
+BEGIN { use_ok("IkiWiki"); }
+
+%pagesources=(
+	foo => "foo.mdwn",
+	bar => "bar.mdwn",
+	"post/1" => "post/1.mdwn",
+	"post/2" => "post/2.mdwn",
+	"post/3" => "post/3.mdwn",
+);
+
+is_deeply([use_pagespec("foo", "bar")], ["bar"]);
+is_deeply([sort(use_pagespec("foo", "post/*"))], ["post/1", "post/2", "post/3"]);
+is_deeply([use_pagespec("foo", "post/*", sort => "title", reverse => 1)],
+	["post/3", "post/2", "post/1"]);
+is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 2)],
+	["post/1", "post/2"]);
+is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 50)],
+	["post/1", "post/2", "post/3"]);
+is_deeply([use_pagespec("foo", "post/*", sort => "title",
+                         limit => sub { $_[0] !~ /3/}) ],
+	["post/1", "post/2"]);
+eval { use_pagespec("foo", "beep") };
+ok($@, "fails with error when unable to match anything");
+eval { use_pagespec("foo", "this is not a legal pagespec!") };
+ok($@, "fails with error when pagespec bad");
-- 
cgit v1.2.3


From de24c0df873a772a8b44098d1b4d2e1258640c9e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 17:52:20 -0400
Subject: map: switch to use_pagespec

---
 IkiWiki/Plugin/map.pm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 19872e51c..634b0e4d6 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -28,12 +28,15 @@ sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
+	# Needs to update whenever a page is added or removed (or in some
+	# cases, when its content changes, if show= is specified).
+	my $deptype=deptype(exists $params{show} ? "content" : "presence");
+	
 	my $common_prefix;
 
 	# Get all the items to map.
 	my %mapitems;
-	foreach my $page (pagespec_match_list([keys %pagesources],
-				$params{pages}, location => $params{page})) {
+	foreach my $page (use_pagespec($params{page}, $params{pages}, deptype => $deptype)) {
 		if (exists $params{show} && 
 		    exists $pagestate{$page} &&
 		    exists $pagestate{$page}{meta}{$params{show}}) {
@@ -67,12 +70,6 @@ sub preprocess (@) {
 		$common_prefix=IkiWiki::dirname($common_prefix);
 	}
 
-	# Needs to update whenever a page is added or removed (or in some
-	# cases, when its content changes, if show= is specified), so
-	# register a dependency.
-	add_depends($params{page}, $params{pages},
-		deptype(exists $params{show} ? "content" : "presence");
-
 	# Create the map.
 	my $parent="";
 	my $indent=0;
@@ -80,12 +77,12 @@ sub preprocess (@) {
 	my $addparent="";
 	my $map = "<div class='map'>\n";
 
-	# Return empty div if %mapitems is empty
-	if (!scalar(keys %mapitems)) {
+	if (! keys %mapitems) {
+		# return empty div for empty map
 		$map .= "</div>\n";
 		return $map; 
 	} 
-	else { # continue populating $map
+	else {
 		$map .= "<ul>\n";
 	}
 
-- 
cgit v1.2.3


From 4b8ca7cfc147b2016b17cc88a21052a7ee6d46fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 18:00:10 -0400
Subject: update

---
 doc/todo/dependency_types.mdwn | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 56153239f..f06603874 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -520,15 +520,19 @@ ANDed with another object, drops their influences. (But when ORed, combines
 them.) Fixes the above, but does it always work?
 
 "(bugs/* or link(patch)) and backlink(index)" =>
-`( HardFailReason() | SuccessReason(patch) ) & SuccessReason(index)`` =>
-`SuccessReason(patch) & SuccessReason(index)` =>
-SuccessReason(patch, index) => right
+`( HardFailReason() | SuccessReason(page) ) & SuccessReason(index)`` =>
+`SuccessReason(page & SuccessReason(index)` =>
+SuccessReason(page, index) => right
 
 "(bugs/* and link(patch)) or backlink(index)" =>
-`( HardFailReason() & SuccessReason(patch) ) | SuccessReason(index)`` =>
+`( HardFailReason() & SuccessReason(page) ) | SuccessReason(index)`` =>
 `HardFailReason() | SuccessReason(index)` =>
 `SuccessReason(index)` => right
 
+"!bugs/* and link(patch)" =>
+`HardFailReason() | SuccessReason(bugs/foo)` =>  
+`HardFailReason()` => right
+
 #### High-level Calculation and Storage
 
 Naively calculating the full influence list for a pagespec requires trying
-- 
cgit v1.2.3


From 65d57902ca9f05b7958ea0a47b3fa3c651da89f5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 18:17:36 -0400
Subject: add sorting page

---
 doc/ikiwiki/directive/inline.mdwn |  8 ++------
 doc/ikiwiki/pagespec/sorting.mdwn | 11 +++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 doc/ikiwiki/pagespec/sorting.mdwn

diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn
index 4e087ab6c..c6a23ce3c 100644
--- a/doc/ikiwiki/directive/inline.mdwn
+++ b/doc/ikiwiki/directive/inline.mdwn
@@ -86,12 +86,8 @@ Here are some less often needed parameters:
   if raw is set to "yes", the page will be included raw, without additional
   markup around it, as if it were a literal part of the source of the 
   inlining page.
-* `sort` - Controls how inlined pages are sorted. The default, "age" is to
-  sort newest created pages first. Setting it to "title" will sort pages by
-  title, and "mtime" sorts most recently modified pages first. If
-  [[!cpan Sort::Naturally]] is installed, `sort` can be set to "title_natural"
-  to sort by title with numbers treated as such ("1 2 9 10 20" instead of
-  "1 10 2 20 9").
+* `sort` - Controls how inlined pages are [[sorted|pagespec/sorting]].
+  The default is to sort the newest created pages first.
 * `reverse` - If set to "yes", causes the sort order to be reversed.
 * `feedshow` - Specify the maximum number of matching pages to include in
   the rss/atom feeds. The default is the same as the `show` value above.
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
new file mode 100644
index 000000000..1e0366029
--- /dev/null
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -0,0 +1,11 @@
+Some [[directives|ikiwiki/directive]] that use
+[[PageSpecs|ikiwiki/pagespec]], such as [[ikiwiki/directive/inline]], allow
+specifying the order that matching pages are shown in. The following sort
+orders can be specified.
+
+* `age` - List pages from the most recently created to the oldest.
+* `mtime` - List pages with the most recently modified first.
+* `title` - Order by title.
+* `title_natural` - Only available if [[!cpan Sort::Naturally]] is
+  installed. Orders by title, but numbers in the title are treated
+  as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
-- 
cgit v1.2.3


From 32cd5f0b798c41b2320a4165c5b6ecc18a4e6e3e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 18:26:36 -0400
Subject: inline: switch to use_pagespec

Taking advantage of every single one of its features, of course.
Even had to add one more..
---
 IkiWiki/Plugin/inline.pm | 49 +++++++++++++++++++++---------------------------
 doc/plugins/write.mdwn   |  2 ++
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index be1781520..748e02df4 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -196,45 +196,37 @@ sub preprocess_inline (@) {
 		@list = map { bestlink($params{page}, $_) }
 		        split ' ', $params{pagenames};
 
+		if (yesno($params{reverse})) {
+			@list=reverse(@list);
+		}
+
 		foreach my $p (@list) {
 			add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
 		}
 	}
 	else {
-		add_depends($params{page}, $params{pages},
-			deptype($quick ? "presence" : "content"));
-
-		@list = pagespec_match_list(
-			[ grep { $_ ne $params{page} } keys %pagesources ],
-			$params{pages}, location => $params{page});
-
-		if (exists $params{sort} && $params{sort} eq 'title') {
-			@list=sort { pagetitle(basename($a)) cmp pagetitle(basename($b)) } @list;
+		my $num=0;
+		if ($params{show}) {
+			$num=$params{show};
 		}
-		elsif (exists $params{sort} && $params{sort} eq 'title_natural') {
-			eval q{use Sort::Naturally};
-			if ($@) {
-				error(gettext("Sort::Naturally needed for title_natural sort"));
-			}
-			@list=sort { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) } @list;
+		if ($params{feedshow} && $num < $params{feedshow}) {
+			$num=$params{feedshow};
 		}
-		elsif (exists $params{sort} && $params{sort} eq 'mtime') {
-			@list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list;
+		if ($params{skip}) {
+			$num+=$params{skip};
 		}
-		elsif (! exists $params{sort} || $params{sort} eq 'age') {
-			@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
-		}
-		else {
-			error sprintf(gettext("unknown sort type %s"), $params{sort});
-		}
-	}
 
-	if (yesno($params{reverse})) {
-		@list=reverse(@list);
+		@list = use_pagespec($params{page}, $params{pages},
+			deptype => deptype($quick ? "presence" : "content"),
+			limit => sub { $_[0] ne $params{page} },
+			sort => exists $params{sort} ? $params{sort} : "age",
+			reverse => yesno($params{reverse}),
+			num => $num,
+		);
 	}
 
 	if (exists $params{skip}) {
-		@list=@list[$params{skip} .. scalar @list - 1];
+		@list=@list[$params{skip} .. $#list];
 	}
 	
 	my @feedlist;
@@ -253,7 +245,8 @@ sub preprocess_inline (@) {
 	}
 
 	if ($feeds && exists $params{feedpages}) {
-		@feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
+		@feedlist = use_pagespec($params{page}, $params{feedpages},
+			list => \@feedlist);
 	}
 
 	my ($feedbase, $feednum);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 3d5650758..62bebbeed 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -647,6 +647,8 @@ Additional named parameters can be specified:
 * `reverse` if true, sorts in reverse.
 * `num` if nonzero, specifies the maximum number of matching pages that
   will be returned.
+* `list` makes it only match amoung the specified list of pages.
+  Default is to match amoung all pages in the wiki.
 
 #### `add_depends($$;$)`
 
-- 
cgit v1.2.3


From 1abbc6a4041e752fbec9b947a9d453b3b126c120 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 18:41:08 -0400
Subject: pagecount: switched to use_pagespec

---
 IkiWiki/Plugin/pagecount.pm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 419f2d535..40474b2a1 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -20,20 +20,20 @@ sub getsetup () {
 
 sub preprocess (@) {
 	my %params=@_;
-	$params{pages}="*" unless defined $params{pages};
+	my $pages=defined $params{pages} ? $params{pages} : "*";
 	
-	# Needs to update count whenever a page is added or removed, so
-	# register a presence dependency.
-	add_depends($params{page}, $params{pages}, deptype("presence"));
-	
-	my @pages;
-	if ($params{pages} eq "*") {
-		@pages=keys %pagesources;
-	}
-	else {
-		@pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
+	# Just get a list of all the pages, and count the items in it.
+	# Use a presence dependency to only update when pages are added
+	# or removed.
+
+	if ($pages eq '*') {
+		# optimisation to avoid needing to try matching every page
+		add_depends($params{page}, $pages, deptype("presence"));
+		return scalar keys %pagesources;
 	}
-	return $#pages+1;
+
+	return scalar use_pagespec($params{page}, $pages,
+		deptype => deptype("presence"));
 }
 
 1
-- 
cgit v1.2.3


From d5f014449511460d4da22591379b30bd5de86145 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 18:47:48 -0400
Subject: use_pagespec: do not fail with error when unable to match, unless it
 fails with an ErrorReason

---
 IkiWiki.pm       | 4 +++-
 t/use_pagespec.t | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c787612e1..c735b26c8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1876,7 +1876,9 @@ sub use_pagespec ($$;@) {
 		foreach my $i (keys %i) {
 			$depends_simple{$page}{lc $i} |= $i{$i};
 		}
-		error(sprintf(gettext("cannot match pages: %s"), $firstfail));
+
+		error(sprintf(gettext("cannot match pages: %s"), $firstfail))
+			if $firstfail->isa("IkiWiki::ErrorReason");
 	}
 
 	return @ret;
diff --git a/t/use_pagespec.t b/t/use_pagespec.t
index 7b904075e..92d7977cf 100755
--- a/t/use_pagespec.t
+++ b/t/use_pagespec.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 64;
+use Test::More tests => 10;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -24,7 +24,8 @@ is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 50)],
 is_deeply([use_pagespec("foo", "post/*", sort => "title",
                          limit => sub { $_[0] !~ /3/}) ],
 	["post/1", "post/2"]);
-eval { use_pagespec("foo", "beep") };
-ok($@, "fails with error when unable to match anything");
+my $r=eval { use_pagespec("foo", "beep") };
+ok(eval { use_pagespec("foo", "beep") } == 0);
+ok(! $@, "does not fail with error when unable to match anything");
 eval { use_pagespec("foo", "this is not a legal pagespec!") };
 ok($@, "fails with error when pagespec bad");
-- 
cgit v1.2.3


From 3bb00d142a4d31316fc6f0eb1277aa2fafe4dbe9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 20:27:56 -0400
Subject: Optimize away most expensive file prune calls, when refreshing

Benchmarking refresh of a a wiki with 25 thousand pages showed
file_pruned() using most of the time. But, when refreshing, ikiwiki already
knows about nearly all the files. So we can skip calling file_pruned() for
those it knows about. While tricky to do, this sped up a refresh (that
otherwise does no work) by 10-50%.
---
 IkiWiki.pm        | 17 +++++++------
 IkiWiki/Render.pm | 71 +++++++++++++++++++++++++++++--------------------------
 debian/changelog  |  2 ++
 3 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 97d84c9de..d667e7e10 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -32,7 +32,6 @@ our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
 use Memoize;
 memoize("abs2rel");
 memoize("pagespec_translate");
-memoize("file_pruned");
 memoize("template_file");
 
 sub getsetup () {
@@ -1770,14 +1769,18 @@ sub add_depends ($$) {
 	return 1;
 }
 
-sub file_pruned ($$) {
-	require File::Spec;
-	my $file=File::Spec->canonpath(shift);
-	my $base=File::Spec->canonpath(shift);
-	$file =~ s#^\Q$base\E/+##;
+sub file_pruned ($;$) {
+	my $file=shift;
+	if (@_) {
+		require File::Spec;
+		$file=File::Spec->canonpath($file);
+		my $base=File::Spec->canonpath(shift);
+		return if $file eq $base;
+		$file =~ s#^\Q$base\E/+##;
+	}
 
 	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
-	return $file =~ m/$regexp/ && $file ne $base;
+	return $file =~ m/$regexp/;
 }
 
 sub define_gettext () {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 246c2260d..a8236b954 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -279,24 +279,26 @@ sub find_src_files () {
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			$_=decode_utf8($_);
-			if (file_pruned($_, $config{srcdir})) {
+			my $file=decode_utf8($_);
+			$file=~s/^\Q$config{srcdir}\E\/?//;
+			my $page = pagename($file);
+			if (! exists $pagesources{$page} &&
+			    file_pruned($file)) {
 				$File::Find::prune=1;
+				return;
 			}
-			elsif (! -l $_ && ! -d _) {
-				my ($f)=/$config{wiki_file_regexp}/; # untaint
-				if (! defined $f) {
-					warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
-				}
-				else {
-					$f=~s/^\Q$config{srcdir}\E\/?//;
-					push @files, $f;
-					my $pagename = pagename($f);
-					if ($pages{$pagename}) {
-						debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
-					}
-					$pages{$pagename}=1;
+			return if -l $_ || -d _ || ! length $file;
+
+			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+			if (! defined $f) {
+				warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+			}
+			else {
+				push @files, $f;
+				if ($pages{$page}) {
+					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 				}
+				$pages{$page}=1;
 			}
 		},
 	}, $config{srcdir});
@@ -304,27 +306,28 @@ sub find_src_files () {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				$_=decode_utf8($_);
-				if (file_pruned($_, $dir)) {
+				my $file=decode_utf8($_);
+				$file=~s/^\Q$dir\E\/?//;
+				my $page=pagename($file);
+				if (! exists $pagesources{$page} &&
+				    file_pruned($file)) {
 					$File::Find::prune=1;
+					return;
 				}
-				elsif (! -l $_ && ! -d _) {
-					my ($f)=/$config{wiki_file_regexp}/; # untaint
-					if (! defined $f) {
-						warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
-					}
-					else {
-						$f=~s/^\Q$dir\E\/?//;
-						# avoid underlaydir
-						# override attacks; see
-						# security.mdwn
-						if (! -l "$config{srcdir}/$f" && 
-						    ! -e _) {
-						    	my $page=pagename($f);
-							if (! $pages{$page}) {
-								push @files, $f;
-								$pages{$page}=1;
-							}
+				return if -l $_ || -d _ || ! length $file;
+
+				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+				if (! defined $f) {
+					warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+				}
+				else {
+					# avoid underlaydir override
+					# attacks; see security.mdwn
+					if (! -l "$config{srcdir}/$f" && 
+					    ! -e _) {
+						if (! $pages{$page}) {
+							push @files, $f;
+							$pages{$page}=1;
 						}
 					}
 				}
diff --git a/debian/changelog b/debian/changelog
index ca5409af7..6c4353065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * mirrorlist: Display nothing if list is empty.
   * Fix a bug that could lead to duplicate links being recorded
     for tags.
+  * Optimize away most expensive file prune calls, when refreshing,
+    by only checking new files.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
-- 
cgit v1.2.3


From bc4ef28f3ebc396096b7eccad04eea6febac8d38 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 19:27:25 -0400
Subject: pagestate: switch to use_pagespec

---
 IkiWiki/Plugin/pagestats.pm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index cd0bdb085..e64f7d9c3 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -35,25 +35,27 @@ sub preprocess (@) {
 	$params{pages}="*" unless defined $params{pages};
 	my $style = ($params{style} or 'cloud');
 	
-	# Needs to update whenever a page is added or removed.
-	add_depends($params{page}, $params{pages}, deptype("presence"));
-	# Also needs to update when any page with links changes, 
-	# in case the links point to our displayed pages.
-	# (Among limits this further.)
-	add_depends($params{page}, exists $params{among} ? $params{among} : "*",
-		deptype("links")); 
-	
 	my %counts;
 	my $max = 0;
-	foreach my $page (pagespec_match_list([keys %pagesources],
-			$params{pages}, location => $params{page})) {
+	foreach my $page (use_pagespec($params{page}, $params{pages},
+	                  # update when a displayed page is added or removed
+	                  deptype => deptype("presence"))) {
 		use IkiWiki::Render;
 
 		my @backlinks = IkiWiki::backlink_pages($page);
 
 		if (exists $params{among}) {
-			@backlinks = pagespec_match_list(\@backlinks,
-				$params{among}, location => $params{page});
+			# only consider backlinks from the amoung pages
+			@backlinks = use_pagespec($params{page}, $params{among},
+				# update whenever links on those pages change
+				deptype => deptype("links"),
+				list => \@backlinks
+			);
+		}
+		else {
+			# update when any page with links changes,
+			# in case the links point to our displayed pages
+			add_depends($params{page}, "*", deptype("links"));
 		}
 
 		$counts{$page} = scalar(@backlinks);
-- 
cgit v1.2.3


From 57d04ed892588cbb49bfa81e2453e88388e67441 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 20:54:06 -0400
Subject: fix feedpages dependency

This dependency was missing before switching to use_pagespec.
It is correct to add it, but it needs to be combined with the regular
"pages" dependency to ensure that it does not match extra pages.

(Also fixed its dependency type.)
---
 IkiWiki/Plugin/inline.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 748e02df4..c02137aed 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -245,7 +245,8 @@ sub preprocess_inline (@) {
 	}
 
 	if ($feeds && exists $params{feedpages}) {
-		@feedlist = use_pagespec($params{page}, $params{feedpages},
+		@feedlist = use_pagespec($params{page}, "($params{pages}) and ($params{feedpages})",
+			deptype => deptype($quick ? "presence" : "content"),
 			list => \@feedlist);
 	}
 
-- 
cgit v1.2.3


From a198c89e8f968549416d3871bddafa831240e6b8 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Thu, 8 Oct 2009 21:09:08 -0400
Subject: Minor comment

---
 doc/todo/dependency_types.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index f06603874..d2b121d81 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -262,6 +262,8 @@ sigh.
 >>>>> like that would probably not support what you want to do.
 >>>>> --[[Joey]]
 
+>>>>>> Yes - that's what I'm talking about - I'll add some comments there.  -- [[Will]]
+
 ---- 
 
 ### Link dependencies
-- 
cgit v1.2.3


From d73c54b9a7406f4f8d23b2a36e1968bba70f1089 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Thu, 8 Oct 2009 21:30:17 -0400
Subject: comments on cycles in the dependency graph

---
 doc/bugs/transitive_dependencies.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
index 9586bc9b0..bdad67f60 100644
--- a/doc/bugs/transitive_dependencies.mdwn
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -66,3 +66,20 @@ Downsides here:
   plugins, and could be solved by adding more dependency types.)
 
 --[[Joey]] 
+
+> Some questions/comments...  I've thought about this a lot for [[todo/tracking_bugs_with_dependencies]].
+> 
+>  * When you say that anything that causes a rebuild of B is treated as a change of B, are you: i) Treating
+> any rebuild as a change, or ii) Treating any rebuild that gives a new result as a change?  Option ii) would
+> lead to fewer rebuilds.  Implementation is easy: when you're about to rebuild a page, load the old rendered html in.  Do the rebuild.  Compare
+> the new and old html.  If there is a difference, then mark that page as having changed.  If there is no difference
+> then you don't need to mark that pages as changed, even though it has been rebuilt.  (This would ignore pages in meta-data that don't
+> cause changes in html, but I don't think that is a huge issue.)
+>  * The second comment I have relates to cycles in transitive dependencies.  At the moment I don't think this is
+> possible, but with some additions it may well become so.  This could be problematic as it could lead to a)
+> updates that never complete, or b) it being theoretically unclear what the final result should be (i.e. you
+> can construct logical paradoxes in the system).  I think the point above about marking things as changed only when
+> the output actually changes fixes any cases that are well defined.  For logical paradoxes and infinite loops (e.g.
+> two pages that include each other), you might want to put a limit on the number of times you'll rebuild a page in any
+> given run of ikiwiki.  Say, only allow a page to rebuild twice on any run, regardless of whether a page it depends on changes.
+> This is not a perfect solution, but would be a good approximation. -- [[Will]]
-- 
cgit v1.2.3


From 0e2ce171c9e897b6b55d31cfeff7566f7adab7b8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 22:31:13 -0400
Subject: response

---
 doc/bugs/transitive_dependencies.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn
index bdad67f60..70b5fb4d4 100644
--- a/doc/bugs/transitive_dependencies.mdwn
+++ b/doc/bugs/transitive_dependencies.mdwn
@@ -75,6 +75,13 @@ Downsides here:
 > the new and old html.  If there is a difference, then mark that page as having changed.  If there is no difference
 > then you don't need to mark that pages as changed, even though it has been rebuilt.  (This would ignore pages in meta-data that don't
 > cause changes in html, but I don't think that is a huge issue.)
+
+>> That is a good idea. I will have to look at it to see if the overhead of
+>> reading back in the html of every page before building actually is a
+>> win though. So far, I've focused on avoiding unnecessary rebuilds, and
+>> there is still some room for more dependency types doing so.
+>> (Particularly for metadata dependencies..) --[[Joey]] 
+
 >  * The second comment I have relates to cycles in transitive dependencies.  At the moment I don't think this is
 > possible, but with some additions it may well become so.  This could be problematic as it could lead to a)
 > updates that never complete, or b) it being theoretically unclear what the final result should be (i.e. you
@@ -83,3 +90,5 @@ Downsides here:
 > two pages that include each other), you might want to put a limit on the number of times you'll rebuild a page in any
 > given run of ikiwiki.  Say, only allow a page to rebuild twice on any run, regardless of whether a page it depends on changes.
 > This is not a perfect solution, but would be a good approximation. -- [[Will]]
+
+>> Ikiwiki only builds any given output file once per run, already. --[[Joey]] 
-- 
cgit v1.2.3


From 4299f22ae8b20f3cbc23876c8fac0a0856a164c2 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Thu, 8 Oct 2009 22:36:29 -0400
Subject: Another tweak to the formal definition.

---
 doc/todo/dependency_types.mdwn | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index d2b121d81..465796135 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -339,11 +339,25 @@ can indirectly influence what pages a pagespec matches.
 > Trying to make a formal definition of this: (Note, I'm using the term sets rather than lists, but they're roughly equivalent)
 >
 >  * Let the *matching set* for a pagespec be the set of existing pages that the pagespec matches.
->  * Let a *influence set* for a pagespec be the set of all pages, *p*, whose alteration might:
+>  * Let the *assignment dependent glob matching set* for a particular assignment of True/False to the `match_()` functions of a pagespec, be the set of pages that would match if the `match_()` functions returned those true/false values.
+>  * Let the *glob matching set* be the intersection of all assignment dependent glob matching sets.  i.e. the set of pages that can match this pagespec just based on glob information, regardless of what the `match_()` functions return. 
+>  * Let the *indirect influence set* for a pagespec be the set of all pages, *p*, whose alteration might:
 >    * cause the pagespec to include or exclude a page other than *p*, or
->    * cause the pagespec to exclude *p*.
+>    * cause the pagespec to exclude *p* unless *p* is in the glob matching set.
 >
->> \[Will snipped some stuff and edited the formal definition]
+> Justification: The 'base dependency mechanism' is to compare changed pages against each pagespec.  If the page matches, then rebuild the spec.  For this comparison, creation and removal
+> of pages are both considered changes.  This base mechanism will catch:
+>
+>  * The addition of any page to the matching set through its own modification/creation
+>  * The removal of any page *that would still match if it existed* from the matching set through its own removal.  (Note: The base mechanism cannot remove a page cannot from the matching set because of that page's own modification.  If the page should be removed, then cannot match the spec after the change.)  This 'match after the change' criterion is what I tried to capture in the glob matching set above.  I think my glob matching set is slightly more restrictive than the set of pages that 'still match after the change', but more restrictive is safer than less restrictive for that set.
+>
+> The base mechanism may therefore not catch:
+>
+>  * The addition or removal of any page from the matching set through the modification/addition/removal of any other page.
+>  * The removal of any page from the matching set through its own modification/removal if it does not still match after the change.
+>
+> The indirect influence set then should handle anything that the base mechanism will not catch.
+>> At the moment the indirect influence set is a little conservative, in that the glob matching set doesn't exactly equal the set of pages that still match after the change.  It is quite hard to get this right - thoughts on tuning the glob matching set definition are welcome.  I've tried to err on the side of a longer indirect influence set, as that will make sure we do enough updates.
 >
 > --[[Will]]
 
@@ -380,10 +394,13 @@ can indirectly influence what pages a pagespec matches.
 
 #### Examples
 
-* The pagespec "created_before(foo)" has an influence list that contains foo.
+* The pagespec "created_before(foo)" has an indirect influence list that contains foo.
   The removal or (re)creation of foo changes what pages match it. Note that
   this is true even if the pagespec currently fails to match.
 
+>>> This is an annoying example.  I think the indirect influence list must contain 'foo' and all currently matching pages.  `created_before(foo)` will not match
+>>> a deleted page, and so the base mechanism would not cause a rebuild.  The removal problem strikes.  Note that the glob matching set is empty in this case. -- [[Will]]
+
 * The pagespec "foo" has an empty influence list. This is because a
   modification/creation/removal of foo directly changes what the pagespec
   matches.
@@ -402,6 +419,8 @@ can indirectly influence what pages a pagespec matches.
 >>>> pagespec, and see they used to match; and thus knows that the
 >>>> dependency has triggered.
 >>>>
+>>>>> IkiWiki can only see that they used to match if they're in the glob matching set.  -- [[Will]]
+>>>>
 >>>> Maybe the thing to do is consider this an optimisation, where such
 >>>> pages are influences, but ikiwiki is able to implicitly find them,
 >>>> so they do not need to be explicitly stored. --[[Joey]]
-- 
cgit v1.2.3


From 3be7a02e7d0a4f19ffba3566d9aedee2885387d4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 22:56:12 -0400
Subject: orphans: switch to use_pagespec

---
 IkiWiki/Plugin/orphans.pm | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 93b8ec440..607239500 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -27,24 +27,30 @@ sub preprocess (@) {
 	# since any page could link to one of the pages we're
 	# considering as orphans.
 	add_depends($params{page}, "*", deptype("links"));
-	# Also needs to update whenever potential orphans are added or
-	# removed.
-	add_depends($params{page}, $params{pages}, deptype("presence"));
 	
-	my @orphans;
-	foreach my $page (pagespec_match_list(
-			[ grep { ! IkiWiki::backlink_pages($_) && $_ ne 'index' }
-				keys %pagesources ],
-			$params{pages}, location => $params{page})) {
-		# If the page has a link to some other page, it's
-		# indirectly linked to a page via that page's backlinks.
-		next if grep { 
-			length $_ &&
-			($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) &&
-			bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
-		} @{$links{$page}};
-		push @orphans, $page;
-	}
+	my @orphans=use_pagespec($params{page}, $params{pages},
+		# update when orphans are added/removed
+		deptype => deptype("presence"),
+		limit => sub {
+			my $page=shift;
+
+			# Filter out pages that other pages link to.
+			return 0 if IkiWiki::backlink_pages($page);
+
+			# Toplevel index is assumed to never be orphaned.
+			return 0 if $page eq 'index';
+
+			# If the page has a link to some other page, it's
+			# indirectly linked via that page's backlinks.
+			return 0 if grep {
+				length $_ &&
+				($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) &&
+				bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
+			} @{$links{$page}};
+			
+			return 1;
+		},
+	);
 	
 	return gettext("All pages have other pages linking to them.") unless @orphans;
 	return "<ul>\n".
-- 
cgit v1.2.3


From 80ab1dbc121fa74fe2f021a5af2b941c743c332d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 22:56:36 -0400
Subject: postsparkline: switch to use_pagespec

Also, fixed up the dependency type for time=mtime. That has
to remain a content dependency, sadly.
---
 IkiWiki/Plugin/postsparkline.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index ea73e9180..f51e309c8 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -30,11 +30,16 @@ sub preprocess (@) {
 		return "";
 	}
 
+	my $deptype;
 	if (! exists $params{time} || $params{time} ne 'mtime') {
 		$params{timehash} = \%IkiWiki::pagectime;
+		# need to update when pages are added or removed
+		$deptype = deptype("presence");
 	}
 	else {
 		$params{timehash} = \%IkiWiki::pagemtime;
+		# need to update when pages are changed
+		$deptype = deptype("content");
 	}
 
 	if (! exists $params{formula}) {
@@ -48,12 +53,11 @@ sub preprocess (@) {
 		error gettext("unknown formula");
 	}
 
-	add_depends($params{page}, $params{pages}, deptype("presence"));
-
 	my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } 
-		pagespec_match_list(
-			[ grep { $_ ne $params{page} } keys %pagesources],
-			$params{pages}, location => $params{page});
+		use_pagespec($params{page}, $params{pages},
+			deptype => $deptype,
+			limit => sub { $_[0] ne $params{page} },
+		);
 
 	my @data=eval qq{IkiWiki::Plugin::postsparkline::formula::$formula(\\\%params, \@list)};
 	if ($@) {
-- 
cgit v1.2.3


From 6533bec35af422d2db3b5b7347e883035fea6e99 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Thu, 8 Oct 2009 22:59:34 -0400
Subject: Yet another tweak to the formal definition.  Much better this time.

---
 doc/todo/dependency_types.mdwn | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 465796135..9a031aac9 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -339,17 +339,17 @@ can indirectly influence what pages a pagespec matches.
 > Trying to make a formal definition of this: (Note, I'm using the term sets rather than lists, but they're roughly equivalent)
 >
 >  * Let the *matching set* for a pagespec be the set of existing pages that the pagespec matches.
->  * Let the *assignment dependent glob matching set* for a particular assignment of True/False to the `match_()` functions of a pagespec, be the set of pages that would match if the `match_()` functions returned those true/false values.
->  * Let the *glob matching set* be the intersection of all assignment dependent glob matching sets.  i.e. the set of pages that can match this pagespec just based on glob information, regardless of what the `match_()` functions return. 
+>  * Let the *missing document matching set* be the set of pages that would match the spec if they didn't exist. These pages may or may not currently exist.  Note that membership of this set depends upon how the `match_()` functions react to non-existant pages.
 >  * Let the *indirect influence set* for a pagespec be the set of all pages, *p*, whose alteration might:
 >    * cause the pagespec to include or exclude a page other than *p*, or
->    * cause the pagespec to exclude *p* unless *p* is in the glob matching set.
+>    * cause the pagespec to exclude *p*, unless the alteration is the removal of *p* and *p* is in the missing document matching set.
 >
 > Justification: The 'base dependency mechanism' is to compare changed pages against each pagespec.  If the page matches, then rebuild the spec.  For this comparison, creation and removal
 > of pages are both considered changes.  This base mechanism will catch:
 >
 >  * The addition of any page to the matching set through its own modification/creation
->  * The removal of any page *that would still match if it existed* from the matching set through its own removal.  (Note: The base mechanism cannot remove a page cannot from the matching set because of that page's own modification.  If the page should be removed, then cannot match the spec after the change.)  This 'match after the change' criterion is what I tried to capture in the glob matching set above.  I think my glob matching set is slightly more restrictive than the set of pages that 'still match after the change', but more restrictive is safer than less restrictive for that set.
+>  * The removal of any page *that would still match while non-existant* from the matching set through its own removal.  (Note: The base mechanism cannot remove a page cannot from the matching set because of that page's own modification (not deletion).  If the page should be removed matching set, then it obviously cannot match the spec after the change.) 
+>  * The modification (not deletion) of any page that still matches after the modification.
 >
 > The base mechanism may therefore not catch:
 >
@@ -357,7 +357,6 @@ can indirectly influence what pages a pagespec matches.
 >  * The removal of any page from the matching set through its own modification/removal if it does not still match after the change.
 >
 > The indirect influence set then should handle anything that the base mechanism will not catch.
->> At the moment the indirect influence set is a little conservative, in that the glob matching set doesn't exactly equal the set of pages that still match after the change.  It is quite hard to get this right - thoughts on tuning the glob matching set definition are welcome.  I've tried to err on the side of a longer indirect influence set, as that will make sure we do enough updates.
 >
 > --[[Will]]
 
@@ -398,8 +397,8 @@ can indirectly influence what pages a pagespec matches.
   The removal or (re)creation of foo changes what pages match it. Note that
   this is true even if the pagespec currently fails to match.
 
->>> This is an annoying example.  I think the indirect influence list must contain 'foo' and all currently matching pages.  `created_before(foo)` will not match
->>> a deleted page, and so the base mechanism would not cause a rebuild.  The removal problem strikes.  Note that the glob matching set is empty in this case. -- [[Will]]
+>>> This is an annoying example (hence well worth having :) ).  I think the indirect influence list must contain 'foo' and all currently matching pages.  `created_before(foo)` will not match
+>>> a deleted page, and so the base mechanism would not cause a rebuild.  The removal problem strikes. -- [[Will]]
 
 * The pagespec "foo" has an empty influence list. This is because a
   modification/creation/removal of foo directly changes what the pagespec
@@ -436,6 +435,9 @@ can indirectly influence what pages a pagespec matches.
   that contains index (because a change to index changes the backlinks).
   Note that this is true even if the backlink currently fails.
 
+>>> This is another interesting example.  The missing document matching set contains all links on the page index, and so
+>>> the influence list only needs to contain 'index' itself.  -- [[Will]]
+
 * The pagespec "link(done)" has an influence list that
   contains every page that it matches. A change to any matching page can
   remove a link and make it not match any more, and so the list is needed
-- 
cgit v1.2.3


From 332821144b33f42b3674240d28159124ee1a5334 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 23:24:03 -0400
Subject: calendar: rework so it can use use_pagespec

This was tricky because of the caching, and because use_pagespec always
adds a dependency. That would have made year calendars depend on the whole
pagespec, which is overly broad. So I removed the caching, format_month,
and in format_year just look at %pagesources to see if month pages are
available.

In format_month, I make it always call use_pagespec, so each month calendar
gets the right dependency and any influcences added. This means a bit more
work, but the added work is fairly minimal, and presence dependencies
remove a *lot* of work it used to do.

(100% untested!)
---
 IkiWiki/Plugin/calendar.pm | 65 ++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index c99170f92..a89175cfb 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -24,8 +24,6 @@ use IkiWiki 3.00;
 use Time::Local;
 use POSIX;
 
-my %cache;
-my %linkcache;
 my $time=time;
 my @now=localtime($time);
 
@@ -75,6 +73,23 @@ sub format_month (@) {
 	my $pyear    = $params{pyear};
 	my $nyear    = $params{nyear};
 
+	my %linkcache;
+	foreach my $p (use_pagespec($params{page}, $params{pagespec},
+				# add presence dependencies to update
+				# month calendar when pages are added/removed
+				deptype => deptype("presence"))) {
+		my $mtime = $IkiWiki::pagectime{$p};
+		my $src   = $pagesources{$p};
+		my @date  = localtime($mtime);
+		my $mday  = $date[3];
+		my $month = $date[4] + 1;
+		my $year  = $date[5] + 1900;
+		my $mtag  = sprintf("%02d", $month);
+
+		# Only one posting per day is being linked to.
+		$linkcache{"$year/$mtag/$mday"} = "$src";
+	}
+
 	my @list;
 	my $calendar="\n";
 
@@ -99,21 +114,21 @@ sub format_month (@) {
   
 	# Calculate URL's for monthly archives.
 	my ($url, $purl, $nurl)=("$monthname",'','');
-	if (exists $cache{$pagespec}{"$year/$month"}) {
+	if (exists $pagesources{"$archivebase/$year/$month"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$year/".sprintf("%02d", $month),
 			linktext => " $monthname ");
 	}
 	add_depends($params{page}, "$archivebase/$year/".sprintf("%02d", $month),
 		deptype("presence"));
-	if (exists $cache{$pagespec}{"$pyear/$pmonth"}) {
+	if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/" . sprintf("%02d", $pmonth),
 			linktext => " $pmonthname ");
 	}
 	add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth),
 		deptype("presence"));
-	if (exists $cache{$pagespec}{"$nyear/$nmonth"}) {
+	if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/" . sprintf("%02d", $nmonth),
 			linktext => " $nmonthname ");
@@ -173,7 +188,7 @@ EOF
 		
 		my $tag;
 		my $mtag = sprintf("%02d", $month);
-		if (defined $cache{$pagespec}{"$year/$mtag/$day"}) {
+		if (defined $pagesources{"$archivebase/$year/$mtag/$day"}) {
 			if ($day == $today) {
 				$tag='month-calendar-day-this-day';
 			}
@@ -210,10 +225,6 @@ EOF
 </table>
 EOF
 
-	# Add dependencies to update the calendar whenever pages
-	# matching the pagespec are added or removed.
-	add_depends($params{page}, $params{pages}, deptype("presence"));
-
 	return $calendar;
 }
 
@@ -239,19 +250,19 @@ sub format_year (@) {
 
 	# calculate URL's for previous and next years
 	my ($url, $purl, $nurl)=("$year",'','');
-	if (exists $cache{$pagespec}{"$year"}) {
+	if (exists $pagesources{"$archivebase/$year"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$year",
 			linktext => "$year");
 	}
-	add_depends($params{page}, "$archivebase/$year", deptype("presence");
-	if (exists $cache{$pagespec}{"$pyear"}) {
+	add_depends($params{page}, "$archivebase/$year", deptype("presence"));
+	if (exists $pagesources{"$archivebase/$pyear"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear",
 			linktext => "\&larr;");
 	}
 	add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
-	if (exists $cache{$pagespec}{"$nyear"}) {
+	if (exists $pagesources{"$archivebase/$nyear"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear",
 			linktext => "\&rarr;");
@@ -280,14 +291,14 @@ EOF
 		my $tag;
 		my $mtag=sprintf("%02d", $month);
 		if ($month == $params{month}) {
-			if ($cache{$pagespec}{"$year/$mtag"}) {
+			if ($pagesources{"$archivebase/$year/$mtag"}) {
 				$tag = 'this_month_link';
 			}
 			else {
 				$tag = 'this_month_nolink';
 			}
 		}
-		elsif ($cache{$pagespec}{"$year/$mtag"}) {
+		elsif ($pagesources{"$archivebase/$year/$mtag"}) {
 			$tag = 'month_link';
 		} 
 		elsif ($future_month && $month >= $future_month) {
@@ -297,7 +308,7 @@ EOF
 			$tag = 'month_nolink';
 		}
 
-		if ($cache{$pagespec}{"$year/$mtag"}) {
+		if ($pagesources{"$archivebase/$year/$mtag"}) {
 			$murl = htmllink($params{page}, $params{destpage}, 
 				"$archivebase/$year/$mtag",
 				linktext => "$monthabbr");
@@ -366,26 +377,6 @@ sub preprocess (@) {
 	$params{nyear} =$nyear;
 
 	my $calendar="\n";
-	my $pagespec=$params{pages};
-	my $page =$params{page};
-
-	if (! defined $cache{$pagespec}) {
-		foreach my $p (pagespec_match_list([keys %pagesources], $pagespec)) {
-			my $mtime = $IkiWiki::pagectime{$p};
-			my $src   = $pagesources{$p};
-			my @date  = localtime($mtime);
-			my $mday  = $date[3];
-			my $month = $date[4] + 1;
-			my $year  = $date[5] + 1900;
-			my $mtag  = sprintf("%02d", $month);
-
-			# Only one posting per day is being linked to.
-			$linkcache{"$year/$mtag/$mday"} = "$src";
-			$cache{$pagespec}{"$year"}++;
-			$cache{$pagespec}{"$year/$mtag"}++;
-			$cache{$pagespec}{"$year/$mtag/$mday"}++;
-		}
-	}
 
 	if ($params{type} =~ /month/i) {
 		$calendar=format_month(%params);
-- 
cgit v1.2.3


From 955bcea2a7bacb98cb62a38faa78b05e0f430aac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 23:48:08 -0400
Subject: fix test broken by change to failing link() influence

---
 t/pagespec_match.t | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 36fa04370..ab3fcdd4b 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -103,9 +103,9 @@ is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link"
 is(join(",", keys %i), 'foo', "created_before is influenced by the comparison page");
 %i=pagespec_match("bar", "created_after(foo)")->influences;
 is(join(",", keys %i), 'foo', "created_after is influenced by the comparison page");
-%i=pagespec_match("bar", "link(quux) and created_after(foo)")->influences;
+%i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
 is(join(",", sort keys %i), 'bar,foo', "influences add up over AND");
-%i=pagespec_match("bar", "link(quux) and created_after(foo)")->influences;
+%i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
 is(join(",", sort keys %i), 'bar,foo', "influences add up over OR");
-%i=pagespec_match("bar", "!link(quux) and !created_after(foo)")->influences;
+%i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
 is(join(",", sort keys %i), 'bar,foo', "influences unaffected by negation");
-- 
cgit v1.2.3


From 5e7b2dea84a35163b599b88efc02cd7ef3e0ad46 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 23:51:06 -0400
Subject: rename use_pagespec to pagespec_match_list

To avoid breaking plugins, also support the old pagespec_match_list
calling convention, with a deprecation warning.
---
 IkiWiki.pm                      | 183 ++++++++++++++++++----------------------
 IkiWiki/Plugin/calendar.pm      |   2 +-
 IkiWiki/Plugin/inline.pm        |   8 +-
 IkiWiki/Plugin/map.pm           |   3 +-
 IkiWiki/Plugin/orphans.pm       |   2 +-
 IkiWiki/Plugin/pagecount.pm     |   2 +-
 IkiWiki/Plugin/pagestats.pm     |   9 +-
 IkiWiki/Plugin/postsparkline.pm |   2 +-
 debian/changelog                |   6 +-
 doc/plugins/write.mdwn          |  24 ++----
 t/pagespec_match_list.t         |  31 +++++++
 t/use_pagespec.t                |  31 -------
 12 files changed, 140 insertions(+), 163 deletions(-)
 create mode 100755 t/pagespec_match_list.t
 delete mode 100755 t/use_pagespec.t

diff --git a/IkiWiki.pm b/IkiWiki.pm
index daa71059b..fd7e23524 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -17,7 +17,7 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %forcerebuild %loaded_plugins};
 
 use Exporter q{import};
-our @EXPORT = qw(hook debug error template htmlpage deptype use_pagespec
+our @EXPORT = qw(hook debug error template htmlpage deptype
                  add_depends pagespec_match pagespec_match_list bestlink
 		 htmllink readfile writefile pagetype srcfile pagename
 		 displaytime will_render gettext urlto targetpage
@@ -1798,91 +1798,6 @@ sub add_depends ($$;$) {
 	return 1;
 }
 
-sub use_pagespec ($$;@) {
-	my $page=shift;
-	my $pagespec=shift;
-	my %params=@_;
-
-	my $sub=pagespec_translate($pagespec);
-	error "syntax error in pagespec \"$pagespec\""
-		if $@ || ! defined $sub;
-
-	my @candidates;
-	if (exists $params{limit}) {
-		@candidates=grep { $params{limit}->($_) } keys %pagesources;
-	}
-	else {
-		@candidates=keys %pagesources;
-	}
-
-	if (defined $params{sort}) {
-		my $f;
-		if ($params{sort} eq 'title') {
-			$f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) };
-		}
-		elsif ($params{sort} eq 'title_natural') {
-			eval q{use Sort::Naturally};
-			if ($@) {
-				error(gettext("Sort::Naturally needed for title_natural sort"));
-			}
-			$f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) };
-                }
-		elsif ($params{sort} eq 'mtime') {
-			$f=sub { $pagemtime{$b} <=> $pagemtime{$a} };
-		}
-		elsif ($params{sort} eq 'age') {
-			$f=sub { $pagectime{$b} <=> $pagectime{$a} };
-		}
-		else {
-			error sprintf(gettext("unknown sort type %s"), $params{sort});
-		}
-		@candidates = sort { &$f } @candidates;
-	}
-
-	@candidates=reverse(@candidates) if $params{reverse};
-	
-	my @matches;
-	my $firstfail;
-	my $count=0;
-	foreach my $p (@candidates) {
-		my $r=$sub->($p, location => $page);
-		if ($r) {
-			push @matches, [$p, $r];
-			last if defined $params{num} && ++$count == $params{num};
-		}
-		elsif (! defined $firstfail) {
-			$firstfail=$r;
-		}
-	}
-	
-	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
-
-	my @ret;
-	if (@matches) {
-		# Add all influences from successful matches.
-		foreach my $m (@matches) {
-			push @ret, $m->[0];
-			my %i=$m->[1]->influences;
-			foreach my $i (keys %i) {
-				$depends_simple{$page}{lc $i} |= $i{$i};
-			}
-		}
-	}
-	elsif (defined $firstfail) {
-		# Add influences from one failure. (Which one should not
-		# matter; all should have the same influences.)
-		my %i=$firstfail->influences;
-		foreach my $i (keys %i) {
-			$depends_simple{$page}{lc $i} |= $i{$i};
-		}
-
-		error(sprintf(gettext("cannot match pages: %s"), $firstfail))
-			if $firstfail->isa("IkiWiki::ErrorReason");
-	}
-
-	return @ret;
-}
-
 sub deptype (@) {
 	my $deptype=0;
 	foreach my $type (@_) {
@@ -2055,27 +1970,95 @@ sub pagespec_match ($$;@) {
 }
 
 sub pagespec_match_list ($$;@) {
-	my $pages=shift;
-	my $spec=shift;
-	my @params=@_;
+	my $page=shift;
+	my $pagespec=shift;
+	my %params=@_;
 
-	my $sub=pagespec_translate($spec);
-	error "syntax error in pagespec \"$spec\""
+	# Backwards compatability with old calling convention.
+	if (ref $page) {
+		print STDERR "warning: a plugin (".caller().") is using pagespec_match_list in an obsolete way, and needs to be updated\n";
+		$params{list}=$page;
+		$page=$params{location}; # ugh!
+	}
+
+	my $sub=pagespec_translate($pagespec);
+	error "syntax error in pagespec \"$pagespec\""
 		if $@ || ! defined $sub;
+
+	my @candidates;
+	if (exists $params{limit}) {
+		@candidates=grep { $params{limit}->($_) } keys %pagesources;
+	}
+	else {
+		@candidates=keys %pagesources;
+	}
+
+	if (defined $params{sort}) {
+		my $f;
+		if ($params{sort} eq 'title') {
+			$f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) };
+		}
+		elsif ($params{sort} eq 'title_natural') {
+			eval q{use Sort::Naturally};
+			if ($@) {
+				error(gettext("Sort::Naturally needed for title_natural sort"));
+			}
+			$f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) };
+                }
+		elsif ($params{sort} eq 'mtime') {
+			$f=sub { $pagemtime{$b} <=> $pagemtime{$a} };
+		}
+		elsif ($params{sort} eq 'age') {
+			$f=sub { $pagectime{$b} <=> $pagectime{$a} };
+		}
+		else {
+			error sprintf(gettext("unknown sort type %s"), $params{sort});
+		}
+		@candidates = sort { &$f } @candidates;
+	}
+
+	@candidates=reverse(@candidates) if $params{reverse};
 	
-	my @ret;
-	my $r;
-	foreach my $page (@$pages) {
-		$r=$sub->($page, @params);
-		push @ret, $page if $r;
+	my @matches;
+	my $firstfail;
+	my $count=0;
+	foreach my $p (@candidates) {
+		my $r=$sub->($p, location => $page);
+		if ($r) {
+			push @matches, [$p, $r];
+			last if defined $params{num} && ++$count == $params{num};
+		}
+		elsif (! defined $firstfail) {
+			$firstfail=$r;
+		}
 	}
+	
+	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
 
-	if (! @ret && defined $r && $r->isa("IkiWiki::ErrorReason")) {
-		error(sprintf(gettext("cannot match pages: %s"), $r));
+	my @ret;
+	if (@matches) {
+		# Add all influences from successful matches.
+		foreach my $m (@matches) {
+			push @ret, $m->[0];
+			my %i=$m->[1]->influences;
+			foreach my $i (keys %i) {
+				$depends_simple{$page}{lc $i} |= $i{$i};
+			}
+		}
 	}
-	else {
-		return @ret;
+	elsif (defined $firstfail) {
+		# Add influences from one failure. (Which one should not
+		# matter; all should have the same influences.)
+		my %i=$firstfail->influences;
+		foreach my $i (keys %i) {
+			$depends_simple{$page}{lc $i} |= $i{$i};
+		}
+
+		error(sprintf(gettext("cannot match pages: %s"), $firstfail))
+			if $firstfail->isa("IkiWiki::ErrorReason");
 	}
+
+	return @ret;
 }
 
 sub pagespec_valid ($) {
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index a89175cfb..c50d038df 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -74,7 +74,7 @@ sub format_month (@) {
 	my $nyear    = $params{nyear};
 
 	my %linkcache;
-	foreach my $p (use_pagespec($params{page}, $params{pagespec},
+	foreach my $p (pagespec_match_list($params{page}, $params{pagespec},
 				# add presence dependencies to update
 				# month calendar when pages are added/removed
 				deptype => deptype("presence"))) {
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index c02137aed..815a37838 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -216,7 +216,7 @@ sub preprocess_inline (@) {
 			$num+=$params{skip};
 		}
 
-		@list = use_pagespec($params{page}, $params{pages},
+		@list = pagespec_match_list($params{page}, $params{pages},
 			deptype => deptype($quick ? "presence" : "content"),
 			limit => sub { $_[0] ne $params{page} },
 			sort => exists $params{sort} ? $params{sort} : "age",
@@ -245,9 +245,11 @@ sub preprocess_inline (@) {
 	}
 
 	if ($feeds && exists $params{feedpages}) {
-		@feedlist = use_pagespec($params{page}, "($params{pages}) and ($params{feedpages})",
+		@feedlist = pagespec_match_list(
+			$params{page}, "($params{pages}) and ($params{feedpages})",
 			deptype => deptype($quick ? "presence" : "content"),
-			list => \@feedlist);
+			list => \@feedlist,
+		);
 	}
 
 	my ($feedbase, $feednum);
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 634b0e4d6..788b96827 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -36,7 +36,8 @@ sub preprocess (@) {
 
 	# Get all the items to map.
 	my %mapitems;
-	foreach my $page (use_pagespec($params{page}, $params{pages}, deptype => $deptype)) {
+	foreach my $page (pagespec_match_list($params{page}, $params{pages},
+					deptype => $deptype)) {
 		if (exists $params{show} && 
 		    exists $pagestate{$page} &&
 		    exists $pagestate{$page}{meta}{$params{show}}) {
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 607239500..b1ebd1b9d 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -28,7 +28,7 @@ sub preprocess (@) {
 	# considering as orphans.
 	add_depends($params{page}, "*", deptype("links"));
 	
-	my @orphans=use_pagespec($params{page}, $params{pages},
+	my @orphans=pagespec_match_list($params{page}, $params{pages},
 		# update when orphans are added/removed
 		deptype => deptype("presence"),
 		limit => sub {
diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 40474b2a1..8d36f057e 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -32,7 +32,7 @@ sub preprocess (@) {
 		return scalar keys %pagesources;
 	}
 
-	return scalar use_pagespec($params{page}, $pages,
+	return scalar pagespec_match_list($params{page}, $pages,
 		deptype => deptype("presence"));
 }
 
diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index e64f7d9c3..47638210a 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -37,16 +37,17 @@ sub preprocess (@) {
 	
 	my %counts;
 	my $max = 0;
-	foreach my $page (use_pagespec($params{page}, $params{pages},
-	                  # update when a displayed page is added or removed
-	                  deptype => deptype("presence"))) {
+	foreach my $page (pagespec_match_list($params{page}, $params{pages},
+		                  # update when a displayed page is added/removed
+	        	          deptype => deptype("presence"))) {
 		use IkiWiki::Render;
 
 		my @backlinks = IkiWiki::backlink_pages($page);
 
 		if (exists $params{among}) {
 			# only consider backlinks from the amoung pages
-			@backlinks = use_pagespec($params{page}, $params{among},
+			@backlinks = pagespec_match_list(
+				$params{page}, $params{among},
 				# update whenever links on those pages change
 				deptype => deptype("links"),
 				list => \@backlinks
diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index f51e309c8..1d4532366 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -54,7 +54,7 @@ sub preprocess (@) {
 	}
 
 	my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } 
-		use_pagespec($params{page}, $params{pages},
+		pagespec_match_list($params{page}, $params{pages},
 			deptype => $deptype,
 			limit => sub { $_[0] ne $params{page} },
 		);
diff --git a/debian/changelog b/debian/changelog
index 3a6fdf77d..49809e6cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,9 +33,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
     info.
   * Plugins providing PageSpec `match_*` functions should pass additional
     influence information when creating result objects.
-  * Added `use_pagespec` function, that plugins can use to find a list
-    of matching pages and add dependencies and influences, all at once,
-    and efficiently.
+  * API change: `pagespec_match_list` has completly changed its interface.
+    The old interface will be removed soon, and a warning will be printed
+    if any plugins try to use it.
   * Optimize away most expensive file prune calls, when refreshing,
     by only checking new files.
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 62bebbeed..f6ea76c36 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -625,16 +625,16 @@ dependency type from one or more of these keywords:
 
 If multiple types are specified, they are combined.
 
-#### `use_pagespec($$;@)`
+#### `pagespec_match_list($$;@)`
 
 Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages
 in the wiki that match the [[ikiwiki/PageSpec]]. 
 
 The page will automatically be made to depend on the specified
 [[ikiwiki/PageSpec]], so `add_depends` does not need to be called. This
-is significantly more efficient than calling `add_depends`
-followed by `pagespec_match_list`. You should use this anytime a plugin
-needs to match a set of pages and generate something based on that list.
+is significantly more efficient than calling `add_depends` and
+`pagespec_match` in a loop. You should use this anytime a plugin
+needs to match a set of pages and do something based on that list.
 
 Additional named parameters can be specified:
 
@@ -650,6 +650,9 @@ Additional named parameters can be specified:
 * `list` makes it only match amoung the specified list of pages.
   Default is to match amoung all pages in the wiki.
 
+Unlike pagespec_match, this may throw an error if there is an error in
+the pagespec.
+
 #### `add_depends($$;$)`
 
 Makes the specified page depend on the specified [[ikiwiki/PageSpec]].
@@ -672,19 +675,6 @@ The most often used is "location", which specifies the location the
 PageSpec should match against. If not passed, relative PageSpecs will match
 relative to the top of the wiki.
 
-#### `pagespec_match_list($$;@)`
-
-Passed a reference to a list of page names, and [[ikiwiki/PageSpec]],
-returns the set of pages that match the [[ikiwiki/PageSpec]].
-
-Additional named parameters can be passed, to further limit the match.
-The most often used is "location", which specifies the location the
-PageSpec should match against. If not passed, relative PageSpecs will match
-relative to the top of the wiki.
-
-Unlike pagespec_match, this may throw an error if there is an error in
-the pagespec.
-
 #### `bestlink($$)`
 
 Given a page and the text of a link on the page, determine which
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
new file mode 100755
index 000000000..85a30b542
--- /dev/null
+++ b/t/pagespec_match_list.t
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 10;
+
+BEGIN { use_ok("IkiWiki"); }
+
+%pagesources=(
+	foo => "foo.mdwn",
+	bar => "bar.mdwn",
+	"post/1" => "post/1.mdwn",
+	"post/2" => "post/2.mdwn",
+	"post/3" => "post/3.mdwn",
+);
+
+is_deeply([pagespec_match_list("foo", "bar")], ["bar"]);
+is_deeply([sort(pagespec_match_list("foo", "post/*"))], ["post/1", "post/2", "post/3"]);
+is_deeply([pagespec_match_list("foo", "post/*", sort => "title", reverse => 1)],
+	["post/3", "post/2", "post/1"]);
+is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 2)],
+	["post/1", "post/2"]);
+is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50)],
+	["post/1", "post/2", "post/3"]);
+is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
+                         limit => sub { $_[0] !~ /3/}) ],
+	["post/1", "post/2"]);
+my $r=eval { pagespec_match_list("foo", "beep") };
+ok(eval { pagespec_match_list("foo", "beep") } == 0);
+ok(! $@, "does not fail with error when unable to match anything");
+eval { pagespec_match_list("foo", "this is not a legal pagespec!") };
+ok($@, "fails with error when pagespec bad");
diff --git a/t/use_pagespec.t b/t/use_pagespec.t
deleted file mode 100755
index 92d7977cf..000000000
--- a/t/use_pagespec.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use Test::More tests => 10;
-
-BEGIN { use_ok("IkiWiki"); }
-
-%pagesources=(
-	foo => "foo.mdwn",
-	bar => "bar.mdwn",
-	"post/1" => "post/1.mdwn",
-	"post/2" => "post/2.mdwn",
-	"post/3" => "post/3.mdwn",
-);
-
-is_deeply([use_pagespec("foo", "bar")], ["bar"]);
-is_deeply([sort(use_pagespec("foo", "post/*"))], ["post/1", "post/2", "post/3"]);
-is_deeply([use_pagespec("foo", "post/*", sort => "title", reverse => 1)],
-	["post/3", "post/2", "post/1"]);
-is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 2)],
-	["post/1", "post/2"]);
-is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 50)],
-	["post/1", "post/2", "post/3"]);
-is_deeply([use_pagespec("foo", "post/*", sort => "title",
-                         limit => sub { $_[0] !~ /3/}) ],
-	["post/1", "post/2"]);
-my $r=eval { use_pagespec("foo", "beep") };
-ok(eval { use_pagespec("foo", "beep") } == 0);
-ok(! $@, "does not fail with error when unable to match anything");
-eval { use_pagespec("foo", "this is not a legal pagespec!") };
-ok($@, "fails with error when pagespec bad");
-- 
cgit v1.2.3


From c11b3af189059efc91d28cda7e8c5a893d004cb2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 23:55:50 -0400
Subject: typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 49809e6cf..5ff8e4ac5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,7 +36,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * API change: `pagespec_match_list` has completly changed its interface.
     The old interface will be removed soon, and a warning will be printed
     if any plugins try to use it.
-  * Optimize away most expensive file prune calls, when refreshing,
+  * Optimize away most expensive file prune checks, when refreshing,
     by only checking new files.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
-- 
cgit v1.2.3


From fb3fd6b60fb584d8c1c0f76253d53633127afb18 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 00:06:08 -0400
Subject: don't link to inline, not available when directives underlay is not
 enabled

---
 doc/ikiwiki/pagespec/sorting.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 1e0366029..41aa58151 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -1,5 +1,5 @@
 Some [[directives|ikiwiki/directive]] that use
-[[PageSpecs|ikiwiki/pagespec]], such as [[ikiwiki/directive/inline]], allow
+[[PageSpecs|ikiwiki/pagespec]] allow
 specifying the order that matching pages are shown in. The following sort
 orders can be specified.
 
-- 
cgit v1.2.3


From fa82be552452ffcd554fcd6af5aa94ff3cf90ac5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 00:06:40 -0400
Subject: add pagespec/sorting to underlay

---
 underlays/basewiki/ikiwiki/pagespec/sorting.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 underlays/basewiki/ikiwiki/pagespec/sorting.mdwn

diff --git a/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn b/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn
new file mode 100644
index 000000000..41aa58151
--- /dev/null
+++ b/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn
@@ -0,0 +1,11 @@
+Some [[directives|ikiwiki/directive]] that use
+[[PageSpecs|ikiwiki/pagespec]] allow
+specifying the order that matching pages are shown in. The following sort
+orders can be specified.
+
+* `age` - List pages from the most recently created to the oldest.
+* `mtime` - List pages with the most recently modified first.
+* `title` - Order by title.
+* `title_natural` - Only available if [[!cpan Sort::Naturally]] is
+  installed. Orders by title, but numbers in the title are treated
+  as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
-- 
cgit v1.2.3


From 34b213235529300c8be19290cefb1e5a01e2da3a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 00:06:58 -0400
Subject: fix test to use new calling convention

This test still fails several cases, since add_depends influence testing is
currently commented out.
---
 t/add_depends.t | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/t/add_depends.t b/t/add_depends.t
index 9f426187b..fce7a76c6 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -31,15 +31,15 @@ ok($IkiWiki::depends_simple{foo0}{"bar"} & $IkiWiki::DEPEND_CONTENT);
 ok(! ($IkiWiki::depends_simple{foo0}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
 
 # adding other dep types standalone
-ok(add_depends("foo2", "*", presence => 1));
-ok(add_depends("foo2", "bar", links => 1));
+ok(add_depends("foo2", "*", deptype("presence")));
+ok(add_depends("foo2", "bar", deptype("links")));
 ok($IkiWiki::depends{foo2}{"*"} & $IkiWiki::DEPEND_PRESENCE);
 ok(! ($IkiWiki::depends{foo2}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 ok($IkiWiki::depends_simple{foo2}{"bar"} & $IkiWiki::DEPEND_LINKS);
 ok(! ($IkiWiki::depends_simple{foo2}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
 
 # adding combined dep types
-ok(add_depends("foo2", "baz", links => 1, presence => 1));
+ok(add_depends("foo2", "baz", deptype("links". "presence")));
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_LINKS);
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_PRESENCE);
 ok(! ($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_CONTENT));
@@ -49,10 +49,10 @@ ok(add_depends("foo2", "baz"));
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_LINKS);
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_PRESENCE);
 ok(($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_CONTENT));
-ok(add_depends("foo2", "bar", presence => 1)); # had only links before
+ok(add_depends("foo2", "bar", deptype("presence"))); # had only links before
 ok($IkiWiki::depends_simple{foo2}{"bar"} & ($IkiWiki::DEPEND_LINKS | $IkiWiki::DEPEND_PRESENCE));
 ok(! ($IkiWiki::depends_simple{foo2}{"bar"} & $IkiWiki::DEPEND_CONTENT));
-ok(add_depends("foo0", "bar", links => 1)); # had only content before
+ok(add_depends("foo0", "bar", deptype("links"))); # had only content before
 ok($IkiWiki::depends{foo0}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS));
 ok(! ($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_PRESENCE));
 
@@ -60,11 +60,11 @@ ok(! ($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_PRESENCE));
 # as an explicit dependency. In the case of a link, a links dependency.
 $links{foo0}=$links{foo9}=[qw{bar baz}];
 foreach my $spec ("* and ! link(bar)", "* or link(bar)") {
-	ok(add_depends("foo3", $spec, presence => 1));
+	ok(add_depends("foo3", $spec, deptype("presence")));
 	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo4", $spec, links => 1));
+	ok(add_depends("foo4", $spec, deptype("links")));
 	ok($IkiWiki::depends{foo4}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo4}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
 	ok($IkiWiki::depends_simple{foo4}{foo4} == $IkiWiki::DEPEND_LINKS);
@@ -73,15 +73,15 @@ foreach my $spec ("* and ! link(bar)", "* or link(bar)") {
 # a pagespec with backlinks() will add as an influence the page with the links
 $links{foo0}=[qw{foo5 foo7}];
 foreach my $spec ("bugs or (backlink(foo0) and !*.png)", "backlink(foo)") {
-	ok(add_depends("foo5", $spec, presence => 1));
+	ok(add_depends("foo5", $spec, deptype("presence")));
 	ok($IkiWiki::depends{foo5}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo5}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo6", $spec, links => 1));
+	ok(add_depends("foo6", $spec, deptype("links")));
 	ok($IkiWiki::depends{foo6}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo6}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
 	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo7", $spec, presence => 1, links => 1));
+	ok(add_depends("foo7", $spec, deptype("presence", "links")));
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_CONTENT));
@@ -93,6 +93,6 @@ foreach my $spec ("bugs or (backlink(foo0) and !*.png)", "backlink(foo)") {
 }
 
 # content is the default if unknown types are entered
-ok(add_depends("foo9", "*", presenCe => 1));
+ok(add_depends("foo9", "*", deptype("monkey")));
 ok($IkiWiki::depends{foo9}{"*"} & $IkiWiki::DEPEND_CONTENT);
 ok(! ($IkiWiki::depends{foo9}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-- 
cgit v1.2.3


From c791f84fb54c723e3bb488a5099e435a64d1c8b0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 12:35:41 -0400
Subject: linkmap: Use new pagespec_match_list

---
 IkiWiki/Plugin/linkmap.pm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 28e4cfa13..9540bd112 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -28,10 +28,6 @@ sub preprocess (@) {
 
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a relevant page is added, or removed, or
-	# its links change.
-	add_depends($params{page}, $params{pages}, deptype("presence", "links"));
-	
 	# Can't just return the linkmap here, since the htmlscrubber
 	# scrubs out all <object> tags (with good reason!)
 	# Instead, insert a placeholder tag, which will be expanded during
@@ -55,12 +51,11 @@ sub genmap ($) {
 	my %params=%{$maps{$mapnum}};
 
 	# Get all the items to map.
-	my %mapitems = ();
-	foreach my $item (keys %pagesources) {
-		if (pagespec_match($item, $params{pages}, location => $params{page})) {
-			$mapitems{$item}=urlto($item, $params{destpage});
-		}
-	}
+	my %mapitems = map { $_ => urlto($_, $params{destpage}) }
+		pagespec_match_list($params{page}, $params{pages},
+			# update when a page is added or removed, or its
+			# links change
+			deptype => deptype("presence", "links"));
 
 	my $dest=$params{page}."/linkmap.png";
 
-- 
cgit v1.2.3


From 96682e3084993428f4de384f5087cffdc29f1710 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 12:48:16 -0400
Subject: progress: switch to new pagespec_match_list

---
 IkiWiki/Plugin/progress.pm | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 6da3e4f71..fe64b40b1 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -36,16 +36,12 @@ sub preprocess (@) {
 		$fill.="%";
 	}
 	elsif (defined $params{totalpages} and defined $params{donepages}) {
-		add_depends($params{page}, $params{totalpages}, deptype("presence"));
-		add_depends($params{page}, $params{donepages}, deptype("presence"));
-
-		my @pages=keys %pagesources;
-		my $totalcount=0;
-		my $donecount=0;
-		foreach my $page (@pages) {
-			$totalcount++ if pagespec_match($page, $params{totalpages}, location => $params{page});
-			$donecount++ if pagespec_match($page, $params{donepages}, location => $params{page});
-		}
+		my $totalcount=pagespec_match_list(
+			$params{page}, $params{totalpages},
+			deptype => deptype("presence"));
+		my $donecount=pagespec_match_list(
+			$params{page}, $params{donepages},
+			deptype => deptype("presence"));
 		
 		if ($totalcount == 0) {
 			$fill = "100%";
-- 
cgit v1.2.3


From b7351daacd0d4a041a51b43d99b7bf589de54f53 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 12:54:13 -0400
Subject: conditional: use yesno

---
 IkiWiki.pm                    | 2 +-
 IkiWiki/Plugin/conditional.pm | 2 +-
 t/yesno.t                     | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index fd7e23524..475e278c3 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1792,7 +1792,7 @@ sub add_depends ($$;$) {
 	#		$depends_simple{$page}{lc $i} |= $i{$i};
 	#	}
 	#}
-	print STDERR "warning: use of add_depends; influences not tracked\n";
+	print STDERR "warning: use of add_depends by ".caller()."; influences not tracked\n";
 
 	$depends{$page}{$pagespec} |= $deptype;
 	return 1;
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 7445dbdad..7ead701f2 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -29,7 +29,7 @@ sub preprocess_if (@) {
 	}
 
 	my $result=0;
-	if ((exists $params{all} && lc $params{all} eq "no") ||
+	if (! IkiWiki::yesno($params{all}) ||
 		# An optimisation to avoid needless looping over every page
 		# and adding of dependencies for simple uses of some of the
 		# tests.
diff --git a/t/yesno.t b/t/yesno.t
index 60a8c071d..8770390a1 100755
--- a/t/yesno.t
+++ b/t/yesno.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 10;
+use Test::More tests => 11;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -19,3 +19,5 @@ ok(IkiWiki::yesno("NO") == 0);
 ok(IkiWiki::yesno("1") == 1);
 ok(IkiWiki::yesno("0") == 0);
 ok(IkiWiki::yesno("mooooooooooo") == 0);
+
+ok(IkiWiki::yesno(undef) == 0);
-- 
cgit v1.2.3


From c7da9911580e9311981758922d354aea03b8074c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:02:03 -0400
Subject: indentation

---
 IkiWiki/Plugin/conditional.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 7ead701f2..bc7b8974d 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -30,10 +30,10 @@ sub preprocess_if (@) {
 
 	my $result=0;
 	if (! IkiWiki::yesno($params{all}) ||
-		# An optimisation to avoid needless looping over every page
-		# and adding of dependencies for simple uses of some of the
-		# tests.
-		$params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
+	    # An optimisation to avoid needless looping over every page
+	    # and adding of dependencies for simple uses of some of the
+	    # tests.
+	    $params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
 		add_depends($params{page}, "($params{test}) and $params{page}");
 		$result=pagespec_match($params{page}, $params{test},
 				location => $params{page},
-- 
cgit v1.2.3


From 769b78df078d0287a10166ce828941a491858ff2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:02:10 -0400
Subject: pagespec_match_list allow additional pagespec limit parameters again

---
 IkiWiki.pm             | 12 ++++++++----
 doc/plugins/write.mdwn |  7 +++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 475e278c3..f959d868b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2019,21 +2019,25 @@ sub pagespec_match_list ($$;@) {
 
 	@candidates=reverse(@candidates) if $params{reverse};
 	
+	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
+	
+	# clear params, remainder is passed to pagespec
+	my $num=$params{num};
+	delete @params{qw{num deptype reverse sort limit}};
+	
 	my @matches;
 	my $firstfail;
 	my $count=0;
 	foreach my $p (@candidates) {
-		my $r=$sub->($p, location => $page);
+		my $r=$sub->($p, %params, location => $page);
 		if ($r) {
 			push @matches, [$p, $r];
-			last if defined $params{num} && ++$count == $params{num};
+			last if defined $num && ++$count == $num;
 		}
 		elsif (! defined $firstfail) {
 			$firstfail=$r;
 		}
 	}
-	
-	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
 
 	my @ret;
 	if (@matches) {
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index f6ea76c36..9661bf4de 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -636,6 +636,9 @@ is significantly more efficient than calling `add_depends` and
 `pagespec_match` in a loop. You should use this anytime a plugin
 needs to match a set of pages and do something based on that list.
 
+Unlike pagespec_match, this may throw an error if there is an error in
+the pagespec.
+
 Additional named parameters can be specified:
 
 * `deptype` optionally specifies the type of dependency to add. Use the
@@ -650,8 +653,8 @@ Additional named parameters can be specified:
 * `list` makes it only match amoung the specified list of pages.
   Default is to match amoung all pages in the wiki.
 
-Unlike pagespec_match, this may throw an error if there is an error in
-the pagespec.
+Any other named parameters are passed on to `pagespec_match`, to further
+limit the match.
 
 #### `add_depends($$;$)`
 
-- 
cgit v1.2.3


From f9f7a6e9f34b120504bb1dc238a3a627e9a8e3dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:07:50 -0400
Subject: conditional: use pagespec_match_list

---
 IkiWiki/Plugin/conditional.pm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index bc7b8974d..aad617812 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -31,8 +31,7 @@ sub preprocess_if (@) {
 	my $result=0;
 	if (! IkiWiki::yesno($params{all}) ||
 	    # An optimisation to avoid needless looping over every page
-	    # and adding of dependencies for simple uses of some of the
-	    # tests.
+	    # for simple uses of some of the tests.
 	    $params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
 		add_depends($params{page}, "($params{test}) and $params{page}");
 		$result=pagespec_match($params{page}, $params{test},
@@ -41,17 +40,12 @@ sub preprocess_if (@) {
 				destpage => $params{destpage});
 	}
 	else {
-		add_depends($params{page}, $params{test});
-
-		foreach my $page (keys %pagesources) {
-			if (pagespec_match($page, $params{test}, 
-					location => $params{page},
-					sourcepage => $params{page},
-					destpage => $params{destpage})) {
-				$result=1;
-				last;
-			}
-		}
+		$result=pagespec_match_list($params{page}, $params{test},
+			# stop after first match
+			num => 1,
+			sourcepage => $params{page},
+			destpage => $params{destpage},
+		);
 	}
 
 	my $ret;
-- 
cgit v1.2.3


From 6f2cc5ac8cc7e76b3faf20cd7516f82bcb3de7ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:20:41 -0400
Subject: pagespec_match_list: change limit to filter

---
 IkiWiki.pm                      |  6 +++---
 IkiWiki/Plugin/inline.pm        |  2 +-
 IkiWiki/Plugin/orphans.pm       | 10 +++++-----
 IkiWiki/Plugin/postsparkline.pm |  2 +-
 doc/plugins/write.mdwn          |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index f959d868b..49c76c4d4 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1986,8 +1986,8 @@ sub pagespec_match_list ($$;@) {
 		if $@ || ! defined $sub;
 
 	my @candidates;
-	if (exists $params{limit}) {
-		@candidates=grep { $params{limit}->($_) } keys %pagesources;
+	if (exists $params{filter}) {
+		@candidates=grep { ! $params{filter}->($_) } keys %pagesources;
 	}
 	else {
 		@candidates=keys %pagesources;
@@ -2023,7 +2023,7 @@ sub pagespec_match_list ($$;@) {
 	
 	# clear params, remainder is passed to pagespec
 	my $num=$params{num};
-	delete @params{qw{num deptype reverse sort limit}};
+	delete @params{qw{num deptype reverse sort filter}};
 	
 	my @matches;
 	my $firstfail;
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 815a37838..0fe0bd2e1 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -218,7 +218,7 @@ sub preprocess_inline (@) {
 
 		@list = pagespec_match_list($params{page}, $params{pages},
 			deptype => deptype($quick ? "presence" : "content"),
-			limit => sub { $_[0] ne $params{page} },
+			filter => sub { $_[0] eq $params{page} },
 			sort => exists $params{sort} ? $params{sort} : "age",
 			reverse => yesno($params{reverse}),
 			num => $num,
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index b1ebd1b9d..702943f87 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -31,24 +31,24 @@ sub preprocess (@) {
 	my @orphans=pagespec_match_list($params{page}, $params{pages},
 		# update when orphans are added/removed
 		deptype => deptype("presence"),
-		limit => sub {
+		filter => sub {
 			my $page=shift;
 
 			# Filter out pages that other pages link to.
-			return 0 if IkiWiki::backlink_pages($page);
+			return 1 if IkiWiki::backlink_pages($page);
 
 			# Toplevel index is assumed to never be orphaned.
-			return 0 if $page eq 'index';
+			return 1 if $page eq 'index';
 
 			# If the page has a link to some other page, it's
 			# indirectly linked via that page's backlinks.
-			return 0 if grep {
+			return 1 if grep {
 				length $_ &&
 				($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) &&
 				bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
 			} @{$links{$page}};
 			
-			return 1;
+			return 0;
 		},
 	);
 	
diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 1d4532366..0d5a12e33 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -56,7 +56,7 @@ sub preprocess (@) {
 	my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } 
 		pagespec_match_list($params{page}, $params{pages},
 			deptype => $deptype,
-			limit => sub { $_[0] ne $params{page} },
+			filter => sub { $_[0] eq $params{page} },
 		);
 
 	my @data=eval qq{IkiWiki::Plugin::postsparkline::formula::$formula(\\\%params, \@list)};
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 9661bf4de..2254d7025 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -643,8 +643,8 @@ Additional named parameters can be specified:
 
 * `deptype` optionally specifies the type of dependency to add. Use the
   `deptype` function to generate a dependency type.
-* `limit` is a reference to a function, that is called and passed a page,
-  and must return true for the page to be included.
+* `filter` is a reference to a function, that is called and passed a page,
+  and returns true if the page should be filtered out of the list.
 * `sort` specifies a sort order for the list. See
   [[ikiwiki/PageSpec/sorting]] for the avilable sort methods.
 * `reverse` if true, sorts in reverse.
-- 
cgit v1.2.3


From 3807aa298cc3a6ad7fbb39c3ff13fd5916a5c469 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:28:41 -0400
Subject: fix pagespec_match_list handling of list parameter

---
 IkiWiki.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 49c76c4d4..232d3e77b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1986,11 +1986,15 @@ sub pagespec_match_list ($$;@) {
 		if $@ || ! defined $sub;
 
 	my @candidates;
-	if (exists $params{filter}) {
-		@candidates=grep { ! $params{filter}->($_) } keys %pagesources;
+	if (exists $params{list}) {
+		@candidates=exists $params{filter}
+			? grep { ! $params{filter}->($_) } @{$params{list}}
+			: @{$params{list}};
 	}
 	else {
-		@candidates=keys %pagesources;
+		@candidates=exists $params{filter}
+			? grep { ! $params{filter}->($_) } keys %pagesources
+			: keys %pagesources;
 	}
 
 	if (defined $params{sort}) {
@@ -2023,7 +2027,7 @@ sub pagespec_match_list ($$;@) {
 	
 	# clear params, remainder is passed to pagespec
 	my $num=$params{num};
-	delete @params{qw{num deptype reverse sort filter}};
+	delete @params{qw{num deptype reverse sort filter list}};
 	
 	my @matches;
 	my $firstfail;
-- 
cgit v1.2.3


From e0b0b57211e8fe609c09a37605a21f42a6d734d3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:33:49 -0400
Subject: fix link

---
 doc/translation.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/translation.mdwn b/doc/translation.mdwn
index d869a6821..9d874d98e 100644
--- a/doc/translation.mdwn
+++ b/doc/translation.mdwn
@@ -23,7 +23,7 @@ essentially three pieces needed for a complete translation:
      file, and in preprocessor directives.
 
 1. The [[basewiki]] needs to be translated. The
-   [[plugins/contrib/po]] ikiwiki plugin will allow translating
+   [[plugins/po]] ikiwiki plugin will allow translating
    wikis using po files and can be used for this.
 
    There is now a website, [l10n.ikiwiki.info](http://l10n.ikiwiki.info)
-- 
cgit v1.2.3


From 1b6b1ee2d8f2e148bca301b177713ca35d2b8691 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:35:11 -0400
Subject: brokenlinks: use pagespec_match_list

---
 IkiWiki/Plugin/brokenlinks.pm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 62a0a42f4..8ee734bf9 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -23,18 +23,15 @@ sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever the links on a page change.
-	add_depends($params{page}, $params{pages}, deptype("links"));
-	
 	my @broken;
 	foreach my $link (keys %IkiWiki::brokenlinks) {
 		next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion};
 
-		my @pages;
-		foreach my $page (@{$IkiWiki::brokenlinks{$link}}) {
-			push @pages, $page
-				if pagespec_match($page, $params{pages}, location => $params{page});
-		}
+		my @pages=pagespec_match_list($params{page}, $params{pages},
+			list => $IkiWiki::brokenlinks{$link},
+			# needs to update when links on a page change
+			deptype => deptype("links")
+		);
 		next unless @pages;
 
 		my $page=$IkiWiki::brokenlinks{$link}->[0];
-- 
cgit v1.2.3


From c5e237c0135e28f3399830abcbdae844d3006a84 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:37:06 -0400
Subject: img: use presence dependency when linking to a page

---
 IkiWiki/Plugin/img.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index e2f541506..32023fa97 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -170,7 +170,7 @@ sub preprocess (@) {
 		my $b = bestlink($params{page}, $params{link});
 	
 		if (length $b) {
-			add_depends($params{page}, $b);
+			add_depends($params{page}, $b, deptype("presence"));
 			$imgtag=htmllink($params{page}, $params{destpage},
 				$params{link}, linktext => $imgtag,
 				noimageinline => 1);
-- 
cgit v1.2.3


From 9eb229bfc73066e5d12d5a199c77f63d5881dfb7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 14:05:22 -0400
Subject: move influence tests to pagespec_match_list.t

---
 t/add_depends.t         | 36 ------------------------------
 t/pagespec_match_list.t | 58 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/t/add_depends.t b/t/add_depends.t
index fce7a76c6..e3f0b6603 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -56,42 +56,6 @@ ok(add_depends("foo0", "bar", deptype("links"))); # had only content before
 ok($IkiWiki::depends{foo0}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS));
 ok(! ($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_PRESENCE));
 
-# Adding a pagespec that requires page metadata should add the influence
-# as an explicit dependency. In the case of a link, a links dependency.
-$links{foo0}=$links{foo9}=[qw{bar baz}];
-foreach my $spec ("* and ! link(bar)", "* or link(bar)") {
-	ok(add_depends("foo3", $spec, deptype("presence")));
-	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_PRESENCE);
-	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo4", $spec, deptype("links")));
-	ok($IkiWiki::depends{foo4}{$spec} & $IkiWiki::DEPEND_LINKS);
-	ok(! ($IkiWiki::depends{foo4}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
-	ok($IkiWiki::depends_simple{foo4}{foo4} == $IkiWiki::DEPEND_LINKS);
-}
-
-# a pagespec with backlinks() will add as an influence the page with the links
-$links{foo0}=[qw{foo5 foo7}];
-foreach my $spec ("bugs or (backlink(foo0) and !*.png)", "backlink(foo)") {
-	ok(add_depends("foo5", $spec, deptype("presence")));
-	ok($IkiWiki::depends{foo5}{$spec} & $IkiWiki::DEPEND_PRESENCE);
-	ok(! ($IkiWiki::depends{foo5}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo6", $spec, deptype("links")));
-	ok($IkiWiki::depends{foo6}{$spec} & $IkiWiki::DEPEND_LINKS);
-	ok(! ($IkiWiki::depends{foo6}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
-	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo7", $spec, deptype("presence", "links")));
-	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE);
-	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_LINKS);
-	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_CONTENT));
-	ok($IkiWiki::depends_simple{foo7}{foo0} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo8", $spec));
-	ok($IkiWiki::depends{foo8}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok(! ($IkiWiki::depends{foo8}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo8}{foo0} == $IkiWiki::DEPEND_LINKS);
-}
-
 # content is the default if unknown types are entered
 ok(add_depends("foo9", "*", deptype("monkey")));
 ok($IkiWiki::depends{foo9}{"*"} & $IkiWiki::DEPEND_CONTENT);
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 85a30b542..301197cc1 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,19 +1,29 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 10;
+use Test::More tests => 49;
 
 BEGIN { use_ok("IkiWiki"); }
 
+%config=IkiWiki::defaultconfig();
+$config{srcdir}=$config{destdir}="/dev/null";
+IkiWiki::checkconfig();
+
 %pagesources=(
 	foo => "foo.mdwn",
+	foo2 => "foo2.mdwn",
+	foo3 => "foo3.mdwn",
 	bar => "bar.mdwn",
 	"post/1" => "post/1.mdwn",
 	"post/2" => "post/2.mdwn",
 	"post/3" => "post/3.mdwn",
 );
+$links{foo}=[qw{post/1 post/2}];
+$links{foo2}=[qw{bar}];
+$links{foo3}=[qw{bar}];
 
 is_deeply([pagespec_match_list("foo", "bar")], ["bar"]);
+is_deeply([sort(pagespec_match_list("foo", "* and !post/*"))], ["bar", "foo", "foo2", "foo3"]);
 is_deeply([sort(pagespec_match_list("foo", "post/*"))], ["post/1", "post/2", "post/3"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", reverse => 1)],
 	["post/3", "post/2", "post/1"]);
@@ -22,10 +32,54 @@ is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 2)],
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50)],
 	["post/1", "post/2", "post/3"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
-                         limit => sub { $_[0] !~ /3/}) ],
+                         filter => sub { $_[0] =~ /3/}) ],
 	["post/1", "post/2"]);
 my $r=eval { pagespec_match_list("foo", "beep") };
 ok(eval { pagespec_match_list("foo", "beep") } == 0);
 ok(! $@, "does not fail with error when unable to match anything");
 eval { pagespec_match_list("foo", "this is not a legal pagespec!") };
 ok($@, "fails with error when pagespec bad");
+
+# A pagespec that requires page metadata should add influences
+# as an explicit dependency. In the case of a link, a links dependency.
+foreach my $spec ("* and link(bar)", "* or link(bar)") {
+	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo2}{foo2} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+	pagespec_match_list("foo3", $spec, deptype => deptype("links"));
+	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_LINKS);
+	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
+	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+}
+
+# a pagespec with backlinks() will add as an influence the page with the links
+foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)") {
+	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+	pagespec_match_list("foo2", $spec, deptype => deptype("links"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_LINKS);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+	pagespec_match_list("foo2", $spec, deptype => deptype("presence", "links"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_LINKS);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_CONTENT));
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+	pagespec_match_list("foo2", $spec);
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_CONTENT);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+}
-- 
cgit v1.2.3


From 4ef0b2d77b6aa9db0a45e69c1db29998e4cc06fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 14:27:11 -0400
Subject: rework influence calculation

Thought of a cleaner way to accumulate all influences in
pagespec_match_list, using the pagespec_match result object as an
accumulator.

(This also accumulates all influences from failed matches, rather than just
one failed match. I'm not sure if the old method was correct.)
---
 IkiWiki.pm | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 232d3e77b..c67a1e138 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2032,41 +2032,25 @@ sub pagespec_match_list ($$;@) {
 	my @matches;
 	my $firstfail;
 	my $count=0;
+	my $accum=IkiWiki::SuccessReason->new();
 	foreach my $p (@candidates) {
 		my $r=$sub->($p, %params, location => $page);
+		error(sprintf(gettext("cannot match pages: %s"), $r))
+			if $r->isa("IkiWiki::ErrorReason");
+		$accum |= $r;
 		if ($r) {
-			push @matches, [$p, $r];
+			push @matches, $p;
 			last if defined $num && ++$count == $num;
 		}
-		elsif (! defined $firstfail) {
-			$firstfail=$r;
-		}
-	}
-
-	my @ret;
-	if (@matches) {
-		# Add all influences from successful matches.
-		foreach my $m (@matches) {
-			push @ret, $m->[0];
-			my %i=$m->[1]->influences;
-			foreach my $i (keys %i) {
-				$depends_simple{$page}{lc $i} |= $i{$i};
-			}
-		}
 	}
-	elsif (defined $firstfail) {
-		# Add influences from one failure. (Which one should not
-		# matter; all should have the same influences.)
-		my %i=$firstfail->influences;
-		foreach my $i (keys %i) {
-			$depends_simple{$page}{lc $i} |= $i{$i};
-		}
 
-		error(sprintf(gettext("cannot match pages: %s"), $firstfail))
-			if $firstfail->isa("IkiWiki::ErrorReason");
+	# Add simple dependencies for accumulated influences.
+	my %i=$accum->influences;
+	foreach my $i (keys %i) {
+		$depends_simple{$page}{lc $i} |= $i{$i};
 	}
 
-	return @ret;
+	return @matches;
 }
 
 sub pagespec_valid ($) {
-- 
cgit v1.2.3


From ecbe5576f8b7152e96653669bc91eae021aaa91f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 14:51:02 -0400
Subject: revert

---
 docwiki.setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docwiki.setup b/docwiki.setup
index 41c07f024..52421e501 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -16,5 +16,5 @@ use IkiWiki::Setup::Standard {
 	userdir => "users",
 	usedirs => 0,
 	prefix_directives => 1,
-	add_plugins => [qw{linkmap goodstuff version haiku polygen fortune}],
+	add_plugins => [qw{goodstuff version haiku polygen fortune}],
 }
-- 
cgit v1.2.3


From f977eaf39493984924b6ae9409be3e1d504fc0ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 14:52:03 -0400
Subject: response

---
 doc/todo/dependency_types.mdwn | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 9a031aac9..6ca06fdab 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -348,7 +348,7 @@ can indirectly influence what pages a pagespec matches.
 > of pages are both considered changes.  This base mechanism will catch:
 >
 >  * The addition of any page to the matching set through its own modification/creation
->  * The removal of any page *that would still match while non-existant* from the matching set through its own removal.  (Note: The base mechanism cannot remove a page cannot from the matching set because of that page's own modification (not deletion).  If the page should be removed matching set, then it obviously cannot match the spec after the change.) 
+>  * The removal of any page *that would still match while non-existant* from the matching set through its own removal.  (Note: The base mechanism cannot remove a page from the matching set because of that page's own modification (not deletion).  If the page should be removed matching set, then it obviously cannot match the spec after the change.) 
 >  * The modification (not deletion) of any page that still matches after the modification.
 >
 > The base mechanism may therefore not catch:
@@ -397,8 +397,16 @@ can indirectly influence what pages a pagespec matches.
   The removal or (re)creation of foo changes what pages match it. Note that
   this is true even if the pagespec currently fails to match.
 
->>> This is an annoying example (hence well worth having :) ).  I think the indirect influence list must contain 'foo' and all currently matching pages.  `created_before(foo)` will not match
->>> a deleted page, and so the base mechanism would not cause a rebuild.  The removal problem strikes. -- [[Will]]
+>>> This is an annoying example (hence well worth having :) ).  I think the
+>>> indirect influence list must contain 'foo' and all currently matching
+>>> pages.  `created_before(foo)` will not match
+>>> a deleted page, and so the base mechanism would not cause a rebuild.  The
+>>> removal problem strikes. -- [[Will]]
+
+>>>> But `created_before` can in fact match a deleted page. Because the mtime
+>>>> of a deleted page is temporarily set to 0 while the base mechanism runs to
+>>>> find changes in deleted pages. (I verified this works by experiment,
+>>>> also that `created_after` is triggered by a deleted page.) --[[Joey]]
 
 * The pagespec "foo" has an empty influence list. This is because a
   modification/creation/removal of foo directly changes what the pagespec
-- 
cgit v1.2.3


From 74409f940d24f51a08becb626e266c91d40d69bd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 17:15:40 -0400
Subject: add_depends: optimise influence calculation

I made match_* functions whose influences can vary depending on the page
matched set a special "" influence to indicate this.

Then add_depends can try just one page, and if static influences are found,
stop there.
---
 IkiWiki.pm             | 52 +++++++++++++++++++++++++-------------------------
 IkiWiki/Plugin/meta.pm |  6 +++---
 doc/plugins/write.mdwn |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c67a1e138..cd93fe969 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1780,19 +1780,17 @@ sub add_depends ($$;$) {
 		return 1;
 	}
 
-	# Analyse the pagespec, and match it against all pages
-	# to get a list of influences, and add explicit dependencies
-	# for those.
-	#my $sub=pagespec_translate($pagespec);
-	#return if $@;
-	#foreach my $p (keys %pagesources) {
-	#	my $r=$sub->($p, location => $page );
-	#	my %i=$r->influences;
-	#	foreach my $i (keys %i) {
-	#		$depends_simple{$page}{lc $i} |= $i{$i};
-	#	}
-	#}
-	print STDERR "warning: use of add_depends by ".caller()."; influences not tracked\n";
+	# Add explicit dependencies for influences.
+	my $sub=pagespec_translate($pagespec);
+	return if $@;
+	foreach my $p (keys %pagesources) {
+		my $r=$sub->($p, location => $page);
+		my $i=$r->influences;
+		foreach my $k (keys %$i) {
+			$depends_simple{$page}{lc $k} |= $i->{$k};
+		}
+		last if $r->influences_static;
+	}
 
 	$depends{$page}{$pagespec} |= $deptype;
 	return 1;
@@ -2045,9 +2043,9 @@ sub pagespec_match_list ($$;@) {
 	}
 
 	# Add simple dependencies for accumulated influences.
-	my %i=$accum->influences;
-	foreach my $i (keys %i) {
-		$depends_simple{$page}{lc $i} |= $i{$i};
+	my $i=$accum->influences;
+	foreach my $k (keys %$i) {
+		$depends_simple{$page}{lc $k} |= $i->{$k};
 	}
 
 	return @matches;
@@ -2099,12 +2097,14 @@ sub new {
 
 sub influences {
 	my $this=shift;
-	if (! @_) {
-		return %{$this->[1]};
-	}
-	else {
-		$this->[1]={@_};
-	}
+	$this->[1]={@_} if @_;
+	my %i=%{$this->[1]};
+	delete $i{""};
+	return \%i;
+}
+
+sub influences_static {
+	return ! $_[0][1]->{""};
 }
 
 sub merge_influences {
@@ -2173,19 +2173,19 @@ sub match_link ($$;@) {
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
 		if (length $bestlink) {
-			return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS)
+			return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 				if $bestlink eq IkiWiki::bestlink($page, $p);
 		}
 		else {
-			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS)
+			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 				if match_glob($p, $link, %params);
 			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS)
+			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 				if match_glob($p_rel, $link, %params);
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link");
+	return IkiWiki::FailReason->new("$page does not link to $link", "" => 1);
 }
 
 sub match_backlink ($$;@) {
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index c675880b3..8dcd73a1a 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -291,14 +291,14 @@ sub match {
 
 	if (defined $val) {
 		if ($val=~/^$re$/i) {
-			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT);
+			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
 		}
 		else {
-			return IkiWiki::FailReason->new("$re does not match $field of $page");
+			return IkiWiki::FailReason->new("$re does not match $field of $page", "" => 1);
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$page does not have a $field");
+		return IkiWiki::FailReason->new("$page does not have a $field", "" => 1);
 	}
 }
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 2254d7025..c72418c3c 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -632,7 +632,7 @@ in the wiki that match the [[ikiwiki/PageSpec]].
 
 The page will automatically be made to depend on the specified
 [[ikiwiki/PageSpec]], so `add_depends` does not need to be called. This
-is significantly more efficient than calling `add_depends` and
+is often significantly more efficient than calling `add_depends` and
 `pagespec_match` in a loop. You should use this anytime a plugin
 needs to match a set of pages and do something based on that list.
 
-- 
cgit v1.2.3


From 2ba8bd386142e7f3c0fb03c86eb90eb3885aabd2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 17:19:07 -0400
Subject: remove highlevel influence calculation stuff

I have it implemented in both add_depends and pagespec_match_list.
The add_depends implementation is optimised to only try one page
if the pagespec's influences are all static, and do not vary by page
matched.
---
 doc/todo/dependency_types.mdwn | 51 ------------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 6ca06fdab..e95965c33 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -564,57 +564,6 @@ SuccessReason(page, index) => right
 `HardFailReason() | SuccessReason(bugs/foo)` =>  
 `HardFailReason()` => right
 
-#### High-level Calculation and Storage
-
-Naively calculating the full influence list for a pagespec requires trying
-to match it against every page in the wiki. I'd like to avoid doing such
-expensive matching redundantly.
-
-It may be possible, for some types of pagespecs, to just try matching a
-single, arbitrary page against it, and know the full influence list has
-been obtained. It seems to be that case that if a pagespec has any
-influences, matching any page will return at least one. So if none are
-returned, we can skip trying other pages.
-
-If the influence list does not include the page that was tried, we know
-that the pagespec does not things like `link()` and `title()`, that are
-influenced by the page's own content. So it *might* be safe to not try
-matching any more pages in this case too. I think it would work for all
-current pagespec terms. There might be a hypothetical term where this
-optimisation doesn't work. We could add a special case to ensure it can
-work: If a term declares it is unfluenced by "", then it means it is
-always influenced by the matching page.
-
-Anyway, this seems worth doing: Add a `pagespec_match_all`, which returns a
-list of all pages in the whole wiki that match the pagespec, and also adds
-the pagespec as a dependency, and while it's at it, calculates and stores
-the influence list.
-
-It could have an optional sort parameter, and limit parameter, to control
-how many items to return and the sort order. So when inline wants to
-display the 10 newest, only the influence lists for those ten are added.
-
-If `pagespec_match_depends` can be used by all plugins, then great,
-influences are automatically calculated, no extra work needs to be done.
-
-If not, and some plugins still need to use `pagespec_match_list` or
-`pagespec_match`, and `add_depends`, then I guess that `add_depends` can do
-a slightly more expensive influence calculation.
-
-Bonus: If `add_depends` is doing an influence calculation, then I can remove
-the nasty hack it currently uses to decide if a given pagespec is safe to use
-with an existence or links dependency.
-
-Where to store the influence list? Well, it appears that we can just add
-(content) dependencies for each item on the list, to the page's
-regular list of simple dependencies. So, the data stored ends up looking
-just like what is stored today by the explicit dependency hacks. Except,
-it's calculated more smartly, and is added automatically.
-
-> I've implemented influence calculation in `add_depends`. As expected,
-> it means rather a lot more work, and makes some things much slower.
-> Optimisations next.. --[[Joey]] 
-
 #### Influence types
 
 Note that influences can also have types, same as dependency types.
-- 
cgit v1.2.3


From a75591eaa772c1b875cca2d96b5015935a8617f3 Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Fri, 9 Oct 2009 18:08:21 -0400
Subject: response

---
 doc/todo/dependency_types.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index e95965c33..1c2f579b3 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -408,6 +408,11 @@ can indirectly influence what pages a pagespec matches.
 >>>> find changes in deleted pages. (I verified this works by experiment,
 >>>> also that `created_after` is triggered by a deleted page.) --[[Joey]]
 
+>>>>> Oh, okie.  I looked at the source, saw the `if (exists $IkiWiki::pagectime{$testpage})` and assumed it would fail.
+>>>>> Of course, having it succeed doesn't cure all the issues -- just moves them.  With `created_before()` succeeding
+>>>>> for deleted files, this pagespec will be match any removal in the entire wiki with the base mechanism.  Whether this is
+>>>>> better or worse than the longer indirect influence list is an empirical question. -- [[Will]]
+
 * The pagespec "foo" has an empty influence list. This is because a
   modification/creation/removal of foo directly changes what the pagespec
   matches.
-- 
cgit v1.2.3


From 5fd345bb1f2b97e2dd1d8b6bb27cf7f713f043ab Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 20:07:32 -0400
Subject: releasing version 3.20091009

---
 debian/changelog |  6 +++---
 po/bg.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/cs.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/da.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/de.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/es.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/fr.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/gu.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/ikiwiki.pot   | 57 +++++++++++++++++++++++++++---------------------------
 po/it.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/pl.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/sv.po         | 59 ++++++++++++++++++++++++++++----------------------------
 po/vi.po         | 59 ++++++++++++++++++++++++++++----------------------------
 13 files changed, 350 insertions(+), 362 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c4353065..a79faf7fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.14159266) UNRELEASED; urgency=low
+ikiwiki (3.20091009) unstable; urgency=low
 
   * parentlinks: Add has_parentlinks template parameter to allow styling
     the toplevel index differently etc.
@@ -6,14 +6,14 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * img: Fix dependency code for full size images.
   * toggle, relativedate: Support templates that add attributes
     to the body tag.
-  * Support RPC::XML 0.69's incompatable object instantiation method.
+  * Support RPC::XML 0.69's incompatible object instantiation method.
   * mirrorlist: Display nothing if list is empty.
   * Fix a bug that could lead to duplicate links being recorded
     for tags.
   * Optimize away most expensive file prune calls, when refreshing,
     by only checking new files.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 09 Oct 2009 19:53:50 -0400
 
 ikiwiki (3.14159265) unstable; urgency=low
 
diff --git a/po/bg.po b/po/bg.po
index 88d66b072..ada27177c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Грешка"
 
@@ -402,28 +402,27 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "няма разпознати усмивки; изключване на приставката „smiley”"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "не е инсталиран polygen"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, fuzzy, perl-format
+msgid "failed to read %s: %s"
+msgstr "грешка при запис на файла „%s”: %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, fuzzy, perl-format
-msgid "failed to read %s: %s"
-msgstr "грешка при запис на файла „%s”: %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "грешка при запис на файла „%s”: %s"
@@ -508,11 +507,11 @@ msgstr "шаблонът „%s” не е намерен"
 msgid "redir cycle is not allowed"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Огледала"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Огледало"
 
@@ -618,7 +617,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
@@ -1053,47 +1052,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1172,35 +1171,35 @@ msgstr "обновяване на уики..."
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Дискусия"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
diff --git a/po/cs.po b/po/cs.po
index 9bd80d2bb..219e2769a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -55,7 +55,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Chyba"
 
@@ -393,27 +393,26 @@ msgstr "varování: perlový modul highlight není dostupný; pokračuji bez ně
 msgid "htmltidy failed to parse this html"
 msgstr "htmltidy se nepodařilo zpracovat toto html"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick není nainstalován"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr "nelze číst %s: %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "chybné rozměry „%s“ (formát má být ŠxV)"
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, perl-format
-msgid "failed to read %s: %s"
-msgstr "nelze číst %s: %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "nelze určit velikost obrázku %s"
@@ -488,11 +487,11 @@ msgstr "stránka, na kterou vede přesměrování, nebyla nalezena"
 msgid "redir cycle is not allowed"
 msgstr "cykly nejsou v přesměrování povoleny"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Zrcadla"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Zrcadlo"
 
@@ -598,7 +597,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, perl-format
 msgid "building %s"
 msgstr "sestavuji %s"
@@ -1031,47 +1030,47 @@ msgstr ""
 "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-"
 "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s má několik možných zdrojových stránek"
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "sestavuji %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "sestavuji %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "odstraňuji %s, již není sestavována pomocí %s"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze sestavit %s"
@@ -1150,33 +1149,33 @@ msgstr "znovusestavuji wiki..."
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Diskuse"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr "nelze použít několik rcs modulů"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
diff --git a/po/da.po b/po/da.po
index b15cb27ff..b7da31d34 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Fejl"
 
@@ -404,27 +404,26 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "afkodning af smileys mislykkedes"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ikke installeret"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr "læsning af %s mislykkedes: %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "forkert størrelsesformat \"%s\" (burde være WxH)"
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, perl-format
-msgid "failed to read %s: %s"
-msgstr "læsning af %s mislykkedes: %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Ændring af størrelse mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Vurdering af billedstørrelse mislykkedes: %s"
@@ -501,11 +500,11 @@ msgstr "henvisningsside ikke fundet"
 msgid "redir cycle is not allowed"
 msgstr "ring af henvisninger er ikke tilladt"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Spejle"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Spejl"
 
@@ -614,7 +613,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
@@ -1046,47 +1045,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "gennemlæser %s"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1165,34 +1164,34 @@ msgstr "genopbygger wiki..."
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
diff --git a/po/de.po b/po/de.po
index fb9e3964d..756453db5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Fehler"
 
@@ -402,27 +402,26 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "Smileys konnten nicht ausgewertet werden"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ist nicht installiert"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr "Lesen von %s fehlgeschlagen: %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "falsches Format in \"%s\" für size (sollte BxH sein)"
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, perl-format
-msgid "failed to read %s: %s"
-msgstr "Lesen von %s fehlgeschlagen: %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Größenänderung fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Größe des Bildes %s konnte nicht festgestellt werden."
@@ -502,11 +501,11 @@ msgstr "Umleitungsseite nicht gefunden"
 msgid "redir cycle is not allowed"
 msgstr "Zyklische Umleitungen sind nicht erlaubt"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Spiegel"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Spiegel"
 
@@ -617,7 +616,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
@@ -1055,47 +1054,47 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "durchsuche %s"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1177,36 +1176,36 @@ msgstr "erzeuge Wiki neu.."
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
diff --git a/po/es.po b/po/es.po
index f9497325e..fa9081449 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Error"
 
@@ -407,27 +407,26 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "Algunos emoticonos tienen errores"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 msgid "Image::Magick is not installed"
 msgstr "El complemento Image::Magick no ha sido instalado"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr "no puedo leer de %s: %s "
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, perl-format
-msgid "failed to read %s: %s"
-msgstr "no puedo leer de %s: %s "
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "no he podido determinar el tamaño de la imagen %s"
@@ -508,11 +507,11 @@ msgstr "falta la página a donde redirigir"
 msgid "redir cycle is not allowed"
 msgstr "ciclo de redirección no permitido"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Réplicas"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Réplica"
 
@@ -621,7 +620,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
@@ -1055,49 +1054,49 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1178,37 +1177,37 @@ msgstr "reconstruyendo el wiki.."
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
diff --git a/po/fr.po b/po/fr.po
index 19a6c103b..08741e2f2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Erreur"
 
@@ -398,27 +398,26 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "Aucun smiley n'a pu être analysé"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick n'est pas installé"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr "Échec de la lecture de %s : %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)"
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, perl-format
-msgid "failed to read %s: %s"
-msgstr "Échec de la lecture de %s : %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Échec de la détermination de la taille de l'image : %s"
@@ -496,11 +495,11 @@ msgstr "Page de redirection introuvable"
 msgid "redir cycle is not allowed"
 msgstr "Redirection cyclique non autorisée"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Miroirs"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Miroir"
 
@@ -616,7 +615,7 @@ msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
@@ -1051,47 +1050,47 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1175,34 +1174,34 @@ msgstr "Reconstruction du wiki..."
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
diff --git a/po/gu.po b/po/gu.po
index cdb613f9d..93e96d93d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -399,28 +399,27 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "પોલિગોન સ્થાપિત નથી"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr "%s વાંચવામાં નિષ્ફળ: %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, perl-format
-msgid "failed to read %s: %s"
-msgstr "%s વાંચવામાં નિષ્ફળ: %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
@@ -498,11 +497,11 @@ msgstr "ફીડ મળ્યું નહી"
 msgid "redir cycle is not allowed"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "મિરરો"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "મિરર"
 
@@ -608,7 +607,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
@@ -1039,47 +1038,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1158,33 +1157,33 @@ msgstr "વીકી ફરીથી બનાવે છે.."
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 1190ffd52..d073af70d 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr ""
 
@@ -390,27 +390,26 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 msgid "Image::Magick is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
 #, perl-format
-msgid "wrong size format \"%s\" (should be WxH)"
+msgid "failed to read %s: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
+#: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
-msgid "failed to read %s: %s"
+msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
@@ -484,11 +483,11 @@ msgstr ""
 msgid "redir cycle is not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr ""
 
@@ -592,7 +591,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, perl-format
 msgid "building %s"
 msgstr ""
@@ -1013,47 +1012,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1132,33 +1131,33 @@ msgstr ""
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 72ebeb033..fd4798470 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -53,7 +53,7 @@ msgstr "Preferenze salvate."
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Errore"
 
@@ -396,27 +396,26 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "impossibile interpretare gli smile"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick non è installato"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr "impossibile leggere %s: %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)"
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, perl-format
-msgid "failed to read %s: %s"
-msgstr "impossibile leggere %s: %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "impossibile ridimensionare: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "impossibile determinare la dimensione dell'immagine %s"
@@ -493,11 +492,11 @@ msgstr "pagina di reindirizzamento non trovata"
 msgid "redir cycle is not allowed"
 msgstr "ciclo di reindirizzamento non ammesso"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Mirror"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Mirror"
 
@@ -609,7 +608,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
@@ -1044,47 +1043,47 @@ msgstr ""
 "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare "
 "allow_symlinks_before_srcdir per abilitare questa configurazione"
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorato il file dal nome scorretto %s"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s ha diverse pagine sorgenti possibili"
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "rimozione della vecchia pagina %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "scansione %s"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "compilazione di %s, che è collegato a %s"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "compilazione di %s, che dipende da %s"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "rimozione di %s, non più richiesto da %s"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1164,33 +1163,33 @@ msgstr "ricostruzione wiki..."
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Discussione"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr "impossibile usare più plugin rcs"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
diff --git a/po/pl.po b/po/pl.po
index f3c752aea..cdc2d91c5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Błąd"
 
@@ -404,28 +404,27 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "awaria w trakcie przetwarzania emitoikonki"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "wtyczka polygen nie jest zainstalowana"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, fuzzy, perl-format
+msgid "failed to read %s: %s"
+msgstr "awaria w trakcie odczytu %s: %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, fuzzy, perl-format
-msgid "failed to read %s: %s"
-msgstr "awaria w trakcie odczytu %s: %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
@@ -511,11 +510,11 @@ msgstr "nieznaleziony kanał RSS"
 msgid "redir cycle is not allowed"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Kopie lustrzane"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Kopia lustrzana"
 
@@ -621,7 +620,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
@@ -1061,47 +1060,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "skanowanie %s"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1180,35 +1179,35 @@ msgstr "przebudowywanie wiki..."
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Dyskusja"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 6424c6df2..11c9d60fa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Fel"
 
@@ -401,28 +401,27 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "misslyckades med att tolka smilisar, inaktiverar instick"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "polygen inte installerad"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, fuzzy, perl-format
+msgid "failed to read %s: %s"
+msgstr "misslyckades med att skriva %s: %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, fuzzy, perl-format
-msgid "failed to read %s: %s"
-msgstr "misslyckades med att skriva %s: %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "misslyckades med att skriva %s: %s"
@@ -504,11 +503,11 @@ msgstr "mallen %s hittades inte"
 msgid "redir cycle is not allowed"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Speglar"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Spegel"
 
@@ -614,7 +613,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
@@ -1048,47 +1047,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1167,33 +1166,33 @@ msgstr "bygger om wiki.."
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
diff --git a/po/vi.po b/po/vi.po
index 8e6edd432..0d64a11e8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 18:53-0400\n"
+"POT-Creation-Date: 2009-10-09 19:55-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
 msgid "Error"
 msgstr "Lỗi"
 
@@ -402,28 +402,27 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "lỗi phân tách hình cười nào nên tắt bổ sung"
 
-#: ../IkiWiki/Plugin/img.pm:63
+#: ../IkiWiki/Plugin/img.pm:64
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "chưa cài đặt polygen"
 
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, fuzzy, perl-format
+msgid "failed to read %s: %s"
+msgstr "lỗi ghi %s: %s"
+
 #: ../IkiWiki/Plugin/img.pm:74
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89
-#: ../IkiWiki/Plugin/img.pm:135
-#, fuzzy, perl-format
-msgid "failed to read %s: %s"
-msgstr "lỗi ghi %s: %s"
-
-#: ../IkiWiki/Plugin/img.pm:100
+#: ../IkiWiki/Plugin/img.pm:120
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:152
+#: ../IkiWiki/Plugin/img.pm:140
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "lỗi ghi %s: %s"
@@ -505,11 +504,11 @@ msgstr "không tìm thấy mẫu %s"
 msgid "redir cycle is not allowed"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirrors"
 msgstr "Nhân bản"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
 msgid "Mirror"
 msgstr "Nhân bản"
 
@@ -615,7 +614,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
@@ -1049,47 +1048,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314
+#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:296
+#: ../IkiWiki/Render.pm:299
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:382
+#: ../IkiWiki/Render.pm:385
 #, perl-format
 msgid "removing old page %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:423
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
-#: ../IkiWiki/Render.pm:450
+#: ../IkiWiki/Render.pm:453
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:497
+#: ../IkiWiki/Render.pm:500
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:533
+#: ../IkiWiki/Render.pm:536
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:545
+#: ../IkiWiki/Render.pm:548
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
-#: ../IkiWiki/Render.pm:569
+#: ../IkiWiki/Render.pm:572
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
@@ -1168,33 +1167,33 @@ msgstr "đang xây dựng lại wiki.."
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Thảo luận"
 
-#: ../IkiWiki.pm:502
+#: ../IkiWiki.pm:501
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:547
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:576
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1259
+#: ../IkiWiki.pm:1258
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1817
+#: ../IkiWiki.pm:1820
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1941
+#: ../IkiWiki.pm:1944
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From 36003bad0ad5746af841a0373ded1e271ae57840 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 20:08:42 -0400
Subject: add news item for ikiwiki 3.20091009

---
 doc/news/version_3.1415.mdwn     |  7 -------
 doc/news/version_3.20091009.mdwn | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)
 delete mode 100644 doc/news/version_3.1415.mdwn
 create mode 100644 doc/news/version_3.20091009.mdwn

diff --git a/doc/news/version_3.1415.mdwn b/doc/news/version_3.1415.mdwn
deleted file mode 100644
index 93310bc64..000000000
--- a/doc/news/version_3.1415.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-ikiwiki 3.1415 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * img: Fix extra double quote with alt text. (smcv)
-   * Updated French debconf templates translation. Closes: #[535103](http://bugs.debian.org/535103)
-   * openid: Support Net::OpenID 2.x when pretty-printing
-     openids. (smcv)
-   * highlight: Fix utf-8 encoding bug. Closes: #[535028](http://bugs.debian.org/535028)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091009.mdwn b/doc/news/version_3.20091009.mdwn
new file mode 100644
index 000000000..9ab1299b9
--- /dev/null
+++ b/doc/news/version_3.20091009.mdwn
@@ -0,0 +1,14 @@
+ikiwiki 3.20091009 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * parentlinks: Add has\_parentlinks template parameter to allow styling
+     the toplevel index differently etc.
+   * img: Correct bug in image size calculation code.
+   * img: Fix dependency code for full size images.
+   * toggle, relativedate: Support templates that add attributes
+     to the body tag.
+   * Support RPC::XML 0.69's incompatible object instantiation method.
+   * mirrorlist: Display nothing if list is empty.
+   * Fix a bug that could lead to duplicate links being recorded
+     for tags.
+   * Optimize away most expensive file prune calls, when refreshing,
+     by only checking new files."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From a169e7b6a81485a918992328f053d899e3614547 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 20:30:22 -0400
Subject: update

---
 doc/todo/dependency_types.mdwn | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index bf6a76d87..da9b5e6cf 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -566,9 +566,16 @@ SuccessReason(page, index) => right
 `HardFailReason() | SuccessReason(index)` =>
 `SuccessReason(index)` => right
 
+Ok so far, but:
+
 "!bugs/* and link(patch)" =>
-`HardFailReason() | SuccessReason(bugs/foo)` =>  
-`HardFailReason()` => right
+`!SuccessReason() | SuccessReason(bugs/foo)` =>  
+'FailReason() | SuccessReason(bugs/foo)
+`FailReason(bugs/foo)` => wrong!
+
+This could be fixed by adding a HardSuccessReason that glob also returns.
+Maybe just a field of the object that is set if it is "hard" is a better
+approach though.
 
 #### Influence types
 
-- 
cgit v1.2.3


From 6d6fff8d87ae304427e222d20e4e49e671e3b0f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 21:12:14 -0400
Subject: added tests of SuccessReason/FailReason objects

---
 t/pagespec_match_result.t | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100755 t/pagespec_match_result.t

diff --git a/t/pagespec_match_result.t b/t/pagespec_match_result.t
new file mode 100755
index 000000000..2319d8733
--- /dev/null
+++ b/t/pagespec_match_result.t
@@ -0,0 +1,54 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 67;
+
+BEGIN { use_ok("IkiWiki"); }
+
+# Note that new objects have to be constructed freshly for each test, since
+# object states are mutated as they are combined.
+sub S { IkiWiki::SuccessReason->new("match") }
+sub F { IkiWiki::FailReason->new("no match") }
+sub E { IkiWiki::ErrorReason->new("error in matching") }
+
+ok(S() eq "match");
+ok(F() eq "no match");
+ok(E() eq "error in matching");
+
+ok(S());
+ok(! F());
+ok(! E());
+
+ok(!(! S()));
+ok(!(!(! F)));
+ok(!(!(! E)));
+
+ok(S() | F());
+ok(F() | S());
+ok(!(F() | E()));
+ok(!(!S() | F() | E()));
+
+ok(S() & S() & S());
+ok(!(S() & E()));
+ok(!(S() & F()));
+ok(!(S() & F() & E()));
+ok(S() & (F() | F() | S()));
+
+# influences are always merged, no matter the operation performed,
+# as long as the two items are always both present
+foreach my $op ('$s | $f', '$s & $f', '$s & $f & E()', '$s | E() | $f',
+                '! $s | ! $f', '!(!(!$s)) | $f') {
+	my $s=S();
+	$s->influences(foo => 1, bar => 1);
+	is($s->influences->{foo}, 1);
+	is($s->influences->{bar}, 1);
+	my $f=F();
+	$f->influences(bar => 2, baz => 1);
+	is($f->influences->{bar}, 2);
+	is($f->influences->{baz}, 1);
+	my $c = eval $op;
+	ok(ref $c);
+	is($c->influences->{foo}, 1, "foo ($op)");
+	is($c->influences->{bar}, (1 | 2), "bar ($op)");
+	is($c->influences->{baz}, 1, "baz ($op)");
+}
-- 
cgit v1.2.3


From ba00fb319c6332977ac0cc78937151add5b91335 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 21:23:39 -0400
Subject: update

---
 t/pagespec_match_result.t | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/t/pagespec_match_result.t b/t/pagespec_match_result.t
index 2319d8733..d9c31d6f0 100755
--- a/t/pagespec_match_result.t
+++ b/t/pagespec_match_result.t
@@ -1,15 +1,15 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 67;
+use Test::More tests => 71;
 
 BEGIN { use_ok("IkiWiki"); }
 
 # Note that new objects have to be constructed freshly for each test, since
 # object states are mutated as they are combined.
-sub S { IkiWiki::SuccessReason->new("match") }
-sub F { IkiWiki::FailReason->new("no match") }
-sub E { IkiWiki::ErrorReason->new("error in matching") }
+sub S { IkiWiki::SuccessReason->new("match", @_) }
+sub F { IkiWiki::FailReason->new("no match", @_) }
+sub E { IkiWiki::ErrorReason->new("error in matching", @_) }
 
 ok(S() eq "match");
 ok(F() eq "no match");
@@ -38,12 +38,10 @@ ok(S() & (F() | F() | S()));
 # as long as the two items are always both present
 foreach my $op ('$s | $f', '$s & $f', '$s & $f & E()', '$s | E() | $f',
                 '! $s | ! $f', '!(!(!$s)) | $f') {
-	my $s=S();
-	$s->influences(foo => 1, bar => 1);
+	my $s=S(foo => 1, bar => 1);
 	is($s->influences->{foo}, 1);
 	is($s->influences->{bar}, 1);
-	my $f=F();
-	$f->influences(bar => 2, baz => 1);
+	my $f=F(bar => 2, baz => 1);
 	is($f->influences->{bar}, 2);
 	is($f->influences->{baz}, 1);
 	my $c = eval $op;
@@ -52,3 +50,10 @@ foreach my $op ('$s | $f', '$s & $f', '$s & $f & E()', '$s | E() | $f',
 	is($c->influences->{bar}, (1 | 2), "bar ($op)");
 	is($c->influences->{baz}, 1, "baz ($op)");
 }
+
+my $s=S(foo => 0, bar => 1);
+$s->influences(baz => 1);
+ok(! $s->influences->{foo}, "removed 0 influence");
+ok(! $s->influences->{bar}, "removed 1 influence");
+ok($s->influences->{baz}, "set influence");
+ok($s->influences_static);
-- 
cgit v1.2.3


From 97dd750380de2176b6f43f8bc9c27ec8122cadd3 Mon Sep 17 00:00:00 2001
From: trianta <trianta@web>
Date: Sat, 10 Oct 2009 04:14:18 -0400
Subject:

---
 doc/sandbox.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 242ffb327..e326319da 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -57,8 +57,10 @@ Bulleted list
 
 [[!progress percent=27]]
 
+[[!progress percent=78]]
+
 -----
 
-This SandBox is also a [[blog]]!
+This **SandBox** is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-- 
cgit v1.2.3


From 800d165037ee9bc3362e21048ab07bdd120dcfe0 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Sat, 10 Oct 2009 04:22:41 -0400
Subject:

---
 doc/plugins/lockedit/discussion.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 doc/plugins/lockedit/discussion.mdwn

diff --git a/doc/plugins/lockedit/discussion.mdwn b/doc/plugins/lockedit/discussion.mdwn
new file mode 100644
index 000000000..b058b2b07
--- /dev/null
+++ b/doc/plugins/lockedit/discussion.mdwn
@@ -0,0 +1,21 @@
+This plugin not only locks pages but ensures too a user is logged in. This seems to me redundant with signedit. I propose :
+
+    sub canedit ($$) {
+    	my $page=shift;
+    	my $cgi=shift;
+    	my $session=shift;
+    
+    	my $user=$session->param("name");
+    	return undef if defined $user && IkiWiki::is_admin($user);
+    
+    	if (defined $config{locked_pages} && length $config{locked_pages} &&
+    	    pagespec_match($page, $config{locked_pages},
+    		    user => $session->param("name"),
+    		    ip => $ENV{REMOTE_ADDR},
+    	    )) {
+    		return sprintf(gettext("%s is locked and cannot be edited"),
+    			htmllink("", "", $page, noimageinline => 1));
+    	}
+    
+    	return undef;
+    }
-- 
cgit v1.2.3


From 9900d6164aca858587b1c603e2fdc53a78f880b9 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Sun, 11 Oct 2009 03:18:32 -0400
Subject:

---
 doc/sandbox.mdwn | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index e326319da..8aedcbb9e 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,10 +1,5 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-test 2
 
 # Header
 
-- 
cgit v1.2.3


From 22ed3f388b6433c512ca7a026d868861ea1990ea Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Sun, 11 Oct 2009 04:34:17 -0400
Subject:

---
 doc/plugins/contrib/groupfile.mdwn | 105 +++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 doc/plugins/contrib/groupfile.mdwn

diff --git a/doc/plugins/contrib/groupfile.mdwn b/doc/plugins/contrib/groupfile.mdwn
new file mode 100644
index 000000000..e5c0ded42
--- /dev/null
+++ b/doc/plugins/contrib/groupfile.mdwn
@@ -0,0 +1,105 @@
+[[!template id=plugin name=groupfile core=0 author="[[Jogo]]"]]
+
+This plugin add a `group(groupname)` function to [[ikiwiki/PageSpec]], which is true
+only if the actual user is member of the group named `groupname`.
+
+Groups membership are read from a file. The syntax of this file is very close to
+usual `/etc/passwd` Unix file : the group's name, followed by a colon, followed by
+a coma separated list of user's names. For exemple :
+
+    dev:toto,foo
+    i18n:zorba
+
+-----
+
+    #!/usr/bin/perl
+    # GroupFile plugin.
+    # by Joseph Boudou <jogo at matabio dot net>
+    
+    package IkiWiki::Plugin::groupfile;
+    
+    use warnings;
+    use strict;
+    use IkiWiki 3.00;
+    
+    sub import {
+        hook(type => 'getsetup', id => 'groups', call => \&get_setup);
+    }
+    
+    sub get_setup () {
+        return (
+            plugin => {
+                safe    => 0,
+                rebuild => 0,
+            },
+            group_file => {
+                type        => 'string',
+                example     => '/etc/ikiwiki/group',
+                description => 'group file location',
+                safe        => 0,
+                rebuild     => 0,
+            },
+        );
+    }
+    
+    my $users_of = 0;
+    
+    sub get_groups () {
+        if (not $users_of) {
+    
+            if (not defined $config{group_file}) {
+                return 'group_file option not set';
+            }
+    
+            open my $file, '<', $config{group_file}
+                or return 'Unable to open group_file';
+    
+            $users_of = {};
+            READ:
+            while (<$file>) {
+                next READ if (/^\s*$/);
+    
+                if (/^(\w+):([\w,]+)/) {
+                    %{ $users_of->{$1} } = map { $_ => 1 } split /,/, $2;
+                }
+                else {
+                    $users_of = "Error at group_file:$.";
+                    last READ;
+                }
+            }
+    
+            close $file;
+        }
+    
+        return $users_of;
+    }
+    
+    package IkiWiki::PageSpec;
+    
+    sub match_group ($$;@) {
+        shift;
+        my $group  = shift;
+        my %params = @_;
+    
+        if (not exists $params{user}) {
+            return IkiWiki::ErrorReason->new('no user specified');
+        }
+        if (not defined $params{user}) {
+            return IkiWiki::FailReason->new('not logged in');
+        }
+    
+        my $users_of = IkiWiki::Plugin::groupfile::get_groups();
+        if (not ref $users_of) {
+            return IkiWiki::ErrorReason->new($users_of);
+        }
+    
+        if (exists $users_of->{$group}{ $params{user} }) {
+            return IkiWiki::SuccessReason->new("user is member of $group");
+        }
+        else {
+            return IkiWiki::FailReason->new(
+                "user $params{user} isn't member of $group");
+        }
+    }
+    
+    1
-- 
cgit v1.2.3


From 5dba91cdc88c01ac1d314f24b12eb2cda651e206 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 13:51:23 -0400
Subject: typo

---
 doc/plugins/calendar.mdwn |  2 +-
 t/pagespec_match_result.t | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index d695762b7..8ade70004 100644
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -6,7 +6,7 @@ The directive displays a calendar, similar to the typical calendars shown on
 some blogs.
 
 Since ikiwiki is a wiki compiler, to keep the calendar up-to-date,
-wikis that include it need to be periodically refreshes, typically by cron
+wikis that include it need to be periodically refreshed, typically by cron
 at midnight. Example crontab:
 
 	0 0 * * * ikiwiki -setup ~/ikiwiki.setup -refresh
diff --git a/t/pagespec_match_result.t b/t/pagespec_match_result.t
index d9c31d6f0..c2112bf14 100755
--- a/t/pagespec_match_result.t
+++ b/t/pagespec_match_result.t
@@ -57,3 +57,21 @@ ok(! $s->influences->{foo}, "removed 0 influence");
 ok(! $s->influences->{bar}, "removed 1 influence");
 ok($s->influences->{baz}, "set influence");
 ok($s->influences_static);
+
+# influence blocking
+my $r=F()->block & S(foo => 1);
+ok(! $r->influences->{foo}, "failed blocker & influence -> does not pass");
+$r=F()->block | S(foo => 1);
+ok($r->influences->{foo}, "failed blocker | influence -> does pass");
+$r=S(foo => 1) & F()->block;
+ok(! $r->influences->{foo}, "influence & failed blocker -> does not pass");
+$r=S(foo => 1) | F()->block;
+ok($r->influences->{foo}, "influence | failed blocker -> does pass");
+$r=S(foo => 1) & F()->block & S(foo => 2);
+ok(! $r->influences->{foo}, "influence & failed blocker & influence -> does not pass");
+$r=S(foo => 1) | F()->block | S(foo => 2);
+ok($r->influences->{foo}, "influence | failed blocker | influence -> does pass");
+$r=S()->block & S(foo => 1);
+ok($r->influences->{foo}, "successful blocker -> does pass");
+$r=(! S()->block) & S(foo => 1);
+ok(! $r->influences->{foo}, "! successful blocker -> failed blocker");
-- 
cgit v1.2.3


From 5cddd8a0a3b1b42dd3a92eb4f839679c12ddf97e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 16:04:03 -0400
Subject: typo

---
 doc/plugins/calendar.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index d695762b7..8ade70004 100644
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -6,7 +6,7 @@ The directive displays a calendar, similar to the typical calendars shown on
 some blogs.
 
 Since ikiwiki is a wiki compiler, to keep the calendar up-to-date,
-wikis that include it need to be periodically refreshes, typically by cron
+wikis that include it need to be periodically refreshed, typically by cron
 at midnight. Example crontab:
 
 	0 0 * * * ikiwiki -setup ~/ikiwiki.setup -refresh
-- 
cgit v1.2.3


From e1939185d29e1431861e63d6526cb3a498d6033e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 16:42:49 -0400
Subject: ikiwiki-calendar: New command automates creation of archive pages
 using the calendar plugin.

---
 debian/changelog                    |  7 +++++
 doc/examples/blog.mdwn              |  4 +++
 doc/ikiwiki-calendar.mdwn           | 51 ++++++++++++++++++++++++++++++++
 doc/ikiwiki/directive/calendar.mdwn | 29 ++++++++++++------
 doc/plugins/calendar.mdwn           |  8 ++---
 ikiwiki-calendar                    | 59 +++++++++++++++++++++++++++++++++++++
 templates/calendarmonth.tmpl        |  3 ++
 templates/calendaryear.tmpl         |  1 +
 8 files changed, 147 insertions(+), 15 deletions(-)
 create mode 100644 doc/ikiwiki-calendar.mdwn
 create mode 100755 ikiwiki-calendar
 create mode 100644 templates/calendarmonth.tmpl
 create mode 100644 templates/calendaryear.tmpl

diff --git a/debian/changelog b/debian/changelog
index a79faf7fb..22935955a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20091010) UNRELEASED; urgency=low
+
+  * ikiwiki-calendar: New command automates creation of archive pages
+    using the calendar plugin.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 11 Oct 2009 15:54:45 -0400
+
 ikiwiki (3.20091009) unstable; urgency=low
 
   * parentlinks: Add has_parentlinks template parameter to allow styling
diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index 2155d7fea..f542cad0c 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -23,3 +23,7 @@ Some additional configuration you might want to do:
   enable comments to posts to the blog:
 
   	comments_pagespec => 'blog/posts/* and !*/Discussion',
+
+* Enable the [[calendar|plugins/calendar]] plugin and run the
+  [[ikiwiki-calendar]] command from cron daily to get an interlinked
+  set of calendar archives.
diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn
new file mode 100644
index 000000000..e2cc612f3
--- /dev/null
+++ b/doc/ikiwiki-calendar.mdwn
@@ -0,0 +1,51 @@
+# NAME
+
+ikiwiki-calendar - create calendar archive pages
+
+# SYNOPSIS
+
+ikiwiki-calendar [-f] your.setup [pagespec] [year]
+
+# DESCRIPTION
+
+`ikiwiki-calendar` creates pages that use the [[ikiwiki/directive/calendar]]
+directive, allowing the archives to be browsed one month
+at a time, with calendar-based navigation.
+
+You must specify the setup file for your wiki. The pages will
+be created inside its `srcdir`, beneath the `archivebase`
+directory used by the calendar plugin (default "archives").
+
+You will probably want to specify a [[ikiwiki/PageSpec]]
+to control which pages are included on the calendars. The
+default is all pages. To limit it to only posts in a blog,
+use something like "posts/* and !*/Discussion".
+
+It defaults to creating calendar pages for the current
+year, as well as the previous year, and the next year.
+If you specify a year, it will create pages for that year.
+
+Existing pages will not be overwritten by this command by default.
+Use the `-f` switch to force it to overwrite any existing pages.
+
+## CRONTAB
+
+While this command only needs to be run once a year to update
+the archive pages for each new year, you are recommended to set up
+a cron job to run it daily, at midnight. Then it will also update
+the calendars to highlight the current day.
+
+An example crontab:
+
+	0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion"
+
+# TEMPLATES
+
+This command uses two [[template|wikitemplates]] to generate
+the pages, `calendarmonth.tmpl` and `calendaryear.tmpl`.
+
+# AUTHOR
+
+Joey Hess <joey@ikiwiki.info>
+
+Warning: this page is automatically made into ikiwiki-calendar's man page, edit with care
diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
index 8a257d6eb..b2ac75b11 100644
--- a/doc/ikiwiki/directive/calendar.mdwn
+++ b/doc/ikiwiki/directive/calendar.mdwn
@@ -1,5 +1,4 @@
 The `calendar` directive is supplied by the [[!iki plugins/calendar desc=calendar]] plugin.
-This plugin requires extra setup.  See the plugin documentation for details.
 
 This directive displays a calendar, similar to the typical calendars shown on
 some blogs.
@@ -12,16 +11,28 @@ some blogs.
 
 	\[[!calendar type="year" year="2005" pages="blog/* and !*/Discussion"]]
 
+## setup
+
 The calendar is essentially a fancy front end to archives of previous
 pages, usually used for blogs. It can produce a calendar for a given month,
-or a list of months for a given year.
-
-The month format calendar simply links to any page posted on each
-day of the month. The year format calendar links to archive pages, with
-names like `archives/2007` (for all of 2007)  and `archives/2007/01`
-(for January, 2007). For this to work, you'll need to create these archive
-pages. They typically use [[inline]] to display or list pages created in
-the given time frame.
+or a list of months for a given year. The month format calendar simply
+links to any page posted on each day of the month. The year format calendar
+links to archive pages, with names like `archives/2007` (for all of 2007)
+and `archives/2007/01` (for January, 2007).
+
+While you can insert calendar directives anywhere on your wiki, including
+in the sidebar, you'll also need to create these archive pages. They
+typically use this directive to display a calendar, and also use [[inline]]
+to display or list pages created in the given time frame.
+
+The `ikiwiki-calendar` command can be used to automatically generate the
+archive pages. It also refreshes the wiki, updating the calendars to
+highlight the current day. This command is typically run at midnight from
+cron. An example crontab:
+
+An example crontab:
+
+	0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion"
 
 ## usage
 
diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index 8ade70004..bc1bc6c71 100644
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -3,13 +3,9 @@
 
 This plugin provides a [[ikiwiki/directive/calendar]] [[ikiwiki/directive]].
 The directive displays a calendar, similar to the typical calendars shown on
-some blogs.
+some blogs. 
 
-Since ikiwiki is a wiki compiler, to keep the calendar up-to-date,
-wikis that include it need to be periodically refreshed, typically by cron
-at midnight. Example crontab:
-
-	0 0 * * * ikiwiki -setup ~/ikiwiki.setup -refresh
+The [[ikiwiki-calendar]] command is used to keep the calendar up-to-date.
 
 ## CSS
 
diff --git a/ikiwiki-calendar b/ikiwiki-calendar
new file mode 100755
index 000000000..ec572cb7c
--- /dev/null
+++ b/ikiwiki-calendar
@@ -0,0 +1,59 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use IkiWiki;
+use IkiWiki::Setup;
+use Getopt::Long;
+
+sub usage () {
+	die gettext("usage: ikiwiki-calendar [-f] your.setup [pagespec] [year]"), "\n";
+}
+
+my $force=0;
+GetOptions(
+	"force" => \$force,
+) || usage();
+my $setup=shift		|| usage();
+my $pagespec=shift	|| "*";
+my $year=shift		|| 1900+(localtime(time))[5];
+
+%config=IkiWiki::defaultconfig();
+IkiWiki::Setup::load($setup);
+IkiWiki::loadplugins();
+IkiWiki::checkconfig();
+
+my $archivebase = 'archives';
+$archivebase = $config{archivebase} if defined $config{archivebase};
+
+sub writearchive ($$;$) {
+	my $template=template(shift);
+	my $year=shift;
+	my $month=shift;
+
+	my $page=defined $month ? "$year/$month" : $year;
+
+	my $pagefile=newpagefile("$archivebase/$page", $config{default_pageext});
+	$template->param(pagespec => $pagespec);
+	$template->param(year => $year);
+	$template->param(month => $month) if defined $month;
+
+	if ($force || ! -e "$config{srcdir}/$pagefile") {
+		writefile($pagefile, $config{srcdir}, $template->output);
+		IkiWiki::rcs_add($pagefile) if $config{rcs};
+	}
+}
+
+IkiWiki::lockwiki();
+
+foreach my $y ($year-1, $year, $year+1) {
+	writearchive("calendaryear.tmpl", $y);
+	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
+		writearchive("calendarmonth.tmpl", $y, $m);
+	}
+}
+
+IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
+	if $config{rcs};
+IkiWiki::unlockwiki();
+
+system("ikiwiki", "-setup", $setup, "-refresh");
diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl
new file mode 100644
index 000000000..37ad78c5c
--- /dev/null
+++ b/templates/calendarmonth.tmpl
@@ -0,0 +1,3 @@
+[[!calendar type=month month=<TMPL_VAR MONTH> year=<TMPL_VAR YEAR> pages="<TMPL_VAR PAGESPEC>"]]
+
+[[!inline pages="creation_month(<TMPL_VAR MONTH>) and creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>" show=0 feeds=no reverse=yes]]
diff --git a/templates/calendaryear.tmpl b/templates/calendaryear.tmpl
new file mode 100644
index 000000000..714bd6d47
--- /dev/null
+++ b/templates/calendaryear.tmpl
@@ -0,0 +1 @@
+[[!calendar type=year year=<TMPL_VAR YEAR> pages="<TMPL_VAR PAGESPEC>"]]
-- 
cgit v1.2.3


From 04d0a72c09528a4117b2ba641f5fdedbbe2a2171 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 19:05:37 -0400
Subject: typo

---
 t/add_depends.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/add_depends.t b/t/add_depends.t
index e3f0b6603..9b074818c 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 88;
+use Test::More tests => 38;
 
 BEGIN { use_ok("IkiWiki"); }
 %config=IkiWiki::defaultconfig();
@@ -39,7 +39,7 @@ ok($IkiWiki::depends_simple{foo2}{"bar"} & $IkiWiki::DEPEND_LINKS);
 ok(! ($IkiWiki::depends_simple{foo2}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
 
 # adding combined dep types
-ok(add_depends("foo2", "baz", deptype("links". "presence")));
+ok(add_depends("foo2", "baz", deptype("links", "presence")));
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_LINKS);
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_PRESENCE);
 ok(! ($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_CONTENT));
-- 
cgit v1.2.3


From 51d889951528a1de4f631435c2deccd1bd326ec5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 19:13:40 -0400
Subject: influences returns hash ref now

---
 t/pagespec_match.t | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index ab3fcdd4b..d529106f7 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -93,19 +93,19 @@ $ret=pagespec_match("foo", "bar or foo");
 ok($ret, "simple match");
 is($ret, "foo matches foo", "stringified return");
 
-my %i=pagespec_match("foo", "link(bar)")->influences;
-is(join(",", keys %i), 'foo', "link is influenced by the page with the link");
-%i=pagespec_match("bar", "backlink(foo)")->influences;
-is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link");
-%i=pagespec_match("bar", "backlink(foo)")->influences;
-is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link");
-%i=pagespec_match("bar", "created_before(foo)")->influences;
-is(join(",", keys %i), 'foo', "created_before is influenced by the comparison page");
-%i=pagespec_match("bar", "created_after(foo)")->influences;
-is(join(",", keys %i), 'foo', "created_after is influenced by the comparison page");
-%i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
-is(join(",", sort keys %i), 'bar,foo', "influences add up over AND");
-%i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
-is(join(",", sort keys %i), 'bar,foo', "influences add up over OR");
-%i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
-is(join(",", sort keys %i), 'bar,foo', "influences unaffected by negation");
+my $i=pagespec_match("foo", "link(bar)")->influences;
+is(join(",", keys %$i), 'foo', "link is influenced by the page with the link");
+$i=pagespec_match("bar", "backlink(foo)")->influences;
+is(join(",", keys %$i), 'foo', "backlink is influenced by the page with the link");
+$i=pagespec_match("bar", "backlink(foo)")->influences;
+is(join(",", keys %$i), 'foo', "backlink is influenced by the page with the link");
+$i=pagespec_match("bar", "created_before(foo)")->influences;
+is(join(",", keys %$i), 'foo', "created_before is influenced by the comparison page");
+$i=pagespec_match("bar", "created_after(foo)")->influences;
+is(join(",", keys %$i), 'foo', "created_after is influenced by the comparison page");
+$i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
+is(join(",", sort keys %$i), 'bar,foo', "influences add up over AND");
+$i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
+is(join(",", sort keys %$i), 'bar,foo', "influences add up over OR");
+$i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
+is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
-- 
cgit v1.2.3


From 7adb471ff4ba0eddd18a858165d65c5dcb94090f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 19:56:40 -0400
Subject: install ikiwiki-calendar

---
 Makefile.PL | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index 020813177..a58b64c0d 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -42,6 +42,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki
 	./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
 	./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
 	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
+	./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
 	$(MAKE) -C po
 	
 docwiki: ikiwiki.out
@@ -100,6 +101,7 @@ extra_install: underlay_install
 	install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1
 	install -m 644 ikiwiki-transition.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-transition.1
 	install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1
+	install -m 644 ikiwiki-calendar.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-calendar.1
 	
 	install -d $(DESTDIR)$(PREFIX)/share/man/man8
 	install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8
@@ -112,7 +114,7 @@ extra_install: underlay_install
 
 	install -d $(DESTDIR)$(PREFIX)/bin
 	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
-	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
+	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist ikiwiki-calendar $(DESTDIR)$(PREFIX)/bin/
 
 	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 	
-- 
cgit v1.2.3


From 99eec4f03de310b544ae727b3b28f14271ef3e30 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 19:59:32 -0400
Subject: remove locking

Problem is that even rcs_add may cause a commit for certian RCSs and then
it would deadlock.
---
 ikiwiki-calendar | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ikiwiki-calendar b/ikiwiki-calendar
index ec572cb7c..074f0d6fd 100755
--- a/ikiwiki-calendar
+++ b/ikiwiki-calendar
@@ -43,8 +43,6 @@ sub writearchive ($$;$) {
 	}
 }
 
-IkiWiki::lockwiki();
-
 foreach my $y ($year-1, $year, $year+1) {
 	writearchive("calendaryear.tmpl", $y);
 	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
@@ -54,6 +52,5 @@ foreach my $y ($year-1, $year, $year+1) {
 
 IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
 	if $config{rcs};
-IkiWiki::unlockwiki();
 
 system("ikiwiki", "-setup", $setup, "-refresh");
-- 
cgit v1.2.3


From 71e266b939d72871f7efbc9c498dc9b472bdf9eb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 20:15:54 -0400
Subject: avoid temporary variables

and fix a bug in pagespec variable name
---
 IkiWiki/Plugin/calendar.pm | 118 ++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 70 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index c50d038df..fe7ee0361 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -65,16 +65,8 @@ sub month_days {
 sub format_month (@) {
 	my %params=@_;
 
-	my $pagespec = $params{pages};
-	my $year     = $params{year};
-	my $month    = $params{month};
-	my $pmonth   = $params{pmonth};
-	my $nmonth   = $params{nmonth};
-	my $pyear    = $params{pyear};
-	my $nyear    = $params{nyear};
-
 	my %linkcache;
-	foreach my $p (pagespec_match_list($params{page}, $params{pagespec},
+	foreach my $p (pagespec_match_list($params{page}, $params{pages},
 				# add presence dependencies to update
 				# month calendar when pages are added/removed
 				deptype => deptype("presence"))) {
@@ -94,19 +86,19 @@ sub format_month (@) {
 	my $calendar="\n";
 
 	# When did this month start?
-	my @monthstart = localtime(timelocal(0,0,0,1,$month-1,$year-1900));
+	my @monthstart = localtime(timelocal(0,0,0,1,$params{month}-1,$params{year}-1900));
 
 	my $future_dom = 0;
 	my $today      = 0;
-	if ($year == $now[5]+1900 && $month == $now[4]+1) {
+	if ($params{year} == $now[5]+1900 && $params{month} == $now[4]+1) {
 		$future_dom = $now[3]+1;
 		$today      = $now[3];
 	}
 
 	# Find out month names for this, next, and previous months
 	my $monthname=POSIX::strftime("%B", @monthstart);
-	my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
-	my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
+	my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$params{pmonth}-1,$params{pyear}-1900)));
+	my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$params{nmonth}-1,$params{nyear}-1900)));
 
 	my $archivebase = 'archives';
 	$archivebase = $config{archivebase} if defined $config{archivebase};
@@ -114,26 +106,26 @@ sub format_month (@) {
   
 	# Calculate URL's for monthly archives.
 	my ($url, $purl, $nurl)=("$monthname",'','');
-	if (exists $pagesources{"$archivebase/$year/$month"}) {
+	if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$year/".sprintf("%02d", $month),
+			"$archivebase/$params{year}/".sprintf("%02d", $params{month}),
 			linktext => " $monthname ");
 	}
-	add_depends($params{page}, "$archivebase/$year/".sprintf("%02d", $month),
+	add_depends($params{page}, "$archivebase/$params{year}/".sprintf("%02d", $params{month}),
 		deptype("presence"));
-	if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) {
+	if (exists $pagesources{"$archivebase/$params{pyear}/$params{pmonth}"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$pyear/" . sprintf("%02d", $pmonth),
+			"$archivebase/$params{pyear}/" . sprintf("%02d", $params{pmonth}),
 			linktext => " $pmonthname ");
 	}
-	add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth),
+	add_depends($params{page}, "$archivebase/$params{pyear}/".sprintf("%02d", $params{pmonth}),
 		deptype("presence"));
-	if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) {
+	if (exists $pagesources{"$archivebase/$params{nyear}/$params{nmonth}"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$nyear/" . sprintf("%02d", $nmonth),
+			"$archivebase/$params{nyear}/" . sprintf("%02d", $params{nmonth}),
 			linktext => " $nmonthname ");
 	}
-	add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth),
+	add_depends($params{page}, "$archivebase/$params{nyear}/".sprintf("%02d", $params{nmonth}),
 		deptype("presence"));
 
 	# Start producing the month calendar
@@ -155,7 +147,7 @@ EOF
 	my %downame;
 	my %dowabbr;
 	for my $dow ($week_start_day..$week_start_day+6) {
-		my @day=localtime(timelocal(0,0,0,$start_day++,$month-1,$year-1900));
+		my @day=localtime(timelocal(0,0,0,$start_day++,$params{month}-1,$params{year}-1900));
 		my $downame = POSIX::strftime("%A", @day);
 		my $dowabbr = POSIX::strftime("%a", @day);
 		$downame{$dow % 7}=$downame;
@@ -176,7 +168,7 @@ EOF
 
 	# At this point, either the first is a week_start_day, in which case
 	# nothing has been printed, or else we are in the middle of a row.
-	for (my $day = 1; $day <= month_days(year => $year, month => $month);
+	for (my $day = 1; $day <= month_days(year => $params{year}, month => $params{month});
 	     $day++, $wday++, $wday %= 7) {
 		# At tihs point, on a week_start_day, we close out a row,
 		# and start a new one -- unless it is week_start_day on the
@@ -187,8 +179,8 @@ EOF
 		}
 		
 		my $tag;
-		my $mtag = sprintf("%02d", $month);
-		if (defined $pagesources{"$archivebase/$year/$mtag/$day"}) {
+		my $mtag = sprintf("%02d", $params{month});
+		if (defined $pagesources{"$archivebase/$params{year}/$mtag/$day"}) {
 			if ($day == $today) {
 				$tag='month-calendar-day-this-day';
 			}
@@ -197,9 +189,9 @@ EOF
 			}
 			$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
 			$calendar.=htmllink($params{page}, $params{destpage}, 
-			                    pagename($linkcache{"$year/$mtag/$day"}),
+			                    pagename($linkcache{"$params{year}/$mtag/$day"}),
 			                    "linktext" => "$day");
-			push @list, pagename($linkcache{"$year/$mtag/$day"});
+			push @list, pagename($linkcache{"$params{year}/$mtag/$day"});
 			$calendar.=qq{</td>\n};
 		}
 		else {
@@ -231,43 +223,35 @@ EOF
 sub format_year (@) {
 	my %params=@_;
 
-	my $pagespec = $params{pages};
-	my $year     = $params{year};
-	my $month    = $params{month};
-	my $pmonth   = $params{pmonth};
-	my $nmonth   = $params{nmonth};
-	my $pyear    = $params{pyear};
-	my $nyear    = $params{nyear};
-
 	my $calendar="\n";
 
 	my $future_month = 0;
-	$future_month = $now[4]+1 if ($year == $now[5]+1900);
+	$future_month = $now[4]+1 if ($params{year} == $now[5]+1900);
 
 	my $archivebase = 'archives';
 	$archivebase = $config{archivebase} if defined $config{archivebase};
 	$archivebase = $params{archivebase} if defined $params{archivebase};
 
 	# calculate URL's for previous and next years
-	my ($url, $purl, $nurl)=("$year",'','');
-	if (exists $pagesources{"$archivebase/$year"}) {
+	my ($url, $purl, $nurl)=("$params{year}",'','');
+	if (exists $pagesources{"$archivebase/$params{year}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$year",
-			linktext => "$year");
+			"$archivebase/$params{year}",
+			linktext => "$params{year}");
 	}
-	add_depends($params{page}, "$archivebase/$year", deptype("presence"));
-	if (exists $pagesources{"$archivebase/$pyear"}) {
+	add_depends($params{page}, "$archivebase/$params{year}", deptype("presence"));
+	if (exists $pagesources{"$archivebase/$params{pyear}"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$pyear",
+			"$archivebase/$params{pyear}",
 			linktext => "\&larr;");
 	}
-	add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
-	if (exists $pagesources{"$archivebase/$nyear"}) {
+	add_depends($params{page}, "$archivebase/$params{pyear}", deptype("presence"));
+	if (exists $pagesources{"$archivebase/$params{nyear}"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$nyear",
+			"$archivebase/$params{nyear}",
 			linktext => "\&rarr;");
 	}
-	add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
+	add_depends($params{page}, "$archivebase/$params{nyear}", deptype("presence"));
 
 	# Start producing the year calendar
 	$calendar=<<EOF;
@@ -282,8 +266,8 @@ sub format_year (@) {
 	</tr>
 EOF
 
-	for ($month = 1; $month <= 12; $month++) {
-		my @day=localtime(timelocal(0,0,0,15,$month-1,$year-1900));
+	for (my $month = 1; $month <= 12; $month++) {
+		my @day=localtime(timelocal(0,0,0,15,$month-1,$params{year}-1900));
 		my $murl;
 		my $monthname = POSIX::strftime("%B", @day);
 		my $monthabbr = POSIX::strftime("%b", @day);
@@ -291,14 +275,14 @@ EOF
 		my $tag;
 		my $mtag=sprintf("%02d", $month);
 		if ($month == $params{month}) {
-			if ($pagesources{"$archivebase/$year/$mtag"}) {
+			if ($pagesources{"$archivebase/$params{year}/$mtag"}) {
 				$tag = 'this_month_link';
 			}
 			else {
 				$tag = 'this_month_nolink';
 			}
 		}
-		elsif ($pagesources{"$archivebase/$year/$mtag"}) {
+		elsif ($pagesources{"$archivebase/$params{year}/$mtag"}) {
 			$tag = 'month_link';
 		} 
 		elsif ($future_month && $month >= $future_month) {
@@ -308,9 +292,9 @@ EOF
 			$tag = 'month_nolink';
 		}
 
-		if ($pagesources{"$archivebase/$year/$mtag"}) {
+		if ($pagesources{"$archivebase/$params{year}/$mtag"}) {
 			$murl = htmllink($params{page}, $params{destpage}, 
-				"$archivebase/$year/$mtag",
+				"$archivebase/$params{year}/$mtag",
 				linktext => "$monthabbr");
 			$calendar.=qq{\t<td class="$tag">};
 			$calendar.=$murl;
@@ -319,7 +303,7 @@ EOF
 		else {
 			$calendar.=qq{\t<td class="$tag">$monthabbr</td>\n};
 		}
-		add_depends($params{page}, "$archivebase/$year/$mtag",
+		add_depends($params{page}, "$archivebase/$params{year}/$mtag",
 			deptype("presence"));
 
 		$calendar.=qq{\t</tr>\n} if ($month % $params{months_per_row} == 0);
@@ -356,28 +340,22 @@ sub preprocess (@) {
 	}
 
 	# Calculate month names for next month, and previous months
-	my $pmonth = $params{month} - 1;
-	my $nmonth = $params{month} + 1;
-	my $pyear  = $params{year}  - 1;
-	my $nyear  = $params{year}  + 1;
+	$params{pmonth} = $params{month} - 1;
+	$params{nmonth} = $params{month} + 1;
+	$params{pyear}  = $params{year}  - 1;
+	$params{nyear}  = $params{year}  + 1;
 
 	# Adjust for January and December
 	if ($params{month} == 1) {
-		$pmonth = 12;
-		$pyear--;
+		$params{pmonth} = 12;
+		$params{pyear}--;
 	}
 	if ($params{month} == 12) {
-		$nmonth = 1;
-		$nyear++;
+		$params{nmonth} = 1;
+		$params{nyear}++;
 	}
 
-	$params{pmonth}=$pmonth;
-	$params{nmonth}=$nmonth;
-	$params{pyear} =$pyear;
-	$params{nyear} =$nyear;
-
-	my $calendar="\n";
-
+	my $calendar="";
 	if ($params{type} =~ /month/i) {
 		$calendar=format_month(%params);
 	}
-- 
cgit v1.2.3


From dd80be66ee7d9a28e788efcc1b3eb62bbe8611dd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 21:06:10 -0400
Subject: calendar: Fix midnight rebuild trigger of calendars with explicit
 month/year.

It was just broken for calendars with an explicit month or year, not
triggering at all.

Now it will update those at appropriate times.
---
 IkiWiki/Plugin/calendar.pm | 42 +++++++++++++++++++++++++++++++++---------
 debian/changelog           |  2 ++
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index fe7ee0361..9cbfd769d 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -318,24 +318,48 @@ EOF
 
 sub preprocess (@) {
 	my %params=@_;
+
+	my $thisyear=1900 + $now[5];
+	my $thismonth=1 + $now[4];
+
 	$params{pages} = "*"            unless defined $params{pages};
 	$params{type}  = "month"        unless defined $params{type};
-	$params{month} = sprintf("%02d", $params{month}) if defined  $params{month};
 	$params{week_start_day} = 0     unless defined $params{week_start_day};
 	$params{months_per_row} = 3     unless defined $params{months_per_row};
-
-	if (! defined $params{year} || ! defined $params{month}) {
-		# Record that the calendar next changes at midnight.
+	$params{year}  = $thisyear	unless defined $params{year};
+	$params{month} = $thismonth	unless defined $params{month};
+
+	$params{month} = sprintf("%02d", $params{month});
+			
+	if ($params{type} eq 'month' && $params{year} == $thisyear
+	    && $params{month} == $thismonth) {
+		# calendar for current month, updates next midnight
 		$pagestate{$params{destpage}}{calendar}{nextchange}=($time
 			+ (60 - $now[0])		# seconds
 			+ (59 - $now[1]) * 60		# minutes
 			+ (23 - $now[2]) * 60 * 60	# hours
 		);
-		
-		$params{year}  = 1900 + $now[5] unless defined $params{year};
-		$params{month} = 1    + $now[4] unless defined $params{month};
+	}
+	elsif ($params{type} eq 'month' &&
+	       (($params{year} == $thisyear && $params{month} > $thismonth) ||
+	        $params{year} > $thisyear)) {
+		# calendar for upcoming month, updates 1st of that month
+		$pagestate{$params{destpage}}{calendar}{nextchange}=
+			timelocal(0, 0, 0, 1, $params{month}-1, $params{year});
+	}
+	elsif ($params{type} eq 'year' && $params{year} == $thisyear) {
+		# calendar for current year, updates 1st of next month
+		$pagestate{$params{destpage}}{calendar}{nextchange}=
+			timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year});
+	}
+	elsif ($params{type} eq 'year' && $params{year} > $thisyear) {
+		# calendar for upcoming year, updates 1st of that year
+		$pagestate{$params{destpage}}{calendar}{nextchange}=
+			timelocal(0, 0, 0, 1, 1-1, $params{year});
 	}
 	else {
+		# calendar for past month or year, does not need
+		# to update any more
 		delete $pagestate{$params{destpage}}{calendar};
 	}
 
@@ -356,10 +380,10 @@ sub preprocess (@) {
 	}
 
 	my $calendar="";
-	if ($params{type} =~ /month/i) {
+	if ($params{type} eq 'month') {
 		$calendar=format_month(%params);
 	}
-	elsif ($params{type} =~ /year/i) {
+	elsif ($params{type} eq 'year') {
 		$calendar=format_year(%params);
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 0e288dd08..c64758a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
   * Transitive dependencies are now correctly supported.
   * ikiwiki-calendar: New command automates creation of archive pages
     using the calendar plugin.
+  * calendar: Fix midnight rebuild trigger of calendars with explicit
+    month/year.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 09 Oct 2009 19:53:50 -0400
 
-- 
cgit v1.2.3


From f3342773d3a6c9da11c248c4cc385dca284add06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 21:42:59 -0400
Subject: calendar: Fix bug in next/previous year/month links, which sometimes
 linked to an archive page from the wrong year.

---
 IkiWiki/Plugin/calendar.pm | 63 ++++++++++++++++++++++++----------------------
 debian/changelog           |  2 ++
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 9cbfd769d..5b4bfac89 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -81,6 +81,21 @@ sub format_month (@) {
 		# Only one posting per day is being linked to.
 		$linkcache{"$year/$mtag/$mday"} = "$src";
 	}
+		
+	my $pmonth = $params{month} - 1;
+	my $nmonth = $params{month} + 1;
+	my $pyear  = $params{year};
+	my $nyear  = $params{year};
+
+	# Adjust for January and December
+	if ($params{month} == 1) {
+		$pmonth = 12;
+		$pyear--;
+	}
+	if ($params{month} == 12) {
+		$nmonth = 1;
+		$nyear++;
+	}
 
 	my @list;
 	my $calendar="\n";
@@ -97,8 +112,8 @@ sub format_month (@) {
 
 	# Find out month names for this, next, and previous months
 	my $monthname=POSIX::strftime("%B", @monthstart);
-	my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$params{pmonth}-1,$params{pyear}-1900)));
-	my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$params{nmonth}-1,$params{nyear}-1900)));
+	my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
+	my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
 
 	my $archivebase = 'archives';
 	$archivebase = $config{archivebase} if defined $config{archivebase};
@@ -113,19 +128,19 @@ sub format_month (@) {
 	}
 	add_depends($params{page}, "$archivebase/$params{year}/".sprintf("%02d", $params{month}),
 		deptype("presence"));
-	if (exists $pagesources{"$archivebase/$params{pyear}/$params{pmonth}"}) {
+	if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$params{pyear}/" . sprintf("%02d", $params{pmonth}),
+			"$archivebase/$pyear/" . sprintf("%02d", $pmonth),
 			linktext => " $pmonthname ");
 	}
-	add_depends($params{page}, "$archivebase/$params{pyear}/".sprintf("%02d", $params{pmonth}),
+	add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth),
 		deptype("presence"));
-	if (exists $pagesources{"$archivebase/$params{nyear}/$params{nmonth}"}) {
+	if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$params{nyear}/" . sprintf("%02d", $params{nmonth}),
+			"$archivebase/$nyear/" . sprintf("%02d", $nmonth),
 			linktext => " $nmonthname ");
 	}
-	add_depends($params{page}, "$archivebase/$params{nyear}/".sprintf("%02d", $params{nmonth}),
+	add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth),
 		deptype("presence"));
 
 	# Start producing the month calendar
@@ -222,8 +237,11 @@ EOF
 
 sub format_year (@) {
 	my %params=@_;
-
+		
 	my $calendar="\n";
+	
+	my $pyear = $params{year}  - 1;
+	my $nyear = $params{year}  + 1;
 
 	my $future_month = 0;
 	$future_month = $now[4]+1 if ($params{year} == $now[5]+1900);
@@ -240,18 +258,18 @@ sub format_year (@) {
 			linktext => "$params{year}");
 	}
 	add_depends($params{page}, "$archivebase/$params{year}", deptype("presence"));
-	if (exists $pagesources{"$archivebase/$params{pyear}"}) {
+	if (exists $pagesources{"$archivebase/$pyear"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$params{pyear}",
+			"$archivebase/$pyear",
 			linktext => "\&larr;");
 	}
-	add_depends($params{page}, "$archivebase/$params{pyear}", deptype("presence"));
-	if (exists $pagesources{"$archivebase/$params{nyear}"}) {
+	add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
+	if (exists $pagesources{"$archivebase/$nyear"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$params{nyear}",
+			"$archivebase/$nyear",
 			linktext => "\&rarr;");
 	}
-	add_depends($params{page}, "$archivebase/$params{nyear}", deptype("presence"));
+	add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
 
 	# Start producing the year calendar
 	$calendar=<<EOF;
@@ -364,21 +382,6 @@ sub preprocess (@) {
 	}
 
 	# Calculate month names for next month, and previous months
-	$params{pmonth} = $params{month} - 1;
-	$params{nmonth} = $params{month} + 1;
-	$params{pyear}  = $params{year}  - 1;
-	$params{nyear}  = $params{year}  + 1;
-
-	# Adjust for January and December
-	if ($params{month} == 1) {
-		$params{pmonth} = 12;
-		$params{pyear}--;
-	}
-	if ($params{month} == 12) {
-		$params{nmonth} = 1;
-		$params{nyear}++;
-	}
-
 	my $calendar="";
 	if ($params{type} eq 'month') {
 		$calendar=format_month(%params);
diff --git a/debian/changelog b/debian/changelog
index c64758a77..8881c48aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
     using the calendar plugin.
   * calendar: Fix midnight rebuild trigger of calendars with explicit
     month/year.
+  * calendar: Fix bug in next/previous year/month links, which sometimes
+    linked to an archive page from the wrong year.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 09 Oct 2009 19:53:50 -0400
 
-- 
cgit v1.2.3


From 8a37be35acb2c2c37d272489d2f2678e47c61834 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 21:43:16 -0400
Subject: fix day links

I broke this recently.
---
 IkiWiki/Plugin/calendar.pm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 5b4bfac89..0266612ae 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -71,7 +71,6 @@ sub format_month (@) {
 				# month calendar when pages are added/removed
 				deptype => deptype("presence"))) {
 		my $mtime = $IkiWiki::pagectime{$p};
-		my $src   = $pagesources{$p};
 		my @date  = localtime($mtime);
 		my $mday  = $date[3];
 		my $month = $date[4] + 1;
@@ -79,7 +78,7 @@ sub format_month (@) {
 		my $mtag  = sprintf("%02d", $month);
 
 		# Only one posting per day is being linked to.
-		$linkcache{"$year/$mtag/$mday"} = "$src";
+		$linkcache{"$year/$mtag/$mday"} = $p;
 	}
 		
 	my $pmonth = $params{month} - 1;
@@ -97,7 +96,6 @@ sub format_month (@) {
 		$nyear++;
 	}
 
-	my @list;
 	my $calendar="\n";
 
 	# When did this month start?
@@ -195,7 +193,7 @@ EOF
 		
 		my $tag;
 		my $mtag = sprintf("%02d", $params{month});
-		if (defined $pagesources{"$archivebase/$params{year}/$mtag/$day"}) {
+		if (defined $linkcache{"$params{year}/$mtag/$day"}) {
 			if ($day == $today) {
 				$tag='month-calendar-day-this-day';
 			}
@@ -204,9 +202,8 @@ EOF
 			}
 			$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
 			$calendar.=htmllink($params{page}, $params{destpage}, 
-			                    pagename($linkcache{"$params{year}/$mtag/$day"}),
+			                    $linkcache{"$params{year}/$mtag/$day"},
 			                    "linktext" => "$day");
-			push @list, pagename($linkcache{"$params{year}/$mtag/$day"});
 			$calendar.=qq{</td>\n};
 		}
 		else {
-- 
cgit v1.2.3


From 23a21850faf1cbb4bd8547b11563c5806617cf7e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 21:52:50 -0400
Subject: fix next/prev month padding bug

---
 IkiWiki/Plugin/calendar.pm | 21 ++++++++++++---------
 debian/changelog           |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 0266612ae..cf133e8dc 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -96,6 +96,10 @@ sub format_month (@) {
 		$nyear++;
 	}
 
+	# Add padding.
+	$pmonth=sprintf("%02d", $pmonth);
+	$nmonth=sprintf("%02d", $nmonth);
+
 	my $calendar="\n";
 
 	# When did this month start?
@@ -121,24 +125,24 @@ sub format_month (@) {
 	my ($url, $purl, $nurl)=("$monthname",'','');
 	if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$params{year}/".sprintf("%02d", $params{month}),
+			"$archivebase/$params{year}/".$params{month},
 			linktext => " $monthname ");
 	}
-	add_depends($params{page}, "$archivebase/$params{year}/".sprintf("%02d", $params{month}),
+	add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
 		deptype("presence"));
 	if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$pyear/" . sprintf("%02d", $pmonth),
+			"$archivebase/$pyear/$pmonth",
 			linktext => " $pmonthname ");
 	}
-	add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth),
+	add_depends($params{page}, "$archivebase/$pyear/$pmonth",
 		deptype("presence"));
 	if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
-			"$archivebase/$nyear/" . sprintf("%02d", $nmonth),
+			"$archivebase/$nyear/$nmonth",
 			linktext => " $nmonthname ");
 	}
-	add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth),
+	add_depends($params{page}, "$archivebase/$nyear/$nmonth",
 		deptype("presence"));
 
 	# Start producing the month calendar
@@ -192,8 +196,7 @@ EOF
 		}
 		
 		my $tag;
-		my $mtag = sprintf("%02d", $params{month});
-		if (defined $linkcache{"$params{year}/$mtag/$day"}) {
+		if (defined $linkcache{"$params{year}/$params{month}/$day"}) {
 			if ($day == $today) {
 				$tag='month-calendar-day-this-day';
 			}
@@ -202,7 +205,7 @@ EOF
 			}
 			$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
 			$calendar.=htmllink($params{page}, $params{destpage}, 
-			                    $linkcache{"$params{year}/$mtag/$day"},
+			                    $linkcache{"$params{year}/$params{month}/$day"},
 			                    "linktext" => "$day");
 			$calendar.=qq{</td>\n};
 		}
diff --git a/debian/changelog b/debian/changelog
index 8881c48aa..5c47b2524 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,7 +31,7 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
   * calendar: Fix midnight rebuild trigger of calendars with explicit
     month/year.
   * calendar: Fix bug in next/previous year/month links, which sometimes
-    linked to an archive page from the wrong year.
+    linked to an archive page from the wrong year, or were missing.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 09 Oct 2009 19:53:50 -0400
 
-- 
cgit v1.2.3


From cf74cf7a37a1fa4e02dffc6f3ac580626d183433 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 21:55:06 -0400
Subject: calendar: use left and right arrows for next/prev months

This is consistent with the year display, and I think it is less
visually confusing than using the full month names.
---
 IkiWiki/Plugin/calendar.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index cf133e8dc..dcf2b6d64 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -133,14 +133,14 @@ sub format_month (@) {
 	if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/$pmonth",
-			linktext => " $pmonthname ");
+			linktext => " \&larr ");
 	}
 	add_depends($params{page}, "$archivebase/$pyear/$pmonth",
 		deptype("presence"));
 	if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/$nmonth",
-			linktext => " $nmonthname ");
+			linktext => " \&rarr ");
 	}
 	add_depends($params{page}, "$archivebase/$nyear/$nmonth",
 		deptype("presence"));
-- 
cgit v1.2.3


From e4c765c64fc31ab13c911b716e80b07b4d1a0037 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 22:11:11 -0400
Subject: calendar: avoid inline images in links

---
 IkiWiki/Plugin/calendar.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index dcf2b6d64..e3c5e2f2d 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -126,6 +126,7 @@ sub format_month (@) {
 	if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}/".$params{month},
+			noimageinline => 1,
 			linktext => " $monthname ");
 	}
 	add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
@@ -133,6 +134,7 @@ sub format_month (@) {
 	if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/$pmonth",
+			noimageinline => 1,
 			linktext => " \&larr ");
 	}
 	add_depends($params{page}, "$archivebase/$pyear/$pmonth",
@@ -140,6 +142,7 @@ sub format_month (@) {
 	if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/$nmonth",
+			noimageinline => 1,
 			linktext => " \&rarr ");
 	}
 	add_depends($params{page}, "$archivebase/$nyear/$nmonth",
@@ -205,8 +208,9 @@ EOF
 			}
 			$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
 			$calendar.=htmllink($params{page}, $params{destpage}, 
-			                    $linkcache{"$params{year}/$params{month}/$day"},
-			                    "linktext" => "$day");
+				$linkcache{"$params{year}/$params{month}/$day"},
+				noimageinline => 1,
+				"linktext" => "$day");
 			$calendar.=qq{</td>\n};
 		}
 		else {
@@ -255,18 +259,21 @@ sub format_year (@) {
 	if (exists $pagesources{"$archivebase/$params{year}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}",
+			noimageinline => 1,
 			linktext => "$params{year}");
 	}
 	add_depends($params{page}, "$archivebase/$params{year}", deptype("presence"));
 	if (exists $pagesources{"$archivebase/$pyear"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear",
+			noimageinline => 1,
 			linktext => "\&larr;");
 	}
 	add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
 	if (exists $pagesources{"$archivebase/$nyear"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear",
+			noimageinline => 1,
 			linktext => "\&rarr;");
 	}
 	add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
@@ -313,6 +320,7 @@ EOF
 		if ($pagesources{"$archivebase/$params{year}/$mtag"}) {
 			$murl = htmllink($params{page}, $params{destpage}, 
 				"$archivebase/$params{year}/$mtag",
+				noimageinline => 1,
 				linktext => "$monthabbr");
 			$calendar.=qq{\t<td class="$tag">};
 			$calendar.=$murl;
-- 
cgit v1.2.3


From 33f42db2ea0422551223c255d85d9f4e45ee404b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 22:38:42 -0400
Subject: git: --getctime will now follow renames back to the original creation
 of a file.

This will be a bit more expensive, but --getctime does not need to be fast.
And getting the real creation time a very useful when untangling blog
histories that involve renames.
---
 IkiWiki/Plugin/git.pm | 8 +++++---
 debian/changelog      | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index ad58231e0..e10283f59 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -613,9 +613,11 @@ sub rcs_getctime ($) {
 	# Remove srcdir prefix
 	$file =~ s/^\Q$config{srcdir}\E\/?//;
 
-	my @sha1s = run_or_non('git', 'rev-list', 'HEAD', '--', $file);
-	my $ci    = git_commit_info($sha1s[$#sha1s], 1);
-	my $ctime = $ci->{'author_epoch'};
+	my @raw_lines = run_or_die('git', 'log', '--reverse', '--follow',
+		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
+		'-r', '--', $file);
+	my $first = parse_diff_tree("", \@raw_lines);
+	my $ctime = $first->{'author_epoch'};
 	debug("ctime for '$file': ". localtime($ctime));
 
 	return $ctime;
diff --git a/debian/changelog b/debian/changelog
index 22935955a..76094e7a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20091010) UNRELEASED; urgency=low
 
   * ikiwiki-calendar: New command automates creation of archive pages
     using the calendar plugin.
+  * git: --getctime will now follow renames back to the original creation
+    of a file.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 11 Oct 2009 15:54:45 -0400
 
-- 
cgit v1.2.3


From 6993d1f905c35bbad415d3f60cde924da32e80a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 22:58:17 -0400
Subject: response

---
 doc/plugins/lockedit/discussion.mdwn | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/doc/plugins/lockedit/discussion.mdwn b/doc/plugins/lockedit/discussion.mdwn
index b058b2b07..8a08edaad 100644
--- a/doc/plugins/lockedit/discussion.mdwn
+++ b/doc/plugins/lockedit/discussion.mdwn
@@ -1,21 +1,8 @@
-This plugin not only locks pages but ensures too a user is logged in. This seems to me redundant with signedit. I propose :
+This plugin not only locks pages but ensures too a user is logged in. This
+seems to me redundant with signedit. I propose [removing the if block that
+calls needsignin ].
 
-    sub canedit ($$) {
-    	my $page=shift;
-    	my $cgi=shift;
-    	my $session=shift;
-    
-    	my $user=$session->param("name");
-    	return undef if defined $user && IkiWiki::is_admin($user);
-    
-    	if (defined $config{locked_pages} && length $config{locked_pages} &&
-    	    pagespec_match($page, $config{locked_pages},
-    		    user => $session->param("name"),
-    		    ip => $ENV{REMOTE_ADDR},
-    	    )) {
-    		return sprintf(gettext("%s is locked and cannot be edited"),
-    			htmllink("", "", $page, noimageinline => 1));
-    	}
-    
-    	return undef;
-    }
+> That was added because the most typical reason for being unable to edit a
+> page is that you are not logged in. And without the jump to logging the
+> user in, there is no way for the user to log in, without navigating away
+> from the page they were trying to edit. --[[Joey]] 
-- 
cgit v1.2.3


From bf577d34c79ebe48efdf06ed826f9109e196cc6d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 23:07:31 -0400
Subject: can't use --reverse with git log --follow

Meh, git.
---
 IkiWiki/Plugin/git.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index e10283f59..9ecda4ffb 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -613,11 +613,14 @@ sub rcs_getctime ($) {
 	# Remove srcdir prefix
 	$file =~ s/^\Q$config{srcdir}\E\/?//;
 
-	my @raw_lines = run_or_die('git', 'log', '--reverse', '--follow',
+	my @raw_lines = run_or_die('git', 'log', '--follow',
 		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
 		'-r', '--', $file);
-	my $first = parse_diff_tree("", \@raw_lines);
-	my $ctime = $first->{'author_epoch'};
+	my @ci;
+	while (my $parsed = parse_diff_tree("", \@raw_lines)) {
+		push @ci, $parsed;
+	}
+	my $ctime = $ci[$#ci]->{'author_epoch'};
 	debug("ctime for '$file': ". localtime($ctime));
 
 	return $ctime;
-- 
cgit v1.2.3


From 1c6794f46a729eea8c7e7d49fcf7c6a54dae2ba9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 23:44:50 -0400
Subject: allow spans

---
 doc/ikiwiki-calendar.mdwn | 6 +++---
 ikiwiki-calendar          | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn
index e2cc612f3..3f5c6a29e 100644
--- a/doc/ikiwiki-calendar.mdwn
+++ b/doc/ikiwiki-calendar.mdwn
@@ -4,7 +4,7 @@ ikiwiki-calendar - create calendar archive pages
 
 # SYNOPSIS
 
-ikiwiki-calendar [-f] your.setup [pagespec] [year]
+ikiwiki-calendar [-f] your.setup [pagespec] [startyear [endyear]]
 
 # DESCRIPTION
 
@@ -22,8 +22,8 @@ default is all pages. To limit it to only posts in a blog,
 use something like "posts/* and !*/Discussion".
 
 It defaults to creating calendar pages for the current
-year, as well as the previous year, and the next year.
-If you specify a year, it will create pages for that year.
+year. If you specify a year, it will create pages for that year.
+Specify a second year to create pages for a span of years.
 
 Existing pages will not be overwritten by this command by default.
 Use the `-f` switch to force it to overwrite any existing pages.
diff --git a/ikiwiki-calendar b/ikiwiki-calendar
index 074f0d6fd..a9548d6ec 100755
--- a/ikiwiki-calendar
+++ b/ikiwiki-calendar
@@ -15,7 +15,8 @@ GetOptions(
 ) || usage();
 my $setup=shift		|| usage();
 my $pagespec=shift	|| "*";
-my $year=shift		|| 1900+(localtime(time))[5];
+my $startyear=shift	|| 1900+(localtime(time))[5];
+my $endyear=shift	|| $startyear;
 
 %config=IkiWiki::defaultconfig();
 IkiWiki::Setup::load($setup);
@@ -43,7 +44,7 @@ sub writearchive ($$;$) {
 	}
 }
 
-foreach my $y ($year-1, $year, $year+1) {
+foreach my $y ($startyear..$endyear) {
 	writearchive("calendaryear.tmpl", $y);
 	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
 		writearchive("calendarmonth.tmpl", $y, $m);
-- 
cgit v1.2.3


From 139085b3f294f3a8e3fd1663aa232a9e901ca3e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 23:53:21 -0400
Subject: add some TODO tests for influence blocking

---
 t/pagespec_match_list.t   | 31 ++++++++++++++++++++++++++++++-
 t/pagespec_match_result.t | 18 ------------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 301197cc1..51145a973 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 49;
+use Test::More tests => 61;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -82,4 +82,33 @@ foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)") {
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_CONTENT);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
 	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+}
+
+TODO: {
+	local $TODO = "optimisation not yet written";
+
+# a pagespec that hard fails due to a glob, etc, will not set influences
+# for other terms that normally would.
+foreach my $spec ("nosuchpage and link(bar)", "link(bar) and */Discussion") {
+	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+}
+
+# a pagespec containing a hard failure that is ored with another term will
+# get influences from the other term
+foreach my $spec ("nosuchpage or link(bar)", "link(bar) or */Discussion") {
+	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo2}{foo2} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+}
+
 }
diff --git a/t/pagespec_match_result.t b/t/pagespec_match_result.t
index c2112bf14..d9c31d6f0 100755
--- a/t/pagespec_match_result.t
+++ b/t/pagespec_match_result.t
@@ -57,21 +57,3 @@ ok(! $s->influences->{foo}, "removed 0 influence");
 ok(! $s->influences->{bar}, "removed 1 influence");
 ok($s->influences->{baz}, "set influence");
 ok($s->influences_static);
-
-# influence blocking
-my $r=F()->block & S(foo => 1);
-ok(! $r->influences->{foo}, "failed blocker & influence -> does not pass");
-$r=F()->block | S(foo => 1);
-ok($r->influences->{foo}, "failed blocker | influence -> does pass");
-$r=S(foo => 1) & F()->block;
-ok(! $r->influences->{foo}, "influence & failed blocker -> does not pass");
-$r=S(foo => 1) | F()->block;
-ok($r->influences->{foo}, "influence | failed blocker -> does pass");
-$r=S(foo => 1) & F()->block & S(foo => 2);
-ok(! $r->influences->{foo}, "influence & failed blocker & influence -> does not pass");
-$r=S(foo => 1) | F()->block | S(foo => 2);
-ok($r->influences->{foo}, "influence | failed blocker | influence -> does pass");
-$r=S()->block & S(foo => 1);
-ok($r->influences->{foo}, "successful blocker -> does pass");
-$r=(! S()->block) & S(foo => 1);
-ok(! $r->influences->{foo}, "! successful blocker -> failed blocker");
-- 
cgit v1.2.3


From 7e7953f0e240bc0e9201942dd88a4f911904d151 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 00:05:31 -0400
Subject: formatting

---
 doc/ikiwiki-calendar.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn
index 3f5c6a29e..982892fca 100644
--- a/doc/ikiwiki-calendar.mdwn
+++ b/doc/ikiwiki-calendar.mdwn
@@ -28,7 +28,7 @@ Specify a second year to create pages for a span of years.
 Existing pages will not be overwritten by this command by default.
 Use the `-f` switch to force it to overwrite any existing pages.
 
-## CRONTAB
+# CRONTAB
 
 While this command only needs to be run once a year to update
 the archive pages for each new year, you are recommended to set up
-- 
cgit v1.2.3


From e82b43bf950e1ff11683ae96abdd29879f92488a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 00:50:48 -0400
Subject: skip merges

git log --follow seems to sometimes show merges from before the file was
ever created. So, skip them, a file shouldn't be first created during a
merge anyway.
---
 IkiWiki/Plugin/git.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 9ecda4ffb..c5c83a3a7 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -613,7 +613,8 @@ sub rcs_getctime ($) {
 	# Remove srcdir prefix
 	$file =~ s/^\Q$config{srcdir}\E\/?//;
 
-	my @raw_lines = run_or_die('git', 'log', '--follow',
+	my @raw_lines = run_or_die('git', 'log', 
+		'--follow', '--no-merges',
 		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
 		'-r', '--', $file);
 	my @ci;
-- 
cgit v1.2.3


From 11e6d650eae4377485cb83f61a0ce9519ceb4c57 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 12:19:42 -0400
Subject: calendar: Fix CSS for year calendar to match the plugin
 documentation.

The names in the documentation were completly different, but
also seemed better chosen than the names in the code.
---
 IkiWiki/Plugin/calendar.pm | 13 ++++---------
 debian/changelog           |  1 +
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index e3c5e2f2d..71c671d67 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -300,21 +300,16 @@ EOF
 		my $tag;
 		my $mtag=sprintf("%02d", $month);
 		if ($month == $params{month}) {
-			if ($pagesources{"$archivebase/$params{year}/$mtag"}) {
-				$tag = 'this_month_link';
-			}
-			else {
-				$tag = 'this_month_nolink';
-			}
+			$tag = 'year-calendar-this-month';
 		}
 		elsif ($pagesources{"$archivebase/$params{year}/$mtag"}) {
-			$tag = 'month_link';
+			$tag = 'year-calendar-month-link';
 		} 
 		elsif ($future_month && $month >= $future_month) {
-			$tag = 'month_future';
+			$tag = 'year-calendar-month-future';
 		} 
 		else {
-			$tag = 'month_nolink';
+			$tag = 'year-calendar-month-nolink';
 		}
 
 		if ($pagesources{"$archivebase/$params{year}/$mtag"}) {
diff --git a/debian/changelog b/debian/changelog
index e9f09a8c6..b9d1923cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
     linked to an archive page from the wrong year, or were missing.
   * git: --getctime will now follow renames back to the original creation
     of a file.
+  * calendar: Fix CSS for year calendar to match the plugin documentation.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 09 Oct 2009 19:53:50 -0400
 
-- 
cgit v1.2.3


From 6678ab8fb3c956ea52d08e546cea7c8e3204aefb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 12:21:46 -0400
Subject: Added minimal default CSS for calendar plugin, just highlighting the
 current day.

---
 debian/changelog | 2 ++
 doc/style.css    | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b9d1923cd..ef92e48fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
   * git: --getctime will now follow renames back to the original creation
     of a file.
   * calendar: Fix CSS for year calendar to match the plugin documentation.
+  * Added minimal default CSS for calendar plugin, just highlighting the
+    current day.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 09 Oct 2009 19:53:50 -0400
 
diff --git a/doc/style.css b/doc/style.css
index 4770fc942..be86a0818 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -403,7 +403,6 @@ span.color {
 }
 
 /* Used by the highlight plugin. */
-
 pre.hl { color:#000000; background-color:#ffffff; }
 .hl.num { color:#2928ff; }
 .hl.esc { color:#ff00ff; }
@@ -419,3 +418,7 @@ pre.hl { color:#000000; background-color:#ffffff; }
 .hl.kwb { color:#830000; }
 .hl.kwc { color:#000000; font-weight:bold; }
 .hl.kwd { color:#010181; }
+
+/* For the calendar plugin. */
+.month-calendar-day-this-day { background-color: #eee; }
+.year-calendar-this-month { background-color: #eee; }
-- 
cgit v1.2.3


From 227540fd875bfaa6b810c0d7caa346f32d5bd7ce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 12:30:10 -0400
Subject: calendar: Add creation time limits to user's pagespec

This avoids all calendars rebuilding when a new page is added
that will only show in one of them.
---
 IkiWiki/Plugin/calendar.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 71c671d67..5aac95884 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -66,7 +66,8 @@ sub format_month (@) {
 	my %params=@_;
 
 	my %linkcache;
-	foreach my $p (pagespec_match_list($params{page}, $params{pages},
+	foreach my $p (pagespec_match_list($params{page}, 
+				"creation_year($params{year}) and creation_month($params{month}) and ($params{pages})",
 				# add presence dependencies to update
 				# month calendar when pages are added/removed
 				deptype => deptype("presence"))) {
-- 
cgit v1.2.3


From 22737e53f1b0367bc9bfb8d7bcbfc4dcc08a81ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 14:05:56 -0400
Subject: remove whitespace from within arrow links

---
 IkiWiki/Plugin/calendar.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 5aac95884..d5a80795a 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -136,7 +136,7 @@ sub format_month (@) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/$pmonth",
 			noimageinline => 1,
-			linktext => " \&larr ");
+			linktext => "\&larr");
 	}
 	add_depends($params{page}, "$archivebase/$pyear/$pmonth",
 		deptype("presence"));
@@ -144,7 +144,7 @@ sub format_month (@) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/$nmonth",
 			noimageinline => 1,
-			linktext => " \&rarr ");
+			linktext => "\&rarr");
 	}
 	add_depends($params{page}, "$archivebase/$nyear/$nmonth",
 		deptype("presence"));
-- 
cgit v1.2.3


From 5c78192435210cdb7792ed56b04c2ef24a2d2127 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 14:19:04 -0400
Subject: year calendar: only link to months that have posts

This does mean the year calendars depend on existence of all posts made in
the year and have to be updated.
---
 IkiWiki/Plugin/calendar.pm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index d5a80795a..ddcd1a823 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -242,6 +242,20 @@ EOF
 
 sub format_year (@) {
 	my %params=@_;
+	
+	my @post_months;
+	foreach my $p (pagespec_match_list($params{page}, 
+				"creation_year($params{year}) and ($params{pages})",
+				# add presence dependencies to update
+				# year calendar's links to months when
+				# pages are added/removed
+				deptype => deptype("presence"))) {
+		my $mtime = $IkiWiki::pagectime{$p};
+		my @date  = localtime($mtime);
+		my $month = $date[4] + 1;
+
+		$post_months[$month]++;
+	}
 		
 	my $calendar="\n";
 	
@@ -313,7 +327,8 @@ EOF
 			$tag = 'year-calendar-month-nolink';
 		}
 
-		if ($pagesources{"$archivebase/$params{year}/$mtag"}) {
+		if ($pagesources{"$archivebase/$params{year}/$mtag"} &&
+		    $post_months[$mtag]) {
 			$murl = htmllink($params{page}, $params{destpage}, 
 				"$archivebase/$params{year}/$mtag",
 				noimageinline => 1,
-- 
cgit v1.2.3


From 28c4caea59543b6d8fd0c62ff5a60aff67a9bba7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 14:22:48 -0400
Subject: year calendar: Avoid highlighting the current month in a different
 year

---
 IkiWiki/Plugin/calendar.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index ddcd1a823..c9bdf4a17 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -262,8 +262,9 @@ sub format_year (@) {
 	my $pyear = $params{year}  - 1;
 	my $nyear = $params{year}  + 1;
 
+	my $thisyear = $now[5]+1900;
 	my $future_month = 0;
-	$future_month = $now[4]+1 if ($params{year} == $now[5]+1900);
+	$future_month = $now[4]+1 if $params{year} == $thisyear;
 
 	my $archivebase = 'archives';
 	$archivebase = $config{archivebase} if defined $config{archivebase};
@@ -314,7 +315,7 @@ EOF
 		$calendar.=qq{\t<tr>\n}  if ($month % $params{months_per_row} == 1);
 		my $tag;
 		my $mtag=sprintf("%02d", $month);
-		if ($month == $params{month}) {
+		if ($month == $params{month} && $thisyear == $params{year}) {
 			$tag = 'year-calendar-this-month';
 		}
 		elsif ($pagesources{"$archivebase/$params{year}/$mtag"}) {
-- 
cgit v1.2.3


From 7272938a116b2c87f8c34057034b5f4e9244cdf8 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Mon, 12 Oct 2009 16:44:12 -0400
Subject:

---
 doc/plugins/lockedit/discussion.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/plugins/lockedit/discussion.mdwn b/doc/plugins/lockedit/discussion.mdwn
index 8a08edaad..867fc6a51 100644
--- a/doc/plugins/lockedit/discussion.mdwn
+++ b/doc/plugins/lockedit/discussion.mdwn
@@ -6,3 +6,13 @@ calls needsignin ].
 > page is that you are not logged in. And without the jump to logging the
 > user in, there is no way for the user to log in, without navigating away
 > from the page they were trying to edit. --[[Joey]] 
+
+>> Ok, but the problem is that when you don't want any signin form you end up
+>> with a lone login button. That might happend if you lock pages only on IP
+>> adresses, if you use another cookie from another webapp...
+
+>> That happends to me and I had to reimplement lockedit in my private auth
+>> plugin.
+
+>> Perhaps you could return undef on that case and let another plugin do the
+>> needsignin call ? -- [[Jogo]]
-- 
cgit v1.2.3


From 68433d82b88e93962561d6ddad8689984398def1 Mon Sep 17 00:00:00 2001
From: lnussel <lnussel@web>
Date: Tue, 13 Oct 2009 05:09:37 -0400
Subject: add shortcut for novell bugzilla

---
 doc/shortcuts.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index b84d71c3d..54dd0fdb1 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -60,6 +60,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
 * [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
+* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-- 
cgit v1.2.3


From 5e4e43e2c73d6077f8091fe063add1ebce9335e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 13 Oct 2009 13:33:51 -0400
Subject: match_link: dynamic influence needed for page that currently has no
 links

---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index cd93fe969..2847c7e0f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2168,7 +2168,7 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links")
+	return IkiWiki::FailReason->new("$page has no links", "" => 1)
 		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
-- 
cgit v1.2.3


From 129bde667604a73e26fce2491dd5e431aef143af Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.myopenid.com/"
 <http://jeremiahfoster.myopenid.com/@web>
Date: Tue, 13 Oct 2009 13:35:44 -0400
Subject: Added a question about permissions.

---
 doc/setup/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 0501f443a..32a8f6de2 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -1,3 +1,5 @@
+I have copied over the ikiwiki.setup file from /usr/share/doc/ikiwiki/ to /etc/ikiwiki/ and run it after editing. My site gets built but when I click on the 'edit' button, firefox and google chrome download the cgi file instead of creating a way to edit it. The permissions on my ikiwiki.cgi script look like this: -rwsr-sr-x  1 root root 13359 2009-10-13 19:21 ikiwiki.cgi. Is there something I should do, i.e. change permissions, so I can get it to run correctly? (jeremiah)
+
 I just went through the standard procedure described for setup, copied the blog directory from examples into my source directory, ran ikiwiki, and everything seems to have worked, except that none of the 
 &#91;&#91;!meta ... &#93;&#93; tags get converted. They simply show up in the html files unformatted, with no exclamation point, and with p tags around them. Any ideas? using ikiwiki version 2.40 on freebsd --mjg
 
-- 
cgit v1.2.3


From 7e326ebfce89b7e81b361afacefa361fd8919586 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 13 Oct 2009 13:57:39 -0400
Subject: update

---
 doc/todo/dependency_types.mdwn | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index 1c2f579b3..2bdf1d6a3 100644
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -552,22 +552,16 @@ operators. Currently, this turns into roughly:
 `FailReason() & SuccessReason(patch)`
 
 Let's say that the glob instead returns a HardFailReason, which when
-ANDed with another object, drops their influences. (But when ORed, combines
-them.) Fixes the above, but does it always work?
-
-"(bugs/* or link(patch)) and backlink(index)" =>
-`( HardFailReason() | SuccessReason(page) ) & SuccessReason(index)`` =>
-`SuccessReason(page & SuccessReason(index)` =>
-SuccessReason(page, index) => right
-
-"(bugs/* and link(patch)) or backlink(index)" =>
-`( HardFailReason() & SuccessReason(page) ) | SuccessReason(index)`` =>
-`HardFailReason() | SuccessReason(index)` =>
-`SuccessReason(index)` => right
-
-"!bugs/* and link(patch)" =>
-`HardFailReason() | SuccessReason(bugs/foo)` =>  
-`HardFailReason()` => right
+ANDed with another object, blocks their influences. (But when ORed,
+combines them.)
+
+Question: Are all pagespec terms that return reason objects w/o any
+influence info, suitable to block influence in this way? 
+
+To be suitable to block, a term should never change from failing to match a
+page to successfully matching it, unless that page is directly changed in a
+way that influences are not needed for ikiwiki to notice. But, if a term
+did not meet these criteria, it would have an influence. QED.
 
 #### Influence types
 
-- 
cgit v1.2.3


From a20bc7a3fc6a2f2369022873ef7c2afbd5e49105 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 13 Oct 2009 14:37:14 -0400
Subject: influence blocker implementation

This avoids unnecessary influences being recorded from pagespecs
such as "link(done) and bugs/*", when a page cannot ever possibly
match.

A pagespec term that returns a value without influence is an influence
blocker. If such a blocker has a false value (possibly due to being
negated) and is ANDed with another term, it blocks that term's influence
from propigating out.

If the term is ORed, or has a true value, it does not block influence.
(Consider "link(done) or bugs/*" and "link(done) and !nosuchpage")

In the implementation in merge_influence, I had to be careful to never
negate $this or $other when testing if they are an influence blocker,
since negation mutates the object. Thus the slightly weird if statement.
---
 IkiWiki.pm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2847c7e0f..ac01ea418 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2071,7 +2071,7 @@ use overload (
 	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 0 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::SuccessReason'},
-	'&'	=> sub { $_[0]->merge_influences($_[1]); $_[0] },
+	'&'	=> sub { $_[0]->merge_influences($_[1], 1); $_[0] },
 	'|'	=> sub { $_[1]->merge_influences($_[0]); $_[1] },
 	fallback => 1,
 );
@@ -2084,7 +2084,7 @@ use overload (
 	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 1 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::FailReason'},
-	'&'	=> sub { $_[1]->merge_influences($_[0]); $_[1] },
+	'&'	=> sub { $_[1]->merge_influences($_[0], 1); $_[1] },
 	'|'	=> sub { $_[0]->merge_influences($_[1]); $_[0] },
 	fallback => 1,
 );
@@ -2110,8 +2110,20 @@ sub influences_static {
 sub merge_influences {
 	my $this=shift;
 	my $other=shift;
-	foreach my $influence (keys %{$other->[1]}) {
-		$this->[1]{$influence} |= $other->[1]{$influence};
+	my $anded=shift;
+
+	if (! $anded || (($this || %{$this->[1]}) &&
+	                ($other || %{$other->[1]}))) {
+		foreach my $influence (keys %{$other->[1]}) {
+			$this->[1]{$influence} |= $other->[1]{$influence};
+		}
+	}
+	else {
+		# influence blocker
+		print STDERR "merging $this and $other; found influence blocker\n";
+		$this->[1]={};
+		$this->[2]=1;
+		return;
 	}
 }
 
-- 
cgit v1.2.3


From 2f5beb59bff17ace9e33743d646a95204a9be5bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 13 Oct 2009 14:46:38 -0400
Subject: tests for influence blocking

---
 t/pagespec_match_list.t | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 51145a973..dd5dcc5b0 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 61;
+use Test::More tests => 88;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -86,23 +86,23 @@ foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)") {
 	%IkiWiki::depends=();
 }
 
-TODO: {
-	local $TODO = "optimisation not yet written";
-
-# a pagespec that hard fails due to a glob, etc, will not set influences
-# for other terms that normally would.
-foreach my $spec ("nosuchpage and link(bar)", "link(bar) and */Discussion") {
+# Hard fails due to a glob, etc, will block influences of other anded terms.
+foreach my $spec ("nosuchpage and link(bar)", "link(bar) and nosuchpage",
+                  "link(bar) and */Discussion", "*/Discussion and link(bar)",
+                  "!foo2 and link(bar)", "link(bar) and !foo2") {
 	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
-	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2}, "no influence from $spec");
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 }
 
-# a pagespec containing a hard failure that is ored with another term will
-# get influences from the other term
-foreach my $spec ("nosuchpage or link(bar)", "link(bar) or */Discussion") {
+# A hard fail will not block influences of other ored terms.
+foreach my $spec ("nosuchpage or link(bar)", "link(bar) or nosuchpage",
+                  "link(bar) or */Discussion", "*/Discussion or link(bar)",
+                  "!foo2 or link(bar)", "link(bar) or !foo2",
+                  "link(bar) or (!foo2 and !foo1)") {
 	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
@@ -110,5 +110,3 @@ foreach my $spec ("nosuchpage or link(bar)", "link(bar) or */Discussion") {
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 }
-
-}
-- 
cgit v1.2.3


From c916dcd035ef35e545119c91953a135600ecf0c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 13 Oct 2009 14:58:22 -0400
Subject: fix some broken influence blocking testing, add more tests

---
 t/pagespec_match_result.t | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/t/pagespec_match_result.t b/t/pagespec_match_result.t
index d9c31d6f0..13fcdcad0 100755
--- a/t/pagespec_match_result.t
+++ b/t/pagespec_match_result.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 71;
+use Test::More tests => 138;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -34,10 +34,27 @@ ok(!(S() & F()));
 ok(!(S() & F() & E()));
 ok(S() & (F() | F() | S()));
 
-# influences are always merged, no matter the operation performed,
-# as long as the two items are always both present
-foreach my $op ('$s | $f', '$s & $f', '$s & $f & E()', '$s | E() | $f',
-                '! $s | ! $f', '!(!(!$s)) | $f') {
+# influence merging tests
+foreach my $test (
+		['$s | $f' => 1],	# OR merges
+                ['! $s | ! $f' => 1],	# OR merges with negated terms too
+		['!(!(!$s)) | $f' => 1],# OR merges with multiple negation too
+		['$s | $f | E()' => 1],	# OR merges, even though E() has no influences
+		['$s | E() | $f' => 1],	# ditto
+		['E() | $s | $f' => 1],	# ditto
+		['!$s | !$f | E()' => 1],# negated terms also do not block merges
+		['!$s | E() | $f' => 1],# ditto
+		['E() | $s | !$f' => 1],# ditto
+		['$s & $f' => 1],	# AND merges if both items have influences
+		['!$s & $f' => 1],	# AND merges negated terms too
+		['$s & !$f' => 1],	# AND merges negated terms too
+		['$s & $f & E()' => 0],	# AND fails to merge since E() has no influences
+		['$s & E() & $f' => 0],	# ditto
+		['E() & $s & $f' => 0],	# ditto
+		) {
+	my $op=$test->[0];
+	my $influence=$test->[1];
+
 	my $s=S(foo => 1, bar => 1);
 	is($s->influences->{foo}, 1);
 	is($s->influences->{bar}, 1);
@@ -46,9 +63,14 @@ foreach my $op ('$s | $f', '$s & $f', '$s & $f & E()', '$s | E() | $f',
 	is($f->influences->{baz}, 1);
 	my $c = eval $op;
 	ok(ref $c);
-	is($c->influences->{foo}, 1, "foo ($op)");
-	is($c->influences->{bar}, (1 | 2), "bar ($op)");
-	is($c->influences->{baz}, 1, "baz ($op)");
+	if ($influence) {
+		is($c->influences->{foo}, 1, "foo ($op)");
+		is($c->influences->{bar}, (1 | 2), "bar ($op)");
+		is($c->influences->{baz}, 1, "baz ($op)");
+	}
+	else {
+		ok(! %{$c->influences}, "no influence for ($op)");
+	}
 }
 
 my $s=S(foo => 0, bar => 1);
@@ -57,3 +79,6 @@ ok(! $s->influences->{foo}, "removed 0 influence");
 ok(! $s->influences->{bar}, "removed 1 influence");
 ok($s->influences->{baz}, "set influence");
 ok($s->influences_static);
+$s=S(foo => 0, bar => 1);
+$s->influences(baz => 1, "" => 1);
+ok(! $s->influences_static);
-- 
cgit v1.2.3


From 046ac5fec5534e10b8e34b96014f936bb151d147 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 13 Oct 2009 15:00:07 -0400
Subject: remove debugging and cruft

---
 IkiWiki.pm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ac01ea418..1e9d1ca2a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2120,10 +2120,7 @@ sub merge_influences {
 	}
 	else {
 		# influence blocker
-		print STDERR "merging $this and $other; found influence blocker\n";
 		$this->[1]={};
-		$this->[2]=1;
-		return;
 	}
 }
 
-- 
cgit v1.2.3


From 6ece984c39713117d356843ba8f71fb2beb47e91 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Tue, 13 Oct 2009 17:26:11 -0400
Subject:

---
 doc/setup/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 32a8f6de2..1c5ad8260 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -1,5 +1,7 @@
 I have copied over the ikiwiki.setup file from /usr/share/doc/ikiwiki/ to /etc/ikiwiki/ and run it after editing. My site gets built but when I click on the 'edit' button, firefox and google chrome download the cgi file instead of creating a way to edit it. The permissions on my ikiwiki.cgi script look like this: -rwsr-sr-x  1 root root 13359 2009-10-13 19:21 ikiwiki.cgi. Is there something I should do, i.e. change permissions, so I can get it to run correctly? (jeremiah)
 
+> Have a look [[here|tips/dot_cgi]]. --[[Jogo]]
+
 I just went through the standard procedure described for setup, copied the blog directory from examples into my source directory, ran ikiwiki, and everything seems to have worked, except that none of the 
 &#91;&#91;!meta ... &#93;&#93; tags get converted. They simply show up in the html files unformatted, with no exclamation point, and with p tags around them. Any ideas? using ikiwiki version 2.40 on freebsd --mjg
 
-- 
cgit v1.2.3


From 7e25c2116cc2ababf7b099e1044dee619837dd23 Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Tue, 13 Oct 2009 20:51:43 -0400
Subject: .htaccess hack

---
 doc/plugins/rsync/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/rsync/discussion.mdwn b/doc/plugins/rsync/discussion.mdwn
index 6bf7a3826..ef0fa9967 100644
--- a/doc/plugins/rsync/discussion.mdwn
+++ b/doc/plugins/rsync/discussion.mdwn
@@ -47,6 +47,8 @@ The wiki now lives on (1), and clicking "edit" just works. --[[schmonz]]
 >> a DVCS (of which I've got at least one other), and possibly for
 >> other uses not yet imagined. ;-) --[[schmonz]]
 
+>>> I'm now using this plugin for an additional purpose. One of the aforementioned wikis (there are actually two) can only be read by trusted users, the list of which is kept in an `.htaccess` file. I added it to git as `htaccess.txt`, enabled the [[plugins/txt]] plugin, and in my `rsync_command` script, have it copied to the destdir as `.htaccess` before calling `rsync`. Now my users (who aren't tech-savvy, but are trustworthy) can edit the access list directly in the wiki. This idea might also be useful for wikis not using `rsync` at all. --[[schmonz]]
+
 ----
 
 Revew: --[[Joey]] 
-- 
cgit v1.2.3


From c82ca7aa56d0902bfc44687d54df53f4fab402ad Mon Sep 17 00:00:00 2001
From: "http://schmonz.livejournal.com/" <http://schmonz.livejournal.com/@web>
Date: Tue, 13 Oct 2009 20:56:29 -0400
Subject: point to "rsync" .htaccess trick

---
 doc/todo/enable-htaccess-files.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index e302a49ed..412cb5eba 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -59,3 +59,5 @@ It should be off by default of course. --Max
 
 ---
 +1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]]
+
+> I've described a workaround for one use case at the [[plugins/rsync]] [[plugins/rsync/discussion]] page. --[[schmonz]]
-- 
cgit v1.2.3


From 57a135c92ac33f792d138fcdbeb72e8ad5f37670 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 14 Oct 2009 13:15:12 -0400
Subject: abort test if cvs prereq perl modules are not available

---
 t/cvs.t | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/t/cvs.t b/t/cvs.t
index c9caa94eb..2808973be 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -13,6 +13,14 @@ BEGIN {
 			use Test::More skip_all => "cvs or cvsps not available or could not make test dir"
 		}
 	}
+	foreach my $module ('File::ReadBackwards', 'File::MimeInfo') {
+		eval qq{use $module};
+		if ($@) {
+			eval qq{
+				use Test::More skip_all => "$module not available"
+			}
+		}
+	}
 }
 use Test::More tests => 12;
 
-- 
cgit v1.2.3


From 7ba4fa760a238a135b2fc2074044454b5b9a177e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 14 Oct 2009 13:19:44 -0400
Subject: build wiki in C locale, to ensure that the "no broken links" message
 is not translated

---
 t/basewiki_brokenlinks.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index d74f64e36..2dd950832 100755
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -8,7 +8,7 @@ ok(! system("make -s ikiwiki.out"));
 ok(! system("make underlay_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null"));
 
 foreach my $plugin ("", "listdirectives") {
-	ok(! system("perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ".
+	ok(! system("LANG=C perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ".
 			# always enabled because pages link to it conditionally,
 			# which brokenlinks cannot handle properly
 			"-plugin smiley ".
-- 
cgit v1.2.3


From 2fced917a5aff2019701c5f4986659f79b31ab9e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 14 Oct 2009 16:59:21 -0400
Subject: sparkline: show error if php does not run

---
 IkiWiki/Plugin/sparkline.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index c1f016ffd..fb4849492 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -149,7 +149,7 @@ sub preprocess (@) {
 
 		waitpid $pid, 0;
 		$SIG{PIPE}="DEFAULT";
-		if ($sigpipe) {
+		if ($sigpipe || ! defined $png) {
 			error gettext("failed to run php");
 		}
 
-- 
cgit v1.2.3


From 143e2de17d084db00487ee4db67b7b0131ccc441 Mon Sep 17 00:00:00 2001
From: Chadius <Chadius@web>
Date: Thu, 15 Oct 2009 09:26:05 -0400
Subject: Asking for a repost of page, as the link is broken.

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index e2eb56d47..1e6fc94a7 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -612,3 +612,5 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	}
 	
 	1
+
+Hello. Got ikiwiki running and I'm planning to convert my personal Mediawiki wiki to ikiwiki so I can take offline copies around. If anyone has an old copy of the instructions, or any advice on where to start I'd be glad to hear it. Otherwise I'm just going to chronicle my journey on the page.--[[users/Chadius]]
-- 
cgit v1.2.3


From 4c3264cd46e48e3b3327e5b02689ad2eba6a53b9 Mon Sep 17 00:00:00 2001
From: "http://seanh.myopenid.com/" <http://seanh.myopenid.com/@web>
Date: Thu, 15 Oct 2009 11:54:59 -0400
Subject:

---
 ...working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn

diff --git a/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn b/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
new file mode 100644
index 000000000..a3cb0ae0b
--- /dev/null
+++ b/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
@@ -0,0 +1,5 @@
+Hey, trying to get ikiwiki working on my account on a shared webserver. Actually installing ikiwiki on the server is phase 2. For now I'm running the latest ikiwiki (from source) locally, compiling the output with the ikiwiki command, then rsyncing the output dir up to the server. This works for the static HTML files, but the CGI file doesn't work, the server redirects to an error page. The error log on the server says "Premature end of script headers: /path/to/ikiwiki.cgi"
+
+My first thought was that this is a Perl CGI and I would need to change the shebang to point to the unusual location of Perl on this server, it's at /usr/pkg/bin/perl. But when I looked at ikiwiki.cgi I found it was a binary file.
+
+Why is it a binary? And what can I do about this error?
-- 
cgit v1.2.3


From 3d268733a31fb3e8a27745a37ac12bf422acb3d8 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Thu, 15 Oct 2009 12:41:02 -0400
Subject: why the wrapper is a binary

---
 ...rking_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn b/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
index a3cb0ae0b..dc274c5b2 100644
--- a/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
+++ b/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
@@ -3,3 +3,10 @@ Hey, trying to get ikiwiki working on my account on a shared webserver. Actually
 My first thought was that this is a Perl CGI and I would need to change the shebang to point to the unusual location of Perl on this server, it's at /usr/pkg/bin/perl. But when I looked at ikiwiki.cgi I found it was a binary file.
 
 Why is it a binary? And what can I do about this error?
+
+> It's a binary because it's SUID, so that it has permission to write to the ikiwiki repository. See [[security]], under 'suid wrappers', for more on that.
+> 
+> As to why you get 'premature end of script headers', that suggests there is a problem running
+> the script (and there is output occurring before the HTTP headers are printed). Do you have access
+> to the webserver logs for your host? They might contain some clues. Are you sure that the webserver
+> is setup for CGI properly? -- [[Jon]]
-- 
cgit v1.2.3


From 96729cafc3c178b54da271c9ba5cbb51a69cccab Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 14:26:06 -0400
Subject: override LC_ALL, not LANG

---
 t/basewiki_brokenlinks.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index 2dd950832..74ddc61c5 100755
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -8,7 +8,7 @@ ok(! system("make -s ikiwiki.out"));
 ok(! system("make underlay_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null"));
 
 foreach my $plugin ("", "listdirectives") {
-	ok(! system("LANG=C perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ".
+	ok(! system("LC_ALL=C perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ".
 			# always enabled because pages link to it conditionally,
 			# which brokenlinks cannot handle properly
 			"-plugin smiley ".
-- 
cgit v1.2.3


From 5a41e6054a7b0782069e4da08a6ab47ffb352392 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 14:34:09 -0400
Subject: response3

---
 ...my_server__44___and_it__39__s_a_binary_file__63__.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn b/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
index dc274c5b2..d0b4a9363 100644
--- a/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
+++ b/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
@@ -10,3 +10,18 @@ Why is it a binary? And what can I do about this error?
 > the script (and there is output occurring before the HTTP headers are printed). Do you have access
 > to the webserver logs for your host? They might contain some clues. Are you sure that the webserver
 > is setup for CGI properly? -- [[Jon]]
+
+> Quite likely your laptop and your server do not run the same
+> OS, so the wrapper binary cannot just be copied from one
+> to the other and run. Also, the wrapper is just that, a
+> thin wrapper which then runs ikiwiki. As ikiwiki is not
+> yet installed on your server, that's another reason what
+> you're trying can't work.
+> 
+> If installing ikiwiki on the server is not possible or
+> too much work right now, you could try building your wiki
+> on your laptop with cgi disabled in the setup file. 
+> The result would be a static website that you could deploy to
+> the server this way. Of course, it wouldn't be editable
+> on the server, and other features that need the CGI would
+> also be disabled. --[[Joey]]
-- 
cgit v1.2.3


From bfbd0680ce29bcfd5a2a9772cee78b66dd9e48cd Mon Sep 17 00:00:00 2001
From: "http://seanh.myopenid.com/" <http://seanh.myopenid.com/@web>
Date: Thu, 15 Oct 2009 16:05:34 -0400
Subject:

---
 ...orking_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn b/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
index d0b4a9363..35db20dc8 100644
--- a/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
+++ b/doc/forum/Ikiwiki_CGI_not_working_on_my_server__44___and_it__39__s_a_binary_file__63__.mdwn
@@ -25,3 +25,9 @@ Why is it a binary? And what can I do about this error?
 > the server this way. Of course, it wouldn't be editable
 > on the server, and other features that need the CGI would
 > also be disabled. --[[Joey]]
+
+> > Ah, ok thanks. Yes the server runs a different OS and ikiwiki
+> > is not installed on it. I've got it working as a static site,
+> > so if I want the CGI I'll have to install ikiwiki on the server.
+> > Ok. It might not work as I don't have root access, but I might
+> > give it a try. Thanks
-- 
cgit v1.2.3


From d0213917ad143c57f34a96c94ceaaf40122b11cf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 16:25:43 -0400
Subject: inline: Optimize generation of archives, etc

Don't generate inlined page content if the template does not use it.
---
 IkiWiki/Plugin/inline.pm | 3 ++-
 debian/changelog         | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 0fe0bd2e1..553fd350c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -337,7 +337,8 @@ sub preprocess_inline (@) {
 			my $file = $pagesources{$page};
 			my $type = pagetype($file);
 			if (! $raw || ($raw && ! defined $type)) {
-				unless ($archive && $quick) {
+				if (!($archive && $quick) &&
+				    $template->query(name => 'content')) {
 					# Get the content before populating the
 					# template, since getting the content uses
 					# the same template if inlines are nested.
diff --git a/debian/changelog b/debian/changelog
index ef92e48fc..eab725d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
   * calendar: Fix CSS for year calendar to match the plugin documentation.
   * Added minimal default CSS for calendar plugin, just highlighting the
     current day.
+  * inline: Optimize generation of archives, etc by not getting inlined page
+    content if the template does not use it.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 09 Oct 2009 19:53:50 -0400
 
-- 
cgit v1.2.3


From 68aca6516a1c4b78991b5fc002c66efc5f012a0c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 18:42:46 -0400
Subject: add

---
 doc/tips/optimising_ikiwiki.mdwn | 155 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 155 insertions(+)
 create mode 100644 doc/tips/optimising_ikiwiki.mdwn

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
new file mode 100644
index 000000000..fcf3077f8
--- /dev/null
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -0,0 +1,155 @@
+Is ikiwiki taking too long to build your wiki? Read on for some common
+problems that can be avoided to make ikiwiki run quick.
+
+[[!toc]]
+
+## rebuild vs refresh
+
+Are you building your wiki by running a command like this?
+
+	ikiwiki -setup my.setup
+
+If so, you're always telling ikiwiki to rebuild the entire site, from
+scratch. But, ikiwiki is smart, it can incrementally update a site,
+building only things affected by the changes you make. You just have to let
+it do so:
+
+	ikiwiki -setup my.setup -refresh
+
+Ikiwiki automatically uses an incremental refresh like this when handing
+a web edit, or when run from a [[rcs]] post-commit hook. (If you've
+configured the hook in the usual way.) Most people who have run into this
+problem got in the habit of running `ikiwiki -setup my.setup` by hand
+when their wiki was small, and found it got slower as they added pages.
+
+### use the latest version
+
+If your version of ikiwiki is not [[!verison]], try upgrading. New
+optimisations are frequently added to ikiwiki, some of them yielding
+*enormous* speed increases.
+
+### expensive inlines
+
+Do you have an archive page for your blog that shows all posts, 
+using an inline that looks like this?
+
+	\[[!inline pages="blog/*" show=0]]
+
+Or maybe you have some tag pages for your blog that show all tagged posts,
+something like this?
+
+	\[[!inline pages="blog/* and tagged(foo)" show=0]]
+
+These are expensive, because they have to be updated whenever you modify a
+matching page. And, if there are a lot of pages, it generates a large html
+file, which is a lot of work. And also large RSS/Atom files, which is even
+more work!
+
+To optimise the inline, consider enabling quick archive mode. Then the
+inline will only need to be updated when new pages are added; no RSS
+or Atom feeds will be built, and the generated html file will be much
+smaller.
+	
+	\[[!inline pages="blog/*" show=0 archive=yes quick=yes]]
+	
+	\[[!inline pages="blog/* and link(tag)" show=0 archive=yes quick=yes]]
+
+Only downsides: This won't show titles set by the [[!ikiwiki/directive/meta]]
+directive. And there's no RSS feed for users to use -- but if this page
+is only for the archives or tag for your blog, users should be subscribing
+to the blog's main page's RSS feed instead.
+
+For the main blog page, the inline should only show the latest N posts,
+which won't be a performance problem:
+
+	\[[!inline pages="blog/*" show=30]]
+
+## expensive maps
+
+Do you have a sitemap type page, that uses a map directive like this?
+
+	\[[!map pages="*" show=title]]
+
+This is expensive because it has to be updated whenever a page is modified.
+The resulting html file might get big and expensive to generate as you
+keep adding pages.
+
+First, consider removing the "show=title". Then the map will not show page
+titles set by the [[!ikiwiki/directive/meta]] directive -- but will also
+only need to be generated when pages are added or removed, not for every
+page change.
+
+Consider limiting the map to only show the toplevel pages of your site,
+like this:
+
+	\[[!map pages="* and !*/*" show=title]]
+
+Or, alternatively, to drop from the map parts of the site that accumulate
+lots of pages, like individual blog posts:
+
+	\[[!map pages="* and !blog/*" show=title]]
+
+## sidebar issues
+
+If you enable the [[plugins/sidebar]] plugin, be careful of what you put in
+your sidebar. Any change that affects what is displayed by the sidebar
+will require an update of *every* page in the wiki, since all pages include
+the sidebar.
+
+Putting an expensive map or inline in the sidebar is the most common cause
+of problems. At its worst, it can result in any change to any page in the
+wiki requiring every page to be rebuilt.
+
+## avoid htmltidy
+
+A few plugins do neat stuff, but slowly. Such plugins are tagged
+[[plugins/type/slow]].
+
+The worst offender is possibly [[plugins/htmltidy]]. This runs an external
+`tidy` program on each page that is built, which is necessarily slow. So don't
+use it unless you really need it; consider using the faster
+[[plugins/htmlbalance]] instead.
+
+## be careful of large linkmaps
+
+[[plugins/Linkmap]] generates a cool map of links between pages, but
+it does it using the `graphviz` program. And any changes to links between
+pages on the map require an update. So, avoid using this to map a large number
+of pages with frequently changing links. For example, using it to map
+all the pages on a traditional, highly WikiLinked wiki, is asking for things
+to be slow. But using it to map a few related pages is probably fine.
+
+This site's own [[plugins/linkmap]] rarely slows it down, because it
+only shows the [[index]] page, and the small set of pages that link to it.
+That is accomplished as follows:
+
+	\[!linkmap pages="index or (backlink(index)"]]
+
+## overhead of the search plugin
+
+Be aware that the [[plugins/search]] plugin has to update the search index
+whenever any page is changed. This can slow things down somewhat.
+
+## scaling to large numbers of pages
+
+Finally, let's think about how huge number of pages can affect ikiwiki.
+
+* Every time it's run, ikiwiki has to scan your `srcdir` to find
+  new and changed pages. This is similar in speed to running the `find`
+  command. Obviously, more files will make it take longer.
+
+* Also, to see what pages match a [[ikiwiki/PageSpec]] like "blog/*", it has
+  to check if every page in the wiki matches. These checks are done quite
+  quickly, but still, lots more pages will make PageSpecs more expensive.
+
+* The backlinks calculation has to consider every link on every page
+  in the wiki. (In practice, most pages only like to at most a few dozen
+  other pages, so this is not a `O(N^2)`, but closer to `O(N)`.)
+
+* Ikiwiki also reads and writes an `index` file, which contains information
+  about each page, and so if you have a lot of pages, this file gets large,
+  and more time is spent on it. For a wiki with 2000 pages, this file
+  will run about 500 kb.
+
+If your wiki will have 100 thousand files in it, you might start seeing
+the above contribute to ikiwiki running slowly.
-- 
cgit v1.2.3


From 4be470a2194aff09056570718d530d103ea2bc45 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 18:49:05 -0400
Subject: update

---
 doc/tips/optimising_ikiwiki.mdwn | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index fcf3077f8..579157291 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -1,8 +1,18 @@
-Is ikiwiki taking too long to build your wiki? Read on for some common
-problems that can be avoided to make ikiwiki run quick.
+Ikiwiki is a wiki compiler, which means that, unlike a traditional wiki,
+all the work needed to display your wiki is done up front. Where you can
+see it and get annoyed at it. In some ways, this is better than a wiki
+where a page view means running a program to generate the page on the fly.
+
+But enough excuses. If ikiwiki is taking too long to build your wiki,
+let's fix that. Read on for some common problems that can be avoided to
+make ikiwiki run quick.
 
 [[!toc]]
 
+(And if none of that helps, file a [[bug|bugs]]. One other great thing about
+ikiwiki being a wiki compiler is that it's easy to provide a test case when
+it's slow, and get the problem fixed!)
+
 ## rebuild vs refresh
 
 Are you building your wiki by running a command like this?
@@ -22,13 +32,13 @@ configured the hook in the usual way.) Most people who have run into this
 problem got in the habit of running `ikiwiki -setup my.setup` by hand
 when their wiki was small, and found it got slower as they added pages.
 
-### use the latest version
+## use the latest version
 
 If your version of ikiwiki is not [[!verison]], try upgrading. New
 optimisations are frequently added to ikiwiki, some of them yielding
 *enormous* speed increases.
 
-### expensive inlines
+## expensive inlines
 
 Do you have an archive page for your blog that shows all posts, 
 using an inline that looks like this?
-- 
cgit v1.2.3


From 19ec5c22599f15b9a3dc5246bea4e8f09ec94180 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 18:50:40 -0400
Subject: typo

---
 doc/tips/optimising_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index 579157291..e3973733f 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -133,7 +133,7 @@ This site's own [[plugins/linkmap]] rarely slows it down, because it
 only shows the [[index]] page, and the small set of pages that link to it.
 That is accomplished as follows:
 
-	\[!linkmap pages="index or (backlink(index)"]]
+	\[[!linkmap pages="index or (backlink(index)"]]
 
 ## overhead of the search plugin
 
-- 
cgit v1.2.3


From 31ec3a7570061e371e0011831308f88ff0887bb8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 18:51:29 -0400
Subject: typo

---
 doc/tips/optimising_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index e3973733f..6d0997603 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -34,7 +34,7 @@ when their wiki was small, and found it got slower as they added pages.
 
 ## use the latest version
 
-If your version of ikiwiki is not [[!verison]], try upgrading. New
+If your version of ikiwiki is not [[!version]], try upgrading. New
 optimisations are frequently added to ikiwiki, some of them yielding
 *enormous* speed increases.
 
-- 
cgit v1.2.3


From fc1bad2e7b6922205ad079043fe3057b3628a2a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 20:01:47 -0400
Subject: slight optimisation

---
 IkiWiki/Plugin/inline.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 553fd350c..a836c18f4 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -332,13 +332,13 @@ sub preprocess_inline (@) {
 			error sprintf(gettext("nonexistant template %s"), $params{template});
 		}
 		my $template=HTML::Template->new(@params) unless $raw;
+		my $needcontent=!($archive && $quick) && $template->query(name => 'content');
 	
 		foreach my $page (@list) {
 			my $file = $pagesources{$page};
 			my $type = pagetype($file);
 			if (! $raw || ($raw && ! defined $type)) {
-				if (!($archive && $quick) &&
-				    $template->query(name => 'content')) {
+				if ($needcontent) {
 					# Get the content before populating the
 					# template, since getting the content uses
 					# the same template if inlines are nested.
-- 
cgit v1.2.3


From cd5bf7eb7f74c2414a87c77141ed0c502ff7f464 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 15 Oct 2009 23:16:52 -0400
Subject: comments after trying to implement joey's idea

---
 doc/plugins/contrib/album/discussion.mdwn | 134 ++++++++++++++++++++++++++----
 1 file changed, 119 insertions(+), 15 deletions(-)

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index 5c8e74fa6..156cd7ad8 100644
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -68,6 +68,9 @@ code or tried it yet, but here goes. --[[Joey]]
 > you (since the requirements for that CGI interface change depending
 > on the implementation). I agree that this is ugly, though. -s
 
+>> Would you accept a version where the albumimage "viewer" pages
+>> could be 0 bytes long, at least until metadata gets added? -s
+
 * With each viewer page having next/prev links, I can see how you
   were having the scalability issues with ikiwiki's data structures
   earlier!
@@ -80,7 +83,7 @@ code or tried it yet, but here goes. --[[Joey]]
 >> these can be presence dependencies, which will probably help with
 >> avoiding rebuilds of a page if the next/prev page is changed.
 >> (Unless you use img to make the thumbnails for those links, then it
->> would rebuild the thumbnails anyway. Have not looked at the code.) --[[Joey]] 
+>> would rebuild the thumbnails anyway. Have not looked at the code.) --[[Joey]]
 
 * And doesn't each viewer page really depend on every other page in the
   same albumsection? If a new page is added, the next/prev links
@@ -108,6 +111,11 @@ code or tried it yet, but here goes. --[[Joey]]
 >> metadata. Er, I mean, I have a cheezy hack in `add_depends` now that does
 >> it to deal with a similar case. --[[Joey]] 
 
+>>> I think I was misunderstanding how early you have to call `add_depends`?
+>>> The critical thing I missed was that if you're scanning a page, you're
+>>> going to rebuild it in a moment anyway, so it doesn't matter if you
+>>> have no idea what it depends on until the rebuild phase. -s
+
 * One thing I do like about having individual pages per image is
   that they can each have their own comments, etc.
 
@@ -121,9 +129,25 @@ code or tried it yet, but here goes. --[[Joey]]
   album. Think tags. So it seems it would be better to have the album
   directive control what pages it includes (a la inline).
 
-> See note above about pagespecs not being very safe early on.
-> You did merge my inline-with-pagenames feature, which is safe to use
-> at scan time, though.
+> I'm inclined to fix this by constraining images to be subpages of exactly
+> one album: if they're subpages of 2+ nested albums then they're only
+> considered to be in the deepest-nested one (i.e. longest URL), and if
+> they're not in any album then that's a usage error. This would
+> also make prev/next links sane.
+>
+> If you want to reference images from elsewhere in the wiki and display
+> them as if in an album, then you can use an ordinary inline with
+> the same template that the album would use, and I'll make sure the
+> templates are set up so this works.
+>
+> (Implementation detail: this means that an image X/Y/Z/W/V, where X and
+> Y are albums, Z does not exist and W exists but is not an album,
+> would have a content dependency on Y, a presence dependency on Z
+> and a content dependency on W.)
+>
+> Perhaps I should just restrict to having the album images be direct
+> subpages of the album, although that would mean breaking some URLs
+> on the existing website I'm doing all this work for... -s
 
 * Putting a few of the above thoughts together, my ideal album system
   seems to be one where I can just drop the images into a directory and
@@ -137,15 +161,57 @@ code or tried it yet, but here goes. --[[Joey]]
 > Putting a JPEG in the web form is not an option from my point of
 > view :-) but perhaps there could just be a "web-editable" flag supplied
 > by plugins, and things could be changed to respect it.
->
+
+>> Replying to myself: would you accept patches to support
+>> `hook(type => 'htmlize', editable => 0, ...)` in editpage? This would
+>> essentially mean "this is an opaque binary: you can delete it
+>> or rename it, and it might have its own special editing UI, but you
+>> can never get it in a web form".
+>>
+>> On the other hand, that essentially means we need to reimplement
+>> editpage in order to edit the sidecar files that contain the metadata.
+>> Having already done one partial reimplementation of editpage (for
+>> comments) I'm in no hurry to do another.
+>>
+>> I suppose another possibility would be to register hook
+>> functions to be called by editpage when it loads and saves the
+>> file. In this case, the loading hook would be to discard
+>> the binary and use filter() instead, and the saving conversion
+>> would be to write the edited content into the metadata sidecar
+>> (creating it if necessary).
+>>
+>> I'd also need to make editpage (and also comments!) not allow the
+>> creation of a file of type albumjpg, albumgif etc., which is something
+>> I previously missed; and I'd need to make attachment able to
+>> upload-and-rename.
+>> -s
+
 > In a way, what you really want for metadata is to have it in the album
 > page, so you can batch-edit the whole lot by editing one file (this
 > does mean that editing the album necessarily causes each of its viewers
 > to be rebuilt, but in practice that happens anyway). -s
->
->> Yes, that would make some sense.. It also allows putting one image in
->> two albums, with different caption etc. (Maybe for different audiences.)
+
+>> Replying to myself: in practice that *doesn't* happen anyway. Having
+>> the metadata in the album page is somewhat harmful because it means
+>> that changing the title of one image causes every viewer in the album
+>> to be rebuilt, whereas if you have a metadata file per image, only
+>> the album itself, plus the next and previous viewers, need
+>> rebuilding. So, I think a file per image is the way to go.
 >>
+>> Ideally we'd have some way to "batch-edit" the metadata of all
+>> images in an album at once, except that would make conflict
+>> resolution much more complicated to deal with; maybe just
+>> give up and scream about mid-air collisions in that case?
+>> (That's apparently good enough for Bugzilla, but not really
+>> for ikiwiki). -s
+
+>> Yes, [all metadata in one file] would make some sense.. It also allows putting one image in
+>> two albums, with different caption etc. (Maybe for different audiences.)
+>> --[[Joey]]
+
+>>> Eek. No, that's not what I had in mind at all; the metadata ends up
+>>> in the "viewer" page, so it's necessarily the same for all albums. -s
+
 >> It would probably be possible to add a new dependency type, and thus
 >> make ikiwiki smart about noticing whether the metadata has actually
 >> changed, and only update those viewers where it has. But the dependency
@@ -164,23 +230,26 @@ mushroom and snake.
 > etc as the htmlize extensions. May need some fixes to ikiwiki to support
 > that. --[[Joey]] 
 
+>> foo.albumjpg (etc.) for images, and foo._albummeta (with
+>> `keepextension => 1`) for sidecar metadata files, seems viable. -s
+
 Files in git repo:
 
 * index.mdwn
 * memes.mdwn
-* memes/badger.albumimage (a renamed JPEG)
+* memes/badger.albumjpg (a renamed JPEG)
 * memes/badger/comment_1._comment
 * memes/badger/comment_2._comment
-* memes/mushroom.albumimage (a renamed GIF)
-* memes/mushroom.meta (sidecar file with metadata)
-* memes/snake.albumimage (a renamed video)
+* memes/mushroom.albumgif (a renamed GIF)
+* memes/mushroom._albummeta (sidecar file with metadata)
+* memes/snake.albummov (a renamed video)
 
 Files in web content:
 
 * index.html
 * memes/index.html
 * memes/96x96-badger.jpg (from img)
-* memes/96x96-mushroom.jpg (from img)
+* memes/96x96-mushroom.gif (from img)
 * memes/96x96-snake.jpg (from img, hacked up to use totem-video-thumbnailer :-) )
 * memes/badger/index.html (including comments)
 * memes/badger.jpg
@@ -200,10 +269,28 @@ way to get them rendered anyway.
 > the image, as well as eg, smiley trying to munge it in sanitize.
 > --[[Joey]] 
 
+>> As long as nothing has a filter() hook that assumes it's already
+>> text... filters are run in arbitrary order. We seem to be OK so far
+>> though.
+>>
+>> If this is the route I take, I propose to have the result of filter()
+>> be the contents of the sidecar metadata file (empty string if none),
+>> with the `\[[!albumimage]]` directive (which no longer requires
+>> arguments) prepended if not already present. This would mean that
+>> meta directives in the metadata file would work as normal, and it
+>> would be possible to insert text both before and after the viewer
+>> if desired. The result of filter() would also be a sensible starting
+>> point for editing, and the result of editing could be diverted into
+>> the metadata file. -s
+
 do=edit&page=memes/badger needs to not put the JPG in a text box: somehow
 divert or override the normal edit CGI by telling it that .albumimage
 files are not editable in the usual way?
 
+> Something I missed here is that editpage also needs to be told that
+> creating new files of type albumjpg, albumgif etc. is not allowed
+> either! -s
+
 Every image needs to depend on, and link to, the next and previous images,
 which is a bit tricky. In previous thinking about this I'd been applying
 the overly strict constraint that the ordered sequence of pages in each
@@ -217,6 +304,9 @@ in order.
 > memoization to avoid each image in an album building the same list.
 > I sense that I may be missing a subtelty though. --[[Joey]] 
 
+>> I think I was misunderstanding how early you have to call `add_depends`
+>> as mentioned above. -s
+
 Perhaps restricting to "the images in an album A must match A/*"
 would be useful; then the unordered superset could just be "A/*". Your
 "albums via tags" idea would be nice too though, particularly for feature
@@ -233,6 +323,9 @@ album, or something?
 > Ugh, yeah, that is a problem. Perhaps wanting to support that was just
 > too ambitious. --[[Joey]] 
 
+>> I propose to restrict to having images be subpages of albums, as
+>> described above. -s
+
 Requiring renaming is awkward for non-technical Windows/Mac users, with both
 platforms' defaults being to hide extensions; however, this could be
 circumvented by adding some sort of hook in attachment to turn things into
@@ -244,13 +337,24 @@ extensions visible is a "don't do that then" situation :-)
 > with an extension. (Or allow specifying a full pagespec,
 > but I hesitate to seriously suggest that.) --[[Joey]] 
 
+>> I think that might be a terrifying idea for another day. If we can
+>> mutate the extension during the `attach` upload, that'd be enough;
+>> I don't think people who are skilled enough to use git/svn/...,
+>> but not skilled enough to tell Explorer to show file extensions,
+>> represent a major use case. -s
+
 Ideally attachment could also be configured to upload into a specified
 underlay, so that photos don't have to be in your source-code control
 (you might want that, but I don't!).
 
+> Replying to myself: perhaps best done as an orthogonal extension
+> to attach? -s
+
 Things that would be nice, and are probably possible:
 
 * make the "Edit page" link on viewers divert to album-specific CGI instead
-  of just failing or not appearing
+  of just failing or not appearing (probably possible via pagetemplate)
+
 * some way to deep-link to memes/badger.jpg with a wikilink, without knowing a
-  priori that it's secretly a JPEG
+  priori that it's secretly a JPEG (probably harder than it looks - you'd
+  have to make a directive for it and it's probably not worth it)
-- 
cgit v1.2.3


From 969ce8c5f889f8f2696c3ed4995f021b2a6539e1 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 15 Oct 2009 23:22:18 -0400
Subject: add a bit more attribution so it's clearer what Joey wrote

---
 doc/plugins/contrib/album/discussion.mdwn | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index 156cd7ad8..50d6c8ddd 100644
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -60,7 +60,7 @@ code or tried it yet, but here goes. --[[Joey]]
 * Needing to create the albumimage "viewer" pages for each photo
   seems like it will become a pain. Everyone will need to come up
   with their own automation for it, and then there's the question
-  of how to automate it when uploading attachments.
+  of how to automate it when uploading attachments. -J
 
 > There's already a script (ikiwiki-album) to populate a git
 > checkout with skeleton "viewer" pages; I was planning to make a
@@ -73,7 +73,7 @@ code or tried it yet, but here goes. --[[Joey]]
 
 * With each viewer page having next/prev links, I can see how you
   were having the scalability issues with ikiwiki's data structures
-  earlier!
+  earlier! -J
 
 > Yeah, I think they're a basic requirement from a UI point of view
 > though (although they don't necessarily have to be full wikilinks).
@@ -88,7 +88,7 @@ code or tried it yet, but here goes. --[[Joey]]
 * And doesn't each viewer page really depend on every other page in the
   same albumsection? If a new page is added, the next/prev links
   may need to be updated, for example. If so, there will be much
-  unnecessary rebuilding.
+  unnecessary rebuilding. -J
 
 > albumsections are just a way to insert headings into the flow of
 > photos, so they don't actually affect dependencies.
@@ -117,7 +117,7 @@ code or tried it yet, but here goes. --[[Joey]]
 >>> have no idea what it depends on until the rebuild phase. -s
 
 * One thing I do like about having individual pages per image is
-  that they can each have their own comments, etc.
+  that they can each have their own comments, etc. -J
 
 > Yes; also, they can be wikilinked. I consider those to be
 > UI requirements. -s
@@ -127,7 +127,7 @@ code or tried it yet, but here goes. --[[Joey]]
   album, but then anyone who can write to any other page on the wiki can
   add an image to it. 2: I may want an image to appear in more than one
   album. Think tags. So it seems it would be better to have the album
-  directive control what pages it includes (a la inline).
+  directive control what pages it includes (a la inline). -J
 
 > I'm inclined to fix this by constraining images to be subpages of exactly
 > one album: if they're subpages of 2+ nested albums then they're only
@@ -156,7 +156,7 @@ code or tried it yet, but here goes. --[[Joey]]
   etc. (Real pity we can't just put arbitrary metadata into the images
   themselves.) This is almost pointing toward making the images first-class
   wiki page sources. Hey, it worked for po! :) But the metadata and editing
-  problems probably don't really allow that.
+  problems probably don't really allow that. -J
 
 > Putting a JPEG in the web form is not an option from my point of
 > view :-) but perhaps there could just be a "web-editable" flag supplied
-- 
cgit v1.2.3


From bc4b8e4e239e56fedcc3cf065f7c6cbd224f7525 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 15 Oct 2009 23:27:53 -0400
Subject: not another hidden requirement...

---
 doc/plugins/contrib/album/discussion.mdwn | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index 50d6c8ddd..9720589b4 100644
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -69,7 +69,16 @@ code or tried it yet, but here goes. --[[Joey]]
 > on the implementation). I agree that this is ugly, though. -s
 
 >> Would you accept a version where the albumimage "viewer" pages
->> could be 0 bytes long, at least until metadata gets added? -s
+>> could be 0 bytes long, at least until metadata gets added?
+>>
+>> The more I think about the "binaries as first-class pages" approach,
+>> the more subtle interactions I notice with other plugins. I
+>> think I'm up to needing changes to editpage, comments, attachment
+>> and recentchanges, plus adjustments to img and Render (to reduce
+>> duplication when thumbnailing an image with a strange extension
+>> while simultaneously changing the extension, and to hardlink/copy
+>> an image with a strange extension to a differing target filename
+>> with the normal extension, respectively). -s
 
 * With each viewer page having next/prev links, I can see how you
   were having the scalability issues with ikiwiki's data structures
@@ -350,6 +359,10 @@ underlay, so that photos don't have to be in your source-code control
 > Replying to myself: perhaps best done as an orthogonal extension
 > to attach? -s
 
+> Yet another non-obvious thing this design would need to do is to find
+> some way to have each change to memes/badger._albummeta show up as a
+> change to memes/badger in `recentchanges`. -s
+
 Things that would be nice, and are probably possible:
 
 * make the "Edit page" link on viewers divert to album-specific CGI instead
-- 
cgit v1.2.3


From e59ba3a11326bbce1c31b0e86ebb28980cbcced3 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Fri, 16 Oct 2009 03:14:03 -0400
Subject: minor: tiny rendering error

---
 doc/bugs/minor:_tiny_rendering_error.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/bugs/minor:_tiny_rendering_error.mdwn

diff --git a/doc/bugs/minor:_tiny_rendering_error.mdwn b/doc/bugs/minor:_tiny_rendering_error.mdwn
new file mode 100644
index 000000000..5131e61fa
--- /dev/null
+++ b/doc/bugs/minor:_tiny_rendering_error.mdwn
@@ -0,0 +1 @@
+`\[[!inline]]` is rendered with a space in front of the first closing bracket.  --[[tschwinge]]
-- 
cgit v1.2.3


From 002b6d2c41300052a056f4f95f417d5d0667f5ce Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Fri, 16 Oct 2009 03:19:55 -0400
Subject: shortcuts: local file.

---
 doc/plugins/shortcut/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/shortcut/discussion.mdwn b/doc/plugins/shortcut/discussion.mdwn
index 4e11ce08c..2e2b1b281 100644
--- a/doc/plugins/shortcut/discussion.mdwn
+++ b/doc/plugins/shortcut/discussion.mdwn
@@ -9,4 +9,10 @@ Maybe use the `default_pageext` is better than hardcode .mdwn?
 
 > done, it will use `default_pageext` now --[[Joey]] 
 
+---
 
+Instead of modifying the [[basewiki]]'s [[shortcuts]] file for local needs --
+thus copying it at some point and losing continuity with upstream enhancements --
+what about handling a `shortcuts-local.mdwn` or `shortcuts/local.mdwn` (if such
+a file exists in the wiki), and additionally process that one.  Possibily a
+conditional `\[[!inline]]` could be used.  --[[tschwinge]]
-- 
cgit v1.2.3


From 6823a51f42a268ba124b287208af7659704ec7d5 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 10:53:05 +0200
Subject: Handling non-existing pages in parentlinks.

---
 doc/bugs/non-existing_pages_in_parentlinks.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/bugs/non-existing_pages_in_parentlinks.mdwn

diff --git a/doc/bugs/non-existing_pages_in_parentlinks.mdwn b/doc/bugs/non-existing_pages_in_parentlinks.mdwn
new file mode 100644
index 000000000..532b0acca
--- /dev/null
+++ b/doc/bugs/non-existing_pages_in_parentlinks.mdwn
@@ -0,0 +1,5 @@
+<http://www.gnu.org/software/hurd/hurd/translator/writing.html> does not exist.
+Then, on
+<http://www.gnu.org/software/hurd/hurd/translator/writing/example.html>, in the
+*parentlinks* line, *writing* links to the top-level *index* file.  It should
+rather not link anywhere at all.
-- 
cgit v1.2.3


From 3e2f99cba10e2bf9194a5788b4174844aeb566e3 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:01:22 +0200
Subject: A list of stuff that would be nice to work on for enhancing the GNU
 Hurd web pages.

---
 doc/users/tschwinge.mdwn | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index bb5cef6a6..5953cf802 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -9,3 +9,64 @@ web pages and previous wiki pages to a *[[ikiwiki]]* system; and all that while
 preserving the previous content's history, which was stored in a CVS repository
 for the HTML web pages and a TWiki RCS repository for the wiki; see
 <http://www.gnu.org/software/hurd/colophon.html>.
+
+# Issues to Work On
+
+## Stability of Separate Builds
+
+The goal is that separate builds of the same source files should yield the
+exactly same HTML code (of course, except for changes due to differences in
+Markdown rendering, for example).
+
+  * Timestamps -- [[forum/ikiwiki__39__s_notion_of_time]], [[forum/How_does_ikiwiki_remember_times__63__]]
+
+    Git set's the current *mtime* when checking out files.  The result is that
+    <http://www.gnu.org/software/hurd/contact_us.html> and
+    <http://www.bddebian.com:8888/~hurd-web/contact_us/> show different *Last
+    edited* timestamps.
+
+    This can either be solved by adding a facility to Git to set the
+    checked-out files' *mtime* according to the *AuthorDate* / *CommitDate*
+    (which one...), or doing that retroactively with the
+    <http://www.gnu.org/software/hurd/set_mtimes> script before building, or
+    with a ikiwiki-internal solution.
+
+  * HTML character entities
+
+    <http://www.gnu.org/software/hurd/purify_html>
+
+## Tags -- [[bugs/tagged__40____41___matching_wikilinks]]
+
+Tags should be a separate concept from wikilinks.
+
+### \[[!map]] behavior
+
+The \[[!map]] on, for example,
+<http://www.gnu.org/software/hurd/tag/open_issue_hurd.html>, should not show
+the complete hierarchy of pages, but instead just the pages that actually *do*
+contain the \[[!tag open_issue_hurd]].
+
+## Anchors -- [[ikiwiki/wikilink/discussion]]
+
+## Default Content for Meta Values -- [[plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__]]
+
+This will decrease to be relevant, as we're going to add copyright and
+licensing headers to every single file.
+
+## Texinfo -- [[plugins/contrib/texinfo]]
+
+Not very important.
+
+## Shortcuts -- [[plugins/shortcut/discussion]]
+
+## \[[!meta redir]] -- [[todo/__42__forward__42__ing_functionality_for_the_meta_plugin]]
+
+Implement a checker that makes sure that no pages that use \[[!meta redir]]
+redirect to another page (and are thus considered legacy pages for providing
+stable URLs, for example) are linked to from other wiki pages.  This is useful
+w.r.t. backlinks.  Alternative, the backlinks to the \[[!meta redir]]-using
+pages could perhaps be passed on to the referred-to page?
+
+## Sendmail -- [[todo/passwordauth:_sendmail_interface]]
+
+## Parentlinks -- [[bugs/non-existing_pages_in_parentlinks]]
-- 
cgit v1.2.3


From 7d76e36edd27663ae7fca653f36a08a63cb36c50 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:05:51 +0200
Subject: Issue with [[!meta date]] / [[!meta updated]] vs. RSS / Atom feeds?

---
 doc/users/tschwinge.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 5953cf802..0fe09696b 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -70,3 +70,9 @@ pages could perhaps be passed on to the referred-to page?
 ## Sendmail -- [[todo/passwordauth:_sendmail_interface]]
 
 ## Parentlinks -- [[bugs/non-existing_pages_in_parentlinks]]
+
+## Unverified -- these may be bugs, but have yet to be verified
+
+  * ikiwiki doesn't change its internal database when \[[!meta date]] /
+    \[[!meta updated]] are added / removed, and thusly these meta values are
+    not promulgated in RSS / Atom feeds.
-- 
cgit v1.2.3


From b94d9589d39dfa720231fb982340741a139478cf Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:11:59 +0200
Subject: Issue with ``no text was copied in this page'' in RSS feeds?

---
 doc/users/tschwinge.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 0fe09696b..306338ae4 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -76,3 +76,8 @@ pages could perhaps be passed on to the referred-to page?
   * ikiwiki doesn't change its internal database when \[[!meta date]] /
     \[[!meta updated]] are added / removed, and thusly these meta values are
     not promulgated in RSS / Atom feeds.
+
+  * Complicated issue w.r.t. *no text was copied in this page*
+    ([[plugins/cutpaste]]) in RSS feed (only; not Atom?) under some conditions
+    (refresh only, but not rebuild?).  Perhaps missing to read in / parse some
+    files?
-- 
cgit v1.2.3


From ab68f96494409e4ce8f689b5c27ef9ea3a73172c Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:12:28 +0200
Subject: Discussion pages of Discussion pages (etc.)?

---
 doc/users/tschwinge.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 306338ae4..657de85f3 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -71,6 +71,12 @@ pages could perhaps be passed on to the referred-to page?
 
 ## Parentlinks -- [[bugs/non-existing_pages_in_parentlinks]]
 
+## Discussion Pages of Discussion Pages of...
+
+Is it useful to have Discussion pages of Discussion pages (etc.)?  -- On
+<http://www.gnu.org/software/hurd/hurd/building/cross-compiling/discussion.html>,
+this possibility is offered.
+
 ## Unverified -- these may be bugs, but have yet to be verified
 
   * ikiwiki doesn't change its internal database when \[[!meta date]] /
-- 
cgit v1.2.3


From 07b28cfcf98c40d1c45276b18d09aab3fa491103 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:24:21 +0200
Subject: TODO: How to preview changes before git://... commit.

---
 doc/todo/preview_changes_before_git_commit.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/todo/preview_changes_before_git_commit.mdwn

diff --git a/doc/todo/preview_changes_before_git_commit.mdwn b/doc/todo/preview_changes_before_git_commit.mdwn
new file mode 100644
index 000000000..e0e6ba866
--- /dev/null
+++ b/doc/todo/preview_changes_before_git_commit.mdwn
@@ -0,0 +1,7 @@
+ikiwiki allows to commit changes to the doc wiki over the `git://...` protocol.
+It would be nice if there'd be a uniform way to view these changes before `git
+push`ing.  For the GNU Hurd's web pages, we include a *render_locally* script,
+<http://www.gnu.org/software/hurd/render_locally>, with instructions on
+<http://www.gnu.org/software/hurd/contributing/web_pages.html>, section
+*Preview Changes*.  With ikiwiki, one can use `make docwiki`, but that excludes
+a set of pages, as per `docwiki.setup`.  --[[tschwinge]]
-- 
cgit v1.2.3


From a91bfd55069a0131d46937a8ef9eedc38e8d6de9 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:25:23 +0200
Subject: Sign.

---
 doc/bugs/non-existing_pages_in_parentlinks.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/non-existing_pages_in_parentlinks.mdwn b/doc/bugs/non-existing_pages_in_parentlinks.mdwn
index 532b0acca..b4ea42b17 100644
--- a/doc/bugs/non-existing_pages_in_parentlinks.mdwn
+++ b/doc/bugs/non-existing_pages_in_parentlinks.mdwn
@@ -2,4 +2,4 @@
 Then, on
 <http://www.gnu.org/software/hurd/hurd/translator/writing/example.html>, in the
 *parentlinks* line, *writing* links to the top-level *index* file.  It should
-rather not link anywhere at all.
+rather not link anywhere at all.  --[[tschwinge]]
-- 
cgit v1.2.3


From 027d28a6a1795b5b1b81aa381793f225682cc0e5 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:28:06 +0200
Subject: Link to the forum from the top-level page.

---
 doc/index.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 93526c42c..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -20,6 +20,7 @@ ikiwiki [[!version ]].
 ## developer resources
 
 The [[RoadMap]] describes where the project is going.
+The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
 can be submitted and tracked using this wiki.
 
-- 
cgit v1.2.3


From 3cf62292e11f0a8809f9f53f1be77acd80d0fb43 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:33:42 +0200
Subject: Forum: discussion about the ever-growing list of pages.

---
 doc/forum/ever-growing_list_of_pages.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 doc/forum/ever-growing_list_of_pages.mdwn

diff --git a/doc/forum/ever-growing_list_of_pages.mdwn b/doc/forum/ever-growing_list_of_pages.mdwn
new file mode 100644
index 000000000..84b9fe6ee
--- /dev/null
+++ b/doc/forum/ever-growing_list_of_pages.mdwn
@@ -0,0 +1,12 @@
+What is overyone's idea about the ever-growing list of pages in bugs/ etc.?
+Once linked to `done`, they're removed from the rendered [[bugs]] page -- but
+they're still present in the repository.
+
+Shouldn't there be some clean-up at some point for those that have been
+resolved?  Or should all of them be kept online forever?
+
+Likewise, for example in [[forum/ikiwiki__39__s_notion_of_time]], should one
+remove the text about the implementation bug that has been fixed, or should it
+stay there, for reference?
+
+--[[tschwinge]]
-- 
cgit v1.2.3


From 9da02428d4f62f84bdadc15f6aadf553a9d16c58 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:40:35 +0200
Subject: Appetizer for the inline plugin?

---
 doc/users/tschwinge.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 657de85f3..54614e922 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -77,6 +77,16 @@ Is it useful to have Discussion pages of Discussion pages (etc.)?  -- On
 <http://www.gnu.org/software/hurd/hurd/building/cross-compiling/discussion.html>,
 this possibility is offered.
 
+## Modifying [[plugins/inline]] for showing only an *appetizer*
+
+Currently ikiwiki's inline plugin will either show the full page or nothing of
+it.  Often that's too much.  One can manually use the [[plugins/toggle]] plugin
+-- see the *News* section on <http://www.gnu.org/software/hurd/>.  Adding a new
+mode to the inline plugin to only show an *appetizer* ending with *... (read
+on)* after a customizable amount of characters (or lines) would be a another
+possibility.  The *... (read on)* would then either toggle the full content
+being displayed or link to the complete page.
+
 ## Unverified -- these may be bugs, but have yet to be verified
 
   * ikiwiki doesn't change its internal database when \[[!meta date]] /
-- 
cgit v1.2.3


From 0a2e4e167dc0a6b9fc0b038c4174694117b74628 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 16 Oct 2009 10:44:14 +0100
Subject: substantially expand the mediawiki tip with some of the steps. More
 to come

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 101 +++++++++++++++++++++++++++--
 1 file changed, 97 insertions(+), 4 deletions(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index f03703b46..c522eaec3 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -1,4 +1,97 @@
-[[sabr]] explains how to [import MediaWiki content into
-git](http://u32.net/Mediawiki_Conversion/index.html?updated), including
-full edit hostory. The [[plugins/contrib/mediawiki]] plugin can then be
-used by ikiwiki to build the wiki.
+Mediawiki is a dynamically-generated wiki which stores it's data in a
+relational database. Pages are marked up using a proprietary markup. It is
+possible to import the contents of a Mediawiki site into an ikiwiki,
+converting some of the Mediawiki conventions into Ikiwiki ones.
+
+The following instructions describe ways of obtaining the current version of
+the wiki. We do not yet cover importing the history of edits.
+
+## Step 1: Getting a list of pages
+
+The first bit of information you require is a list of pages in the Mediawiki.
+There are several different ways of obtaining these.
+
+### Parsing the output of `Special:Allpages`
+
+Mediawikis have a special page called `Special:Allpages` which list all the
+pages for a given namespace on the wiki.
+
+If you fetch the output of this page to a local file with something like
+
+    wget -q -O tmpfile 'http://your-mediawiki/wiki/Special:Allpages'
+
+You can extract the list of page names using the following python script. Note
+that this script is sensitive to the specific markup used on the page, so if
+you have tweaked your mediawiki theme a lot from the original, you will need
+to adjust this script too:
+
+    from xml.dom.minidom import parse, parseString
+    
+    dom = parse(argv[1])
+    tables = dom.getElementsByTagName("table")
+    pagetable = tables[-1]
+    anchors = pagetable.getElementsByTagName("a")
+    for a in anchors:
+        print a.firstChild.toxml().\
+            replace('&amp;,'&').\
+            replace('&lt;','<').\
+            replace('&gt;','>')
+
+Also, if you have pages with titles that need to be encoded to be represented
+in HTML, you may need to add further processing to the last line.
+
+### Querying the database
+
+If you have access to the relational database in which your mediawiki data is
+stored, it is possible to derive a list of page names from this.
+
+## Step 2: fetching the page data
+
+Once you have a list of page names, you can fetch the data for each page.
+
+### Method 1: via HTTP and `action=raw`
+
+You need to create two derived strings from the page titles already: the
+destination path for the page and the source URL. Assuming `$pagename` 
+contains a pagename obtained above, and `$wiki` contains the URL to your
+mediawiki's `index.php` file:
+
+    src=`echo "$pagename" | tr ' ' _ | sed 's,&,&amp;,g'`
+    dest=`"$pagename" | tr ' ' _ | sed 's,&,__38__,g'`
+    
+    mkdir -p `dirname "$dest"`
+    wget -q "$wiki?title=$src&action=raw" -O "$dest"
+
+### Method 2: via HTTP and `Special:Export`
+
+Mediawiki also has a special page `Special:Export` which can be used to obtain
+the source of the page and other metadata such as the last contributor, or the
+full history, etc.
+
+You need to send a `POST` request to the `Special:Export` page. See the source
+of the page fetched via `GET` to determine the correct arguments.
+
+You will then need to write an XML parser to extract the data you need from
+the result.
+
+### Method 3: via the database
+
+It is possible to extract the page data from the database with some
+well-crafted queries.
+
+## Step 2: format conversion
+
+The next step is to convert Mediawiki conventions into Ikiwiki ones. These
+include
+
+ * convert Categories into tags
+ * ...
+
+## External links
+
+[[sabr]] used to explain how to [import MediaWiki content into
+git](http://u32.net/Mediawiki_Conversion/index.html?updated), including full
+edit history, but as of 2009/10/16 that site is not available.
+
+The [[plugins/contrib/mediawiki]] plugin can then be used by ikiwiki to build
+the wiki.
-- 
cgit v1.2.3


From 1c3fc89b8462e4cef2d3fa92dc55c4a9a0658aac Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:46:27 +0200
Subject: Prefixing the HTML Title.

---
 doc/users/tschwinge.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 54614e922..384fac09d 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -87,6 +87,12 @@ on)* after a customizable amount of characters (or lines) would be a another
 possibility.  The *... (read on)* would then either toggle the full content
 being displayed or link to the complete page.
 
+## Prefix For the HTML Title
+
+The title of each page (as in `<html><head><title>`...) should be prefixed with
+*GNU Project - GNU Hurd -*.  We can either do this directly in `page.tmpl`, or
+create a way to modify the `TITLE` template variable suitably.
+
 ## Unverified -- these may be bugs, but have yet to be verified
 
   * ikiwiki doesn't change its internal database when \[[!meta date]] /
-- 
cgit v1.2.3


From 53bf9301eab668cb448cf42a318647dc892a2985 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:48:26 +0200
Subject: Potential issues with the recentchanges plugin.

---
 doc/users/tschwinge.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 384fac09d..05587a24c 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -103,3 +103,13 @@ create a way to modify the `TITLE` template variable suitably.
     ([[plugins/cutpaste]]) in RSS feed (only; not Atom?) under some conditions
     (refresh only, but not rebuild?).  Perhaps missing to read in / parse some
     files?
+
+  * [[plugins/recentchanges]]
+
+      * Creates non-existing links to changes.
+
+      * Invalid *directory link* with `--usedirs`.
+
+      * Doesn't honor `$timeformat`.
+
+      * Does create `recentchangees.*` files even if that is overridden.
-- 
cgit v1.2.3


From d352af1da54851cb7dfdcb31664ad43ecfa3ae85 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:53:37 +0200
Subject: inline plugin: feedfile option w/ usedirs.

---
 doc/users/tschwinge.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 05587a24c..7220310f3 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -93,6 +93,13 @@ The title of each page (as in `<html><head><title>`...) should be prefixed with
 *GNU Project - GNU Hurd -*.  We can either do this directly in `page.tmpl`, or
 create a way to modify the `TITLE` template variable suitably.
 
+## [[plugins/inline]] feedfile option
+
+Not that important.  Git commit b67632cdcdd333cf0a88d03c0f7e6e62921f32c3.  This
+would be nice to have even when using *usedirs*.  Might involve issues as
+discussed in *N-to-M Mapping of Input and Output Files* on
+[[plugins/contrib/texinfo]].
+
 ## Unverified -- these may be bugs, but have yet to be verified
 
   * ikiwiki doesn't change its internal database when \[[!meta date]] /
-- 
cgit v1.2.3


From 5757ad87740fc50ead02aa06cadeb8b591dfcb82 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:57:49 +0200
Subject: Add a comment about the texinfo plugin.

---
 doc/users/tschwinge.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 7220310f3..80eeae0c5 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -55,7 +55,8 @@ licensing headers to every single file.
 
 ## Texinfo -- [[plugins/contrib/texinfo]]
 
-Not very important.
+Not very important.  Have to consider external commands / files / security (see
+[[plugins/teximg]] source code)?
 
 ## Shortcuts -- [[plugins/shortcut/discussion]]
 
-- 
cgit v1.2.3


From 811394ec92205112d3fec0d4f6aac380202f114b Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 16 Oct 2009 11:20:32 +0100
Subject: add snippet for converting categories

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index c522eaec3..ce0c684e7 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -1,3 +1,5 @@
+[[!toc levels=2]]
+
 Mediawiki is a dynamically-generated wiki which stores it's data in a
 relational database. Pages are marked up using a proprietary markup. It is
 possible to import the contents of a Mediawiki site into an ikiwiki,
@@ -85,7 +87,23 @@ The next step is to convert Mediawiki conventions into Ikiwiki ones. These
 include
 
  * convert Categories into tags
- * ...
+
+    import sys, re
+    pattern =  r'\[\[Category:([^\]]+)\]\]'
+    
+    def manglecat(mo):
+            return '[[!tag %s]]' % mo.group(1).strip().replace(' ','_')
+            
+    for line in sys.stdin.readlines():
+            res = re.match(pattern, line)
+            if res:
+                    sys.stdout.write(re.sub(pattern, manglecat, line))
+            else: sys.stdout.write(line)
+
+## Step 3: Mediawiki plugin
+
+The [[plugins/contrib/mediawiki]] plugin can be used by ikiwiki to interpret
+most of the Mediawiki syntax.
 
 ## External links
 
@@ -93,5 +111,3 @@ include
 git](http://u32.net/Mediawiki_Conversion/index.html?updated), including full
 edit history, but as of 2009/10/16 that site is not available.
 
-The [[plugins/contrib/mediawiki]] plugin can then be used by ikiwiki to build
-the wiki.
-- 
cgit v1.2.3


From 58287a929b0ea209a062d11940232a3d31805885 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 16 Oct 2009 11:21:26 +0100
Subject: explanatory text

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index ce0c684e7..3f771ed9b 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -83,10 +83,13 @@ well-crafted queries.
 
 ## Step 2: format conversion
 
-The next step is to convert Mediawiki conventions into Ikiwiki ones. These
-include
+The next step is to convert Mediawiki conventions into Ikiwiki ones.
 
- * convert Categories into tags
+### categories
+
+Mediawiki uses a special page name prefix to define "Categories", which
+otherwise behave like ikiwiki tags. You can convert every Mediawiki category
+into an ikiwiki tag name using a script such as
 
     import sys, re
     pattern =  r'\[\[Category:([^\]]+)\]\]'
-- 
cgit v1.2.3


From 0bee92347020e3034faea5d3cc045ca443e4221c Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 16 Oct 2009 11:23:55 +0100
Subject: minor reworking of page fetch section

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 3f771ed9b..4a750882b 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -53,7 +53,7 @@ Once you have a list of page names, you can fetch the data for each page.
 
 ### Method 1: via HTTP and `action=raw`
 
-You need to create two derived strings from the page titles already: the
+You need to create two derived strings from the page titles: the
 destination path for the page and the source URL. Assuming `$pagename` 
 contains a pagename obtained above, and `$wiki` contains the URL to your
 mediawiki's `index.php` file:
@@ -64,6 +64,9 @@ mediawiki's `index.php` file:
     mkdir -p `dirname "$dest"`
     wget -q "$wiki?title=$src&action=raw" -O "$dest"
 
+You may need to add more conversions here depending on the precise page titles
+used in your wiki.
+
 ### Method 2: via HTTP and `Special:Export`
 
 Mediawiki also has a special page `Special:Export` which can be used to obtain
-- 
cgit v1.2.3


From f6d08ceb358f6d5e51c54ab1b9e90cc4a86fad37 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 16 Oct 2009 11:44:13 +0100
Subject: notes about namespaces

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 4a750882b..87b1ebc48 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -42,6 +42,16 @@ to adjust this script too:
 Also, if you have pages with titles that need to be encoded to be represented
 in HTML, you may need to add further processing to the last line.
 
+Note that by default, `Special:Allpages` will only list pages in the main
+namespace. You need to add a `&namespace=XX` argument to get pages in a
+different namespace. The following numbers correspond to common namespaces:
+
+ * 10 - templates (`Template:foo`)
+ * 14 - categories (`Category:bar`)
+
+Note that the page names obtained this way will not include any namespace
+specific prefix: e.g. `Category:` will be stripped off.
+
 ### Querying the database
 
 If you have access to the relational database in which your mediawiki data is
@@ -67,6 +77,12 @@ mediawiki's `index.php` file:
 You may need to add more conversions here depending on the precise page titles
 used in your wiki.
 
+If you are trying to fetch pages from a different namespace to the default,
+you will need to prefix the page title with the relevant prefix, e.g.
+`Category:` for category pages. You probably don't want to prefix it to the
+output page, but you may want to vary the destination path (i.e. insert an
+extra directory component corresponding to your ikiwiki's `tagbase`).
+
 ### Method 2: via HTTP and `Special:Export`
 
 Mediawiki also has a special page `Special:Export` which can be used to obtain
-- 
cgit v1.2.3


From 7a9512918d981762016bdaf7e6196fe2d46c10c7 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 16 Oct 2009 11:59:27 +0100
Subject: fix step numbering

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 87b1ebc48..1e5b912a9 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -100,7 +100,7 @@ the result.
 It is possible to extract the page data from the database with some
 well-crafted queries.
 
-## Step 2: format conversion
+## Step 3: format conversion
 
 The next step is to convert Mediawiki conventions into Ikiwiki ones.
 
@@ -122,7 +122,7 @@ into an ikiwiki tag name using a script such as
                     sys.stdout.write(re.sub(pattern, manglecat, line))
             else: sys.stdout.write(line)
 
-## Step 3: Mediawiki plugin
+## Step 4: Mediawiki plugin
 
 The [[plugins/contrib/mediawiki]] plugin can be used by ikiwiki to interpret
 most of the Mediawiki syntax.
-- 
cgit v1.2.3


From 4c9ded61db6baf9a5cbd7342055b9ad783ca2351 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 16 Oct 2009 13:24:37 +0100
Subject: response

---
 doc/forum/ever-growing_list_of_pages.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/forum/ever-growing_list_of_pages.mdwn b/doc/forum/ever-growing_list_of_pages.mdwn
index 84b9fe6ee..85a39e107 100644
--- a/doc/forum/ever-growing_list_of_pages.mdwn
+++ b/doc/forum/ever-growing_list_of_pages.mdwn
@@ -10,3 +10,10 @@ remove the text about the implementation bug that has been fixed, or should it
 stay there, for reference?
 
 --[[tschwinge]]
+
+> To answer a question with a question, what harm does having the done bugs
+> around cause? At some point in the future perhaps the number of done pages
+> will be large enough to be a time or space concern. Do you think we've
+> reached a point now? One advantage of having them around is that people
+> running older versions of the Ikiwiki software may find the page explaining
+> that the bug is fixed if they perform a search. -- [[Jon]]
-- 
cgit v1.2.3


From d216a27e0c448447f798883a4d6692d1a51677ef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 12:18:04 -0400
Subject: pointer

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 1e6fc94a7..ed3faa324 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -613,4 +613,15 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	
 	1
 
-Hello. Got ikiwiki running and I'm planning to convert my personal Mediawiki wiki to ikiwiki so I can take offline copies around. If anyone has an old copy of the instructions, or any advice on where to start I'd be glad to hear it. Otherwise I'm just going to chronicle my journey on the page.--[[users/Chadius]]
+Hello. Got ikiwiki running and I'm planning to convert my personal
+Mediawiki wiki to ikiwiki so I can take offline copies around. If anyone
+has an old copy of the instructions, or any advice on where to start I'd be
+glad to hear it. Otherwise I'm just going to chronicle my journey on the
+page.--[[users/Chadius]]
+
+> Today I saw that someone is working to import wikipedia into git.
+> <http://www.gossamer-threads.com/lists/wiki/foundation/181163>
+> Since wikipedia uses mediawiki, perhaps his importer will work
+> on mediawiki in general. It seems to produce output that could be
+> used by the [[plugins/contrib/mediawiki]] plugin, if the filenames
+> were fixed to use the right extension.  --[[Joey]] 
-- 
cgit v1.2.3


From d42f5ec009bff055ebf36feb972cde8e540673f8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 12:38:26 -0400
Subject: response

---
 doc/todo/preview_changes_before_git_commit.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/todo/preview_changes_before_git_commit.mdwn b/doc/todo/preview_changes_before_git_commit.mdwn
index e0e6ba866..187497cf4 100644
--- a/doc/todo/preview_changes_before_git_commit.mdwn
+++ b/doc/todo/preview_changes_before_git_commit.mdwn
@@ -5,3 +5,13 @@ push`ing.  For the GNU Hurd's web pages, we include a *render_locally* script,
 <http://www.gnu.org/software/hurd/contributing/web_pages.html>, section
 *Preview Changes*.  With ikiwiki, one can use `make docwiki`, but that excludes
 a set of pages, as per `docwiki.setup`.  --[[tschwinge]]
+
+> `ikiwiki -setup some.setup --render file.mdwn` will build the page and
+> dump it to stdout. So, for example:
+
+	ikiwiki -setup docwiki.setup --render doc/todo/preview_changes_before_git_commit.mdwn | w3m -T text/html
+
+> You have to have a setup file, though it suffices to make up your own
+> if you don't have the real one. Using ikiwiki.info's real setup file
+> won't actually work since it uses a search plugin that gets unhappy
+> if this is not in `/srv/web/ikiwiki.info`. --[[Joey]]
-- 
cgit v1.2.3


From 3cedbc3b65cfa5e2c802da0e92eca716dda13bb8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 12:51:32 -0400
Subject: notes

---
 doc/users/tschwinge.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 80eeae0c5..341a52953 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -46,6 +46,8 @@ The \[[!map]] on, for example,
 the complete hierarchy of pages, but instead just the pages that actually *do*
 contain the \[[!tag open_issue_hurd]].
 
+> `tagged(open_issue_hurd)` in its pagespec should do that. --[[Joey]]
+
 ## Anchors -- [[ikiwiki/wikilink/discussion]]
 
 ## Default Content for Meta Values -- [[plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__]]
@@ -68,6 +70,9 @@ stable URLs, for example) are linked to from other wiki pages.  This is useful
 w.r.t. backlinks.  Alternative, the backlinks to the \[[!meta redir]]-using
 pages could perhaps be passed on to the referred-to page?
 
+> I found that backlinks was an easy way to find such links to such pages.
+> (Although the redirection made it hard to see the backlinks!) --[[Joey]] 
+
 ## Sendmail -- [[todo/passwordauth:_sendmail_interface]]
 
 ## Parentlinks -- [[bugs/non-existing_pages_in_parentlinks]]
@@ -88,6 +93,9 @@ on)* after a customizable amount of characters (or lines) would be a another
 possibility.  The *... (read on)* would then either toggle the full content
 being displayed or link to the complete page.
 
+> You're looking for [[plugins/more]] (or possibly a way to do that automatically, 
+> I suppose. --[[Joey]] 
+
 ## Prefix For the HTML Title
 
 The title of each page (as in `<html><head><title>`...) should be prefixed with
@@ -101,12 +109,22 @@ would be nice to have even when using *usedirs*.  Might involve issues as
 discussed in *N-to-M Mapping of Input and Output Files* on
 [[plugins/contrib/texinfo]].
 
+> Do you mean when *not* using usedirs? It is currently supported for usedirs,
+> only. --[[Joey]] 
+
 ## Unverified -- these may be bugs, but have yet to be verified
 
   * ikiwiki doesn't change its internal database when \[[!meta date]] /
     \[[!meta updated]] are added / removed, and thusly these meta values are
     not promulgated in RSS / Atom feeds.
 
+    > I would rather see this filed as a bug, but FWIW, the problem
+    > is probably that meta does not override the mdate_3339
+    > template variable used by the atom and rss templates.
+    > (Meta does store ctime directly in the ikiwiki database, but cannot
+    > store mtime in \%pagemtime because it would mess up detection of when
+    > actual file mtimes change.) --[[Joey]]
+
   * Complicated issue w.r.t. *no text was copied in this page*
     ([[plugins/cutpaste]]) in RSS feed (only; not Atom?) under some conditions
     (refresh only, but not rebuild?).  Perhaps missing to read in / parse some
-- 
cgit v1.2.3


From e772c5527b534976f19364b380e05bfe0bd31426 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 12:58:54 -0400
Subject: merge duplicate bug into original

note behavior change, also that presense dependencies could let this be
fixed now
---
 doc/bugs/broken_parentlinks.mdwn                | 21 +++++++++++++++++++++
 doc/bugs/non-existing_pages_in_parentlinks.mdwn |  5 -----
 2 files changed, 21 insertions(+), 5 deletions(-)
 delete mode 100644 doc/bugs/non-existing_pages_in_parentlinks.mdwn

diff --git a/doc/bugs/broken_parentlinks.mdwn b/doc/bugs/broken_parentlinks.mdwn
index caf1eeb0e..f8f96b6ca 100644
--- a/doc/bugs/broken_parentlinks.mdwn
+++ b/doc/bugs/broken_parentlinks.mdwn
@@ -19,6 +19,10 @@ example/*!
 ikiwiki doesn't have a way to represent this dependency and can't get one
 without a lot of new complex code being added.
 
+> Note that this code has now been added. In new terms, example/* has a
+> presence dependency on example. So this bug is theoretically fixable now.
+> --[[Joey]] 
+
 For now the best thing to do is to make sure that you always create
 example if you create example/foo. Which is probably a good idea anyway..
 
@@ -27,3 +31,20 @@ example if you create example/foo. Which is probably a good idea anyway..
 Note that this bug does not exist if the wiki is built with the "usedirs"
 option, since in that case, the parent link will link to a subdirectory,
 that will just be missing the index.html file, but still nicely usable.
+--[[Joey]] 
+
+----
+
+<http://www.gnu.org/software/hurd/hurd/translator/writing.html> does not exist.
+Then, on
+<http://www.gnu.org/software/hurd/hurd/translator/writing/example.html>, in the
+*parentlinks* line, *writing* links to the top-level *index* file.  It should
+rather not link anywhere at all.  --[[tschwinge]]
+
+> So, the bug has changed behavior a bit. Rather than a broken link, we get
+> a link to the toplevel page. This, FWIW, is because the template now
+> uses this for each parentlink:
+
+	<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/
+
+> Best workaround is still to enable usedirs. --[[Joey]] 
diff --git a/doc/bugs/non-existing_pages_in_parentlinks.mdwn b/doc/bugs/non-existing_pages_in_parentlinks.mdwn
deleted file mode 100644
index b4ea42b17..000000000
--- a/doc/bugs/non-existing_pages_in_parentlinks.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-<http://www.gnu.org/software/hurd/hurd/translator/writing.html> does not exist.
-Then, on
-<http://www.gnu.org/software/hurd/hurd/translator/writing/example.html>, in the
-*parentlinks* line, *writing* links to the top-level *index* file.  It should
-rather not link anywhere at all.  --[[tschwinge]]
-- 
cgit v1.2.3


From 5b49890be04c5691437e33e2c28fe46a0c65198f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 13:01:02 -0400
Subject: respinse

---
 doc/bugs/minor:_tiny_rendering_error.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/minor:_tiny_rendering_error.mdwn b/doc/bugs/minor:_tiny_rendering_error.mdwn
index 5131e61fa..b2e07eef9 100644
--- a/doc/bugs/minor:_tiny_rendering_error.mdwn
+++ b/doc/bugs/minor:_tiny_rendering_error.mdwn
@@ -1 +1,5 @@
 `\[[!inline]]` is rendered with a space in front of the first closing bracket.  --[[tschwinge]]
+
+> I don't think that complicating the directive parser
+> is warrented by the minorness of this bug. The result that it outputs is
+> still valid. --[[Joey]] 
-- 
cgit v1.2.3


From 13c93b1ab9a7ae3efb845b7fb73e34c94b912e3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 15:34:33 -0400
Subject: note that chrome fixes this nicely

---
 doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
index 4c9c2352a..0c45f0c90 100644
--- a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
+++ b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
@@ -10,7 +10,7 @@ On longer pages its not very comfortable to edit pages with such a small box. Th
 >	}
 >
 > Perhaps you have replaced it with a modified style sheet that does not
-> include that? --[[Joey]] [[!tag done]]
+> include that? --[[Joey]]
 
 >> The screen shot was made with http://ikiwiki.info/ where i didn't change anything. The width is optimally used. The problem is the height.
 
@@ -32,3 +32,9 @@ On longer pages its not very comfortable to edit pages with such a small box. Th
 >>> --[[Joey]] 
 
 >>>>>> the javascript approach would need to work something like this: you need to know about the "bottom-most" item on the edit page, and get a handle for that object in the DOM. You can then obtain the absolute position height-wise of this element and the absolute position of the bottom of the window to determine the pixel-difference. Then, you set the height of the textarea to (current height in px) + determined-value. This needs to be re-triggered on various resize events, at least for the window and probably for other elements too. I may have a stab at this at some point. -- [[Jon]]
+
+Google chrome has a completly elegant fix for this problem: All textareas
+have a small resize handle in a corner, that can be dragged around. No
+nasty javascript needed. IMHO, this is the right solution, and I hope other
+browsers emulate it. [[done]]
+--[[Joey]]
-- 
cgit v1.2.3


From aa5fa1f11dcec93bae1420e175e17b768372d31c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 15:37:31 -0400
Subject: response

---
 doc/forum/ever-growing_list_of_pages.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/forum/ever-growing_list_of_pages.mdwn b/doc/forum/ever-growing_list_of_pages.mdwn
index 85a39e107..435b12c8c 100644
--- a/doc/forum/ever-growing_list_of_pages.mdwn
+++ b/doc/forum/ever-growing_list_of_pages.mdwn
@@ -17,3 +17,6 @@ stay there, for reference?
 > reached a point now? One advantage of having them around is that people
 > running older versions of the Ikiwiki software may find the page explaining
 > that the bug is fixed if they perform a search. -- [[Jon]]
+
+> I like to keep old bugs around. OTOH, I have no problem with cleaning up
+> obsolete stuff in the forum, tips, etc. --[[Joey]]
-- 
cgit v1.2.3


From 2209a07ba34830c63ce578881da6a006bc48d90f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 15:43:32 -0400
Subject: update

---
 doc/forum/speeding_up_ikiwiki.mdwn | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/forum/speeding_up_ikiwiki.mdwn b/doc/forum/speeding_up_ikiwiki.mdwn
index 0b2164238..2c2ac240e 100644
--- a/doc/forum/speeding_up_ikiwiki.mdwn
+++ b/doc/forum/speeding_up_ikiwiki.mdwn
@@ -77,15 +77,14 @@ wrapper.
 > Dependencies go in the `%IkiWiki::depends` hash, which is not exported. It
 > can also be dumped out as part of the wiki state - see [[tips/inside_dot_ikiwiki]].
 >
-> It's a map from page name to increasingly complex pagespec, although
-> the `optimize-depends` branch in my git repository changes that to a
-> map from a page name to a *list* of pagespecs which are automatically
-> or'd together for use (this at least means duplicates can be weeded out).
->
-> See [[todo/should_optimise_pagespecs]] for more on that.
+> Nowadays, it's a hash of pagespecs, and there
+> is also a `IkiWiki::depends_simple` hash of simple page names.
 >
 > I've been hoping to speed up IkiWiki too - making a lot of photo albums
 > with my [[plugins/contrib/album]] plugin makes it pretty slow.
 >
 > One thing that I found was a big improvement was to use `quick=yes` on all
 > my `archive=yes` [[ikiwiki/directive/inline]]s. --[[smcv]]
+
+> Take a look at [[tips/optimising_ikiwiki]] for lots of helpful advice.
+> --[[Joey]] 
-- 
cgit v1.2.3


From b2fd4f9b254610283d3fa6944ea73941c2045769 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 15:50:33 -0400
Subject: explain how to profile

---
 doc/tips/optimising_ikiwiki.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index 6d0997603..085ef0306 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -140,6 +140,21 @@ That is accomplished as follows:
 Be aware that the [[plugins/search]] plugin has to update the search index
 whenever any page is changed. This can slow things down somewhat.
 
+## profiling
+
+If you have a repeatable change that ikiwiki takes a long time to build,
+and none of the above help, the next thing to consider is profiling
+ikiwiki. 
+
+The best way to do it is:
+
+* Install [[cpan Devel::NYTProf]]
+* `PERL5OPT=-d:NYTProf`
+* `export PER5OPT`
+* Now run ikiwiki as usual, and it will generate a `nytprof.out` file.
+* Run `nytprofhtml` to generate html files.
+* Those can be examined to see what parts of ikiwiki are being slow.
+
 ## scaling to large numbers of pages
 
 Finally, let's think about how huge number of pages can affect ikiwiki.
-- 
cgit v1.2.3


From 69a1ebce16debf8b0aeb61329ff26d235e248e7d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 16:43:26 -0400
Subject: link

---
 doc/tips/optimising_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index 085ef0306..cf166998b 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -148,7 +148,7 @@ ikiwiki.
 
 The best way to do it is:
 
-* Install [[cpan Devel::NYTProf]]
+* Install [[!cpan Devel::NYTProf]]
 * `PERL5OPT=-d:NYTProf`
 * `export PER5OPT`
 * Now run ikiwiki as usual, and it will generate a `nytprof.out` file.
-- 
cgit v1.2.3


From 31633c7addf25619a2a3042fc3e27f21aa97a831 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Sat, 17 Oct 2009 14:43:11 +0200
Subject: Add some more reasoning.  Split out unrelated issue.

---
 .../cleaning_up_discussion_pages_and_the_like.mdwn    | 11 +++++++++++
 doc/forum/ever-growing_list_of_pages.mdwn             | 19 +++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn

diff --git a/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
new file mode 100644
index 000000000..35ceae59b
--- /dev/null
+++ b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
@@ -0,0 +1,11 @@
+For example in [[forum/ikiwiki__39__s_notion_of_time]], should one remove the
+text about the implementation bug that has been fixed, or should it stay there,
+for reference?  --[[tschwinge]]
+
+> I have no problem with cleaning up obsolete stuff in the forum, tips, etc.
+> --[[Joey]]
+
+That's also what I think: such discussions or comments on [[forum]] discussion
+pages, or generally on all pages' [[Discussion]] subpages, can be removed if
+either they're simply not valid / interesting / ... anymore, or if they've been
+used to improve the *real* documentation.  --[[tschwinge]]
diff --git a/doc/forum/ever-growing_list_of_pages.mdwn b/doc/forum/ever-growing_list_of_pages.mdwn
index 435b12c8c..9920e34bb 100644
--- a/doc/forum/ever-growing_list_of_pages.mdwn
+++ b/doc/forum/ever-growing_list_of_pages.mdwn
@@ -5,10 +5,6 @@ they're still present in the repository.
 Shouldn't there be some clean-up at some point for those that have been
 resolved?  Or should all of them be kept online forever?
 
-Likewise, for example in [[forum/ikiwiki__39__s_notion_of_time]], should one
-remove the text about the implementation bug that has been fixed, or should it
-stay there, for reference?
-
 --[[tschwinge]]
 
 > To answer a question with a question, what harm does having the done bugs
@@ -18,5 +14,16 @@ stay there, for reference?
 > running older versions of the Ikiwiki software may find the page explaining
 > that the bug is fixed if they perform a search. -- [[Jon]]
 
-> I like to keep old bugs around. OTOH, I have no problem with cleaning up
-> obsolete stuff in the forum, tips, etc. --[[Joey]]
+> I like to keep old bugs around. --[[Joey]]
+
+So, I guess it depends on whether you want to represent the development of the
+software (meaning: which bugs are open, which are fixed) *(a)* in a snapshot of
+the repository (a checkout; that is, what you see rendered on
+<http://ikiwiki.info/>), or *(b)* if that information is to be contained in the
+backing repository's revision history only.  Both approaches are valid.  For
+people used to using Git for accessing a project's history, *(b)* is what
+they're used to, but for those poor souls ;-) that only use a web browser to
+access this database, *(a)* is the more useful approach indeed.  For me, using
+Git, it is a bit of a hindrance, as, when doing a full-text search for a
+keyword on a checkout, I'd frequently hit pages that reported a bug, but are
+tagged `done` by now.  --[[tschwinge]]
-- 
cgit v1.2.3


From f71e84c918827a482158073af45fa7f9acc5ed31 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Sat, 17 Oct 2009 15:00:12 +0200
Subject: Reflect merge of page.

---
 doc/bugs/broken_parentlinks.mdwn | 2 +-
 doc/users/tschwinge.mdwn         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/bugs/broken_parentlinks.mdwn b/doc/bugs/broken_parentlinks.mdwn
index f8f96b6ca..556d89b65 100644
--- a/doc/bugs/broken_parentlinks.mdwn
+++ b/doc/bugs/broken_parentlinks.mdwn
@@ -10,7 +10,7 @@ a dead link for every subpage.
 
 This is a bug, but fixing it is very tricky. Consider what would happen if
 example.mdwn were created: example/page.html and the rest of example/*
-would need to be updated to change the parentlink from a bare work to a
+would need to be updated to change the parentlink from a bare word to a
 link to the new page. Now if example.mdwn were removed again, they'd need
 to be updated again. So example/* depends on example. But it's even more
 tricky, because if example.mdwn is modified, we _don't_ want to rebuild
diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 341a52953..3bab61bc1 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -75,7 +75,7 @@ pages could perhaps be passed on to the referred-to page?
 
 ## Sendmail -- [[todo/passwordauth:_sendmail_interface]]
 
-## Parentlinks -- [[bugs/non-existing_pages_in_parentlinks]]
+## [[bugs/Broken Parentlinks]]
 
 ## Discussion Pages of Discussion Pages of...
 
-- 
cgit v1.2.3


From f51a2b654fbcf6b3b6ae7ad50b2c1929705f2b22 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Sat, 17 Oct 2009 15:16:02 +0200
Subject: [[!map tagged=...]]: Try to tell more clearly what I'd expect.

---
 doc/users/tschwinge.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 3bab61bc1..53902a7df 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -48,6 +48,20 @@ contain the \[[!tag open_issue_hurd]].
 
 > `tagged(open_issue_hurd)` in its pagespec should do that. --[[Joey]]
 
+>> Well, that's exactly what this page contains: \[[!map
+>> pages="tagged(open_issue_hurd) and !open_issues and !*/discussion"
+>> show=title]]
+>> 
+>> This is currently rendered as can be seen on
+>> <http://www.gnu.org/software/hurd/tag/open_issue_hurd.html>, but I'd imagine
+>> it to be rendered by **only** linking to the pages that actually do contain
+>> the tag, (**only** the outer leaf ones, which are *capturing stdout and
+>> stderr*, *ramdisk*, *syncfs*, ...; but **not** to *hurd*, *debugging*,
+>> *translator*, *libstore*, *examples*, ...).  Otherwise, the way it's being
+>> rendered at the moment, it appears to the reader that *hurd*, *debugging*,
+>> *translator*, *libstore*, *examples*, ... were all tagged, too, and not only
+>> the outer ones.
+
 ## Anchors -- [[ikiwiki/wikilink/discussion]]
 
 ## Default Content for Meta Values -- [[plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__]]
-- 
cgit v1.2.3


From 1859ccf8ace69c7f2db4872b269be10a66b41e4d Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Sat, 17 Oct 2009 15:19:01 +0200
Subject: feedfile: Thanks, Joey, indeed *not* using usedirs was what I meant.

---
 doc/users/tschwinge.mdwn | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 53902a7df..33a139784 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -119,13 +119,10 @@ create a way to modify the `TITLE` template variable suitably.
 ## [[plugins/inline]] feedfile option
 
 Not that important.  Git commit b67632cdcdd333cf0a88d03c0f7e6e62921f32c3.  This
-would be nice to have even when using *usedirs*.  Might involve issues as
+would be nice to have even when *not* using *usedirs*.  Might involve issues as
 discussed in *N-to-M Mapping of Input and Output Files* on
 [[plugins/contrib/texinfo]].
 
-> Do you mean when *not* using usedirs? It is currently supported for usedirs,
-> only. --[[Joey]] 
-
 ## Unverified -- these may be bugs, but have yet to be verified
 
   * ikiwiki doesn't change its internal database when \[[!meta date]] /
-- 
cgit v1.2.3


From 6a955e86bb37b490f066886968ba8ba2c56907ef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Oct 2009 20:21:42 -0400
Subject: fix logic error

This sometimes caused infinite recursion when rebuilding a wiki
with po files.
---
 IkiWiki/Plugin/po.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 5d0d9e79d..d9aa9bfda 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -394,23 +394,25 @@ sub change (@) {
 	my $updated_po_files=0;
 
 	# Refresh/create POT and PO files as needed.
-	# (But avoid doing so if they are in an underlay directory.)
 	foreach my $file (grep {istranslatablefile($_)} @rendered) {
 		my $masterfile=srcfile($file);
 		my $page=pagename($file);
 		my $updated_pot_file=0;
+
+		# Avoid touching underlay files.
+		next if $masterfile ne "$config{srcdir}/$file";
+
 		# Only refresh POT file if it does not exist, or if
-		# $pagesources{$page} was changed: don't if only the HTML was
+		# the source was changed: don't if only the HTML was
 		# refreshed, e.g. because of a dependency.
-		if ($masterfile eq "$config{srcdir}/$file" &&
-		   ((grep { $_ eq $pagesources{$page} } @origneedsbuild)
-		    || ! -e potfile($masterfile))) {
+		if ((grep { $_ eq $pagesources{$page} } @origneedsbuild) ||
+		    ! -e potfile($masterfile)) {
 			refreshpot($masterfile);
 			$updated_pot_file=1;
 		}
 		my @pofiles;
 		foreach my $po (pofiles($masterfile)) {
-			next if ! $updated_pot_file && ! -e $po;
+			next if ! $updated_pot_file && -e $po;
 			next if grep { $po=~/\Q$_\E/ } @{$config{underlaydirs}};
 			push @pofiles, $po;
 		}
-- 
cgit v1.2.3


From 1d094d82a3ebdc277680c88ae47bbb78dab62328 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Oct 2009 20:52:18 -0400
Subject: releasing version 3.20091017

---
 debian/NEWS      |   2 +-
 debian/changelog |   4 +-
 po/bg.po         | 130 ++++++++++++++++++++++++++---------------------------
 po/cs.po         | 130 ++++++++++++++++++++++++++---------------------------
 po/da.po         | 130 ++++++++++++++++++++++++++---------------------------
 po/de.po         | 130 ++++++++++++++++++++++++++---------------------------
 po/es.po         | 134 +++++++++++++++++++++++++++----------------------------
 po/fr.po         | 130 ++++++++++++++++++++++++++---------------------------
 po/gu.po         | 130 ++++++++++++++++++++++++++---------------------------
 po/ikiwiki.pot   | 126 +++++++++++++++++++++++++--------------------------
 po/it.po         | 130 ++++++++++++++++++++++++++---------------------------
 po/pl.po         | 130 ++++++++++++++++++++++++++---------------------------
 po/sv.po         | 130 ++++++++++++++++++++++++++---------------------------
 po/vi.po         | 130 ++++++++++++++++++++++++++---------------------------
 14 files changed, 783 insertions(+), 783 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 7c88ca733..50332670f 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
+ikiwiki (3.20091017) unstable; urgency=low
 
   To take advantage of significant performance improvements, all
   wikis need to be rebuilt on upgrade to this version. If you
diff --git a/debian/changelog b/debian/changelog
index eab725d92..7da20a3f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
+ikiwiki (3.20091017) unstable; urgency=low
 
   * Added support framework for multiple types of dependencies, including
     dependncies that are only affected by page precence or link changes.
@@ -40,7 +40,7 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
   * inline: Optimize generation of archives, etc by not getting inlined page
     content if the template does not use it.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 09 Oct 2009 19:53:50 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 17 Oct 2009 15:37:04 -0400
 
 ikiwiki (3.20091009) unstable; urgency=low
 
diff --git a/po/bg.po b/po/bg.po
index ada27177c..79ea53624 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Грешка"
 
@@ -188,12 +188,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "Няма „счупени” връзки!"
 
@@ -348,18 +348,18 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -448,29 +448,20 @@ msgstr "липсващ параметър „id” на шаблона"
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "непознат вид сортиране „%s”"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 #, fuzzy
 msgid "failed to run dot"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
@@ -531,7 +522,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "Получаване на OpenID номер"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Всички страници имат връзки от други страници."
@@ -617,77 +608,77 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -708,11 +699,11 @@ msgstr "не е инсталиран polygen"
 msgid "command failed"
 msgstr "грешшка в приставката „fortune”"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr ""
 
@@ -785,7 +776,7 @@ msgstr ""
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -1045,54 +1036,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "сканиране на „%s”"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "сканиране на „%s”"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "премахване на „%s” понеже не се генерира от „%s”"
+
+#: ../IkiWiki/Render.pm:603
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:548
-#, fuzzy, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "премахване на „%s” понеже не се генерира от „%s”"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1171,35 +1162,44 @@ msgstr "обновяване на уики..."
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Дискусия"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr ""
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "непознат вид сортиране „%s”"
+
+#: ../IkiWiki.pm:2036
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
diff --git a/po/cs.po b/po/cs.po
index 219e2769a..b3c25c8a8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -55,7 +55,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Chyba"
 
@@ -186,12 +186,12 @@ msgstr ""
 "Je mi líto, ale podle <a href=\"http://blogspam.net/\">blogspam</a> to "
 "vypadá jako spam: "
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr "%s z %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "Žádné porušené odkazy!"
 
@@ -341,18 +341,18 @@ msgstr "není stránkou"
 msgid "%s is an attachment, not a page."
 msgstr "%s není ani příloha, ani stránka."
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "nejste oprávněni měnit %s"
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
@@ -434,29 +434,20 @@ msgstr "chybí parametr pages"
 msgid "the %s and %s parameters cannot be used together"
 msgstr "parametry %s a %s nelze použít zároveň"
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "neznámý typ řazení %s"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr "Přidat nový příspěvek nazvaný:"
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "neexistující šablona %s"
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 msgid "failed to run dot"
 msgstr "nepodařilo se spustit dot"
 
@@ -511,7 +502,7 @@ msgstr "Přihlásit pomocí"
 msgid "Get an OpenID"
 msgstr "Získat OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 msgid "All pages have other pages linking to them."
 msgstr "Na každou stránku vede odkaz z jiné stránky."
 
@@ -597,16 +588,16 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, perl-format
 msgid "building %s"
 msgstr "sestavuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "aktualizovány PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -614,7 +605,7 @@ msgstr ""
 "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
 "budou odstraněny také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -622,55 +613,55 @@ msgstr ""
 "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
 "budou přejmenovány také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT soubor (%s) neexistuje"
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nepodařilo se zkopírovat PO soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "nepodařilo se aktualizovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nepodařilo se zkopírovat POT soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "nepodařilo se přeložit %s"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "odstraněny zastaralé PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, perl-format
 msgid "failed to write %s"
 msgstr "nepodařilo se zapsat %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "failed to translate"
 msgstr "překlad se nezdařil"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, perl-format
 msgid "failed to read %s"
 msgstr "nepodařilo se přečíst %s"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
@@ -692,11 +683,11 @@ msgstr "polygen není nainstalován"
 msgid "command failed"
 msgstr "příkaz selhal"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr "chybí vzorec"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr "neznámý vzorec"
 
@@ -769,7 +760,7 @@ msgstr "%A o poledni"
 msgid "illegal percent value %s"
 msgstr "neplatná procentuální hodnota %s"
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`"
 
@@ -1021,7 +1012,12 @@ msgstr "nemohu určit identitu nedůvěryhodného uživatele %s"
 msgid "bad file name %s"
 msgstr "chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "prohledávám %s"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1030,47 +1026,42 @@ msgstr ""
 "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-"
 "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s má několik možných zdrojových stránek"
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "prohledávám %s"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "sestavuji %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "odstraňuji %s, již není sestavována pomocí %s"
+
+#: ../IkiWiki/Render.pm:603
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "sestavuji %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:548
-#, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "odstraňuji %s, již není sestavována pomocí %s"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze sestavit %s"
@@ -1149,33 +1140,42 @@ msgstr "znovusestavuji wiki..."
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Diskuse"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr "nelze použít několik rcs modulů"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "neznámý typ řazení %s"
+
+#: ../IkiWiki.pm:2036
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
diff --git a/po/da.po b/po/da.po
index b7da31d34..b68e663a7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Fejl"
 
@@ -193,12 +193,12 @@ msgstr ""
 "Beklager, men det ligner spam til <a href=\"http://blogspam.net/\">blogspam</"
 "a>: "
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr "%s fra %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
@@ -349,18 +349,18 @@ msgstr "kan ikke få sider til at passe sammen: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Du har ikke lov til at ændre %s"
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "du kan ikke påvirke en fil med modus %s"
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
@@ -445,29 +445,20 @@ msgstr "mangler pages-parametren"
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally krævet for title_natural sortering"
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "ukendt sorteringsform %s"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr "Tilføj nyt indlæg med følgende titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "ikke-eksisterende skabelon: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 msgid "failed to run dot"
 msgstr "dot-kørsel mislykkedes"
 
@@ -524,7 +515,7 @@ msgstr "Log på med"
 msgid "Get an OpenID"
 msgstr "Skaf en OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 msgid "All pages have other pages linking to them."
 msgstr "Alle sider har henvisninger fra andre sider."
 
@@ -613,16 +604,16 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -630,7 +621,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -638,55 +629,55 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, perl-format
 msgid "failed to read %s"
 msgstr "læsning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -707,11 +698,11 @@ msgstr "polygen ikke installeret"
 msgid "command failed"
 msgstr "kommando fejlede"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr "manglende formular"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr "ukendt formular"
 
@@ -784,7 +775,7 @@ msgstr "midt på dagen %A"
 msgid "illegal percent value %s"
 msgstr "ugyldig procentværdi %s"
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`"
 
@@ -1036,7 +1027,12 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "gennemlæser %s"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1045,47 +1041,42 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "gennemlæser %s"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "fjerner %s, ikke længere dannet af %s"
+
+#: ../IkiWiki/Render.pm:603
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:548
-#, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "fjerner %s, ikke længere dannet af %s"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1164,34 +1155,43 @@ msgstr "genopbygger wiki..."
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr "Sort::Naturally krævet for title_natural sortering"
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "ukendt sorteringsform %s"
+
+#: ../IkiWiki.pm:2036
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
diff --git a/po/de.po b/po/de.po
index 756453db5..4f3be838f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Fehler"
 
@@ -190,12 +190,12 @@ msgstr ""
 "Entschuldigung, aber <a href=\"http://blogspam.net/\">blogspam</a> stuft das "
 "als Spam ein: "
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "Es gibt keine ungültigen Verweise!"
 
@@ -347,18 +347,18 @@ msgstr "Kann die Seiten nicht zuordnen: %s"
 msgid "%s is an attachment, not a page."
 msgstr "Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Sie dürfen %s nicht verändern"
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
@@ -445,29 +445,20 @@ msgstr "fehlender Seitenparameter"
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally wird benötigt für title_natural sort"
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "Unbekannter Sortierungstyp %s"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "nicht-vorhandene Vorlage %s"
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 msgid "failed to run dot"
 msgstr "dot konnte nicht ausgeführt werden"
 
@@ -525,7 +516,7 @@ msgstr "Anmelden mit"
 msgid "Get an OpenID"
 msgstr "Eine OpenID anfordern"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite."
@@ -616,16 +607,16 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -633,7 +624,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -641,55 +632,55 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, perl-format
 msgid "failed to read %s"
 msgstr "lesen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -711,11 +702,11 @@ msgstr "polygen ist nicht installiert"
 msgid "command failed"
 msgstr "Befehl fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr "fehlende Formel"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr "unbekannte Formel"
 
@@ -788,7 +779,7 @@ msgstr "am Nachmittag des %A"
 msgid "illegal percent value %s"
 msgstr "unzulässiger Prozentwert %s"
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 "es werden entweder `percent` oder `totalpages` und `donepages` Parameter "
@@ -1045,7 +1036,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "durchsuche %s"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1054,47 +1050,42 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "durchsuche %s"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "entferne %s, wird nicht länger von %s erzeugt"
+
+#: ../IkiWiki/Render.pm:603
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:548
-#, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "entferne %s, wird nicht länger von %s erzeugt"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1176,36 +1167,45 @@ msgstr "erzeuge Wiki neu.."
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr "Sort::Naturally wird benötigt für title_natural sort"
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "Unbekannter Sortierungstyp %s"
+
+#: ../IkiWiki.pm:2036
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
diff --git a/po/es.po b/po/es.po
index fa9081449..ddaf20d85 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Error"
 
@@ -195,12 +195,12 @@ msgstr ""
 "Lo siento, pero el analizador <a href=\"http://blospam.net\">blogspam</a> "
 "dice que el texto puede ser spam."
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr "%s desde la página %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "¡ No hay enlaces rotos !"
 
@@ -351,18 +351,18 @@ msgstr "no encuentro páginas coincidentes: %s"
 msgid "%s is an attachment, not a page."
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No puede cambiar %s"
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "no puede actuar sobre un archivo con permisos %s"
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
@@ -450,31 +450,20 @@ msgstr "falta el parámetro pages"
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
-"Se necesita el módulo Sort::Naturally para el tipo de ordenación "
-"title_natural"
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "no conozco este tipo de ordenación %s"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr "Añadir una entrada nueva titulada:"
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "la plantilla %s no existe "
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 msgid "failed to run dot"
 msgstr "no he podido ejecutar el programa dot"
 
@@ -531,7 +520,7 @@ msgstr "Identificarse mediante "
 msgid "Get an OpenID"
 msgstr "Consiga un identificador OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Todas las páginas están referenciadas entre sí."
@@ -620,77 +609,77 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "no puedo leer de %s: %s "
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -710,11 +699,11 @@ msgstr "El complemento polygen no ha sido instalado"
 msgid "command failed"
 msgstr "la ejecución del programa ha fallado"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr "falta la fórmula"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr "fórmula desconocida "
 
@@ -787,7 +776,7 @@ msgstr "el %A a media tarde"
 msgid "illegal percent value %s"
 msgstr "%s es un valor erróneo para un porcentaje"
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'"
 
@@ -1045,7 +1034,12 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "explorando %s"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1054,49 +1048,44 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "explorando %s"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "eliminando la página %s puesto que ya no se deriva de %s"
+
+#: ../IkiWiki/Render.pm:603
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:548
-#, fuzzy, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "eliminando la página %s puesto que ya no se deriva de %s"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1177,37 +1166,48 @@ msgstr "reconstruyendo el wiki.."
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr ""
+"Se necesita el módulo Sort::Naturally para el tipo de ordenación "
+"title_natural"
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "no conozco este tipo de ordenación %s"
+
+#: ../IkiWiki.pm:2036
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
diff --git a/po/fr.po b/po/fr.po
index 08741e2f2..1d402468c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Erreur"
 
@@ -188,12 +188,12 @@ msgstr ""
 "Désolé, mais cela ressemble à un « spam » selon les critères de <a href="
 "\"http://blogspam.net/\">blogspam</a> : "
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr "%s sur %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "Aucun lien cassé !"
 
@@ -343,18 +343,18 @@ msgstr "Ce n'est pas une page."
 msgid "%s is an attachment, not a page."
 msgstr "%s est une pièce jointe, pas une page."
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Vous n'êtes pas autorisé à modifier %s"
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
@@ -441,29 +441,20 @@ msgstr "Paramètre « pages » manquant"
 msgid "the %s and %s parameters cannot be used together"
 msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble."
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "Type de tri %s inconnu"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "Le modèle de page %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 msgid "failed to run dot"
 msgstr "Échec du lancement de dot"
 
@@ -519,7 +510,7 @@ msgstr "S'identifier en tant que"
 msgid "Get an OpenID"
 msgstr "Obtenir un compte OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 msgid "All pages have other pages linking to them."
 msgstr "Toutes les pages sont liées à d'autres pages."
 
@@ -615,16 +606,16 @@ msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -632,7 +623,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -640,55 +631,55 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, perl-format
 msgid "failed to read %s"
 msgstr "Impossible de lire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -710,11 +701,11 @@ msgstr "polygen n'est pas installé"
 msgid "command failed"
 msgstr "Échec de la commande"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr "formule manquante"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr "formule inconnue"
 
@@ -787,7 +778,7 @@ msgstr "%A, à midi"
 msgid "illegal percent value %s"
 msgstr "pourcentage %s illégal"
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 "L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire."
@@ -1041,7 +1032,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "Examen de %s"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1050,47 +1046,42 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "Examen de %s"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "Suppression de %s, qui n'est plus rendu par %s"
+
+#: ../IkiWiki/Render.pm:603
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:548
-#, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "Suppression de %s, qui n'est plus rendu par %s"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1174,34 +1165,43 @@ msgstr "Reconstruction du wiki..."
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "Type de tri %s inconnu"
+
+#: ../IkiWiki.pm:2036
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
diff --git a/po/gu.po b/po/gu.po
index 93e96d93d..2f7c5859e 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -186,12 +186,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "અહીં કોઇ તૂટેલ કડી નથી!"
 
@@ -346,18 +346,18 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -443,29 +443,20 @@ msgstr "ખોવાયેલ %s વિકલ્પ"
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:"
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 msgid "failed to run dot"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
@@ -521,7 +512,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "ઓપનઆઇડી મેળવો"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે."
@@ -607,77 +598,77 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -698,11 +689,11 @@ msgstr "પોલિગોન સ્થાપિત નથી"
 msgid "command failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr "ખોવાયેલ સૂત્ર"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr "અજાણ્યું સૂત્ર"
 
@@ -776,7 +767,7 @@ msgstr "બપોરે %A પર"
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -1031,54 +1022,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "%s શોધે છે"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "%s શોધે છે"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
+
+#: ../IkiWiki/Render.pm:603
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:548
-#, fuzzy, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1157,33 +1148,42 @@ msgstr "વીકી ફરીથી બનાવે છે.."
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr ""
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
+
+#: ../IkiWiki.pm:2036
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index d073af70d..5bae38012 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr ""
 
@@ -183,12 +183,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr ""
 
@@ -338,18 +338,18 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -431,29 +431,20 @@ msgstr ""
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr ""
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 msgid "failed to run dot"
 msgstr ""
 
@@ -507,7 +498,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr ""
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 msgid "All pages have other pages linking to them."
 msgstr ""
 
@@ -591,76 +582,76 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, perl-format
 msgid "failed to read %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -680,11 +671,11 @@ msgstr ""
 msgid "command failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr ""
 
@@ -757,7 +748,7 @@ msgstr ""
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -1005,54 +996,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Render.pm:471
 #, perl-format
-msgid "scanning %s"
+msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:480
 #, perl-format
-msgid "building %s, which links to %s"
+msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:603
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:548
-#, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr ""
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1131,33 +1122,42 @@ msgstr ""
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr ""
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr ""
+
+#: ../IkiWiki.pm:2036
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index fd4798470..6fa47cd24 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -53,7 +53,7 @@ msgstr "Preferenze salvate."
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Errore"
 
@@ -185,12 +185,12 @@ msgstr ""
 "È stato riconosciuto come spam da <a href=\"http://blogspam.net/\">blogspam</"
 "a>: "
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr "%s da %s"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "Non ci sono collegamenti rotti."
 
@@ -340,18 +340,18 @@ msgstr "non è una pagina"
 msgid "%s is an attachment, not a page."
 msgstr "%s è un allegato, non una pagina."
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "non è permesso modificare %s"
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "non è permesso lavorare su un file in modalità %s"
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
@@ -438,29 +438,20 @@ msgstr "parametro pagine mancante"
 msgid "the %s and %s parameters cannot be used together"
 msgstr "i parametri %s e %s non possono essere usati insieme"
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "ordinamento %s sconosciuto"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr "Aggiungere un nuovo articolo dal titolo:"
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "modello %s non esistente"
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 msgid "failed to run dot"
 msgstr "impossibile eseguire dot"
 
@@ -516,7 +507,7 @@ msgstr "Accedi tramite"
 msgid "Get an OpenID"
 msgstr "Ottieni un OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 msgid "All pages have other pages linking to them."
 msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine."
 
@@ -608,16 +599,16 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "file PO aggiornati"
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -625,7 +616,7 @@ msgstr ""
 "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
 "stata eliminata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -633,55 +624,55 @@ msgstr ""
 "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
 "stata rinominata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Il file POT (%s) non esiste"
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "impossibile copiare il file PO di underlay in %s"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "impossibile copiare il file POT in %s"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/D"
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "impossibile tradurre %s"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, perl-format
 msgid "failed to read %s"
 msgstr "impossibile leggere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
@@ -703,11 +694,11 @@ msgstr "polygen non è installato"
 msgid "command failed"
 msgstr "errore nel comando"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr "formula mancante"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr "formula sconosciuta"
 
@@ -780,7 +771,7 @@ msgstr "%A a mezzogiorno"
 msgid "illegal percent value %s"
 msgstr "valore percentuale %s non ammesso"
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e "
@@ -1034,7 +1025,12 @@ msgstr "impossibile determinare l'id del committer non fidato %s"
 msgid "bad file name %s"
 msgstr "nome file %s scorretto"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "scansione %s"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1043,47 +1039,42 @@ msgstr ""
 "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare "
 "allow_symlinks_before_srcdir per abilitare questa configurazione"
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorato il file dal nome scorretto %s"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s ha diverse pagine sorgenti possibili"
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "rimozione della vecchia pagina %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "scansione %s"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "compilazione di %s, che è collegato a %s"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "rimozione di %s, non più richiesto da %s"
+
+#: ../IkiWiki/Render.pm:603
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "compilazione di %s, che dipende da %s"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:548
-#, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "rimozione di %s, non più richiesto da %s"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1163,33 +1154,42 @@ msgstr "ricostruzione wiki..."
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Discussione"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr "impossibile usare più plugin rcs"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "ordinamento %s sconosciuto"
+
+#: ../IkiWiki.pm:2036
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
diff --git a/po/pl.po b/po/pl.po
index cdc2d91c5..47a0fb6fa 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Błąd"
 
@@ -190,12 +190,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "Wszystkie odnośniki są aktualne!"
 
@@ -350,18 +350,18 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -450,29 +450,20 @@ msgstr "brakujący parametr %s"
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "nieznany sposób sortowania %s"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr "Tytuł nowego wpisu"
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "brakujący szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 #, fuzzy
 msgid "failed to run dot"
 msgstr "awaria w trakcie uruchamiania dot"
@@ -534,7 +525,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "Pobierz OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Dla każdej strony istnieje odnośnik z innej strony"
@@ -620,77 +611,77 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -711,11 +702,11 @@ msgstr "wtyczka polygen nie jest zainstalowana"
 msgid "command failed"
 msgstr "awaria fortunki"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr "brakująca reguła"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr "nieznana reguła"
 
@@ -789,7 +780,7 @@ msgstr "w południe w %A"
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -1053,54 +1044,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "skanowanie %s"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "skanowanie %s"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "usuwanie %s nie tworzonego już przez %s"
+
+#: ../IkiWiki/Render.pm:603
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:548
-#, fuzzy, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "usuwanie %s nie tworzonego już przez %s"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1179,35 +1170,44 @@ msgstr "przebudowywanie wiki..."
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Dyskusja"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr ""
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "nieznany sposób sortowania %s"
+
+#: ../IkiWiki.pm:2036
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 11c9d60fa..ad723dfc0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Fel"
 
@@ -187,12 +187,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "Det finns inga trasiga länkar!"
 
@@ -347,18 +347,18 @@ msgstr "kan inte läsa %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -445,29 +445,20 @@ msgstr "mall saknar id-parameter"
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "okänd sorteringstyp %s"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 #, fuzzy
 msgid "failed to run dot"
 msgstr "linkmap misslyckades att köra dot"
@@ -527,7 +518,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "Skaffa ett OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Alla sidor länkas till av andra sidor."
@@ -613,77 +604,77 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -704,11 +695,11 @@ msgstr "polygen inte installerad"
 msgid "command failed"
 msgstr "fortune misslyckades"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr ""
 
@@ -781,7 +772,7 @@ msgstr ""
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -1040,54 +1031,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "söker av %s"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "söker av %s"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "tar bort %s, som inte längre ritas upp av %s"
+
+#: ../IkiWiki/Render.pm:603
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:548
-#, fuzzy, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "tar bort %s, som inte längre ritas upp av %s"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1166,33 +1157,42 @@ msgstr "bygger om wiki.."
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr ""
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "okänd sorteringstyp %s"
+
+#: ../IkiWiki.pm:2036
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
diff --git a/po/vi.po b/po/vi.po
index 0d64a11e8..ad970a85f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 19:55-0400\n"
+"POT-Creation-Date: 2009-10-17 20:47-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Lỗi"
 
@@ -188,12 +188,12 @@ msgid ""
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:42
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:50
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 
@@ -348,18 +348,18 @@ msgstr "không thể đọc %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:685
+#: ../IkiWiki/Plugin/git.pm:691
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:689
+#: ../IkiWiki/Plugin/git.pm:695
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -448,29 +448,20 @@ msgstr "mẫu thiếu tham số id"
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:212
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
-
-#: ../IkiWiki/Plugin/inline.pm:223
-#, perl-format
-msgid "unknown sort type %s"
-msgstr "kiểu sắp xếp không rõ %s"
-
-#: ../IkiWiki/Plugin/inline.pm:318
+#: ../IkiWiki/Plugin/inline.pm:312
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:332
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:603
+#: ../IkiWiki/Plugin/inline.pm:598
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:101
 #, fuzzy
 msgid "failed to run dot"
 msgstr "linkmap không chạy dot được"
@@ -528,7 +519,7 @@ msgstr ""
 msgid "Get an OpenID"
 msgstr "Lấy OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:45
+#: ../IkiWiki/Plugin/orphans.pm:55
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Mọi trang được liên kết với trang khác."
@@ -614,77 +605,77 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:426
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:450
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:470
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:869
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:883
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:892
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:934
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1031
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1108
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1113
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1160
+#: ../IkiWiki/Plugin/po.pm:1162
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -705,11 +696,11 @@ msgstr "chưa cài đặt polygen"
 msgid "command failed"
 msgstr "fortune bị lỗi"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:46
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:53
 msgid "unknown formula"
 msgstr ""
 
@@ -782,7 +773,7 @@ msgstr ""
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:55
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -1041,54 +1032,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:266
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr "đang quét %s"
+
+#: ../IkiWiki/Render.pm:271
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:299
+#: ../IkiWiki/Render.pm:305
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:385
+#: ../IkiWiki/Render.pm:395
 #, perl-format
 msgid "removing old page %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:426
-#, perl-format
-msgid "scanning %s"
-msgstr "đang quét %s"
-
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:471
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:480
+#, fuzzy, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
+
+#: ../IkiWiki/Render.pm:603
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:536
+#: ../IkiWiki/Render.pm:616
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:548
-#, fuzzy, perl-format
-msgid "removing %s, no longer built by %s"
-msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
-
-#: ../IkiWiki/Render.pm:572
+#: ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
@@ -1167,33 +1158,42 @@ msgstr "đang xây dựng lại wiki.."
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Thảo luận"
 
-#: ../IkiWiki.pm:501
+#: ../IkiWiki.pm:507
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
-#: ../IkiWiki.pm:547
+#: ../IkiWiki.pm:553
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:582
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1258
+#: ../IkiWiki.pm:1264
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1820
+#: ../IkiWiki.pm:1863
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr ""
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr "kiểu sắp xếp không rõ %s"
+
+#: ../IkiWiki.pm:2036
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From 4227c0e3cb6c2b6663c67c549259e662c57367bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Oct 2009 20:57:26 -0400
Subject: add news item for ikiwiki 3.20091017

---
 doc/news/version_3.14159.mdwn    |  5 ----
 doc/news/version_3.20091017.mdwn | 49 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 5 deletions(-)
 delete mode 100644 doc/news/version_3.14159.mdwn
 create mode 100644 doc/news/version_3.20091017.mdwn

diff --git a/doc/news/version_3.14159.mdwn b/doc/news/version_3.14159.mdwn
deleted file mode 100644
index 21f91fdb4..000000000
--- a/doc/news/version_3.14159.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-ikiwiki 3.14159 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * svn: Fix rcs\_rename to properly scope call to dirname.
-   * img: Pass the align parameter through to the generated img tag.
-   * Move OpenID pretty-printing from openid plugin to core (smcv)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091017.mdwn b/doc/news/version_3.20091017.mdwn
new file mode 100644
index 000000000..aba830a82
--- /dev/null
+++ b/doc/news/version_3.20091017.mdwn
@@ -0,0 +1,49 @@
+News for ikiwiki 3.20091017:
+
+   To take advantage of significant performance improvements, all
+   wikis need to be rebuilt on upgrade to this version. If you
+   listed your wiki in /etc/ikiwiki/wikilist this will be done
+   automatically when the Debian package is upgraded. Or use
+   ikiwiki-mass-rebuild to force a rebuild.
+
+ikiwiki 3.20091017 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Added support framework for multiple types of dependencies, including
+     dependncies that are only affected by page precence or link changes.
+   * Rebuild wikis on upgrade to this version to get improved dependency
+     info.
+   * pagecount, calendar, postsparkline, progress: Use a presence dependency,
+     which makes these directives much less expensive to use, since page
+     edits will no longer trigger an unnecessary update.
+   * map: Use a presence dependency unless show= is specified.
+     This makes maps efficient enough that they can be used on sidebars!
+   * inline: Use a presence dependency in quick mode.
+   * brokenlinks: Use a link dependency.
+     This makes it much more efficient, only updating when really necessary.
+   * orphans, pagestats: Use a combination of presence and link dependencies.
+     This makes them more efficient. It also fixes a longstanding bug,
+     where if only a small set of pages were considered by orphans/pagestats,
+     changes to links on other pages failed to cause an update.
+   * linkmap: Use a combination of presence and link dependencies.
+     This makes the map be regenerated much less frequently in many cases,
+     so larger maps are more practical to use now.
+   * Plugins providing PageSpec `match\_*` functions should pass additional
+     influence information when creating result objects. This allows correctly
+     handling many more complicated dependencies.
+   * API change: `pagespec\_match\_list` has completly changed its interface.
+     The old interface will be removed soon, and a warning will be printed
+     if any plugins try to use it.
+   * Transitive dependencies are now correctly supported.
+   * ikiwiki-calendar: New command automates creation of archive pages
+     using the calendar plugin.
+   * calendar: Fix midnight rebuild trigger of calendars with explicit
+     month/year.
+   * calendar: Fix bug in next/previous year/month links, which sometimes
+     linked to an archive page from the wrong year, or were missing.
+   * git: --getctime will now follow renames back to the original creation
+     of a file.
+   * calendar: Fix CSS for year calendar to match the plugin documentation.
+   * Added minimal default CSS for calendar plugin, just highlighting the
+     current day.
+   * inline: Optimize generation of archives, etc by not getting inlined page
+     content if the template does not use it."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 967c845e473a34ac5c3b112f53a7721d029204a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Oct 2009 20:59:01 -0400
Subject: remove discussion page for removed page

---
 doc/news/version_3.141/discussion.mdwn | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 doc/news/version_3.141/discussion.mdwn

diff --git a/doc/news/version_3.141/discussion.mdwn b/doc/news/version_3.141/discussion.mdwn
deleted file mode 100644
index 1f5f39282..000000000
--- a/doc/news/version_3.141/discussion.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-Version 3.141!? Is it not a mistake? Maybe you meant 3.14.1 or 3.15?
---[[Paweł|users/ptecza]]
-
-> I suspect the next version will be 3.1415 ;) -- [[Jon]]
-
->> And next 3.14159, 3.141592, etc. :) I think that version schema
->> should be patented by Joey ;) --[[Paweł|users/ptecza]]
-
->>> That's not exactly new; quoting from <http://www-cs-faculty.stanford.edu/~knuth/abcde.html>:
->>>
->>>> The latest and best TeX is currently version 3.1415926 (and plain.tex is version 3.141592653); METAFONT is currently version 2.718281 (and plain.mf is version 2.71). My last will and testament for TeX and METAFONT is that their version numbers ultimately become $\pi$ and $e$, respectively. At that point they will be completely error-free by definition.
->>>
->>> --[[tschwinge]]
-
->>>> Thanks for the info, Thomas! I didn't know about it. Sorry Joey,
->>>> but Don Knuth was faster. What a pity... ;) --[[Paweł|users/ptecza]]
-- 
cgit v1.2.3


From d1a88c892ea1786e3f8451d0ef9069be9358e332 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 18 Oct 2009 13:47:30 -0400
Subject: edittemplate: Allow template page name to be specified using anything
 legal for a wikilink (including eg, leading slashes).

Before, the htmllink would display the link to the template as if it were a
wikilink, but what was stored was not, which could lead to confusing
situations.
---
 IkiWiki/Plugin/edittemplate.pm | 3 ++-
 debian/changelog               | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 7d2eba194..e8e7b1e04 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -55,7 +55,8 @@ sub preprocess (@) {
 	}
 
 	my $link=linkpage($params{template});
-	$pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
+	my $bestlink=bestlink($params{page}, $link);
+	$pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 
 	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
 	add_depends($params{page}, $link, deptype("presence"));
diff --git a/debian/changelog b/debian/changelog
index 7da20a3f7..81935f998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20091018) UNRELEASED; urgency=low
+
+  * edittemplate: Allow template page name to be specified using anything
+    legal for a wikilink (including eg, leading slashes).
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 18 Oct 2009 13:44:09 -0400
+
 ikiwiki (3.20091017) unstable; urgency=low
 
   * Added support framework for multiple types of dependencies, including
-- 
cgit v1.2.3


From 2d60ea7fa8c34f5904e5bc40d2d2c60fd938232d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 18 Oct 2009 13:56:35 -0400
Subject: edittemplate: Work around bug #551499 in CGI::FormBuilder.

---
 IkiWiki/Plugin/edittemplate.pm | 7 +++++--
 debian/changelog               | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index e8e7b1e04..a163b0d84 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -83,10 +83,13 @@ sub formbuilder (@) {
 	foreach my $field ($form->field) {
 		if ($field eq 'page') {
 			@page_locs=$field->def_value;
-			push @page_locs, $field->options;
+
+			# FormBuilder is on the bad crack. See #551499
+			my @options=map { ref $_ ? @$_ : $_ } $field->options;
+
+			push @page_locs, @options;
 		}
 	}
-
 	foreach my $p (@page_locs) {
 		foreach my $registering_page (keys %pagestate) {
 			if (exists $pagestate{$registering_page}{edittemplate}) {
diff --git a/debian/changelog b/debian/changelog
index 81935f998..95dc8c6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low
 
   * edittemplate: Allow template page name to be specified using anything
     legal for a wikilink (including eg, leading slashes).
+  * edittemplate: Work around bug #551499 in CGI::FormBuilder.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Oct 2009 13:44:09 -0400
 
-- 
cgit v1.2.3


From f4c40a62aab3cdb13e5e766f3a3e0dafa49a165b Mon Sep 17 00:00:00 2001
From: "http://bruno.boulgour.com/" <http://bruno.boulgour.com/@web>
Date: Sun, 18 Oct 2009 14:42:23 -0400
Subject: Added bbb git repository

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index a3b56c682..ce762b0cd 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -51,6 +51,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[schmonz]] `git://github.com/schmonz/ikiwiki.git`
 * [[will]] `http://www.cse.unsw.edu.au/~willu/ikiwiki.git`
 * [[kaizer]] `git://github.com/engla/ikiwiki.git`
+* [[bbb]] `http://git.boulgour.com/bbb/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 8a05bb2c1193517f993c90716710b933985dea9d Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Sun, 18 Oct 2009 17:56:30 -0400
Subject: filed bug

---
 doc/bugs/inline_breaks_PERMALINK_variable.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/bugs/inline_breaks_PERMALINK_variable.mdwn

diff --git a/doc/bugs/inline_breaks_PERMALINK_variable.mdwn b/doc/bugs/inline_breaks_PERMALINK_variable.mdwn
new file mode 100644
index 000000000..8a50b1262
--- /dev/null
+++ b/doc/bugs/inline_breaks_PERMALINK_variable.mdwn
@@ -0,0 +1,9 @@
+in 3.20091017 the following inline
+
+> `\[[!inline pages="internal(foo/bar/baz/*)" show=3 archive="yes" feeds="no" template="sometemplates"]]`
+
+with sometemplate being
+
+> `<p><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a> (<TMPL_VAR CTIME>)</p>`
+
+produced output that links nowhere (`<a href="">`) while the other variables do fine. This problem does not occur in 3.1415926.
-- 
cgit v1.2.3


From 5864184c0b66a5441a0b8cd146dee3224b0d94c4 Mon Sep 17 00:00:00 2001
From: "http://openid.headfucking.net/pankkake"
 <http://openid.headfucking.net/pankkake@web>
Date: Sun, 18 Oct 2009 17:57:19 -0400
Subject:

---
 doc/sandbox/plop.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/sandbox/plop.mdwn

diff --git a/doc/sandbox/plop.mdwn b/doc/sandbox/plop.mdwn
new file mode 100644
index 000000000..e8b7c915c
--- /dev/null
+++ b/doc/sandbox/plop.mdwn
@@ -0,0 +1 @@
+plop
-- 
cgit v1.2.3


From 04aa977b45cbd67792f7873b02175d408ce1fd85 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Mon, 19 Oct 2009 04:58:46 -0400
Subject: bad generation of links in map directive

---
 doc/bugs/pages_missing_top-level_directory.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/bugs/pages_missing_top-level_directory.mdwn

diff --git a/doc/bugs/pages_missing_top-level_directory.mdwn b/doc/bugs/pages_missing_top-level_directory.mdwn
new file mode 100644
index 000000000..302d3653a
--- /dev/null
+++ b/doc/bugs/pages_missing_top-level_directory.mdwn
@@ -0,0 +1,17 @@
+Hi,
+
+I've rebuilt two sites now, and anything that requires a working directory structure isn't working properly. I have no idea how it's doing this. I don't see anything in my templates, and I haven't messed around with the back-end code much.
+
+An example would show this best I think.
+
+<pre>
+/                   <- root of site
+/About/             <- sub-directory
+      /Policy/      <- sub-sub-
+</pre>
+
+When you're on /About/, any generated links get mapped to /Policy/ and NOT /About/Policy/ - of course this results in a 404 error.
+
+I used to be able to use relative links or absolute ones to get the links I want, and now I can't do either. The generated link results in a 404 due to the stripping of a directory.
+
+I don't know if it's related to the fact that I have one ikiwiki install under another (/blog/ under / is also ikiwiki), but both are FUBAR.
-- 
cgit v1.2.3


From 6695a710b6c86ef353e04d8cd33598290a0fe056 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Mon, 19 Oct 2009 10:42:09 +0100
Subject: request for more detail

---
 doc/bugs/pages_missing_top-level_directory.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/pages_missing_top-level_directory.mdwn b/doc/bugs/pages_missing_top-level_directory.mdwn
index 302d3653a..14e016187 100644
--- a/doc/bugs/pages_missing_top-level_directory.mdwn
+++ b/doc/bugs/pages_missing_top-level_directory.mdwn
@@ -15,3 +15,9 @@ When you're on /About/, any generated links get mapped to /Policy/ and NOT /Abou
 I used to be able to use relative links or absolute ones to get the links I want, and now I can't do either. The generated link results in a 404 due to the stripping of a directory.
 
 I don't know if it's related to the fact that I have one ikiwiki install under another (/blog/ under / is also ikiwiki), but both are FUBAR.
+
+> what do you mean by generated links: do you mean the output of
+> [[ikiwiki/wikilink]]s? Or are you generating links some other way?
+> When you say "on /About/, any generated links get mapped to
+> /Policy/ and NOT /About/Policy" can you provide an example of what
+> source generates the link? -- [[Jon]]
-- 
cgit v1.2.3


From 190c34804451532673bd46d2073f444f820a2687 Mon Sep 17 00:00:00 2001
From: "http://xdnf.myopenid.com/" <http://xdnf.myopenid.com/@web>
Date: Mon, 19 Oct 2009 12:38:36 -0400
Subject:

---
 doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
index 35ceae59b..0c9619647 100644
--- a/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
+++ b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
@@ -9,3 +9,5 @@ That's also what I think: such discussions or comments on [[forum]] discussion
 pages, or generally on all pages' [[Discussion]] subpages, can be removed if
 either they're simply not valid / interesting / ... anymore, or if they've been
 used to improve the *real* documentation.  --[[tschwinge]]
+
+test
-- 
cgit v1.2.3


From 80edf46ff216a547676de9e7902072777f715a35 Mon Sep 17 00:00:00 2001
From: "http://xdnf.myopenid.com/" <http://xdnf.myopenid.com/@web>
Date: Mon, 19 Oct 2009 12:43:56 -0400
Subject:

---
 doc/index/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index d52cb0a2d..a9633934b 100644
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -462,3 +462,4 @@ Any thoughts or examples on this? Any links to examples of news sites or blogs w
 
 Thanks --[[JeremyReed]]
 
+test
-- 
cgit v1.2.3


From 39f8071aacf9913304d907694002e2e5294aa987 Mon Sep 17 00:00:00 2001
From: "http://xdnf.myopenid.com/" <http://xdnf.myopenid.com/@web>
Date: Mon, 19 Oct 2009 12:44:23 -0400
Subject:

---
 doc/index/discussion.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index a9633934b..d52cb0a2d 100644
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -462,4 +462,3 @@ Any thoughts or examples on this? Any links to examples of news sites or blogs w
 
 Thanks --[[JeremyReed]]
 
-test
-- 
cgit v1.2.3


From 8dbb95371384d2a33f1c936d003adead5554fdab Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Tue, 20 Oct 2009 11:14:25 +0200
Subject: This reverts commit 190c34804451532673bd46d2073f444f820a2687.

---
 doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
index 0c9619647..35ceae59b 100644
--- a/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
+++ b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
@@ -9,5 +9,3 @@ That's also what I think: such discussions or comments on [[forum]] discussion
 pages, or generally on all pages' [[Discussion]] subpages, can be removed if
 either they're simply not valid / interesting / ... anymore, or if they've been
 used to improve the *real* documentation.  --[[tschwinge]]
-
-test
-- 
cgit v1.2.3


From d926c73a6673047650008204f841061e98e35084 Mon Sep 17 00:00:00 2001
From: ian <ian@web>
Date: Tue, 20 Oct 2009 10:59:15 -0400
Subject:

---
 doc/forum/Cannot_write_to_commitlock.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/forum/Cannot_write_to_commitlock.mdwn

diff --git a/doc/forum/Cannot_write_to_commitlock.mdwn b/doc/forum/Cannot_write_to_commitlock.mdwn
new file mode 100644
index 000000000..a5d4bf440
--- /dev/null
+++ b/doc/forum/Cannot_write_to_commitlock.mdwn
@@ -0,0 +1,17 @@
+I am following the laptop wiki with git tip page. I have set up my local and remote wiki as suggested. However, when I try to push my local changes back to the server I get the following error:
+
+Writing objects: 100% (4/4), 359 bytes, done.
+Total 4 (delta 2), reused 0 (delta 0)
+cannot write to /home/ian/ianbarton/.ikiwiki/commitlock: No such file or directory
+To ian@wilkesley.org:~/ikiwiki/ianbarton.git
+   5cf9054..16a871d  master -> master
+
+The relevnt bit of my setup file is:
+
+git_wrapper => '/home/ian/ianbarton.git/hooks/post-commit',
+
+Now ~/ianbarton/.ikiwiki exists and is owned and writable by me. I have tried touching commitlock and also removing lock and commitlock before pushing. Any suggestions for further trouble shooting?
+
+Ian.
+
+
-- 
cgit v1.2.3


From b69f9eba9250b5c71e81415c977836d4421ef0a4 Mon Sep 17 00:00:00 2001
From: "http://telmich.myopenid.com/" <http://telmich.myopenid.com/@web>
Date: Wed, 21 Oct 2009 08:06:08 -0400
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index a98abf578..f6ab34653 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -127,6 +127,7 @@ Personal sites and blogs
 * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 * [Weakish Jiang's Homepage](http://weakish.pigro.net)
+* [Nico Schottelius' homepage](http://www.nico.schottelius.org)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 587e0c3d21dfbde052e0fd71a7ed0e33e09e757f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 21 Oct 2009 13:50:49 -0400
Subject: Fix a bug introduced in the last version that caused ikiwiki to skip
 all files if a sourcedir of "./" was specified.

---
 IkiWiki/Render.pm | 4 ++--
 debian/changelog  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0fe20c64f..0889fed62 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -287,13 +287,13 @@ sub find_src_files () {
 		wanted => sub {
 			my $file=decode_utf8($_);
 			$file=~s/^\Q$config{srcdir}\E\/?//;
+			return if -l $_ || -d _ || ! length $file;
 			my $page = pagename($file);
 			if (! exists $pagesources{$page} &&
 			    file_pruned($file)) {
 				$File::Find::prune=1;
 				return;
 			}
-			return if -l $_ || -d _ || ! length $file;
 
 			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 			if (! defined $f) {
@@ -314,13 +314,13 @@ sub find_src_files () {
 			wanted => sub {
 				my $file=decode_utf8($_);
 				$file=~s/^\Q$dir\E\/?//;
+				return if -l $_ || -d _ || ! length $file;
 				my $page=pagename($file);
 				if (! exists $pagesources{$page} &&
 				    file_pruned($file)) {
 					$File::Find::prune=1;
 					return;
 				}
-				return if -l $_ || -d _ || ! length $file;
 
 				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 				if (! defined $f) {
diff --git a/debian/changelog b/debian/changelog
index 95dc8c6b2..f6739952e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low
   * edittemplate: Allow template page name to be specified using anything
     legal for a wikilink (including eg, leading slashes).
   * edittemplate: Work around bug #551499 in CGI::FormBuilder.
+  * Fix a bug introduced in the last version that caused ikiwiki
+    to skip all files if a sourcedir of "./" was specified.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Oct 2009 13:44:09 -0400
 
-- 
cgit v1.2.3


From 037d5d5296ad0073a1acbb05c4cfd6461b49d1fd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 21 Oct 2009 13:55:44 -0400
Subject: fix case

---
 auto-blog.setup | 2 +-
 auto.setup      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/auto-blog.setup b/auto-blog.setup
index cf77b3bf7..82aa8d415 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -21,7 +21,7 @@ our $rcs=IkiWiki::Setup::Automator::ask(
 our $admin=IkiWiki::Setup::Automator::ask(
 	gettext("What wiki user (or openid) will be admin?"), $ENV{USER});
 use Net::Domain q{hostfqdn};
-our $domain=hostfqdn() || ikiwiki::setup::automator::ask(
+our $domain=hostfqdn() || IkiWiki::Setup::Automator::ask(
 	gettext("What is the domain name of the web server?"), "");
 
 IkiWiki::Setup::Automator->import(
diff --git a/auto.setup b/auto.setup
index dc2b19992..afb54b324 100644
--- a/auto.setup
+++ b/auto.setup
@@ -20,7 +20,7 @@ our $rcs=IkiWiki::Setup::Automator::ask(
 our $admin=IkiWiki::Setup::Automator::ask(
 	gettext("Which user (wiki account or openid) will be admin?"), $ENV{USER});
 use Net::Domain q{hostfqdn};
-our $domain=hostfqdn() || ikiwiki::setup::automator::ask(
+our $domain=hostfqdn() || IkiWiki::Setup::Automator::ask(
 	gettext("What is the domain name of the web server?"), "");
 
 IkiWiki::Setup::Automator->import(
-- 
cgit v1.2.3


From 990a4b99b00c162da218f951041fed50c4259049 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <giulio.eulisse@cern.ch>
Date: Mon, 19 Oct 2009 09:40:45 +0200
Subject: Pick up user specified CFLAGS when compiling the wrapper. (cherry
 picked from commit 13e9383b48857daa206387f3486eb00e3b171a68)

---
 IkiWiki/Wrapper.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index ff110b5ff..7a1529119 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -143,7 +143,8 @@ $pre_exec
 EOF
 
 	my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
-	if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
+	my $cflags=exists $ENV{CFLAGS} ? possibly_foolish_untaint($ENV{CFLAGS}) : '-O';
+	if (system($cc, $cflags, "$wrapper.c", "-o", "$wrapper.new") != 0) {
 		#translators: The parameter is a C filename.
 		error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
 	}
-- 
cgit v1.2.3


From b6f6f126d0e3fa23687f2d8c537de207e2c7b5d3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 21 Oct 2009 16:27:44 -0400
Subject: avoid -O default for CFLAGS, and document

---
 IkiWiki/Wrapper.pm | 6 +++---
 debian/changelog   | 1 +
 doc/usage.mdwn     | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 7a1529119..5427a5c80 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -142,9 +142,9 @@ $pre_exec
 }
 EOF
 
-	my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
-	my $cflags=exists $ENV{CFLAGS} ? possibly_foolish_untaint($ENV{CFLAGS}) : '-O';
-	if (system($cc, $cflags, "$wrapper.c", "-o", "$wrapper.new") != 0) {
+	my @cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
+	push @cc, possibly_foolish_untaint($ENV{CFLAGS}) if exists $ENV{CFLAGS};
+	if (system(@cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
 		#translators: The parameter is a C filename.
 		error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
 	}
diff --git a/debian/changelog b/debian/changelog
index f6739952e..0ff7a0d13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low
   * edittemplate: Work around bug #551499 in CGI::FormBuilder.
   * Fix a bug introduced in the last version that caused ikiwiki
     to skip all files if a sourcedir of "./" was specified.
+  * Support CFLAGS when building wrapper.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Oct 2009 13:44:09 -0400
 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 0c618de5c..4ee935f73 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -345,6 +345,10 @@ also be configured using a setup file.
 
   This controls what C compiler is used to build wrappers. Default is 'cc'.
 
+* CFLAGS
+
+  This can be used to pass options to the C compiler when building wrappers.
+
 # SEE ALSO
 
 * [[ikiwiki-mass-rebuild]](8)
-- 
cgit v1.2.3


From 7ae0f754f3d82273948f8c5f1426fda91420aeb1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 21 Oct 2009 16:31:32 -0400
Subject: thanks telmich

---
 doc/tipjar.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index 787df9bf7..1f361f99f 100644
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -13,6 +13,7 @@ Thanks to the following people for their kind contributions:
 * Martin Krafft
 * Paweł Tęcza
 * Mick Pollard
+* Nico Schottelius
 
 (Note that this page is locked to prevent anyone from tampering with the PayPal button.
 If you prefer your donation *not* be listed here, let [[Joey]] know.)
-- 
cgit v1.2.3


From b9071082717cd7fd56e66963b47a6d589848e062 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 21 Oct 2009 16:42:25 -0400
Subject: meta: Gather permalink info on scan pass so it is available to inline
 when using a template that does not include page content.

---
 IkiWiki/Plugin/meta.pm                         |  7 +++++--
 debian/changelog                               |  2 ++
 doc/bugs/inline_breaks_PERMALINK_variable.mdwn | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 8dcd73a1a..6fe9cda34 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -121,6 +121,10 @@ sub preprocess (@) {
 		$pagestate{$page}{meta}{authorurl}=$value if safeurl($value);
 		# fallthrough
 	}
+	elsif ($key eq 'permalink') {
+		$pagestate{$page}{meta}{permalink}=$value if safeurl($value);
+		# fallthrough
+	}
 	elsif ($key eq 'date') {
 		eval q{use Date::Parse};
 		if (! $@) {
@@ -141,10 +145,9 @@ sub preprocess (@) {
 		return;
 	}
 
-	# Metadata collection that happens only during preprocessing pass.
+	# Metadata handling that happens only during preprocessing pass.
 	if ($key eq 'permalink') {
 		if (safeurl($value)) {
-			$pagestate{$page}{meta}{permalink}=$value;
 			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index 0ff7a0d13..be30b498c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low
   * Fix a bug introduced in the last version that caused ikiwiki
     to skip all files if a sourcedir of "./" was specified.
   * Support CFLAGS when building wrapper.
+  * meta: Gather permalink info on scan pass so it is available
+    to inline when using a template that does not include page content.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Oct 2009 13:44:09 -0400
 
diff --git a/doc/bugs/inline_breaks_PERMALINK_variable.mdwn b/doc/bugs/inline_breaks_PERMALINK_variable.mdwn
index 8a50b1262..fc891bb25 100644
--- a/doc/bugs/inline_breaks_PERMALINK_variable.mdwn
+++ b/doc/bugs/inline_breaks_PERMALINK_variable.mdwn
@@ -7,3 +7,19 @@ with sometemplate being
 > `<p><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a> (<TMPL_VAR CTIME>)</p>`
 
 produced output that links nowhere (`<a href="">`) while the other variables do fine. This problem does not occur in 3.1415926.
+
+> This must be caused by an optimisation that avoids reading the page
+> content when using a template that does not use CONTENT. 
+> 
+> I guess that it needs to instead check all the variables the template 
+> uses, and read content if PERMALINK, or probably any other unknown
+> variable is used. Unfortunatly, that will lose the optimisation
+> for the archivepage template as well -- it also uses PERMALINK.
+> 
+> So, revert the optimisation? Or, make meta gather the permalink
+> data on scan? That seems doable, but is not a general fix for
+> other stuff that might be a) used in a template and b) gathered
+> at preprocess time.
+> 
+> For now, I am going with the special case fix of fixing meta. I may need
+> to go for a more general fix later. --[[Joey]] [[!tag done]]
-- 
cgit v1.2.3


From 14526ef59772c0e1b60866b8149e478d82a4b70f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 21 Oct 2009 16:46:22 -0400
Subject: response

---
 doc/forum/Cannot_write_to_commitlock.mdwn | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/forum/Cannot_write_to_commitlock.mdwn b/doc/forum/Cannot_write_to_commitlock.mdwn
index a5d4bf440..81b0cdeb3 100644
--- a/doc/forum/Cannot_write_to_commitlock.mdwn
+++ b/doc/forum/Cannot_write_to_commitlock.mdwn
@@ -14,4 +14,11 @@ Now ~/ianbarton/.ikiwiki exists and is owned and writable by me. I have tried to
 
 Ian.
 
-
+> I'm guessing that this is some kind of permissions problem,
+> and that the error message is just being misleading. 
+> 
+> When you push the changes to the server, what user is
+> git logging into the server as? If that user is different
+> than `ian` (possibly due to using git-daemon?), the post-commit
+> wrapper needs to be setuid to `ian`. This ensures that ikiwiki
+> runs as you and can see and write to the files. --[[Joey]] 
-- 
cgit v1.2.3


From f9de9f22d89892152438d5a83cd2100daf97ce3e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 21 Oct 2009 16:48:20 -0400
Subject: also confused

---
 doc/bugs/pages_missing_top-level_directory.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/pages_missing_top-level_directory.mdwn b/doc/bugs/pages_missing_top-level_directory.mdwn
index 14e016187..0f967db44 100644
--- a/doc/bugs/pages_missing_top-level_directory.mdwn
+++ b/doc/bugs/pages_missing_top-level_directory.mdwn
@@ -21,3 +21,6 @@ I don't know if it's related to the fact that I have one ikiwiki install under a
 > When you say "on /About/, any generated links get mapped to
 > /Policy/ and NOT /About/Policy" can you provide an example of what
 > source generates the link? -- [[Jon]]
+
+> I'm also confused about what is generating the links. The map directive?
+> You? --[[Joey]] 
-- 
cgit v1.2.3


From c83f8b9b25fb170b0e91a4ece350f9c549f3b336 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Wed, 21 Oct 2009 19:33:20 -0400
Subject:

---
 doc/bugs/pages_missing_top-level_directory.mdwn | 28 ++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/pages_missing_top-level_directory.mdwn b/doc/bugs/pages_missing_top-level_directory.mdwn
index 0f967db44..974ea1179 100644
--- a/doc/bugs/pages_missing_top-level_directory.mdwn
+++ b/doc/bugs/pages_missing_top-level_directory.mdwn
@@ -22,5 +22,31 @@ I don't know if it's related to the fact that I have one ikiwiki install under a
 > /Policy/ and NOT /About/Policy" can you provide an example of what
 > source generates the link? -- [[Jon]]
 
+>> No, a \[[map]] call, such as:
+>>
+>> (actual code)<br />
+>> = = = = =<br />
+>> \[[!map pages="About/*" show="title"]]<br />
+>> = = = = =<br />
+>>
+>> The end result is:<br />
+>> (actual code)
+>>
+<pre>
+&lt;div class="map">
+&lt;ul>
+&lt;li>&lt;a class="mapitem" href="./Policy/">Policy&lt;/a>
+&lt;ul>
+&lt;li>&lt;a class="mapitem" href="./Policy/Microblog/">Microblogging subscription policy&lt;/a>
+&lt;/li>
+&lt;/ul>
+&lt;/li>
+&lt;/ul>
+&lt;/div>
+</pre>
+
 > I'm also confused about what is generating the links. The map directive?
-> You? --[[Joey]] 
+> You? --[[Joey]]
+
+>> see above :)
+
-- 
cgit v1.2.3


From 6b16d1996c90cdaa0279075f9673cc0d859e3c2b Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Wed, 21 Oct 2009 19:36:21 -0400
Subject:

---
 doc/bugs/pages_missing_top-level_directory.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/pages_missing_top-level_directory.mdwn b/doc/bugs/pages_missing_top-level_directory.mdwn
index 974ea1179..381bcd85b 100644
--- a/doc/bugs/pages_missing_top-level_directory.mdwn
+++ b/doc/bugs/pages_missing_top-level_directory.mdwn
@@ -50,3 +50,5 @@ I don't know if it's related to the fact that I have one ikiwiki install under a
 
 >> see above :)
 
+>> I suspect this is due to git scanning everything under the pwd of the .git/ directory, but not totally so.
+>> Other ikiwiki sites I have don't do this, and work OK, on the same server, but different docroots.
-- 
cgit v1.2.3


From 54be16aaa8a6428b8f6e3015e452678a80dc233c Mon Sep 17 00:00:00 2001
From: ian <ian@web>
Date: Thu, 22 Oct 2009 10:29:36 -0400
Subject:

---
 doc/forum/Cannot_write_to_commitlock.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/Cannot_write_to_commitlock.mdwn b/doc/forum/Cannot_write_to_commitlock.mdwn
index 81b0cdeb3..05490a799 100644
--- a/doc/forum/Cannot_write_to_commitlock.mdwn
+++ b/doc/forum/Cannot_write_to_commitlock.mdwn
@@ -22,3 +22,7 @@ Ian.
 > than `ian` (possibly due to using git-daemon?), the post-commit
 > wrapper needs to be setuid to `ian`. This ensures that ikiwiki
 > runs as you and can see and write to the files. --[[Joey]] 
+
+The user is logging as ian, the same user as the laptop. I can push and pull git repos on the same server owned by the same user via ssh with no problem. I have deleted and re-started from scratch several times. However, for my use case I think it's simpler to keep the repo on my local computer and just rsync the web pages to the server.
+
+Ian.
-- 
cgit v1.2.3


From fe2ff822a525f4faef4740c8e2f18d71ec5a8cf3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 22 Oct 2009 20:34:25 -0400
Subject: releasing version 3.20091022

---
 debian/changelog |  4 ++--
 po/ikiwiki.pot   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be30b498c..9b0cd5f52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20091018) UNRELEASED; urgency=low
+ikiwiki (3.20091022) unstable; urgency=low
 
   * edittemplate: Allow template page name to be specified using anything
     legal for a wikilink (including eg, leading slashes).
@@ -9,7 +9,7 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low
   * meta: Gather permalink info on scan pass so it is available
     to inline when using a template that does not include page content.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 18 Oct 2009 13:44:09 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 22 Oct 2009 20:25:15 -0400
 
 ikiwiki (3.20091017) unstable; urgency=low
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 5bae38012..30179103d 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-22 20:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -303,12 +303,12 @@ msgstr ""
 msgid "match not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 msgid "failed to process"
 msgstr ""
 
@@ -462,15 +462,15 @@ msgstr ""
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 msgid "stylesheet not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 msgid "redir page not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 msgid "redir cycle is not allowed"
 msgstr ""
 
@@ -1087,13 +1087,13 @@ msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
-- 
cgit v1.2.3


From 0699013dac6136acaee2674caee40e0ba03a3c16 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 22 Oct 2009 20:35:35 -0400
Subject: add news item for ikiwiki 3.20091022

---
 doc/news/version_3.141592.mdwn   | 19 -------------------
 doc/news/version_3.20091022.mdwn | 10 ++++++++++
 2 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 doc/news/version_3.141592.mdwn
 create mode 100644 doc/news/version_3.20091022.mdwn

diff --git a/doc/news/version_3.141592.mdwn b/doc/news/version_3.141592.mdwn
deleted file mode 100644
index 5911e07f9..000000000
--- a/doc/news/version_3.141592.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-ikiwiki 3.141592 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add new hooks: canremove, canrename, rename. (intrigeri)
-   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
-   * po: New plugin, suporting translation of wiki pages using po files.
-     (intrigeri)
-   * Add build machinery to build po files to translate the underlay wikis,
-   * Add further build machinery to generate translated underlays from
-     the po file, for use by wikis whose primary language is not English.
-   * Add Danish basewiki translation by Jonas Smedegaard.
-   * img: Fix adding of dependency from page to the image.
-   * pagestats: add `among` parameter, which only counts links from specified
-     pages (smcv)
-   * pagestats: when making a tag cloud, don't emit links where the tag is
-     unused (smcv)
-   * map: Avoid emitting an unclosed ul element if the map is empty. (harishcm)
-   * inline: Add pagenames parameter that can be used to list a set of
-     pages to inline, in a specific order, without using a PageSpec. (smcv)
-   * Add getsource plugin (Will, smcv)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091022.mdwn b/doc/news/version_3.20091022.mdwn
new file mode 100644
index 000000000..6fc9713c0
--- /dev/null
+++ b/doc/news/version_3.20091022.mdwn
@@ -0,0 +1,10 @@
+ikiwiki 3.20091022 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * edittemplate: Allow template page name to be specified using anything
+     legal for a wikilink (including eg, leading slashes).
+   * edittemplate: Work around bug #551499 in CGI::FormBuilder.
+   * Fix a bug introduced in the last version that caused ikiwiki
+     to skip all files if a sourcedir of "./" was specified.
+   * Support CFLAGS when building wrapper.
+   * meta: Gather permalink info on scan pass so it is available
+     to inline when using a template that does not include page content."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 6807c0422619abbb2ec710f3260c2d21cd1378a5 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 23 Oct 2009 12:17:19 +0100
Subject: update user page to track another todo item

---
 doc/users/jon.mdwn | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 54f1ac383..7895a03bf 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -18,6 +18,16 @@ of software for this task.
 
 I am also working on some ikiwiki hacks:
 
+* [[todo/allow site-wide meta definitions]]
+
+I am mostly interested in ikiwiki usability issues:
+
+ * [[bugs/the login page is unclear when multiple methods exist]]
+ * [[bugs/backlinks onhover thing can go weird]]
+ * [[todo/CSS classes for links]]
+
+The following I have been looking at, but are on the back-burner:
+
 * an alternative approach to [[plugins/comments]] (see
   [[todo/more flexible inline postform]] for one piece of the puzzle;
   <http://dev.jmtd.net/comments/> for some investigation into making the post
@@ -25,9 +35,3 @@ I am also working on some ikiwiki hacks:
 * a system for [[forum/managing_todo_lists]] (see also
   [[todo/interactive todo lists]] and <http://dev.jmtd.net/outliner/> for the
   current WIP).
-
-I am currently mostly interested in ikiwiki usability issues:
-
- * [[bugs/the login page is unclear when multiple methods exist]]
- * [[bugs/backlinks onhover thing can go weird]]
- * [[todo/CSS classes for links]]
-- 
cgit v1.2.3


From 789e0bfd6b43c20697bad7f69633e1f49a01cc5a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 23 Oct 2009 12:38:30 -0400
Subject: inline: Fix raw mode. Closes: #552114

---
 IkiWiki/Plugin/inline.pm | 2 +-
 debian/changelog         | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a836c18f4..942df6f89 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -332,7 +332,7 @@ sub preprocess_inline (@) {
 			error sprintf(gettext("nonexistant template %s"), $params{template});
 		}
 		my $template=HTML::Template->new(@params) unless $raw;
-		my $needcontent=!($archive && $quick) && $template->query(name => 'content');
+		my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));
 	
 		foreach my $page (@list) {
 			my $file = $pagesources{$page};
diff --git a/debian/changelog b/debian/changelog
index 9b0cd5f52..278ea01bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20091023) UNRELEASED; urgency=low
+
+  * inline: Fix raw mode. Closes: #552114
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 23 Oct 2009 12:37:51 -0400
+
 ikiwiki (3.20091022) unstable; urgency=low
 
   * edittemplate: Allow template page name to be specified using anything
-- 
cgit v1.2.3


From ff0e203c477b4d280035c168f19988c6285545ec Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 23 Oct 2009 12:43:35 -0400
Subject: releasing version 3.20091023

---
 debian/changelog | 4 ++--
 po/ikiwiki.pot   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 278ea01bc..c73aa53d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-ikiwiki (3.20091023) UNRELEASED; urgency=low
+ikiwiki (3.20091023) unstable; urgency=low
 
   * inline: Fix raw mode. Closes: #552114
 
- -- Joey Hess <joeyh@debian.org>  Fri, 23 Oct 2009 12:37:51 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 23 Oct 2009 12:38:50 -0400
 
 ikiwiki (3.20091022) unstable; urgency=low
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 30179103d..d52e3bd99 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-22 20:27-0400\n"
+"POT-Creation-Date: 2009-10-23 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
cgit v1.2.3


From 0aa1ce01dda6d0c2c997e55294dddd430709413a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 23 Oct 2009 12:44:36 -0400
Subject: add news item for ikiwiki 3.20091023

---
 doc/news/version_3.1415926.mdwn  | 53 ----------------------------------------
 doc/news/version_3.20091023.mdwn |  3 +++
 2 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 doc/news/version_3.1415926.mdwn
 create mode 100644 doc/news/version_3.20091023.mdwn

diff --git a/doc/news/version_3.1415926.mdwn b/doc/news/version_3.1415926.mdwn
deleted file mode 100644
index d31812c8e..000000000
--- a/doc/news/version_3.1415926.mdwn
+++ /dev/null
@@ -1,53 +0,0 @@
-News for ikiwiki 3.1415926:
-
-   In order to fix a performance bug, all wikis need to be rebuilt on
-   upgrade to this version. If you listed your wiki in
-   /etc/ikiwiki/wikilist this will be done automatically when the
-   Debian package is upgraded. Or use ikiwiki-mass-rebuild to force
-   a rebuild.
-
-ikiwiki 3.1415926 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * [ Joey Hess ]
-   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
-     the old version, but continue. Closes: #[541205](http://bugs.debian.org/541205)
-   * inline: Avoid use of my $\_ as it fails with older perls.
-     Closes: #[541215](http://bugs.debian.org/541215)
-   * Add discussionpage configuration setting.
-   * Several optimisations, including speedups to orphans and brokenlinks
-     calculation.
-   * meta, img: Fix bugs in dependency code. (smcv)
-   * Allow building ikiwiki on systems w/o po4a --
-     building of the translated underlays will be skipped in this case.
-   * Add basic styling of po plugin's languages list.
-   * inline: Display an error if feedpages is specified and fails to match
-     due to a problem such as created\_before being told to check against
-     a page that does not exist.
-   * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective
-     pages from the basewiki.
-   * Updated French program translation from Philippe Batailler.
-     Closes: #[542036](http://bugs.debian.org/542036)
-   * po: Fixed to run rcs\_add ralative to srcdir.
-   * Italian program translation from Luca Bruno.
-   * Fix example blog's tags/life to not have a broken PageSpec.
-     Closes: #[543510](http://bugs.debian.org/543510)
-   * Optimize the dependencies list. This also fixes a bug
-     that could cause repeated refreshes of the wiki to grow
-     increasingly larger dependency lists, and get increasingly
-     slower. (smcv)
-   * Rebuild wikis on upgrade to this version to fix bloat caused
-     by the dependency bug.
-   * Further optimisation of dependency handling by adding a special
-     case for simple page dependencies. (smcv)
-   * htmltidy: Return an error message if tidy fails. Closes: #[543722](http://bugs.debian.org/543722)
-   * po: Fix name of translated toplevel index page. (intrigeri)
-   * po: Fix display of links from a translated page to itself (ntrigeri)
-   * Add Czech basewiki translation from Miroslav Kure.
-   * po: fix interdiction to create pages of type po (intrigeri)
-   * po: po: favor the type of linking page's masterpage on page creation
-     (intrigeri)
-   * img: Don't generate new verison of image if it is scaled to be
-     larger in either dimension.
- * [ Josh Triplett ]
-   * teximg: Replace the insufficient blacklist with the built-in security
-     mechanisms of TeX. ([[!cve CVE-2009-2944]])"""]]
diff --git a/doc/news/version_3.20091023.mdwn b/doc/news/version_3.20091023.mdwn
new file mode 100644
index 000000000..1d4167a1a
--- /dev/null
+++ b/doc/news/version_3.20091023.mdwn
@@ -0,0 +1,3 @@
+ikiwiki 3.20091023 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * inline: Fix raw mode. Closes: #[552114](http://bugs.debian.org/552114)"""]]
\ No newline at end of file
-- 
cgit v1.2.3


From ed1fa6c887c0677e9ba80e1d422ba133a218ac54 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 23 Oct 2009 12:49:31 -0400
Subject: belated thanks to Jon Dowland

---
 doc/tipjar.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index 1f361f99f..87a497fd1 100644
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -14,6 +14,7 @@ Thanks to the following people for their kind contributions:
 * Paweł Tęcza
 * Mick Pollard
 * Nico Schottelius
+* Jon Dowland
 
 (Note that this page is locked to prevent anyone from tampering with the PayPal button.
 If you prefer your donation *not* be listed here, let [[Joey]] know.)
-- 
cgit v1.2.3


From ba7442b845d7857d69c77bcd512aa4e41dca4a22 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 23 Oct 2009 19:15:23 -0400
Subject: had a crack at this tonight

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 70ccc2b68..57bc7a6fd 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -72,3 +72,13 @@ my github ikiwiki fork):
 > by the fact that some (but not all!) meta headers are idempotent.
 > 
 > --[[smcv]]
+
+>> Thanks for your comment. Tonight I had a go at implementing the syntax
+>> you propose here. I decided the simplest thing to do might be for the scan
+>> subroutine to convert any hashes found in the meta_defaults list into calls
+>> to the preprocess routine. I've got a bit stuck trying to convert a hash to
+>> a named parameter list (or just a subroutine parameter list that is). I may
+>> try to look again in the morning (brain a bit sleepy)
+>>
+>> ...and on writing this comment I see your second suggestion was essentially
+>> to do exactly that :) -- [[Jon]]
-- 
cgit v1.2.3


From 9e4fa42676ddc6c8e73469bca52a66245845723c Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 23 Oct 2009 19:48:04 -0400
Subject: progress

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 57bc7a6fd..f935a9acb 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -82,3 +82,14 @@ my github ikiwiki fork):
 >>
 >> ...and on writing this comment I see your second suggestion was essentially
 >> to do exactly that :) -- [[Jon]]
+
+>>> ok, it's easier than I thought, I just pass the hash and it's handled
+>>> correctly. Right now can't figure out why my hashes get converted into
+>>> strings prior to me seeing them in scan():
+
+    $VAR64 = [
+      'HASH(0xc2daf8)',
+      'HASH(0xc2db40)'
+    ];
+
+>>> ...but it *really* is bedtime :) -- [[Jon]]
-- 
cgit v1.2.3


From de59a76e157936e6d95ed6474e188c0fdc353ee4 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Sat, 24 Oct 2009 16:49:37 +0100
Subject: update allow_site-wide_meta_definitions with last night's hacking

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 117 ++++++++++++++-----------
 1 file changed, 66 insertions(+), 51 deletions(-)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index f935a9acb..3c6c3b5aa 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -5,11 +5,39 @@ I'd like to define [[plugins/meta]] values to apply across all pages
 site-wide unless the pages define their own: default values for meta
 definitions essentially.
 
-Here's a patch to achieve this (also in the "defaultmeta" branch of
-my github ikiwiki fork):
+    <snip old patch, see below for latest>
+
+-- [[Jon]]
+
+> This doesn't support multiple-argument meta directives like
+> `link=x rel=y`, or meta directives with special side-effects like
+> `updated`.
+>
+> The first could be solved (if you care) by a syntax like this:
+>
+>     meta_defaults => [
+>         { copyright => "© me" },
+>         { link => "about:blank", rel => "silly", },
+>     ]
+>
+> The second could perhaps be solved by invoking `meta::preprocess` from within
+> `scan` (which might be a simplification anyway), although this is complicated
+> by the fact that some (but not all!) meta headers are idempotent.
+> 
+> --[[smcv]]
+
+>> Thanks for your comment. I've revised the patch to use the config syntax
+>> you suggest. I need to perform some more testing to make sure I've
+>> addressed the issues you highlight.
+>> 
+>> I had to patch part of IkiWiki core, the merge routine in Setup, because
+>> the use of `possibly_foolish_untaint` was causing the hashrefs at the deep
+>> end of the data structure to be converted into strings. The specific change
+>> I've made may not be acceptable, though -- I'd appreciate someone providing
+>> some feedback on that hunk!
 
     diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
-    index b229592..3132257 100644
+    index 6fe9cda..c4079fd 100644
     --- a/IkiWiki/Plugin/meta.pm
     +++ b/IkiWiki/Plugin/meta.pm
     @@ -13,6 +13,7 @@ sub import {
@@ -20,76 +48,63 @@ my github ikiwiki fork):
      }
      
      sub getsetup () {
-    @@ -302,6 +303,15 @@ sub match {
+    @@ -305,6 +306,17 @@ sub match {
      	}
      }
      
     +sub scan() {
     +	my %params = @_;
     +	my $page = $params{page};
-    +    foreach my $type (map { s/^meta_//; $_ } grep /^meta_/, keys %config) {
-    +		$pagestate{$page}{meta}{$type} = $config{"meta_$type"}
-    +			unless defined $pagestate{$page}{meta}{$type};
+    +	if($config{"meta_defaults"}) {
+    +		foreach my $default (@{$config{"meta_defaults"}}) {
+    +			preprocess(%$default, page => $page,
+    +				destpage => $page, preview => 0);
+    +		}
     +	}
     +}
     +
      package IkiWiki::PageSpec;
      
      sub match_title ($$;@) {
+    diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
+    index 8a25ecc..e4d50c9 100644
+    --- a/IkiWiki/Setup.pm
+    +++ b/IkiWiki/Setup.pm
+    @@ -51,7 +51,13 @@ sub merge ($) {
+     					$config{$c}=$setup{$c};
+     				}
+     				else {
+    -					$config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}]
+    +					$config{$c}=[map {
+    +						if(ref $_ eq 'HASH') {
+    +							$_
+    +						} else {
+    +							IkiWiki::possibly_foolish_untaint($_)
+    +						}
+    +					} @{$setup{$c}}];
+     				}
+     			}
+     			elsif (ref $setup{$c} eq 'HASH') {
     diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
-    index 000f461..200c4b2 100644
+    index 000f461..8d34ee4 100644
     --- a/doc/ikiwiki/directive/meta.mdwn
     +++ b/doc/ikiwiki/directive/meta.mdwn
-    @@ -12,6 +12,12 @@ also specifies some additional sub-parameters.
+    @@ -12,6 +12,16 @@ also specifies some additional sub-parameters.
      The field values are treated as HTML entity-escaped text, so you can include
      a quote in the text by writing `&quot;` and so on.
      
     +You can also define site-wide defaults for meta values by including them
-    +in your setup file, e.g.
+    +in your setup file. The key used is `meta_defaults` and the value is a list
+    +of hashes, one per meta directive. e.g.:
     +
-    +	meta_copyright => "Copyright 2007 by Joey Hess",
-    +	meta_license   => "GPL v2+",
+    +	meta_defaults = [
+    +		{ copyright => "Copyright 2007 by Joey Hess" },
+    +		{ license   => "GPL v2+" },
+    +		{ link => "somepage", rel => "site entrypoint", },
+    +	],
     +
      Supported fields:
      
      * title
 
--- [[Jon]]
-
-> This doesn't support multiple-argument meta directives like
-> `link=x rel=y`, or meta directives with special side-effects like
-> `updated`.
->
-> The first could be solved (if you care) by a syntax like this:
->
->     meta_defaults => [
->         { copyright => "© me" },
->         { link => "about:blank", rel => "silly", },
->     ]
->
-> The second could perhaps be solved by invoking `meta::preprocess` from within
-> `scan` (which might be a simplification anyway), although this is complicated
-> by the fact that some (but not all!) meta headers are idempotent.
-> 
-> --[[smcv]]
-
->> Thanks for your comment. Tonight I had a go at implementing the syntax
->> you propose here. I decided the simplest thing to do might be for the scan
->> subroutine to convert any hashes found in the meta_defaults list into calls
->> to the preprocess routine. I've got a bit stuck trying to convert a hash to
->> a named parameter list (or just a subroutine parameter list that is). I may
->> try to look again in the morning (brain a bit sleepy)
->>
->> ...and on writing this comment I see your second suggestion was essentially
->> to do exactly that :) -- [[Jon]]
-
->>> ok, it's easier than I thought, I just pass the hash and it's handled
->>> correctly. Right now can't figure out why my hashes get converted into
->>> strings prior to me seeing them in scan():
-
-    $VAR64 = [
-      'HASH(0xc2daf8)',
-      'HASH(0xc2db40)'
-    ];
-
->>> ...but it *really* is bedtime :) -- [[Jon]]
+>> -- [[Jon]]
-- 
cgit v1.2.3


From 0c28536117d55fbc3a97ea59f1b37e5ef8807a34 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Sat, 24 Oct 2009 16:59:41 +0100
Subject: split the patch out of the page (and minor update it)

---
 doc/todo/allow_site-wide_meta_definitions.mdwn     | 75 ++--------------------
 .../current-patch.mdwn                             | 70 ++++++++++++++++++++
 2 files changed, 74 insertions(+), 71 deletions(-)
 create mode 100644 doc/todo/allow_site-wide_meta_definitions/current-patch.mdwn

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 3c6c3b5aa..3d506965f 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -36,75 +36,8 @@ definitions essentially.
 >> I've made may not be acceptable, though -- I'd appreciate someone providing
 >> some feedback on that hunk!
 
-    diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
-    index 6fe9cda..c4079fd 100644
-    --- a/IkiWiki/Plugin/meta.pm
-    +++ b/IkiWiki/Plugin/meta.pm
-    @@ -13,6 +13,7 @@ sub import {
-     	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
-     	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
-     	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
-    +	hook(type => "scan", id => "meta", call => \&scan);
-     }
-     
-     sub getsetup () {
-    @@ -305,6 +306,17 @@ sub match {
-     	}
-     }
-     
-    +sub scan() {
-    +	my %params = @_;
-    +	my $page = $params{page};
-    +	if($config{"meta_defaults"}) {
-    +		foreach my $default (@{$config{"meta_defaults"}}) {
-    +			preprocess(%$default, page => $page,
-    +				destpage => $page, preview => 0);
-    +		}
-    +	}
-    +}
-    +
-     package IkiWiki::PageSpec;
-     
-     sub match_title ($$;@) {
-    diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
-    index 8a25ecc..e4d50c9 100644
-    --- a/IkiWiki/Setup.pm
-    +++ b/IkiWiki/Setup.pm
-    @@ -51,7 +51,13 @@ sub merge ($) {
-     					$config{$c}=$setup{$c};
-     				}
-     				else {
-    -					$config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}]
-    +					$config{$c}=[map {
-    +						if(ref $_ eq 'HASH') {
-    +							$_
-    +						} else {
-    +							IkiWiki::possibly_foolish_untaint($_)
-    +						}
-    +					} @{$setup{$c}}];
-     				}
-     			}
-     			elsif (ref $setup{$c} eq 'HASH') {
-    diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
-    index 000f461..8d34ee4 100644
-    --- a/doc/ikiwiki/directive/meta.mdwn
-    +++ b/doc/ikiwiki/directive/meta.mdwn
-    @@ -12,6 +12,16 @@ also specifies some additional sub-parameters.
-     The field values are treated as HTML entity-escaped text, so you can include
-     a quote in the text by writing `&quot;` and so on.
-     
-    +You can also define site-wide defaults for meta values by including them
-    +in your setup file. The key used is `meta_defaults` and the value is a list
-    +of hashes, one per meta directive. e.g.:
-    +
-    +	meta_defaults = [
-    +		{ copyright => "Copyright 2007 by Joey Hess" },
-    +		{ license   => "GPL v2+" },
-    +		{ link => "somepage", rel => "site entrypoint", },
-    +	],
-    +
-     Supported fields:
-     
-     * title
+<code>
+[[!inline pages="current-patch" raw=yes quick=yes]]
+</code>
 
->> -- [[Jon]]
+ -- [[Jon]]
diff --git a/doc/todo/allow_site-wide_meta_definitions/current-patch.mdwn b/doc/todo/allow_site-wide_meta_definitions/current-patch.mdwn
new file mode 100644
index 000000000..c5e37e76e
--- /dev/null
+++ b/doc/todo/allow_site-wide_meta_definitions/current-patch.mdwn
@@ -0,0 +1,70 @@
+diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
+index 6fe9cda..c4079fd 100644
+--- a/IkiWiki/Plugin/meta.pm
++++ b/IkiWiki/Plugin/meta.pm
+@@ -13,6 +13,7 @@ sub import {
+ 	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
+ 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
+ 	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
++	hook(type => "scan", id => "meta", call => \&scan);
+ }
+ 
+ sub getsetup () {
+@@ -305,6 +306,17 @@ sub match {
+ 	}
+ }
+ 
++sub scan() {
++	my %params = @_;
++	my $page = $params{page};
++	if($config{"meta_defaults"}) {
++		foreach my $default (@{$config{"meta_defaults"}}) {
++			preprocess(%$default, page => $page,
++				destpage => $page, preview => 0);
++		}
++	}
++}
++
+ package IkiWiki::PageSpec;
+ 
+ sub match_title ($$;@) {
+diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
+index 8a25ecc..e4d50c9 100644
+--- a/IkiWiki/Setup.pm
++++ b/IkiWiki/Setup.pm
+@@ -51,7 +51,13 @@ sub merge ($) {
+ 					$config{$c}=$setup{$c};
+ 				}
+ 				else {
+-					$config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}]
++					$config{$c}=[map {
++						if(ref $_ eq 'HASH') {
++							$_
++						} else {
++							IkiWiki::possibly_foolish_untaint($_)
++						}
++					} @{$setup{$c}}];
+ 				}
+ 			}
+ 			elsif (ref $setup{$c} eq 'HASH') {
+diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
+index 000f461..8d34ee4 100644
+--- a/doc/ikiwiki/directive/meta.mdwn
++++ b/doc/ikiwiki/directive/meta.mdwn
+@@ -12,6 +12,16 @@ also specifies some additional sub-parameters.
+ The field values are treated as HTML entity-escaped text, so you can include
+ a quote in the text by writing `&quot;` and so on.
+ 
++You can also define site-wide defaults for meta values by including them
++in your setup file. The key used is `meta_defaults` and the value is a list
++of hashes, one per meta directive. e.g.:
++
++	meta_defaults = [
++		{ copyright => "Copyright 2007 by Joey Hess" },
++		{ license   => "GPL v2+" },
++		{ link => "somepage", rel => "site entrypoint", },
++	],
++
+ Supported fields:
+ 
+ * title
-- 
cgit v1.2.3


From 6f84c0b5608ccf8faae52040d5ebbeb6b59fb063 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Sat, 24 Oct 2009 17:01:20 +0100
Subject: try to fix my inline

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 3d506965f..f56bf5c3c 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -37,7 +37,7 @@ definitions essentially.
 >> some feedback on that hunk!
 
 <code>
-[[!inline pages="current-patch" raw=yes quick=yes]]
+[[!inline pages="allow site-wide meta definitions/current-patch" raw=yes quick=yes]]
 </code>
 
  -- [[Jon]]
-- 
cgit v1.2.3


From b474e61eee26c5f0f7c9537562a9d6c2be0ad68f Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Sat, 24 Oct 2009 17:22:01 +0100
Subject: try to fix my inline, second attempt

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index f56bf5c3c..2e8296640 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -37,7 +37,7 @@ definitions essentially.
 >> some feedback on that hunk!
 
 <code>
-[[!inline pages="allow site-wide meta definitions/current-patch" raw=yes quick=yes]]
+[[!inline pages="allow_site-wide_meta_definitions/current-patch" raw=yes quick=yes]]
 </code>
 
  -- [[Jon]]
-- 
cgit v1.2.3


From 118058f0f530f0171fb625815aa0aae992e3f4b6 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Sat, 24 Oct 2009 17:23:52 +0100
Subject: give up and just inline the patch again

---
 doc/todo/allow_site-wide_meta_definitions.mdwn     | 74 +++++++++++++++++++++-
 .../current-patch.mdwn                             | 70 --------------------
 2 files changed, 71 insertions(+), 73 deletions(-)
 delete mode 100644 doc/todo/allow_site-wide_meta_definitions/current-patch.mdwn

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 2e8296640..d95f8bf13 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -36,8 +36,76 @@ definitions essentially.
 >> I've made may not be acceptable, though -- I'd appreciate someone providing
 >> some feedback on that hunk!
 
-<code>
-[[!inline pages="allow_site-wide_meta_definitions/current-patch" raw=yes quick=yes]]
-</code>
+
+    diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
+    index 6fe9cda..c4079fd 100644
+    --- a/IkiWiki/Plugin/meta.pm
+    +++ b/IkiWiki/Plugin/meta.pm
+    @@ -13,6 +13,7 @@ sub import {
+     	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
+     	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
+     	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
+    +	hook(type => "scan", id => "meta", call => \&scan);
+     }
+     
+     sub getsetup () {
+    @@ -305,6 +306,17 @@ sub match {
+     	}
+     }
+     
+    +sub scan() {
+    +	my %params = @_;
+    +	my $page = $params{page};
+    +	if($config{"meta_defaults"}) {
+    +		foreach my $default (@{$config{"meta_defaults"}}) {
+    +			preprocess(%$default, page => $page,
+    +				destpage => $page, preview => 0);
+    +		}
+    +	}
+    +}
+    +
+     package IkiWiki::PageSpec;
+     
+     sub match_title ($$;@) {
+    diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
+    index 8a25ecc..e4d50c9 100644
+    --- a/IkiWiki/Setup.pm
+    +++ b/IkiWiki/Setup.pm
+    @@ -51,7 +51,13 @@ sub merge ($) {
+     					$config{$c}=$setup{$c};
+     				}
+     				else {
+    -					$config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}]
+    +					$config{$c}=[map {
+    +						if(ref $_ eq 'HASH') {
+    +							$_
+    +						} else {
+    +							IkiWiki::possibly_foolish_untaint($_)
+    +						}
+    +					} @{$setup{$c}}];
+     				}
+     			}
+     			elsif (ref $setup{$c} eq 'HASH') {
+    diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
+    index 000f461..8d34ee4 100644
+    --- a/doc/ikiwiki/directive/meta.mdwn
+    +++ b/doc/ikiwiki/directive/meta.mdwn
+    @@ -12,6 +12,16 @@ also specifies some additional sub-parameters.
+     The field values are treated as HTML entity-escaped text, so you can include
+     a quote in the text by writing `&quot;` and so on.
+     
+    +You can also define site-wide defaults for meta values by including them
+    +in your setup file. The key used is `meta_defaults` and the value is a list
+    +of hashes, one per meta directive. e.g.:
+    +
+    +	meta_defaults = [
+    +		{ copyright => "Copyright 2007 by Joey Hess" },
+    +		{ license   => "GPL v2+" },
+    +		{ link => "somepage", rel => "site entrypoint", },
+    +	],
+    +
+     Supported fields:
+     
+     * title
 
  -- [[Jon]]
diff --git a/doc/todo/allow_site-wide_meta_definitions/current-patch.mdwn b/doc/todo/allow_site-wide_meta_definitions/current-patch.mdwn
deleted file mode 100644
index c5e37e76e..000000000
--- a/doc/todo/allow_site-wide_meta_definitions/current-patch.mdwn
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
-index 6fe9cda..c4079fd 100644
---- a/IkiWiki/Plugin/meta.pm
-+++ b/IkiWiki/Plugin/meta.pm
-@@ -13,6 +13,7 @@ sub import {
- 	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
- 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
- 	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
-+	hook(type => "scan", id => "meta", call => \&scan);
- }
- 
- sub getsetup () {
-@@ -305,6 +306,17 @@ sub match {
- 	}
- }
- 
-+sub scan() {
-+	my %params = @_;
-+	my $page = $params{page};
-+	if($config{"meta_defaults"}) {
-+		foreach my $default (@{$config{"meta_defaults"}}) {
-+			preprocess(%$default, page => $page,
-+				destpage => $page, preview => 0);
-+		}
-+	}
-+}
-+
- package IkiWiki::PageSpec;
- 
- sub match_title ($$;@) {
-diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
-index 8a25ecc..e4d50c9 100644
---- a/IkiWiki/Setup.pm
-+++ b/IkiWiki/Setup.pm
-@@ -51,7 +51,13 @@ sub merge ($) {
- 					$config{$c}=$setup{$c};
- 				}
- 				else {
--					$config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}]
-+					$config{$c}=[map {
-+						if(ref $_ eq 'HASH') {
-+							$_
-+						} else {
-+							IkiWiki::possibly_foolish_untaint($_)
-+						}
-+					} @{$setup{$c}}];
- 				}
- 			}
- 			elsif (ref $setup{$c} eq 'HASH') {
-diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
-index 000f461..8d34ee4 100644
---- a/doc/ikiwiki/directive/meta.mdwn
-+++ b/doc/ikiwiki/directive/meta.mdwn
-@@ -12,6 +12,16 @@ also specifies some additional sub-parameters.
- The field values are treated as HTML entity-escaped text, so you can include
- a quote in the text by writing `&quot;` and so on.
- 
-+You can also define site-wide defaults for meta values by including them
-+in your setup file. The key used is `meta_defaults` and the value is a list
-+of hashes, one per meta directive. e.g.:
-+
-+	meta_defaults = [
-+		{ copyright => "Copyright 2007 by Joey Hess" },
-+		{ license   => "GPL v2+" },
-+		{ link => "somepage", rel => "site entrypoint", },
-+	],
-+
- Supported fields:
- 
- * title
-- 
cgit v1.2.3


From 128e31d658b67411168775dcf8d9b9c9675e28cc Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Sat, 24 Oct 2009 17:27:48 +0100
Subject: inline the correct patch, and then go shopping

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index d95f8bf13..20c8c02ac 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -36,31 +36,29 @@ definitions essentially.
 >> I've made may not be acceptable, though -- I'd appreciate someone providing
 >> some feedback on that hunk!
 
-
     diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
-    index 6fe9cda..c4079fd 100644
+    index 6fe9cda..2f8c098 100644
     --- a/IkiWiki/Plugin/meta.pm
     +++ b/IkiWiki/Plugin/meta.pm
-    @@ -13,6 +13,7 @@ sub import {
+    @@ -13,6 +13,8 @@ sub import {
      	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
      	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
      	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
-    +	hook(type => "scan", id => "meta", call => \&scan);
+    +	hook(type => "scan", id => "meta", call => \&scan)
+    +		if $config{"meta_defaults"};
      }
      
      sub getsetup () {
-    @@ -305,6 +306,17 @@ sub match {
+    @@ -305,6 +307,15 @@ sub match {
      	}
      }
      
     +sub scan() {
     +	my %params = @_;
     +	my $page = $params{page};
-    +	if($config{"meta_defaults"}) {
-    +		foreach my $default (@{$config{"meta_defaults"}}) {
-    +			preprocess(%$default, page => $page,
-    +				destpage => $page, preview => 0);
-    +		}
+    +	foreach my $default (@{$config{"meta_defaults"}}) {
+    +		preprocess(%$default, page => $page,
+    +			destpage => $page, preview => 0);
     +	}
     +}
     +
@@ -108,4 +106,4 @@ definitions essentially.
      
      * title
 
- -- [[Jon]]
+-- [[Jon]]
-- 
cgit v1.2.3


From 0dbb16fd5a9f573c6b49006f7452cd60474d9803 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sun, 25 Oct 2009 10:32:49 -0400
Subject: Typo.

---
 doc/ikiwiki/directive/comment.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/comment.mdwn b/doc/ikiwiki/directive/comment.mdwn
index 21386dfc3..693a92770 100644
--- a/doc/ikiwiki/directive/comment.mdwn
+++ b/doc/ikiwiki/directive/comment.mdwn
@@ -32,7 +32,7 @@ metadata of the comment.
 * `ip` - Can be used to record the IP address of a commenter,
   if they posted anonymously.
 * `claimedauthor` - Records the name that the user entered,
-  if anonmous commenters are allowed to enter their (unverified)
+  if anonymous commenters are allowed to enter their (unverified)
   name.
 
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From b54b8215d0c150410e4a629caa9b0035d69f89b2 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sun, 25 Oct 2009 16:13:24 -0400
Subject: Question about interaction of `feedshow` and `show`.

---
 doc/ikiwiki/directive/inline/discussion.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn
index be0665d04..e5cfeb91c 100644
--- a/doc/ikiwiki/directive/inline/discussion.mdwn
+++ b/doc/ikiwiki/directive/inline/discussion.mdwn
@@ -124,3 +124,19 @@ My index page has:
 Else can you please suggest a smarter way of getting certain data out from pages for a inline index?
 
 --[[hendry]]
+
+---
+
+## Interaction of `show` and `feedshow`
+
+Reading the documentation I would think that `feedshow` does not
+influence `show`.
+
+	 [[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]]
+
+Only ten pages are listed in this example although `archive` is set to
+yes. Removing `feedshow=10` all matching pages are shown.
+
+Is that behaviour intended?
+
+--[[PaulePanter]]
-- 
cgit v1.2.3


From f756d7e6de847277708249b601696f42e5882e58 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 26 Oct 2009 11:53:55 -0400
Subject: po: Fix breakage caused by changes to render code.

---
 IkiWiki/Plugin/po.pm | 3 +--
 debian/changelog     | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index d9aa9bfda..02fc4a89e 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -386,8 +386,7 @@ sub change (@) {
 		resetalreadyfiltered();
 		require IkiWiki::Render;
 		foreach my $file (@rendered) {
-			debug(sprintf(gettext("building %s"), $file));
-			IkiWiki::render($file);
+			IkiWiki::render($file, sprintf(gettext("building %s"), $file));
 		}
 	}
 
diff --git a/debian/changelog b/debian/changelog
index c73aa53d7..3d910e3ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20091024) UNRELEASED; urgency=low
+
+  * po: Fix breakage caused by changes to render code.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 26 Oct 2009 11:53:32 -0400
+
 ikiwiki (3.20091023) unstable; urgency=low
 
   * inline: Fix raw mode. Closes: #552114
-- 
cgit v1.2.3


From a2979b2b52eee47cc6d08274b5c6947aeaf9bfdc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 26 Oct 2009 11:56:42 -0400
Subject: mdwn: Avoid trying to use multimarkdown if it is not installed.

---
 IkiWiki/Plugin/mdwn.pm | 6 ++++--
 debian/changelog       | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index c62780cb8..3de59ef3d 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -43,8 +43,10 @@ sub htmlize (@) {
 			if ($@) {
 				debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
 			}
-			$markdown_sub=sub {
-				Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
+			else {
+				$markdown_sub=sub {
+					Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
+				}
 			}
 		}
 		if (! defined $markdown_sub) {
diff --git a/debian/changelog b/debian/changelog
index 3d910e3ba..336924317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.20091024) UNRELEASED; urgency=low
 
   * po: Fix breakage caused by changes to render code.
+  * mdwn: Avoid trying to use multimarkdown if it is not installed. 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 26 Oct 2009 11:53:32 -0400
 
-- 
cgit v1.2.3


From 8dfd5289a970e2a77499a2178c493c2c233ba27e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 26 Oct 2009 13:24:27 -0400
Subject: moderatedcomments: New plugin to allow comment moderation w/o relying
 on blogspam.net.

---
 IkiWiki/Plugin/moderatedcomments.pm | 44 +++++++++++++++++++++++++++++++++++++
 debian/changelog                    |  2 ++
 doc/plugins/comments.mdwn           |  3 ++-
 doc/plugins/moderatedcomments.mdwn  | 10 +++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 IkiWiki/Plugin/moderatedcomments.pm
 create mode 100644 doc/plugins/moderatedcomments.mdwn

diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
new file mode 100644
index 000000000..2555927b7
--- /dev/null
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::moderatedcomments;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "moderatedcomments",  call => \&getsetup);
+	hook(type => "checkcontent", id => "moderatedcomments", call => \&checkcontent);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+		},
+		moderate_users => {
+			type => 'boolean',
+			example => 1,
+			description => 'Moderate comments of logged-in users?',
+			safe => 1,
+			rebuild => 0,
+		},
+}
+
+sub checkcontent (@) {
+	my %params=@_;
+	
+	# only handle comments	
+	return undef unless pagespec_match($params{page}, "postcomment(*)",
+	                	location => $params{page});
+
+	# admins and maybe users can comment w/o moderation
+	my $session=$params{session};
+	my $user=$session->param("name") if $session;
+	return undef if defined $user && (IkiWiki::is_admin($user) ||
+		(exists $config{moderate_users} && ! $config{moderate_users}));
+
+	return gettext("comment needs moderation");
+}
+
+1
diff --git a/debian/changelog b/debian/changelog
index 336924317..f517111b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low
 
   * po: Fix breakage caused by changes to render code.
   * mdwn: Avoid trying to use multimarkdown if it is not installed. 
+  * moderatedcomments: New plugin to allow comment moderation w/o relying
+    on blogspam.net.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 26 Oct 2009 11:53:32 -0400
 
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index 7e2232411..b6d4d252b 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -45,7 +45,8 @@ There are some global options for the setup file:
 ## comment moderation
 
 If you enable the [[blogspam]] plugin, comments that appear spammy will be
-held for moderation. Wiki admins can access the comment moderation queue
+held for moderation. (Or with the [[moderatedcomments]] plugin, all
+comments will be held.) Wiki admins can access the comment moderation queue
 via a button on their Preferences page.
 
 The comments are stored in `.ikiwiki/comments_pending/`, and can be
diff --git a/doc/plugins/moderatedcomments.mdwn b/doc/plugins/moderatedcomments.mdwn
new file mode 100644
index 000000000..97924d742
--- /dev/null
+++ b/doc/plugins/moderatedcomments.mdwn
@@ -0,0 +1,10 @@
+[[!template id=plugin name=moderatedcomments author="[[Joey]]"]]
+[[!tag type/auth]]
+
+This plugin causes [[comments]] to be held for manual moderation.
+Admins can access the comment moderation queue via their preferences page.
+
+By default, all comments made by anyone who is not an admin will be held
+for moderation. The `moderate_users` setting can be set to false to avoid
+moderating comments of logged-in users, while still moderating anonymous
+comments.
-- 
cgit v1.2.3


From 0961af83fb6d9d7241363644037dccfb2fedaf0a Mon Sep 17 00:00:00 2001
From: Smith <Smith@web>
Date: Tue, 27 Oct 2009 01:50:30 -0400
Subject:

---
 doc/soc/ideas.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/soc/ideas.mdwn b/doc/soc/ideas.mdwn
index 88f06b0f1..07c7e669e 100644
--- a/doc/soc/ideas.mdwn
+++ b/doc/soc/ideas.mdwn
@@ -6,3 +6,4 @@ but please don't add the `soc` tag yourself.
 [[!inline pages="(todo/* or bugs/*) and link(soc) and !todo/done and
 !link(todo/done) and !bugs/done and !link(bugs/done) and 
 !*/Discussion" actions=yes show=0]]
+[http://www.yaheodj.com/ khn]
-- 
cgit v1.2.3


From a4693301c22e10fd8d521677bed276bbacfb0628 Mon Sep 17 00:00:00 2001
From: Smith <Smith@web>
Date: Tue, 27 Oct 2009 01:53:23 -0400
Subject:

---
 doc/todo/Gallery.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Gallery.mdwn b/doc/todo/Gallery.mdwn
index f41980333..39316b86f 100644
--- a/doc/todo/Gallery.mdwn
+++ b/doc/todo/Gallery.mdwn
@@ -80,4 +80,4 @@ Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikig
 
 See also [[/users/smcv/gallery]] for another implementation of the same sort of
 thing. Unfortunately, none of the implementation ideas
-I have there seem quite right either... --[[smcv]]
+I have there seem quite right either... --[[smcv]] [http://www.pipiskmd.com/ khan]
-- 
cgit v1.2.3


From 7034e3cafe267999104e2ab12ce0dea13473d2e0 Mon Sep 17 00:00:00 2001
From: Smith <Smith@web>
Date: Tue, 27 Oct 2009 01:58:10 -0400
Subject:

---
 doc/todo/Gallery.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Gallery.mdwn b/doc/todo/Gallery.mdwn
index 39316b86f..5018d85c4 100644
--- a/doc/todo/Gallery.mdwn
+++ b/doc/todo/Gallery.mdwn
@@ -80,4 +80,4 @@ Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikig
 
 See also [[/users/smcv/gallery]] for another implementation of the same sort of
 thing. Unfortunately, none of the implementation ideas
-I have there seem quite right either... --[[smcv]] [http://www.pipiskmd.com/ khan]
+I have there seem quite right either... --[[smcv]] [Lightbox](http://www.asererogether.com)
-- 
cgit v1.2.3


From fca522cbf3dc6f325d4562cba97cd72372d016cb Mon Sep 17 00:00:00 2001
From: Smith <Smith@web>
Date: Tue, 27 Oct 2009 02:07:33 -0400
Subject:

---
 doc/ikiwikiusers.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index f6ab34653..a73d7761e 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,7 +47,11 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
-
+* [Executive MBA accreditation] [http://www.internationalaccreditation.org/IAO/resources/executive-education.asp]  
+* [Engineering accreditation] [http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp]
+* [Psychology accreditation] [http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp]
+* [Bachelors Degree Accreditation] [http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp]
+* [Business education accreditation] [http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp]
 Personal sites and blogs
 ========================
 
-- 
cgit v1.2.3


From b7cc3ef2431c59584c2e57f1468425cbe3ba33cb Mon Sep 17 00:00:00 2001
From: Smith <Smith@web>
Date: Tue, 27 Oct 2009 02:09:59 -0400
Subject:

---
 doc/ikiwikiusers.mdwn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index a73d7761e..f78ba1934 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,11 +47,11 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
-* [Executive MBA accreditation] [http://www.internationalaccreditation.org/IAO/resources/executive-education.asp]  
-* [Engineering accreditation] [http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp]
-* [Psychology accreditation] [http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp]
-* [Bachelors Degree Accreditation] [http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp]
-* [Business education accreditation] [http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp]
+* [Executive MBA accreditation] (http://www.internationalaccreditation.org/IAO/resources/executive-education.asp)  
+* [Engineering accreditation] (http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp)
+* [Psychology accreditation] (http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp)
+* [Bachelors Degree Accreditation] (http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp)
+* [Business education accreditation] (http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp)
 Personal sites and blogs
 ========================
 
-- 
cgit v1.2.3


From 739b7c158c46de74ee62cdd99b4a818a48bc8f84 Mon Sep 17 00:00:00 2001
From: Smith <Smith@web>
Date: Tue, 27 Oct 2009 02:07:33 -0400
Subject:

---
 doc/ikiwikiusers.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index f6ab34653..a73d7761e 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,7 +47,11 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
-
+* [Executive MBA accreditation] [http://www.internationalaccreditation.org/IAO/resources/executive-education.asp]  
+* [Engineering accreditation] [http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp]
+* [Psychology accreditation] [http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp]
+* [Bachelors Degree Accreditation] [http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp]
+* [Business education accreditation] [http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp]
 Personal sites and blogs
 ========================
 
-- 
cgit v1.2.3


From b0bca45892415a09e5294539c3b8c2acc90a8d2b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 27 Oct 2009 02:06:23 -0400
Subject: Revert spam

---
 doc/soc/ideas.mdwn    | 1 -
 doc/todo/Gallery.mdwn | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/soc/ideas.mdwn b/doc/soc/ideas.mdwn
index 07c7e669e..88f06b0f1 100644
--- a/doc/soc/ideas.mdwn
+++ b/doc/soc/ideas.mdwn
@@ -6,4 +6,3 @@ but please don't add the `soc` tag yourself.
 [[!inline pages="(todo/* or bugs/*) and link(soc) and !todo/done and
 !link(todo/done) and !bugs/done and !link(bugs/done) and 
 !*/Discussion" actions=yes show=0]]
-[http://www.yaheodj.com/ khn]
diff --git a/doc/todo/Gallery.mdwn b/doc/todo/Gallery.mdwn
index 5018d85c4..f41980333 100644
--- a/doc/todo/Gallery.mdwn
+++ b/doc/todo/Gallery.mdwn
@@ -80,4 +80,4 @@ Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikig
 
 See also [[/users/smcv/gallery]] for another implementation of the same sort of
 thing. Unfortunately, none of the implementation ideas
-I have there seem quite right either... --[[smcv]] [Lightbox](http://www.asererogether.com)
+I have there seem quite right either... --[[smcv]]
-- 
cgit v1.2.3


From 0e6f0cea2cf229fa86a9871fbd290b35748223e7 Mon Sep 17 00:00:00 2001
From: Smith <Smith@web>
Date: Tue, 27 Oct 2009 02:09:59 -0400
Subject:

---
 doc/ikiwikiusers.mdwn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index a73d7761e..f78ba1934 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,11 +47,11 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
-* [Executive MBA accreditation] [http://www.internationalaccreditation.org/IAO/resources/executive-education.asp]  
-* [Engineering accreditation] [http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp]
-* [Psychology accreditation] [http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp]
-* [Bachelors Degree Accreditation] [http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp]
-* [Business education accreditation] [http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp]
+* [Executive MBA accreditation] (http://www.internationalaccreditation.org/IAO/resources/executive-education.asp)  
+* [Engineering accreditation] (http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp)
+* [Psychology accreditation] (http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp)
+* [Bachelors Degree Accreditation] (http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp)
+* [Business education accreditation] (http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp)
 Personal sites and blogs
 ========================
 
-- 
cgit v1.2.3


From 799fb15cfd8dcae62228018303a564999201a1fb Mon Sep 17 00:00:00 2001
From: Smith <Smith@web>
Date: Tue, 27 Oct 2009 02:11:32 -0400
Subject:

---
 doc/ikiwikiusers.mdwn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index f78ba1934..c3fe9f2fa 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,11 +47,11 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
-* [Executive MBA accreditation] (http://www.internationalaccreditation.org/IAO/resources/executive-education.asp)  
-* [Engineering accreditation] (http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp)
-* [Psychology accreditation] (http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp)
-* [Bachelors Degree Accreditation] (http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp)
-* [Business education accreditation] (http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp)
+* [Executive MBA accreditation](http://www.internationalaccreditation.org/IAO/resources/executive-education.asp)  
+* [Engineering accreditation](http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp)
+* [Psychology accreditation](http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp)
+* [Bachelors Degree Accreditation](http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp)
+* [Business education accreditation](http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp)
 Personal sites and blogs
 ========================
 
-- 
cgit v1.2.3


From 52499701db1e7b35b2ea4db95c9bfb2182fa7fc7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 27 Oct 2009 02:10:38 -0400
Subject: Revert spam (and you're banned)

---
 doc/ikiwikiusers.mdwn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index f78ba1934..f6ab34653 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,11 +47,7 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
-* [Executive MBA accreditation] (http://www.internationalaccreditation.org/IAO/resources/executive-education.asp)  
-* [Engineering accreditation] (http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp)
-* [Psychology accreditation] (http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp)
-* [Bachelors Degree Accreditation] (http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp)
-* [Business education accreditation] (http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp)
+
 Personal sites and blogs
 ========================
 
-- 
cgit v1.2.3


From bea089d6eced985635498235995e14be41fa4a0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 27 Oct 2009 02:13:50 -0400
Subject: Revert spam

---
 doc/ikiwikiusers.mdwn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index c3fe9f2fa..f78ba1934 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,11 +47,11 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
-* [Executive MBA accreditation](http://www.internationalaccreditation.org/IAO/resources/executive-education.asp)  
-* [Engineering accreditation](http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp)
-* [Psychology accreditation](http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp)
-* [Bachelors Degree Accreditation](http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp)
-* [Business education accreditation](http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp)
+* [Executive MBA accreditation] (http://www.internationalaccreditation.org/IAO/resources/executive-education.asp)  
+* [Engineering accreditation] (http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp)
+* [Psychology accreditation] (http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp)
+* [Bachelors Degree Accreditation] (http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp)
+* [Business education accreditation] (http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp)
 Personal sites and blogs
 ========================
 
-- 
cgit v1.2.3


From e186cd7d164d468dec3e5780e1df0c0bcfc281c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 27 Oct 2009 02:15:41 -0400
Subject: Revert spam

---
 doc/ikiwikiusers.mdwn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index f78ba1934..a73d7761e 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,11 +47,11 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
-* [Executive MBA accreditation] (http://www.internationalaccreditation.org/IAO/resources/executive-education.asp)  
-* [Engineering accreditation] (http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp)
-* [Psychology accreditation] (http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp)
-* [Bachelors Degree Accreditation] (http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp)
-* [Business education accreditation] (http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp)
+* [Executive MBA accreditation] [http://www.internationalaccreditation.org/IAO/resources/executive-education.asp]  
+* [Engineering accreditation] [http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp]
+* [Psychology accreditation] [http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp]
+* [Bachelors Degree Accreditation] [http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp]
+* [Business education accreditation] [http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp]
 Personal sites and blogs
 ========================
 
-- 
cgit v1.2.3


From 8eec30159e49360257d01311243c4d78528854f1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 27 Oct 2009 02:17:20 -0400
Subject: Revert spam

---
 doc/ikiwikiusers.mdwn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index a73d7761e..f6ab34653 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,11 +47,7 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
-* [Executive MBA accreditation] [http://www.internationalaccreditation.org/IAO/resources/executive-education.asp]  
-* [Engineering accreditation] [http://www.internationalaccreditation.org/IAO/resources/engineering-education-accrediation.asp]
-* [Psychology accreditation] [http://www.internationalaccreditation.org/IAO/resources/psychology-education-accrediation.asp]
-* [Bachelors Degree Accreditation] [http://www.internationalaccreditation.org/IAO/resources/programs-accreditation.asp]
-* [Business education accreditation] [http://www.internationalaccreditation.org/IAO/resources/business-education-accrediation.asp]
+
 Personal sites and blogs
 ========================
 
-- 
cgit v1.2.3


From f1558020131a3fc6d0d611441a12a5598e4b917f Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Tue, 27 Oct 2009 04:17:01 -0400
Subject:

---
 doc/todo/Support_XML-RPC-based_blogging.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/Support_XML-RPC-based_blogging.mdwn b/doc/todo/Support_XML-RPC-based_blogging.mdwn
index f9685be73..6a0593b17 100644
--- a/doc/todo/Support_XML-RPC-based_blogging.mdwn
+++ b/doc/todo/Support_XML-RPC-based_blogging.mdwn
@@ -9,6 +9,9 @@ blog names would work. --[[JoshTriplett]]
 
 >> I'd love to see support for this and would be happy to contribute towards a bounty (say US$100) :-).  [PmWiki](http://www.pmwiki.org/) has a plugin which [implements this](http://www.pmwiki.org/wiki/Cookbook/XMLRPC) in a way which seems fairly sensible as an end user.  --[[AdamShand]]
 
+>>> Bump. This would be a nice feature, and with the talent on this project I'm sure it could be done safely, too.
+
+
 [[!tag soc]]
 
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 11fc28970b329334d88d3667e5b55e0d57e353ab Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Tue, 27 Oct 2009 17:44:06 -0400
Subject: 403 response may be a "not found" too

---
 doc/plugins/404/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/plugins/404/discussion.mdwn

diff --git a/doc/plugins/404/discussion.mdwn b/doc/plugins/404/discussion.mdwn
new file mode 100644
index 000000000..5a8e8ed85
--- /dev/null
+++ b/doc/plugins/404/discussion.mdwn
@@ -0,0 +1,3 @@
+With Apache, if you have a page foo/bar/baz but no foo/bar, and if you've
+disabled `Indexes` option, you'll end up with a `403` response for foo/bar.
+The 404 plugin doesn't try to handle that. But it should. -- [[Jogo]]
-- 
cgit v1.2.3


From 57213fa0dbabd52001897d0b63bfb1a8d9d6926a Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Tue, 27 Oct 2009 22:22:11 -0400
Subject: Google will take a full URL, request that the plugin send it

---
 doc/plugins/google/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/plugins/google/discussion.mdwn b/doc/plugins/google/discussion.mdwn
index babc919d2..39403f9f9 100644
--- a/doc/plugins/google/discussion.mdwn
+++ b/doc/plugins/google/discussion.mdwn
@@ -4,3 +4,8 @@ This is not very good since the default ikiwiki
 templates produce XHTML instead of HTML.
 
 > Fixed, thanks for the patch! --[[Joey]] 
+
+It works to pass the whole wiki baseurl to Google, not just the
+domain, and appears to be legal. I've got a wiki that'd benefit
+(it's a few directories down from the root). Can the plugin be
+tweaked to do this? --[[schmonz]]
-- 
cgit v1.2.3


From 471c04bfd2222dbb8aec9c350a1512213ef711f5 Mon Sep 17 00:00:00 2001
From: "http://blog.mithis.net/" <http://blog.mithis.net/@web>
Date: Wed, 28 Oct 2009 03:47:41 -0400
Subject: Adding information about the media2iki github project.

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 1e5b912a9..ab6984494 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -8,6 +8,9 @@ converting some of the Mediawiki conventions into Ikiwiki ones.
 The following instructions describe ways of obtaining the current version of
 the wiki. We do not yet cover importing the history of edits.
 
+Another set of instructions and conversion tools (which imports the full history)
+can be found at <http://github.com/mithro/media2iki>
+
 ## Step 1: Getting a list of pages
 
 The first bit of information you require is a list of pages in the Mediawiki.
@@ -131,5 +134,7 @@ most of the Mediawiki syntax.
 
 [[sabr]] used to explain how to [import MediaWiki content into
 git](http://u32.net/Mediawiki_Conversion/index.html?updated), including full
-edit history, but as of 2009/10/16 that site is not available.
+edit history, but as of 2009/10/16 that site is not available. A copy of the 
+information found on this website is stored at <http://github.com/mithro/media2iki>
+
 
-- 
cgit v1.2.3


From 12a27e7025d8ad560976de8a1a76899daaf23a25 Mon Sep 17 00:00:00 2001
From: "http://blog.mithis.net/" <http://blog.mithis.net/@web>
Date: Wed, 28 Oct 2009 03:57:05 -0400
Subject: Adding information about the media2iki github project.

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index ed3faa324..3e9c4dc3c 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -16,6 +16,10 @@ Also, some detail on converting mediawiki transclusion to ikiwiki inlines...
 > "Who knows, the remote site might disappear.". Right now, it appears to
 > have done just that. -- [[users/Jon]]
 
+I have manage to recover most of the site using the Internet Archive. What
+I was unable to retrieve I have rewritten. You can find a copy of the code
+at <http://github.com/mithro/media2iki>
+
 
 The iki-fast-load ruby script from the u32 page is given below:
 
-- 
cgit v1.2.3


From 8b745be93321dbeca6e090af668a3d7920f680b7 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Wed, 28 Oct 2009 13:39:16 +0000
Subject: add XCB library to users

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index f6ab34653..eb998851a 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,6 +47,7 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
+* [The XCB library](http://xcb.freedesktop.org/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 6659d78aa2e3c66c9beadf180aa18438db0f40e5 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Wed, 28 Oct 2009 13:43:02 +0000
Subject: add dividers to split up the individual discussions going on

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 3e9c4dc3c..12c241a7d 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -13,6 +13,8 @@ Also, some detail on converting mediawiki transclusion to ikiwiki inlines...
 
 -- [[users/Jon]]
 
+----
+
 > "Who knows, the remote site might disappear.". Right now, it appears to
 > have done just that. -- [[users/Jon]]
 
@@ -20,6 +22,7 @@ I have manage to recover most of the site using the Internet Archive. What
 I was unable to retrieve I have rewritten. You can find a copy of the code
 at <http://github.com/mithro/media2iki>
 
+----
 
 The iki-fast-load ruby script from the u32 page is given below:
 
@@ -617,6 +620,8 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	
 	1
 
+----
+
 Hello. Got ikiwiki running and I'm planning to convert my personal
 Mediawiki wiki to ikiwiki so I can take offline copies around. If anyone
 has an old copy of the instructions, or any advice on where to start I'd be
-- 
cgit v1.2.3


From 4df15554f84831d9e39db8719efa1b4b9ef9dd82 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Wed, 28 Oct 2009 13:51:00 +0000
Subject: response to mithro

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 12c241a7d..683a3f8ac 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -22,6 +22,21 @@ I have manage to recover most of the site using the Internet Archive. What
 I was unable to retrieve I have rewritten. You can find a copy of the code
 at <http://github.com/mithro/media2iki>
 
+> This is excellent news. However, I'm still keen on there being a
+> comprehensive and up-to-date set of instructions on *this* site. I wouldn't
+> suggest importing that material into ikiwiki like-for-like (not least for
+> [[licensing|freesoftware]] reasons), but it's excellent to have it available
+> for reference, especially since it (currently) is the only set of
+> instructions that gives you the whole history.
+> 
+> The `mediawiki.pm` that was at u32.net is licensed GPL-2. I'd like to see it
+> cleaned up and added to IkiWiki proper (although I haven't requested this
+> yet, I suspect the way it (ab)uses linkify would disqualify it at present).
+>
+> I've imported Scott's initial `mediawiki.pm` into a repository at
+> <http://github.com/jmtd/mediawiki.pm> as a start.
+> -- [[Jon]]
+
 ----
 
 The iki-fast-load ruby script from the u32 page is given below:
-- 
cgit v1.2.3


From 4dd50ba1bc4cb86c408ff45bbe06069e511e28fc Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Wed, 28 Oct 2009 13:52:05 +0000
Subject: update URL to mediawiki plugin

---
 doc/plugins/contrib/mediawiki.mdwn | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/plugins/contrib/mediawiki.mdwn b/doc/plugins/contrib/mediawiki.mdwn
index 7bf1ba0df..13c2d04b2 100644
--- a/doc/plugins/contrib/mediawiki.mdwn
+++ b/doc/plugins/contrib/mediawiki.mdwn
@@ -1,7 +1,10 @@
 [[!template id=plugin name=mediawiki author="[[sabr]]"]]
 [[!tag type/format]]
 
-[The Mediawiki plugin](http://u32.net/Mediawiki_Plugin/) allows ikiwiki to
-process pages written using MediaWiki markup.
+The Mediawiki plugin allows ikiwiki to process pages written using MediaWiki
+markup.
 
-Available at <http://alcopop.org/~jon/mediawiki.pm>
+Available at <http://github.com/jmtd/mediawiki.pm>.
+
+This plugin originally lived at <http://u32.net/Mediawiki_Plugin/>, but that
+website has disappeared.
-- 
cgit v1.2.3


From 16ff34af90b6490e2c2a951d9c74f08547b39730 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Wed, 28 Oct 2009 13:53:41 +0000
Subject: update info about my commits

---
 doc/users/jon.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 7895a03bf..8bb218cdc 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -4,8 +4,8 @@ team-documentation management system for a small-sized group of UNIX
 sysadmins.
 
 * my edits should appear either as 'Jon' (if I've used
-  [[tips/untrusted_git_push]]) or 'jmtd.net' (or once upon a time
-  'alcopop.org/me/openid/' or 'jondowland').
+  [[tips/untrusted_git_push]]); 'jmtd.net', 'jmtd.livejournal.com', 
+  or once upon a time 'alcopop.org/me/openid/' or 'jondowland'.
 * My [homepage](http://jmtd.net/) is powered by ikiwiki
 
 I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual
-- 
cgit v1.2.3


From f782021644ddf8d2111f498f99e33db5fcc9c60a Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Wed, 28 Oct 2009 13:53:58 +0000
Subject: my talk was in 2008

---
 doc/users/jon.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 8bb218cdc..55b3ee137 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -9,10 +9,10 @@ sysadmins.
 * My [homepage](http://jmtd.net/) is powered by ikiwiki
 
 I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual
-[Linux conference](http://www.ukuug.org/events/linux2008/) about organising
-system administrator documentation. Roughly a third of this talk was
-discussing IkiWiki in some technical detail and suggesting it as a good piece
-of software for this task.
+[Linux conference](http://www.ukuug.org/events/linux2008/) in 2008 about
+organising system administrator documentation. Roughly a third of this talk
+was discussing IkiWiki in some technical detail and suggesting it as a good
+piece of software for this task.
 
  * slides at <http://www.staff.ncl.ac.uk/jon.dowland/unix/docs/>.
 
-- 
cgit v1.2.3


From e5cab4165d9c12b8b68a15ce2c037d21dd2090b0 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Wed, 28 Oct 2009 13:55:03 +0000
Subject: add notes about mediawiki

---
 doc/users/jon.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 55b3ee137..ab71426d5 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -19,6 +19,9 @@ piece of software for this task.
 I am also working on some ikiwiki hacks:
 
 * [[todo/allow site-wide meta definitions]]
+* Improving the means by which you can migrate from mediawiki to
+  IkiWiki. See [[tips/convert mediawiki to ikiwiki]] and the
+  [[plugins/contrib/mediawiki]] plugin.
 
 I am mostly interested in ikiwiki usability issues:
 
-- 
cgit v1.2.3


From 879f2f683e878ca859f98eb8b182002cdbc69a20 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Wed, 28 Oct 2009 20:57:27 -0400
Subject: the setup file wants `rsync_command`, not `rsync`

---
 doc/plugins/rsync.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/rsync.mdwn b/doc/plugins/rsync.mdwn
index db7fcb4f7..315b663c0 100644
--- a/doc/plugins/rsync.mdwn
+++ b/doc/plugins/rsync.mdwn
@@ -7,7 +7,7 @@ The command to run is specified by setting `rsync_command` in your setup
 file. The command will be run in your destdir, so something like this
 is a typical command:
 
-	rsync => 'rsync -qa --delete . user@host:/path/to/docroot/',
+	rsync_command => 'rsync -qa --delete . user@host:/path/to/docroot/',
 
 If using rsync over ssh, you will need to enable noninteractive ssh login
 to the remote host. It's also a good idea to specify the exact command line
-- 
cgit v1.2.3


From ed8953716496354561218cdaf10153a8a4f4259d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 07:50:53 -0400
Subject: fix dangling TMPL_IF noticed by rodyaj

---
 doc/tips/parentlinks_style.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/tips/parentlinks_style.mdwn b/doc/tips/parentlinks_style.mdwn
index 5294e5452..b10d7cf56 100644
--- a/doc/tips/parentlinks_style.mdwn
+++ b/doc/tips/parentlinks_style.mdwn
@@ -77,6 +77,7 @@ following lines in `page.tmpl`:
 	<a href="<TMPL_VAR NAME="URL">" class="height<TMPL_VAR NAME="HEIGHT">">
 	  <TMPL_VAR NAME="PAGE">
 	</a> / 
+        </TMPL_IF>
 	</TMPL_LOOP>
 
 Then write the appropriate CSS bits for `a.height1`, etc.
-- 
cgit v1.2.3


From 341e5cec5912fd593c0d0836efccf13344488ee2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 07:57:30 -0400
Subject: fix indentation

---
 doc/tips/parentlinks_style.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/parentlinks_style.mdwn b/doc/tips/parentlinks_style.mdwn
index b10d7cf56..b992a11a0 100644
--- a/doc/tips/parentlinks_style.mdwn
+++ b/doc/tips/parentlinks_style.mdwn
@@ -77,7 +77,7 @@ following lines in `page.tmpl`:
 	<a href="<TMPL_VAR NAME="URL">" class="height<TMPL_VAR NAME="HEIGHT">">
 	  <TMPL_VAR NAME="PAGE">
 	</a> / 
-        </TMPL_IF>
+	</TMPL_IF>
 	</TMPL_LOOP>
 
 Then write the appropriate CSS bits for `a.height1`, etc.
-- 
cgit v1.2.3


From ae7591fd18e4d96666971b8f5707dafd62b8d1e2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 10:15:49 -0400
Subject: thoughts

---
 doc/todo/OpenSearch.mdwn | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/todo/OpenSearch.mdwn b/doc/todo/OpenSearch.mdwn
index e63ded688..c35da54e1 100644
--- a/doc/todo/OpenSearch.mdwn
+++ b/doc/todo/OpenSearch.mdwn
@@ -15,4 +15,24 @@ contain the wiki title from `ikiwiki.setup`.
 
 --[[JoshTriplett]]
 
+> I support adding this. I think all that is needed, beyond the simple task
+> of adding the link header, is to make the search plugin write out
+> the xml file, probably based on a template.
+> 
+> One problem is that the 
+> [specification](http://www.opensearch.org/Specifications/OpenSearch/1.1#OpenSearch_description_document)
+> for the XML file contains a number of silly limits to field lenghs. 
+> For example, it wants a "ShortName" that identifies the search engine,
+> to be 16 characters or less. The Description is limited to 1024,
+> the LongName to 48. This limits what existing config settings can be
+> reused for those. 
+> 
+> Another semi-problem is that the specification saz: 
+> 
+>> OpenSearch description documents should include at least one Query element of role="example" that is expected to return search results. Search clients may use this example query to validate that the search engine is working properly.
+> 
+> How should ikiwiki know what example query will return actual results?
+> (How would a client know if a HTML page contains results or not, anyway?)
+> Sillyness. Ignore this? --[[Joey]]
+
 [[wishlist]]
-- 
cgit v1.2.3


From ce785c87022842a53eda6a25088eb4299907f938 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 10:17:30 -0400
Subject: fix url encoding in redir

When redirecting to a page, ie, after editing, ensure that the url is
uri-encoded. Most browsers other than MSIE don't care, but it's the right
thing to do.

The known failure case involved editing a page that had utf-8 in the name
using MSIE.
---
 IkiWiki/CGI.pm   | 3 ++-
 debian/changelog | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 52cafade0..9277223f0 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -40,7 +40,8 @@ sub showform ($$$$;@) {
 
 sub redirect ($$) {
 	my $q=shift;
-	my $url=shift;
+	eval q{use URI};
+	my $url=URI->new(shift);
 	if (! $config{w3mmode}) {
 		print $q->redirect($url);
 	}
diff --git a/debian/changelog b/debian/changelog
index f517111b3..11fdc993f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low
   * mdwn: Avoid trying to use multimarkdown if it is not installed. 
   * moderatedcomments: New plugin to allow comment moderation w/o relying
     on blogspam.net.
+  * When redirecting to a page, ie, after editing, ensure that the
+    url is uri-encoded. Most browsers other than MSIE don't care, but it's
+    the right thing to do.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 26 Oct 2009 11:53:32 -0400
 
-- 
cgit v1.2.3


From c4784a437d82c2c7747ffc600ac54355130b2ac0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 10:32:02 -0400
Subject: add an example of how to use the recently added HAS_PARENTLINKS

---
 doc/tips/parentlinks_style.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/tips/parentlinks_style.mdwn b/doc/tips/parentlinks_style.mdwn
index b992a11a0..8b95cd396 100644
--- a/doc/tips/parentlinks_style.mdwn
+++ b/doc/tips/parentlinks_style.mdwn
@@ -82,6 +82,24 @@ following lines in `page.tmpl`:
 
 Then write the appropriate CSS bits for `a.height1`, etc.
 
+Avoid showing title of toplevel index page
+------------------------------------------
+
+If you don't like having "index" appear on the top page of the wiki,
+but you do want to see the name of the page otherwise, you can use a
+special `HAS_PARENTLINKS` template variable that the plugin provides.
+It is true for every page *except* the toplevel index.
+
+Here is an example of using it to hide the title of the toplevel index
+page:
+
+	<TMPL_LOOP NAME="PARENTLINKS">
+	<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ 
+	</TMPL_LOOP>
+	<TMPL_IF HAS_PARENTLINKS>
+	<TMPL_VAR TITLE>
+	</TMPL_IF>
+
 Full-blown example
 ------------------
 
-- 
cgit v1.2.3


From f4c4b3b45f70764f56a7c29c4d29928f4280a5df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 11:38:08 -0400
Subject: add spec file

Modify makefile to update spec file version number.
---
 Makefile.PL      |   1 +
 debian/changelog |   1 +
 ikiwiki.spec     | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 272 insertions(+)
 create mode 100644 ikiwiki.spec

diff --git a/Makefile.PL b/Makefile.PL
index a58b64c0d..474098814 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -44,6 +44,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki
 	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
 	./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
 	$(MAKE) -C po
+	sed -i "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
 	
 docwiki: ikiwiki.out
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
diff --git a/debian/changelog b/debian/changelog
index 11fdc993f..4c8c4d6fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low
   * When redirecting to a page, ie, after editing, ensure that the
     url is uri-encoded. Most browsers other than MSIE don't care, but it's
     the right thing to do.
+  * Add a spec file to allow building rpm from the source package.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 26 Oct 2009 11:53:32 -0400
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
new file mode 100644
index 000000000..9294586df
--- /dev/null
+++ b/ikiwiki.spec
@@ -0,0 +1,270 @@
+Name:           ikiwiki
+Version: 3.20091024
+Release:        1%{?dist}
+Summary:        A wiki compiler
+
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            http://ikiwiki.info/
+Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
+Patch0:         ikiwiki-3.00-libexecdir.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+BuildRequires:  perl(Text::Markdown)
+BuildRequires:  perl(Mail::Sendmail)
+BuildRequires:  perl(HTML::Scrubber)
+BuildRequires:  perl(XML::Simple)
+BuildRequires:  perl(Date::Parse)
+BuildRequires:  perl(Date::Format)
+BuildRequires:  perl(HTML::Template)
+BuildRequires:  perl(CGI::FormBuilder)
+BuildRequires:  perl(CGI::Session)
+BuildRequires:  perl(File::MimeInfo)
+BuildRequires:  gettext
+BuildRequires:  po4a
+
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+Requires:       perl(Text::Markdown)
+Requires:       perl(Mail::Sendmail)
+Requires:       perl(HTML::Scrubber)
+Requires:       perl(XML::Simple)
+Requires:       perl(CGI::FormBuilder)
+Requires:       perl(CGI::Session)
+Requires:       perl(Digest::SHA1)
+
+Requires:       python-docutils
+
+%define cgi_bin %{_libexecdir}/w3m/cgi-bin
+
+
+%description
+Ikiwiki is a wiki compiler. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages and history
+in a revision control system such as Subversion or Git. There are many
+other features, including support for blogging, as well as a large
+array of plugins.
+
+
+%prep
+%setup0 -q -n %{name}
+%patch0 -p1 -b .libexecdir
+
+# Filter unwanted Provides:
+%{__cat} << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+  %{__sed} -e '/perl(IkiWiki.*)/d'
+EOF
+
+%define __perl_provides %{_builddir}/%{name}/%{name}-prov
+%{__chmod} +x %{__perl_provides}
+
+# Filter Requires, all used by plugins
+# - Monotone: see bz 450267
+%{__cat} << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+  %{__sed} -e '/perl(IkiWiki.*)/d' \
+           -e '/perl(Monotone)/d'
+EOF
+
+%define __perl_requires %{_builddir}/%{name}/%{name}-req
+%{__chmod} +x %{__perl_requires}
+
+# goes into the -w3m subpackage
+%{__cat} << \EOF > README.fedora
+See http://ikiwiki.info/w3mmode/ for more information.
+EOF
+
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix}
+# parallel builds currently don't work
+%{__make} 
+
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin}
+%find_lang %{name}
+
+# move external plugins
+%{__mkdir_p} %{buildroot}%{_libexecdir}/ikiwiki/plugins
+%{__mv} %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \
+        %{buildroot}%{_libexecdir}/ikiwiki/plugins
+
+# remove shebang
+%{__sed} -e '1{/^#!/d}' -i \
+        %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup \
+        %{buildroot}%{_sysconfdir}/ikiwiki/auto-blog.setup \
+        %{buildroot}%{_libexecdir}/ikiwiki/plugins/proxy.py
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%{_bindir}/ikiwiki*
+%{_sbindir}/ikiwiki*
+%{_mandir}/man1/ikiwiki*
+%{_mandir}/man8/ikiwiki*
+%{_datadir}/ikiwiki
+%dir %{_sysconfdir}/ikiwiki
+%config(noreplace) %{_sysconfdir}/ikiwiki/*
+# contains a packlist only
+%exclude %{perl_vendorarch}
+%{perl_vendorlib}/IkiWiki*
+%exclude %{perl_vendorlib}/IkiWiki*/Plugin/skeleton.pm.example
+%{_libexecdir}/ikiwiki
+%doc README debian/changelog debian/NEWS html
+%doc IkiWiki/Plugin/skeleton.pm.example
+
+
+%package w3m
+Summary:        Ikiwiki w3m cgi meta-wrapper
+Group:          Applications/Internet
+Requires:       w3m
+Requires:       %{name} = %{version}-%{release}
+
+%description w3m
+Enable usage of all of ikiwiki's web features (page editing, etc) in
+the w3m web browser without a web server. w3m supports local CGI
+scripts, and ikiwiki can be set up to run that way using the
+meta-wrapper in this package.
+
+
+%files w3m
+%defattr(-,root,root,-)
+%doc README.fedora
+%{cgi_bin}/ikiwiki-w3m.cgi
+
+
+%changelog
+* Thu Oct  8 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.14159265-1
+- Update to 3.14159265.
+
+* Tue Sep  1 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.1415926-1
+- Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543).
+
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.141592-1
+- Update to 3.141592.
+- po4a is needed now.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1415-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.1415-1
+- Update to 3.1415.
+
+* Thu Jun 11 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.14-1
+- Update to 3.14.
+
+* Fri May 15 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.12-1
+- Update to 3.12.
+
+* Tue May  5 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.11-1
+- Update to 3.11.
+
+* Sat Apr 25 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.10-1
+- Update to 3.10.
+
+* Tue Apr  7 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.09-1
+- Update to 3.09.
+
+* Fri Mar 27 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.08-1
+- Update to 3.08.
+
+* Mon Mar  9 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.07-1
+- Update to 3.07.
+
+* Thu Mar  5 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.06-1
+- Update to 3.06.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.04-1
+- Update to 3.04.
+
+* Mon Feb  9 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.03-1
+- Update to 3.03.
+
+* Sat Jan 10 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.01-1
+- Update to 3.01.
+
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.00-1
+- Update to 3.00.
+
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny@gmx.de> - 2.72-1
+- Update to 2.72.
+- Patch for mtn plugin has been applied upstream.
+- Encoding of ikiwiki.vim has been changed to utf-8 upstream.
+- Use new W3M_CGI_BIN option in %%install.
+
+* Tue Dec 16 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.70-3
+- Patch for monotone plugin: Prevent broken pipe message.
+- Cosmetic changes to satisfy rpmlint.
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 2.70-2
+- Rebuild for Python 2.6
+
+* Thu Nov 20 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.70-1
+- Update to 2.70.
+- Install and enable the external rst plugin.
+- Stop filtering perl(RPC::XML*) requires.
+
+* Fri Oct 10 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.66-1
+- Update to 2.66.
+
+* Fri Sep 19 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.64-1
+- Update to 2.64.
+
+* Thu Sep 11 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.63-1
+- Update to 2.63.
+
+* Sat Aug 30 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.62.1-1
+- Update to 2.62.1. Add /etc/ikiwiki.
+
+* Thu Aug  7 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.56-1
+- Update to 2.56.
+- Stop filtering perl(Net::Amazon::S3), has been approved (bz436481).
+
+* Thu Jul 31 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.55-1
+- Update to 2.55.
+
+* Thu Jul 24 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.54-1
+- Update to 2.54.
+- Move example plugin file to doc.
+
+* Sat Jul 12 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.53-1
+- Update to 2.53.
+
+* Thu Jul 10 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.52-1
+- Update to 2.52.
+
+* Sun Jul  6 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.51-1
+- Update to 2.51.
+- Save iconv output to a temporary file.
+
+* Sun Jun 15 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.50-1
+- Update to 2.50.
+- Move ikiwiki-w3m.cgi into a subpackage.
+- Add ikiwiki's own documentation.
+- Remove duplicate requirement perl(File::MimeInfo).
+- Minor cleanups.
+
+* Mon Jun  2 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.48-1
+- Update to 2.48.
+
+* Wed May 28 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.47-1
+- Update to 2.47.
+
+* Tue May 13 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.46-1
+- Update to 2.46.
+
+* Sat May 10 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.45-1
+- New package.
-- 
cgit v1.2.3


From d62eeaa4b5540ec927355c00acf76361f73cfe3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 11:39:47 -0400
Subject: remove stuff not needed in spec inside tarball

The changelog is partly Fedora-specific, not something
I want to maintain. The Source line is not needed when building
from tarball. Overriding BuildRoot
---
 ikiwiki.spec | 129 -----------------------------------------------------------
 1 file changed, 129 deletions(-)

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 9294586df..4805cc361 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -6,9 +6,7 @@ Summary:        A wiki compiler
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ikiwiki.info/
-Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
 Patch0:         ikiwiki-3.00-libexecdir.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  perl(Text::Markdown)
@@ -141,130 +139,3 @@ meta-wrapper in this package.
 %defattr(-,root,root,-)
 %doc README.fedora
 %{cgi_bin}/ikiwiki-w3m.cgi
-
-
-%changelog
-* Thu Oct  8 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.14159265-1
-- Update to 3.14159265.
-
-* Tue Sep  1 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.1415926-1
-- Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543).
-
-* Wed Aug 12 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.141592-1
-- Update to 3.141592.
-- po4a is needed now.
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1415-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jul 17 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.1415-1
-- Update to 3.1415.
-
-* Thu Jun 11 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.14-1
-- Update to 3.14.
-
-* Fri May 15 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.12-1
-- Update to 3.12.
-
-* Tue May  5 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.11-1
-- Update to 3.11.
-
-* Sat Apr 25 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.10-1
-- Update to 3.10.
-
-* Tue Apr  7 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.09-1
-- Update to 3.09.
-
-* Fri Mar 27 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.08-1
-- Update to 3.08.
-
-* Mon Mar  9 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.07-1
-- Update to 3.07.
-
-* Thu Mar  5 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.06-1
-- Update to 3.06.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.04-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 18 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.04-1
-- Update to 3.04.
-
-* Mon Feb  9 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.03-1
-- Update to 3.03.
-
-* Sat Jan 10 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.01-1
-- Update to 3.01.
-
-* Fri Jan  2 2009 Thomas Moschny <thomas.moschny@gmx.de> - 3.00-1
-- Update to 3.00.
-
-* Fri Jan  2 2009 Thomas Moschny <thomas.moschny@gmx.de> - 2.72-1
-- Update to 2.72.
-- Patch for mtn plugin has been applied upstream.
-- Encoding of ikiwiki.vim has been changed to utf-8 upstream.
-- Use new W3M_CGI_BIN option in %%install.
-
-* Tue Dec 16 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.70-3
-- Patch for monotone plugin: Prevent broken pipe message.
-- Cosmetic changes to satisfy rpmlint.
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 2.70-2
-- Rebuild for Python 2.6
-
-* Thu Nov 20 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.70-1
-- Update to 2.70.
-- Install and enable the external rst plugin.
-- Stop filtering perl(RPC::XML*) requires.
-
-* Fri Oct 10 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.66-1
-- Update to 2.66.
-
-* Fri Sep 19 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.64-1
-- Update to 2.64.
-
-* Thu Sep 11 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.63-1
-- Update to 2.63.
-
-* Sat Aug 30 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.62.1-1
-- Update to 2.62.1. Add /etc/ikiwiki.
-
-* Thu Aug  7 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.56-1
-- Update to 2.56.
-- Stop filtering perl(Net::Amazon::S3), has been approved (bz436481).
-
-* Thu Jul 31 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.55-1
-- Update to 2.55.
-
-* Thu Jul 24 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.54-1
-- Update to 2.54.
-- Move example plugin file to doc.
-
-* Sat Jul 12 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.53-1
-- Update to 2.53.
-
-* Thu Jul 10 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.52-1
-- Update to 2.52.
-
-* Sun Jul  6 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.51-1
-- Update to 2.51.
-- Save iconv output to a temporary file.
-
-* Sun Jun 15 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.50-1
-- Update to 2.50.
-- Move ikiwiki-w3m.cgi into a subpackage.
-- Add ikiwiki's own documentation.
-- Remove duplicate requirement perl(File::MimeInfo).
-- Minor cleanups.
-
-* Mon Jun  2 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.48-1
-- Update to 2.48.
-
-* Wed May 28 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.47-1
-- Update to 2.47.
-
-* Tue May 13 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.46-1
-- Update to 2.46.
-
-* Sat May 10 2008 Thomas Moschny <thomas.moschny@gmx.de> - 2.45-1
-- New package.
-- 
cgit v1.2.3


From be895687ca7f83139ddbe519831b6b867788f69b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 11:44:06 -0400
Subject: remove libexecdir patch

This violates the FHS.

(Also removed unnecessary chebang removal code.)
---
 ikiwiki.spec | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 4805cc361..69457e154 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -6,7 +6,6 @@ Summary:        A wiki compiler
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ikiwiki.info/
-Patch0:         ikiwiki-3.00-libexecdir.patch
 BuildArch:      noarch
 
 BuildRequires:  perl(Text::Markdown)
@@ -47,7 +46,6 @@ array of plugins.
 
 %prep
 %setup0 -q -n %{name}
-%patch0 -p1 -b .libexecdir
 
 # Filter unwanted Provides:
 %{__cat} << \EOF > %{name}-prov
@@ -88,18 +86,6 @@ EOF
 %{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin}
 %find_lang %{name}
 
-# move external plugins
-%{__mkdir_p} %{buildroot}%{_libexecdir}/ikiwiki/plugins
-%{__mv} %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \
-        %{buildroot}%{_libexecdir}/ikiwiki/plugins
-
-# remove shebang
-%{__sed} -e '1{/^#!/d}' -i \
-        %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup \
-        %{buildroot}%{_sysconfdir}/ikiwiki/auto-blog.setup \
-        %{buildroot}%{_libexecdir}/ikiwiki/plugins/proxy.py
-
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -117,7 +103,7 @@ EOF
 %exclude %{perl_vendorarch}
 %{perl_vendorlib}/IkiWiki*
 %exclude %{perl_vendorlib}/IkiWiki*/Plugin/skeleton.pm.example
-%{_libexecdir}/ikiwiki
+%{_libdir}/ikiwiki
 %doc README debian/changelog debian/NEWS html
 %doc IkiWiki/Plugin/skeleton.pm.example
 
-- 
cgit v1.2.3


From f57c48ccac9864450290495203c30a5f2ca213ad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 11:49:18 -0400
Subject: put back Source

Seems rpmbuild -ta file.tar.gz still wants Source even
though it's not used. Go figure.
---
 ikiwiki.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 69457e154..c50ef404f 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -6,6 +6,8 @@ Summary:        A wiki compiler
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ikiwiki.info/
+Source0:	http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  perl(Text::Markdown)
-- 
cgit v1.2.3


From 49bdbcd24c8e410a22a1b7140e88c6345077dc18 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 12:15:13 -0400
Subject: update, reorg, mention spec file

---
 doc/download.mdwn | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 8f5004ca9..3b02e9127 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -1,16 +1,21 @@
-Here's how to get ikiwiki. See [[setup]] for how to use it, and be sure to
-add your wiki to [[IkiwikiUsers]] if you use ikiwiki.
+Here's how to get ikiwiki in source or prepackaged form. See [[setup]] for
+how to use it, and be sure to add your wiki to [[IkiwikiUsers]] if you use
+ikiwiki.
 
-## tarball
+## source
+
+Ikiwiki is developed in a [[git_repository|git]].
 
 The best place to download a tarball of the latest release is from 
 <http://packages.debian.org/unstable/source/ikiwiki>.
 
-Installation steps and requirements are listed on the [[install]] page.
+Manual installation steps and requirements are listed on the [[install]] page.
 
 ## packages
 
-To install with apt, if using Debian or Ubuntu:
+### Debian / Ubuntu
+
+To install with apt:
 
         apt-get install ikiwiki
 
@@ -19,17 +24,26 @@ Or download the deb from <http://packages.debian.org/unstable/web/ikiwiki>.
 There is a backport of a recent version of ikiwiki for Debian 5.0 at
 <http://packages.debian.org/lenny-backports/ikiwiki>.
 
-Fedora versions 8 and newer have RPMs of ikiwiki available.
-
 There is also an unofficial backport of ikiwiki for Ubuntu Jaunty, provided by
 [[Paweł_Tęcza|users/ptecza]],
 at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html).
 
+### Fedora / other RPM based systems
+
+Fedora versions 8 and newer have RPMs of ikiwiki available.
+
+Ikiwiki's source includes a RPM spec file, which you can use to build your
+own RPM.
+
+### BSD
+
 NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
 
 FreeBSD has ikiwiki in its
 [ports collection](http://www.freshports.org/www/ikiwiki/).
 
+### Others
+
 Gentoo has an [ebuild](http://bugs.gentoo.org/show_bug.cgi?id=144453) in its bug database. 
 
 The [openSUSE Build Service](http://software.opensuse.org/search?baseproject=ALL&p=1&q=ikiwiki) has packages for openSUSE
@@ -38,7 +52,3 @@ IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=na
 by running `sudo port install ikiwiki`.
 
 A [PKGBUILD for Arch Linux](http://aur.archlinux.org/packages.php?ID=12284) is in the AUR.
-
-## revision control
-
-Ikiwiki is developed in a [[git_repository|git]].
-- 
cgit v1.2.3


From 29f2cf4a49fb4d11ef92d0c9d1a8343181f6af6c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 12:23:14 -0400
Subject: header cleanup

---
 doc/download.mdwn | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 3b02e9127..45d0d7870 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -11,11 +11,9 @@ The best place to download a tarball of the latest release is from
 
 Manual installation steps and requirements are listed on the [[install]] page.
 
-## packages
+## Debian / Ubuntu packages
 
-### Debian / Ubuntu
-
-To install with apt:
+To install with apt, if using Debian or Ubuntu:
 
         apt-get install ikiwiki
 
@@ -28,27 +26,27 @@ There is also an unofficial backport of ikiwiki for Ubuntu Jaunty, provided by
 [[Paweł_Tęcza|users/ptecza]],
 at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html).
 
-### Fedora / other RPM based systems
+## RPM packages
 
 Fedora versions 8 and newer have RPMs of ikiwiki available.
 
 Ikiwiki's source includes a RPM spec file, which you can use to build your
 own RPM.
 
-### BSD
+## BSD ports
+
+IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
+by running `sudo port install ikiwiki`.
 
 NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
 
 FreeBSD has ikiwiki in its
 [ports collection](http://www.freshports.org/www/ikiwiki/).
 
-### Others
+## Other packages
 
 Gentoo has an [ebuild](http://bugs.gentoo.org/show_bug.cgi?id=144453) in its bug database. 
 
 The [openSUSE Build Service](http://software.opensuse.org/search?baseproject=ALL&p=1&q=ikiwiki) has packages for openSUSE
 
-IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
-by running `sudo port install ikiwiki`.
-
 A [PKGBUILD for Arch Linux](http://aur.archlinux.org/packages.php?ID=12284) is in the AUR.
-- 
cgit v1.2.3


From 9c50ccf3d9f4c694e01f541704b6c98d2a919d99 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Thu, 29 Oct 2009 13:07:27 -0700
Subject: Update user page: I no longer develop or maintain the conversion
 scripts

---
 doc/users/joshtriplett.mdwn | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/users/joshtriplett.mdwn b/doc/users/joshtriplett.mdwn
index f85c068c3..29178057c 100644
--- a/doc/users/joshtriplett.mdwn
+++ b/doc/users/joshtriplett.mdwn
@@ -6,9 +6,10 @@ Email: `josh@{joshtriplett.org,freedesktop.org,kernel.org,psas.pdx.edu}`.
 
 Proud user of ikiwiki.
 
-Currently working on scripts to convert MoinMoin and TWiki wikis to
-ikiwikis backed by a git repository, including full history.
-Available from the following repositories, though not well-documented:
+Worked on scripts to convert MoinMoin and TWiki wikis to ikiwikis backed by a
+git repository, including full history.  Used for a couple of wikis, and now no
+longer maintained, but potentially still useful.  Available from the following
+repositories, though not well-documented:
 
     git clone git://svcs.cs.pdx.edu/git/wiki2iki/moin2iki
     git clone git://svcs.cs.pdx.edu/git/wiki2iki/html-wikiconverter
-- 
cgit v1.2.3


From da58a21d2832fe95fad992d2031c73add5a33300 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Thu, 29 Oct 2009 17:53:45 -0400
Subject:

---
 doc/users/jogo.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/users/jogo.mdwn b/doc/users/jogo.mdwn
index 2a6577990..6f87cbc45 100644
--- a/doc/users/jogo.mdwn
+++ b/doc/users/jogo.mdwn
@@ -1,3 +1,5 @@
-I'm looking at Ikiwiki, searching the best Wiki. The only other one I've found is [werc](http://werc.cat-v.org/).
+ * An [economic game](http://sef.matabio.net/) in french, which [use](http://sef.matabio.net/wiki/) IkiWiki.
+ * Some [plugins](http://kimya.matabio.net/tcgi/hg/IkiPlugins/file/).
+ * An alternative [base wiki](http://kimya.matabio.net/tcgi/hg/FrIkiWiki/file/) in french.
 
 email: `jogo matabio net`.
-- 
cgit v1.2.3


From c29957e0177c3c654a1ea1feffdba00307449560 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 18:05:58 -0400
Subject: google: Pass the whole wiki url to google, not just the domain, so
 that search works correctly for wikis that are located in subdirectories of
 domains.

---
 IkiWiki/Plugin/google.pm           | 9 +--------
 debian/changelog                   | 3 +++
 doc/plugins/google/discussion.mdwn | 2 ++
 templates/googleform.tmpl          | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 1683220e7..483fa1707 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -6,8 +6,6 @@ use strict;
 use IkiWiki 3.00;
 use URI;
 
-my $host;
-
 sub import {
 	hook(type => "getsetup", id => "google", call => \&getsetup);
 	hook(type => "checkconfig", id => "google", call => \&checkconfig);
@@ -26,11 +24,6 @@ sub checkconfig () {
 	if (! length $config{url}) {
 		error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google'));
 	}
-	my $uri=URI->new($config{url});
-	if (! $uri || ! defined $uri->host) {
-		error(gettext("Failed to parse url, cannot determine domain name"));
-	}
-	$host=$uri->host;
 }
 
 my $form;
@@ -43,7 +36,7 @@ sub pagetemplate (@) {
 	if ($template->query(name => "searchform")) {
 		if (! defined $form) {
 			my $searchform = template("googleform.tmpl", blind_cache => 1);
-			$searchform->param(sitefqdn => $host);
+			$searchform->param(url => $config{url});
 			$form=$searchform->output;
 		}
 
diff --git a/debian/changelog b/debian/changelog
index 4c8c4d6fc..f19b4eae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low
     url is uri-encoded. Most browsers other than MSIE don't care, but it's
     the right thing to do.
   * Add a spec file to allow building rpm from the source package.
+  * google: Pass the whole wiki url to google, not just the domain,
+    so that search works correctly for wikis that are located in
+    subdirectories of domains.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 26 Oct 2009 11:53:32 -0400
 
diff --git a/doc/plugins/google/discussion.mdwn b/doc/plugins/google/discussion.mdwn
index 39403f9f9..94fc36a35 100644
--- a/doc/plugins/google/discussion.mdwn
+++ b/doc/plugins/google/discussion.mdwn
@@ -9,3 +9,5 @@ It works to pass the whole wiki baseurl to Google, not just the
 domain, and appears to be legal. I've got a wiki that'd benefit
 (it's a few directories down from the root). Can the plugin be
 tweaked to do this? --[[schmonz]]
+
+> Done. --[[Joey]] 
diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl
index e2d4a1f43..bcf1004a4 100644
--- a/templates/googleform.tmpl
+++ b/templates/googleform.tmpl
@@ -1,6 +1,6 @@
 <form method="get" action="http://www.google.com/search" id="searchform">
  <div>
-  <input name="sitesearch" value="<TMPL_VAR SITEFQDN>" type="hidden" />
+  <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" />
   <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text" />
  </div>
 </form>
-- 
cgit v1.2.3


From 405343153a6c495a99c497cc6e9b58b7b92c43b0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 31 Oct 2009 18:35:49 -0400
Subject: releasing version 3.20091031

---
 debian/changelog |  4 +--
 ikiwiki.spec     |  2 +-
 po/bg.po         | 78 +++++++++++++++++++++++++-------------------------
 po/cs.po         | 82 ++++++++++++++++++++++++++++-------------------------
 po/da.po         | 82 ++++++++++++++++++++++++++++-------------------------
 po/de.po         | 83 +++++++++++++++++++++++++++++-------------------------
 po/es.po         | 84 ++++++++++++++++++++++++++++--------------------------
 po/fr.po         | 82 ++++++++++++++++++++++++++++-------------------------
 po/gu.po         | 78 +++++++++++++++++++++++++-------------------------
 po/ikiwiki.pot   | 64 ++++++++++++++++++++---------------------
 po/it.po         | 86 +++++++++++++++++++++++++++++---------------------------
 po/pl.po         | 78 +++++++++++++++++++++++++-------------------------
 po/sv.po         | 78 +++++++++++++++++++++++++-------------------------
 po/vi.po         | 78 +++++++++++++++++++++++++-------------------------
 14 files changed, 492 insertions(+), 467 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f19b4eae4..c13cbf3b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20091024) UNRELEASED; urgency=low
+ikiwiki (3.20091031) unstable; urgency=low
 
   * po: Fix breakage caused by changes to render code.
   * mdwn: Avoid trying to use multimarkdown if it is not installed. 
@@ -12,7 +12,7 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low
     so that search works correctly for wikis that are located in
     subdirectories of domains.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 26 Oct 2009 11:53:32 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 31 Oct 2009 18:29:38 -0400
 
 ikiwiki (3.20091023) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index c50ef404f..f7f96a0d0 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20091024
+Version: 3.20091031
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index 79ea53624..8f62d4652 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -16,46 +16,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Първо трябва да влезете."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 #, fuzzy
 msgid "Preferences"
 msgstr "Предпочитанията са запазени."
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Предпочитанията са запазени."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Грешка"
 
@@ -310,12 +310,12 @@ msgstr "шаблонът „%s” не е намерен"
 msgid "match not specified"
 msgstr "не е указан файл на обвивката"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 #, fuzzy
 msgid "failed to process"
 msgstr "грешка при обработване на шаблона"
@@ -363,16 +363,12 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "При използване на приеставката „search” е необходимо е да се укаже %s"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -476,24 +472,24 @@ msgstr ""
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/"
 "markdown” (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 #, fuzzy
 msgid "redir page not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "шаблонът „%s” не е намерен"
@@ -506,6 +502,10 @@ msgstr "Огледала"
 msgid "Mirror"
 msgstr "Огледало"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+msgid "comment needs moderation"
+msgstr ""
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr ""
@@ -613,72 +613,72 @@ msgstr ""
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1127,13 +1127,13 @@ msgid "wrapper filename not specified"
 msgstr "не е указан файл на обвивката"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "крешка при компилиране на файла %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "успешно генериране на %s"
diff --git a/po/cs.po b/po/cs.po
index b3c25c8a8..37374be28 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -15,11 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Nejprve se musíte přihlásit."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -27,35 +27,35 @@ msgstr ""
 "pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale "
 "Ezkoušíte se přihlásit přes http a ne přes https"
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "přihlášení selhalo; možná si musíte povolit cookies?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr "Vaše sezení expirovalo."
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr "Přihlášení"
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr "Správce"
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Nastavení uloženo."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Chyba"
 
@@ -306,12 +306,12 @@ msgstr "nebyl zadán parametr template"
 msgid "match not specified"
 msgstr "nebyl zadán parametr match"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s byla zaregistrována pro %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 msgid "failed to process"
 msgstr "nepodařilo se zpracovat"
 
@@ -356,16 +356,12 @@ msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "%s musíte zadat při každém použití modulu %s"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr "Nepodařilo se syntakticky rozebrat url, nelze určit doménová jméno."
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "nepodařilo se spustit graphviz"
@@ -460,21 +456,21 @@ msgstr "Stránka %s je zamknutá a nelze ji měnit"
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr "je povolen multimarkdown, ale Text::MultiMarkdown není nainstalován"
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 msgid "stylesheet not found"
 msgstr "styl nebyl nalezen"
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 msgid "redir page not found"
 msgstr "stránka, na kterou vede přesměrování, nebyla nalezena"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 msgid "redir cycle is not allowed"
 msgstr "cykly nejsou v přesměrování povoleny"
 
@@ -486,6 +482,11 @@ msgstr "Zrcadla"
 msgid "Mirror"
 msgstr "Zrcadlo"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#, fuzzy
+msgid "comment needs moderation"
+msgstr "schvalování komentářů"
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "více"
@@ -593,11 +594,11 @@ msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 msgid "building %s"
 msgstr "sestavuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr "aktualizovány PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -605,7 +606,7 @@ msgstr ""
 "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
 "budou odstraněny také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -613,55 +614,55 @@ msgstr ""
 "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
 "budou přejmenovány také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT soubor (%s) neexistuje"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nepodařilo se zkopírovat PO soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, perl-format
 msgid "failed to update %s"
 msgstr "nepodařilo se aktualizovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nepodařilo se zkopírovat POT soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, perl-format
 msgid "failed to translate %s"
 msgstr "nepodařilo se přeložit %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr "odstraněny zastaralé PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, perl-format
 msgid "failed to write %s"
 msgstr "nepodařilo se zapsat %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 msgid "failed to translate"
 msgstr "překlad se nezdařil"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, perl-format
 msgid "failed to read %s"
 msgstr "nepodařilo se přečíst %s"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
@@ -1105,13 +1106,13 @@ msgid "wrapper filename not specified"
 msgstr "jméno souboru s obalem nebylo zadáno"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "nelze zkompilovat %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s byl úspěšně vytvořen"
@@ -1200,6 +1201,9 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?"
 msgid "What is the domain name of the web server?"
 msgstr "Jaké je doménové jméno webového serveru?"
 
+#~ msgid "Failed to parse url, cannot determine domain name"
+#~ msgstr "Nepodařilo se syntakticky rozebrat url, nelze určit doménová jméno."
+
 #~ msgid "discussion"
 #~ msgstr "diskuse"
 
diff --git a/po/da.po b/po/da.po
index b68e663a7..9801ca011 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -19,11 +19,11 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Du skal først logge på."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -31,35 +31,35 @@ msgstr ""
 "mulig opsætningsfejl: sslcookie er sat, men du forsøger at logge på via "
 "http, ikke https"
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr "Din kørsel (login session) er udløbet"
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr "Pålogning"
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr "Admin"
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Indstillinger gemt"
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Fejl"
 
@@ -313,12 +313,12 @@ msgstr "skabelon %s ikke angivet"
 msgid "match not specified"
 msgstr "sammenligning ikke angivet"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "redigeringsskabelon %s registreret for %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 msgid "failed to process"
 msgstr "dannelsen mislykkedes"
 
@@ -364,16 +364,12 @@ msgstr "du kan ikke påvirke en fil med modus %s"
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Skal angive %s når udvidelsen %s bruges"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "graphviz-kørsel mislykkedes"
@@ -472,22 +468,22 @@ msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret"
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) "
 "mislykkedes"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 msgid "stylesheet not found"
 msgstr "stilsnit (stylesheet) ikke fundet"
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 msgid "redir page not found"
 msgstr "henvisningsside ikke fundet"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 msgid "redir cycle is not allowed"
 msgstr "ring af henvisninger er ikke tilladt"
 
@@ -499,6 +495,11 @@ msgstr "Spejle"
 msgid "Mirror"
 msgstr "Spejl"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#, fuzzy
+msgid "comment needs moderation"
+msgstr "kommentarkoderering"
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "mere"
@@ -609,11 +610,11 @@ msgstr "gendanner alle sider for at korrigere meta titler"
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -621,7 +622,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -629,55 +630,55 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, perl-format
 msgid "failed to read %s"
 msgstr "læsning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -1120,13 +1121,13 @@ msgid "wrapper filename not specified"
 msgstr "wrapper-navn ikke angivet"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "kompilering af %s mislykkedes"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "Korrekt bygget %s"
@@ -1216,6 +1217,9 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er webserverens domænenavn?"
 
+#~ msgid "Failed to parse url, cannot determine domain name"
+#~ msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn"
+
 #~ msgid "code includes disallowed latex commands"
 #~ msgstr "kode indeholder ikke-tilladte latec-kommandoer"
 
diff --git a/po/de.po b/po/de.po
index 4f3be838f..e4b5ed9c4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -15,11 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Sie müssen sich zuerst anmelden."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -27,36 +27,36 @@ msgstr ""
 "vermutliche Fehlkonfiguration: sslcookie ist gesetzt, aber Sie versuchen "
 "sich via http anzumelden, nicht https"
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr "Ihre Anmeldezeit ist abgelaufen."
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr "Administrator"
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Einstellungen gespeichert."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Fehler"
 
@@ -311,12 +311,12 @@ msgstr "Vorlage nicht angegeben"
 msgid "match not specified"
 msgstr "Übereinstimmung nicht angegeben"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s für %s registriert"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 msgid "failed to process"
 msgstr "Ablauf fehlgeschlagen"
 
@@ -362,16 +362,12 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr "auswerten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "graphviz konnte nicht ausgeführt werden"
@@ -473,22 +469,22 @@ msgstr ""
 "multimarkdown ist eingeschaltet, aber Text::MultiMarkdown ist nicht "
 "installiert"
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) "
 "fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 msgid "stylesheet not found"
 msgstr "Stylesheet nicht gefunden"
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 msgid "redir page not found"
 msgstr "Umleitungsseite nicht gefunden"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 msgid "redir cycle is not allowed"
 msgstr "Zyklische Umleitungen sind nicht erlaubt"
 
@@ -500,6 +496,11 @@ msgstr "Spiegel"
 msgid "Mirror"
 msgstr "Spiegel"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#, fuzzy
+msgid "comment needs moderation"
+msgstr "Kommentar-Moderation"
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "mehr"
@@ -612,11 +613,11 @@ msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -624,7 +625,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -632,55 +633,55 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, perl-format
 msgid "failed to read %s"
 msgstr "lesen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -1132,13 +1133,13 @@ msgid "wrapper filename not specified"
 msgstr "Dateiname des Wrappers nicht angegeben"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "erzeugen von %s fehlgeschlagen"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s wurde erfolgreich erstellt"
@@ -1230,6 +1231,10 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?"
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
 
+#~ msgid "Failed to parse url, cannot determine domain name"
+#~ msgstr ""
+#~ "auswerten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen"
+
 #~ msgid "code includes disallowed latex commands"
 #~ msgstr "Code enthält verbotene LaTeX-Befehle"
 
diff --git a/po/es.po b/po/es.po
index ddaf20d85..ca26b0bf6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Antes es necesario identificarse."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -31,36 +31,36 @@ msgstr ""
 "activa, pero está intentando registrarse en el sistema vía el protocolo "
 "'http' y no 'https'"
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr "Su registro en el sistema ha expirado."
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr "Identificación"
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr "Administración"
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Las preferencias se han guardado."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Error"
 
@@ -315,12 +315,12 @@ msgstr "falta indicar la plantilla (template)"
 msgid "match not specified"
 msgstr "falta indicar la coincidencia de páginas (match)"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "plantilla de edición %s registrada para %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 msgid "failed to process"
 msgstr "fallo en el proceso"
 
@@ -366,17 +366,12 @@ msgstr "no puede actuar sobre un archivo con permisos %s"
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
-"Error en el análisis del URL, no puedo determinar el nombre del dominio"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "no he podido ejecutar el programa graphviz "
@@ -477,22 +472,22 @@ msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar "
 "el programa /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 msgid "stylesheet not found"
 msgstr "hoja de estilo no encontrada "
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 msgid "redir page not found"
 msgstr "falta la página a donde redirigir"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 msgid "redir cycle is not allowed"
 msgstr "ciclo de redirección no permitido"
 
@@ -504,6 +499,11 @@ msgstr "Réplicas"
 msgid "Mirror"
 msgstr "Réplica"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#, fuzzy
+msgid "comment needs moderation"
+msgstr "aprobación de comentarios"
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "ver más"
@@ -614,72 +614,72 @@ msgstr ""
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "no puedo leer de %s: %s "
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1131,13 +1131,13 @@ msgid "wrapper filename not specified"
 msgstr "el programa envoltorio no ha sido especificado"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "ha fallado la compilación del programa %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "creado con éxito el programa envoltorio %s"
@@ -1235,6 +1235,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "Failed to parse url, cannot determine domain name"
+#~ msgstr ""
+#~ "Error en el análisis del URL, no puedo determinar el nombre del dominio"
+
 #~ msgid "code includes disallowed latex commands"
 #~ msgstr "el código incluye órdenes latex anuladas"
 
diff --git a/po/fr.po b/po/fr.po
index 1d402468c..fbfb49a88 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Vous devez d'abord vous identifier."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -29,35 +29,35 @@ msgstr ""
 "Erreur de configuration probable : sslcookie est positionné mais vous tentez "
 "de vous connecter avec http au lieu de https"
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Échec de l'identification, vous devez autoriser les cookies."
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr "Session d'authentification expirée."
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr "S’identifier"
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr "Administrateur"
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Les préférences ont été enregistrées."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Erreur"
 
@@ -308,12 +308,12 @@ msgstr "modèle (« template ») non indiqué"
 msgid "match not specified"
 msgstr "correspondance non indiquée"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s enregistré pour %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 msgid "failed to process"
 msgstr "Échec du traitement"
 
@@ -358,16 +358,12 @@ msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s."
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr "Impossible d'analyser l'URL, pas de nom de domaine"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "Échec du lancement de graphviz"
@@ -467,22 +463,22 @@ msgstr "%s est verrouillé et ne peut être modifié"
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr "mulitmarkdown est activé mais Text::Multimarkdown n'est pas installé"
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown "
 "(%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 msgid "stylesheet not found"
 msgstr "Feuille de style introuvable "
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 msgid "redir page not found"
 msgstr "Page de redirection introuvable"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 msgid "redir cycle is not allowed"
 msgstr "Redirection cyclique non autorisée"
 
@@ -494,6 +490,11 @@ msgstr "Miroirs"
 msgid "Mirror"
 msgstr "Miroir"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#, fuzzy
+msgid "comment needs moderation"
+msgstr "modération du commentaire"
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "lire la suite"
@@ -611,11 +612,11 @@ msgstr ""
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -623,7 +624,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -631,55 +632,55 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, perl-format
 msgid "failed to read %s"
 msgstr "Impossible de lire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -1130,13 +1131,13 @@ msgid "wrapper filename not specified"
 msgstr "Le nom du fichier CGI n'a pas été indiqué"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Échec de la compilation de %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s a été créé avec succès"
@@ -1226,6 +1227,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "Failed to parse url, cannot determine domain name"
+#~ msgstr "Impossible d'analyser l'URL, pas de nom de domaine"
+
 #~ msgid "code includes disallowed latex commands"
 #~ msgstr "Le code comporte des commandes LaTeX non permises"
 
diff --git a/po/gu.po b/po/gu.po
index 2f7c5859e..96e9ad184 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -15,46 +15,46 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 #, fuzzy
 msgid "Preferences"
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -308,12 +308,12 @@ msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 msgid "match not specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 #, fuzzy
 msgid "failed to process"
 msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
@@ -361,16 +361,12 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ"
@@ -469,21 +465,21 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે 
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 msgid "stylesheet not found"
 msgstr "સ્ટાઇલશીટ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 #, fuzzy
 msgid "redir page not found"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "ફીડ મળ્યું નહી"
@@ -496,6 +492,10 @@ msgstr "મિરરો"
 msgid "Mirror"
 msgstr "મિરર"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+msgid "comment needs moderation"
+msgstr ""
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "વધુ"
@@ -603,72 +603,72 @@ msgstr ""
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1113,13 +1113,13 @@ msgid "wrapper filename not specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index d52e3bd99..45dd49d01 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-23 12:40-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,45 +16,45 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 msgid "Preferences"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr ""
 
@@ -353,16 +353,12 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr ""
@@ -457,7 +453,7 @@ msgstr ""
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
@@ -482,6 +478,10 @@ msgstr ""
 msgid "Mirror"
 msgstr ""
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+msgid "comment needs moderation"
+msgstr ""
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr ""
@@ -587,71 +587,71 @@ msgstr ""
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, perl-format
 msgid "failed to read %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 6fa47cd24..7e0d3dd90 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Occorre prima effettuare l'accesso."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -25,35 +25,35 @@ msgstr ""
 "possibile errore di configurazione: sslcookie è impostato, ma si sta "
 "tentando un accesso via http, non https"
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr "La sessione è scaduta."
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr "Entra"
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr "Amministrazione"
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Errore"
 
@@ -305,12 +305,12 @@ msgstr "modello non specificato"
 msgid "match not specified"
 msgstr "corrispondenza non specificata"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s registrato per %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 msgid "failed to process"
 msgstr "errore nell'elaborazione"
 
@@ -355,18 +355,12 @@ msgstr "non è permesso lavorare su un file in modalità %s"
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Occorre specificare %s quando si usa il plugin %s"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
-"Errore nell'interpretazione dell'URL, impossibile determinare il nome del "
-"dominio"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "errore nell'eseguire graphviz"
@@ -465,21 +459,21 @@ msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato"
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 msgid "stylesheet not found"
 msgstr "foglio di stile non trovato"
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 msgid "redir page not found"
 msgstr "pagina di reindirizzamento non trovata"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 msgid "redir cycle is not allowed"
 msgstr "ciclo di reindirizzamento non ammesso"
 
@@ -491,6 +485,11 @@ msgstr "Mirror"
 msgid "Mirror"
 msgstr "Mirror"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#, fuzzy
+msgid "comment needs moderation"
+msgstr "moderazione commento"
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "altro"
@@ -604,11 +603,11 @@ msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 msgid "building %s"
 msgstr "compilazione di %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr "file PO aggiornati"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -616,7 +615,7 @@ msgstr ""
 "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
 "stata eliminata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -624,55 +623,55 @@ msgstr ""
 "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
 "stata rinominata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Il file POT (%s) non esiste"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "impossibile copiare il file PO di underlay in %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, perl-format
 msgid "failed to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "impossibile copiare il file POT in %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr "N/D"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, perl-format
 msgid "failed to translate %s"
 msgstr "impossibile tradurre %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, perl-format
 msgid "failed to read %s"
 msgstr "impossibile leggere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
@@ -1119,13 +1118,13 @@ msgid "wrapper filename not specified"
 msgstr "nome del file del contenitore non specificato"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "errore nel compilare %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s generato con successo"
@@ -1214,5 +1213,10 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
 msgid "What is the domain name of the web server?"
 msgstr "Qual è il nome del dominio del server web?"
 
+#~ msgid "Failed to parse url, cannot determine domain name"
+#~ msgstr ""
+#~ "Errore nell'interpretazione dell'URL, impossibile determinare il nome del "
+#~ "dominio"
+
 #~ msgid "code includes disallowed latex commands"
 #~ msgstr "nel codice sono presenti comandi latex non permessi"
diff --git a/po/pl.po b/po/pl.po
index 47a0fb6fa..81addd8d9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -16,48 +16,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Proszę najpierw zalogować się."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są "
 "ciasteczka (ang. cookies)"
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 #, fuzzy
 msgid "Preferences"
 msgstr "Preferencje zapisane."
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Preferencje zapisane."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Błąd"
 
@@ -312,12 +312,12 @@ msgstr "nieznaleziony szablon %s"
 msgid "match not specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 #, fuzzy
 msgid "failed to process"
 msgstr "awaria w trakcie przetwarzania:"
@@ -365,16 +365,12 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -479,24 +475,24 @@ msgstr ""
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub "
 "uruchamiania programu /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "nieznaleziony szablon ze stylami CSS"
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 #, fuzzy
 msgid "redir page not found"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "nieznaleziony kanał RSS"
@@ -509,6 +505,10 @@ msgstr "Kopie lustrzane"
 msgid "Mirror"
 msgstr "Kopia lustrzana"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+msgid "comment needs moderation"
+msgstr ""
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "więcej"
@@ -616,72 +616,72 @@ msgstr ""
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1135,13 +1135,13 @@ msgid "wrapper filename not specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "awaria w trakcie kompilowania %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "pomyślnie utworzono %s"
diff --git a/po/sv.po b/po/sv.po
index ad723dfc0..21a65ae5d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -15,46 +15,46 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Du måste logga in först."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 #, fuzzy
 msgid "Preferences"
 msgstr "Inställningar sparades."
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Inställningar sparades."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Fel"
 
@@ -309,12 +309,12 @@ msgstr "mallen %s hittades inte"
 msgid "match not specified"
 msgstr "filnamn för wrapper har inte angivits"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 #, fuzzy
 msgid "failed to process"
 msgstr "misslyckades med att behandla mall:"
@@ -362,16 +362,12 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Måste ange %s när sökinsticket används"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -472,24 +468,24 @@ msgstr "%s är låst av %s och kan inte redigeras"
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/"
 "markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 #, fuzzy
 msgid "redir page not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "mallen %s hittades inte"
@@ -502,6 +498,10 @@ msgstr "Speglar"
 msgid "Mirror"
 msgstr "Spegel"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+msgid "comment needs moderation"
+msgstr ""
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr ""
@@ -609,72 +609,72 @@ msgstr ""
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1122,13 +1122,13 @@ msgid "wrapper filename not specified"
 msgstr "filnamn för wrapper har inte angivits"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "misslyckades med att kompilera %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "generering av %s lyckades"
diff --git a/po/vi.po b/po/vi.po
index ad970a85f..03ff3bf76 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 20:47-0400\n"
+"POT-Creation-Date: 2009-10-31 18:31-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -16,46 +16,46 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.6fc1\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Trước tiên bạn cần phải đăng nhập."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 #, fuzzy
 msgid "Preferences"
 msgstr "Tùy thích đã được lưu."
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Tùy thích đã được lưu."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
 msgid "Error"
 msgstr "Lỗi"
 
@@ -310,12 +310,12 @@ msgstr "không tìm thấy mẫu %s"
 msgid "match not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:63
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
+#: ../IkiWiki/Plugin/edittemplate.pm:137
 #, fuzzy
 msgid "failed to process"
 msgstr "mẫu không xử lý được:"
@@ -363,16 +363,12 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -475,22 +471,22 @@ msgstr "%s bị %s khoá nên không thể sửa được"
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:161
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/meta.pm:196
+#: ../IkiWiki/Plugin/meta.pm:199
 #, fuzzy
 msgid "redir page not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/meta.pm:210
+#: ../IkiWiki/Plugin/meta.pm:213
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "không tìm thấy mẫu %s"
@@ -503,6 +499,10 @@ msgstr "Nhân bản"
 msgid "Mirror"
 msgstr "Nhân bản"
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+msgid "comment needs moderation"
+msgstr ""
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr ""
@@ -610,72 +610,72 @@ msgstr ""
 msgid "building %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1123,13 +1123,13 @@ msgid "wrapper filename not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:148
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "lỗi biên dịch %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:168
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s đã được tạo ra"
-- 
cgit v1.2.3


From df2c15555708a84dbd62ef4b8f4b45a979e1531e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 31 Oct 2009 18:37:09 -0400
Subject: add news item for ikiwiki 3.20091031

---
 doc/news/version_3.14159265.mdwn | 18 ------------------
 doc/news/version_3.20091031.mdwn | 13 +++++++++++++
 2 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 doc/news/version_3.14159265.mdwn
 create mode 100644 doc/news/version_3.20091031.mdwn

diff --git a/doc/news/version_3.14159265.mdwn b/doc/news/version_3.14159265.mdwn
deleted file mode 100644
index ed46b09ea..000000000
--- a/doc/news/version_3.14159265.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-ikiwiki 3.14159265 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add complete French basewiki and underlays translation from the Debian
-     French l10n team, including Philippe Batailler, Alexandre Dupas, and
-     Steve Petruzzello.
-   * Expand banned\_users; it can now include PageSpecs, which
-     allows banning by IP address.
-   * underlay: Also allow configuring additional directories to search
-     for template files in.
-   * Fix parsing web commits from ipv6 addresses.
-   * Add genwrapper hook, that can be used to add code into the C wrapper.
-   * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by
-     Amitai Schlair.
-   * Updated Czech translation from Miroslav Kure. Closes: #[546223](http://bugs.debian.org/546223)
-   * rsync: New plugin that allows pushing the destdir to a remote host
-     via rsync or similar. Thanks, Amitai Schlair.
-   * auto.setup, auto-blog.setup: Fix sanitization of entered wikiname.
-     Closes: #[547378](http://bugs.debian.org/547378)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091031.mdwn b/doc/news/version_3.20091031.mdwn
new file mode 100644
index 000000000..bb77bfa31
--- /dev/null
+++ b/doc/news/version_3.20091031.mdwn
@@ -0,0 +1,13 @@
+ikiwiki 3.20091031 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * po: Fix breakage caused by changes to render code.
+   * mdwn: Avoid trying to use multimarkdown if it is not installed.
+   * moderatedcomments: New plugin to allow comment moderation w/o relying
+     on blogspam.net.
+   * When redirecting to a page, ie, after editing, ensure that the
+     url is uri-encoded. Most browsers other than MSIE don't care, but it's
+     the right thing to do.
+   * Add a spec file to allow building rpm from the source package.
+   * google: Pass the whole wiki url to google, not just the domain,
+     so that search works correctly for wikis that are located in
+     subdirectories of domains."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From e4e63a6f17be74985539752da46647eaf09cb69b Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 1 Nov 2009 23:39:54 -0500
Subject: note CVS usage

---
 doc/setup.mdwn        | 1 +
 doc/setup/byhand.mdwn | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 89444c9a8..2d4da5536 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -65,6 +65,7 @@ source. (Remember to replace "foo" with the real directory name.)
 
 	git clone foo.git foo.src
 	svn checkout file://`pwd`/foo.svn/trunk foo.src
+	cvs -d `pwd`/foo get -P ikiwiki
 	bzr clone foo foo.src
 	hg clone foo foo.src
 	# TODO monotone, tla
diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
index 53f8d18bb..b2ff7bd01 100644
--- a/doc/setup/byhand.mdwn
+++ b/doc/setup/byhand.mdwn
@@ -124,6 +124,12 @@ revision control.
 	ikiwiki-makerepo svn $SRCDIR $REPOSITORY
 """]]
 
+[[!toggle id=subversion text="CVS"]]
+[[!toggleable id=cvs text="""
+	REPOSITORY=~/wikirepo
+	ikiwiki-makerepo cvs $SRCDIR $REPOSITORY
+"""]]
+
 [[!toggle id=git text="Git"]]
 [[!toggleable id=git text="""
 	REPOSITORY=~/wiki.git
-- 
cgit v1.2.3


From 212b248f8b383de3b880a46e4b813a6a0f65d5db Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Mon, 2 Nov 2009 11:12:04 +0000
Subject: fix toggle id for CVS

---
 doc/setup/byhand.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
index b2ff7bd01..afd1ac27f 100644
--- a/doc/setup/byhand.mdwn
+++ b/doc/setup/byhand.mdwn
@@ -124,7 +124,7 @@ revision control.
 	ikiwiki-makerepo svn $SRCDIR $REPOSITORY
 """]]
 
-[[!toggle id=subversion text="CVS"]]
+[[!toggle id=cvs text="CVS"]]
 [[!toggleable id=cvs text="""
 	REPOSITORY=~/wikirepo
 	ikiwiki-makerepo cvs $SRCDIR $REPOSITORY
-- 
cgit v1.2.3


From a8fd8373a20b26d58c9d49a80ecacfbdb42f5a3f Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Mon, 2 Nov 2009 11:26:25 +0000
Subject: sparse no longer use ikiwiki, it seems

---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index eb998851a..af7f5409b 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -10,7 +10,6 @@ Projects & Organizations
 * The [Portland State Aerospace Society](http://psas.pdx.edu) website.  Converted from a combination of TWiki and MoinMoin to ikiwiki, including full history ([[rcs/Git]] backend).
 * [Planet Debian upstream](http://updo.debian.net/)
 * [Debian Mentors wiki](http://jameswestby.net/mentors/)
-* The [Sparse wiki](http://kernel.org/pub/linux/kernel/people/josh/sparse).
 * [The BSD Associate Admin Book Project](http://bsdwiki.reedmedia.net/)
 * The [maildirman wiki](http://svcs.cs.pdx.edu/maildirman)
 * The [linuxbierwanderung wiki/homepage](http://www.linuxbierwanderung.org)
-- 
cgit v1.2.3


From 9997e0df913aceb6a37855ae61e52ab653d152d7 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Mon, 2 Nov 2009 11:28:47 +0000
Subject: remove broken link to example site (domain squatter)

---
 doc/css_market.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index c0e349552..fe58e77f1 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -15,7 +15,6 @@ gnomes will convert them to css files..)
 * **[[css_market/kirkambar.css]]**, contributed by [[Roktas]].  This far from perfect
   stylesheet follows a [Gitweb](http://www.kernel.org/git/?p=git/git.git;a=tree;f=gitweb)
   like theme, so it may provide a consistent look'n feel along with the [[rcs/git]] backend. ;-)
-  You can see it in action on [kirkambar](http://kirkambar.net/) (Turkish content).
   [[!meta stylesheet="kirkambar"]]
 
 * **[[css_market/embeddedmoose.css]]**, contributed by [[JoshTriplett]].
-- 
cgit v1.2.3


From 06293fc92e17cee816721a95fb3a4dfee34a3d7f Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Wed, 4 Nov 2009 17:51:10 -0500
Subject: from html to ikiwiki with url compatibility

---
 doc/plugins/html/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/plugins/html/discussion.mdwn

diff --git a/doc/plugins/html/discussion.mdwn b/doc/plugins/html/discussion.mdwn
new file mode 100644
index 000000000..5446468bb
--- /dev/null
+++ b/doc/plugins/html/discussion.mdwn
@@ -0,0 +1,5 @@
+I'm trying to convert hand written html site to ikiwiki and maintain url compatibility. 
+html plugin with indexpages=1 converts all dir_name/index.html correctly dir_name urls with wiki/css
+based content, but somedir/somefile.html files are only accessible as somedir/somefile/.
+
+How to make somedir/somefile.html accessible as somedir/somefile.html under ikiwiki?
-- 
cgit v1.2.3


From b37bca1dffed48747f89d420798396eddc1991d7 Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Thu, 5 Nov 2009 03:46:13 -0500
Subject: move forum

---
 doc/plugins/html/discussion.mdwn | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/plugins/html/discussion.mdwn b/doc/plugins/html/discussion.mdwn
index 5446468bb..8b1378917 100644
--- a/doc/plugins/html/discussion.mdwn
+++ b/doc/plugins/html/discussion.mdwn
@@ -1,5 +1 @@
-I'm trying to convert hand written html site to ikiwiki and maintain url compatibility. 
-html plugin with indexpages=1 converts all dir_name/index.html correctly dir_name urls with wiki/css
-based content, but somedir/somefile.html files are only accessible as somedir/somefile/.
 
-How to make somedir/somefile.html accessible as somedir/somefile.html under ikiwiki?
-- 
cgit v1.2.3


From 440c7ec20853375e6c6e7aa3668016b9dee39ebd Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Thu, 5 Nov 2009 03:49:37 -0500
Subject: move question from plugins/html to forum

---
 doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
new file mode 100644
index 000000000..e48f952fe
--- /dev/null
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -0,0 +1,7 @@
+I'm trying to convert hand written html site to ikiwiki and maintain url compatibility. html plugin with indexpages=1 converts all dir_name/index.html correctly to dir_name urls with wiki/css based content, but somedir/somefile.html files are only accessible as somedir/somefile/. Non .html files seem to accessible with their full paths, for example somedir/pic.jpg from hand written html can be accessed by same path under ikiwiki.
+
+How to make somedir/somefile.html accessible as somedir/somefile.html under ikiwiki?
+
+Thanks,
+
+-Mikko
-- 
cgit v1.2.3


From 2faf2d706b98863c74fa27796f080b166ae933ba Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Thu, 5 Nov 2009 09:26:57 +0000
Subject: rm empty discussion page

---
 doc/plugins/html/discussion.mdwn | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 doc/plugins/html/discussion.mdwn

diff --git a/doc/plugins/html/discussion.mdwn b/doc/plugins/html/discussion.mdwn
deleted file mode 100644
index 8b1378917..000000000
--- a/doc/plugins/html/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-
-- 
cgit v1.2.3


From 416c9ff2adf0f75bd192cd52047ce4dc6c230f16 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Thu, 5 Nov 2009 09:30:36 +0000
Subject: response

---
 doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index e48f952fe..6ea0f5841 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -5,3 +5,13 @@ How to make somedir/somefile.html accessible as somedir/somefile.html under ikiw
 Thanks,
 
 -Mikko
+
+> Hello! The options you need to investigate are `--usedirs` and
+> `--no-usedirs`. The default `--usedirs` takes any source page foo
+> (regardless of its format, be it markdown or html) and converts it into a
+> destination page foo/index.html (URL foo/). By comparison, `--no-usedirs`
+> maps the source file onto a destination file directly: src/foo.html becomes
+> dest/foo.html, src/bar.mdwn becomes dest/bar.html, etc.
+> 
+> It sounds like you want `--no-usedirs`, or the corresponding `usedirs => 0,`
+> option in your setup file. See [[usage]] for more information. -- [[Jon]]
-- 
cgit v1.2.3


From 83a36abebacfdde679b83f3bd6f5b86140b6d502 Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Thu, 5 Nov 2009 05:27:20 -0500
Subject:

---
 doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index 6ea0f5841..5f6d89408 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -15,3 +15,7 @@ Thanks,
 > 
 > It sounds like you want `--no-usedirs`, or the corresponding `usedirs => 0,`
 > option in your setup file. See [[usage]] for more information. -- [[Jon]]
+
+Thanks, usedirs seems to be just the thing I need.
+
+-Mikko
-- 
cgit v1.2.3


From f603869d749ee33172df45aa964b093b0b97e85a Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Thu, 5 Nov 2009 06:30:36 -0500
Subject: not quite there yet

---
 .../transition_from_handwritten_html_to_ikiwiki.mdwn    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index 5f6d89408..e25bc06a7 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -19,3 +19,20 @@ Thanks,
 Thanks, usedirs seems to be just the thing I need.
 
 -Mikko
+
+Actually usedirs didn't do exactly what I want. The old site contains both
+somedir/index.html and somedir/somename.html files. With html plugin and 
+indexpages=1 the somedir/index.html pages are accessed correctly but 
+somedir/somefile.html files not.
+
+With usedirs => 0, somedir/somename.html pages are accessed correctly but
+somedir/index.html pages are not. Actually the handwritten somedir/index.html
+files were removed on a rebuild:
+
+    $ ikiwiki -setup blog.setup -rebuild -v
+    ...
+    removing test2/index.html, no longer built by test2
+
+Is there a way for both index.html and somename.html raw html files to show up through ikiwki?
+
+-Mikko
-- 
cgit v1.2.3


From 57f94bb658f566764d87a26ea324dc2d6146c99f Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 5 Nov 2009 13:17:26 -0500
Subject:

---
 ...ransition_from_handwritten_html_to_ikiwiki.mdwn | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index e25bc06a7..3203ce0bb 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -36,3 +36,32 @@ files were removed on a rebuild:
 Is there a way for both index.html and somename.html raw html files to show up through ikiwki?
 
 -Mikko
+
+> I think you want usedirs => 0 and indexpages => 0?
+>
+> What IkiWiki does is to map the source filename to an abstract page name
+> (indexpages alters how this is done), then map the abstract page name
+> to an output filename (usedirs alters how this is done).
+>
+> The three columns here are input, abstract page name, output:
+>
+>     usedirs => 0, indexpages => 0:
+>         a/index.html -> a/index -> a/index.html
+>         a/b.html -> a/b -> a/b.html
+>     usedirs => 1, indexpages => 0:
+>         a/index.html -> a/index -> a/index/index.html
+>         a/b.html -> a/b -> a/b/index.html
+>     usedirs => 0, indexpages => 1:
+>         a/index.html -> a -> a.html
+>         a/b.html -> a/b -> a/b.html
+>     usedirs => 1, indexpages => 1:
+>         a/index.html -> a -> a/index.html
+>         a/b.html -> a/b -> a/b/index.html
+>
+> The abstract page name is what you use in wikilinks and pagespecs.
+>
+> What I would suggest you do instead, though, is break your URLs once
+> (but put in Apache redirections), to get everything to be consistent;
+> I strongly recommend usedirs => 1 and indexpages => 0, then always
+> advertising URLs that look like <http://www.example.com/a/b/>. This is
+> what ikiwiki.info itself does, for instance. --[[smcv]]
-- 
cgit v1.2.3


From e1a2778fa27e5917e3d6c178adcacb7fb7d79048 Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Thu, 5 Nov 2009 17:02:36 -0500
Subject:

---
 doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index 3203ce0bb..98fb00736 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -65,3 +65,9 @@ Is there a way for both index.html and somename.html raw html files to show up t
 > I strongly recommend usedirs => 1 and indexpages => 0, then always
 > advertising URLs that look like <http://www.example.com/a/b/>. This is
 > what ikiwiki.info itself does, for instance. --[[smcv]]
+
+Thanks for the explanation. usedirs => 0 and indexpages => 0 does the trick,
+but I'll try to setup mod_rewrite from foo/bar.html to foo/bar in the final 
+conversion.
+
+-Mikko
-- 
cgit v1.2.3


From 4be740cc9112789e0a6b2a903d1717b3c584286e Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Thu, 5 Nov 2009 18:27:16 -0500
Subject: binary blob question

---
 doc/forum/ikiwiki_and_big_files.mdwn | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 doc/forum/ikiwiki_and_big_files.mdwn

diff --git a/doc/forum/ikiwiki_and_big_files.mdwn b/doc/forum/ikiwiki_and_big_files.mdwn
new file mode 100644
index 000000000..fdd14eee9
--- /dev/null
+++ b/doc/forum/ikiwiki_and_big_files.mdwn
@@ -0,0 +1,37 @@
+My website has 214 hand written html, 1500 of pictures and a few, err sorry, 114
+video files. All this takes around 1.5 GB of disk space at the moment.
+Plain html files take 1.7 MB and fit naturally into git.
+
+But what about the picture and video files?
+
+Pictures are mostly static and rarely need to be edited after first upload, 
+wasting a megabyte or two after an edit while having them in git doesn't really matter. 
+Videos on the other hand are quite large from megabytes to hundreds. Sometimes
+I re-encode them from the original source with better codec parameters and just
+replace the files under html root so they are accessible from the same URL.
+So having a way to delete a 200 MB file and upload a new one with same name and access URL
+is what I need. And it appears git has trouble erasing commits from history, or requires
+some serious gitfoo and good backups of the original repository.
+
+So which ikiwiki backend could handle piles of large binary files? Or should I go for a separate
+data/binary blob directory next to ikiwiki content?
+
+Further complication is my intention to keep URL compatibility with old handwritten and ikiwiki
+based site. Sigh, tough job but luckily just a hobby.
+
+[-Mikko](http://mcfrisk.kapsi.fi)
+
+ps. here's how to calculate space taken by html, picture and video files:
+
+    ~/www$ unset sum; for size in $( for ext in htm html txt xml log; \
+    do find . -iname "*$ext" -exec stat -c "%s" \{\} \; ; done | xargs ); \
+    do sum=$(( $sum + $size )); done ; echo $sum
+    1720696
+    ~/www$ unset sum; for size in $( for ext in jpg gif jpeg png; \
+    do find . -iname "*$ext" -exec stat -c "%s" \{\} \; ; done | xargs ); \
+    do sum=$(( $sum + $size )); done ; echo $sum
+    46032184
+    ~/www$ unset sum; for size in $( for ext in avi dv mpeg mp4; \
+    do find . -iname "*$ext" -exec stat -c "%s" \{\} \; ; done | xargs ); \
+    do sum=$(( $sum + $size )); done ; echo $sum
+    1351890888
-- 
cgit v1.2.3


From 3f2e5abb56efadca99de384ca83ed23e579df915 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 5 Nov 2009 19:02:51 -0500
Subject: response

---
 doc/forum/ikiwiki_and_big_files.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/forum/ikiwiki_and_big_files.mdwn b/doc/forum/ikiwiki_and_big_files.mdwn
index fdd14eee9..bded60ba0 100644
--- a/doc/forum/ikiwiki_and_big_files.mdwn
+++ b/doc/forum/ikiwiki_and_big_files.mdwn
@@ -35,3 +35,16 @@ ps. here's how to calculate space taken by html, picture and video files:
     do find . -iname "*$ext" -exec stat -c "%s" \{\} \; ; done | xargs ); \
     do sum=$(( $sum + $size )); done ; echo $sum
     1351890888
+
+> One approach is to use the [[plugins/underlay]] plugin to
+> configure a separate underlay directory, and put the large
+> files in there. Those files will then be copied to the generated
+> wiki, but need not be kept in revision control. (Or could be 
+> revision controlled in a separate repository -- perhaps one using
+> a version control system that handles large files better than git;
+> or perhaps one that you periodically blow away the old history to
+> in order to save space.)
+> 
+> BTW, the `hardlink` setting is a good thing to enable if you
+> have large files, as it saves both disk space and copying time. 
+> --[[Joey]]
-- 
cgit v1.2.3


From 63b1a4e6ca0de322d5bbfc97c5cc3728661793d1 Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Fri, 6 Nov 2009 04:56:49 -0500
Subject:

---
 doc/forum/ikiwiki_and_big_files.mdwn | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/doc/forum/ikiwiki_and_big_files.mdwn b/doc/forum/ikiwiki_and_big_files.mdwn
index bded60ba0..8e36278e5 100644
--- a/doc/forum/ikiwiki_and_big_files.mdwn
+++ b/doc/forum/ikiwiki_and_big_files.mdwn
@@ -48,3 +48,26 @@ ps. here's how to calculate space taken by html, picture and video files:
 > BTW, the `hardlink` setting is a good thing to enable if you
 > have large files, as it saves both disk space and copying time. 
 > --[[Joey]]
+
+Can underlay plugin handle the case that source and destination directories
+are the same? I'd rather have just one copy of these underlay files on the server.
+And did I goof in the setup file since I got this:
+
+    $ ikiwiki -setup blog.setup -rebuild --verbose
+    Can't use string ("/home/users/mcfrisk/www/blog/med") as an ARRAY ref while
+    "strict refs" in use at 
+    /home/users/mcfrisk/bin/share/perl/5.10.0/IkiWiki/Plugin/underlay.pm line 41.
+    $ grep underlay blog.setup 
+        add_plugins => [qw{goodstuff websetup comments blogspam html sidebar underlay}],
+        underlaydir => '/home/users/mcfrisk/bin/share/ikiwiki/basewiki',
+        # underlay plugin
+        # extra underlay directories to add
+        add_underlays => '/home/users/mcfrisk/www/blog/media',
+    $ egrep "(srcdir|destdir)" blog.setup 
+        srcdir => '/home/users/mcfrisk/blog',
+        destdir => '/home/users/mcfrisk/www/blog',
+        # allow symlinks in the path leading to the srcdir (potentially insecure)
+        allow_symlinks_before_srcdir => 1,
+        # directory in srcdir that contains directive descriptions
+
+-Mikko
-- 
cgit v1.2.3


From b9e443c4d1ba0fdd64bbc2120831db490b185733 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Fri, 6 Nov 2009 08:21:25 -0500
Subject:

---
 doc/bugs/pages_missing_top-level_directory.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/pages_missing_top-level_directory.mdwn b/doc/bugs/pages_missing_top-level_directory.mdwn
index 381bcd85b..3e81ed9de 100644
--- a/doc/bugs/pages_missing_top-level_directory.mdwn
+++ b/doc/bugs/pages_missing_top-level_directory.mdwn
@@ -52,3 +52,6 @@ I don't know if it's related to the fact that I have one ikiwiki install under a
 
 >> I suspect this is due to git scanning everything under the pwd of the .git/ directory, but not totally so.
 >> Other ikiwiki sites I have don't do this, and work OK, on the same server, but different docroots.
+
+>>> Well, I've moved my blog to under my site's docroot - in terms of git and ikiwiki - and it's still cutting out a whole directory level. I have no idea what's going on. I need to check the code.
+
-- 
cgit v1.2.3


From 5ce231ada7425d2259ccb2c82b4e63ffbbcac14d Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Fri, 6 Nov 2009 08:23:46 -0500
Subject:

---
 doc/bugs/pages_missing_top-level_directory.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/pages_missing_top-level_directory.mdwn b/doc/bugs/pages_missing_top-level_directory.mdwn
index 3e81ed9de..159006444 100644
--- a/doc/bugs/pages_missing_top-level_directory.mdwn
+++ b/doc/bugs/pages_missing_top-level_directory.mdwn
@@ -53,5 +53,5 @@ I don't know if it's related to the fact that I have one ikiwiki install under a
 >> I suspect this is due to git scanning everything under the pwd of the .git/ directory, but not totally so.
 >> Other ikiwiki sites I have don't do this, and work OK, on the same server, but different docroots.
 
->>> Well, I've moved my blog to under my site's docroot - in terms of git and ikiwiki - and it's still cutting out a whole directory level. I have no idea what's going on. I need to check the code.
+>>> Well, I've moved my blog to under my site's docroot - in terms of git and ikiwiki - and it's still cutting out a whole directory level. I have no idea what's going on. I need to check the code. The site is at http://simonraven.kisikew.org/ - if you follow the "About" link, you'll understand exactly what's going on, if you look at the URL in your status bar (or under your cursor if you're using a text browser).
 
-- 
cgit v1.2.3


From c4fcdd54ffbf7bcce319a7fcd21c51022632780b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 6 Nov 2009 12:04:24 -0500
Subject: response

---
 doc/forum/ikiwiki_and_big_files.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/forum/ikiwiki_and_big_files.mdwn b/doc/forum/ikiwiki_and_big_files.mdwn
index 8e36278e5..7c213e5a3 100644
--- a/doc/forum/ikiwiki_and_big_files.mdwn
+++ b/doc/forum/ikiwiki_and_big_files.mdwn
@@ -51,6 +51,9 @@ ps. here's how to calculate space taken by html, picture and video files:
 
 Can underlay plugin handle the case that source and destination directories
 are the same? I'd rather have just one copy of these underlay files on the server.
+
+> No, but enabling hardlinks accomplishes the same effect. --[[Joey]] 
+
 And did I goof in the setup file since I got this:
 
     $ ikiwiki -setup blog.setup -rebuild --verbose
@@ -71,3 +74,9 @@ And did I goof in the setup file since I got this:
         # directory in srcdir that contains directive descriptions
 
 -Mikko
+
+> The plugin seems to present a bad default value in the setup file.
+> (Fixed in git.) A correct configuration would be:
+
+        add_underlays => ['/home/users/mcfrisk/www/blog/media'],
+	
-- 
cgit v1.2.3


From 70ee70e2765b1c405b158282d6ceaa54b8b7cf91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 6 Nov 2009 12:06:46 -0500
Subject: underlay: Fix example values put in setup file to be array
 references.

---
 IkiWiki/Plugin/underlay.pm | 4 ++--
 debian/changelog           | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index c59935672..51b769333 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -21,7 +21,7 @@ sub getsetup () {
 		},
 		add_underlays => {
 			type => "string",
-			default => [],
+			example => ["$ENV{HOME}/wiki.underlay"],
 			description => "extra underlay directories to add",
 			advanced => 1,
 			safe => 0,
@@ -29,7 +29,7 @@ sub getsetup () {
 		},
 		add_templates => {
 			type => "string",
-			default => [],
+			example => ["$ENV{HOME}/.ikiwiki/templates"],
 			description => "extra template directories to add",
 			advanced => 1,
 			safe => 0,
diff --git a/debian/changelog b/debian/changelog
index c13cbf3b3..f4132cb46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20091032) UNRELEASED; urgency=low
+
+  * underlay: Fix example values put in setup file to be array
+    references.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
+
 ikiwiki (3.20091031) unstable; urgency=low
 
   * po: Fix breakage caused by changes to render code.
-- 
cgit v1.2.3


From ef33ab76576afd467e73b0016187cdb294e61d4e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 6 Nov 2009 23:03:13 -0500
Subject: add

---
 doc/quotes.mdwn       | 3 +++
 doc/quotes/pizza.mdwn | 4 ++++
 2 files changed, 7 insertions(+)
 create mode 100644 doc/quotes.mdwn
 create mode 100644 doc/quotes/pizza.mdwn

diff --git a/doc/quotes.mdwn b/doc/quotes.mdwn
new file mode 100644
index 000000000..22f3a28d8
--- /dev/null
+++ b/doc/quotes.mdwn
@@ -0,0 +1,3 @@
+Collecting some happy quotes about ikiwiki here.
+
+[[!inline pages="quotes/* and !*/Discussion"]]
diff --git a/doc/quotes/pizza.mdwn b/doc/quotes/pizza.mdwn
new file mode 100644
index 000000000..c3badac6a
--- /dev/null
+++ b/doc/quotes/pizza.mdwn
@@ -0,0 +1,4 @@
+> Best. Wiki. Ever. Now a wiki that I can't "git clone" and "git push" to is
+> like a pizza that I have to eat with a knife and fork.
+
+-- Don Marti
-- 
cgit v1.2.3


From 8b4d7ca9fb068ee32bcc1ffdbb51dd7aadda2501 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 6 Nov 2009 23:55:02 -0500
Subject: analise and close; template customisation error

---
 doc/bugs/pages_missing_top-level_directory.mdwn | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/pages_missing_top-level_directory.mdwn b/doc/bugs/pages_missing_top-level_directory.mdwn
index 159006444..b32ab1e0c 100644
--- a/doc/bugs/pages_missing_top-level_directory.mdwn
+++ b/doc/bugs/pages_missing_top-level_directory.mdwn
@@ -51,7 +51,25 @@ I don't know if it's related to the fact that I have one ikiwiki install under a
 >> see above :)
 
 >> I suspect this is due to git scanning everything under the pwd of the .git/ directory, but not totally so.
+
+>>> Ikiwiki never, ever, looks in directories with names starting with a
+>>> dot. --[[Joey]] 
+
 >> Other ikiwiki sites I have don't do this, and work OK, on the same server, but different docroots.
 
->>> Well, I've moved my blog to under my site's docroot - in terms of git and ikiwiki - and it's still cutting out a whole directory level. I have no idea what's going on. I need to check the code. The site is at http://simonraven.kisikew.org/ - if you follow the "About" link, you'll understand exactly what's going on, if you look at the URL in your status bar (or under your cursor if you're using a text browser).
+>>> Well, I've moved my blog to under my site's docroot - in terms of git
+>>> and ikiwiki - and it's still cutting out a whole directory level. I
+>>> have no idea what's going on. I need to check the code. The site is at
+>>> http://simonraven.kisikew.org/ - if you follow the "About" link, you'll
+>>> understand exactly what's going on, if you look at the URL in your
+>>> status bar (or under your cursor if you're using a text browser).
 
+>>>> Your page contains the following in its html:
+>>>>	`<base href="../" />`
+>>>> 
+>>>> Given a link like "./Policy/", which is *correct*, and when on the
+>>>> About page will normally link to the About/Policy page, this causes
+>>>> the link to really link to ".././Policy/" which is of course broken.
+>>>> 
+>>>> Ikiwiki's standard page templates do not contain this base tag, so
+>>>> I guess your customised templates are broken. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 69f69f5d8b06a79f769732d53c4132700f7c1b3d Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Sat, 7 Nov 2009 04:49:43 -0500
Subject:

---
 doc/forum/ikiwiki_and_big_files.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/forum/ikiwiki_and_big_files.mdwn b/doc/forum/ikiwiki_and_big_files.mdwn
index 7c213e5a3..b45bc1185 100644
--- a/doc/forum/ikiwiki_and_big_files.mdwn
+++ b/doc/forum/ikiwiki_and_big_files.mdwn
@@ -80,3 +80,18 @@ And did I goof in the setup file since I got this:
 
         add_underlays => ['/home/users/mcfrisk/www/blog/media'],
 	
+Umm, doesn't quite fix this yet:
+
+    $ ikiwiki -setup blog.setup -v
+    Can't use an undefined value as an ARRAY reference at /home/users/mcfrisk/bin/share/perl/5.10.0/IkiWiki
+    /Plugin/underlay.pm line 44.
+    $ grep underlay blog.setup 
+        add_plugins => [qw{goodstuff websetup comments blogspam html sidebar underlay}],
+        underlaydir => '/home/users/mcfrisk/bin/share/ikiwiki/basewiki',
+        # underlay plugin
+        # extra underlay directories to add
+        add_underlays => ['/home/users/mcfrisk/www/blog/media'],
+    $ ikiwiki --version
+    ikiwiki version 3.20091032
+
+-Mikko
-- 
cgit v1.2.3


From 59e1f891189de563c89729d1f835ada62156b7e2 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Sat, 7 Nov 2009 08:11:17 -0500
Subject: mod_alias works too

---
 doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index 98fb00736..e54dacdd5 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -71,3 +71,5 @@ but I'll try to setup mod_rewrite from foo/bar.html to foo/bar in the final
 conversion.
 
 -Mikko
+
+> That's roughly what I do, but you can do it with `Redirect` and `RedirectMatch` from `mod_alias`, rather than fire up rewrite. Mind you I don't write a generic rule, I have a finite set of pages to redirect which I know. -- [[Jon]]
-- 
cgit v1.2.3


From 910cbae922ff7805947ea8b01527be1e5a27890b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 7 Nov 2009 12:36:13 -0500
Subject: underlay: Avoid crashing if lists of underlays (or template
 directories) are not configured.

---
 IkiWiki/Plugin/underlay.pm | 10 +++++++---
 debian/changelog           |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 51b769333..116fe7324 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -38,10 +38,14 @@ sub getsetup () {
 }
 
 sub checkconfig () {
-	foreach my $dir (@{$config{add_underlays}}) {
-		add_underlay($dir);
+	if ($config{add_underlays}) {
+		foreach my $dir (@{$config{add_underlays}}) {
+			add_underlay($dir);
+		}
+	}
+	if ($config{add_templates}) {
+		push @{$config{templatedirs}}, @{$config{add_templates}};
 	}
-	push @{$config{templatedirs}}, @{$config{add_templates}};
 }
 
 1;
diff --git a/debian/changelog b/debian/changelog
index f4132cb46..0026d9ddc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
 
   * underlay: Fix example values put in setup file to be array
     references.
+  * underlay: Avoid crashing if lists of underlays (or template
+    directories) are not configured.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
 
-- 
cgit v1.2.3


From b296bcbb08aabe3eb7a0b1c41e3a7942e1739e57 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 7 Nov 2009 12:37:35 -0500
Subject: response

---
 doc/forum/ikiwiki_and_big_files.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/forum/ikiwiki_and_big_files.mdwn b/doc/forum/ikiwiki_and_big_files.mdwn
index b45bc1185..cd41d9fce 100644
--- a/doc/forum/ikiwiki_and_big_files.mdwn
+++ b/doc/forum/ikiwiki_and_big_files.mdwn
@@ -95,3 +95,8 @@ Umm, doesn't quite fix this yet:
     ikiwiki version 3.20091032
 
 -Mikko
+
+> Yeah, I've fixed that in git, but you can work around it with this:
+> --[[Joey]] 
+        
+	templatedirs => [],
-- 
cgit v1.2.3


From 144ffc0e36568207250a80a31370927eaf4f96ff Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 6 Nov 2009 15:51:14 +0100
Subject: bugs++

---
 doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn

diff --git a/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
new file mode 100644
index 000000000..814074e08
--- /dev/null
+++ b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
@@ -0,0 +1,19 @@
+When trying to insert the raw content of an attached shell script
+called `whatever` using:
+
+    \[[!inline pages="whatever" raw="yes"]]
+
+The generated HTML contains:
+
+    \[[!inline Erreur: Can't call method "param" on an undefined value
+    at /usr/local/share/perl/5.10.0/IkiWiki/Plugin/inline.pm
+    line 346.]]
+
+Looking at the inline plugin's code, it is clear that `$template` is
+undef in such a situation. Defining `$template` just before line 346,
+in case it's not defined, removes the error message, but nothing
+gets inlined as `get_inline_content` returns the empty string in
+this situation.
+
+If we explicitely don't want to allow raw inlining of unknown page
+types, ikiwiki should output a better error message.
-- 
cgit v1.2.3


From 73c3f0d7018041acac259eedf501dc6d9a52e1af Mon Sep 17 00:00:00 2001
From: tzafrir <tzafrir@web>
Date: Sat, 7 Nov 2009 14:01:09 -0500
Subject: s/a name/id/ ?

---
 doc/ikiwiki/wikilink/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index b146c9447..d6df4cbf6 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -43,6 +43,11 @@ BTW, ikiwiki doesn't displays the #foo anchor in the example
 
 >> Fixed that --[[Joey]]
 
+The 'name' attribute of the 'a' element is a depracated way to create a named anchor. The right way to do that is using the 'id' attribute of any element. This is because an anchor may refer to a complete element rather than some point in the page.
+
+Standard purity aside, if you define an anchor (using either 'a name' or 'id') to a single point in the document but refer to a complete section, the browser may just show that specific point at the bottom of the page rather than trying to show all the section.
+--[[tzafrir]]
+
 ---
 
 Considering a hierarchy like `foo/bar/bar`, I had the need to link from the
-- 
cgit v1.2.3


From 5f2503e2cf3ea3a3a97ace9ed37e4ac3564083a3 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Sun, 8 Nov 2009 00:52:25 +0100
Subject: New withlist item: [[!meta redir]] -- tell what's going on

---
 doc/users/tschwinge.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 33a139784..f9eebb73a 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -87,6 +87,12 @@ pages could perhaps be passed on to the referred-to page?
 > I found that backlinks was an easy way to find such links to such pages.
 > (Although the redirection made it hard to see the backlinks!) --[[Joey]] 
 
+## \[[!meta redir]] -- tell what's going on
+
+Add functionality that a text like *this page's content has moved to [new
+page]; in a few seconds you'll be redirected thither* is displayed on every
+page that uses \[[!meta redir]].
+
 ## Sendmail -- [[todo/passwordauth:_sendmail_interface]]
 
 ## [[bugs/Broken Parentlinks]]
-- 
cgit v1.2.3


From 84f606b6fe5a9252a1cc515b083856e3b9a3c455 Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Sat, 7 Nov 2009 19:54:08 -0500
Subject:

---
 doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index e54dacdd5..96be862d7 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -73,3 +73,8 @@ conversion.
 -Mikko
 
 > That's roughly what I do, but you can do it with `Redirect` and `RedirectMatch` from `mod_alias`, rather than fire up rewrite. Mind you I don't write a generic rule, I have a finite set of pages to redirect which I know. -- [[Jon]]
+
+I'm getting closer. Now with usedirs => 1 and raw html pages, ikiwiki transforms foo/index.html to foo/index/index.html.
+Can ikiwiki be instructed map foo/index.html to page foo instead that foo/index?
+
+-Mikko
-- 
cgit v1.2.3


From 19ff6180a8bbb2e5441fe177a934e146d129f1c7 Mon Sep 17 00:00:00 2001
From: justin <justin@web>
Date: Sat, 7 Nov 2009 21:58:54 -0500
Subject: every search result includes any navigational text

---
 .../Search_summary_includes_text_from_navigational_elements.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn

diff --git a/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn b/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn
new file mode 100644
index 000000000..874b9ffeb
--- /dev/null
+++ b/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn
@@ -0,0 +1,9 @@
+Each listed result for a search will show some example text from the beginning of the linked page.  It strips out HTML elements, but if there's any navigational text items, they will stay.
+
+For example, each search result on ikiwiki.info shows "(title) ikiwiki/ (title) Edit RecentChanges History Preferences Discussion" at the start of its results.
+
+A way to name some CSS ids that should be removed in search results within the ikiwiki setup file would work.  Here's something similar that a friend proposed:
+
+http://leaf.dragonflybsd.org/mailarchive/users/2009-11/msg00077.html
+
+(bin attachment on that page is actually a .diff.)
-- 
cgit v1.2.3


From 66b46576ec097b9f10b45d4b1de18bb214cd5bd5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 8 Nov 2009 13:48:07 -0500
Subject: Moved the postscan hook to run on the raw html of a page, before the
 template is filled out. This improves the search plugin's indexing, since it
 will not include navigational elements from the page template or sidebar.

---
 IkiWiki/Render.pm                                  |  8 ++++----
 debian/changelog                                   |  4 ++++
 ...y_includes_text_from_navigational_elements.mdwn | 13 +++++++++++++
 doc/plugins/write.mdwn                             | 22 +++++++++++-----------
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0889fed62..ab3a71671 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -61,6 +61,10 @@ sub backlinks ($) {
 sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
+	
+	run_hooks(postscan => sub {
+		shift->(page => $page, content => $content);
+	});
 
 	my $templatefile;
 	run_hooks(templatefile => sub {
@@ -130,10 +134,6 @@ sub genpage ($$) {
 	
 	$content=$template->output;
 	
-	run_hooks(postscan => sub {
-		shift->(page => $page, content => $content);
-	});
-
 	run_hooks(format => sub {
 		$content=shift->(
 			page => $page,
diff --git a/debian/changelog b/debian/changelog
index 0026d9ddc..6a5ae30ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
     references.
   * underlay: Avoid crashing if lists of underlays (or template
     directories) are not configured.
+  * Moved the postscan hook to run on the raw html of a page, before
+    the template is filled out. This improves the search plugin's indexing,
+    since it will not include navigational elements from the page template
+    or sidebar.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
 
diff --git a/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn b/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn
index 874b9ffeb..b774c4531 100644
--- a/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn
+++ b/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn
@@ -7,3 +7,16 @@ A way to name some CSS ids that should be removed in search results within the i
 http://leaf.dragonflybsd.org/mailarchive/users/2009-11/msg00077.html
 
 (bin attachment on that page is actually a .diff.)
+
+> So I was looking at this and I relized that while the search plugin used
+> to use the format hook, and so there was no way to avoid it seeing all
+> the gunk around the page body, it was changed a while ago for different
+> reasons to use its own hook, postscan. So there's really no reason not
+> to move postscan so it runs before said gunk is added to the page.
+> (Aside from a small risk of breaking other third-party plugins that
+> somehow use postscan.)
+> 
+> I've implemented that in git, and it drops the navigation elements nicely.
+> It's perhaps less general than allowing specific divs to be skipped from
+> search, but it seems good enough. Please thank the dragonfly guys for their
+> work on this. [[done]] --[[Joey]] 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index c72418c3c..2f179d46f 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -201,6 +201,17 @@ like `Makefile` that have no extension.
 If `hook` is passed an optional "longname" parameter, this value is used
 when prompting a user to choose a page type on the edit page form.
 
+### postscan
+
+	hook(type => "postscan", id => "foo", call => \&postscan);
+
+This hook is called once the page has been converted to html (but before
+the generated html is put in a template). The most common use is to
+update search indexes. Added in ikiwiki 2.54.
+
+The function is passed named parameters "page" and "content". Its return
+value is ignored.
+
 ### pagetemplate
 
 	hook(type => "pagetemplate", id => "foo", call => \&pagetemplate);
@@ -237,17 +248,6 @@ modify the body of a page after it has been fully converted to html.
 The function is passed named parameters: "page", "destpage", and "content",
 and should return the sanitized content.
 
-### postscan
-
-	hook(type => "postscan", id => "foo", call => \&postscan);
-
-This hook is called once the full page body is available (but before the
-format hook). The most common use is to update search indexes. Added in
-ikiwiki 2.54.
-
-The function is passed named parameters "page" and "content". Its return
-value is ignored.
-
 ### format
 
 	hook(type => "format", id => "foo", call => \&format);
-- 
cgit v1.2.3


From 940f3d631ea27dd4e8e05302ae191e19cb8115a3 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Sun, 8 Nov 2009 13:55:58 -0500
Subject: rename the source?

---
 doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index 96be862d7..3084f764c 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -78,3 +78,7 @@ I'm getting closer. Now with usedirs => 1 and raw html pages, ikiwiki transforms
 Can ikiwiki be instructed map foo/index.html to page foo instead that foo/index?
 
 -Mikko
+
+> If you don't already have a foo.html in your source, why not just rename foo/index.html to foo.html? With usedirs, it will then map to foo/index.html. Before, you had 'foo/' and 'foo/index.html' as working URLS, and they will work after too. 
+> 
+> If you did have a foo.html and a foo/index.html, hmm, that's a tricky one. -- [[Jon]]
-- 
cgit v1.2.3


From ad98c6d5439d658ad291f5c2a41cf56dcef18e97 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Sun, 8 Nov 2009 14:07:20 -0500
Subject: source?

---
 doc/quotes/pizza/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/quotes/pizza/discussion.mdwn

diff --git a/doc/quotes/pizza/discussion.mdwn b/doc/quotes/pizza/discussion.mdwn
new file mode 100644
index 000000000..ecf8c44a6
--- /dev/null
+++ b/doc/quotes/pizza/discussion.mdwn
@@ -0,0 +1 @@
+It would be cool to know where this was written (assuming it was somewhere public :-)) Googling around, I've found a few places Don has recommended ikiwiki, but not in such glowing terms. -- [[Jon]]
-- 
cgit v1.2.3


From 2700289d26ea63331799cf3485dc63e853739ff4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 8 Nov 2009 14:28:05 -0500
Subject: add a link

---
 doc/quotes/pizza.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/quotes/pizza.mdwn b/doc/quotes/pizza.mdwn
index c3badac6a..34899edfb 100644
--- a/doc/quotes/pizza.mdwn
+++ b/doc/quotes/pizza.mdwn
@@ -1,4 +1,4 @@
 > Best. Wiki. Ever. Now a wiki that I can't "git clone" and "git push" to is
 > like a pizza that I have to eat with a knife and fork.
 
--- Don Marti
+-- [Don Marti](http://lwn.net/Articles/360888/)
-- 
cgit v1.2.3


From a596e6195cde3a1af5d236a5f6c24ebfd56d9e0a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 8 Nov 2009 18:30:12 -0500
Subject: add sublevels to toc

---
 doc/tips/parentlinks_style.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/parentlinks_style.mdwn b/doc/tips/parentlinks_style.mdwn
index 8b95cd396..f9dfa8f55 100644
--- a/doc/tips/parentlinks_style.mdwn
+++ b/doc/tips/parentlinks_style.mdwn
@@ -6,7 +6,7 @@ a subset of a page's parents. It also provides a few bonus
 possibilities, such as styling the parent links depending on their
 place in the path.
 
-[[!toc ]]
+[[!toc levels=2]]
 
 Content
 =======
-- 
cgit v1.2.3


From daa4e3e906e746fae51df4ae05919f2666ee5290 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 8 Nov 2009 21:13:46 -0500
Subject: add a site of mine (the one that necessitated the rsync plugin)

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index af7f5409b..188330909 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -128,6 +128,7 @@ Personal sites and blogs
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 * [Weakish Jiang's Homepage](http://weakish.pigro.net)
 * [Nico Schottelius' homepage](http://www.nico.schottelius.org)
+* [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 34f41bb8cb6cdc03ecc0d7ac350bbe3f7f874e7f Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 8 Nov 2009 21:15:54 -0500
Subject: whoops, it's an organization

---
 doc/ikiwikiusers.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 188330909..acb63be39 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,6 +47,7 @@ Projects & Organizations
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
 * [The XCB library](http://xcb.freedesktop.org/)
+* [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
 
 Personal sites and blogs
 ========================
@@ -128,7 +129,6 @@ Personal sites and blogs
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 * [Weakish Jiang's Homepage](http://weakish.pigro.net)
 * [Nico Schottelius' homepage](http://www.nico.schottelius.org)
-* [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 52e5810c603ddb23690f259aa0f7743d69af05d6 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Mon, 9 Nov 2009 00:13:09 -0500
Subject: yay

---
 doc/bugs/pages_missing_top-level_directory.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/pages_missing_top-level_directory.mdwn b/doc/bugs/pages_missing_top-level_directory.mdwn
index b32ab1e0c..77c31cd27 100644
--- a/doc/bugs/pages_missing_top-level_directory.mdwn
+++ b/doc/bugs/pages_missing_top-level_directory.mdwn
@@ -73,3 +73,6 @@ I don't know if it's related to the fact that I have one ikiwiki install under a
 >>>> 
 >>>> Ikiwiki's standard page templates do not contain this base tag, so
 >>>> I guess your customised templates are broken. --[[Joey]] [[done]]
+
+>>>>> I totally forgot about that tag... good catch. I was thinking it was my template that was broken, since yesterday, but I couldn't see what. Thank you very much for your eyes.
+
-- 
cgit v1.2.3


From 73a296732149d20f9f03d6b8c9177733bea7b619 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 9 Nov 2009 10:15:48 -0500
Subject: *now* you want to look at indexpages ;-)

---
 doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index 3084f764c..a8d04a0ad 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -82,3 +82,9 @@ Can ikiwiki be instructed map foo/index.html to page foo instead that foo/index?
 > If you don't already have a foo.html in your source, why not just rename foo/index.html to foo.html? With usedirs, it will then map to foo/index.html. Before, you had 'foo/' and 'foo/index.html' as working URLS, and they will work after too. 
 > 
 > If you did have a foo.html and a foo/index.html, hmm, that's a tricky one. -- [[Jon]]
+
+> We may be going round in circles - that's what indexpages => 1 does :-)
+> See the table I constructed above, which explains the mapping from input
+> files to abstract page names, and then the mapping from abstract page
+> names to output files. (I personally think that moving your source pages
+> around like Jon suggested is a better solution, though. --[[smcv]]
-- 
cgit v1.2.3


From 1fec2fdd20f04bae4f48980e04681bfa608db99e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 9 Nov 2009 13:12:14 -0500
Subject: add a pointer to meta

---
 doc/css.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/css.mdwn b/doc/css.mdwn
index 5b6b9e1af..20790b3d1 100644
--- a/doc/css.mdwn
+++ b/doc/css.mdwn
@@ -3,7 +3,7 @@
 ## Using CSS with ikiwiki
 
 Ikiwiki comes with two CSS stylesheets: [[style.css]] and [[local.css]].
-The idea is to customize the second one overriding the first one and
+The idea is to customize the second one, overriding the first one and
 defining brand new rendering rules.
 
 While ikiwiki's default use of stylesheets is intentionally quite plain and
@@ -11,3 +11,8 @@ minimalistic, CSS allows creating any kind of look you can dream up.
 
 The [[css_market]] page is an attempt to collect user contributed local.css
 files.
+
+## Per-page CSS
+
+The [[plugins/meta]] plugin can be used to add additional style sheets to a
+page.
-- 
cgit v1.2.3


From 9f0931ce21e5f58e2e9de0ef302beca08b8f9177 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 9 Nov 2009 13:32:08 -0500
Subject: localstyle: New plugin, allows overrding the toplevel local.css with
 one that is closer to a page.

I chose not to have it override style.css, because style.css is not really
intended to be edited; the one from the underlay is intended to be used as
a base that local.css overrides.

I chose to use a plugin rather than changing the default behavior, both
because I didn't want to have to worry about possibly breaking backwards
compatability (though this seems unlikely), and because it seemed cleaner
to not include style template parameters in the main page template code.

I suppose someone might want a way to not override the toplevel
local.css, but instead include it as well as foo/local.css. Probably the
best way to do that would be to have foo/local.css @import ../local.css
(modulo browser compatability issues). Alternatively, edit page.tmpl
to always include the toplevel local.css, or swap out this plugin for
another one.
---
 IkiWiki/Plugin/localstyle.pm | 35 +++++++++++++++++++++++++++++++++++
 debian/changelog             |  2 ++
 doc/css.mdwn                 |  3 +++
 doc/plugins/localstyle.mdwn  | 12 ++++++++++++
 templates/page.tmpl          |  5 +++++
 5 files changed, 57 insertions(+)
 create mode 100644 IkiWiki/Plugin/localstyle.pm
 create mode 100644 doc/plugins/localstyle.mdwn

diff --git a/IkiWiki/Plugin/localstyle.pm b/IkiWiki/Plugin/localstyle.pm
new file mode 100644
index 000000000..111f4dc30
--- /dev/null
+++ b/IkiWiki/Plugin/localstyle.pm
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+
+package IkiWiki::Plugin::localstyle;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "localstyle", call => \&getsetup);
+	hook(type => "pagetemplate", id => "localstyle", call => \&pagetemplate);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+}
+
+sub pagetemplate (@) {
+	my %params=@_;
+	
+	my $template=$params{template};
+	
+	if ($template->query(name => "local_css")) {
+		my $best=bestlink($params{page}, 'local.css');
+		if ($best) {
+			$template->param(local_css => $best);
+		}
+	}
+}
+
+1
diff --git a/debian/changelog b/debian/changelog
index 6a5ae30ab..4ab63f175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
     the template is filled out. This improves the search plugin's indexing,
     since it will not include navigational elements from the page template
     or sidebar.
+  * localstyle: New plugin, allows overrding the toplevel local.css
+    with one that is closer to a page.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
 
diff --git a/doc/css.mdwn b/doc/css.mdwn
index 20790b3d1..29a335596 100644
--- a/doc/css.mdwn
+++ b/doc/css.mdwn
@@ -16,3 +16,6 @@ files.
 
 The [[plugins/meta]] plugin can be used to add additional style sheets to a
 page.
+
+The [[plugins/localstyle]] plugin can be used to override the toplevel
+[[local.css]] for a whole section of the wiki.
diff --git a/doc/plugins/localstyle.mdwn b/doc/plugins/localstyle.mdwn
new file mode 100644
index 000000000..70a909d68
--- /dev/null
+++ b/doc/plugins/localstyle.mdwn
@@ -0,0 +1,12 @@
+[[!template id=plugin name=localstyle author="[[Joey]]"]]
+[[!tag type/chrome]]
+
+This plugin allows styling different sections of a wiki using different
+versions of the local.css [[CSS]] file. Normally this file is read from the
+top level of the wiki, but with this plugin enabled, standard
+[[ikiwiki/subpage/LinkingRules]] are used to find the closest local.css
+file to each page.
+
+So, for example, to use different styling for page `foo`, as well as all
+of its [[SubPages|ikiwiki/subpage]], such as `foo/bar`, create a
+`foo/local.css`.
diff --git a/templates/page.tmpl b/templates/page.tmpl
index e71ba316d..0e73463ec 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -7,8 +7,13 @@
 <TMPL_IF NAME="FAVICON">
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
+<TMPL_IF NAME="STYLE_CSS">
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
+<TMPL_IF NAME="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>
 <TMPL_IF NAME="EDITURL">
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
-- 
cgit v1.2.3


From 76d72e9bdd983ca05d84bef158644ff009931e31 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 9 Nov 2009 13:47:37 -0500
Subject: more portable use of sed -i

Apparently OS X requires the extension be specified. But this
turns on backup in GNU sed, so have to remove that.
---
 Makefile.PL | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index 474098814..462f7364d 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -44,7 +44,8 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki
 	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
 	./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
 	$(MAKE) -C po
-	sed -i "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
+	sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
+	rm -f ikiwiki.spec.bkp
 	
 docwiki: ikiwiki.out
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
-- 
cgit v1.2.3


From 7dc357a6db55873d02a52ab7fbc451e5192fa5cb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 9 Nov 2009 14:42:18 -0500
Subject: typo

---
 templates/page.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 0e73463ec..968066a19 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -7,7 +7,6 @@
 <TMPL_IF NAME="FAVICON">
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
-<TMPL_IF NAME="STYLE_CSS">
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
 <TMPL_IF NAME="LOCAL_CSS">
 <link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
-- 
cgit v1.2.3


From 92a6f2e5e88b513ceaa1b9083ddbf6e928122893 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 10 Nov 2009 00:50:59 -0500
Subject: httpauth: Add cgiauthurl setting that can be used to do http basic
 auth only when ikiwiki needs authentication, rather than for any access to 
 the cgi/wiki.

---
 IkiWiki/Plugin/httpauth.pm | 11 +++++++++++
 debian/changelog           |  3 +++
 doc/plugins/httpauth.mdwn  | 24 ++++++++++++++++++++----
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 1816c9d74..bbfff859a 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -17,6 +17,13 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 0,
 		},
+		cgiauthurl => {
+			type => "string",
+			example => "ttp://example.com/wiki/auth/ikiwiki.cgi",
+			description => "url to redirect to when authentication is needed",
+			safe => 1,
+			rebuild => 0,
+		},
 }
 
 sub auth ($$) {
@@ -26,6 +33,10 @@ sub auth ($$) {
 	if (defined $cgi->remote_user()) {
 		$session->param("name", $cgi->remote_user());
 	}
+	elsif (defined $config{cgiauthurl}) {
+		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+		exit;
+	}
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index 4ab63f175..1a703b11f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
     or sidebar.
   * localstyle: New plugin, allows overrding the toplevel local.css
     with one that is closer to a page.
+  * httpauth: Add cgiauthurl setting that can be used to do http basic auth
+    only when ikiwiki needs authentication, rather than for any access to 
+    the cgi/wiki.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
 
diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index 11ed223e7..77796a3d7 100644
--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@@ -2,8 +2,24 @@
 [[!tag type/auth]]
 
 This plugin allows HTTP basic authentication to be used to log into the
-wiki. To use the plugin, your web server should be set up to perform HTTP
-basic authentiation for at least the directory containing `ikiwiki.cgi`. 
-The authenticated user will be automatically signed into the wiki.
+wiki. 
 
-This plugin is included in ikiwiki, but is not enabled by default.
+## fully authenticated wiki
+
+One way to use the plugin is to configure your web server to require
+HTTP basic authentication for any access to the directory containing the
+wiki (and `ikiwiki.cgi`). The authenticated user will be automatically
+signed into the wiki. This method is suitable only for private wikis.
+
+## separate cgiauthurl
+
+To use httpauth for a wiki where the content is public, and where
+the `ikiwiki.cgi` needs to be usable without authentication (for searching
+and so on), you can configure a separate url that is used for
+authentication, via the `cgiauthurl` option in the setup file. This
+url will then be redirected to whenever authentication is needed.
+
+A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi` 
+into it. Then configure the web server to require authentication only for
+access to the `auth` subdirectory. Then `cgiauthurl` is pointed at this
+symlink.
-- 
cgit v1.2.3


From 8ec53967c13894ba7a550550c57f1f5d575f0d69 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 10 Nov 2009 00:53:34 -0500
Subject: typo

---
 IkiWiki/Plugin/httpauth.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index bbfff859a..127c321f0 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -19,7 +19,7 @@ sub getsetup () {
 		},
 		cgiauthurl => {
 			type => "string",
-			example => "ttp://example.com/wiki/auth/ikiwiki.cgi",
+			example => "http://example.com/wiki/auth/ikiwiki.cgi",
 			description => "url to redirect to when authentication is needed",
 			safe => 1,
 			rebuild => 0,
-- 
cgit v1.2.3


From c13dc4366c14eca6ee9454b284c32ca2b2dc5b12 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Tue, 10 Nov 2009 16:24:57 +0000
Subject: half-formed thoughts

---
 doc/users/jon.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index ab71426d5..922a20ab9 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -38,3 +38,10 @@ The following I have been looking at, but are on the back-burner:
 * a system for [[forum/managing_todo_lists]] (see also
   [[todo/interactive todo lists]] and <http://dev.jmtd.net/outliner/> for the
   current WIP).
+
+Finally, the following are merely half-formed thoughts:
+
+ * adding and removing tags to pages via the edit form by ticking and
+   unticking checkboxes next to a tag name (rather than entering the 
+   directive into the text of the page directly)
+ * perhaps the same for meta
-- 
cgit v1.2.3


From be6b1c43d06a9022ab7cf88973d18e16645696ef Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Tue, 10 Nov 2009 16:33:01 +0000
Subject: another back-burner todo item

---
 doc/users/jon.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 922a20ab9..2fea7b4f6 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -38,6 +38,10 @@ The following I have been looking at, but are on the back-burner:
 * a system for [[forum/managing_todo_lists]] (see also
   [[todo/interactive todo lists]] and <http://dev.jmtd.net/outliner/> for the
   current WIP).
+* a `tag2` plugin, which does the same thing as [[plugins/tag]], but
+  does not sit on top of [[ikiwiki/wikilink]]s, so does not result in
+  bugs such as [[bugs/tagged() matching wikilinks]]. Code for this lives
+  in my github `tag2` branch: <http://github.com/jmtd/ikiwiki>
 
 Finally, the following are merely half-formed thoughts:
 
-- 
cgit v1.2.3


From 35319202724cbca495b13143b85578b892de0d05 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 9 Nov 2009 21:04:05 +0000
Subject: comment about patch version

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 20c8c02ac..18508255e 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -107,3 +107,25 @@ definitions essentially.
      * title
 
 -- [[Jon]]
+
+>> Ok, I've had a bit of a think about this. There are currently 15 supported
+>> meta fields. Of these: title, licence, copyright, author, authorurl,
+>> and robots might make sense to define globally and override on a per-page
+>> basis.
+>> 
+>> Less so, description (due to its impact on map); openid (why would
+>> someone want more than one URI to act as an openid endpoint, delegating
+>> to the same place?); updated.
+>> 
+>> Not useful are permalink, date, stylesheet (you already have a global
+>> stylesheet), link, redir, guid, updated.
+>>
+>> In other words, the limitations of my first patch that [[smcv]] outlined
+>> are only relevant to defined fields that you wouldn't want to specify a
+>> global default for anyway.
+>>
+>> Due to this, and the added complexity of the second patch (having to adjust
+>> `IkiWiki/Setup.pm`), I think the first patch makes more sense. I've thus
+>> reverted to it here.
+>> 
+>> --[[Jon]]
-- 
cgit v1.2.3


From 6fead140d810c5e5e90b1be6fb9d1ada97a96ab8 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 9 Nov 2009 21:05:32 +0000
Subject: adjustments to my comment

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 18508255e..9da0dddf8 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -114,11 +114,12 @@ definitions essentially.
 >> basis.
 >> 
 >> Less so, description (due to its impact on map); openid (why would
->> someone want more than one URI to act as an openid endpoint, delegating
->> to the same place?); updated.
+>> someone want more than one URI to act as an openid endpoint to the same
+>> place?); updated. I can almost see why someone might want to set a global
+>> updated value. Almost.
 >> 
 >> Not useful are permalink, date, stylesheet (you already have a global
->> stylesheet), link, redir, guid, updated.
+>> stylesheet), link, redir, and guid.
 >>
 >> In other words, the limitations of my first patch that [[smcv]] outlined
 >> are only relevant to defined fields that you wouldn't want to specify a
-- 
cgit v1.2.3


From 31244492a5350dfce50d15d98841b358da41ffa8 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 9 Nov 2009 21:08:00 +0000
Subject: restore my original patch

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 50 ++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 9da0dddf8..8b9c3dca9 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -128,5 +128,51 @@ definitions essentially.
 >> Due to this, and the added complexity of the second patch (having to adjust
 >> `IkiWiki/Setup.pm`), I think the first patch makes more sense. I've thus
 >> reverted to it here.
->> 
->> --[[Jon]]
+
+    diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
+    index b229592..3132257 100644
+    --- a/IkiWiki/Plugin/meta.pm
+    +++ b/IkiWiki/Plugin/meta.pm
+    @@ -13,6 +13,7 @@ sub import {
+     	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
+     	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
+     	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
+    +	hook(type => "scan", id => "meta", call => \&scan);
+     }
+     
+     sub getsetup () {
+    @@ -302,6 +303,15 @@ sub match {
+     	}
+     }
+     
+    +sub scan() {
+    +	my %params = @_;
+    +	my $page = $params{page};
+    +    foreach my $type (map { s/^meta_//; $_ } grep /^meta_/, keys %config) {
+    +		$pagestate{$page}{meta}{$type} = $config{"meta_$type"}
+    +			unless defined $pagestate{$page}{meta}{$type};
+    +	}
+    +}
+    +
+     package IkiWiki::PageSpec;
+     
+     sub match_title ($$;@) {
+    diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
+    index 000f461..200c4b2 100644
+    --- a/doc/ikiwiki/directive/meta.mdwn
+    +++ b/doc/ikiwiki/directive/meta.mdwn
+    @@ -12,6 +12,12 @@ also specifies some additional sub-parameters.
+     The field values are treated as HTML entity-escaped text, so you can include
+     a quote in the text by writing `&quot;` and so on.
+     
+    +You can also define site-wide defaults for meta values by including them
+    +in your setup file, e.g.
+    +
+    +	meta_copyright => "Copyright 2007 by Joey Hess",
+    +	meta_license   => "GPL v2+",
+    +
+     Supported fields:
+     
+     * title
+
+-- [[Jon]]
-- 
cgit v1.2.3


From beb8c7444e97320a1757ccbfa21602beb34fc243 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Wed, 11 Nov 2009 19:06:00 +0000
Subject: is this merge-worthy?

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 8b9c3dca9..62317ba1a 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -128,6 +128,8 @@ definitions essentially.
 >> Due to this, and the added complexity of the second patch (having to adjust
 >> `IkiWiki/Setup.pm`), I think the first patch makes more sense. I've thus
 >> reverted to it here.
+>>
+>> Is this merge-worthy?
 
     diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
     index b229592..3132257 100644
-- 
cgit v1.2.3


From ac61907a6251639e7235f5baf653b04626009d35 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon+ikiwiki@alcopop.org>
Date: Wed, 11 Nov 2009 19:12:37 +0000
Subject: another possible commit name

---
 doc/users/jon.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 2fea7b4f6..f482c6967 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -5,6 +5,7 @@ sysadmins.
 
 * my edits should appear either as 'Jon' (if I've used
   [[tips/untrusted_git_push]]); 'jmtd.net', 'jmtd.livejournal.com', 
+  'jmtd' if I've forgotten to set my local git config properly,
   or once upon a time 'alcopop.org/me/openid/' or 'jondowland'.
 * My [homepage](http://jmtd.net/) is powered by ikiwiki
 
-- 
cgit v1.2.3


From 2761faeb5a9620ee506f7e8f1b2090c9b4bf1ef2 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon+ikiwiki@alcopop.org>
Date: Wed, 11 Nov 2009 19:14:18 +0000
Subject: a user page redir. not sure which is worse: polluting users/ with
 redirects, or broken links on /recentchanges.

---
 doc/users/jmtd.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/jmtd.mdwn

diff --git a/doc/users/jmtd.mdwn b/doc/users/jmtd.mdwn
new file mode 100644
index 000000000..a816baf6f
--- /dev/null
+++ b/doc/users/jmtd.mdwn
@@ -0,0 +1 @@
+[[!meta redir=users/jon]]
-- 
cgit v1.2.3


From 797ef6f61aced20d0553f748bbe3d04fd9305df9 Mon Sep 17 00:00:00 2001
From: diannetyron <diannetyron@web>
Date: Thu, 12 Nov 2009 00:12:10 -0500
Subject:

---
 doc/index.mdwn | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..8b1378917 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,28 +1 @@
-Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
-suitable for publishing on a website. Ikiwiki stores pages and history in a
-[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
-There are many other [[features]], including support for
-[[blogging|blog]], as well as a large array of [[plugins]].
 
-[[!template id=links]]
-
-## using ikiwiki
-
-[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
-[[man_page|usage]]. There are some [[examples]] of things you can do
-with ikiwiki, and some [[tips]].
-
-All wikis are supposed to have a [[SandBox]], so this one does too.
-
-This site generally runs the latest release of ikiwiki; currently, it runs
-ikiwiki [[!version ]].
-
-## developer resources
-
-The [[RoadMap]] describes where the project is going.
-The [[forum]] is open for discussions.
-[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
-can be submitted and tracked using this wiki.
-
-ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]].
-- 
cgit v1.2.3


From 5d040714649e905927cc0ed71edca0875a4e49d8 Mon Sep 17 00:00:00 2001
From: diannetyron <diannetyron@web>
Date: Thu, 12 Nov 2009 00:19:28 -0500
Subject:

---
 doc/index.mdwn | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 8b1378917..fa5ad37ae 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1 +1,28 @@
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages of [custom essay](http://www.superiorpapers.com/) and history in a
+[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
+There are many other [[features]], including support for
+[[blogging|blog]], as well as a large array of [[plugins]].
 
+[[!template id=links]]
+
+## using ikiwiki
+
+[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
+[[man_page|usage]]. There are some [[examples]] of things you can do
+with ikiwiki, and some [[tips]].
+
+All wikis are supposed to have a [[SandBox]], so this one does too.
+
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
+
+## developer resources
+
+The [[RoadMap]] describes where the project is going.
+The [[forum]] is open for discussions.
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
+can be submitted and tracked using this wiki.
+
+ikiwiki is developed by [[Joey]] and many contributors,
+and is [[FreeSoftware]].
-- 
cgit v1.2.3


From 91f364d02baae11e2d4d7aaa433ac7574f1fba8e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 12 Nov 2009 00:24:33 -0500
Subject: Revert spam

---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index fa5ad37ae..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,5 +1,5 @@
 Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
-suitable for publishing on a website. Ikiwiki stores pages of [custom essay](http://www.superiorpapers.com/) and history in a
+suitable for publishing on a website. Ikiwiki stores pages and history in a
 [[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
 There are many other [[features]], including support for
 [[blogging|blog]], as well as a large array of [[plugins]].
-- 
cgit v1.2.3


From 34ae4419a5846336a4cc22976eab60142949c202 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Thu, 12 Nov 2009 14:08:44 +0100
Subject: doc/bugs/img_vs_align: New.

---
 doc/bugs/img_vs_align.mdwn | 6 ++++++
 doc/users/tschwinge.mdwn   | 2 ++
 2 files changed, 8 insertions(+)
 create mode 100644 doc/bugs/img_vs_align.mdwn

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
new file mode 100644
index 000000000..9ed5e9e19
--- /dev/null
+++ b/doc/bugs/img_vs_align.mdwn
@@ -0,0 +1,6 @@
+The *[[ikiwiki/directive/img]]* directive allows for specifying an
+*align* parameter -- which is of limited usability as the image is
+embedded as `<p><img ...></p>`.  That's at least what I see on
+<http://www.bddebian.com:8888/~hurd-web/hurd/status/>.  On the other
+hand, CSS is supposed to be used instead, I guess.  (But how...  I forgot
+almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index f9eebb73a..20d8d16a8 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -69,6 +69,8 @@ contain the \[[!tag open_issue_hurd]].
 This will decrease to be relevant, as we're going to add copyright and
 licensing headers to every single file.
 
+## [[bugs/img vs align]]
+
 ## Texinfo -- [[plugins/contrib/texinfo]]
 
 Not very important.  Have to consider external commands / files / security (see
-- 
cgit v1.2.3


From ed742ab2b580cf1f1b72b5c3e5d7517dad18a3dc Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Thu, 12 Nov 2009 09:14:45 -0500
Subject: explanation: whitespace surrounding your use of the IMG tag

---
 doc/bugs/img_vs_align.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
index 9ed5e9e19..dcb9129b9 100644
--- a/doc/bugs/img_vs_align.mdwn
+++ b/doc/bugs/img_vs_align.mdwn
@@ -4,3 +4,8 @@ embedded as `<p><img ...></p>`.  That's at least what I see on
 <http://www.bddebian.com:8888/~hurd-web/hurd/status/>.  On the other
 hand, CSS is supposed to be used instead, I guess.  (But how...  I forgot
 almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
+
+> [[!img logo/ikiwiki.png align=right]]The [img tag doesn't create P tags](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=IkiWiki/Plugin/img.pm;h=32023fa97af8ba8e63192cacaff10a4677d20654;hb=HEAD), but if you have surrounded the img directive with newlines, they will result in paragraph tags.
+>
+> I've edited the URL you provided to demonstrate this -- hope you don't mind! I've also added an inline, right-aligned image to this page.[[!tag done]]
+> -- [[Jon]]
-- 
cgit v1.2.3


From 074d2c27f89693579c6e1b019a2a7b276e56be0e Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Thu, 12 Nov 2009 09:40:33 -0500
Subject: optionally customize the commit message for rename/remove

---
 doc/todo/adjust_commit_message_for_rename__44___remove.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/todo/adjust_commit_message_for_rename__44___remove.mdwn

diff --git a/doc/todo/adjust_commit_message_for_rename__44___remove.mdwn b/doc/todo/adjust_commit_message_for_rename__44___remove.mdwn
new file mode 100644
index 000000000..3d0d1aff4
--- /dev/null
+++ b/doc/todo/adjust_commit_message_for_rename__44___remove.mdwn
@@ -0,0 +1,5 @@
+When you rename or remove pages using the relevant plugins, a commit message is generated automatically by the plugin.
+
+It would be nice to provide a text field in the remove/rename form, pre-populated with the automatic message, so that a user may customize or append to the message (modulo VCS support)
+
+-- [[Jon]]
-- 
cgit v1.2.3


From 1e6200f6fc5e718381cef8a86490963f6918aa30 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Thu, 12 Nov 2009 09:41:57 -0500
Subject: +todo/ adjust commit message for rename, remove

---
 doc/users/jon.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index f482c6967..f08076c2a 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -29,6 +29,7 @@ I am mostly interested in ikiwiki usability issues:
  * [[bugs/the login page is unclear when multiple methods exist]]
  * [[bugs/backlinks onhover thing can go weird]]
  * [[todo/CSS classes for links]]
+ * [[todo/adjust commit message for rename, remove]]
 
 The following I have been looking at, but are on the back-burner:
 
-- 
cgit v1.2.3


From 5704255b8f65ebbf9d0d20926744f039816e7ca5 Mon Sep 17 00:00:00 2001
From: JeremyReed <JeremyReed@web>
Date: Thu, 12 Nov 2009 10:16:44 -0500
Subject: ask question

---
 doc/ikiwiki/pagespec/attachment/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ikiwiki/pagespec/attachment/discussion.mdwn b/doc/ikiwiki/pagespec/attachment/discussion.mdwn
index 373242b3f..abfb62edc 100644
--- a/doc/ikiwiki/pagespec/attachment/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/attachment/discussion.mdwn
@@ -13,3 +13,5 @@ I am interested for [[todo/mbox]] --[[DavidBremner]]
 >> them. --[[DavidBremner]] 
 
 >>> Done, [[plugins/filecheck]] --[[Joey]]
+
+Anyway to make it so an edit page doesn't offer the attachment capability unless it matches a specific user, is an admin, and/or is an allowed page? (For now, I have it on all pages, and then it prohibits after I submit based on the allowed_attachments.)
-- 
cgit v1.2.3


From b9f264d066bd71e5a995f339fcf25181539c9b8f Mon Sep 17 00:00:00 2001
From: JeremyReed <JeremyReed@web>
Date: Thu, 12 Nov 2009 10:23:58 -0500
Subject: fix typo

---
 doc/ikiwiki/pagespec/attachment/discussion.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/ikiwiki/pagespec/attachment/discussion.mdwn b/doc/ikiwiki/pagespec/attachment/discussion.mdwn
index abfb62edc..34f21f84a 100644
--- a/doc/ikiwiki/pagespec/attachment/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/attachment/discussion.mdwn
@@ -14,4 +14,5 @@ I am interested for [[todo/mbox]] --[[DavidBremner]]
 
 >>> Done, [[plugins/filecheck]] --[[Joey]]
 
-Anyway to make it so an edit page doesn't offer the attachment capability unless it matches a specific user, is an admin, and/or is an allowed page? (For now, I have it on all pages, and then it prohibits after I submit based on the allowed_attachments.)
+
+Any way to make it so an edit page doesn't offer the attachment capability unless it matches a specific user, is an admin, and/or is an allowed page? (For now, I have it on all pages, and then it prohibits after I submit based on the allowed_attachments.)
-- 
cgit v1.2.3


From 5ccf68f11329779f9e173355fe76bff85203a851 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 13 Nov 2009 14:56:24 -0500
Subject: inline: Do not generated feeds for nested inlines.

My experience is that when inlines are nested, the old behavior of
generating feeds for the nested inlines was never really desired. Since the
feeds were numbered sequentially, the numbers could easily change, and it did
not make sense to subscribe to or use those feeds. And generating those nested
feeds often meant a lot of unnecessary calculation, and data being written.
So, I dropped them.

Looking back, nested feeds originally were a free side effect of properly
handing multiple feeds on one page. Of course, that is still supported.
---
 IkiWiki/Plugin/inline.pm | 2 +-
 debian/changelog         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 942df6f89..001d2ed1a 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -159,7 +159,7 @@ sub preprocess_inline (@) {
 	my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
 	my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
 	my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
-	my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
+	my $feeds=! $nested && (exists $params{feeds} ? yesno($params{feeds}) : !$quick);
 	my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1;
 	my $feedonly=yesno($params{feedonly});
 	if (! exists $params{show} && ! $archive) {
diff --git a/debian/changelog b/debian/changelog
index 1a703b11f..5a2d94e23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
   * httpauth: Add cgiauthurl setting that can be used to do http basic auth
     only when ikiwiki needs authentication, rather than for any access to 
     the cgi/wiki.
+  * inline: Do not generated feeds for nested inlines.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
 
-- 
cgit v1.2.3


From ad303e878e65c72bf31eb676ced866be56bbee91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 13 Nov 2009 15:10:58 -0500
Subject: inline: Allow direct inclusion of non-page files in raw mode.

---
 IkiWiki/Plugin/inline.pm                            | 6 +++++-
 debian/changelog                                    | 1 +
 doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 001d2ed1a..8e7fa9958 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -337,7 +337,7 @@ sub preprocess_inline (@) {
 		foreach my $page (@list) {
 			my $file = $pagesources{$page};
 			my $type = pagetype($file);
-			if (! $raw || ($raw && ! defined $type)) {
+			if (! $raw) {
 				if ($needcontent) {
 					# Get the content before populating the
 					# template, since getting the content uses
@@ -391,6 +391,10 @@ sub preprocess_inline (@) {
 					      filter($page, $params{destpage},
 					      readfile(srcfile($file)))));
 				}
+				else {
+					$ret.="\n".
+					      readfile(srcfile($file));
+				}
 			}
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index 5a2d94e23..b25651f42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
     only when ikiwiki needs authentication, rather than for any access to 
     the cgi/wiki.
   * inline: Do not generated feeds for nested inlines.
+  * inline: Allow direct inclusion of non-page files in raw mode.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
 
diff --git a/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
index 814074e08..e43540c65 100644
--- a/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
+++ b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
@@ -17,3 +17,11 @@ this situation.
 
 If we explicitely don't want to allow raw inlining of unknown page
 types, ikiwiki should output a better error message.
+
+> I have made it just do a direct include if the page type is not known, in
+> raw mode. That seems useful if you want to include some other file right
+> into a page. You could probably even wrap it in a format directive.
+> 
+> It does allow including binary files right into a page, but nothing is
+> stopping you pasting binary data right into the edit form either, so
+> while annoying I don't think that will be a security problem. --[[Joey]] 
-- 
cgit v1.2.3


From 2bd6ebb42ce3e7a91866f6731563926b09e7806f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 13 Nov 2009 15:31:34 -0500
Subject: move to todo item, some thoughtS

---
 doc/ikiwiki/pagespec/attachment/discussion.mdwn    |  3 ---
 ...avoid_attachement_ui_if_upload_not_allowed.mdwn | 25 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 doc/todo/avoid_attachement_ui_if_upload_not_allowed.mdwn

diff --git a/doc/ikiwiki/pagespec/attachment/discussion.mdwn b/doc/ikiwiki/pagespec/attachment/discussion.mdwn
index 34f21f84a..373242b3f 100644
--- a/doc/ikiwiki/pagespec/attachment/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/attachment/discussion.mdwn
@@ -13,6 +13,3 @@ I am interested for [[todo/mbox]] --[[DavidBremner]]
 >> them. --[[DavidBremner]] 
 
 >>> Done, [[plugins/filecheck]] --[[Joey]]
-
-
-Any way to make it so an edit page doesn't offer the attachment capability unless it matches a specific user, is an admin, and/or is an allowed page? (For now, I have it on all pages, and then it prohibits after I submit based on the allowed_attachments.)
diff --git a/doc/todo/avoid_attachement_ui_if_upload_not_allowed.mdwn b/doc/todo/avoid_attachement_ui_if_upload_not_allowed.mdwn
new file mode 100644
index 000000000..487915850
--- /dev/null
+++ b/doc/todo/avoid_attachement_ui_if_upload_not_allowed.mdwn
@@ -0,0 +1,25 @@
+Any way to make it so an edit page doesn't offer the attachment capability
+unless it matches a specific user, is an admin, and/or is an allowed page?
+(For now, I have it on all pages, and then it prohibits after I submit
+based on the allowed_attachments.)
+
+> To do that, ikiwiki would have to try to match the `allowed_attachments`
+> pagespec against a sort of dummy upload to the current page. Then if it
+> failed, assume all real uploads would fail. Now consider a pagespec like
+> "user(joey) and mimetype(audio/mpeg)" -- it'd be hard to make a dummy
+> upload to test this pagespec against.
+> 
+> So, there would need to be some sort of test mode, where terms like
+> `mimetype()` always succeed. But then consider a pagespec like
+> "user(joey) and !mimetype(video/mpeg)" -- if mimetype succeeds, this
+> fails.
+> 
+> So, maybe we can instead just filter out all the pagespec terms aside
+> from `user()`, `ip()`, and `admin()`. Transforming that into just
+> "user(joey)", which would succeed in the test.
+> 
+> That'd work, I guess. Pulling a pagespec apart, filtering out terms, and
+> putting it back together is nontrivial, but doable.
+> 
+> Other approach would be to have a separate pagespec that explicitly
+> controlls what pages to show the attachment UI on. --[[Joey]] 
-- 
cgit v1.2.3


From 2a7e8921d5ace6ca6a053e964d459f5190fc552b Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Fri, 13 Nov 2009 17:14:54 -0500
Subject: new bug

---
 doc/bugs/inline_skip_causes_empty_inline.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/bugs/inline_skip_causes_empty_inline.mdwn

diff --git a/doc/bugs/inline_skip_causes_empty_inline.mdwn b/doc/bugs/inline_skip_causes_empty_inline.mdwn
new file mode 100644
index 000000000..8a4559360
--- /dev/null
+++ b/doc/bugs/inline_skip_causes_empty_inline.mdwn
@@ -0,0 +1 @@
+When using the [[directive/inline]] directive with the skip parameter i get emtpy list inline (no output at all). The same inline used to work before but not in 3.20091031.
-- 
cgit v1.2.3


From 956efcfac26bca9f5c00a18efa084881d49f6fae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 13 Nov 2009 17:35:13 -0500
Subject: cannot reproduce

---
 doc/bugs/inline_skip_causes_empty_inline.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/inline_skip_causes_empty_inline.mdwn b/doc/bugs/inline_skip_causes_empty_inline.mdwn
index 8a4559360..b2fce224e 100644
--- a/doc/bugs/inline_skip_causes_empty_inline.mdwn
+++ b/doc/bugs/inline_skip_causes_empty_inline.mdwn
@@ -1 +1,6 @@
-When using the [[directive/inline]] directive with the skip parameter i get emtpy list inline (no output at all). The same inline used to work before but not in 3.20091031.
+When using the [[directive/inline]] directive with the skip parameter i get
+emtpy list inline (no output at all). The same inline used to work before
+but not in 3.20091031.
+
+> I need more information to help. Skip is working as expected here.
+> Can I download/clone your wiki? --[[Joey]] 
-- 
cgit v1.2.3


From e062693632777b8f3c3fdd2b2b6079a11a95a693 Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Fri, 13 Nov 2009 19:00:13 -0500
Subject: repoduced it ... sorry should have pasted this earlier

---
 doc/bugs/inline_skip_causes_empty_inline.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/inline_skip_causes_empty_inline.mdwn b/doc/bugs/inline_skip_causes_empty_inline.mdwn
index b2fce224e..6ee1e601b 100644
--- a/doc/bugs/inline_skip_causes_empty_inline.mdwn
+++ b/doc/bugs/inline_skip_causes_empty_inline.mdwn
@@ -4,3 +4,7 @@ but not in 3.20091031.
 
 > I need more information to help. Skip is working as expected here.
 > Can I download/clone your wiki? --[[Joey]] 
+
+>> The bug occurs only together with archive="yes" as I Just found out:
+
+[[!inline pages="news/*" archive="yes" feeds="no" skip=3]]
-- 
cgit v1.2.3


From d8cfd8d431bd3ec44152944f0b8418bbab6b7920 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 13 Nov 2009 20:50:27 -0500
Subject: inline: Fix display of all pages when archive=yes or show=0 are used.

---
 IkiWiki/Plugin/inline.pm                      | 4 ++--
 debian/changelog                              | 1 +
 doc/bugs/inline_skip_causes_empty_inline.mdwn | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8e7fa9958..f89209a1b 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -212,7 +212,7 @@ sub preprocess_inline (@) {
 		if ($params{feedshow} && $num < $params{feedshow}) {
 			$num=$params{feedshow};
 		}
-		if ($params{skip}) {
+		if ($params{skip} && $num) {
 			$num+=$params{skip};
 		}
 
@@ -221,7 +221,7 @@ sub preprocess_inline (@) {
 			filter => sub { $_[0] eq $params{page} },
 			sort => exists $params{sort} ? $params{sort} : "age",
 			reverse => yesno($params{reverse}),
-			num => $num,
+			($num ? (num => $num) : ()),
 		);
 	}
 
diff --git a/debian/changelog b/debian/changelog
index b25651f42..c96919252 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
     the cgi/wiki.
   * inline: Do not generated feeds for nested inlines.
   * inline: Allow direct inclusion of non-page files in raw mode.
+  * inline: Fix display of all pages when archive=yes or show=0 are used.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
 
diff --git a/doc/bugs/inline_skip_causes_empty_inline.mdwn b/doc/bugs/inline_skip_causes_empty_inline.mdwn
index 6ee1e601b..e1cbc5470 100644
--- a/doc/bugs/inline_skip_causes_empty_inline.mdwn
+++ b/doc/bugs/inline_skip_causes_empty_inline.mdwn
@@ -7,4 +7,4 @@ but not in 3.20091031.
 
 >> The bug occurs only together with archive="yes" as I Just found out:
 
-[[!inline pages="news/*" archive="yes" feeds="no" skip=3]]
+>>> Thanks, [[fixed|done]] in git. --[[Joey]] 
-- 
cgit v1.2.3


From 6edd00e9a47116babe2a3addd81d1afb24c3c4d5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 13 Nov 2009 22:11:42 -0500
Subject: releasing version 3.20091113

---
 debian/changelog     | 4 ++--
 doc/quotes/sold.mdwn | 3 +++
 ikiwiki.spec         | 2 +-
 po/ikiwiki.pot       | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 doc/quotes/sold.mdwn

diff --git a/debian/changelog b/debian/changelog
index c96919252..ad80d37b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20091032) UNRELEASED; urgency=low
+ikiwiki (3.20091113) unstable; urgency=low
 
   * underlay: Fix example values put in setup file to be array
     references.
@@ -17,7 +17,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low
   * inline: Allow direct inclusion of non-page files in raw mode.
   * inline: Fix display of all pages when archive=yes or show=0 are used.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 06 Nov 2009 12:04:29 -0500
+ -- Joey Hess <joeyh@debian.org>  Fri, 13 Nov 2009 20:51:57 -0500
 
 ikiwiki (3.20091031) unstable; urgency=low
 
diff --git a/doc/quotes/sold.mdwn b/doc/quotes/sold.mdwn
new file mode 100644
index 000000000..4bd021f74
--- /dev/null
+++ b/doc/quotes/sold.mdwn
@@ -0,0 +1,3 @@
+I'm totally sold on ikiwiki now.
+
+-- Anna Hess
diff --git a/ikiwiki.spec b/ikiwiki.spec
index f7f96a0d0..491c69a8d 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20091031
+Version: 3.20091113
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 45dd49d01..65ee22fb1 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2009-11-13 20:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -436,7 +436,7 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:602
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
-- 
cgit v1.2.3


From df06b9201c298b03cf36ffa8223087157b1c573d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 13 Nov 2009 22:13:05 -0500
Subject: add news item for ikiwiki 3.20091113

---
 doc/news/version_3.20091009.mdwn | 14 --------------
 doc/news/version_3.20091113.mdwn | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 14 deletions(-)
 delete mode 100644 doc/news/version_3.20091009.mdwn
 create mode 100644 doc/news/version_3.20091113.mdwn

diff --git a/doc/news/version_3.20091009.mdwn b/doc/news/version_3.20091009.mdwn
deleted file mode 100644
index 9ab1299b9..000000000
--- a/doc/news/version_3.20091009.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-ikiwiki 3.20091009 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * parentlinks: Add has\_parentlinks template parameter to allow styling
-     the toplevel index differently etc.
-   * img: Correct bug in image size calculation code.
-   * img: Fix dependency code for full size images.
-   * toggle, relativedate: Support templates that add attributes
-     to the body tag.
-   * Support RPC::XML 0.69's incompatible object instantiation method.
-   * mirrorlist: Display nothing if list is empty.
-   * Fix a bug that could lead to duplicate links being recorded
-     for tags.
-   * Optimize away most expensive file prune calls, when refreshing,
-     by only checking new files."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091113.mdwn b/doc/news/version_3.20091113.mdwn
new file mode 100644
index 000000000..f313b57d1
--- /dev/null
+++ b/doc/news/version_3.20091113.mdwn
@@ -0,0 +1,18 @@
+ikiwiki 3.20091113 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * underlay: Fix example values put in setup file to be array
+     references.
+   * underlay: Avoid crashing if lists of underlays (or template
+     directories) are not configured.
+   * Moved the postscan hook to run on the raw html of a page, before
+     the template is filled out. This improves the search plugin's indexing,
+     since it will not include navigational elements from the page template
+     or sidebar.
+   * localstyle: New plugin, allows overrding the toplevel local.css
+     with one that is closer to a page.
+   * httpauth: Add cgiauthurl setting that can be used to do http basic auth
+     only when ikiwiki needs authentication, rather than for any access to
+     the cgi/wiki.
+   * inline: Do not generated feeds for nested inlines.
+   * inline: Allow direct inclusion of non-page files in raw mode.
+   * inline: Fix display of all pages when archive=yes or show=0 are used."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 65077372fab1e6fa30c3d143e4c68123557d8441 Mon Sep 17 00:00:00 2001
From: "http://www.openid.albertlash.com/openid/"
 <http://www.openid.albertlash.com/openid/@web>
Date: Sat, 14 Nov 2009 14:34:52 -0500
Subject: missing apostrophe in python code

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index ab6984494..e57144109 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -38,7 +38,7 @@ to adjust this script too:
     anchors = pagetable.getElementsByTagName("a")
     for a in anchors:
         print a.firstChild.toxml().\
-            replace('&amp;,'&').\
+            replace('&amp;','&').\
             replace('&lt;','<').\
             replace('&gt;','>')
 
-- 
cgit v1.2.3


From 7b2571adf4ebe989043b9609b0c42ca96eada71d Mon Sep 17 00:00:00 2001
From: "http://www.openid.albertlash.com/openid/"
 <http://www.openid.albertlash.com/openid/@web>
Date: Sat, 14 Nov 2009 14:36:54 -0500
Subject: import sys and sys.argv

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index e57144109..45df683de 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -30,9 +30,10 @@ that this script is sensitive to the specific markup used on the page, so if
 you have tweaked your mediawiki theme a lot from the original, you will need
 to adjust this script too:
 
+    import sys
     from xml.dom.minidom import parse, parseString
     
-    dom = parse(argv[1])
+    dom = parse(sys.argv[1])
     tables = dom.getElementsByTagName("table")
     pagetable = tables[-1]
     anchors = pagetable.getElementsByTagName("a")
-- 
cgit v1.2.3


From 88a217598d1254774f611f1878883083289606f1 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Sun, 15 Nov 2009 00:33:28 +0100
Subject: Improve img's documentation.

Jon is right, of course.  User error, not an ikiwiki bug.  So, I removed the
false bug report and added its gist to img's documentation.
---
 doc/bugs/img_vs_align.mdwn     | 11 -----------
 doc/ikiwiki/directive/img.mdwn |  6 ++++++
 2 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 doc/bugs/img_vs_align.mdwn

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
deleted file mode 100644
index dcb9129b9..000000000
--- a/doc/bugs/img_vs_align.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-The *[[ikiwiki/directive/img]]* directive allows for specifying an
-*align* parameter -- which is of limited usability as the image is
-embedded as `<p><img ...></p>`.  That's at least what I see on
-<http://www.bddebian.com:8888/~hurd-web/hurd/status/>.  On the other
-hand, CSS is supposed to be used instead, I guess.  (But how...  I forgot
-almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
-
-> [[!img logo/ikiwiki.png align=right]]The [img tag doesn't create P tags](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=IkiWiki/Plugin/img.pm;h=32023fa97af8ba8e63192cacaff10a4677d20654;hb=HEAD), but if you have surrounded the img directive with newlines, they will result in paragraph tags.
->
-> I've edited the URL you provided to demonstrate this -- hope you don't mind! I've also added an inline, right-aligned image to this page.[[!tag done]]
-> -- [[Jon]]
diff --git a/doc/ikiwiki/directive/img.mdwn b/doc/ikiwiki/directive/img.mdwn
index 94cc754bd..b847aa239 100644
--- a/doc/ikiwiki/directive/img.mdwn
+++ b/doc/ikiwiki/directive/img.mdwn
@@ -22,6 +22,12 @@ You can also pass `alt`, `title`, `class`, `align` and `id` parameters.
 These are passed through unchanged to the html img tag. If you include a
 `caption` parameter, the caption will be displayed centered beneath the image.
 
+Note that for the `align` parameter to work, you have to make sure that the
+`img` directive isn't surrounded with newlines, as the [[Markdown]] renderer
+would otherwise put the image into its own paragraph, inhibiting this
+functionality from working.  On the other hand, CSS should probably rather be
+used instead.
+
 The `link` parameter is used to control whether the scaled image links
 to the full size version. By default it does; set "link=somepage" to link
 to another page instead, or "link=no" to disable the link, or
-- 
cgit v1.2.3


From 11787065a133f4884dfb8a8dc8a5ecacfe2fed63 Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Sat, 14 Nov 2009 21:02:34 -0500
Subject: opened bug

---
 ...map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn

diff --git a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
new file mode 100644
index 000000000..2973c6010
--- /dev/null
+++ b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
@@ -0,0 +1 @@
+The [[directive/map]] directive sorty by pagename. That looks kind of odd, when used together with show=title. I would expect it to sort by title then.
-- 
cgit v1.2.3


From fb26b9ca849b2cc8090e317c0cba790da76c425a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 15 Nov 2009 14:52:53 -0500
Subject: Revert "Improve img's documentation."

The information added is incorrect.
---
 doc/bugs/img_vs_align.mdwn     | 11 +++++++++++
 doc/ikiwiki/directive/img.mdwn |  6 ------
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 doc/bugs/img_vs_align.mdwn

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
new file mode 100644
index 000000000..dcb9129b9
--- /dev/null
+++ b/doc/bugs/img_vs_align.mdwn
@@ -0,0 +1,11 @@
+The *[[ikiwiki/directive/img]]* directive allows for specifying an
+*align* parameter -- which is of limited usability as the image is
+embedded as `<p><img ...></p>`.  That's at least what I see on
+<http://www.bddebian.com:8888/~hurd-web/hurd/status/>.  On the other
+hand, CSS is supposed to be used instead, I guess.  (But how...  I forgot
+almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
+
+> [[!img logo/ikiwiki.png align=right]]The [img tag doesn't create P tags](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=IkiWiki/Plugin/img.pm;h=32023fa97af8ba8e63192cacaff10a4677d20654;hb=HEAD), but if you have surrounded the img directive with newlines, they will result in paragraph tags.
+>
+> I've edited the URL you provided to demonstrate this -- hope you don't mind! I've also added an inline, right-aligned image to this page.[[!tag done]]
+> -- [[Jon]]
diff --git a/doc/ikiwiki/directive/img.mdwn b/doc/ikiwiki/directive/img.mdwn
index b847aa239..94cc754bd 100644
--- a/doc/ikiwiki/directive/img.mdwn
+++ b/doc/ikiwiki/directive/img.mdwn
@@ -22,12 +22,6 @@ You can also pass `alt`, `title`, `class`, `align` and `id` parameters.
 These are passed through unchanged to the html img tag. If you include a
 `caption` parameter, the caption will be displayed centered beneath the image.
 
-Note that for the `align` parameter to work, you have to make sure that the
-`img` directive isn't surrounded with newlines, as the [[Markdown]] renderer
-would otherwise put the image into its own paragraph, inhibiting this
-functionality from working.  On the other hand, CSS should probably rather be
-used instead.
-
 The `link` parameter is used to control whether the scaled image links
 to the full size version. By default it does; set "link=somepage" to link
 to another page instead, or "link=no" to disable the link, or
-- 
cgit v1.2.3


From 03fe40cdc5c55bafd0f3b9058fb985e66a872aab Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 15 Nov 2009 15:01:17 -0500
Subject: diagnosis: probably broken browser?

---
 doc/bugs/img_vs_align.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
index dcb9129b9..c70f4d5ef 100644
--- a/doc/bugs/img_vs_align.mdwn
+++ b/doc/bugs/img_vs_align.mdwn
@@ -9,3 +9,11 @@ almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
 >
 > I've edited the URL you provided to demonstrate this -- hope you don't mind! I've also added an inline, right-aligned image to this page.[[!tag done]]
 > -- [[Jon]]
+
+> Contrary to all of the above, html does not care about P tags when
+> floating an image to the left or right via align. Proof:
+> <http://kitenet.net/~joey/pics/toomanypicturesofjoey/>, where the image
+> is in its own paragraph but still floats. Also, I re-modified a local
+> copy of the hurd page to enclose the image in a P, and it still floats.
+> 
+> Tested with Chromium and Firefox. --[[Joey]]
-- 
cgit v1.2.3


From dbc18a7223da6d2cdd5ae72ef5cb6afeb64352a5 Mon Sep 17 00:00:00 2001
From: NicolasLimare <NicolasLimare@web>
Date: Sun, 15 Nov 2009 20:19:34 -0500
Subject: + micro whishlist item

---
 doc/todo/description_meta_param_passed_to_templates.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/todo/description_meta_param_passed_to_templates.mdwn

diff --git a/doc/todo/description_meta_param_passed_to_templates.mdwn b/doc/todo/description_meta_param_passed_to_templates.mdwn
new file mode 100644
index 000000000..cbd35f17d
--- /dev/null
+++ b/doc/todo/description_meta_param_passed_to_templates.mdwn
@@ -0,0 +1,8 @@
+[[!tag whishlist]]
+
+I'd like to use the description parameter from [[meta|/ikiwiki/directive/meta]] directives in custom [[inline|/ikiwiki/directive/inline]] templates. I guess this could be useful to others too.
+
+The only change required is on [line 266](http://github.com/joeyh/ikiwiki/blob/master/IkiWiki/Plugin/meta.pm#L266) of `meta.pm`
+
+    - foreach my $field (qw{author authorurl permalink}) {
+    + foreach my $field (qw{author authorurl description permalink}) {
-- 
cgit v1.2.3


From fa7fd79ff0396b1d7b9eca6d3ae493c7092e9950 Mon Sep 17 00:00:00 2001
From: NicolasLimare <NicolasLimare@web>
Date: Sun, 15 Nov 2009 20:21:04 -0500
Subject: - typo

---
 doc/todo/description_meta_param_passed_to_templates.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/description_meta_param_passed_to_templates.mdwn b/doc/todo/description_meta_param_passed_to_templates.mdwn
index cbd35f17d..5598698d7 100644
--- a/doc/todo/description_meta_param_passed_to_templates.mdwn
+++ b/doc/todo/description_meta_param_passed_to_templates.mdwn
@@ -1,4 +1,4 @@
-[[!tag whishlist]]
+[[!tag wishlist]]
 
 I'd like to use the description parameter from [[meta|/ikiwiki/directive/meta]] directives in custom [[inline|/ikiwiki/directive/inline]] templates. I guess this could be useful to others too.
 
-- 
cgit v1.2.3


From 6d73c132804b2c725cea257f5b55e5d438ec5640 Mon Sep 17 00:00:00 2001
From: NicolasLimare <NicolasLimare@web>
Date: Sun, 15 Nov 2009 20:22:21 -0500
Subject: + patch tag

---
 doc/todo/description_meta_param_passed_to_templates.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/description_meta_param_passed_to_templates.mdwn b/doc/todo/description_meta_param_passed_to_templates.mdwn
index 5598698d7..80a6a8e8a 100644
--- a/doc/todo/description_meta_param_passed_to_templates.mdwn
+++ b/doc/todo/description_meta_param_passed_to_templates.mdwn
@@ -1,4 +1,4 @@
-[[!tag wishlist]]
+[[!tag wishlist patch]]
 
 I'd like to use the description parameter from [[meta|/ikiwiki/directive/meta]] directives in custom [[inline|/ikiwiki/directive/inline]] templates. I guess this could be useful to others too.
 
-- 
cgit v1.2.3


From 2d1dfab20a6ed69f48c1696e00a97b44eac84062 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Mon, 16 Nov 2009 09:10:36 +0100
Subject: Follow up.

---
 doc/bugs/img_vs_align.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
index c70f4d5ef..6eff46178 100644
--- a/doc/bugs/img_vs_align.mdwn
+++ b/doc/bugs/img_vs_align.mdwn
@@ -17,3 +17,15 @@ almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
 > copy of the hurd page to enclose the image in a P, and it still floats.
 > 
 > Tested with Chromium and Firefox. --[[Joey]]
+
+>> Uh, sorry for not confirming what I supposed to be with looking into
+>> the relevant standard.  It just seemed too obvious to me that the
+>> closure of `<p>...</p>` would confine whatever embedded stuff may be
+>> doing.  (Meaning, I didn't expect that the *img*'s alignment would
+>> propagate to the *p*'s and would thus be visible from the outside.)
+>> 
+>> I confirm (Firefox, Ubuntu jaunty) that your picture page is being
+>> shown correctly -- thus I suppose that there's a buglet in our CSS
+>> scripts again...
+>> 
+>> --[[tschwinge]]
-- 
cgit v1.2.3


From 65e9fbf6e98e0bf5525c39273f0327c0a122276f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 16 Nov 2009 15:30:08 -0500
Subject: add example of a map showing page descriptions

---
 doc/ikiwiki/directive/map.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ikiwiki/directive/map.mdwn b/doc/ikiwiki/directive/map.mdwn
index 09c95a0c9..4b6499547 100644
--- a/doc/ikiwiki/directive/map.mdwn
+++ b/doc/ikiwiki/directive/map.mdwn
@@ -13,6 +13,8 @@ the [[meta]] directive). For example:
 
 	\[[!map pages="* and !blog/* and !*/Discussion" show=title]]
 
+	\[[!map pages="* and !blog/* and !*/Discussion" show=description]]
+
 Hint: To limit the map to displaying pages less than a certain level deep,
 use a [[ikiwiki/PageSpec]] like this: `pages="* and !*/*/*"`
 
-- 
cgit v1.2.3


From 20cdadba32dfd0280a3d17aef7136c0490ccb3d7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 16 Nov 2009 15:44:03 -0500
Subject: avoid fallthrough to default meta header addition for title

With the htmlscrubber disabled, it was adding a <meta name=title>
tag for the title, which is pointless.
---
 IkiWiki/Plugin/meta.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 6fe9cda34..6bdb6f39c 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -88,7 +88,7 @@ sub preprocess (@) {
 	# Metadata collection that needs to happen during the scan pass.
 	if ($key eq 'title') {
 		$pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
-		# fallthrough
+		return "";
 	}
 	elsif ($key eq 'description') {
 		$pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
-- 
cgit v1.2.3


From 4fa17df57de29e2b91c552c1b012f3f198dfaa2f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 16 Nov 2009 15:51:00 -0500
Subject: meta: Generate meta description tags even when the html scrubber is
 enabled.

Unlike generic meta foo tags, meta description is known to be safe, so can
be special cased to be allowed despite the html scrubber. This makes meta
description much more useful, since it is otherwise limited to being used
by other plugins like map.
---
 IkiWiki/Plugin/meta.pm          | 4 ++++
 debian/changelog                | 7 +++++++
 doc/ikiwiki/directive/meta.mdwn | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 6bdb6f39c..45d073e28 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -239,6 +239,10 @@ sub preprocess (@) {
 		push @{$metaheaders{$page}}, '<meta name="robots"'.
 			' content="'.encode_entities($value).'" />';
 	}
+	elsif ($key eq 'description') {
+		push @{$metaheaders{$page}}, '<meta name="'.encode_entities($key).
+			'" content="'.encode_entities($value).'" />';
+	}
 	else {
 		push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).
 			'" content="'.encode_entities($value).'" />', $destpage);
diff --git a/debian/changelog b/debian/changelog
index ad80d37b7..9bddf0733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20091114) UNRELEASED; urgency=low
+
+  * meta: Generate meta description tags even when the html scrubber is
+    enabled.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500
+
 ikiwiki (3.20091113) unstable; urgency=low
 
   * underlay: Fix example values put in setup file to be array
diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index 000f461c9..557441c0b 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -43,8 +43,8 @@ Supported fields:
 
 * description
 
-  Specifies a "description" of the page. You could use this to provide
-  a summary, for example, to be picked up by the [[map]] directive.
+  Specifies a short description for the page. This will be put in
+  the html header, and can also be displayed by eg, the [[map]] directive.
 
 * permalink
 
-- 
cgit v1.2.3


From 43a1640345e5af8f173a9d3669a4c9e0dfb0a512 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 16 Nov 2009 15:54:11 -0500
Subject: meta: Allow use of DESCRIPTION in templates to get at the meta
 description value. (Thanks, NicolasLimare)

---
 IkiWiki/Plugin/meta.pm | 2 +-
 debian/changelog       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 45d073e28..55c9ddbd1 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -267,7 +267,7 @@ sub pagetemplate (@) {
 		$template->param(title_overridden => 1);
 	}
 
-	foreach my $field (qw{author authorurl permalink}) {
+	foreach my $field (qw{author authorurl description permalink}) {
 		$template->param($field => $pagestate{$page}{meta}{$field})
 			if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
 	}
diff --git a/debian/changelog b/debian/changelog
index 9bddf0733..1abd4de4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
 
   * meta: Generate meta description tags even when the html scrubber is
     enabled.
+  * meta: Allow use of DESCRIPTION in templates to get at the meta description
+    value. (Thanks, NicolasLimare)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500
 
-- 
cgit v1.2.3


From 34f046ed4a7873e6dadbd6eb9f096b94f688d1e9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 16 Nov 2009 15:55:01 -0500
Subject: close

---
 doc/todo/description_meta_param_passed_to_templates.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/description_meta_param_passed_to_templates.mdwn b/doc/todo/description_meta_param_passed_to_templates.mdwn
index 80a6a8e8a..712471258 100644
--- a/doc/todo/description_meta_param_passed_to_templates.mdwn
+++ b/doc/todo/description_meta_param_passed_to_templates.mdwn
@@ -6,3 +6,5 @@ The only change required is on [line 266](http://github.com/joeyh/ikiwiki/blob/m
 
     - foreach my $field (qw{author authorurl permalink}) {
     + foreach my $field (qw{author authorurl description permalink}) {
+
+> Good idea, [[done]]. --[[Joey]] 
-- 
cgit v1.2.3


From 64fef7c3bb5bab33778d4c4a1bbda42cd88cf735 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 16 Nov 2009 16:12:34 -0500
Subject: why this is hard

---
 ...rts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
index 2973c6010..f8e257daf 100644
--- a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
+++ b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
@@ -1 +1,8 @@
 The [[directive/map]] directive sorty by pagename. That looks kind of odd, when used together with show=title. I would expect it to sort by title then.
+
+> This would be quite hard to fix. Map sorts the pages it displays by page
+> name, which has the happy effect of making "foo/bar" come after "foo";
+> which it *has* to do, so that it can be displayed as a child of the page
+> it's located in. If sorting by title, that wouldn't hold. So, map
+> would have to be effectively totally rewritten, to build up each group
+> of child pages, and then re-sort those. --[[Joey]] 
-- 
cgit v1.2.3


From c46b19371a983d5e066494143dd66a3a05f305bd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Nov 2009 00:50:08 -0500
Subject: add page listing some alternatives to ikiwiki

---
 doc/competition.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/competition.mdwn

diff --git a/doc/competition.mdwn b/doc/competition.mdwn
new file mode 100644
index 000000000..2c782ea92
--- /dev/null
+++ b/doc/competition.mdwn
@@ -0,0 +1,19 @@
+When I started ikiwiki in 2006, there were no other existing systems that
+filled quite the niche of generating a static html wiki out of markdown
+files stored in a [[VCS|rcs]]. My 
+[first blog about ikiwiki](http://kitenet.net/~joey/blog/entry/seeking_wiki/)
+looked at some projects that were semi-close, and found them wanting.
+
+My hope was that besides being useful to all its [[users|ikiwikiusers]],
+ikiwiki would help spread its underlying concepts. Let a thousand flowers
+bloom! These are some that have sprung up since. --[[Joey]]
+
+* [Gitit](http://gitit.johnmacfarlane.net/) is a wiki backed by a git (or
+  darcs) filestore. No static rendering here; pages are generated on the fly.
+  It's written in Haskell and uses the amazing PanDoc to generate html
+  from markdown or many other formats.
+
+* [Markdoc](http://blog.zacharyvoase.com/post/246800035) statically builds
+  a wiki from markdown source (which can be in a VCS, if you check it in).
+  It includes a built-in webserver to ease serving the generated static
+  html.
-- 
cgit v1.2.3


From da92e91769945648500819508374e2b15b79fdc8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Nov 2009 01:29:28 -0500
Subject: inline: Use caching of inlined pages to speed up builds of inlines
 that include feeds.

Speedup of about 25% for small inlines; could be much larger for inlines of
many, or complex pages.

Not bloating memory with excessive memoization data was the key to this.
The method chosen does not squeeze out every erg of speed possible when
inlines are nested, but that's rare. It uses less memory than other
optimisation hacks (I'm looking at you,
f937c1fb8074a512d8bb788fa275f5e90595cd47 !) already used in inline.pm.
---
 IkiWiki/Plugin/inline.pm | 27 +++++++++++++++++++++++----
 debian/changelog         |  3 +++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index f89209a1b..29729a414 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -423,6 +423,8 @@ sub preprocess_inline (@) {
 		}
 	}
 	
+	clear_inline_content_cache();
+
 	return $ret if $raw || $nested;
 	push @inline, $ret;
 	return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";
@@ -437,25 +439,42 @@ sub pagetemplate_inline (@) {
 		if exists $feedlinks{$page} && $template->query(name => "feedlinks");
 }
 
+{
+my %inline_content;
+my $cached_destpage="";
+
 sub get_inline_content ($$) {
 	my $page=shift;
 	my $destpage=shift;
 	
+	if (exists $inline_content{$page} && $cached_destpage eq $destpage) {
+		return $inline_content{$page};
+	}
+
 	my $file=$pagesources{$page};
 	my $type=pagetype($file);
+	my $ret="";
 	if (defined $type) {
 		$nested++;
-		my $ret=htmlize($page, $destpage, $type,
+		$ret=htmlize($page, $destpage, $type,
 		       linkify($page, $destpage,
 		       preprocess($page, $destpage,
 		       filter($page, $destpage,
 		       readfile(srcfile($file))))));
 		$nested--;
-		return $ret;
 	}
-	else {
-		return "";
+	
+	if ($cached_destpage ne $destpage) {
+		clear_inline_content_cache();
+		$cached_destpage=$destpage;
 	}
+	return $inline_content{$page}=$ret;
+}
+
+sub clear_inline_content_cache () {
+	%inline_content=();
+}
+
 }
 
 sub date_822 ($) {
diff --git a/debian/changelog b/debian/changelog
index 1abd4de4d..31c28941a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
     enabled.
   * meta: Allow use of DESCRIPTION in templates to get at the meta description
     value. (Thanks, NicolasLimare)
+  * inline: Use caching of inlined pages to speed up builds of inlines that
+    include feeds. Speedup of about 25% for small inlines; could be much
+    larger for inlines of many, or complex pages.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500
 
-- 
cgit v1.2.3


From 182043667058d302d33aefa12dcb8678799d7fc7 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Tue, 17 Nov 2009 15:55:01 +0000
Subject: escape something being interpreted as a directive

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 45df683de..3b8e5043c 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -118,7 +118,7 @@ into an ikiwiki tag name using a script such as
     pattern =  r'\[\[Category:([^\]]+)\]\]'
     
     def manglecat(mo):
-            return '[[!tag %s]]' % mo.group(1).strip().replace(' ','_')
+            return '[\[!tag %s]]' % mo.group(1).strip().replace(' ','_')
             
     for line in sys.stdin.readlines():
             res = re.match(pattern, line)
-- 
cgit v1.2.3


From 07dcf7d6e75705ff0601cb5b9dcf8f00d8093dde Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Tue, 17 Nov 2009 15:56:42 +0000
Subject: shuffle commit symbol around

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 3b8e5043c..9719d9a7e 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -118,7 +118,7 @@ into an ikiwiki tag name using a script such as
     pattern =  r'\[\[Category:([^\]]+)\]\]'
     
     def manglecat(mo):
-            return '[\[!tag %s]]' % mo.group(1).strip().replace(' ','_')
+            return '\[[!tag %s]]' % mo.group(1).strip().replace(' ','_')
             
     for line in sys.stdin.readlines():
             res = re.match(pattern, line)
-- 
cgit v1.2.3


From 6dd5f2e9c0722f502bed83b32c849a13283c26f9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Nov 2009 16:12:08 -0500
Subject: Added (incomplete) Turkish po file. Closes: #556744 Thanks, Recai
 Oktaş
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog |    2 +
 po/tr.po         | 1180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1182 insertions(+)
 create mode 100644 po/tr.po

diff --git a/debian/changelog b/debian/changelog
index 31c28941a..15d56a693 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
   * inline: Use caching of inlined pages to speed up builds of inlines that
     include feeds. Speedup of about 25% for small inlines; could be much
     larger for inlines of many, or complex pages.
+  * Added (incomplete) Turkish po file. Closes: #556744
+    Thanks, Recai Oktaş
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500
 
diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 000000000..de8fe21db
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,1180 @@
+# Turkish translation for ikiwiki.
+# This file is distributed under the same license as the ikiwiki package.
+# Recai Oktaş <roktas@debian.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki 3.20091031\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-23 12:40-0400\n"
+"PO-Revision-Date: 2009-11-08 03:04+0200\n"
+"Last-Translator: Recai Oktaş <roktas@debian.org>\n"
+"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../IkiWiki/CGI.pm:113
+msgid "You need to log in first."
+msgstr "Önce sisteme giriş yapmanız gerekiyor."
+
+#: ../IkiWiki/CGI.pm:146
+msgid ""
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
+"via http, not https"
+msgstr ""
+
+#: ../IkiWiki/CGI.pm:149
+msgid "login failed, perhaps you need to turn on cookies?"
+msgstr ""
+
+#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+msgid "Your login session has expired."
+msgstr ""
+
+#: ../IkiWiki/CGI.pm:189
+msgid "Login"
+msgstr "Giriş"
+
+#: ../IkiWiki/CGI.pm:190
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: ../IkiWiki/CGI.pm:191
+msgid "Admin"
+msgstr "Yönet"
+
+#: ../IkiWiki/CGI.pm:231
+msgid "Preferences saved."
+msgstr "Tercihler kaydedildi."
+
+#: ../IkiWiki/CGI.pm:277
+msgid "You are banned."
+msgstr ""
+
+#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+msgid "Error"
+msgstr "Hata"
+
+#: ../IkiWiki/Plugin/aggregate.pm:84
+msgid "Aggregation triggered via web."
+msgstr ""
+
+#: ../IkiWiki/Plugin/aggregate.pm:93
+msgid "Nothing to do right now, all feeds are up-to-date!"
+msgstr ""
+
+#: ../IkiWiki/Plugin/aggregate.pm:220
+#, perl-format
+msgid "missing %s parameter"
+msgstr "%s parametresi eksik"
+
+#: ../IkiWiki/Plugin/aggregate.pm:255
+msgid "new feed"
+msgstr "yeni özet akışı"
+
+#: ../IkiWiki/Plugin/aggregate.pm:269
+msgid "posts"
+msgstr "gönderi"
+
+#: ../IkiWiki/Plugin/aggregate.pm:271
+msgid "new"
+msgstr "yeni"
+
+#: ../IkiWiki/Plugin/aggregate.pm:441
+#, perl-format
+msgid "expiring %s (%s days old)"
+msgstr "%s için zaman aşımı (%s gün eski)"
+
+#: ../IkiWiki/Plugin/aggregate.pm:448
+#, perl-format
+msgid "expiring %s"
+msgstr "%s için zaman aşımı"
+
+#: ../IkiWiki/Plugin/aggregate.pm:475
+#, perl-format
+msgid "last checked %s"
+msgstr "son güncelleme: %s"
+
+#: ../IkiWiki/Plugin/aggregate.pm:479
+#, perl-format
+msgid "checking feed %s ..."
+msgstr "%s özet akışı denetleniyor ..."
+
+#: ../IkiWiki/Plugin/aggregate.pm:484
+#, perl-format
+msgid "could not find feed at %s"
+msgstr "%s özet akışı bulunamadı"
+
+#: ../IkiWiki/Plugin/aggregate.pm:503
+msgid "feed not found"
+msgstr "özet akışı bulunamadı"
+
+#: ../IkiWiki/Plugin/aggregate.pm:514
+#, perl-format
+msgid "(invalid UTF-8 stripped from feed)"
+msgstr "(geçersiz UTF-8 dizgisi özet akışından çıkarıldı)"
+
+#: ../IkiWiki/Plugin/aggregate.pm:522
+#, perl-format
+msgid "(feed entities escaped)"
+msgstr "(özet akışı girdileri işlendi)"
+
+#: ../IkiWiki/Plugin/aggregate.pm:530
+msgid "feed crashed XML::Feed!"
+msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!"
+
+#: ../IkiWiki/Plugin/aggregate.pm:616
+#, perl-format
+msgid "creating new page %s"
+msgstr "%s için yeni sayfa oluşturuluyor"
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:31
+msgid "deleting bucket.."
+msgstr ""
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+msgid "done"
+msgstr ""
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:97
+#, perl-format
+msgid "Must specify %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:136
+msgid "Failed to create S3 bucket: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:221
+msgid "Failed to save file to S3: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/amazon_s3.pm:243
+msgid "Failed to delete file from S3: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/attachment.pm:49
+#, perl-format
+msgid "there is already a page named %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/attachment.pm:65
+msgid "prohibited by allowed_attachments"
+msgstr ""
+
+#: ../IkiWiki/Plugin/attachment.pm:140
+msgid "bad attachment filename"
+msgstr ""
+
+#: ../IkiWiki/Plugin/attachment.pm:182
+msgid "attachment upload"
+msgstr ""
+
+#: ../IkiWiki/Plugin/autoindex.pm:105
+msgid "automatic index generation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/blogspam.pm:108
+msgid ""
+"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
+"\">blogspam</a>: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
+#, perl-format
+msgid "%s from %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
+msgid "There are no broken links!"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:129
+msgid "comment must have content"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:185
+msgid "Anonymous"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+msgid "bad page name"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:345
+#, perl-format
+msgid "commenting on %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:363
+#, perl-format
+msgid "page '%s' doesn't exist, so you can't comment"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:370
+#, perl-format
+msgid "comments on page '%s' are closed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:464
+msgid "comment stored for moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:466
+msgid "Your comment will be posted after moderator review"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:479
+msgid "Added a comment"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:483
+#, perl-format
+msgid "Added a comment: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+msgid "you are not logged in as an admin"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:576
+msgid "Comment moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:615
+msgid "comment moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:766
+msgid "Comments"
+msgstr ""
+
+#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
+#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/testpagespec.pm:26
+#, perl-format
+msgid "%s parameter is required"
+msgstr ""
+
+#: ../IkiWiki/Plugin/cutpaste.pm:66
+msgid "no text was copied in this page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/cutpaste.pm:69
+#, perl-format
+msgid "no text was copied in this page with id %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/editpage.pm:40
+#, perl-format
+msgid "removing old preview %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/editpage.pm:113
+#, perl-format
+msgid "%s is not an editable page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/editpage.pm:292
+#, perl-format
+msgid "creating %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
+#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
+#: ../IkiWiki/Plugin/editpage.pm:422
+#, perl-format
+msgid "editing %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/edittemplate.pm:51
+msgid "template not specified"
+msgstr ""
+
+#: ../IkiWiki/Plugin/edittemplate.pm:54
+msgid "match not specified"
+msgstr ""
+
+#: ../IkiWiki/Plugin/edittemplate.pm:63
+#, perl-format
+msgid "edittemplate %s registered for %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/edittemplate.pm:137
+msgid "failed to process"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:20
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/fortune.pm:27
+msgid "fortune failed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+msgid "missing page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#, perl-format
+msgid "The page %s does not exist."
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:73
+msgid "not a page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+#, perl-format
+msgid "%s is an attachment, not a page."
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Receive.pm:130
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:691
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:695
+msgid "you are not allowed to change file modes"
+msgstr ""
+
+#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/search.pm:36
+#, perl-format
+msgid "Must specify %s when using the %s plugin"
+msgstr ""
+
+#: ../IkiWiki/Plugin/google.pm:31
+msgid "Failed to parse url, cannot determine domain name"
+msgstr ""
+
+#: ../IkiWiki/Plugin/graphviz.pm:67
+msgid "failed to run graphviz"
+msgstr ""
+
+#: ../IkiWiki/Plugin/graphviz.pm:94
+msgid "prog not a valid graphviz program"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:47
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:58
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:123
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+msgid "htmltidy failed to parse this html"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:64
+msgid "Image::Magick is not installed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:74
+#, perl-format
+msgid "wrong size format \"%s\" (should be WxH)"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:120
+#, perl-format
+msgid "failed to resize: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:140
+#, perl-format
+msgid "failed to determine size of image %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:92
+msgid "Must specify url to wiki with --url when using --rss or --atom"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:138
+msgid "page editing not allowed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:155
+msgid "missing pages parameter"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:191
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:312
+msgid "Add a new post titled:"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:332
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:598
+msgid "RPC::XML::Client not found, not pinging"
+msgstr ""
+
+#: ../IkiWiki/Plugin/linkmap.pm:101
+msgid "failed to run dot"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:47
+#, perl-format
+msgid "%s is locked and cannot be edited"
+msgstr ""
+
+#: ../IkiWiki/Plugin/mdwn.pm:44
+msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/mdwn.pm:67
+#, perl-format
+msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
+msgstr ""
+
+#: ../IkiWiki/Plugin/meta.pm:161
+msgid "stylesheet not found"
+msgstr ""
+
+#: ../IkiWiki/Plugin/meta.pm:199
+msgid "redir page not found"
+msgstr ""
+
+#: ../IkiWiki/Plugin/meta.pm:213
+msgid "redir cycle is not allowed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
+msgid "Mirrors"
+msgstr ""
+
+#: ../IkiWiki/Plugin/mirrorlist.pm:43
+msgid "Mirror"
+msgstr ""
+
+#: ../IkiWiki/Plugin/more.pm:8
+msgid "more"
+msgstr ""
+
+#: ../IkiWiki/Plugin/norcs.pm:65
+msgid "getctime not implemented"
+msgstr ""
+
+#: ../IkiWiki/Plugin/openid.pm:61
+msgid "Log in with"
+msgstr ""
+
+#: ../IkiWiki/Plugin/openid.pm:64
+msgid "Get an OpenID"
+msgstr ""
+
+#: ../IkiWiki/Plugin/orphans.pm:55
+msgid "All pages have other pages linking to them."
+msgstr ""
+
+#: ../IkiWiki/Plugin/pagetemplate.pm:30
+msgid "bad or missing template"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:248
+msgid "Account creation successful. Now you can Login."
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:251
+msgid "Error creating account."
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:258
+msgid "No email address, so cannot email password reset instructions."
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:292
+msgid "Failed to send mail"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:294
+msgid "You have been mailed password reset instructions."
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:329
+msgid "incorrect password reset url"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:332
+msgid "password reset denied"
+msgstr ""
+
+#: ../IkiWiki/Plugin/pingee.pm:30
+msgid "Ping received."
+msgstr ""
+
+#: ../IkiWiki/Plugin/pinger.pm:53
+msgid "requires 'from' and 'to' parameters"
+msgstr ""
+
+#: ../IkiWiki/Plugin/pinger.pm:58
+#, perl-format
+msgid "Will ping %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/pinger.pm:61
+#, perl-format
+msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
+msgstr ""
+
+#: ../IkiWiki/Plugin/pinger.pm:77
+msgid "LWP not found, not pinging"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:138
+#, perl-format
+msgid "%s is not a valid language code"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:150
+#, perl-format
+msgid ""
+"%s is not a valid value for po_link_to, falling back to po_link_to=default"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:155
+msgid ""
+"po_link_to=negotiated requires usedirs to be enabled, falling back to "
+"po_link_to=default"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:385
+#, perl-format
+msgid "rebuilding all pages to fix meta titles"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#, perl-format
+msgid "building %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:428
+msgid "updated PO files"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:452
+msgid ""
+"Can not remove a translation. If the master page is removed, however, its "
+"translations will be removed as well."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:472
+msgid ""
+"Can not rename a translation. If the master page is renamed, however, its "
+"translations will be renamed as well."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:871
+#, perl-format
+msgid "POT file (%s) does not exist"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:885
+#, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:894
+#, perl-format
+msgid "failed to update %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:900
+#, perl-format
+msgid "failed to copy the POT file to %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:936
+msgid "N/A"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:949
+#, perl-format
+msgid "failed to translate %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1033
+msgid "removed obsolete PO files"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
+#: ../IkiWiki/Plugin/po.pm:1150
+#, perl-format
+msgid "failed to write %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1108
+msgid "failed to translate"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1113
+#, perl-format
+msgid "failed to read %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1162
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
+#: ../IkiWiki/Plugin/poll.pm:69
+msgid "vote"
+msgstr ""
+
+#: ../IkiWiki/Plugin/poll.pm:77
+msgid "Total votes:"
+msgstr ""
+
+#: ../IkiWiki/Plugin/polygen.pm:41
+msgid "polygen not installed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/polygen.pm:60
+msgid "command failed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/postsparkline.pm:46
+msgid "missing formula"
+msgstr ""
+
+#: ../IkiWiki/Plugin/postsparkline.pm:53
+msgid "unknown formula"
+msgstr ""
+
+#. translators: These descriptions of times of day are used
+#. translators: in messages like "last edited <description>".
+#. translators: %A is the name of the day of the week, while
+#. translators: %A- is the name of the previous day.
+#: ../IkiWiki/Plugin/prettydate.pm:15
+msgid "late %A- night"
+msgstr "%A- gecesi geç saatlerde"
+
+#: ../IkiWiki/Plugin/prettydate.pm:17
+msgid "in the wee hours of %A- night"
+msgstr "%A- gecesi erken saatlerde"
+
+#: ../IkiWiki/Plugin/prettydate.pm:20
+msgid "terribly early %A morning"
+msgstr "%A sabahı çok erken saatlerde"
+
+#: ../IkiWiki/Plugin/prettydate.pm:22
+msgid "early %A morning"
+msgstr "%A sabahı erken saatlerde"
+
+#: ../IkiWiki/Plugin/prettydate.pm:25
+msgid "mid-morning %A"
+msgstr "%A sabahı"
+
+#: ../IkiWiki/Plugin/prettydate.pm:26
+msgid "late %A morning"
+msgstr "%A sabahı ilerleyen saatlerde"
+
+#: ../IkiWiki/Plugin/prettydate.pm:27
+msgid "at lunch time on %A"
+msgstr "%A öğle arası"
+
+#: ../IkiWiki/Plugin/prettydate.pm:29
+msgid "%A afternoon"
+msgstr "%A öğleden sonra"
+
+#: ../IkiWiki/Plugin/prettydate.pm:32
+msgid "late %A afternoon"
+msgstr "%A öğleden sonra ilerleyen saatlerde"
+
+#: ../IkiWiki/Plugin/prettydate.pm:33
+msgid "%A evening"
+msgstr "%A akşamı"
+
+#: ../IkiWiki/Plugin/prettydate.pm:35
+msgid "late %A evening"
+msgstr "%A akşamı ilerleyen saatlerde"
+
+#: ../IkiWiki/Plugin/prettydate.pm:37
+msgid "%A night"
+msgstr "%A gecesi"
+
+#: ../IkiWiki/Plugin/prettydate.pm:101
+msgid "at teatime on %A"
+msgstr "%A ikindi saatlerinde"
+
+#: ../IkiWiki/Plugin/prettydate.pm:105
+msgid "at midnight"
+msgstr "geceyarısında"
+
+#: ../IkiWiki/Plugin/prettydate.pm:108
+msgid "at noon on %A"
+msgstr "%A öğleyin"
+
+#: ../IkiWiki/Plugin/progress.pm:34
+#, perl-format
+msgid "illegal percent value %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/progress.pm:55
+msgid "need either `percent` or `totalpages` and `donepages` parameters"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
+msgid "(Diff truncated)"
+msgstr ""
+
+#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#, perl-format
+msgid "%s does not exist"
+msgstr ""
+
+#: ../IkiWiki/Plugin/remove.pm:38
+#, perl-format
+msgid "%s is not in the srcdir, so it cannot be deleted"
+msgstr ""
+
+#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#, perl-format
+msgid "%s is not a file"
+msgstr ""
+
+#: ../IkiWiki/Plugin/remove.pm:134
+#, perl-format
+msgid "confirm removal of %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/remove.pm:171
+msgid "Please select the attachments to remove."
+msgstr ""
+
+#: ../IkiWiki/Plugin/remove.pm:211
+msgid "removed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:42
+#, perl-format
+msgid "%s is not in the srcdir, so it cannot be renamed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:62
+msgid "no change to the file name was specified"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:68
+#, perl-format
+msgid "illegal name"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:73
+#, perl-format
+msgid "%s already exists"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:79
+#, perl-format
+msgid "%s already exists on disk"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:122
+#, perl-format
+msgid "rename %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:161
+msgid "Also rename SubPages and attachments"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:247
+msgid "Only one attachment can be renamed at a time."
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:250
+msgid "Please select the attachment to rename."
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:347
+#, perl-format
+msgid "rename %s to %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rename.pm:571
+#, perl-format
+msgid "update for rename of %s to %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rsync.pm:40
+#, perl-format
+msgid "rsync_command exited %d"
+msgstr ""
+
+#: ../IkiWiki/Plugin/search.pm:182
+#, perl-format
+msgid "need Digest::SHA1 to index %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/search.pm:217
+msgid "search"
+msgstr ""
+
+#: ../IkiWiki/Plugin/shortcut.pm:31
+#, perl-format
+msgid "shortcut plugin will not work without %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/shortcut.pm:44
+msgid "missing name or url parameter"
+msgstr ""
+
+#. translators: This is used to display what shortcuts are defined.
+#. translators: First parameter is the name of the shortcut, the second
+#. translators: is an URL.
+#: ../IkiWiki/Plugin/shortcut.pm:54
+#, perl-format
+msgid "shortcut %s points to <i>%s</i>"
+msgstr ""
+
+#: ../IkiWiki/Plugin/smiley.pm:43
+msgid "failed to parse any smileys"
+msgstr ""
+
+#: ../IkiWiki/Plugin/sparkline.pm:72
+msgid "parse error"
+msgstr ""
+
+#: ../IkiWiki/Plugin/sparkline.pm:78
+msgid "invalid featurepoint diameter"
+msgstr ""
+
+#: ../IkiWiki/Plugin/sparkline.pm:88
+msgid "invalid featurepoint location"
+msgstr ""
+
+#: ../IkiWiki/Plugin/sparkline.pm:99
+msgid "missing values"
+msgstr ""
+
+#: ../IkiWiki/Plugin/sparkline.pm:104
+msgid "invalid height value"
+msgstr ""
+
+#: ../IkiWiki/Plugin/sparkline.pm:111
+msgid "missing width parameter"
+msgstr ""
+
+#: ../IkiWiki/Plugin/sparkline.pm:115
+msgid "invalid width value"
+msgstr ""
+
+#: ../IkiWiki/Plugin/sparkline.pm:153
+msgid "failed to run php"
+msgstr ""
+
+#: ../IkiWiki/Plugin/table.pm:31
+msgid "cannot find file"
+msgstr ""
+
+#: ../IkiWiki/Plugin/table.pm:87
+msgid "unknown data format"
+msgstr ""
+
+#: ../IkiWiki/Plugin/table.pm:95
+msgid "empty data"
+msgstr ""
+
+#: ../IkiWiki/Plugin/table.pm:114
+msgid "Direct data download"
+msgstr ""
+
+#: ../IkiWiki/Plugin/table.pm:148
+#, perl-format
+msgid "parse fail at line %d: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/template.pm:29
+msgid "missing id parameter"
+msgstr ""
+
+#: ../IkiWiki/Plugin/template.pm:36
+#, perl-format
+msgid "template %s not found"
+msgstr ""
+
+#: ../IkiWiki/Plugin/template.pm:55
+msgid "failed to process:"
+msgstr ""
+
+#: ../IkiWiki/Plugin/teximg.pm:70
+msgid "missing tex code"
+msgstr ""
+
+#: ../IkiWiki/Plugin/teximg.pm:122
+msgid "failed to generate image from code"
+msgstr ""
+
+#: ../IkiWiki/Plugin/websetup.pm:89
+msgid "plugin"
+msgstr ""
+
+#: ../IkiWiki/Plugin/websetup.pm:108
+#, perl-format
+msgid "enable %s?"
+msgstr ""
+
+#: ../IkiWiki/Plugin/websetup.pm:240
+msgid "setup file for this wiki is not known"
+msgstr ""
+
+#: ../IkiWiki/Plugin/websetup.pm:256
+msgid "main"
+msgstr ""
+
+#: ../IkiWiki/Plugin/websetup.pm:257
+msgid "plugins"
+msgstr ""
+
+#: ../IkiWiki/Plugin/websetup.pm:395
+msgid ""
+"The configuration changes shown below require a wiki rebuild to take effect."
+msgstr ""
+
+#: ../IkiWiki/Plugin/websetup.pm:399
+msgid ""
+"For the configuration changes shown below to fully take effect, you may need "
+"to rebuild the wiki."
+msgstr ""
+
+#: ../IkiWiki/Plugin/websetup.pm:436
+#, perl-format
+msgid "Error: %s exited nonzero (%s). Discarding setup changes."
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:34
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:86
+#, perl-format
+msgid "bad file name %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:150
+#, perl-format
+msgid "scanning %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:271
+#, perl-format
+msgid ""
+"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
+"allow this"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#, perl-format
+msgid "skipping bad filename %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:305
+#, perl-format
+msgid "%s has multiple possible source pages"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:395
+#, perl-format
+msgid "removing old page %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:471
+#, perl-format
+msgid "building %s, which links to %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:480
+#, perl-format
+msgid "removing %s, no longer built by %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:603
+#, perl-format
+msgid "building %s, which depends on %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:616
+#, perl-format
+msgid "building %s, to update its backlinks"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:679
+#, perl-format
+msgid "ikiwiki: cannot build %s"
+msgstr ""
+
+#. translators: The first parameter is a filename, and the second
+#. translators: is a (probably not translated) error message.
+#: ../IkiWiki/Setup.pm:19
+#, perl-format
+msgid "cannot read %s: %s"
+msgstr ""
+
+#: ../IkiWiki/Setup/Automator.pm:33
+msgid "you must enter a wikiname (that contains alphanumerics)"
+msgstr ""
+
+#: ../IkiWiki/Setup/Automator.pm:76
+#, perl-format
+msgid "unsupported revision control system %s"
+msgstr ""
+
+#: ../IkiWiki/Setup/Automator.pm:102
+msgid "failed to set up the repository with ikiwiki-makerepo"
+msgstr ""
+
+#: ../IkiWiki/Setup/Automator.pm:120
+#, perl-format
+msgid "** Disabling plugin %s, since it is failing with this message:"
+msgstr ""
+
+#: ../IkiWiki/Wrapper.pm:16
+#, perl-format
+msgid "%s doesn't seem to be executable"
+msgstr ""
+
+#: ../IkiWiki/Wrapper.pm:20
+msgid "cannot create a wrapper that uses a setup file"
+msgstr ""
+
+#: ../IkiWiki/Wrapper.pm:24
+msgid "wrapper filename not specified"
+msgstr ""
+
+#. translators: The parameter is a C filename.
+#: ../IkiWiki/Wrapper.pm:149
+#, perl-format
+msgid "failed to compile %s"
+msgstr ""
+
+#. translators: The parameter is a filename.
+#: ../IkiWiki/Wrapper.pm:169
+#, perl-format
+msgid "successfully generated %s"
+msgstr ""
+
+#: ../ikiwiki.in:13
+msgid "usage: ikiwiki [options] source dest"
+msgstr ""
+
+#: ../ikiwiki.in:14
+msgid "       ikiwiki --setup configfile"
+msgstr ""
+
+#: ../ikiwiki.in:91
+msgid "usage: --set var=value"
+msgstr ""
+
+#: ../ikiwiki.in:140
+msgid "generating wrappers.."
+msgstr ""
+
+#: ../ikiwiki.in:195
+msgid "rebuilding wiki.."
+msgstr ""
+
+#: ../ikiwiki.in:198
+msgid "refreshing wiki.."
+msgstr ""
+
+#: ../IkiWiki.pm:238
+msgid "Discussion"
+msgstr ""
+
+#: ../IkiWiki.pm:507
+msgid "Must specify url to wiki with --url when using --cgi"
+msgstr ""
+
+#: ../IkiWiki.pm:553
+msgid "cannot use multiple rcs plugins"
+msgstr ""
+
+#: ../IkiWiki.pm:582
+#, perl-format
+msgid "failed to load external plugin needed for %s plugin: %s"
+msgstr ""
+
+#: ../IkiWiki.pm:1264
+#, perl-format
+msgid "preprocessing loop detected on %s at depth %i"
+msgstr ""
+
+#: ../IkiWiki.pm:1863
+msgid "yes"
+msgstr ""
+
+#: ../IkiWiki.pm:2006
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr ""
+
+#: ../IkiWiki.pm:2017
+#, perl-format
+msgid "unknown sort type %s"
+msgstr ""
+
+#: ../IkiWiki.pm:2036
+#, perl-format
+msgid "cannot match pages: %s"
+msgstr ""
+
+#: ../auto.setup:16
+msgid "What will the wiki be named?"
+msgstr ""
+
+#: ../auto.setup:16
+msgid "wiki"
+msgstr ""
+
+#: ../auto.setup:19
+msgid "What revision control system to use?"
+msgstr ""
+
+#: ../auto.setup:21
+msgid "Which user (wiki account or openid) will be admin?"
+msgstr ""
+
+#: ../auto.setup:24
+msgid "What is the domain name of the web server?"
+msgstr ""
-- 
cgit v1.2.3


From e8ecc3833f96dfcfdada2b774eec6cef8b0b8019 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 19 Nov 2009 01:41:22 -0500
Subject: initial content

---
 doc/users/KathrynAndersen.mdwn | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/users/KathrynAndersen.mdwn

diff --git a/doc/users/KathrynAndersen.mdwn b/doc/users/KathrynAndersen.mdwn
new file mode 100644
index 000000000..c26a91223
--- /dev/null
+++ b/doc/users/KathrynAndersen.mdwn
@@ -0,0 +1,2 @@
+* Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need).
+* <http://kerravonsen.dreamwidth.org>
-- 
cgit v1.2.3


From a56b51aef546dd87d11f7c6bd4944d13442e5df3 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 19 Nov 2009 01:55:30 -0500
Subject: response of potential user

---
 doc/todo/Mailing_list.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/todo/Mailing_list.mdwn b/doc/todo/Mailing_list.mdwn
index b6a207420..4b2406786 100644
--- a/doc/todo/Mailing_list.mdwn
+++ b/doc/todo/Mailing_list.mdwn
@@ -18,3 +18,12 @@ Does this sound okay?
 > todo/bugs/forum feeds, or to some other feed they create on their user page.
 > And there's work on making the discussion pages more structured, on
 > accepting comments sent via mail, etc. --[[Joey]]
+
+>>I was going to make the very same request, so I'm glad to know I'm not the only one who felt the need for it.
+
+>>I can see your reasoning, though I don't think ikiwiki has reached the level (yet) of facilitating discussion as well as a mailing list does.
+>>You've already pointed out the need for (a) more structured discussion pages, (b) comments sent via mail, but I'm not sure whether that will be enough. This is because the nature of a wiki means that discussions are scattered all over the site, as people discuss in discussion pages about the given topic - and so they should.  The consequence of this, however, is that one has a choice (in regard to RSS feeds) of having too much or too little.  Too little, if one only feeds on news/todo/bugs/forum, since one misses out on discussions elsewhere.  Too much, because the only other option appears to be subscribing to recentchanges, which will give one *everything*, whether it is relevant or not.
+>>Unfortunately, I'm not really sure what the best solution is for this problem.
+
+>> For those who might be interested, I've added two RSS feeds to <http://www.dreamwidth.org>: ikiwiki_news and ikiwiki_recent. 
+>>--[[KathrynAndersen]]
-- 
cgit v1.2.3


From 866a915395c78f4b49a3a4f84f52816fe4f0da4f Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 19 Nov 2009 14:10:14 -0500
Subject: added more dreamwidth feeds

---
 doc/todo/Mailing_list.mdwn | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Mailing_list.mdwn b/doc/todo/Mailing_list.mdwn
index 4b2406786..67cbbb00b 100644
--- a/doc/todo/Mailing_list.mdwn
+++ b/doc/todo/Mailing_list.mdwn
@@ -25,5 +25,12 @@ Does this sound okay?
 >>You've already pointed out the need for (a) more structured discussion pages, (b) comments sent via mail, but I'm not sure whether that will be enough. This is because the nature of a wiki means that discussions are scattered all over the site, as people discuss in discussion pages about the given topic - and so they should.  The consequence of this, however, is that one has a choice (in regard to RSS feeds) of having too much or too little.  Too little, if one only feeds on news/todo/bugs/forum, since one misses out on discussions elsewhere.  Too much, because the only other option appears to be subscribing to recentchanges, which will give one *everything*, whether it is relevant or not.
 >>Unfortunately, I'm not really sure what the best solution is for this problem.
 
->> For those who might be interested, I've added two RSS feeds to <http://www.dreamwidth.org>: ikiwiki_news and ikiwiki_recent. 
+>> For those who might be interested, I've added the following RSS feeds to <http://www.dreamwidth.org>:
+*ikiwiki_bugs_feed,
+ikiwiki_forum_feed,
+ikiwiki_news_feed,
+ikiwiki_recent_feed,
+ikiwiki_todo_feed,
+ikiwiki_wishlist_feed*
+
 >>--[[KathrynAndersen]]
-- 
cgit v1.2.3


From 62dd681b3aa406a9bb6c1174eeaaacc8fe6b94ff Mon Sep 17 00:00:00 2001
From: "http://bsorez.myopenid.com/" <http://bsorez.myopenid.com/@web>
Date: Fri, 20 Nov 2009 17:09:20 -0500
Subject:

---
 doc/sandbox.mdwn | 62 +-------------------------------------------------------
 1 file changed, 1 insertion(+), 61 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8aedcbb9e..2a02d41ce 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,61 +1 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
-
-
-# Header
-
-## Subheader
-
-> This is a blockquote.
->
-> This is the first level of quoting.
->
-> > This is nested blockquote.
->
->> Without a space works too.
->>> to three levels
->
-> Back to the first level.
-
-Numbered list 
-
-1. First item.
- 1. Sub item.
-1. Another.
-1. And another..
- 1. foo
- 2. bar
-
-Bulleted list
-
-* item
-* *item*
-* item
-* one
-  * two
-
-----
-
-[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
-[[!haiku hint="sandbox play"]]
-
-----
-
-## Different sorts of links:
-
-* [[Features]]
-* <http://ikiwiki.info/ikiwiki/formatting/>
-* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
-* <http://www.gnu.org/>
-* [GNU](http://www.gnu.org/)
-
------
-
-[[!progress percent=27]]
-
-[[!progress percent=78]]
-
------
-
-This **SandBox** is also a [[blog]]!
-
-[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+TEST
-- 
cgit v1.2.3


From dc15be03d69604fcae20ce49d684d3146ff068a6 Mon Sep 17 00:00:00 2001
From: harishcm <harishcm@web>
Date: Sat, 21 Nov 2009 05:18:00 -0500
Subject: Patch added

---
 ...a_sidebar_does_not_regenerate_the_subpages.mdwn | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/doc/bugs/Building_a_sidebar_does_not_regenerate_the_subpages.mdwn b/doc/bugs/Building_a_sidebar_does_not_regenerate_the_subpages.mdwn
index 596719a8b..93aafc2c0 100644
--- a/doc/bugs/Building_a_sidebar_does_not_regenerate_the_subpages.mdwn
+++ b/doc/bugs/Building_a_sidebar_does_not_regenerate_the_subpages.mdwn
@@ -7,3 +7,54 @@ If sandbox/page.mdwn has been generated and sandbox/sidebar.mdwn is created, the
 	# currently requires a wiki rebuild.
 	add_depends($page, $sidebar_page);
 
+----
+Below is a patch for the bug. It's inspired by trying to solve [[todo/Post-compilation inclusion of the sidebar]].
+What do you think about it? I have a concern though. If a sidebar is removed, it takes two refreshes to update 
+the affected pages. Is this a feature or a bug? --[[harishcm]]
+
+    --- sidebar.pm.orig	2009-11-21 17:40:02.000000000 +0800
+    +++ sidebar_bugfix.pm	2009-11-21 18:16:11.000000000 +0800
+    @@ -10,6 +10,7 @@
+     
+     sub import {
+     	hook(type => "getsetup", id => "sidebar", call => \&getsetup);
+    +	hook(type => "needsbuild", id => "sidebar", call => \&needsbuild);
+     	hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);
+     }
+     
+    @@ -21,6 +22,22 @@
+     		},
+     }
+     
+    +sub needsbuild (@) {
+    +	my $needsbuild=shift;
+    +
+    +	# Determine every pages' sidebar page
+    +	foreach my $page (keys %pagesources) {
+    +		my $sidebar_page='';
+    +		$sidebar_page=bestlink($page, "sidebar");
+    +		
+    +		# If a page's sidebar has changed, force rebuild
+    +		if (!exists $pagestate{$page}{sidebar}{sidebar_page} || $pagestate{$page}{sidebar}{sidebar_page} ne $sidebar_page) {
+    +			$pagestate{$page}{sidebar}{sidebar_page} = $sidebar_page;
+    +			push @$needsbuild, $pagesources{$page};
+    +		}
+    +	}
+    +}
+    +
+     sub sidebar_content ($) {
+     	my $page=shift;
+     	
+    @@ -29,9 +46,9 @@
+     	my $sidebar_type=pagetype($sidebar_file);
+     	
+     	if (defined $sidebar_type) {
+    -		# FIXME: This isn't quite right; it won't take into account
+    -		# adding a new sidebar page. So adding such a page
+    -		# currently requires a wiki rebuild.
+    +		# Record current sidebar page for rechecking bestlink 
+    +		# during wiki refresh. Also add depends on the sidebar page.
+    +		$pagestate{$page}{sidebar}{sidebar_page}=$sidebar_page;
+     		add_depends($page, $sidebar_page);
+     
+     		my $content=readfile(srcfile($sidebar_file));
-- 
cgit v1.2.3


From ff5ae256b9dd0554a881388d88788366049babf1 Mon Sep 17 00:00:00 2001
From: harishcm <harishcm@web>
Date: Sat, 21 Nov 2009 05:28:25 -0500
Subject:

---
 doc/users/harishcm.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/harishcm.mdwn b/doc/users/harishcm.mdwn
index 47f28c83c..164711022 100644
--- a/doc/users/harishcm.mdwn
+++ b/doc/users/harishcm.mdwn
@@ -1 +1 @@
-Using ikiwiki for my yet to be publish personal website :)
+Using ikiwiki for my yet to be published personal website :)
-- 
cgit v1.2.3


From cf6fd45a8a6379232c3c8dec652175c42a96040b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 22 Nov 2009 15:08:49 -0500
Subject: restore sandbox

---
 doc/sandbox.mdwn | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 2a02d41ce..8aedcbb9e 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1 +1,61 @@
-TEST
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
+
+
+# Header
+
+## Subheader
+
+> This is a blockquote.
+>
+> This is the first level of quoting.
+>
+> > This is nested blockquote.
+>
+>> Without a space works too.
+>>> to three levels
+>
+> Back to the first level.
+
+Numbered list 
+
+1. First item.
+ 1. Sub item.
+1. Another.
+1. And another..
+ 1. foo
+ 2. bar
+
+Bulleted list
+
+* item
+* *item*
+* item
+* one
+  * two
+
+----
+
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]
+
+----
+
+## Different sorts of links:
+
+* [[Features]]
+* <http://ikiwiki.info/ikiwiki/formatting/>
+* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
+* <http://www.gnu.org/>
+* [GNU](http://www.gnu.org/)
+
+-----
+
+[[!progress percent=27]]
+
+[[!progress percent=78]]
+
+-----
+
+This **SandBox** is also a [[blog]]!
+
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-- 
cgit v1.2.3


From ab2f53b081f98f92a40bb782ae9a755d7f6e4f6d Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4"
 <https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4@web>
Date: Mon, 23 Nov 2009 02:16:28 -0500
Subject:

---
 doc/sandbox.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 2a02d41ce..f789143a6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1 +1,3 @@
-TEST
+# Sandbox
+
+Omne contento in Wikipedia es subjecte al [Licentia GNU pro Documentation Libere](http://ia.wikipedia.org/wiki/Licentia_GNU_pro_Documentation_Libere).
-- 
cgit v1.2.3


From 34b961e31684bf11cf34aa720f4f75f2e23da5d4 Mon Sep 17 00:00:00 2001
From: Sean Bartell <wingedtachikoma@gmail.com>
Date: Mon, 23 Nov 2009 02:25:38 -0500
Subject: Revert removal of sandbox content.

This reverts commit 62dd681b3aa406a9bb6c1174eeaaacc8fe6b94ff.

Conflicts:

	doc/sandbox.mdwn
---
 doc/sandbox.mdwn | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index f789143a6..bf913e78c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,3 +1,63 @@
 # Sandbox
 
 Omne contento in Wikipedia es subjecte al [Licentia GNU pro Documentation Libere](http://ia.wikipedia.org/wiki/Licentia_GNU_pro_Documentation_Libere).
+
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
+
+
+## Subheader
+
+> This is a blockquote.
+>
+> This is the first level of quoting.
+>
+> > This is nested blockquote.
+>
+>> Without a space works too.
+>>> to three levels
+>
+> Back to the first level.
+
+Numbered list 
+
+1. First item.
+ 1. Sub item.
+1. Another.
+1. And another..
+ 1. foo
+ 2. bar
+
+Bulleted list
+
+* item
+* *item*
+* item
+* one
+  * two
+
+----
+
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]
+
+----
+
+## Different sorts of links:
+
+* [[Features]]
+* <http://ikiwiki.info/ikiwiki/formatting/>
+* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
+* <http://www.gnu.org/>
+* [GNU](http://www.gnu.org/)
+
+-----
+
+[[!progress percent=27]]
+
+[[!progress percent=78]]
+
+-----
+
+This **SandBox** is also a [[blog]]!
+
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-- 
cgit v1.2.3


From 6a694c5663666f6f88c5f691de57f48ee1f52b2c Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4"
 <https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4@web>
Date: Mon, 23 Nov 2009 02:29:08 -0500
Subject: new post "Post"

---
 doc/sandbox/Post.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/sandbox/Post.mdwn

diff --git a/doc/sandbox/Post.mdwn b/doc/sandbox/Post.mdwn
new file mode 100644
index 000000000..7ae61669b
--- /dev/null
+++ b/doc/sandbox/Post.mdwn
@@ -0,0 +1,5 @@
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages and history in a
+[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
+There are many other [[features]], including support for
+[[blogging|blog]], as well as a large array of [[plugins]].
-- 
cgit v1.2.3


From 8eb2cbdf93f55090429526371833f108a886f5c6 Mon Sep 17 00:00:00 2001
From: "http://www.openid.albertlash.com/openid/"
 <http://www.openid.albertlash.com/openid/@web>
Date: Mon, 23 Nov 2009 07:44:05 -0500
Subject:

---
 doc/setup/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 1c5ad8260..a4f023dec 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -242,3 +242,6 @@ Thank you! I'm not a Perl programmer, so what's your opinion: is this behavior a
 
 > That is not entirely clear to me from the documentation. It doesn't
 > say the path has to exist, but doesn't say it cannot either. --[[Joey]]
+
+I am experiencing the same problem "/etc/ikiwiki/custom: failed to set up the repository with ikiwiki-makerepo
+" on Debian squeeze with perl5.10.0. -- [Albert](http://www.docunext.com/)
-- 
cgit v1.2.3


From 2a933a07c63056df0a645c501e16a951c7308184 Mon Sep 17 00:00:00 2001
From: "http://www.openid.albertlash.com/openid/"
 <http://www.openid.albertlash.com/openid/@web>
Date: Mon, 23 Nov 2009 07:52:01 -0500
Subject:

---
 doc/setup/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index a4f023dec..b71263dae 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -244,4 +244,4 @@ Thank you! I'm not a Perl programmer, so what's your opinion: is this behavior a
 > say the path has to exist, but doesn't say it cannot either. --[[Joey]]
 
 I am experiencing the same problem "/etc/ikiwiki/custom: failed to set up the repository with ikiwiki-makerepo
-" on Debian squeeze with perl5.10.0. -- [Albert](http://www.docunext.com/)
+" on Debian squeeze with perl5.10.0. Upgrading to ikiwiki 3.10 fixes it. -- [Albert](http://www.docunext.com/)
-- 
cgit v1.2.3


From b8ba8509adb5e8d84670d9f478e790363a89a526 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4"
 <https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4@web>
Date: Mon, 23 Nov 2009 21:22:50 -0500
Subject: sandbox: add text to check searching

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8aedcbb9e..3575a4dd6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -31,7 +31,7 @@ Bulleted list
 * *item*
 * item
 * one
-  * two
+  * footballs; runner; unices
 
 ----
 
-- 
cgit v1.2.3


From ca7a05cd6d0608adac13576e8242fc757d054a7f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 23 Nov 2009 21:52:02 -0500
Subject: update

---
 doc/forum/google_openid_broken__63__.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 1be9d0487..cd71abf64 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -28,3 +28,17 @@ http://openid-provider.appspot.com/larrylud
 >> URL directly, it doesn't work.  I think there is something weird with re-direction.  I hope this
 >> isn't a more general security hole.
 >> -- [[Will]]
+
+----
+
+So, while the above bug will probably get fixed sooner or later,
+the best approach for those of you needing a google openid now is
+to use gmail.
+
+
+Just a note that someone has apparently figured out how to use a google
+openid, and not a third-party provider either, to edit this site. 
+The openid is
+<https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4>
+(what a mouthfull!), and I don't know who that is or how to use it since it
+points to a fairly useless xml document, rather than a web page. --[[Joey]]
-- 
cgit v1.2.3


From 2903fe6539cd40e30543bc54933e53d795cb5e7d Mon Sep 17 00:00:00 2001
From: GraceTemplman46 <GraceTemplman46@web>
Date: Tue, 24 Nov 2009 02:39:34 -0500
Subject:

---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..3ffcf9b27 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -24,5 +24,5 @@ The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
 can be submitted and tracked using this wiki.
 
-ikiwiki is developed by [[Joey]] and many contributors,
+ikiwiki is developed by [[Joey]] and many [research paper](http://www.superiorpapers.com) contributors,
 and is [[FreeSoftware]].
-- 
cgit v1.2.3


From dcc0d76d8b373a2f4445a06717869859f1fea2b9 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Tue, 24 Nov 2009 08:52:46 +0100
Subject: Remove spam.

This reverts commit 2903fe6539cd40e30543bc54933e53d795cb5e7d.
---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 3ffcf9b27..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -24,5 +24,5 @@ The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
 can be submitted and tracked using this wiki.
 
-ikiwiki is developed by [[Joey]] and many [research paper](http://www.superiorpapers.com) contributors,
+ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
-- 
cgit v1.2.3


From 22a12717010546882860f770c1eb7bd083255914 Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <http://liw.fi/@web>
Date: Tue, 24 Nov 2009 04:07:27 -0500
Subject:

---
 doc/todo/support_link__40__.__41___in_pagespec.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/todo/support_link__40__.__41___in_pagespec.mdwn

diff --git a/doc/todo/support_link__40__.__41___in_pagespec.mdwn b/doc/todo/support_link__40__.__41___in_pagespec.mdwn
new file mode 100644
index 000000000..da55bce67
--- /dev/null
+++ b/doc/todo/support_link__40__.__41___in_pagespec.mdwn
@@ -0,0 +1,10 @@
+[[!tag wishlist]]
+
+It would be nice to have pagespecs support "link(.)" as syntax.
+This would match pages that link to the page that invokes the pagespec.
+The use case is a blog with tags, and having a page for each tag
+which uses !inline to list all posts with the tag.
+
+Joey said on IRC that "probably changing the derel() function in 
+IkiWiki.pm is the best way to do it".
+
-- 
cgit v1.2.3


From 43e95adc0ea864d1e59db0c6c1bcdda5c4ab5d50 Mon Sep 17 00:00:00 2001
From: NicolasLimare <NicolasLimare@web>
Date: Tue, 24 Nov 2009 04:47:36 -0500
Subject:

---
 doc/sandbox.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 3575a4dd6..92f6728ef 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -59,3 +59,17 @@ Bulleted list
 This **SandBox** is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+----
+
+
+[[!toggleable  id="foobar" text="""
+foo
+"""]]
+
+[[!toggleable  id="foobar" text="""
+bar
+"""]]
+
+[[!toggle  id="foobar" text="foo/bar"]]
+
-- 
cgit v1.2.3


From 4adf2e27c671d6b5441762df34c5ad32d91defe3 Mon Sep 17 00:00:00 2001
From: ettienne <ettienne@web>
Date: Tue, 24 Nov 2009 05:59:30 -0500
Subject:

---
 doc/tips/dot_cgi/discussion.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/tips/dot_cgi/discussion.mdwn b/doc/tips/dot_cgi/discussion.mdwn
index 124b9edff..a8854565c 100644
--- a/doc/tips/dot_cgi/discussion.mdwn
+++ b/doc/tips/dot_cgi/discussion.mdwn
@@ -34,3 +34,13 @@ there), and so I need to choose the more secure solution. --Ivan Z.
 >> The easiest way though is probably
 >> to add your ssh key to the special user's `.ssh/authorized_keys`
 >> and push that way. --[[Joey]] 
+
+## apache2 - run from userdir
+Followed instructions but couldn't get it right to run from user dir (running ubuntu jaunty),  
+Finally got it working once I've sym linked as follow (& restarted apache):    
+\# ln -s ../mods-available/userdir.load .  
+\# ln -s ../mods-available/userdir.conf .  
+\# pwd  
+/etc/apache2/mods-enabled  
+
+
-- 
cgit v1.2.3


From df75c5b93a1067461b649e48cc62d4c7f4d18ec7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 25 Nov 2009 01:18:43 -0500
Subject: date: New plugin that allows inserting date directives that expand to
 pretty-printed dates, using the same formatting as used for page modification
 date display, etc.

---
 IkiWiki/Plugin/date.pm          | 33 +++++++++++++++++++++++++++++++++
 debian/changelog                |  3 +++
 doc/ikiwiki/directive/date.mdwn | 14 ++++++++++++++
 doc/plugins/date.mdwn           |  6 ++++++
 4 files changed, 56 insertions(+)
 create mode 100644 IkiWiki/Plugin/date.pm
 create mode 100644 doc/ikiwiki/directive/date.mdwn
 create mode 100644 doc/plugins/date.mdwn

diff --git a/IkiWiki/Plugin/date.pm b/IkiWiki/Plugin/date.pm
new file mode 100644
index 000000000..8f2aa73d6
--- /dev/null
+++ b/IkiWiki/Plugin/date.pm
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::date;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "meta", call => \&getsetup);
+	hook(type => "preprocess", id => "meta", call => \&preprocess);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub preprocess (@) {
+	my $str=shift;
+
+	eval q{use Date::Parse};
+	error $@ if $@;
+	my $time = str2time($str);
+	if (! defined $time) {
+		error("unable to parse $str");
+	}
+	return displaytime($time);
+}
+
+1
diff --git a/debian/changelog b/debian/changelog
index 15d56a693..10fcebbec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
     larger for inlines of many, or complex pages.
   * Added (incomplete) Turkish po file. Closes: #556744
     Thanks, Recai Oktaş
+  * date: New plugin that allows inserting date directives that expand to
+    pretty-printed dates, using the same formatting as used for page
+    modification date display, etc.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500
 
diff --git a/doc/ikiwiki/directive/date.mdwn b/doc/ikiwiki/directive/date.mdwn
new file mode 100644
index 000000000..df45fa840
--- /dev/null
+++ b/doc/ikiwiki/directive/date.mdwn
@@ -0,0 +1,14 @@
+The `date` directive is supplied by the [[!iki plugins/date desc=date]] plugin.
+
+This directive can be used to display a date on a page, using the same
+display method that is used to display the modification date in the page
+footer, and other dates in the wiki. This can be useful for consistency
+of display, or if you want to embed parseable dates into the page source.
+
+Like the dates used by the [[meta]] directive, the date can be entered in
+nearly any format, since it's parsed by [[!cpan TimeDate]].
+
+For example, an update to a page with an embedded date stamp could look
+like:
+
+	Updated \[[!date "Wed, 25 Nov 2009 01:11:55 -0500"]]: mumble mumble
diff --git a/doc/plugins/date.mdwn b/doc/plugins/date.mdwn
new file mode 100644
index 000000000..b8dbdfee5
--- /dev/null
+++ b/doc/plugins/date.mdwn
@@ -0,0 +1,6 @@
+[[!template id=plugin name=date author="[[Joey]]"]]
+[[!tag type/meta]]
+
+This plugin provides the [[ikiwiki/directive/date]]
+[[ikiwiki/directive]], which provides a way to display an arbitrary date
+in a page.
-- 
cgit v1.2.3


From f4cb6edd0f4d32710e2ef6ddef7de1b06b103389 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 25 Nov 2009 01:31:44 -0500
Subject: remove info about how to manually add relativedates

The date directive is a better approach.
---
 doc/plugins/relativedate.mdwn | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/doc/plugins/relativedate.mdwn b/doc/plugins/relativedate.mdwn
index 3ada0864b..50c96c5d7 100644
--- a/doc/plugins/relativedate.mdwn
+++ b/doc/plugins/relativedate.mdwn
@@ -8,9 +8,3 @@ cause a tooltip to pop up with the absolute date.
 This only works in browsers with javascript enabled; other browsers will
 show the absolute date instead. Also, this plugin can be used with other
 plugins like [[prettydate]] that change how the absolute date is displayed.
-
-If this plugin is enabled, you may also add relative dates to pages in the
-wiki, by using html elements in the "relativedate" class. For example, this
-will display as a relative date:
-
-	<span class="relativedate">Tue Jan 20 12:00:00 EDT 2009</span>
-- 
cgit v1.2.3


From 09dbbaf24573b235b8976339062138ec00b94520 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 25 Nov 2009 06:49:26 -0500
Subject: fix hook names

---
 IkiWiki/Plugin/date.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/date.pm b/IkiWiki/Plugin/date.pm
index 8f2aa73d6..652e6df0a 100644
--- a/IkiWiki/Plugin/date.pm
+++ b/IkiWiki/Plugin/date.pm
@@ -6,8 +6,8 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
-	hook(type => "getsetup", id => "meta", call => \&getsetup);
-	hook(type => "preprocess", id => "meta", call => \&preprocess);
+	hook(type => "getsetup", id => "date", call => \&getsetup);
+	hook(type => "preprocess", id => "date", call => \&preprocess);
 }
 
 sub getsetup () {
-- 
cgit v1.2.3


From ae64fadcce529d771c7b7047ba8859757847170a Mon Sep 17 00:00:00 2001
From: harishcm <harishcm@web>
Date: Wed, 25 Nov 2009 09:15:40 -0500
Subject:

---
 doc/bugs/bestlink_returns_deleted_pages.mdwn | 54 ++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 doc/bugs/bestlink_returns_deleted_pages.mdwn

diff --git a/doc/bugs/bestlink_returns_deleted_pages.mdwn b/doc/bugs/bestlink_returns_deleted_pages.mdwn
new file mode 100644
index 000000000..59e9dbcb5
--- /dev/null
+++ b/doc/bugs/bestlink_returns_deleted_pages.mdwn
@@ -0,0 +1,54 @@
+To reproduce: 
+
+1. Add the backlinkbug plugin below to ikiwiki. 
+2. Create a page named test.mdwn somewhere in the wiki. 
+3. Refresh ikiwiki in verbose mode. Pages whose bestlink is the test.mwdn page will be printed to the terminal.
+4. Delete test.mdwn.
+5. Refresh ikiwiki in verbose mode again. The same pages will be printed to the terminal again.
+6. Refresh ikiwiki in verbose mode another time. Now no pages will be printed.
+
+bestlink() checks %links (and %pagecase) to confirm the existance of the page.
+However, find_del_files() does not remove the deleted page from %links (and %pagecase).
+
+Since find_del_files removes the deleted page from %pagesources and %destsources,
+won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
+
+
+----
+
+    #!/usr/bin/perl
+    # Plugin to reproduce bestlink returning deleted pages. 
+    # Run with ikiwiki in verbose mode.
+    
+    package IkiWiki::Plugin::bestlinkbug;
+    
+    use warnings;
+    use strict;
+    use IkiWiki 3.00;
+    
+    sub import {
+    	hook(type => "getsetup", id => "bestlinkbug", call => \&getsetup);
+    	hook(type => "needsbuild", id => "bestlinkbug", call => \&needsbuild);
+    }
+    
+    sub getsetup () {
+    	return
+    		plugin => {
+    			safe => 1,
+    			rebuild => 0,
+    		},
+    }
+    
+    sub needsbuild (@) {
+    	my $needsbuild=shift;
+    	
+    	foreach my $page (keys %pagestate) {
+    		my $testpage=bestlink($page, "test") || next;
+    		
+    		debug("$page");
+    	}
+    }	
+    
+    1
+
+
-- 
cgit v1.2.3


From f0d1c32504321ae55e1663af00c15fab88558e3c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 25 Nov 2009 17:19:17 -0500
Subject: google's openid support announced today does work

---
 doc/forum/google_openid_broken__63__.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index cd71abf64..53713ce10 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -1,3 +1,9 @@
+Now that google supports using thier profiles as OpenIDs, that can be used
+directly to sign into ikiwiki. Just use, for example, 
+<http://www.google.com/profiles/joeyhess> . Tested and it works. --[[Joey]] 
+
+## historical discussion
+
 when I login via to this wiki (or ours) via Google's OpenID, I get this error:
 
 Error: OpenID failure: no_identity_server: The provided URL doesn't declare its OpenID identity server. 
-- 
cgit v1.2.3


From d334e0221143e20b95e5b979dfc8eac0440c12a7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 25 Nov 2009 17:22:33 -0500
Subject: remove videntity, site not in english now, and does not appear in
 openid directory

---
 doc/ikiwiki/openid.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwiki/openid.mdwn b/doc/ikiwiki/openid.mdwn
index a79655284..318928139 100644
--- a/doc/ikiwiki/openid.mdwn
+++ b/doc/ikiwiki/openid.mdwn
@@ -13,7 +13,6 @@ To sign up for an OpenID, visit one of the following identity providers:
 
 * [MyOpenID](https://www.myopenid.com/)
 * [GetOpenID](https://getopenid.com/)
-* [Videntity](http://videntity.org/)
 * [LiveJournal](http://www.livejournal.com/openid/)
 * [TrustBearer](https://openid.trustbearer.com/)
 * or any of the [many others out there](http://openiddirectory.com/openid-providers-c-1.html)
-- 
cgit v1.2.3


From 268a2dd54cd47d6ec39c22d61baa5f6f9d40b7f5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 26 Nov 2009 14:10:21 -0500
Subject: htmllink: allow a title attribute to be specified

---
 IkiWiki.pm             | 9 ++++-----
 debian/changelog       | 1 +
 doc/plugins/write.mdwn | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1e9d1ca2a..611ba6f65 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1081,11 +1081,10 @@ sub htmllink ($$$;@) {
 	}
 
 	my @attrs;
-	if (defined $opts{rel}) {
-		push @attrs, ' rel="'.$opts{rel}.'"';
-	}
-	if (defined $opts{class}) {
-		push @attrs, ' class="'.$opts{class}.'"';
+	foreach my $attr (qw{rel class title}) {
+		if (defined $opts{$attr}) {
+			push @attrs, " $attr=\"".$opts{attr}.'"';
+		}
 	}
 
 	return "<a href=\"$bestlink\"@attrs>$linktext</a>";
diff --git a/debian/changelog b/debian/changelog
index 10fcebbec..e31928223 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
   * date: New plugin that allows inserting date directives that expand to
     pretty-printed dates, using the same formatting as used for page
     modification date display, etc.
+  * htmllink: Allow a title attribute to be specified.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 2f179d46f..45f083b42 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -712,6 +712,7 @@ control some options. These are:
 * anchor - set to make the link include an anchor
 * rel - set to add a rel attribute to the link
 * class - set to add a css class to the link
+* title - set to add a title attribute to the link
 
 #### `readfile($;$)`
 
-- 
cgit v1.2.3


From 2255a6a0bba10eece24304f64ec8329068e8bf07 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 26 Nov 2009 14:57:52 -0500
Subject: calendar: Add title attributes for all links in the calendars.

---
 IkiWiki.pm                 |  2 +-
 IkiWiki/Plugin/calendar.pm | 33 +++++++++++++++++++++------------
 debian/changelog           |  1 +
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 611ba6f65..99d5724eb 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1083,7 +1083,7 @@ sub htmllink ($$$;@) {
 	my @attrs;
 	foreach my $attr (qw{rel class title}) {
 		if (defined $opts{$attr}) {
-			push @attrs, " $attr=\"".$opts{attr}.'"';
+			push @attrs, " $attr=\"$opts{$attr}\"";
 		}
 	}
 
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index c9bdf4a17..cbbb57e98 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -128,7 +128,8 @@ sub format_month (@) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}/".$params{month},
 			noimageinline => 1,
-			linktext => " $monthname ");
+			linktext => $monthname,
+			title => $monthname);
 	}
 	add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
 		deptype("presence"));
@@ -136,7 +137,8 @@ sub format_month (@) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/$pmonth",
 			noimageinline => 1,
-			linktext => "\&larr");
+			linktext => "\&larr",
+			title => $pmonthname);
 	}
 	add_depends($params{page}, "$archivebase/$pyear/$pmonth",
 		deptype("presence"));
@@ -144,7 +146,8 @@ sub format_month (@) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/$nmonth",
 			noimageinline => 1,
-			linktext => "\&rarr");
+			linktext => "\&rarr",
+			title => $nmonthname);
 	}
 	add_depends($params{page}, "$archivebase/$nyear/$nmonth",
 		deptype("presence"));
@@ -173,7 +176,7 @@ EOF
 		my $dowabbr = POSIX::strftime("%a", @day);
 		$downame{$dow % 7}=$downame;
 		$dowabbr{$dow % 7}=$dowabbr;
-		$calendar.= qq{\t\t<th class="month-calendar-day-head $downame">$dowabbr</th>\n};
+		$calendar.= qq{\t\t<th class="month-calendar-day-head $downame" title="$downame">$dowabbr</th>\n};
 	}
 
 	$calendar.=<<EOF;
@@ -191,7 +194,7 @@ EOF
 	# nothing has been printed, or else we are in the middle of a row.
 	for (my $day = 1; $day <= month_days(year => $params{year}, month => $params{month});
 	     $day++, $wday++, $wday %= 7) {
-		# At tihs point, on a week_start_day, we close out a row,
+		# At this point, on a week_start_day, we close out a row,
 		# and start a new one -- unless it is week_start_day on the
 		# first, where we do not close a row -- since none was started.
 		if ($wday == $week_start_day) {
@@ -200,7 +203,8 @@ EOF
 		}
 		
 		my $tag;
-		if (defined $linkcache{"$params{year}/$params{month}/$day"}) {
+		my $key="$params{year}/$params{month}/$day";
+		if (defined $linkcache{$key}) {
 			if ($day == $today) {
 				$tag='month-calendar-day-this-day';
 			}
@@ -209,9 +213,10 @@ EOF
 			}
 			$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
 			$calendar.=htmllink($params{page}, $params{destpage}, 
-				$linkcache{"$params{year}/$params{month}/$day"},
+				$linkcache{$key},
 				noimageinline => 1,
-				"linktext" => "$day");
+				linktext => $day,
+				title => pagetitle(IkiWiki::basename($linkcache{$key})));
 			$calendar.=qq{</td>\n};
 		}
 		else {
@@ -276,21 +281,24 @@ sub format_year (@) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}",
 			noimageinline => 1,
-			linktext => "$params{year}");
+			linktext => $params{year},
+			title => $params{year});
 	}
 	add_depends($params{page}, "$archivebase/$params{year}", deptype("presence"));
 	if (exists $pagesources{"$archivebase/$pyear"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear",
 			noimageinline => 1,
-			linktext => "\&larr;");
+			linktext => "\&larr;",
+			title => $pyear);
 	}
 	add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
 	if (exists $pagesources{"$archivebase/$nyear"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear",
 			noimageinline => 1,
-			linktext => "\&rarr;");
+			linktext => "\&rarr;",
+			title => $nyear);
 	}
 	add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
 
@@ -333,7 +341,8 @@ EOF
 			$murl = htmllink($params{page}, $params{destpage}, 
 				"$archivebase/$params{year}/$mtag",
 				noimageinline => 1,
-				linktext => "$monthabbr");
+				linktext => $monthabbr,
+				title => $monthname);
 			$calendar.=qq{\t<td class="$tag">};
 			$calendar.=$murl;
 			$calendar.=qq{\t</td>\n};
diff --git a/debian/changelog b/debian/changelog
index e31928223..2b468ca2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
     pretty-printed dates, using the same formatting as used for page
     modification date display, etc.
   * htmllink: Allow a title attribute to be specified.
+  * calendar: Add title attributes for all links in the calendars.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500
 
-- 
cgit v1.2.3


From a53bded6941198b33b928c1f7a989e37d4ab1b0e Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/will.uther"
 <http://www.google.com/profiles/will.uther@web>
Date: Fri, 27 Nov 2009 21:54:52 -0500
Subject: Note on delegation of Google profile openids

---
 doc/forum/google_openid_broken__63__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 53713ce10..68b44f2c1 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -2,6 +2,8 @@ Now that google supports using thier profiles as OpenIDs, that can be used
 directly to sign into ikiwiki. Just use, for example, 
 <http://www.google.com/profiles/joeyhess> . Tested and it works. --[[Joey]] 
 
+> This seems to work fine if you use the profile directly as an OpenID.  It doesn't seem to work with delegation.  From that I can see, this is a deliberate decision by Google for security reasons.  See the response [here](http://groups.google.com/group/google-federated-login-api/browse_thread/thread/825067789537568c/23451a68c8b8b057?show_docid=23451a68c8b8b057). -- [[Will]]
+
 ## historical discussion
 
 when I login via to this wiki (or ours) via Google's OpenID, I get this error:
-- 
cgit v1.2.3


From 617a3acfe462690713fc674abce1a97349efaba8 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/will.uther"
 <http://www.google.com/profiles/will.uther@web>
Date: Fri, 27 Nov 2009 21:56:24 -0500
Subject: Add google profile openid

---
 doc/users/Will.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/Will.mdwn b/doc/users/Will.mdwn
index 043203dc3..f5effdbe3 100644
--- a/doc/users/Will.mdwn
+++ b/doc/users/Will.mdwn
@@ -2,7 +2,7 @@ I started using Ikiwiki as a way to replace [Trac](http://trac.edgewall.org/) wh
 
 Lately I've been using Ikiwiki for other things and seem to be scratching a few itches here and there. :)
 
-I generally use my [[ikiwiki/openid]] login when editing here: <http://www.cse.unsw.edu.au/~willu/>
+I generally use my [[ikiwiki/openid]] login when editing here: <http://www.cse.unsw.edu.au/~willu/> or <http://www.google.com/profiles/will.uther>.
 
 I have a git repository for some of my IkiWiki code: <http://www.cse.unsw.edu.au/~willu/ikiwiki.git>.
 
-- 
cgit v1.2.3


From 356bf3fed7700558e2e8dff26d3176aaf25f1b1e Mon Sep 17 00:00:00 2001
From: "http://beza1e1.myopenid.com/" <http://beza1e1.myopenid.com/@web>
Date: Sat, 28 Nov 2009 06:13:32 -0500
Subject: added my personal homepage

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index acb63be39..4e5a0b45e 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -129,6 +129,7 @@ Personal sites and blogs
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 * [Weakish Jiang's Homepage](http://weakish.pigro.net)
 * [Nico Schottelius' homepage](http://www.nico.schottelius.org)
+* [Andreas Zwinkaus homepage](http://beza1e1.tuxen.de)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From e0d4b55bc885550a0e5a4fd49e2389eaeb5ec384 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sat, 28 Nov 2009 21:36:01 -0500
Subject: this would be a nifty feature

---
 doc/todo/enable_arbitrary_markup_for_directives.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/todo/enable_arbitrary_markup_for_directives.mdwn

diff --git a/doc/todo/enable_arbitrary_markup_for_directives.mdwn b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
new file mode 100644
index 000000000..7aa0b6d06
--- /dev/null
+++ b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
@@ -0,0 +1,17 @@
+One of the good things about [PmWiki](http://www.pmwiki.org) is the ability to treat arbitrary markup as directives.
+In ikiwiki, all directives have the same format:
+
+\[[!name arguments]]
+
+But with PmWiki, directives can be added to the engine (with the "Markup" hook) with the usual name and function passing, but also with a regexp which has capturing parentheses, and the results of the match are passed to the given function.
+Would it be possible to alter the "preprocess" hook to have an optional regex argument which acted in a similar fashion?
+
+For example, one could then write a plugin which would treat
+
+Category: Foo, Bar
+
+as a tag, by using a regex such as /^Category:\s*([\w\s,]+)$/; the result "Foo, Bar" could then be further processed by the hook function.
+
+This could also make it easier to support more styles of markup, rather than having to do all the processing in "htmlize" and/or "filter".
+
+-- [[KathrynAndersen]]
-- 
cgit v1.2.3


From bac8bc027d4a1bb262300be2323ae4093c193e5b Mon Sep 17 00:00:00 2001
From: "http://bruno.boulgour.com/" <http://bruno.boulgour.com/@web>
Date: Sat, 28 Nov 2009 23:35:31 -0500
Subject: new version of the patch available on my git repo

---
 doc/todo/cas_authentication.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/todo/cas_authentication.mdwn b/doc/todo/cas_authentication.mdwn
index 8bf7042df..ed8010518 100644
--- a/doc/todo/cas_authentication.mdwn
+++ b/doc/todo/cas_authentication.mdwn
@@ -21,6 +21,19 @@ follows) ?
 > license statement at the top. I have a few questions that I'll insert
 > inline with the patch below. --[[Joey]]
 
+>> I have made some corrections to this patch (my cas plugin) in order to use
+>> IkiWiki 3.00 interface and take your comments into account. It should work
+>> fine now.
+>>
+>> You can pull it from my git repo at
+>> http://git.boulgour.com/bbb/ikiwiki.git/ and maybe add it to your main
+>> repo.
+>> 
+>> I will add GNU GPL copyright license statement as soon as I get some free
+>> time.
+>>
+>> --[[/users/bbb]]
+
 ------------------------------------------------------------------------------
     diff --git a/IkiWiki/Plugin/cas.pm b/IkiWiki/Plugin/cas.pm
     new file mode 100644
-- 
cgit v1.2.3


From 020200d84c8ee49be46d72e6c460f6a1906898e5 Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Mon, 30 Nov 2009 05:27:25 -0500
Subject: remove of one site which no longer uses ikiwiki

---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4e5a0b45e..418768a2c 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -127,7 +127,6 @@ Personal sites and blogs
 * [tumashu's page](http://tumashu.github.com) This is my personal site in github  created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master)  
 * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
-* [Weakish Jiang's Homepage](http://weakish.pigro.net)
 * [Nico Schottelius' homepage](http://www.nico.schottelius.org)
 * [Andreas Zwinkaus homepage](http://beza1e1.tuxen.de)
 
-- 
cgit v1.2.3


From 5e513aa867fe22e021a5d02bb3fba57302a30ea8 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 30 Nov 2009 06:19:51 -0500
Subject: spew stream-of-conciousness nonsense re web services, fastcgi etc.

---
 doc/forum/web_service_API__44___fastcgi_support.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/forum/web_service_API__44___fastcgi_support.mdwn

diff --git a/doc/forum/web_service_API__44___fastcgi_support.mdwn b/doc/forum/web_service_API__44___fastcgi_support.mdwn
new file mode 100644
index 000000000..480014c00
--- /dev/null
+++ b/doc/forum/web_service_API__44___fastcgi_support.mdwn
@@ -0,0 +1,11 @@
+This is a half-baked thought of mine so I thought I would post it in forum for discussion.
+
+There are some things that ikiwiki.cgi is asked to do which do not involve changing the repository: these include form generation, handling logins, the "goto" from [[recentchanges]], edit previews, etc.
+
+For one thing I am working on slowly ([[todo/interactive todo lists]]), I've hit a situation where I am likely to need to implement doing markup evaluation for a subset of a page. The problem I face is, if a user edits content in the browser, markup, ikiwiki directives etc. need to be expanded. I could possibly do this with a round-trip through edit preview, but that would be for the whole content of a page, and I hit the problem with editing a list item.
+
+Anyway - I've realised that a big part of the interactive todo lists stuff is trying to handle round trips to ikiwiki.cgi through javascript. A web services API would make handling the various conditions of this easier (e.g. need to login, login failed, etc.). I'm not sure what else might benefit from a web services API and I have no real experience of either using or writing them so I don't know what pros/cons there are for REST vs SOAP etc.
+
+Second, and in a way related, I've been mooting hacking fastcgi support into ikiwiki. Essentially one ikiwiki.cgi process would persist and serve CGI-ish requests on stdin/stdout. The initial content-scanning and dependency generation would happen once and not need to be repeated for future requests. Although, all state-changing operations would need to be careful to ensure the in-memory models were accurate. Also, I don't know how suited the data structures would be for persistence, since the current model is build em up, throw em away, they might not be space-efficient enough for persistence.
+
+If I did attempt this, I would want to avoid restructuring things in a way which would impair ikiwiki's core philosophy of being a static compiler. -- [[Jon]]
-- 
cgit v1.2.3


From 3540f9fb92903046c86192dc0517d037728fcc5d Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 30 Nov 2009 06:22:23 -0500
Subject: addendum re: plans for structuring JS

---
 doc/forum/web_service_API__44___fastcgi_support.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/web_service_API__44___fastcgi_support.mdwn b/doc/forum/web_service_API__44___fastcgi_support.mdwn
index 480014c00..4a78fb932 100644
--- a/doc/forum/web_service_API__44___fastcgi_support.mdwn
+++ b/doc/forum/web_service_API__44___fastcgi_support.mdwn
@@ -4,6 +4,8 @@ There are some things that ikiwiki.cgi is asked to do which do not involve chang
 
 For one thing I am working on slowly ([[todo/interactive todo lists]]), I've hit a situation where I am likely to need to implement doing markup evaluation for a subset of a page. The problem I face is, if a user edits content in the browser, markup, ikiwiki directives etc. need to be expanded. I could possibly do this with a round-trip through edit preview, but that would be for the whole content of a page, and I hit the problem with editing a list item.
 
+> (slight addendum on this front. I'm planning to split the javascript code for interactive todo lists into two parts: one for handling round trips of content to and from ikiwiki.cgi, and the various failure modes that might occur (permission denied, edit conflicts, login required, etc.) ; then the list-specific stuff can build on top of this. The first chunk might be reusable by others for other AJAXY-edit fu.)
+
 Anyway - I've realised that a big part of the interactive todo lists stuff is trying to handle round trips to ikiwiki.cgi through javascript. A web services API would make handling the various conditions of this easier (e.g. need to login, login failed, etc.). I'm not sure what else might benefit from a web services API and I have no real experience of either using or writing them so I don't know what pros/cons there are for REST vs SOAP etc.
 
 Second, and in a way related, I've been mooting hacking fastcgi support into ikiwiki. Essentially one ikiwiki.cgi process would persist and serve CGI-ish requests on stdin/stdout. The initial content-scanning and dependency generation would happen once and not need to be repeated for future requests. Although, all state-changing operations would need to be careful to ensure the in-memory models were accurate. Also, I don't know how suited the data structures would be for persistence, since the current model is build em up, throw em away, they might not be space-efficient enough for persistence.
-- 
cgit v1.2.3


From cdd9ef8d588650b19ebdf7724e25cc15bfb2b218 Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Mon, 30 Nov 2009 10:13:58 -0500
Subject: add info about webhost for ikiwiki

---
 doc/ikiwikiusers/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/ikiwikiusers/discussion.mdwn b/doc/ikiwikiusers/discussion.mdwn
index 39a9bb921..2c211b097 100644
--- a/doc/ikiwikiusers/discussion.mdwn
+++ b/doc/ikiwikiusers/discussion.mdwn
@@ -33,3 +33,7 @@ Hopefully I will be one of the ikiwiki users one day :) cheers --[[Chao]]
 ----
 
 Are there automated hosting sites for ikiwiki yet?  If you know one, can you add one in a new section on [[ikiwikiusers]] please?  If you don't know any and you're willing to pay to set one up (shouldn't be much more expensive than a single ikiwiki IMO), [contact me](http://www.ttllp.co.uk/contact.html) and let's talk. -- MJR
+
+----
+
+People who have interests in getting a webhost for ikiwiki may have a look at [this site](http://www.pigro.net).  -- weakish
-- 
cgit v1.2.3


From f1ddf4bd98821a597d8fa1532092f09d3d9b5483 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 30 Nov 2009 17:16:44 -0500
Subject: fix bestlink to not return just-deleted pages

bestlink was looking at whether %links existed for a page in order to tell
if the page exists, but just-deleted pages still have entries in there (for
reasons it may be best not to explore). So bestlink would return
just-deleted pages. Instead, make bestlink use %pagesources.

Also, when finding a deleted page, %pagecase was not cleared of that page.
This, again, made bestlink return just-deleted pages. Now that is cleared.

Fixing bestlink exposed another issue though. The backlink calculation code
uses bestlink. So when a page was deleted, no backlinks to it are found,
and pages that really did backlink to it were not updated, and had broken
links.

To fix that, the code that actually removes deleted pages had to be split
out from find_del_files, so it can run a bit later. It is run just after
backlinks are calculated. This way, backlink calculation still sees the
deleted pages, but everything afterwards does not.

However, it does not address the original bug report that started this
whole thing, [[bugs/bestlink_returns_deleted_pages]]. Because there
bestlink is run in the needsbuild hook. And that happens before backlink
calculation, and so bestlink still returns deleted pages then. Also in the
scan hook.

If bestlink needs to work consistently during those hooks, a more involved
fix will be needed.
---
 IkiWiki.pm        |  4 ++--
 IkiWiki/Render.pm | 34 ++++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 99d5724eb..3430c5742 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -881,7 +881,7 @@ sub bestlink ($$) {
 		$l.="/" if length $l;
 		$l.=$link;
 
-		if (exists $links{$l}) {
+		if (exists $pagesources{$l}) {
 			return $l;
 		}
 		elsif (exists $pagecase{lc $l}) {
@@ -891,7 +891,7 @@ sub bestlink ($$) {
 
 	if (length $config{userdir}) {
 		my $l = "$config{userdir}/".lc($link);
-		if (exists $links{$l}) {
+		if (exists $pagesources{$l}) {
 			return $l;
 		}
 		elsif (exists $pagecase{lc $l}) {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index ab3a71671..dec9293ad 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -392,27 +392,39 @@ sub find_del_files ($) {
 				push @internal_del, $pagesources{$page};
 			}
 			else {
-				debug(sprintf(gettext("removing old page %s"), $page));
 				push @del, $pagesources{$page};
 			}
 			$links{$page}=[];
 			$renderedfiles{$page}=[];
 			$pagemtime{$page}=0;
-			foreach my $old (@{$oldrenderedfiles{$page}}) {
-				prune($config{destdir}."/".$old);
-			}
-			delete $pagesources{$page};
-			foreach my $source (keys %destsources) {
-				if ($destsources{$source} eq $page) {
-					delete $destsources{$source};
-				}
-			}
 		}
 	}
 
 	return \@del, \@internal_del;
 }
 
+sub remove_del (@) {
+	foreach my $file (@_) {
+		my $page=pagename($file);
+		if (isinternal($page)) {
+			debug(sprintf(gettext("removing old page %s"), $page));
+		}
+	
+		foreach my $old (@{$oldrenderedfiles{$page}}) {
+			prune($config{destdir}."/".$old);
+		}
+
+		foreach my $source (keys %destsources) {
+			if ($destsources{$source} eq $page) {
+				delete $destsources{$source};
+			}
+		}
+	
+		delete $pagecase{lc $page};
+		delete $pagesources{$page};
+	}
+}
+
 sub find_changed ($) {
 	my $files=shift;
 	my @changed;
@@ -633,6 +645,8 @@ sub refresh () {
 	}
 
 	calculate_links();
+	
+	remove_del(@$del, @$internal_del);
 
 	foreach my $file (@$changed) {
 		render($file, sprintf(gettext("building %s"), $file));
-- 
cgit v1.2.3


From 58ce89355f5af0bf2d9cedef66d57acc4ef76497 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 30 Nov 2009 17:39:33 -0500
Subject: I just fixed half of ikiwiki's second-oldest bug. Yay!

---
 doc/bugs/bestlink_change_update_issue.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/bestlink_change_update_issue.mdwn b/doc/bugs/bestlink_change_update_issue.mdwn
index 8a526e821..c26e40d10 100644
--- a/doc/bugs/bestlink_change_update_issue.mdwn
+++ b/doc/bugs/bestlink_change_update_issue.mdwn
@@ -23,7 +23,10 @@
   Keeping a copy of the backlinks has some merit. It could also be
   incrementally updated.
 
+  This old bug still exists as of 031d1bf5046ab77c796477a19967e7c0c512c417.
+
 * And if Foo/Bar/Baz is then removed, Foo/Bar gets a broken link,
   instead of changing back to linking to Foo/Baz.
 
-This old bug still exists as of 031d1bf5046ab77c796477a19967e7c0c512c417.
+  This part was finally fixed by commit
+  f1ddf4bd98821a597d8fa1532092f09d3d9b5483.
-- 
cgit v1.2.3


From 01c0f533de4f6504df8e762125ec06f8458b1024 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 30 Nov 2009 18:05:47 -0500
Subject: fix test suite after bestlink change

---
 t/bestlink.t       | 4 ++--
 t/pagespec_match.t | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/t/bestlink.t b/t/bestlink.t
index 033b80d74..0020a05e2 100755
--- a/t/bestlink.t
+++ b/t/bestlink.t
@@ -11,11 +11,11 @@ sub test ($$$) {
 	my @existing_pages=@{shift()};
 	
 	%IkiWiki::pagecase=();
-	%links=();
+	%pagesources=();
 	$IkiWiki::config{userdir}="foouserdir";
 	foreach my $page (@existing_pages) {
 		$IkiWiki::pagecase{lc $page}=$page;
-		$links{$page}=[];
+		$pagesources{$page}="$page.mdwn";
 	}
 
 	return bestlink($page, $link);
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index d529106f7..b96947407 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -49,9 +49,13 @@ $links{"bugs/foo"}=[qw{bugs/done}];
 $links{"bugs/done"}=[];
 $links{"bugs/bar"}=[qw{done}];
 $links{"done"}=[];
+$links{"done"}=[];
 $links{"examples/softwaresite/bugs/fails_to_frobnicate"}=[qw{done}];
 $links{"examples/softwaresite/bugs/done"}=[];
 $links{"ook"}=[qw{/blog/tags/foo}];
+foreach my $p (keys %links) {
+	$pagesources{$p}="$p.mdwn";
+}
 
 ok(pagespec_match("foo", "link(bar)"), "link");
 ok(pagespec_match("foo", "link(ba?)"), "glob link");
-- 
cgit v1.2.3


From e104499f28f99408a6712aa603b9dd34e0b8471c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 30 Nov 2009 18:06:04 -0500
Subject: fixed.. partly

---
 doc/bugs/bestlink_returns_deleted_pages.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/bugs/bestlink_returns_deleted_pages.mdwn b/doc/bugs/bestlink_returns_deleted_pages.mdwn
index 59e9dbcb5..035023c7d 100644
--- a/doc/bugs/bestlink_returns_deleted_pages.mdwn
+++ b/doc/bugs/bestlink_returns_deleted_pages.mdwn
@@ -13,6 +13,20 @@ However, find_del_files() does not remove the deleted page from %links (and %pag
 Since find_del_files removes the deleted page from %pagesources and %destsources,
 won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
 
+> This same problem turned out to also be the root of half of ikiwiki's
+> second-oldest bug, [[bestlink_change_update_issue]].
+> 
+> Fixing it is really a bit involved, see commit
+> f1ddf4bd98821a597d8fa1532092f09d3d9b5483. The fix I committed fixes
+> bestlink to not return deleted pages, but only *after* the needsbuild and
+> scan hooks are called. So I was able to fix it for every case except the
+> one you gave! Sorry for that. To fix it during beedsbuild and scan, 
+> a much more involved approach would be needed. AFAICS, no existing plugin
+> in ikiwiki uses bestlink in needsbuild or scan though.
+> 
+> If the other half of [[bestlink_change_update_issue]] is fixed, 
+> maybe by keeping a copy of the old backlinks info, then that fix could be
+> applied here too. --[[Joey]]
 
 ----
 
-- 
cgit v1.2.3


From c5b554b9b23f7314f616746197a6c015f3c4aa49 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 30 Nov 2009 18:15:33 -0500
Subject: inline: Avoid using %links to test for page existence

%links is populated even for just-deleted pages, so %pagesources
should be used for such tests instead.
---
 IkiWiki/Plugin/inline.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 29729a414..93dc0149e 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -359,7 +359,7 @@ sub preprocess_inline (@) {
 					if ($config{discussion}) {
 						if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
 						    (length $config{cgiurl} ||
-						     exists $links{$page."/".$config{discussionpage}})) {
+						     exists $pagesources{$page."/".$config{discussionpage}})) {
 							$template->param(have_actions => 1);
 							$template->param(discussionlink =>
 								htmllink($page,
-- 
cgit v1.2.3


From df66288c4db6f670e3c258058712c9835f0ebf20 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 30 Nov 2009 20:31:37 -0500
Subject: an alternative approach using a bare mirror

---
 doc/tips/laptop_wiki_with_git.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index 9758beb80..e85f7d12b 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -1,3 +1,5 @@
+[[!toc]]
+
 Using ikiwiki with the [[rcs/git]] backend, some interesting things can be done
 with creating mirrors (or, really, branches) of a wiki. In this tip, I'll
 assume your wiki is located on a server, and you want to take a copy with
@@ -8,6 +10,8 @@ version on the laptop, perhaps while offline. You can browse and edit the
 wiki using a local web server. When you're ready, you can manually push the
 changes to the main wiki on the server.
 
+## Original approach
+
 First, set up the wiki on the server, if it isn't already. Nothing special
 needs to be done here, just follow the regular instructions in [[setup]]
 for setting up ikiwiki with git.
@@ -49,3 +53,14 @@ update the wiki, with a command such as `ikiwiki -setup wiki.setup -refresh`.
 If you'd like it to automatically update when changes are merged in, you
 can simply make a symlink `post-merge` hook pointing at the `post-update`
 hook ikiwiki created.
+
+## Alternative Approach
+
+As above, set up a normal ikiwiki on the server, with the usual bare repository.
+
+Next, `git clone --mirror server:/path/to/bare/repository`
+
+This will be used as the $REPOSITORY on the laptop.  Then you can follow the instructions in [[setup by hand|/setup/byhand]] as per a normal ikiwiki installation.
+This means that you can clone from the local bare repository as many times as you want (thus being able to have a repository which is used by the ikiwiki CGI, and another which you can use for updating via git).
+
+When you want to update the server from the laptop, do a `git push` from within the laptop's bare repository, and likewise do a `git pull` to update the laptop from the server.
-- 
cgit v1.2.3


From c6ea46807423f68e903f897c464b0ed35f0c586a Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 30 Nov 2009 20:45:31 -0500
Subject: tagged this wishlist; was I supposed to do that?

---
 doc/todo/enable_arbitrary_markup_for_directives.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/enable_arbitrary_markup_for_directives.mdwn b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
index 7aa0b6d06..94713838e 100644
--- a/doc/todo/enable_arbitrary_markup_for_directives.mdwn
+++ b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
@@ -15,3 +15,5 @@ as a tag, by using a regex such as /^Category:\s*([\w\s,]+)$/; the result "Foo,
 This could also make it easier to support more styles of markup, rather than having to do all the processing in "htmlize" and/or "filter".
 
 -- [[KathrynAndersen]]
+
+[[!taglink wishlist]]
-- 
cgit v1.2.3


From 124200f3e31624457eb71167a1e74ce2aa70b819 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 30 Nov 2009 21:42:58 -0500
Subject: added my ikiwiki plugins git repo

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index ce762b0cd..fef2e01e0 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -52,6 +52,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[will]] `http://www.cse.unsw.edu.au/~willu/ikiwiki.git`
 * [[kaizer]] `git://github.com/engla/ikiwiki.git`
 * [[bbb]] `http://git.boulgour.com/bbb/ikiwiki.git`
+* [[KathrynAndersen]] `git://github.com/rubykat/ikiplugins.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 9f30da3e1cb4fef022e1ad4802a6406e61c524d4 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 30 Nov 2009 21:55:06 -0500
Subject: xslt plugin

---
 doc/plugins/contrib/xslt.mdwn | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 doc/plugins/contrib/xslt.mdwn

diff --git a/doc/plugins/contrib/xslt.mdwn b/doc/plugins/contrib/xslt.mdwn
new file mode 100644
index 000000000..406d42f4e
--- /dev/null
+++ b/doc/plugins/contrib/xslt.mdwn
@@ -0,0 +1,37 @@
+## NAME
+
+IkiWiki::Plugin::xslt - ikiwiki directive to process an XML file with XSLT
+
+## SYNOPSIS
+
+\[[!xslt file="data1.xml" stylesheet="style1.xsl"]]
+
+## DESCRIPTION
+
+IkiWiki::Plugin::xslt is an IkiWiki plugin implementing a directive
+to process an input XML data file with XSLT, and output the result in
+the page where the directive was called.
+
+It is expected that the XSLT stylesheet will output valid HTML markup.
+
+## OPTIONS
+
+There are two arguments to this directive.
+
+* **file:**
+  The file which contains XML data to be processed.  This file is searched for using the usual IkiWiki mechanism, thus finding the file first in the same directory as the page, then in the directory above, and so on.
+
+* **stylesheet:**
+  The file which contains XSLT stylesheet to apply to the XML data.  This file is searched for using the usual IkiWiki mechanism, thus finding the file first in the same directory as the page, then in the directory above, and so on.
+
+## PREREQUISITES
+
+    IkiWiki
+    XML::LibXML
+    XML::LibXSLT
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/xslt.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
+
-- 
cgit v1.2.3


From d57ec1c6a4d2e05d2570fb273c7682d383b3b7d9 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Tue, 1 Dec 2009 11:30:03 -0500
Subject: add plugin template

---
 doc/plugins/contrib/xslt.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/plugins/contrib/xslt.mdwn b/doc/plugins/contrib/xslt.mdwn
index 406d42f4e..e26f58e38 100644
--- a/doc/plugins/contrib/xslt.mdwn
+++ b/doc/plugins/contrib/xslt.mdwn
@@ -1,3 +1,4 @@
+[[!template id=plugin name=xslt author="rubykat"]]
 ## NAME
 
 IkiWiki::Plugin::xslt - ikiwiki directive to process an XML file with XSLT
-- 
cgit v1.2.3


From 99ffde64a8fb9059a32e49ae8653d18d80a1e190 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 1 Dec 2009 15:51:47 -0500
Subject: is this really better?

---
 doc/todo/enable_arbitrary_markup_for_directives.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/todo/enable_arbitrary_markup_for_directives.mdwn b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
index 94713838e..aa7b6fa49 100644
--- a/doc/todo/enable_arbitrary_markup_for_directives.mdwn
+++ b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
@@ -17,3 +17,19 @@ This could also make it easier to support more styles of markup, rather than hav
 -- [[KathrynAndersen]]
 
 [[!taglink wishlist]]
+
+> Arbitrary text transformations can already be done via the filter and
+> sanitize hooks. That's how the smiley and typography plugins do their
+> thing.
+> 
+> AFAICS, the only benefit to having a regexp-based-hook interface is less
+> overhead in passing page content into the hooks. But that overhead is a
+> small amount of the total render time.
+>
+> Also, I notice that smiley does such complicated things in its sanitize
+> hook (ie, it looks at html context around the smilies) that a simple
+> matching regexp would not be sufficient. Furthermore, typography needs to
+> pass the page content into the library it uses, which does not expose
+> regexps to match on. So ikiwiki's more general filtering interface seems
+> to allow both of these to do things that could not be done with the
+> PmWiki interface. --[[Joey]] 
-- 
cgit v1.2.3


From b042e4a0511a77df97d1be0657a2621bf1a1de1a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 1 Dec 2009 15:54:48 -0500
Subject: rename headers

---
 doc/tips/laptop_wiki_with_git.mdwn | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index e85f7d12b..85e26c729 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -10,7 +10,7 @@ version on the laptop, perhaps while offline. You can browse and edit the
 wiki using a local web server. When you're ready, you can manually push the
 changes to the main wiki on the server.
 
-## Original approach
+## simple clone approach
 
 First, set up the wiki on the server, if it isn't already. Nothing special
 needs to be done here, just follow the regular instructions in [[setup]]
@@ -54,13 +54,19 @@ If you'd like it to automatically update when changes are merged in, you
 can simply make a symlink `post-merge` hook pointing at the `post-update`
 hook ikiwiki created.
 
-## Alternative Approach
+## bare mirror approach
 
 As above, set up a normal ikiwiki on the server, with the usual bare repository.
 
 Next, `git clone --mirror server:/path/to/bare/repository`
 
-This will be used as the $REPOSITORY on the laptop.  Then you can follow the instructions in [[setup by hand|/setup/byhand]] as per a normal ikiwiki installation.
-This means that you can clone from the local bare repository as many times as you want (thus being able to have a repository which is used by the ikiwiki CGI, and another which you can use for updating via git).
+This will be used as the $REPOSITORY on the laptop.  Then you can follow
+the instructions in [[setup by hand|/setup/byhand]] as per a normal ikiwiki
+installation. This means that you can clone from the local bare repository
+as many times as you want (thus being able to have a repository which is
+used by the ikiwiki CGI, and another which you can use for updating via
+git).
 
-When you want to update the server from the laptop, do a `git push` from within the laptop's bare repository, and likewise do a `git pull` to update the laptop from the server.
+When you want to update the server from the laptop, do a `git push` from
+within the laptop's bare repository, and likewise do a `git pull` to update
+the laptop from the server.
-- 
cgit v1.2.3


From db746519ebca6495342d836a77c0664977ee0d99 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 1 Dec 2009 16:04:18 -0500
Subject: security and comments

---
 doc/plugins/contrib/xslt/discussion.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 doc/plugins/contrib/xslt/discussion.mdwn

diff --git a/doc/plugins/contrib/xslt/discussion.mdwn b/doc/plugins/contrib/xslt/discussion.mdwn
new file mode 100644
index 000000000..a549681de
--- /dev/null
+++ b/doc/plugins/contrib/xslt/discussion.mdwn
@@ -0,0 +1,16 @@
+## security
+
+I'm curious what the security implications of having this plugin on a
+publically writable wiki are.
+
+First, it looks like the way it looks up the stylesheet file will happily
+use a regular .mdwn wiki page as the stylsheet. Which means any user can
+create a stylesheet and have it be used, without needing permission to
+upload arbitrary files. That probably needs to be fixed; one way would be
+to mandate that the `srcfile` has a `.xsl` extension.
+
+Secondly, if an attacker is able to upload a stylesheet file somehow, could
+this be used to attack the server where it is built? I know that xslt is
+really a full programming language, so I assume at least DOS attacks are
+possible. Can it also read other arbitrary files, run other programs, etc?
+--[[Joey]] 
-- 
cgit v1.2.3


From 3ca05b15d6c47446e89128b405b9ffce8a418a3c Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 1 Dec 2009 18:30:25 -0500
Subject: reply to comment

---
 doc/plugins/contrib/xslt/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/contrib/xslt/discussion.mdwn b/doc/plugins/contrib/xslt/discussion.mdwn
index a549681de..3288150a4 100644
--- a/doc/plugins/contrib/xslt/discussion.mdwn
+++ b/doc/plugins/contrib/xslt/discussion.mdwn
@@ -14,3 +14,9 @@ this be used to attack the server where it is built? I know that xslt is
 really a full programming language, so I assume at least DOS attacks are
 possible. Can it also read other arbitrary files, run other programs, etc?
 --[[Joey]] 
+
+> For the first point, agreed.  It should probably check that the data file has a `.xml` extension also.  Will fix soon.
+
+> For the second point, I think the main concern would be resource usage.  XSLT is a pretty limited language; it can read other XML files, but it can't run other programs so far as I know.
+
+> -- [[KathrynAndersen]]
-- 
cgit v1.2.3


From 64765b365e46e0bd557d994829a0592497a5702c Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 1 Dec 2009 18:41:04 -0500
Subject: second thoughts

---
 doc/todo/enable_arbitrary_markup_for_directives.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/enable_arbitrary_markup_for_directives.mdwn b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
index aa7b6fa49..f521204e4 100644
--- a/doc/todo/enable_arbitrary_markup_for_directives.mdwn
+++ b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
@@ -33,3 +33,6 @@ This could also make it easier to support more styles of markup, rather than hav
 > regexps to match on. So ikiwiki's more general filtering interface seems
 > to allow both of these to do things that could not be done with the
 > PmWiki interface. --[[Joey]] 
+
+>>You have some good points.  I was aware of using filter, but it didn't occur to me that one could use sanitize to do processing also, probably because "sanitize" brought to mind removing harmful content rather than doing other alterations.
+>>It has also occurred to me, on further thought, that if one wants one's chosen markup to actually be processed during the "preprocess" stage, that one could do so by converting the chosen markup to directive-style markup during the "filter" stage and then processing the directive during the "preprocess" stage as per usual.  Is there a tag for "no longer on the wishlist?". --[[KathrynAndersen]]
-- 
cgit v1.2.3


From cbdd0d85078eb8bc9d01698e9cc8ac24e12ca7ea Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 1 Dec 2009 18:51:10 -0500
Subject: bug fix; now checks extensions.

---
 doc/plugins/contrib/xslt.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/contrib/xslt.mdwn b/doc/plugins/contrib/xslt.mdwn
index e26f58e38..f98f8378d 100644
--- a/doc/plugins/contrib/xslt.mdwn
+++ b/doc/plugins/contrib/xslt.mdwn
@@ -20,10 +20,10 @@ It is expected that the XSLT stylesheet will output valid HTML markup.
 There are two arguments to this directive.
 
 * **file:**
-  The file which contains XML data to be processed.  This file is searched for using the usual IkiWiki mechanism, thus finding the file first in the same directory as the page, then in the directory above, and so on.
+  The file which contains XML data to be processed. This file *must* have a `.xml` extension (`filename.xml`). This file is searched for using the usual IkiWiki mechanism, thus finding the file first in the same directory as the page, then in the directory above, and so on.
 
 * **stylesheet:**
-  The file which contains XSLT stylesheet to apply to the XML data.  This file is searched for using the usual IkiWiki mechanism, thus finding the file first in the same directory as the page, then in the directory above, and so on.
+  The file which contains XSLT stylesheet to apply to the XML data.  This file *must* have a `.xsl` extension (`filename.xsl`). This file is searched for using the usual IkiWiki mechanism, thus finding the file first in the same directory as the page, then in the directory above, and so on.
 
 ## PREREQUISITES
 
-- 
cgit v1.2.3


From 18840f67e991e48e1c78bf848ce3dd50a649569b Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 1 Dec 2009 18:51:48 -0500
Subject: now have fixed xslt plugin

---
 doc/plugins/contrib/xslt/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/xslt/discussion.mdwn b/doc/plugins/contrib/xslt/discussion.mdwn
index 3288150a4..9cda02f88 100644
--- a/doc/plugins/contrib/xslt/discussion.mdwn
+++ b/doc/plugins/contrib/xslt/discussion.mdwn
@@ -15,7 +15,7 @@ really a full programming language, so I assume at least DOS attacks are
 possible. Can it also read other arbitrary files, run other programs, etc?
 --[[Joey]] 
 
-> For the first point, agreed.  It should probably check that the data file has a `.xml` extension also.  Will fix soon.
+> For the first point, agreed.  It should probably check that the data file has a `.xml` extension also.  Have now fixed.
 
 > For the second point, I think the main concern would be resource usage.  XSLT is a pretty limited language; it can read other XML files, but it can't run other programs so far as I know.
 
-- 
cgit v1.2.3


From 092877335cf0994fc1066e74309f698b2a101f76 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 1 Dec 2009 20:07:21 -0500
Subject: close

---
 doc/todo/enable_arbitrary_markup_for_directives.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/todo/enable_arbitrary_markup_for_directives.mdwn b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
index f521204e4..c1f0f86ed 100644
--- a/doc/todo/enable_arbitrary_markup_for_directives.mdwn
+++ b/doc/todo/enable_arbitrary_markup_for_directives.mdwn
@@ -36,3 +36,12 @@ This could also make it easier to support more styles of markup, rather than hav
 
 >>You have some good points.  I was aware of using filter, but it didn't occur to me that one could use sanitize to do processing also, probably because "sanitize" brought to mind removing harmful content rather than doing other alterations.
 >>It has also occurred to me, on further thought, that if one wants one's chosen markup to actually be processed during the "preprocess" stage, that one could do so by converting the chosen markup to directive-style markup during the "filter" stage and then processing the directive during the "preprocess" stage as per usual.  Is there a tag for "no longer on the wishlist?". --[[KathrynAndersen]]
+
+>>> Yeah, sanitize is a misleading name for the relatively few things that
+>>> use it this way.
+>>>
+>>> While you could do a filter to preprocess step, it is a bit
+>>> of a long way round, since filter always runs just before 
+>>> preprocess.
+>>> 
+>>> Anyway, guess this is [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 18a68a2c4bd671f730968493bbe2916e2d7c012e Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 1 Dec 2009 20:52:59 -0500
Subject: clearing up a bit of confusion about who I am

---
 doc/users/rubykat.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/rubykat.mdwn

diff --git a/doc/users/rubykat.mdwn b/doc/users/rubykat.mdwn
new file mode 100644
index 000000000..f37d13306
--- /dev/null
+++ b/doc/users/rubykat.mdwn
@@ -0,0 +1 @@
+See [[KathrynAndersen]].
-- 
cgit v1.2.3


From 9cfd232a9c7ead375d6bcdfb5a91c8ec02d3e910 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 1 Dec 2009 20:54:15 -0500
Subject: clearing up a bit of confusion about who I am

---
 doc/users/KathrynAndersen.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/users/KathrynAndersen.mdwn b/doc/users/KathrynAndersen.mdwn
index c26a91223..2f2838367 100644
--- a/doc/users/KathrynAndersen.mdwn
+++ b/doc/users/KathrynAndersen.mdwn
@@ -1,2 +1,4 @@
+* aka [[rubykat]]
 * Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need).
 * <http://kerravonsen.dreamwidth.org>
+* <http://github.com/rubykat>
-- 
cgit v1.2.3


From 6eb35262d5c2cd3a9b24029d958cc24743ccd64f Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 1 Dec 2009 20:55:25 -0500
Subject: clearing up a bit of confusion about who I am

---
 doc/plugins/contrib/xslt.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/xslt.mdwn b/doc/plugins/contrib/xslt.mdwn
index f98f8378d..c30e618ea 100644
--- a/doc/plugins/contrib/xslt.mdwn
+++ b/doc/plugins/contrib/xslt.mdwn
@@ -1,4 +1,4 @@
-[[!template id=plugin name=xslt author="rubykat"]]
+[[!template id=plugin name=xslt author="[[rubykat]]"]]
 ## NAME
 
 IkiWiki::Plugin::xslt - ikiwiki directive to process an XML file with XSLT
-- 
cgit v1.2.3


From 5d68ee9e4e920ef3756c7489fd84eafd1b332f87 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 2 Dec 2009 00:43:47 -0500
Subject: here be a plugin for processing POD!

---
 doc/plugins/contrib/pod.mdwn | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 doc/plugins/contrib/pod.mdwn

diff --git a/doc/plugins/contrib/pod.mdwn b/doc/plugins/contrib/pod.mdwn
new file mode 100644
index 000000000..648e3b0c2
--- /dev/null
+++ b/doc/plugins/contrib/pod.mdwn
@@ -0,0 +1,35 @@
+## NAME
+
+IkiWiki::Plugin::pod - process pages written in POD format.
+
+## SYNOPSIS
+
+In the ikiwiki setup file, enable this plugin by adding it to the
+list of active plugins.
+
+    add_plugins => [qw{goodstuff pod ....}],
+
+## DESCRIPTION
+
+IkiWiki::Plugin::pod is an IkiWiki plugin enabling ikiwiki to
+process pages written in POD (Plain Old Documentation) format.
+This will treat files with a `.pod` or `.pm` extension as files
+which contain POD markup.
+
+## OPTIONS
+
+The following options can be set in the ikiwiki setup file.
+
+* **pod_index:** If true, this will generate an index (table of contents) for the page.
+* **pod_toplink:** The label to be used for links back to the top of the page.  If this is empty, then no top-links will be generated.
+
+## PREREQUISITES
+
+    IkiWiki
+    Pod::Xhtml
+    IO::String
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/pod.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From 11a6112b561a5624b30cb587a067d35e0098c21d Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 2 Dec 2009 00:45:23 -0500
Subject: added the proper template thingie

---
 doc/plugins/contrib/pod.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/plugins/contrib/pod.mdwn b/doc/plugins/contrib/pod.mdwn
index 648e3b0c2..5ca1b3347 100644
--- a/doc/plugins/contrib/pod.mdwn
+++ b/doc/plugins/contrib/pod.mdwn
@@ -1,3 +1,4 @@
+[[!template id=plugin name=pod author="[[rubykat]]"]]
 ## NAME
 
 IkiWiki::Plugin::pod - process pages written in POD format.
-- 
cgit v1.2.3


From 2a0f15d2cd2c5d6855650a27c4f6e7e56900ee84 Mon Sep 17 00:00:00 2001
From: harishcm <harishcm@web>
Date: Wed, 2 Dec 2009 08:23:08 -0500
Subject:

---
 doc/bugs/bestlink_returns_deleted_pages.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/bestlink_returns_deleted_pages.mdwn b/doc/bugs/bestlink_returns_deleted_pages.mdwn
index 035023c7d..2aed0520c 100644
--- a/doc/bugs/bestlink_returns_deleted_pages.mdwn
+++ b/doc/bugs/bestlink_returns_deleted_pages.mdwn
@@ -28,6 +28,10 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
 > maybe by keeping a copy of the old backlinks info, then that fix could be
 > applied here too. --[[Joey]]
 
+>> Cool that was fast! Well at least half the bug is solved :) For now I'll
+>> probably try using a workaround if using bestlink within the needsbuild
+>> or scan hooks.
+
 ----
 
     #!/usr/bin/perl
-- 
cgit v1.2.3


From bd3bb876c292e5426a0dcf69e30f2e371cc4e59c Mon Sep 17 00:00:00 2001
From: harishcm <harishcm@web>
Date: Wed, 2 Dec 2009 08:41:16 -0500
Subject: reply to joey's partial bugfix

---
 doc/bugs/bestlink_returns_deleted_pages.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/bestlink_returns_deleted_pages.mdwn b/doc/bugs/bestlink_returns_deleted_pages.mdwn
index 2aed0520c..861663a56 100644
--- a/doc/bugs/bestlink_returns_deleted_pages.mdwn
+++ b/doc/bugs/bestlink_returns_deleted_pages.mdwn
@@ -30,7 +30,7 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
 
 >> Cool that was fast! Well at least half the bug is solved :) For now I'll
 >> probably try using a workaround if using bestlink within the needsbuild
->> or scan hooks.
+>> or scan hooks. Maybe by testing if pagemtime equals zero. --[[harishcm]]
 
 ----
 
-- 
cgit v1.2.3


From f02f806cf70ed19c9e9aa70e232ca46398b3538a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Dec 2009 12:58:45 -0500
Subject: calendar: Fix month wraparound error that broke in December.

---
 IkiWiki/Plugin/calendar.pm | 10 ++++++++--
 debian/changelog           |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index cbbb57e98..77fd50827 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -396,8 +396,14 @@ sub preprocess (@) {
 	}
 	elsif ($params{type} eq 'year' && $params{year} == $thisyear) {
 		# calendar for current year, updates 1st of next month
-		$pagestate{$params{destpage}}{calendar}{nextchange}=
-			timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year});
+		if ($thismonth < 12) {
+			$pagestate{$params{destpage}}{calendar}{nextchange}=
+				timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year});
+		}
+		else {
+			$pagestate{$params{destpage}}{calendar}{nextchange}=
+				timelocal(0, 0, 0, 1, 1-1, $params{year}+1);
+		}
 	}
 	elsif ($params{type} eq 'year' && $params{year} > $thisyear) {
 		# calendar for upcoming year, updates 1st of that year
diff --git a/debian/changelog b/debian/changelog
index 2b468ca2f..3afe89b59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
     modification date display, etc.
   * htmllink: Allow a title attribute to be specified.
   * calendar: Add title attributes for all links in the calendars.
+  * calendar: Fix month wraparound error that broke in December.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500
 
-- 
cgit v1.2.3


From 304e373771405f6f24a235e4113d9746c39803ad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Dec 2009 13:06:31 -0500
Subject: note

---
 doc/bugs/bestlink_returns_deleted_pages.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/bestlink_returns_deleted_pages.mdwn b/doc/bugs/bestlink_returns_deleted_pages.mdwn
index 861663a56..874f18ead 100644
--- a/doc/bugs/bestlink_returns_deleted_pages.mdwn
+++ b/doc/bugs/bestlink_returns_deleted_pages.mdwn
@@ -32,6 +32,9 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
 >> probably try using a workaround if using bestlink within the needsbuild
 >> or scan hooks. Maybe by testing if pagemtime equals zero. --[[harishcm]]
 
+>>> Yeah, and bestlink could also do that. However, it feels nasty to have
+>>> it need to look at pagemtime. --[[Joey]]
+
 ----
 
     #!/usr/bin/perl
-- 
cgit v1.2.3


From ae161be8f9bbc6f93ca654eea119a651411bd02f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Dec 2009 13:07:58 -0500
Subject: fix inverted test

---
 IkiWiki/Render.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index dec9293ad..308d60ed0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -406,7 +406,7 @@ sub find_del_files ($) {
 sub remove_del (@) {
 	foreach my $file (@_) {
 		my $page=pagename($file);
-		if (isinternal($page)) {
+		if (! isinternal($page)) {
 			debug(sprintf(gettext("removing old page %s"), $page));
 		}
 	
-- 
cgit v1.2.3


From c4b7d046690a7d35f5f6dc73fcbc83b72bc95f42 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Wed, 2 Dec 2009 13:08:42 -0500
Subject: minor: a link to describe the  format

---
 doc/plugins/contrib/pod.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/pod.mdwn b/doc/plugins/contrib/pod.mdwn
index 5ca1b3347..dafffa844 100644
--- a/doc/plugins/contrib/pod.mdwn
+++ b/doc/plugins/contrib/pod.mdwn
@@ -13,7 +13,7 @@ list of active plugins.
 ## DESCRIPTION
 
 IkiWiki::Plugin::pod is an IkiWiki plugin enabling ikiwiki to
-process pages written in POD (Plain Old Documentation) format.
+process pages written in POD ([Plain Old Documentation](http://en.wikipedia.org/wiki/Plain_Old_Documentation)) format.
 This will treat files with a `.pod` or `.pm` extension as files
 which contain POD markup.
 
-- 
cgit v1.2.3


From cf29a980bd5486ca70927c35acc0bdc809d4e11f Mon Sep 17 00:00:00 2001
From: testerinchen <testerinchen@web>
Date: Wed, 2 Dec 2009 13:09:59 -0500
Subject:

---
 doc/examples/softwaresite/bugs/needs_more_bugs.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn b/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn
index a150570a4..6627ac0b9 100644
--- a/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn
+++ b/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn
@@ -1,3 +1,4 @@
 FooBar does not have enough bugs, which suggests that it's not a real Free
 Software project. Please help create more bugs by adding code to FooBar!
 :-)
+And what now?
-- 
cgit v1.2.3


From 0a5b34b8e12d9e5e3d5e493d8eafa629a65e2a80 Mon Sep 17 00:00:00 2001
From: testerinchen <testerinchen@web>
Date: Wed, 2 Dec 2009 13:11:07 -0500
Subject:

---
 doc/examples/softwaresite/bugs/New_bug.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/examples/softwaresite/bugs/New_bug.mdwn

diff --git a/doc/examples/softwaresite/bugs/New_bug.mdwn b/doc/examples/softwaresite/bugs/New_bug.mdwn
new file mode 100644
index 000000000..85f68d2b6
--- /dev/null
+++ b/doc/examples/softwaresite/bugs/New_bug.mdwn
@@ -0,0 +1 @@
+This is a new bug report!
-- 
cgit v1.2.3


From 82c7f367ec91fba14d1c48dc55c2a859c74fc08f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Dec 2009 13:15:30 -0500
Subject: releasing version 3.20091202

---
 debian/changelog |  4 +--
 ikiwiki.spec     |  2 +-
 po/ikiwiki.pot   | 30 +++++++++----------
 po/tr.po         | 90 ++++++++++++++++++++++++++++----------------------------
 4 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3afe89b59..1408e4dce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20091114) UNRELEASED; urgency=low
+ikiwiki (3.20091202) unstable; urgency=low
 
   * meta: Generate meta description tags even when the html scrubber is
     enabled.
@@ -16,7 +16,7 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
   * calendar: Add title attributes for all links in the calendars.
   * calendar: Fix month wraparound error that broke in December.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500
+ -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 13:09:20 -0500
 
 ikiwiki (3.20091113) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 491c69a8d..1651377e1 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20091113
+Version: 3.20091202
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 65ee22fb1..eb1824411 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:53-0500\n"
+"POT-Creation-Date: 2009-12-02 13:10-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr ""
 
@@ -436,7 +436,7 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:602
+#: ../IkiWiki/Plugin/inline.pm:621
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -582,7 +582,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:652
 #, perl-format
 msgid "building %s"
 msgstr ""
@@ -1018,32 +1018,32 @@ msgstr ""
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:483
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:492
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:615
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:628
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:693
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1139,25 +1139,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index de8fe21db..f3bce9f4f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-23 12:40-0400\n"
+"POT-Creation-Date: 2009-12-02 13:10-0500\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -13,45 +13,45 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:113
+#: ../IkiWiki/CGI.pm:114
 msgid "You need to log in first."
 msgstr "Önce sisteme giriş yapmanız gerekiyor."
 
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:147
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:150
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:190
 msgid "Login"
 msgstr "Giriş"
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:191
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:192
 msgid "Admin"
 msgstr "Yönet"
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:232
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#: ../IkiWiki/CGI.pm:277
+#: ../IkiWiki/CGI.pm:278
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Hata"
 
@@ -350,16 +350,12 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131
+#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr ""
@@ -437,7 +433,7 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:621
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -454,7 +450,7 @@ msgstr ""
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:69
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
@@ -479,6 +475,10 @@ msgstr ""
 msgid "Mirror"
 msgstr ""
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+msgid "comment needs moderation"
+msgstr ""
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr ""
@@ -579,76 +579,76 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:652
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:427
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:451
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:471
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:870
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:884
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:893
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:935
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:948
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1032
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110
-#: ../IkiWiki/Plugin/po.pm:1150
+#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
+#: ../IkiWiki/Plugin/po.pm:1149
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1107
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1113
+#: ../IkiWiki/Plugin/po.pm:1112
 #, perl-format
 msgid "failed to read %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1162
+#: ../IkiWiki/Plugin/po.pm:1161
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1015,32 +1015,32 @@ msgstr ""
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:483
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:492
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:615
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:628
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:693
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1136,25 +1136,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
-- 
cgit v1.2.3


From 9fdd9af2db2bd21e543fa0f5f4bfa85b56b8dd5c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Dec 2009 13:19:19 -0500
Subject: add news item for ikiwiki 3.20091202

---
 doc/news/version_3.20091017.mdwn | 49 ----------------------------------------
 doc/news/version_3.20091202.mdwn | 17 ++++++++++++++
 2 files changed, 17 insertions(+), 49 deletions(-)
 delete mode 100644 doc/news/version_3.20091017.mdwn
 create mode 100644 doc/news/version_3.20091202.mdwn

diff --git a/doc/news/version_3.20091017.mdwn b/doc/news/version_3.20091017.mdwn
deleted file mode 100644
index aba830a82..000000000
--- a/doc/news/version_3.20091017.mdwn
+++ /dev/null
@@ -1,49 +0,0 @@
-News for ikiwiki 3.20091017:
-
-   To take advantage of significant performance improvements, all
-   wikis need to be rebuilt on upgrade to this version. If you
-   listed your wiki in /etc/ikiwiki/wikilist this will be done
-   automatically when the Debian package is upgraded. Or use
-   ikiwiki-mass-rebuild to force a rebuild.
-
-ikiwiki 3.20091017 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Added support framework for multiple types of dependencies, including
-     dependncies that are only affected by page precence or link changes.
-   * Rebuild wikis on upgrade to this version to get improved dependency
-     info.
-   * pagecount, calendar, postsparkline, progress: Use a presence dependency,
-     which makes these directives much less expensive to use, since page
-     edits will no longer trigger an unnecessary update.
-   * map: Use a presence dependency unless show= is specified.
-     This makes maps efficient enough that they can be used on sidebars!
-   * inline: Use a presence dependency in quick mode.
-   * brokenlinks: Use a link dependency.
-     This makes it much more efficient, only updating when really necessary.
-   * orphans, pagestats: Use a combination of presence and link dependencies.
-     This makes them more efficient. It also fixes a longstanding bug,
-     where if only a small set of pages were considered by orphans/pagestats,
-     changes to links on other pages failed to cause an update.
-   * linkmap: Use a combination of presence and link dependencies.
-     This makes the map be regenerated much less frequently in many cases,
-     so larger maps are more practical to use now.
-   * Plugins providing PageSpec `match\_*` functions should pass additional
-     influence information when creating result objects. This allows correctly
-     handling many more complicated dependencies.
-   * API change: `pagespec\_match\_list` has completly changed its interface.
-     The old interface will be removed soon, and a warning will be printed
-     if any plugins try to use it.
-   * Transitive dependencies are now correctly supported.
-   * ikiwiki-calendar: New command automates creation of archive pages
-     using the calendar plugin.
-   * calendar: Fix midnight rebuild trigger of calendars with explicit
-     month/year.
-   * calendar: Fix bug in next/previous year/month links, which sometimes
-     linked to an archive page from the wrong year, or were missing.
-   * git: --getctime will now follow renames back to the original creation
-     of a file.
-   * calendar: Fix CSS for year calendar to match the plugin documentation.
-   * Added minimal default CSS for calendar plugin, just highlighting the
-     current day.
-   * inline: Optimize generation of archives, etc by not getting inlined page
-     content if the template does not use it."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091202.mdwn b/doc/news/version_3.20091202.mdwn
new file mode 100644
index 000000000..60f17fe63
--- /dev/null
+++ b/doc/news/version_3.20091202.mdwn
@@ -0,0 +1,17 @@
+ikiwiki 3.20091202 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * meta: Generate meta description tags even when the html scrubber is
+     enabled.
+   * meta: Allow use of DESCRIPTION in templates to get at the meta description
+     value. (Thanks, NicolasLimare)
+   * inline: Use caching of inlined pages to speed up builds of inlines that
+     include feeds. Speedup of about 25% for small inlines; could be much
+     larger for inlines of many, or complex pages.
+   * Added (incomplete) Turkish po file. Closes: #[556744](http://bugs.debian.org/556744)
+     Thanks, Recai Oktaş
+   * date: New plugin that allows inserting date directives that expand to
+     pretty-printed dates, using the same formatting as used for page
+     modification date display, etc.
+   * htmllink: Allow a title attribute to be specified.
+   * calendar: Add title attributes for all links in the calendars.
+   * calendar: Fix month wraparound error that broke in December."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 917b8e5ba17ba4b0c9a2cf5c12781f1880d02ff5 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Wed, 2 Dec 2009 13:20:43 -0500
Subject: minor: a link to describe the mentioned format

---
 doc/plugins/table.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index 7b080acda..10a85bb2c 100644
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -3,6 +3,6 @@
 
 This plugin provides the [[ikiwiki/directive/table]] [[ikiwiki/directive]].
 It can build HTML tables from data in CSV (comma-separated values)
-or DSV (delimiter-separated values) format.
+or DSV ([delimiter-separated values](http://en.wikipedia.org/wiki/Delimiter-separated_values)) format.
 
 It needs the perl module [[!cpan Text::CSV]] for the CSV data.
-- 
cgit v1.2.3


From 3fd8a7f91ccf0f9628a345d7ae08e8bba508410c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Dec 2009 17:22:42 -0500
Subject: cvs: Add missing bit to Automator.

---
 IkiWiki/Setup/Automator.pm | 3 +++
 debian/changelog           | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index d1594d7ea..7af93e73c 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -72,6 +72,9 @@ sub import (@) {
 		elsif ($config{rcs} eq 'mercurial') {
 			# TODO
 		}
+		elsif ($config{rcs} eq 'cvs') {
+			$config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
+		}
 		else {
 			error sprintf(gettext("unsupported revision control system %s"),
 			       	$config{rcs});
diff --git a/debian/changelog b/debian/changelog
index 1408e4dce..c693be513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20091203) UNRELEASED; urgency=low
+
+  * cvs: Add missing bit to Automator.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
+
 ikiwiki (3.20091202) unstable; urgency=low
 
   * meta: Generate meta description tags even when the html scrubber is
-- 
cgit v1.2.3


From bd2316dda729116edca516c4fc6cd906b4f1ef7e Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 2 Dec 2009 21:01:10 -0500
Subject: possible answer

---
 doc/forum/understanding_filter_hooks.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/forum/understanding_filter_hooks.mdwn b/doc/forum/understanding_filter_hooks.mdwn
index 061d6d295..e6ddc91cc 100644
--- a/doc/forum/understanding_filter_hooks.mdwn
+++ b/doc/forum/understanding_filter_hooks.mdwn
@@ -7,3 +7,11 @@ but right now I have to have a look at the content, which I don't like so much.
 Is there a better hook to use for this? I need to transform the input before preprocessing.
 
 [[DavidBremner]] 
+
+>You can check the type of the page without having to look at the content of the page:
+
+    my $page_file=$pagesources{$page};
+    my $page_type=pagetype($page_file);
+
+>Then you can check whether `$page_type` is "tex".
+>--[[KathrynAndersen]]
-- 
cgit v1.2.3


From 28dae7bbef98c1a10f2c389c63c05fb0227d26fb Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Thu, 3 Dec 2009 11:03:15 -0500
Subject: 3.20091017 news item removed?

---
 doc/news/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/news/discussion.mdwn b/doc/news/discussion.mdwn
index 351e39c62..3a8152811 100644
--- a/doc/news/discussion.mdwn
+++ b/doc/news/discussion.mdwn
@@ -1,3 +1,7 @@
+## 3.20091017 news item removed?
+Hi! Why have you [removed](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/news/version_3.20091017.mdwn;h=0000000000000000000000000000000000000000;hp=aba830a82f881bd97d11fe644eb2c78b99c2258d;hb=9fdd9af2db2bd21e543fa0f5f4bfa85b56b8dd5c;hpb=b74dceb884a60f6f7be395378a009ee414726d0b) the item for 
+3.20091017? Perhaps, it's an error, isn't it? The corresponding code AFAIU is still there. --Ivan Z.
+
 ## Ikiwiki 3.12
 
 Joey, what about news for Ikiwiki 3.12? The changelog says is has been released
-- 
cgit v1.2.3


From 49e585d66289f8299f0d86c3944e95161f017c53 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Thu, 3 Dec 2009 13:22:00 -0500
Subject: a short report: Still true now.

---
 ...firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
index 8cb47f864..46e77a265 100644
--- a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
+++ b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
@@ -3,3 +3,5 @@ I'm using firefox-3.0.8-alt0.M41.1 (Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1
 Only explicitly pressing "reload" helps.
 
 Is it a bug? I haven't been noticing such problems usually on other sites. --Ivan Z.
+
+This remains to be true now, with Epiphany 2.26.3 (Mozilla/5.0 (X11; U; Linux i686; en; rv:1.9.1.4pre) Gecko/20080528 Epiphany/2.22 Firefox/3.5). --Ivan Z.
-- 
cgit v1.2.3


From 091794871c9011acd1195382fd4d968964a04d91 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Thu, 3 Dec 2009 14:26:29 -0500
Subject:

---
 doc/news/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/news/discussion.mdwn b/doc/news/discussion.mdwn
index 3a8152811..d6a548f8b 100644
--- a/doc/news/discussion.mdwn
+++ b/doc/news/discussion.mdwn
@@ -2,6 +2,8 @@
 Hi! Why have you [removed](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/news/version_3.20091017.mdwn;h=0000000000000000000000000000000000000000;hp=aba830a82f881bd97d11fe644eb2c78b99c2258d;hb=9fdd9af2db2bd21e543fa0f5f4bfa85b56b8dd5c;hpb=b74dceb884a60f6f7be395378a009ee414726d0b) the item for 
 3.20091017? Perhaps, it's an error, isn't it? The corresponding code AFAIU is still there. --Ivan Z.
 
+> I always remove old news items when making a new release. The info is still there in the changelog if needed. --[[Joey]]
+
 ## Ikiwiki 3.12
 
 Joey, what about news for Ikiwiki 3.12? The changelog says is has been released
-- 
cgit v1.2.3


From 321dbb026449da9ae9b389159f12635f8b105005 Mon Sep 17 00:00:00 2001
From: "http://numbat.myopenid.com/" <http://numbat.myopenid.com/@web>
Date: Thu, 3 Dec 2009 16:53:09 -0500
Subject:

---
 doc/users/joshtriplett/discussion.mdwn | 64 ++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 doc/users/joshtriplett/discussion.mdwn

diff --git a/doc/users/joshtriplett/discussion.mdwn b/doc/users/joshtriplett/discussion.mdwn
new file mode 100644
index 000000000..647f93a83
--- /dev/null
+++ b/doc/users/joshtriplett/discussion.mdwn
@@ -0,0 +1,64 @@
+Can we please have a very brief HOWTO?
+
+I have a Moin wiki in /var/www/wiki and want to create an IkIwiki clone of it in /var/www/ikiwiki backed by a git repos in /data/ikiwiki.
+{{{
+fatal: ambiguous argument 'master': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions
+fatal: ambiguous argument 'master': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions
+fatal: Not a valid object name master
+Traceback (most recent call last):
+  File "/home/peterc/src/moin2iki/git-map", line 125, in <module>
+    if __name__ == "__main__": sys.exit(main(sys.argv[1:]))
+  File "/home/peterc/src/moin2iki/git-map", line 117, in main
+    print git_map_file('commit', new_head)
+  File "/home/peterc/src/moin2iki/git-map", line 33, in git_map_file
+    f(inproc.stdout, outproc.stdin, sha, arg)
+  File "/home/peterc/src/moin2iki/git-map", line 64, in handle_commit
+    string, tree = lines.pop(0).split()
+IndexError: pop from empty list
+}}}
+I tried:
+  mkdir /var/www/ikiwiki
+  mkdir /data/ikiwiki
+  PATH=.:/usr/lib/git-core:$PATH ./moin2iki /data/ikiwiki http://localhost/wiki
+but this failed. (BTW, I don't usually put . in my PATH).  The failure appears to be that the converter doesn't actually create an ikiwiki instance, but appears to want to update one:
+
+    fatal: ambiguous argument 'master': unknown revision or path not in the working tree.
+    Use '--' to separate paths from revisions
+    fatal: ambiguous argument 'master': unknown revision or path not in the working tree.
+    Use '--' to separate paths from revisions
+    fatal: Not a valid object name master
+    Traceback (most recent call last):
+      File "/home/peterc/src/moin2iki/git-map", line 125, in <module>
+        if __name__ == "__main__": sys.exit(main(sys.argv[1:]))
+      File "/home/peterc/src/moin2iki/git-map", line 117, in main
+        print git_map_file('commit', new_head)
+      File "/home/peterc/src/moin2iki/git-map", line 33, in git_map_file
+        f(inproc.stdout, outproc.stdin, sha, arg)
+      File "/home/peterc/src/moin2iki/git-map", line 64, in handle_commit
+        string, tree = lines.pop(0).split()
+    IndexError: pop from empty list
+
+OK, so I created one:
+
+    ikiwiki --setup /etc/ikiwiki/auto.setup
+    .....
+ This process created several files and directories in my home directory:
+    wiki.git/
+    public_html/wiki/
+    wiki.setup
+    .ikiwiki/
+
+Following the instructions on the setup page, I did:
+    mv wiki.git /data/ikiwiki
+    ( cd /data/ikiwiki; git clone -l wiki.git wiki; )
+    mv .ikiwiki /data/ikiwiki/ikiwiki
+    mv ~/public_html/wiki /var/ikiwiki/
+
+then did again
+    PATH=.:/usr/lib/git-core:$PATH ./moin2iki /data/ikiwiki/wiki http://www/wiki
+and saw no output, and no change to the filesystem.
+
+
+Help please!
-- 
cgit v1.2.3


From 251055d748822d8304c8f2094ef61795252bdb0f Mon Sep 17 00:00:00 2001
From: "http://numbat.myopenid.com/" <http://numbat.myopenid.com/@web>
Date: Thu, 3 Dec 2009 17:08:14 -0500
Subject:

---
 doc/users/joshtriplett/discussion.mdwn | 46 ++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/doc/users/joshtriplett/discussion.mdwn b/doc/users/joshtriplett/discussion.mdwn
index 647f93a83..16e9be057 100644
--- a/doc/users/joshtriplett/discussion.mdwn
+++ b/doc/users/joshtriplett/discussion.mdwn
@@ -1,28 +1,14 @@
 Can we please have a very brief HOWTO?
 
 I have a Moin wiki in /var/www/wiki and want to create an IkIwiki clone of it in /var/www/ikiwiki backed by a git repos in /data/ikiwiki.
-{{{
-fatal: ambiguous argument 'master': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions
-fatal: ambiguous argument 'master': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions
-fatal: Not a valid object name master
-Traceback (most recent call last):
-  File "/home/peterc/src/moin2iki/git-map", line 125, in <module>
-    if __name__ == "__main__": sys.exit(main(sys.argv[1:]))
-  File "/home/peterc/src/moin2iki/git-map", line 117, in main
-    print git_map_file('commit', new_head)
-  File "/home/peterc/src/moin2iki/git-map", line 33, in git_map_file
-    f(inproc.stdout, outproc.stdin, sha, arg)
-  File "/home/peterc/src/moin2iki/git-map", line 64, in handle_commit
-    string, tree = lines.pop(0).split()
-IndexError: pop from empty list
-}}}
+
 I tried:
-  mkdir /var/www/ikiwiki
-  mkdir /data/ikiwiki
-  PATH=.:/usr/lib/git-core:$PATH ./moin2iki /data/ikiwiki http://localhost/wiki
-but this failed. (BTW, I don't usually put . in my PATH).  The failure appears to be that the converter doesn't actually create an ikiwiki instance, but appears to want to update one:
+
+    mkdir /var/www/ikiwiki
+    mkdir /data/ikiwiki
+    PATH=.:/usr/lib/git-core:$PATH ./moin2iki /data/ikiwiki http://localhost/wiki
+
+Help please!but this failed. (BTW, I don't usually put . in my PATH).  The failure appears to be that the converter doesn't actually create an ikiwiki instance, but appears to want to update one:
 
     fatal: ambiguous argument 'master': unknown revision or path not in the working tree.
     Use '--' to separate paths from revisions
@@ -44,7 +30,8 @@ OK, so I created one:
 
     ikiwiki --setup /etc/ikiwiki/auto.setup
     .....
- This process created several files and directories in my home directory:
+This process created several files and directories in my home directory:
+
     wiki.git/
     public_html/wiki/
     wiki.setup
@@ -57,8 +44,23 @@ Following the instructions on the setup page, I did:
     mv ~/public_html/wiki /var/ikiwiki/
 
 then did again
+
     PATH=.:/usr/lib/git-core:$PATH ./moin2iki /data/ikiwiki/wiki http://www/wiki
+
 and saw no output, and no change to the filesystem.
 
+I'm totally confused.  It looks as though the script calls moin2git iff the target directory isn't there, but the script fails in interesting ways if it is.
+
+The other thing I saw was:
+
+    2009-12-04 09:00:31,542 WARNING MoinMoin.log:139 using logging configuration read from built-in fallback in MoinMoin.log module!
+    Traceback (most recent call last):
+      File "./moin2git", line 128, in <module>
+        if __name__ == '__main__': main(*sys.argv[1:])
+      File "./moin2git", line 43, in main
+        r = request.RequestCLI()
+    AttributeError: 'module' object has no attribute 'RequestCLI'
+
+Moin version is 1.8.5
 
 Help please!
-- 
cgit v1.2.3


From 658da70f6aa52331389566cd1824e8342264dfe5 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 4 Dec 2009 04:09:44 -0500
Subject: added field plugin

---
 doc/plugins/contrib/field.mdwn | 97 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 doc/plugins/contrib/field.mdwn

diff --git a/doc/plugins/contrib/field.mdwn b/doc/plugins/contrib/field.mdwn
new file mode 100644
index 000000000..f7c2f4b1b
--- /dev/null
+++ b/doc/plugins/contrib/field.mdwn
@@ -0,0 +1,97 @@
+[[!template id=plugin name=pod author="[[rubykat]]"]]
+[[!toc]]
+## NAME
+
+IkiWiki::Plugin::field - front-end for per-page record fields.
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff field ....}],
+
+    # simple registration
+    field_register => [qw{meta}],
+
+## DESCRIPTION
+
+This plugin is meant to be used in conjunction with other plugins
+in order to provide a uniform interface to access per-page structured
+data, where each page is treated like a record, and the structured data
+are fields in that record.  This can include the meta-data for that page,
+such as the page title.
+
+Plugins can register a function which will return the value of a "field" for
+a given page.  This can be used in three ways:
+
+* In page templates; all registered fields will be passed to the page template in the "pagetemplate" processing.
+* In PageSpecs; the "field" function can be used to match the value of a field in a page.
+* By other plugins, using the field_get_value function, to get the value of a field for a page, and do with it what they will.
+
+## OPTIONS
+
+The following options can be set in the ikiwiki setup file.
+
+**field_register**
+
+A list of plugin-IDs to register.  This assumes that the plugins in
+question store data in the %pagestatus hash using the ID of that plugin,
+and thus the field values are looked for there.
+
+This is the simplest form of registration, but the advantage is that it
+doesn't require the plugin to be modified in order for it to be
+registered with the "field" plugin.
+
+## PageSpec
+
+The "field" PageSpec function can be used to match the value of a field for a page.
+
+field(*name* *glob*)
+
+For example:
+
+field(bar Foo*) will match if the "bar" field starts with "Foo".
+
+## FUNCTIONS
+
+### field_register
+
+field_register(id=>$id);
+
+Register a plugin as having field data.  The above form is the simplest, where the field value
+is looked up in the %pagestatus hash under the plugin-id.
+
+Additional Options:
+
+**call=>&myfunc**
+
+A reference to a function to call rather than just looking up the value in the %pagestatus hash.
+It takes two arguments: the name of the field, and the name of the page.  It is expected to return
+the value of that field, or undef if there is no field by that name.
+
+    sub myfunc ($$) {
+	my $field = shift;
+	my $page = shift;
+
+	...
+
+	return $value;
+    }
+
+**first=>1**
+
+Set this to be called first in the sequence of calls looking for values.  Since the first found
+value is the one which is returned, ordering is significant.
+
+**last=>1**
+
+Set this to be called last in the sequence of calls looking for values.  Since the first found
+value is the one which is returned, ordering is significant.
+
+### field_get_value($field, $page)
+
+Returns the value of the field for that page, or undef if none is found.
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/field.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From 2a4f37b4622bd5ce8e2c153fff2ae5d1d57f57de Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 4 Dec 2009 04:11:12 -0500
Subject: oops, fixed name

---
 doc/plugins/contrib/field.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/field.mdwn b/doc/plugins/contrib/field.mdwn
index f7c2f4b1b..745a36bcd 100644
--- a/doc/plugins/contrib/field.mdwn
+++ b/doc/plugins/contrib/field.mdwn
@@ -1,4 +1,4 @@
-[[!template id=plugin name=pod author="[[rubykat]]"]]
+[[!template id=plugin name=field author="[[rubykat]]"]]
 [[!toc]]
 ## NAME
 
-- 
cgit v1.2.3


From 27dd2810d48c7a08f6b82632d26d9f6f00f5cb6b Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 4 Dec 2009 04:29:10 -0500
Subject: request for comment

---
 doc/forum/an_alternative_approach_to_structured_data.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/forum/an_alternative_approach_to_structured_data.mdwn

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
new file mode 100644
index 000000000..8898c90da
--- /dev/null
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -0,0 +1,15 @@
+Looking at the discussion about [[todo/structured_page_data]], it looks a bit like folks are bogged down in figuring out what *markup* to use for structured page data, something I doubt that people will really agree on.  And thus, little progress is made.
+
+I propose that, rather than worry about what the data looks like, that we take a similar approach
+to the way Revision Control Systems are used in ikiwiki: a front-end + back-end approach.
+The front-end would be a common interface, where queries are made about the structured data,
+and there would be any number of back-ends, which could use whatever markup or format that they desired.
+
+To that purpose, I've written the [[plugins/contrib/field]] plugin for a possible front-end.
+I called it "field" because each page could be considered a "record" where one could request the values of "fields" of that record.
+The idea is that back-end plugins would register functions which can be called when the value of a field is desired.
+
+This is gone into in more depth on the plugin page itself, but I would appreciate feedback and improvements on the approach.
+I think it could be really powerful and useful, especially if it becomes part of ikiwiki proper.
+
+--[[KathrynAndersen]]
-- 
cgit v1.2.3


From d2c91d1a6b17fcf2c1c19d4c80d7147eef2b35fa Mon Sep 17 00:00:00 2001
From: "http://vibrog.myopenid.com/" <http://vibrog.myopenid.com/@web>
Date: Fri, 4 Dec 2009 09:30:08 -0500
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 92f6728ef..f25e56ae6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -62,6 +62,7 @@ This **SandBox** is also a [[blog]]!
 
 ----
 
+What about [relative urls](formatting/)?
 
 [[!toggleable  id="foobar" text="""
 foo
-- 
cgit v1.2.3


From ced9e33776f74d1190a104dcaf839229ba204137 Mon Sep 17 00:00:00 2001
From: "http://vibrog.myopenid.com/" <http://vibrog.myopenid.com/@web>
Date: Fri, 4 Dec 2009 09:32:52 -0500
Subject:

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index f25e56ae6..e23c6330b 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -62,7 +62,7 @@ This **SandBox** is also a [[blog]]!
 
 ----
 
-What about [relative urls](formatting/)?
+What about [relative urls](../setup/byhand)?
 
 [[!toggleable  id="foobar" text="""
 foo
-- 
cgit v1.2.3


From af3cc556bab1e2b840f8521b4da09bcf05f04fd9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 4 Dec 2009 13:12:12 -0500
Subject: add darcs to VCS list

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 3e2fdc537..172e1b23d 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends},
   libhtml-parser-perl, liburi-perl
 Recommends: gcc | c-compiler, 
   libc6-dev | libc-dev,
-  subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38),
+  subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
   libxml-simple-perl, libnet-openid-consumer-perl,
   liblwpx-paranoidagent-perl, libtimedate-perl,
   libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
-- 
cgit v1.2.3


From b8ed5e72286ab0c592ea62a24a0ac160647d612d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 4 Dec 2009 13:13:41 -0500
Subject: more idomatic perl

---
 IkiWiki/Plugin/darcs.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 2448673ac..0d68f27e5 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -73,7 +73,7 @@ sub darcs_rev($) {
 	my $file = shift; # Relative to the repodir.
 	my $repodir = $config{srcdir};
 
-	return "" if (! file_in_vc($repodir, $file));
+	return "" unless file_in_vc($repodir, $file);
 	my $hash = darcs_info('hash', $repodir, $file);
 	return defined $hash ? $hash : "";
 }
-- 
cgit v1.2.3


From 2ce7ae08b3559c151a76109a46c97b460922a4c4 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 4 Dec 2009 22:09:57 -0500
Subject: link to further discussion

---
 doc/todo/structured_page_data.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/structured_page_data.mdwn b/doc/todo/structured_page_data.mdwn
index 72bfd8dea..da9da9663 100644
--- a/doc/todo/structured_page_data.mdwn
+++ b/doc/todo/structured_page_data.mdwn
@@ -1,5 +1,7 @@
 This is an idea from [[JoshTriplett]].  --[[Joey]]
 
+* See further discussion at [[forum/an_alternative_approach_to_structured_data]].
+
 Some uses of ikiwiki, such as for a bug-tracking system (BTS), move a bit away from the wiki end
 of the spectrum, and toward storing structured data about a page or instead
 of a page. 
-- 
cgit v1.2.3


From 505e94708d900948cb28fbf1d70f0499bf548b11 Mon Sep 17 00:00:00 2001
From: "http://www.google.com.au/profiles/will.uther"
 <http://www.google.com.au/profiles/will.uther@web>
Date: Sat, 5 Dec 2009 01:44:36 -0500
Subject:

---
 doc/forum/an_alternative_approach_to_structured_data.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index 8898c90da..fb007f7e9 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -13,3 +13,5 @@ This is gone into in more depth on the plugin page itself, but I would appreciat
 I think it could be really powerful and useful, especially if it becomes part of ikiwiki proper.
 
 --[[KathrynAndersen]]
+
+> It looks like an interesting idea.  I don't have time right now to look at it in depth, but it looks interesting. -- [[Will]]
-- 
cgit v1.2.3


From cb74161218449bc1bc7648782f421ede9b94334b Mon Sep 17 00:00:00 2001
From: harishcm <harishcm@web>
Date: Sat, 5 Dec 2009 02:06:25 -0500
Subject: Removed my previous patch that is still affected by the bestlink
 returns deleted pages bug

---
 ...a_sidebar_does_not_regenerate_the_subpages.mdwn | 52 ----------------------
 1 file changed, 52 deletions(-)

diff --git a/doc/bugs/Building_a_sidebar_does_not_regenerate_the_subpages.mdwn b/doc/bugs/Building_a_sidebar_does_not_regenerate_the_subpages.mdwn
index 93aafc2c0..419292930 100644
--- a/doc/bugs/Building_a_sidebar_does_not_regenerate_the_subpages.mdwn
+++ b/doc/bugs/Building_a_sidebar_does_not_regenerate_the_subpages.mdwn
@@ -6,55 +6,3 @@ If sandbox/page.mdwn has been generated and sandbox/sidebar.mdwn is created, the
 	# adding a new sidebar page. So adding such a page
 	# currently requires a wiki rebuild.
 	add_depends($page, $sidebar_page);
-
-----
-Below is a patch for the bug. It's inspired by trying to solve [[todo/Post-compilation inclusion of the sidebar]].
-What do you think about it? I have a concern though. If a sidebar is removed, it takes two refreshes to update 
-the affected pages. Is this a feature or a bug? --[[harishcm]]
-
-    --- sidebar.pm.orig	2009-11-21 17:40:02.000000000 +0800
-    +++ sidebar_bugfix.pm	2009-11-21 18:16:11.000000000 +0800
-    @@ -10,6 +10,7 @@
-     
-     sub import {
-     	hook(type => "getsetup", id => "sidebar", call => \&getsetup);
-    +	hook(type => "needsbuild", id => "sidebar", call => \&needsbuild);
-     	hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);
-     }
-     
-    @@ -21,6 +22,22 @@
-     		},
-     }
-     
-    +sub needsbuild (@) {
-    +	my $needsbuild=shift;
-    +
-    +	# Determine every pages' sidebar page
-    +	foreach my $page (keys %pagesources) {
-    +		my $sidebar_page='';
-    +		$sidebar_page=bestlink($page, "sidebar");
-    +		
-    +		# If a page's sidebar has changed, force rebuild
-    +		if (!exists $pagestate{$page}{sidebar}{sidebar_page} || $pagestate{$page}{sidebar}{sidebar_page} ne $sidebar_page) {
-    +			$pagestate{$page}{sidebar}{sidebar_page} = $sidebar_page;
-    +			push @$needsbuild, $pagesources{$page};
-    +		}
-    +	}
-    +}
-    +
-     sub sidebar_content ($) {
-     	my $page=shift;
-     	
-    @@ -29,9 +46,9 @@
-     	my $sidebar_type=pagetype($sidebar_file);
-     	
-     	if (defined $sidebar_type) {
-    -		# FIXME: This isn't quite right; it won't take into account
-    -		# adding a new sidebar page. So adding such a page
-    -		# currently requires a wiki rebuild.
-    +		# Record current sidebar page for rechecking bestlink 
-    +		# during wiki refresh. Also add depends on the sidebar page.
-    +		$pagestate{$page}{sidebar}{sidebar_page}=$sidebar_page;
-     		add_depends($page, $sidebar_page);
-     
-     		my $content=readfile(srcfile($sidebar_file));
-- 
cgit v1.2.3


From 700a4e31da325cb25184969ba5c7b9168e089459 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 6 Dec 2009 15:02:26 -0500
Subject: added copyright info for translations

---
 debian/copyright | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index 98feffc6f..9285bf541 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -148,6 +148,20 @@ Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
 
+Files: po/*
+Copyright:
+  2007 Damyan Ivanov <dam@modsodtsys.com>
+  2007-2009 Miroslav Kure <kurem@debian.cz>
+  2008 Jonas Smedegaard <dr@jones.dk>
+  2008 Kai Wasserbäch <debian@carbon-project.org>
+  2008-2009 Kurt Gramlich <kurt@skolelinux.de>
+  2007, 2009 The Free Software Foundation, Inc
+  2007 Kartik Mistry <kartik.mistry@gmail.com>
+  2007 Pawel Tecza <ptecza@net.icm.edu.pl>
+License: 
+ Redistribution and use in source and compiled forms, with or without
+ modification, are permitted under any circumstances. No warranty.
+
 Files: doc/smileys/*
 Copyright:
  (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>
-- 
cgit v1.2.3


From eaec4d97e4c7a2b42e5a0932d63faed10bc232f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 6 Dec 2009 15:07:20 -0500
Subject: improve po copyright info

The FSF copyrights seem to be boilerplate, not real, so put in
the actual authors' info.
---
 debian/copyright | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 9285bf541..050a4dd61 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -155,9 +155,14 @@ Copyright:
   2008 Jonas Smedegaard <dr@jones.dk>
   2008 Kai Wasserbäch <debian@carbon-project.org>
   2008-2009 Kurt Gramlich <kurt@skolelinux.de>
-  2007, 2009 The Free Software Foundation, Inc
   2007 Kartik Mistry <kartik.mistry@gmail.com>
   2007 Pawel Tecza <ptecza@net.icm.edu.pl>
+  2007, 2009 Víctor Moral <victor@taquiones.net>
+  2007 Jean-Luc Coulon (f5ibh) <jean-luc.coulon@«anadoo.fr>
+  2008 Christian Perrier <bubulle@debian.org>
+  2007 Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
+  2007 Daniel Nylander <po@danielnylander.se>
+  2009 Fernando González de Requena <fgrequena@gmail.com>
 License: 
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
-- 
cgit v1.2.3


From c3ae09056d6ee9880d8cd118e98282f1a3655fe6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 6 Dec 2009 15:09:59 -0500
Subject: Add complete Spanish basewiki translation done by Fernando Gonzalez
 de Requena.

---
 debian/changelog                                   |   2 +
 po/underlay.setup                                  |   2 +-
 po/underlays/basewiki/ikiwiki.es.po                |  71 +++++
 po/underlays/basewiki/ikiwiki/directive.es.po      | 133 +++++++++
 po/underlays/basewiki/ikiwiki/formatting.es.po     | 299 +++++++++++++++++++++
 po/underlays/basewiki/ikiwiki/markdown.es.po       |  50 ++++
 po/underlays/basewiki/ikiwiki/openid.es.po         | 117 ++++++++
 po/underlays/basewiki/ikiwiki/pagespec.es.po       | 251 +++++++++++++++++
 .../basewiki/ikiwiki/pagespec/attachment.es.po     | 119 ++++++++
 po/underlays/basewiki/ikiwiki/pagespec/po.es.po    |  64 +++++
 po/underlays/basewiki/ikiwiki/searching.es.po      |  84 ++++++
 po/underlays/basewiki/ikiwiki/subpage.es.po        |  51 ++++
 .../basewiki/ikiwiki/subpage/linkingrules.es.po    | 102 +++++++
 po/underlays/basewiki/ikiwiki/wikilink.es.po       | 107 ++++++++
 po/underlays/basewiki/index.es.po                  |  31 +++
 po/underlays/basewiki/recentchanges.es.po          |  40 +++
 po/underlays/basewiki/sandbox.es.po                |  90 +++++++
 po/underlays/basewiki/shortcuts.es.po              | 233 ++++++++++++++++
 po/underlays/basewiki/templates.es.po              | 242 +++++++++++++++++
 po/underlays/basewiki/templates/note.es.po         |  44 +++
 po/underlays/basewiki/templates/popup.es.po        |  54 ++++
 21 files changed, 2185 insertions(+), 1 deletion(-)
 create mode 100644 po/underlays/basewiki/ikiwiki.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/directive.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/formatting.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/markdown.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/openid.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/po.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/searching.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/subpage.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po
 create mode 100644 po/underlays/basewiki/ikiwiki/wikilink.es.po
 create mode 100644 po/underlays/basewiki/index.es.po
 create mode 100644 po/underlays/basewiki/recentchanges.es.po
 create mode 100644 po/underlays/basewiki/sandbox.es.po
 create mode 100644 po/underlays/basewiki/shortcuts.es.po
 create mode 100644 po/underlays/basewiki/templates.es.po
 create mode 100644 po/underlays/basewiki/templates/note.es.po
 create mode 100644 po/underlays/basewiki/templates/popup.es.po

diff --git a/debian/changelog b/debian/changelog
index c693be513..cffc316ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20091203) UNRELEASED; urgency=low
 
   * cvs: Add missing bit to Automator.
+  * Add complete Spanish basewiki translation done by Fernando Gonzalez de
+    Requena.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
diff --git a/po/underlay.setup b/po/underlay.setup
index a7d307e71..333d331d1 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -7,7 +7,7 @@ use IkiWiki::Setup::Standard {
 	# Listing languages without active translations
 	# will excessively bloat things.
         po_slave_languages => {
-		#'es' => 'Español',
+		'es' => 'Español',
 		#'de' => 'Deutsch',
 		'fr' => 'Français',
 		'da' => 'Dansk',
diff --git a/po/underlays/basewiki/ikiwiki.es.po b/po/underlays/basewiki/ikiwiki.es.po
new file mode 100644
index 000000000..f6c1eb3c9
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki.es.po
@@ -0,0 +1,71 @@
+# Spanish translation of basewiki/ikiwiki page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki \n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-16 20:19+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Currently running version [[!version ]].)\"\n"
+"]]\n"
+msgstr ""
+"Este wiki funciona con [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Versión actualmente en funcionamiento [[!version ]].)\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid "Some documentation on using ikiwiki:"
+msgstr "Alguna documentación sobre el uso de ikiwiki:"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/formatting]]"
+msgstr "[[Aplicación de formato a las páginas|ikiwiki/formatting]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/wikilink]]"
+msgstr "[[Enlaces Wiki («WikiLinks»)|ikiwiki/wikilink]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/subpage]]"
+msgstr "[[Subpáginas|ikiwiki/subpage]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/pagespec]]"
+msgstr "[[Selección de páginas («PageSpec»)|ikiwiki/pagespec]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/directive]]"
+msgstr "[[Directivas|ikiwiki/directive]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/markdown]]"
+msgstr "[[Lenguaje de marcado|ikiwiki/markdown]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/openid]]"
+msgstr "[[ikiwiki/openid]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/searching]]"
+msgstr "[[Búsqueda|ikiwiki/searching]]"
+
diff --git a/po/underlays/basewiki/ikiwiki/directive.es.po b/po/underlays/basewiki/ikiwiki/directive.es.po
new file mode 100644
index 000000000..91fa89e29
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/directive.es.po
@@ -0,0 +1,133 @@
+# Spanish translation of basewiki/ikiwiki/directive page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-18 02:21+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin "
+"with `!` and may contain parameters. The general form is:"
+msgstr ""
+"Las directivas tienen una forma similar a un [[ikiwiki/WikiLink]], pero empiezan "
+"con `!` y pueden contener parámetros. La forma general es:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgstr "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This gets expanded before the rest of the page is processed, and can be used "
+"to transform the page in various ways."
+msgstr ""
+"Esto se expande antes de que el resto de la página sea procesada, y puede utilizarse "
+"para transformar la página de diferentes maneras."
+
+#. type: Plain text
+msgid ""
+"The quotes around values can be omitted if the value is a simple word.  "
+"Also, some directives may use parameters without values, for example:"
+msgstr ""
+"Se pueden omitir las comillas en torno a un valor si éste consiste en una sola "
+"palabra. Además, algunas directivas pueden usar parámetros sin valores, "
+"como por ejemplo:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!tag foo]]\n"
+msgstr "\t\\[[!tag foo]]\n"
+
+#. type: Plain text
+msgid ""
+"A directive does not need to all be on one line, it can be wrapped to "
+"multiple lines if you like:"
+msgstr ""
+"No es necesario que una directiva ocupe una sola línea, si lo desea puede "
+"ocupar varias líneas:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+msgstr ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+
+#. type: Plain text
+msgid ""
+"Also, multiple lines of *quoted* text can be used for a value.  To allow "
+"quote marks inside the quoted text, delimit the block of text with triple-"
+"quotes:"
+msgstr ""
+"Además, se pueden usar múltiples líneas de texto *entrecomillado* como valor. Para "
+"que se permitan las comillas dentro del texto citado, delimite el bloque de "
+"texto con comillas triples:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive text=\"\"\"\n"
+msgstr "\t\\[[!directive text=\"\"\"\n"
+
+#. type: Bullet: '	1. '
+msgid "\"foo\""
+msgstr "\"foo\""
+
+#. type: Bullet: '	2. '
+msgid "\"bar\""
+msgstr "\"bar\""
+
+#. type: Bullet: '	3. '
+msgid "\"baz\""
+msgstr "\"baz\""
+
+#. type: Plain text
+msgid ""
+"ikiwiki also has an older syntax for directives, which requires a space in "
+"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This "
+"syntax has several disadvantages: it requires a space after directives with "
+"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
+"[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed "
+"syntax shown above as default.  However, ikiwiki still supports wikis using "
+"the older syntax, if the `prefix_directives` option is disabled."
+msgstr ""
+"ikiwiki tiene además una sintaxis más antigua para las directivas, que requiere "
+"un espacio en las directivas para distinguirlas de los [[wikilinks|ikiwiki/wikilink]]. "
+"Esta sintaxis tiene varias desventajas: requiere un espacio después de las "
+"directivas sin parámetros (tales como `\\[[pagecount ]]`), y prohíbe espacios en "
+"los [[wikilinks|ikiwiki/wikilink]]. ikiwiki proporciona ahora de manera predeterminada "
+"la sintaxis que utiliza el prefijo `!` mostrada arriba. Sin embargo, ikiwiki todavía "
+"es compatible con los wikis que utilizan la antigua sintaxis, si se desactiva la "
+"opción `prefix_directives`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid "Here is a list of currently available directives in this wiki:"
+msgstr "Ésta es una lista de las directivas actualmente disponibles en este wiki:"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!listdirectives ]]\n"
+msgstr "[[!listdirectives ]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.es.po b/po/underlays/basewiki/ikiwiki/formatting.es.po
new file mode 100644
index 000000000..e8efac5b5
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/formatting.es.po
@@ -0,0 +1,299 @@
+# Spanish translation of basewiki/ikiwiki/formatting page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"PO-Revision-Date: 2009-08-18 20:20+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
+msgstr "[[!meta title=\"Aplicación de formato a las páginas wiki\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Text on this wiki is, by default, written in a form very close to how you "
+"might write text for an email message. This style of text formatting is "
+"called [[MarkDown]], and it works like this:"
+msgstr ""
+"El texto de este wiki está escrito, de manera predeterminada, en una forma "
+"muy parecida a cómo se escribe texto para un mensaje de correo electrónico. "
+"Este estilo de asignación de formato al texto se llama [[MarkDown]] y "
+"funciona así:"
+
+#. type: Plain text
+msgid "Leave blank lines between paragraphs."
+msgstr "Deje líneas vacías entre párrafos."
+
+#. type: Plain text
+#| msgid ""
+#| "You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
+#| "placing it in single or double asterisks."
+msgid ""
+"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
+"placing it in single or double asterisks."
+msgstr ""
+"Puede *\\*resaltar*\\* o **\\*\\*resaltar fuertemente\\*\\*** el texto "
+"colocándolo entre asteriscos simples o dobles."
+
+#. type: Plain text
+msgid "To create a list, start each line with an asterisk:"
+msgstr "Para crear una lista, inicie cada línea con un asterisco:"
+
+#. type: Bullet: '* '
+msgid "\"* this is my list\""
+msgstr "\"* Ésta es mi lista\""
+
+#. type: Bullet: '* '
+msgid "\"* another item\""
+msgstr "\"* Otro elemento\""
+
+#. type: Plain text
+msgid ""
+"To make a numbered list, start each line with a number (any number will do) "
+"followed by a period:"
+msgstr ""
+"Para hacer una lista numerada, inicie cada línea con un número (cualquier "
+"número servirá) seguido de un punto:"
+
+#. type: Bullet: '1. '
+msgid "\"1. first line\""
+msgstr "\"1. Primera línea\""
+
+#. type: Bullet: '2. '
+msgid "\"2. second line\""
+msgstr "\"2. Segunda línea\""
+
+#. type: Bullet: '2. '
+msgid "\"2. third line\""
+msgstr "\"2. Tercera línea\""
+
+#. type: Plain text
+msgid ""
+"To create a header, start a line with one or more `#` characters followed by "
+"a space and the header text. The number of `#` characters controls the size "
+"of the header:"
+msgstr ""
+"Para crear un título, inicie una línea con uno o más caracteres `#` seguidos "
+"de un espacio y el texto del título. El número de caracteres `#` controla el "
+"tamaño del título:"
+
+#. type: Title #
+#, no-wrap
+msgid "# h1"
+msgstr "# h1"
+
+#. type: Title ##
+#, no-wrap
+msgid "## h2"
+msgstr "## h2"
+
+#. type: Title ###
+#, no-wrap
+msgid "### h3"
+msgstr "### h3"
+
+#. type: Title ####
+#, no-wrap
+msgid "#### h4"
+msgstr "#### h4"
+
+#. type: Title #####
+#, no-wrap
+msgid "##### h5"
+msgstr "##### h5"
+
+#. type: Title ######
+#, no-wrap
+msgid "###### h6"
+msgstr "###### h6"
+
+#. type: Plain text
+msgid ""
+"To create a horizontal rule, just write three or more dashes or stars on "
+"their own line:"
+msgstr ""
+"Para crear una línea horizontal, simplemente escriba tres o más guiones o "
+"estrellas en su propia línea:"
+
+#. type: Plain text
+#, no-wrap
+msgid "To quote someone, prefix the quote with \">\":\n"
+msgstr "Para citar a alguien, ponga delante de la cita \">\":\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> To be or not to be,\n"
+"> that is the question.\n"
+msgstr ""
+"> Ser o no ser,\n"
+"> ésa es la cuestión.\n"
+
+#. type: Plain text
+msgid "To write a code block, indent each line with a tab or 4 spaces:"
+msgstr ""
+"Para escribir un bloque de código, sangre cada línea con una tabulación o "
+"con 4 espacios:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t10 PRINT \"Hello, world!\"\n"
+"\t20 GOTO 10\n"
+msgstr ""
+"\t10 PRINT \"Hola mundo!\"\n"
+"\t20 GOTO 10\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"To link to an url or email address, you can just put the\n"
+"url in angle brackets: <<http://ikiwiki.info>>, or you can use the\n"
+"form \\[link text\\]\\(url\\)\n"
+msgstr ""
+"Para enlazar a un url o a una dirección de correo electrónico, puede poner simplemente el\n"
+"url entre paréntesis angulares: <<http://ikiwiki.info>>, o puede usar la\n"
+"forma \\[link text\\]\\(url\\)\n"
+
+#. type: Plain text
+msgid ""
+"In addition to basic html formatting using [[MarkDown]], this wiki lets you "
+"use the following additional features:"
+msgstr ""
+"Además de la aplicación de formato html básico utilizando [[MarkDown]], este "
+"wiki le permite usar las siguientes características adicionales:"
+
+#. type: Bullet: '* '
+msgid ""
+"To link to another page on the wiki, place the page's name inside double "
+"square brackets. So you would use `\\[[WikiLink]]` to link to [[WikiLink]]."
+msgstr ""
+"Para enlazar a otra página del wiki, coloque el nombre de la página entre "
+"dobles corchetes. Así, puede utilizar `\\[[WikiLink]]` para enlazar a "
+"[[WikiLink]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Insert [[smileys]] and some other useful symbols. :-)"
+msgstr "Inserte [[smileys]] y algunos otros símbolos útiles. :-)"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Use [[shortcuts]] to link to common resources."
+msgstr "Use [[atajos|shortcuts]] para enlazar a recursos comunes."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid ""
+"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
+"text."
+msgstr ""
+"Cree y rellene [[plantillas|templates]] para bloques repetidos de texto wiki "
+"con parámetros."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* Insert various [[directives|directive]] onto a page to perform useful\n"
+"  actions.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
+msgstr ""
+"* Inserte varias [[directivas|directive]] en una página para realizar\n"
+"  acciones útiles.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  For example, you can:\n"
+msgstr "  Por ejemplo, puede:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Add a table of contents to a page:"
+msgstr "Añadir una tabla de contenidos a una página:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc]]\n"
+msgstr "\t\\[[!toc]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Change the title of a page:"
+msgstr "Cambiar el título de una página:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"full page title\"]]\n"
+msgstr "\t\\[[!meta title=\"full page title\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Create a blog by inlining a set of pages:"
+msgstr "Crear un blog insertando un conjunto de páginas en otra:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
+msgstr "\t\\[[!inline pages=\"blog/*\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Full list of [[directives|directive]] enabled for this wiki:\n"
+msgstr "  Lista completa de [[directivas|directive]] activadas en este wiki:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  [[!listdirectives ]]\n"
+msgstr "  [[!listdirectives ]]\n"
+
diff --git a/po/underlays/basewiki/ikiwiki/markdown.es.po b/po/underlays/basewiki/ikiwiki/markdown.es.po
new file mode 100644
index 000000000..daa61328b
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/markdown.es.po
@@ -0,0 +1,50 @@
+# Spanish translation of basewiki/ikiwiki/markdown page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-18 20:43+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[Markdown](http://daringfireball.net/projects/markdown/)  is a minimal "
+"markup language that resembles plain text as used in email messages. It is "
+"the markup language used by this wiki by default."
+msgstr ""
+"[Markdown](http://daringfireball.net/projects/markdown/) es un lenguaje mínimo "
+"de marcado que se parece al texto plano utilizado en los mensajes de correo electrónico. "
+"Es el lenguaje de marcado utilizado en este wiki de manera predeterminada."
+
+#. type: Plain text
+msgid ""
+"For documentation about the markdown syntax, see [[formatting]] and "
+"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
+msgstr ""
+"Si desea consultar documentación sobre la sintaxis de markdown, vea [[Aplicación_de_formato|formatting]] y "
+"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
+
+#. type: Plain text
+msgid ""
+"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part "
+"of the markdown syntax, and are the only bit of markup that this wiki "
+"handles internally."
+msgstr ""
+"Tenga en cuenta que los [[WikiLinks|WikiLink]] y las [[directivas|directive]] no son "
+"parte de la sintaxis de markdown, y son los únicos elementos de marcado "
+"que este wiki maneja internamente."
+
diff --git a/po/underlays/basewiki/ikiwiki/openid.es.po b/po/underlays/basewiki/ikiwiki/openid.es.po
new file mode 100644
index 000000000..4a2f19d60
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/openid.es.po
@@ -0,0 +1,117 @@
+# Spanish translation of basewiki/ikiwiki/openid page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-19 18:53+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"OpenID\"]]\n"
+msgstr "[[!meta title=\"OpenID\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(openid)\"\n"
+"     then=\"This wiki has OpenID **enabled**.\"\n"
+"     else=\"This wiki has OpenID **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(openid)\"\n"
+"     then=\"Este wiki tiene OpenID **activado**.\"\n"
+"     else=\"Este wiki tiene OpenID **desactivado**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[OpenID](http://openid.net) is a decentralized authentication mechanism that "
+"allows you to have one login that you can use on a growing number of "
+"websites."
+msgstr ""
+"[OpenID](http://openid.net) es un mecanismo descentralizado de identificación que "
+"le permite tener un acceso («login») que puede usar en un número creciente de "
+"sitios web."
+
+#. type: Plain text
+msgid "To sign up for an OpenID, visit one of the following identity providers:"
+msgstr "Para solicitar un OpenID, visite a alguno de los proveedores de identidad siguientes:"
+
+#. type: Bullet: '* '
+msgid "[MyOpenID](https://www.myopenid.com/)"
+msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[GetOpenID](https://getopenid.com/)"
+msgstr "[GetOpenID](https://getopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[Videntity](http://videntity.org/)"
+msgstr "[Videntity](http://videntity.org/)"
+
+#. type: Bullet: '* '
+msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#. type: Bullet: '* '
+msgid "[TrustBearer](https://openid.trustbearer.com/)"
+msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#. type: Bullet: '* '
+msgid ""
+"or any of the [many others out there](http://openiddirectory.com/openid-"
+"providers-c-1.html)"
+msgstr ""
+"o cualquier de los [muchos otros que existen](http://openiddirectory.com/openid-"
+"providers-c-1.html)"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Your OpenID is the URL that you are given when you sign up.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgstr ""
+"Su OpenID es el URL que se le proporciona al registrarse.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"To sign in to this wiki using OpenID, just enter it in the OpenID field in "
+"the signin form. You do not need to give this wiki a password or go through "
+"any registration process when using OpenID."
+msgstr ""
+"Para identificarse en este wiki usando OpenID, simplemente introdúzcalo en el "
+"Campo OpenID del formulario de identificación. Si usa OpenID, no es necesario "
+"que proporcione ninguna contraseña a este wiki, ni que realice ningún proceso "
+"de registro."
+
+#. type: Plain text
+msgid ""
+"It's also possible to make a page in the wiki usable as an OpenID url, by "
+"delegating it to an openid server. Here's an example of how to do that:"
+msgstr ""
+"También es posible hacer una página del wiki utilizable como un url OpenID, "
+"asignándolo a un servidor openid. Éste es un ejemplo de cómo hacerlo:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t       server=\"http://www.myopenid.com/server\"]]\n"
+msgstr ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t       server=\"http://www.myopenid.com/server\"]]\n"
+
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.es.po b/po/underlays/basewiki/ikiwiki/pagespec.es.po
new file mode 100644
index 000000000..124e3333c
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec.es.po
@@ -0,0 +1,251 @@
+# Spanish translation of basewiki/ikiwiki/pagespec page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-23 21:00+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To select a set of pages, such as pages that are locked, pages whose commit "
+"emails you want subscribe to, or pages to combine into a blog, the wiki uses "
+"a PageSpec. This is an expression that matches a set of pages."
+msgstr ""
+"Para seleccionar un conjunto de páginas, como páginas que están bloqueadas, "
+"páginas a cuyo envío de correo electrónico quiere suscribirse, o páginas para combinar "
+"en un blog, el wiki utiliza una PageSpec. Ésta consiste en una expresión que se "
+"corresponde con un conjunto de páginas."
+
+#. type: Plain text
+msgid ""
+"The simplest PageSpec is a simple list of pages. For example, this matches "
+"any of the three listed pages:"
+msgstr ""
+"La PageSpec más simple es una lista simple de páginas. Por ejemplo, ésta se "
+"corresponde con cualquiera de las tres páginas listadas:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tfoo or bar or baz\n"
+msgstr "\tfoo or bar or baz\n"
+
+#. type: Plain text
+msgid ""
+"More often you will want to match any pages that have a particular thing in "
+"their name. You can do this using a glob pattern. \"`*`\" stands for any "
+"part of a page name, and \"`?`\" for any single letter of a page name. So "
+"this matches all pages about music, and any [[SubPage]]s of the SandBox, but "
+"does not match the SandBox itself:"
+msgstr ""
+"A menudo querrá seleccionar cualquier página que tenga alguna particularidad "
+"en su nombre. Puede hacerlo utilizando un patrón «glob». \"`*`\" representa cualquier "
+"parte del nombre de una página, y \"`?`\" cualquier letra del nombre de una página. "
+"Así, esto se corresponde con todas las páginas sobre música, y cualquier [[subpágina|SubPage]] "
+"de la [[zona de pruebas («SandBox»)|SandBox]], pero no con la zona de pruebas («SandBox») misma:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t*music* or SandBox/*\n"
+msgstr "\t*music* or SandBox/*\n"
+
+#. type: Plain text
+msgid ""
+"You can also prefix an item with \"`!`\" to skip pages that match it. So to "
+"match all pages except for Discussion pages and the SandBox:"
+msgstr ""
+"También puede utilizar \"`!`\" delante de un elemento para que no se incluyan "
+"las páginas que se correspondan con ese elemento. Así, para seleccionar todas "
+"las páginas excepto las de Discusión y la Zona de pruebas («SandBox»):"
+
+#. type: Bullet: '	* '
+msgid "and !SandBox and !*/Discussion"
+msgstr "and !SandBox and !*/Discussion"
+
+#. type: Plain text
+msgid ""
+"Some more elaborate limits can be added to what matches using these "
+"functions:"
+msgstr ""
+"Se pueden añadir límites más elaborados para seleccionar páginas utilizando "
+"estas funciones:"
+
+#. type: Bullet: '* '
+msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+msgstr ""
+"\"`link(page)`\" - selecciona solamente páginas que enlazan a una determiada "
+"página (o patrón «glob»)"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
+"(or tags matched by a glob)"
+msgstr ""
+"\"`tagged(tag)`\" - selecciona páginas que están etiquetadas con o enlazadas "
+"a la etiqueta dada (o etiquetas que se corresponden con un patrón «glob»)"
+
+#. type: Bullet: '* '
+msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+msgstr ""
+"\"`backlink(page)`\" - selecciona solamente páginas a las que enlaza una "
+"página determinada"
+
+#. type: Bullet: '* '
+msgid "\"`creation_month(month)`\" - matches only pages created on the given month"
+msgstr "\"`creation_month(month)`\" - selecciona solamente páginas creadas en el mes dado"
+
+#. type: Bullet: '* '
+msgid "\"`creation_day(mday)`\" - or day of the month"
+msgstr "\"`creation_day(mday)`\" - o en el día del mes"
+
+#. type: Bullet: '* '
+msgid "\"`creation_year(year)`\" - or year"
+msgstr "\"`creation_year(year)`\" - o en el año"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_after(page)`\" - matches only pages created after the given page "
+"was created"
+msgstr ""
+"\"`created_after(page)`\" - selecciona solamente páginas creadas después de que la "
+"página dada fuera creada"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_before(page)`\" - matches only pages created before the given "
+"page was created"
+msgstr ""
+"\"`created_before(page)`\" - selecciona solamente páginas creadas antes de que la "
+"página dada fuera creada"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
+"the glob by itself is actually a shorthand for this function."
+msgstr ""
+"\"`glob(someglob)`\" - selecciona solamente páginas que se corresponden con el «glob» "
+"dado. Escribir simplemente el «glob» mismo es una abreviatura para esta función."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+"that globs do not usually match."
+msgstr ""
+"\"`internal(glob)`\" - como `glob()`, pero selecciona incluso páginas de uso "
+"interno, que los «globs» normalmente no seleccionan."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
+"matching the specified glob."
+msgstr ""
+"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+"(glob)`\", \"`copyright(glob)`\" - seleccionan páginas que contienen los metadatos "
+"dados, que se corresponden con el «glob» especificado."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`user(username)`\" - tests whether a modification is being made by a user "
+"with the specified username. If openid is enabled, an openid can also be put "
+"here."
+msgstr ""
+"\"`user(username)`\" - comprueba si se está haciendo una modificación por un "
+"usuario con el nombre de usuario especificado. Si openid está habilitado, también "
+"se puede usar aquí un openid."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`admin()`\" - tests whether a modification is being made by one of the "
+"wiki admins."
+msgstr ""
+"\"`admin()`\" - comprueba si se está haciendo una modificación por uno de "
+"los administradores del wiki."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ip(address)`\" - tests whether a modification is being made from the "
+"specified IP address."
+msgstr ""
+"\"`ip(address)`\" - comprueba si se está haciendo una modificación desde "
+"la dirección IP especificada."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
+"page matching the specified glob"
+msgstr ""
+"\"`postcomment(glob)`\" - selecciona solamente cuando se están poniendo comentarios "
+"a una página que se corresponde con el «glob» especificado"
+
+#. type: Plain text
+msgid ""
+"For example, to match all pages in a blog that link to the page about music "
+"and were written in 2005:"
+msgstr ""
+"Por ejemplo, para seleccionar todas las páginas de un blog que enlazan a la página "
+"sobre música y que fueron escritas en 2005:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and link(music) and creation_year(2005)\n"
+msgstr "\tblog/* and link(música) and creation_year(2005)\n"
+
+#. type: Plain text
+msgid ""
+"Note the use of \"and\" in the above example, that means that only pages "
+"that match each of the three expressions match the whole. Use \"and\" when "
+"you want to combine expression like that; \"or\" when it's enough for a page "
+"to match one expression. Note that it doesn't make sense to say \"index and "
+"SandBox\", since no page can match both expressions."
+msgstr ""
+"Fíjese en el uso de \"and\" en el ejemplo anterior, que significa que sólo son seleccionadas "
+"las páginas que se corresponden con cada una de las tres expresiones. Utilice \"and\" "
+"cuando quiera combinar una expresión como ésa; utilice \"or\" cuando sea suficiente que una "
+"página se corresponda con una de las expresiones. Fíjese en que no tiene sentido decir "
+"\"index and SandBox\", puesto que ninguna página puede corresponderse con ambas "
+"expresiones."
+
+#. type: Plain text
+msgid ""
+"More complex expressions can also be created, by using parentheses for "
+"grouping. For example, to match pages in a blog that are tagged with either "
+"of two tags, use:"
+msgstr ""
+"También se pueden crear expresiones más complejas, utilizando paréntesis para "
+"agruparlas. Por ejemplo, para seleccionar páginas de un blog que están etiquetadas "
+"con alguna de dos etiquetas, utilice:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and (tagged(foo) or tagged(bar))\n"
+msgstr "\tblog/* and (tagged(foo) or tagged(bar))\n"
+
+#. type: Plain text
+msgid ""
+"Note that page names in PageSpecs are matched against the absolute filenames "
+"of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will "
+"not match a page named \"a/foo\" or \"a/b/foo\". To match relative to the "
+"directory of the page containing the pagespec, you can use \"./\". For "
+"example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
+msgstr ""
+"Tenga en cuenta que los nombres de página en las PageSpecs se seleccionan según los "
+"nombre de archivo absolutos de las páginas del wiki, de tal modo que una «pagespec» "
+"\"foo\" utilizada en la página \"a/b\" no seleccionará una página llamada \"a/foo\" o \"a/b/foo\". "
+"Para seleccionar de manera relativa al directorio de la página que contiene la «pagespec», "
+"puede utilizar \"./\". Por ejemplo, \"./foo\" en la página \"a/b\" selecciona la página \"a/foo\"."
+
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po
new file mode 100644
index 000000000..201d87937
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po
@@ -0,0 +1,119 @@
+# Spanish translation of basewiki/ikiwiki/pagespec/attachment page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-03 13:21+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(attachment)\"\n"
+"     then=\"This wiki has attachments **enabled**.\"\n"
+"     else=\"This wiki has attachments **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(attachment)\"\n"
+"     then=\"Este wiki tiene los archivos adjuntos **activados**.\"\n"
+"     else=\"Este wiki tiene los archivos adjuntos **desactivados**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If attachments are enabled, the wiki admin can control what types of "
+"attachments will be accepted, via the `allowed_attachments` configuration "
+"setting."
+msgstr ""
+"Si los archivos adjuntos están activados, el administrador del wiki puede controlar "
+"qué tipos de archivos adjuntos serán aceptados a través de la opción de configuración "
+"`allowed_attachments`."
+
+#. type: Plain text
+msgid ""
+"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
+"files to be uploaded by joey into a specific directory, and check all "
+"attachments for viruses, something like this could be used:"
+msgstr ""
+"Por ejemplo, para limitar cualquier archivo a 50 kilobytes, pero permitir que "
+"joey envíe archivos mp3 más grandes a un directorio específico, y comprobar "
+"todos los archivos adjuntos en busca de virus, se podría utilizar algo como lo "
+"siguiente:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+
+#. type: Plain text
+msgid ""
+"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
+"additional tests:"
+msgstr ""
+"La sintaxis normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones adicionales "
+"siguientes:"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`maxsize(size)`\" - tests whether the attachment is no larger than the "
+"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", \"gb"
+"\" etc can be used to specify the units."
+msgstr ""
+"\"`maxsize(tamaño)`\" - comprueba que el archivo adjunto no sea más grande "
+"que el tamaño especificado. De manera predeterminada el tamaño se expresa "
+"en bytes, pero se puede utilizar «kb», «mb», «gb», etc., para especificar las "
+"unidades."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`minsize(size)`\" - tests whether the attachment is no smaller than the "
+"specified size."
+msgstr ""
+"\"`minsize(tamaño)`\" - comprueba que el archivo adjunto no sea más pequeño que "
+"el tamaño especificado."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as "
+"a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other "
+"enabled page format)."
+msgstr ""
+"\"`ispage()`\" - comprueba si el archivo adjunto será tratado por ikiwiki como una "
+"página wiki. (Es decir, si tiene una extensión \".mdwn\", o la de cualquier otro "
+"formato de página activado)."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
+"  use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n"
+"  as attachments, use `ispage()`.\n"
+msgstr ""
+"  Así, si no quiere permitir que se envíen páginas wiki como archivos adjuntos,\n"
+"  utilice `!ispage()` ; si sólo quiere permitir el envío de páginas wiki como \n"
+"  archivos adjuntos, utilice `ispage()`.\n"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can "
+"include a glob in the type, for example `mimetype(image/*)`."
+msgstr ""
+"\"`mimetype(foo/bar)`\" - comprueba el tipo MIME del archivo adjunto. Puede incluir "
+"un «glob» en el tipo, por ejemplo `mimetype(image/*)`."
+
+#. type: Bullet: '* '
+msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
+msgstr "\"`virusfree()`\" - comprueba el archivo adjunto con un programa antivirus."
+
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.es.po b/po/underlays/basewiki/ikiwiki/pagespec/po.es.po
new file mode 100644
index 000000000..3a9d8d4a1
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.es.po
@@ -0,0 +1,64 @@
+# Spanish translation of basewiki/ikiwiki/pagespec/attachment page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-03 13:48+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(po)\"\n"
+"     then=\"This wiki has po support **enabled**.\"\n"
+"     else=\"This wiki has po support **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(po)\"\n"
+"     then=\"Este wiki tiene **activada** la compatibilidad con po.\"\n"
+"     else=\"Este wiki tiene **desactivada** la compatibilidad con po.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/"
+"PageSpec]] syntax is expanded with the following additional tests that can "
+"be used to improve user navigation in a multi-lingual wiki:"
+msgstr ""
+"Si el complemento («plugin») [[!iki plugins/po desc=po]] está activado, la sintaxis "
+"normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones adicionales "
+"siguientes, que se pueden utilizar  para mejorar la navegación del usuario en "
+"un wiki multilingüe:"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`lang(LL)`\" - tests whether a page is written in the language specified "
+"as a ISO639-1 (two-letter) language code."
+msgstr ""
+"\"`lang(LL)`\" - comprueba si una página está escrita en el idioma especificado según "
+"el código ISO639-1 (dos letras)."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`currentlang()`\" - tests whether a page is written in the same language "
+"as the current page."
+msgstr ""
+"\"`currentlang()`\" - comprueba si una página está escrita en el mismo idioma "
+"que la página actual."
+
+#. type: Plain text
+msgid ""
+"Note that every non-po page is considered to be written in "
+"`po_master_language`, as specified in `ikiwiki.setup`."
+msgstr ""
+"Tenga en cuenta que se considera que cualquier página que no "
+"sea de tipo «po» está escrita en `po_master_language`, según "
+"se especifica en `ikiwiki.setup`."
+
diff --git a/po/underlays/basewiki/ikiwiki/searching.es.po b/po/underlays/basewiki/ikiwiki/searching.es.po
new file mode 100644
index 000000000..7ab8cdca3
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/searching.es.po
@@ -0,0 +1,84 @@
+# Spanish translation of basewiki/searching page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# First translation by Oscar Jacho
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: searching\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"PO-Revision-Date: 2009-12-06 18:16+0100\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(search)\"\n"
+"then=\"This wiki has searching **enabled**.\"\n"
+"else=\"This wiki has searching **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(search)\"\n"
+"then=\"Este wiki tiene la búsqueda **habilitada**.\"\n"
+"else=\"Este wiki tiene la búsqueda **deshabilitada**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If searching is enabled, you can enter search terms in the search field, as "
+"you'd expect. There are a few special things you can do to construct more "
+"powerful searches."
+msgstr ""
+"Si la búsqueda está habilitada, puede introducir el texto a buscar en el campo de búsqueda, tal "
+"y como cabría esperar. Hay además algunas reglas que puede usar para construir búsquedas más "
+"sofisticadas."
+
+#. type: Bullet: '* '
+msgid "To match a phrase, enclose it in double quotes."
+msgstr "Para buscar una frase exacta, pongala entre comillas dobles."
+
+#. type: Bullet: '* '
+msgid "`AND` can be used to search for documents containing two expressions."
+msgstr "`AND` se puede usar para buscar documentos que contengan dos expresiones."
+
+#. type: Bullet: '* '
+msgid ""
+"`OR` can be used to search for documents containing either one of two "
+"expressions."
+msgstr ""
+"`OR` se puede usar para buscar documentos que contengan cualquiera de las dos "
+"expresiones."
+
+#. type: Bullet: '* '
+msgid ""
+"Parentheses can be used to build up complicated search expressions. For "
+"example, \"(foo AND bar) OR (me AND you)\""
+msgstr ""
+"Los paréntesis se pueden usar para construir expresiones de búsqueda más complicadas. Por "
+"ejemplo, \"(foo AND bar) OR (me AND you)\""
+
+#. type: Bullet: '* '
+msgid ""
+"Prefix a search term with \"-\" to avoid it from appearing in the results.  "
+"For example, \"-discussion\" will omit \"discussion\"."
+msgstr ""
+"Ponga \"-\" antes de un término de búsqueda para evitar que aparezca en los resultados.  "
+"Por ejemplo, \"-discussion\" omitirá \"discussion\"."
+
+#. type: Bullet: '* '
+msgid "To search for a page with a given title, use \"title:foo\"."
+msgstr "Para buscar una página con un determinado título, use \"title:foo\"."
+
+#. type: Bullet: '* '
+msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"."
+msgstr "Para buscar páginas que contengan un enlace a \"bar\", use \"link:bar\"."
+
diff --git a/po/underlays/basewiki/ikiwiki/subpage.es.po b/po/underlays/basewiki/ikiwiki/subpage.es.po
new file mode 100644
index 000000000..0b0c8453e
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage.es.po
@@ -0,0 +1,51 @@
+# Spanish translation of basewiki/ikiwiki/subpage page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-03 18:21+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"ikiwiki supports placing pages in a directory hierarchy. For example, this "
+"page, [[SubPage]] has some related pages placed under it, like [[SubPage/"
+"LinkingRules]]. This is a useful way to add some order to your wiki rather "
+"than just having a great big directory full of pages."
+msgstr ""
+"ikiwiki permite colocar páginas en una jerarquía de directorios. Por ejemplo, bajo "
+"esta página, [[SubPage]] («subpágina»), hay algunas páginas relacionadas, como [[SubPage/LinkingRules]]. Ésta es una manera práctica de poner un poco de orden "
+"en el wiki, en lugar de tener simplemente un gran directorio lleno de páginas."
+
+#. type: Plain text
+msgid ""
+"To add a SubPage, just make a subdirectory and put pages in it. For example, "
+"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
+"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"nested as deeply as you'd like."
+msgstr ""
+"Para añadir una subpágina, simplemente cree un subdirectorio y ponga páginas en "
+"él. Por ejemplo, esta página es «SubPage.mdwn» en las fuentes del wiki, y hay además "
+"un directorio «SubPage», que contiene «SubPage/LinkingRules.mdwn». Las subpáginas "
+"pueden anidarse tanto como desee."
+
+#. type: Plain text
+msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
+msgstr ""
+"La creación de un enlace a y desde una subpágina se explica en [[LinkingRules]] "
+"(Reglas para la creación de enlaces)."
+
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po
new file mode 100644
index 000000000..f81291fa9
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po
@@ -0,0 +1,102 @@
+# Spanish translation of basewiki/ikiwiki/subpage/linkingrules page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-03 19:47+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To link to or from a [[SubPage]], you can normally use a regular "
+"[[WikiLink]] that does not contain the name of the parent directory of the "
+"[[SubPage]]. Ikiwiki descends the directory hierarchy looking for a page "
+"that matches your link."
+msgstr ""
+"Para crear un enlace a o desde una [[subpágina|SubPage]], usualmente "
+"puede usar un [[WikiLink]] normal que no contenga el nombre del directorio "
+"superior de la [[subpágina|SubPage]]. Ikiwiki desciende por la jerarquía de "
+"directorios buscando una página que se corresponda con su enlace."
+
+#. type: Plain text
+msgid ""
+"For example, if FooBar/SubPage links to \"OtherPage\", ikiwiki will first "
+"prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next to "
+"FooBar/OtherPage and finally to OtherPage in the root of the wiki."
+msgstr ""
+"Por ejemplo, si «FooBar/SubPagina» enlaza a «OtraPagina», ikiwiki preferirá primero "
+"dirigir el enlace a «FooBar/SubPagina/OtraPagina» si existe, a continuación a «FooBar/OtraPagina», "
+"y finalmente a «OtraPagina» en el directorio raíz del wiki."
+
+#. type: Plain text
+msgid ""
+"Note that this means that if a link on FooBar/SomePage to \"OtherPage\" "
+"currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage "
+"is created, the link will _change_ to point to FooBar/OtherPage. On the "
+"other hand, a link from BazBar to \"OtherPage\" would be unchanged by this "
+"creation of a [[SubPage]] of FooBar."
+msgstr ""
+"Tenga en cuenta que esto significa que si un enlace en «FooBar/AlgunaPagina» "
+"a «OtraPagina» enlaza actualmente a «OtraPagina» en el directorio raíz del wiki, "
+"y se crea «FooBar/OtraPagina», el enlace _cambiará_ para dirigir a «FooBar/OtraPagina». "
+"Por otra parte, un enlace desde «BazBar» a «OtraPagina» no cambiará por esta creación "
+"de una [[subpágina|SubPage]] de «FooBar»."
+
+#. type: Plain text
+msgid ""
+"You can also specify a link that contains a directory name, like \"FooBar/"
+"OtherPage\" to more exactly specify what page to link to. This is the only "
+"way to link to an unrelated [[SubPage]]."
+msgstr ""
+"También puede especificar un enlace que contenga un nombre de directorio, como "
+"«FooBar/OtraPagina» para especificar con más exactitud a qué página enlazar. Ésta es "
+"la única manera de enlazar a una [[subpágina|SubPage]] no relacionada."
+
+#. type: Plain text
+msgid ""
+"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", "
+"or from BazBar/SubPage to \"FooBar/SubPage\"."
+msgstr ""
+"Puede utilizar esto, por ejemplo, para enlazar desde «BazBar» a «FooBar/SubPagina», "
+"o desde «BazBar/SubPagina» a «FooBar/SubPagina»."
+
+#. type: Plain text
+msgid ""
+"You can also use \"/\" at the start of a link, to specify exactly which page "
+"to link to, when there are multiple pages with similar names and the link "
+"goes to the wrong page by default. For example, linking from \"FooBar/SubPage"
+"\" to \"/OtherPage\" will link to the \"OtherPage\" in the root of the wiki, "
+"even if there is a \"FooBar/OtherPage\"."
+msgstr ""
+"También puede utilizar «/» al principio de un enlace, para especificar exactamente "
+"a qué página enlazar, cuando existen múltiples páginas con nombres similares y "
+"el enlace conduce a la página equivocada de manera predeterminada. Por ejemplo, "
+"crear un enlace desde «FooBar/SubPagina» a «/OtraPagina» conducirá a la «OtraPagina» "
+"del directorio raíz del wiki, incluso aunque haya una «FooBar/OtraPagina»."
+
+#. type: Plain text
+msgid ""
+"Also, if the wiki is configured with a userdir, you can link to pages within "
+"the userdir without specifying a path to them. This is to allow for easy "
+"linking to a user's page in the userdir, to sign a comment. These links are "
+"checked for last of all."
+msgstr ""
+"Además, si el wiki está configurado con un directorio «userdir», puede enlazar a "
+"páginas dentro del «userdir» sin especificar una ruta hasta ellas. Esto ocurre para "
+"permitir la creación sencilla de enlaces a la página de un usuario en el «userdir», "
+"para firmar un comentario. Estos enlaces se comprueban en último lugar."
+
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.es.po b/po/underlays/basewiki/ikiwiki/wikilink.es.po
new file mode 100644
index 000000000..252bc9984
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/wikilink.es.po
@@ -0,0 +1,107 @@
+# Spanish translation of basewiki/ikiwiki/wikilink page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: wikilink\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-12-06 17:57+0100\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"WikiLinks provide easy linking between pages of the wiki. To create a "
+"[[WikiLink]], just put the name of the page to link to in double brackets.  "
+"For example `\\[[WikiLink]]`."
+msgstr ""
+"Los WikiLinks proporcionan enlaces fáciles entre páginas del wiki. Para crear un "
+"[[WikiLink]], ponga simplemente el nombre de la página a enlazar entre corchetes "
+"dobles. Por ejemplo, `\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"If you ever need to write something like `\\[[WikiLink]]` without creating a "
+"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
+msgstr ""
+"Si necesita crea algo como `\\[[WikiLink]]` sin crear un link wiki, simplemente añada "
+"`\\` como prefijo, de la siguiente manera: `\\\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"There are some special [[SubPage/LinkingRules]] that come into play when "
+"linking between [[SubPages|SubPage]]."
+msgstr ""
+"Hay algunas [[Reglas para la creación de enlaces|SubPage/LinkingRules]] especiales "
+"que entran en juego al enlazar [[Subpáginas|SubPage]]."
+
+#. type: Plain text
+msgid ""
+"Also, if the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Además, si el archivo enlazado por un WikiLink parece una imagen, se mostrará "
+"como parte de la página."
+
+#. type: Plain text
+msgid ""
+"WikiLinks are matched with page names in a case-insensitive manner, so you "
+"don't need to worry about getting the case the same, and can capitalise "
+"links at the start of a sentence, and so on."
+msgstr ""
+"Los WikiLinks se corresponden con nombres de página sin tener en cuenta si se "
+"usan letras mayúsculas o minúsculas, así que no tiene que preocuparse por esto, y "
+"puede por ejemplo utilizar mayúsculas en un enlace si se encuentra al principio de una frase."
+
+#. type: Plain text
+msgid ""
+"It's also possible to write a WikiLink that uses something other than the "
+"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
+"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
+msgstr ""
+"También es posible escribir un WikiLink que use otra cosa en lugar del nombre de la "
+"página como texto del enlace. Por ejemplo `\\[[foo_bar|SandBox]]` enlaza a la página "
+"de la zona de pruebas («SandBox»), pero el enlace aparece así: [[foo_bar|SandBox]]."
+
+#. type: Plain text
+msgid ""
+"To link to an anchor inside a page, you can use something like `"
+"\\[[WikiLink#foo]]` ."
+msgstr ""
+"Para enlazar a un punto («anchor») dentro de una página, puede utilizar algo "
+"como `\\[[WikiLink#foo]]` ."
+
+#. type: Title ##
+#, no-wrap
+msgid "Directives and WikiLinks"
+msgstr "Directivas y WikiLinks"
+
+#. type: Plain text
+msgid ""
+"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+"used spaces to distinguish between directives and wikilinks; as a result, "
+"with that syntax in use, you cannot use spaces in WikiLinks, and must "
+"replace spaces with underscores.  The newer syntax, enabled with the "
+"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+"with `!`, and thus does not prevent links with spaces.  Future versions of "
+"ikiwiki will turn this option on by default."
+msgstr ""
+"ikiwiki tiene dos sintaxis para las [[directivas|directive]]. La sintaxis antigua "
+"utilizaba espacios para distinguir entre directivas y wikilinks; como resultado, "
+"al utilizar esa sintaxis, no podía utilizar espacios en los WikiLinks, y debía reemplazar "
+"los espacios con guiones bajos. La nueva sintaxis, activada con la opción `prefix_directives` "
+"en un archivo de configuración de ikiwiki, añade a las directivas el prefijo `!`, y así no "
+"impide enlaces con espacios. Futuras versiones de ikiwiki activarán esta opción de "
+"manera predeterminada."
+
diff --git a/po/underlays/basewiki/index.es.po b/po/underlays/basewiki/index.es.po
new file mode 100644
index 000000000..548e966e2
--- /dev/null
+++ b/po/underlays/basewiki/index.es.po
@@ -0,0 +1,31 @@
+# Spanish translation of basewiki/index page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-16 21:03+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+msgid "Welcome to your new wiki."
+msgstr "Bienvenido a su nuevo wiki."
+
+#. type: Plain text
+msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
+msgstr ""
+"Se supone que todos los wikis tienen una [[Zona_de_pruebas|SandBox]], "
+"así que éste también la tiene."
+
+#. type: Plain text
+msgid "This wiki is powered by [[ikiwiki]]."
+msgstr "Este wiki funciona con [[ikiwiki]]."
+
diff --git a/po/underlays/basewiki/recentchanges.es.po b/po/underlays/basewiki/recentchanges.es.po
new file mode 100644
index 000000000..1c5c461ca
--- /dev/null
+++ b/po/underlays/basewiki/recentchanges.es.po
@@ -0,0 +1,40 @@
+# Spanish translation of basewiki/recentchanges page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki \n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-16 22:38+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"RecentChanges\"]]\n"
+msgstr "[[!meta title=\"CambiosRecientes\"]]\n"
+
+#. type: Plain text
+msgid "Recent changes to this wiki:"
+msgstr "Cambios recientes a este wiki:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
+msgstr ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
+
diff --git a/po/underlays/basewiki/sandbox.es.po b/po/underlays/basewiki/sandbox.es.po
new file mode 100644
index 000000000..12bf5347d
--- /dev/null
+++ b/po/underlays/basewiki/sandbox.es.po
@@ -0,0 +1,90 @@
+# Spanish translation of basewiki/sandbox page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:56-0300\n"
+"PO-Revision-Date: 2009-08-16 19:15+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+msgid "This is the SandBox, a page anyone can edit to learn how to use the wiki."
+msgstr "Esta es la Zona de Pruebas («SandBox»), una página que cualquiera puede editar para aprender a usar el wiki."
+
+#. type: Plain text
+msgid "Here's a paragraph."
+msgstr "Aquí podemos ver un párrafo."
+
+#. type: Plain text
+msgid "Here's another one with *emphasised* text."
+msgstr "Aquí podemos ver otro con texto *resaltado*."
+
+#. type: Title #
+#, no-wrap
+msgid "Header"
+msgstr "Título"
+
+#. type: Title ##
+#, no-wrap
+msgid "Subheader"
+msgstr "Subtítulo"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> This is a blockquote.\n"
+">\n"
+"> This is the first level of quoting.\n"
+">\n"
+"> > This is nested blockquote.\n"
+">\n"
+"> Back to the first level.\n"
+msgstr ""
+"> Esto es un bloque de cita. \n"
+">\n"
+"> Éste es el primer nivel de citación.\n"
+">\n"
+"> > Esto es un bloque de cita de nivel inferior.\n"
+">\n"
+"> De vuelta al primer nivel.\n"
+
+#. type: Plain text
+msgid "Numbered list"
+msgstr "Lista numerada"
+
+#. type: Bullet: '1. '
+msgid "First item."
+msgstr "Primer elemento."
+
+#. type: Bullet: '1. '
+msgid "Another."
+msgstr "Otro."
+
+#. type: Bullet: '1. '
+msgid "And another.."
+msgstr "Y otro ..."
+
+#. type: Plain text
+msgid "Bulleted list"
+msgstr "Lista"
+
+#. type: Bullet: '* '
+msgid "*item*"
+msgstr "*elemento*"
+
+#. type: Bullet: '* '
+msgid "item"
+msgstr "elemento"
+
+#. type: Plain text
+msgid "[[ikiwiki/WikiLink]]"
+msgstr "[[ikiwiki/WikiLink]]"
+
diff --git a/po/underlays/basewiki/shortcuts.es.po b/po/underlays/basewiki/shortcuts.es.po
new file mode 100644
index 000000000..8ac3759f5
--- /dev/null
+++ b/po/underlays/basewiki/shortcuts.es.po
@@ -0,0 +1,233 @@
+# Spanish translation of shortcuts page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"PO-Revision-Date: 2009-08-17 01:02+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(shortcut)\"\n"
+"     then=\"This wiki has shortcuts **enabled**.\"\n"
+"     else=\"This wiki has shortcuts **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(shortcut)\"\n"
+"     then=\"Este wiki tiene los atajos **activados**.\"\n"
+"     else=\"Este wiki tiene los atajos **desactivados**.\"]]\n"
+
+#. type: Plain text
+msgid "Some examples of using shortcuts include:"
+msgstr "Algunos ejemplos de uso de los atajos incluyen:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n"
+msgstr ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tCompruebe la \\[[!cia ikiwiki desc=\"página de CIA para %s\"]].\n"
+
+#. type: Plain text
+msgid "This page controls what shortcut links the wiki supports."
+msgstr "Esta página controla qué atajos de enlace se pueden hacer en el wiki."
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgstr "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+msgstr "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
+msgstr ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgstr "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
+msgstr ""
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+"  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+msgstr ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+"  * Uso: `\\[[!debss package]]`, `\\[[!debss package#version]]`, o `\\[[!debss package/version]]`. Para más detalles, vea http://snapshot.debian.net .\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+
+#. type: Plain text
+#| msgid ""
+#| "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the "
+#| "url, \"%s\" is replaced with the text passed to the named shortcut, after "
+#| "url-encoding it, and '%S' is replaced with the raw, non-encoded text. The "
+#| "optional `desc` parameter controls the description of the link."
+msgid ""
+"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
+"\"%s\" is replaced with the text passed to the named shortcut, after [[!"
+"wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded "
+"text. The optional `desc` parameter controls the description of the link."
+msgstr ""
+"Para añadir un nuevo atajo, utilice la [[directiva|ikiwiki/directive]] "
+"`shortcut`. En el url, «%s» se reemplaza con el texto que se pasa al atajo "
+"nombrado, después de codificarlo mediante el [[!wikipedia url_encoding]], y «%S» se "
+"reemplaza con el texto en bruto, no codificado. El parámetro opcional `desc` "
+"controla la descripción del enlace."
+
+#. type: Plain text
+msgid ""
+"Remember that the `name` you give the shortcut will become a new [[ikiwiki/"
+"directive]].  Avoid using a `name` that conflicts with an existing "
+"directive.  These directives also accept a `desc` parameter that will "
+"override the one provided at definition time."
+msgstr ""
+"Recuerde que el `name` («nombre») que le dé al atajo se convertirá en una "
+"nueva [[directiva|ikiwiki/directive]]. Evite utilizar un `name` («nombre») "
+"que choque con una directiva que ya exista. Estas directivas también aceptan "
+"un parámetro `desc` que anulará la que se proporcione en la definición."
+
+#. type: Plain text
+#| msgid ""
+#| "If you come up with a shortcut that you think others might find useful, "
+#| "consider contributing it to the [shortcuts page on the ikiwiki ikiwiki]"
+#| "(http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki will "
+#| "include your shortcut in the standard underlay."
+msgid ""
+"If you come up with a shortcut that you think others might find useful, "
+"consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
+"ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include "
+"your shortcut in the standard underlay."
+msgstr ""
+"Si se le ocurre un atajo que crea que puede ser útil para otros, considere "
+"aportarlo a la [página de atajos en el wiki ikiwiki](http://ikiwiki.info/"
+"shortcuts/), de tal modo que futuras versiones de ikiwiki puedan incluir su "
+"atajo en la base estándar."
+
diff --git a/po/underlays/basewiki/templates.es.po b/po/underlays/basewiki/templates.es.po
new file mode 100644
index 000000000..21173d528
--- /dev/null
+++ b/po/underlays/basewiki/templates.es.po
@@ -0,0 +1,242 @@
+# Spanish translation of templates page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-17 13:22+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"This wiki has templates **enabled**.\"\n"
+"else=\"This wiki has templates **disabled**.\"\n"
+"]]\n"
+msgstr ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"Este wiki tiene las plantillas **activadas**.\"\n"
+"else=\"Este wiki tiene las plantillas **desactivadas**.\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid ""
+"Templates are files that can be filled out and inserted into pages in the "
+"wiki."
+msgstr ""
+"Las plantillas son archivos que se pueden completar e insertar en páginas "
+"del wiki."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid "These templates are available for inclusion onto other pages in this wiki:"
+msgstr "Estas plantillas están disponibles en este wiki para ser incluidas en otras páginas:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+msgstr ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "Using a template"
+msgstr "Uso de una plantilla"
+
+#. type: Plain text
+msgid "Using a template works like this:"
+msgstr "El uso de una plantilla es así:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+msgstr "\t\\[[!template id=note text=\"\"\"Éste es el texto que se insertará en mi nota.\"\"\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This fills out the [[note]] template, filling in the `text` field with the "
+"specified value, and inserts the result into the page."
+msgstr ""
+"Esto rellena la plantilla [[note]] («nota»), completando el campo `text` "
+"(«texto») con el valor especificado, e inserta el resultado en la página."
+
+#. type: Plain text
+msgid ""
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
+msgstr ""
+"Por lo general, un valor puede incluir cualquier marcado («markup») permitido "
+"en la página wiki fuera de la plantilla. La utilización de comillas triples permite "
+"incluso que se incluyan comillas. En combinación con valores entrecomillados "
+"en múltiples líneas, esto permite que se incluyan grandes fragmentos de texto "
+"marcado en una plantilla:"
+
+#. type: Plain text
+#, no-wrap
+msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+
+#. type: Bullet: '        * '
+msgid "\\[[Charley]]'s sister."
+msgstr "Hermana de \\[[Charley]]."
+
+#. type: Bullet: '        * '
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr "\"Quiero ser astronauta cuando crezca.\""
+
+#. type: Bullet: '        * '
+msgid "Really 8 and a half."
+msgstr "8 y medio en realidad."
+
+#. type: Title ##
+#, no-wrap
+msgid "Creating a template"
+msgstr "Creación de una plantilla"
+
+#. type: Plain text
+msgid ""
+"To create a template, simply add a template directive to a page, and the "
+"page will provide a link that can be used to create the template. The "
+"template is a regular wiki page, located in the `templates/` subdirectory "
+"inside the source directory of the wiki."
+msgstr ""
+"Para crear una plantilla, simplemente añada una directiva de plantilla a una "
+"página, y ésta proporcionará un enlace que puede utilizarse para crear la "
+"plantilla. La plantilla es una página wiki normal, situada en el subdirectorio "
+"`templates/` dentro del directorio fuente del wiki."
+
+#. type: Plain text
+msgid ""
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
+msgstr ""
+"La plantilla utiliza la sintaxis usada por el módulo perl [[!cpan HTML::Template]], "
+"que permite hacer algunas cosas bastante complejas. Consulte su documentación "
+"para ver la sintaxis completa, pero todo lo que realmente necesita saber son unas "
+"pocas cosas:"
+
+#. type: Bullet: '* '
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr ""
+"Cada parámetro que pase a la directiva de plantilla generará una variable de "
+"plantilla. También existen algunas variables predefinidas como PAGE y BASENAME."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
+msgstr ""
+"Para introducir el valor de una variable, utilice `<TMPL_VAR variable>`. El marcado "
+"(«markup») wiki en el valor será convertido primero a html."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
+msgstr ""
+"Para insertar el valor sin procesar de una variable, con el marcado wiki no "
+"convertido todavía a html, utilice `<TMPL_VAR raw_variable>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"NAME=\"variable\">text</TMPL_IF>`."
+msgstr ""
+"Para que un bloque de texto dependa de que una variable haya sido establecida, "
+"utilice `<TMPL_IF NAME=\"variable\">texto</TMPL_IF>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+"Para utilizar un bloque de texto si se ha establecido una variable, y otro texto "
+"si no se ha establecido, utilice "
+"`<TMPL_IF NAME=\"variable\">texto<TMPL_ELSE>otro texto</TMPL_IF>`"
+
+#. type: Plain text
+msgid "Here's a sample template:"
+msgstr "Esto es una plantilla de ejemplo:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        <span class=\"infobox\">\n"
+"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Age: <TMPL_VAR age><br />\n"
+"        <TMPL_IF NAME=\"color\">\n"
+"        Favorite color: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF NAME=\"notes\">\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+msgstr ""
+"        <span class=\"infobox\">\n"
+"        Nombre: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Edad: <TMPL_VAR age><br />\n"
+"        <TMPL_IF NAME=\"color\">\n"
+"        Color favorito: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        Ningún color favorito.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF NAME=\"notes\">\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+
+#. type: Plain text
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
+msgstr ""
+"La plantilla rellenada se formateará de la misma manera que el resto de la página "
+"que la contiene, así que puede incluir WikiLinks («enlaces wiki») y todas las otras "
+"formas de marcado wiki en la plantilla. Sin embargo, tenga en cuenta que estos "
+"WikiLinks no aparecerán como «backlinks» a la página que usa la plantilla."
+
+#. type: Plain text
+msgid ""
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
+"ensures that if the name contains something that might be mistaken for wiki "
+"markup, it's not converted to html before being processed as a [[ikiwiki/"
+"WikiLink]]."
+msgstr ""
+"Tenga en cuenta el uso de «raw_name» dentro del generador de [[ikiwiki/WikiLink]]. "
+"Esto asegura que si el nombre contiene algo que pueda ser tomado equivocadamente "
+"como marcado wiki, no sea convertido a html antes de ser procesado como un "
+"[[ikiwiki/WikiLink]]."
+
diff --git a/po/underlays/basewiki/templates/note.es.po b/po/underlays/basewiki/templates/note.es.po
new file mode 100644
index 000000000..de2c53f5f
--- /dev/null
+++ b/po/underlays/basewiki/templates/note.es.po
@@ -0,0 +1,44 @@
+# Spanish translation of basewiki/templates/note page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-17 13:48+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Use this template to insert a note into a page. The note will be styled to\n"
+"float to the right of other text on the page. This template has one\n"
+"parameter:\n"
+"<ul>\n"
+"<li>`text` - the text to display in the note\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
+msgstr ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Use esta plantilla para insertar una nota en una página. La nota se\n"
+"configurará para flotar a la derecha de otro texto en la página.\n"
+"Esta plantilla tiene un parámetro:\n"
+"<ul>\n"
+"<li>`text` - el texto que aparecerá en la nota\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
+
diff --git a/po/underlays/basewiki/templates/popup.es.po b/po/underlays/basewiki/templates/popup.es.po
new file mode 100644
index 000000000..10fddb8c0
--- /dev/null
+++ b/po/underlays/basewiki/templates/popup.es.po
@@ -0,0 +1,54 @@
+# Spanish translation of basewiki/templates/popup page for ikiwiki.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-17 14:06+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Use this template to create a popup window that is displayed when the mouse\n"
+"is over part of the page. This template has two parameters:\n"
+"<ul>\n"
+"<li>`mouseover` - This is the text or other content that triggers the\n"
+"popup.\n"
+"<li>`popup` - This should be the content of the popup window. It can be\n"
+"anything, even images or a whole little wiki page, but should not be too\n"
+"large for good usability.\n"
+"</ul>\n"
+"Note that browsers that do not support the CSS will display the popup\n"
+"inline in the page, inside square brackets.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
+msgstr ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Utilice esta plantilla para crear una ventana emergente que se mostrará cuando\n"
+"el ratón esté encima de una parte de la página. Esta plantilla tiene dos parámetros:\n"
+"<ul>\n"
+"<li>`mouseover` - Éste es el texto, u otro contenido, que activa la ventana\n"
+"emergente.\n"
+"<li>`popup` - Éste debería ser el contenido de la ventana emergente. Puede ser\n"
+"cualquier cosa, incluso imágenes o una pequeña página wiki completa, pero no\n"
+"debe ser demasiado grande para favorecer una buena usabilidad.\n"
+"</ul>\n"
+"Tenga en cuenta que los navegadores que no sean compatibles con el CSS mostrarán\n"
+"la ventana emergente como parte de la página, dentro de corchetes.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
+
-- 
cgit v1.2.3


From 1370a26030599dc2f7cbeb3df714e7935860e436 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 7 Dec 2009 01:03:37 -0500
Subject: show you the code!

---
 ...er_ceiling___40__opposite_of_levels__61____41__.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
index 547c7a80a..318375660 100644
--- a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
+++ b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
@@ -1,3 +1,20 @@
 It would be nice if the [[plugins/toc]] plugin let you specify a header level "ceiling" above which (or above and including which) the headers would not be incorporated into the toc.
 
 Currently, the levels=X parameter lets you tweak how deep it will go for small headers, but I'd like to chop off the h1's (as I use them for my page title) -- [[Jon]]
+
+> This change to toc.pm should do it. --[[KathrynAndersen]]
+
+	56,57c56,57
+	<       my $startlevel=($params{startlevel} ? $params{startlevel} : 0);
+	<       my $curlevel=$startlevel-1;
+	---
+	>       my $curlevel;
+	>       my $startlevel=0;
+	70d69
+	<                       # unless we're given startlevel as a parameter
+	75,79d73
+	<                       elsif (defined $params{startlevel}
+	<                              and $level < $params{startlevel})
+	<                       {
+	<                           return;
+	<                       }
-- 
cgit v1.2.3


From 4fe1eb7ab542255eaa3d0266bc0437b49bacef4d Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 7 Dec 2009 01:05:35 -0500
Subject: my bad; wrong way around

---
 ...iling___40__opposite_of_levels__61____41__.mdwn | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
index 318375660..2d90772db 100644
--- a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
+++ b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
@@ -5,16 +5,17 @@ Currently, the levels=X parameter lets you tweak how deep it will go for small h
 > This change to toc.pm should do it. --[[KathrynAndersen]]
 
 	56,57c56,57
-	<       my $startlevel=($params{startlevel} ? $params{startlevel} : 0);
-	<       my $curlevel=$startlevel-1;
+	<       my $curlevel;
+	<       my $startlevel=0;
 	---
-	>       my $curlevel;
-	>       my $startlevel=0;
-	70d69
-	<                       # unless we're given startlevel as a parameter
-	75,79d73
-	<                       elsif (defined $params{startlevel}
-	<                              and $level < $params{startlevel})
-	<                       {
-	<                           return;
-	<                       }
+	>       my $startlevel=($params{startlevel} ? $params{startlevel} : 0);
+	>       my $curlevel=$startlevel-1;
+	69a70
+	>                       # unless we're given startlevel as a parameter
+	73a75,79
+	>                       elsif (defined $params{startlevel}
+	>                              and $level < $params{startlevel})
+	>                       {
+	>                           return;
+	>                       }
+
-- 
cgit v1.2.3


From 0294fdfb5c50e5af22acc14407a2b69c79360e44 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 7 Dec 2009 14:38:10 -0500
Subject: call git remote prune to drop stale tracking branches

---
 gitremotes | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gitremotes b/gitremotes
index e2468814b..d49cf2d9e 100755
--- a/gitremotes
+++ b/gitremotes
@@ -28,6 +28,9 @@ while (<IN>) {
 			print "$remote failed\n";
 		}
 		$error |= $r;
+		
+		# drop stale tracking branches
+		system("git", "remote", "prune", $remote);
 	}
 }
 close IN;
-- 
cgit v1.2.3


From 958e83230d36bbf995329981a659ee69717a0451 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 7 Dec 2009 14:44:50 -0500
Subject: drop remote pulling; can be done using git remote update --prune

---
 gitremotes | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/gitremotes b/gitremotes
index d49cf2d9e..f596c650f 100755
--- a/gitremotes
+++ b/gitremotes
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 # Parses list of remotes in doc/git.mdwn, configures git to use them
-# all, and fetches updates from them.
-
-my $error=0;
+# all. After running this, use "git remote update --prune" to pull
+# updates from all remotes.
 
 open (IN, "doc/git.mdwn") || die "doc/git.mdwn: $!";
 while (<IN>) {
@@ -15,24 +14,10 @@ while (<IN>) {
 		# check configured url to deal with it changing
 		my $info=`git remote show -n $remote`;
 		my ($oldurl)=$info=~/URL: (.*)/m;
-		my $r;
 		if ($oldurl ne $url) {
 			system("git remote rm $remote 2>/dev/null");
-			$r = system("git", "remote", "add", "-f", $remote, $url)
-		}
-		else {
-			$r = system("git", "fetch", "--no-tag", $remote);
+			system("git", "remote", "add", "-f", $remote, $url)
 		}
-
-		if ($r != 0) {
-			print "$remote failed\n";
-		}
-		$error |= $r;
-		
-		# drop stale tracking branches
-		system("git", "remote", "prune", $remote);
 	}
 }
 close IN;
-
-exit $error;
-- 
cgit v1.2.3


From 8241b092acab7e8af0e6dd04ea53bdb67a314e44 Mon Sep 17 00:00:00 2001
From: "http://xma.myopenid.com/" <http://xma.myopenid.com/@web>
Date: Mon, 7 Dec 2009 15:02:18 -0500
Subject: removed

---
 doc/users/xma.mdwn | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 doc/users/xma.mdwn

diff --git a/doc/users/xma.mdwn b/doc/users/xma.mdwn
deleted file mode 100644
index 89f2ff74c..000000000
--- a/doc/users/xma.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-[[!meta title="Xavier Maillard"]]
-# Xavier Maillard
-
-I just started using [[ikiwiki]] for my own webspace at http://maillard.mobi/~xma/wiki
-
-I am learning how to effectively use it.
-
-Anyway, [[ikiwiki]] is really *awesome* !
-
-## More about me
-
-I am CLI user living in the linux console. More precisely, I live in an [[GNU_Emacs]] frame all day long. My main computer is an EeePC 901 running Slackware GNU/Linux 12.1. I do not have X installed (too lazy) but when in X, I am running an instance of [[CLFSWM]].
-
-## Contacting me
-
-Various channels to contact me:
-
-- mail: xma@gnu.org
-- jabber: xma01@jabber.fr
-- mobile: +33 621-964-362 (I only anwser to people I know though)
-
-Voila.
-
-## Plans
-
-I am planning to make a presentation of [[ikiwiki]]to my [local LUG](http://lolica.org) for our next montly meeting. Any help would be greatly appreciated.
-
-We are discussing to replace our old unmaintained (and unmaintainable) [SPIP](http://spip.net) website with a wiki. This is why I would like using ikiwiki ;)
-- 
cgit v1.2.3


From d0604bdc745536d8d0c12c7366f838c273dc2e87 Mon Sep 17 00:00:00 2001
From: "http://adam.shand.net/" <http://adam.shand.net/@web>
Date: Mon, 7 Dec 2009 21:51:56 -0500
Subject:

---
 doc/news/version_3.20091113.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/news/version_3.20091113.mdwn b/doc/news/version_3.20091113.mdwn
index f313b57d1..579174011 100644
--- a/doc/news/version_3.20091113.mdwn
+++ b/doc/news/version_3.20091113.mdwn
@@ -13,6 +13,6 @@ ikiwiki 3.20091113 released with [[!toggle text="these changes"]]
    * httpauth: Add cgiauthurl setting that can be used to do http basic auth
      only when ikiwiki needs authentication, rather than for any access to
      the cgi/wiki.
-   * inline: Do not generated feeds for nested inlines.
+   * inline: Do not generate feeds for nested inlines.
    * inline: Allow direct inclusion of non-page files in raw mode.
-   * inline: Fix display of all pages when archive=yes or show=0 are used."""]]
\ No newline at end of file
+   * inline: Fix display of all pages when archive=yes or show=0 are used."""]]
-- 
cgit v1.2.3


From 43b251aec4e5c788cd1c9ae2f3ca3725462de8b7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Dec 2009 19:03:43 -0500
Subject: typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cffc316ea..ccf45df94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,7 +41,7 @@ ikiwiki (3.20091113) unstable; urgency=low
   * httpauth: Add cgiauthurl setting that can be used to do http basic auth
     only when ikiwiki needs authentication, rather than for any access to 
     the cgi/wiki.
-  * inline: Do not generated feeds for nested inlines.
+  * inline: Do not generate feeds for nested inlines.
   * inline: Allow direct inclusion of non-page files in raw mode.
   * inline: Fix display of all pages when archive=yes or show=0 are used.
 
-- 
cgit v1.2.3


From a132ca7c62df5ceb6c3be425613cd36c1938e335 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 10 Dec 2009 07:40:42 -0500
Subject:

---
 ..._set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
index 2d90772db..ce51d90a3 100644
--- a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
+++ b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
@@ -4,6 +4,12 @@ Currently, the levels=X parameter lets you tweak how deep it will go for small h
 
 > This change to toc.pm should do it. --[[KathrynAndersen]]
 
+> > The patch looks vaguely OK to me but it's hard to tell without
+> > context. It'd be much easier to review if you used unified diff
+> > (`diff -u`), which is what `git diff` defaults to - almost all
+> > projects prefer to receive changes as unified diffs (or as
+> > branches in their chosen VCS, which is [[git]] here). --[[smcv]]
+
 	56,57c56,57
 	<       my $curlevel;
 	<       my $startlevel=0;
@@ -19,3 +25,4 @@ Currently, the levels=X parameter lets you tweak how deep it will go for small h
 	>                           return;
 	>                       }
 
+[[!tag patch]]
-- 
cgit v1.2.3


From 5d4ef9cecc2079355099ed7ede016611945e2fba Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Dec 2009 22:16:58 -0500
Subject: split out the toplevel discussion page into individual forum posts

backdated to the date the topic was discussed to avoid flooding
---
 doc/forum.mdwn                                     |   6 +-
 ...submitted_and_then_reviewed_before_posting.mdwn |  23 +
 .../Regex_for_Valid_Characters_in_Filenames.mdwn   |  19 +
 doc/forum/Should_not_create_an_existing_page.mdwn  |  15 +
 doc/forum/Spaces_in_wikilinks.mdwn                 | 104 +++++
 ...teps_from_RecentChanges_CGI_to_static_page.mdwn |  10 +
 ...arious_ways_to_use_Subversion_with_ikiwiki.mdwn |  23 +
 doc/forum/editing_the_style_sheet.mdwn             |  18 +
 doc/forum/how_do_I_translate_a_TWiki_site.mdwn     |  44 ++
 doc/forum/installation_and_setup_questions.mdwn    |  52 +++
 doc/forum/installation_as_non-root_user.mdwn       |   7 +
 doc/forum/installation_of_selected_docs.mdwn       |  29 ++
 doc/forum/upgrade_steps.mdwn                       | 147 +++++++
 doc/index/discussion.mdwn                          | 465 +--------------------
 14 files changed, 496 insertions(+), 466 deletions(-)
 create mode 100644 doc/forum/News_site_where_articles_are_submitted_and_then_reviewed_before_posting.mdwn
 create mode 100644 doc/forum/Regex_for_Valid_Characters_in_Filenames.mdwn
 create mode 100644 doc/forum/Should_not_create_an_existing_page.mdwn
 create mode 100644 doc/forum/Spaces_in_wikilinks.mdwn
 create mode 100644 doc/forum/Upgrade_steps_from_RecentChanges_CGI_to_static_page.mdwn
 create mode 100644 doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn
 create mode 100644 doc/forum/editing_the_style_sheet.mdwn
 create mode 100644 doc/forum/how_do_I_translate_a_TWiki_site.mdwn
 create mode 100644 doc/forum/installation_and_setup_questions.mdwn
 create mode 100644 doc/forum/installation_as_non-root_user.mdwn
 create mode 100644 doc/forum/installation_of_selected_docs.mdwn
 create mode 100644 doc/forum/upgrade_steps.mdwn

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index 729540774..19ca9ed0b 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,6 +1,8 @@
-This is a place for questions and discussions that don't have a Discussion page fitting enough. Users of ikiwiki can ask questions here.
+This is a place for questions and discussions that don't have a Discussion
+page fitting enough. Users of ikiwiki can ask questions here.
 
-_This is a bold experiment by me, since I have exactly such a question. This overrides the default content/discussion dichotomy, feel free to refactor and discuss! --ulrik_
+Note that for more formal bug reports or todo items, you can also edit the
+[[bugs]] and [[todo]] pages.
 
 ## Current topics ##
 
diff --git a/doc/forum/News_site_where_articles_are_submitted_and_then_reviewed_before_posting.mdwn b/doc/forum/News_site_where_articles_are_submitted_and_then_reviewed_before_posting.mdwn
new file mode 100644
index 000000000..3879c594a
--- /dev/null
+++ b/doc/forum/News_site_where_articles_are_submitted_and_then_reviewed_before_posting.mdwn
@@ -0,0 +1,23 @@
+[[meta date="2008-04-28 14:57:25 -0400"]]
+
+I am considering moving a news site to Ikiwiki. I am hoping that Ikiwiki has a feature where anonymous posters can submit a form that moderators can review and then accept for it to be posted on a news webpage (like front page of the website).
+
+> Well, you can have one blog that contains unreviewed articles, and
+> moderators can then add a tag that makes the article show up in the main
+> news feed. There's nothing stopping someone submitting an article
+> pre-tagged though. If you absolutely need to lock that down, you could
+> have one blog with unreviewed articles in one subdirectory, and reviewers
+> then move the file over to another subdirectory when they're ready to
+> publish it. (This second subdirectory would be locked to prevent others
+> from writing to it.) --[[Joey]]
+
+Also it would be good if the news page would keep maybe just the latest 10 entries with links to an archive that make it easy to browse to old entries by date. (Could have over a thousand news articles.)
+
+> The inline plugin allows setting up things like this.
+
+Plus users be able to post feedback to news items. If anonymous, they must be approved first. I'd prefer to not use normal "wiki" editor for feedback.
+
+Any thoughts or examples on this? Any links to examples of news sites or blogs with outside feedback using ikiwiki?
+
+Thanks --[[JeremyReed]]
+
diff --git a/doc/forum/Regex_for_Valid_Characters_in_Filenames.mdwn b/doc/forum/Regex_for_Valid_Characters_in_Filenames.mdwn
new file mode 100644
index 000000000..618576f81
--- /dev/null
+++ b/doc/forum/Regex_for_Valid_Characters_in_Filenames.mdwn
@@ -0,0 +1,19 @@
+I'm sure that this is documented somewhere but I've ransacked the wiki and I can't find it.  :-(  What are the allowed characters in an ikiwiki page name?  I'm writing a simple script to make updating my blog easier and need to filter invalid characters (so far I've found that # and , aren't allowed ;-)).  Thanks for any pointers.  -- [[AdamShand]]
+
+> The default `wiki_file_regexp` matches filenames containing only
+> `[-[:alnum:]_.:/+]`
+> 
+> The titlepage() function will convert freeform text to a valid
+> page name. See [[todo/should_use_a_standard_encoding_for_utf_chars_in_filenames]]
+> for an example. --[[Joey]]
+
+>> Perfect, thanks! 
+>>
+>> In the end I decided that I didn't need any special characters in filenames and replaced everything but alphanumeric characters with underscores.  In addition to replacing bad characters I also collapse multiple underscores into a single one, and strip off trailing and leading underscores to make tidy filenames.  If it's useful to anybody else here's a sed example:
+>>
+>>     # echo "++ Bad: ~@#$%^&*()_=}{[];,? Iki: +_-:./ Num: 65.5 ++" | sed -e 's/[^A-Za-z0-9_]/_/g' -e 's/__*/_/g' -e 's/^_//g' -e 's/_$//g'
+>>     Bad_Iki_Num_65_5
+>>
+>>--[[AdamShand]]
+
+[[!meta date="2008-01-18 23:40:02 -0500"]]
diff --git a/doc/forum/Should_not_create_an_existing_page.mdwn b/doc/forum/Should_not_create_an_existing_page.mdwn
new file mode 100644
index 000000000..b9500757f
--- /dev/null
+++ b/doc/forum/Should_not_create_an_existing_page.mdwn
@@ -0,0 +1,15 @@
+[[!meta date="2007-01-08 14:55:31 +0000"]]
+
+This might be a bug, but will discuss it here first.
+Clicking on an old "?" or going to a create link but new Markdown content exists, should not go into "create" mode, but should do a regular "edit".
+
+> I belive that currently it does a redirect to the new static web page.
+> At least that's the intent of the code. --[[Joey]]
+
+>> Try at your site: `?page=discussion&from=index&do=create`
+>> It brings up an empty textarea to start a new webpage -- even though it already exists here. --reed
+
+>>> Ah, right. Notice that the resulting form allows saving the page as
+>>> discussion, or users/discussion, but not index/discussion, since this
+>>> page already exists. If all the pages existed, it would do the redirect
+>>> thing. --[[Joey]]
diff --git a/doc/forum/Spaces_in_wikilinks.mdwn b/doc/forum/Spaces_in_wikilinks.mdwn
new file mode 100644
index 000000000..9326ac448
--- /dev/null
+++ b/doc/forum/Spaces_in_wikilinks.mdwn
@@ -0,0 +1,104 @@
+[[!meta date="2007-07-02 13:21:29 +0000"]]
+
+# Spaces in WikiLinks?
+
+Hello Joey,
+
+I've just switched from ikiwiki 2.0 to ikiwiki 2.2 and I'm really surprised
+that I can't use the spaces in WikiLinks. Could you please tell me why the spaces
+aren't allowed in WikiLinks now?
+
+My best regards,
+
+--[[PaweB|ptecza]]
+
+> See [[bugs/Spaces_in_link_text_for_ikiwiki_links]]
+
+----
+
+# Build in OpenSolaris?
+
+Moved to [[bugs/build_in_opensolaris]] --[[Joey]]
+
+----
+
+# Various ways to use Subversion with ikiwiki
+
+I'm playing around with various ways that I can use subversion with ikiwiki.
+
+* Is it possible to have ikiwiki point to a subversion repository which is on a different server?  The basic checkin/checkout functionality seems to work but there doesn't seem to be any way to make the post-commit hook work for a non-local server?
+
+> This is difficult to do since ikiwiki's post-commit wrapper expects to
+> run on a machine that contains both the svn repository and the .ikiwiki
+> state directory. However, with recent versions of ikiwiki, you can get
+> away without running the post-commit wrapper on commit, and all you lose
+> is the ability to send commit notification emails.
+
+> (And now that [[recentchanges]] includes rss, you can just subscribe to
+> that, no need to worry about commit notification emails anymore.)
+
+* Is it possible / sensible to have ikiwiki share a subversion repository with other data (either completely unrelated files or another ikiwiki instance)?  This works in part but again the post-commit hook seems problematic.
+
+--[[AdamShand]]
+
+> Sure, see ikiwiki's subversion repository for example of non-wiki files
+> in the same repo. If you have two wikis in one repository, you will need
+> to write a post-commit script that calls the post-commit wrappers for each
+> wiki.
+
+----
+
+# Regex for Valid Characters in Filenames
+
+I'm sure that this is documented somewhere but I've ransacked the wiki and I can't find it.  :-(  What are the allowed characters in an ikiwiki page name?  I'm writing a simple script to make updating my blog easier and need to filter invalid characters (so far I've found that # and , aren't allowed ;-)).  Thanks for any pointers.  -- [[AdamShand]]
+
+> The default `wiki_file_regexp` matches filenames containing only
+> `[-[:alnum:]_.:/+]`
+> 
+> The titlepage() function will convert freeform text to a valid
+> page name. See [[todo/should_use_a_standard_encoding_for_utf_chars_in_filenames]]
+> for an example. --[[Joey]]
+
+>> Perfect, thanks! 
+>>
+>> In the end I decided that I didn't need any special characters in filenames and replaced everything but alphanumeric characters with underscores.  In addition to replacing bad characters I also collapse multiple underscores into a single one, and strip off trailing and leading underscores to make tidy filenames.  If it's useful to anybody else here's a sed example:
+>>
+>>     # echo "++ Bad: ~@#$%^&*()_=}{[];,? Iki: +_-:./ Num: 65.5 ++" | sed -e 's/[^A-Za-z0-9_]/_/g' -e 's/__*/_/g' -e 's/^_//g' -e 's/_$//g'
+>>     Bad_Iki_Num_65_5
+>>
+>>--[[AdamShand]]
+
+# Upgrade steps from RecentChanges CGI to static page?
+
+Where are the upgrade steps for RecentChanges change from CGI to static feed?
+I run multiple ikiwiki-powered sites on multiple servers, but today I just upgraded one to 2.32.3.
+Please have a look at
+<http://bsdwiki.reedmedia.net/wiki/recentchanges.html>
+Any suggestions?
+
+> There are no upgrade steps required. It does look like you need to enable
+> the meta plugin to get a good recentchanges page though.. --[[Joey]]
+
+# News site where articles are submitted and then reviewed before posting?
+
+I am considering moving a news site to Ikiwiki. I am hoping that Ikiwiki has a feature where anonymous posters can submit a form that moderators can review and then accept for it to be posted on a news webpage (like front page of the website).
+
+> Well, you can have one blog that contains unreviewed articles, and
+> moderators can then add a tag that makes the article show up in the main
+> news feed. There's nothing stopping someone submitting an article
+> pre-tagged though. If you absolutely need to lock that down, you could
+> have one blog with unreviewed articles in one subdirectory, and reviewers
+> then move the file over to another subdirectory when they're ready to
+> publish it. (This second subdirectory would be locked to prevent others
+> from writing to it.) --[[Joey]]
+
+Also it would be good if the news page would keep maybe just the latest 10 entries with links to an archive that make it easy to browse to old entries by date. (Could have over a thousand news articles.)
+
+> The inline plugin allows setting up things like this.
+
+Plus users be able to post feedback to news items. If anonymous, they must be approved first. I'd prefer to not use normal "wiki" editor for feedback.
+
+Any thoughts or examples on this? Any links to examples of news sites or blogs with outside feedback using ikiwiki?
+
+Thanks --[[JeremyReed]]
+
diff --git a/doc/forum/Upgrade_steps_from_RecentChanges_CGI_to_static_page.mdwn b/doc/forum/Upgrade_steps_from_RecentChanges_CGI_to_static_page.mdwn
new file mode 100644
index 000000000..298ff49f1
--- /dev/null
+++ b/doc/forum/Upgrade_steps_from_RecentChanges_CGI_to_static_page.mdwn
@@ -0,0 +1,10 @@
+Where are the upgrade steps for RecentChanges change from CGI to static feed?
+I run multiple ikiwiki-powered sites on multiple servers, but today I just upgraded one to 2.32.3.
+Please have a look at
+<http://bsdwiki.reedmedia.net/wiki/recentchanges.html>
+Any suggestions?
+
+> There are no upgrade steps required. It does look like you need to enable
+> the meta plugin to get a good recentchanges page though.. --[[Joey]]
+
+[[!meta date="2008-02-23 21:10:42 -0500"]]
diff --git a/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn b/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn
new file mode 100644
index 000000000..8eed30cd8
--- /dev/null
+++ b/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn
@@ -0,0 +1,23 @@
+[[!meta date="2007-08-17 03:54:10 +0000"]]
+
+I'm playing around with various ways that I can use subversion with ikiwiki.
+
+* Is it possible to have ikiwiki point to a subversion repository which is on a different server?  The basic checkin/checkout functionality seems to work but there doesn't seem to be any way to make the post-commit hook work for a non-local server?
+
+> This is difficult to do since ikiwiki's post-commit wrapper expects to
+> run on a machine that contains both the svn repository and the .ikiwiki
+> state directory. However, with recent versions of ikiwiki, you can get
+> away without running the post-commit wrapper on commit, and all you lose
+> is the ability to send commit notification emails.
+
+> (And now that [[recentchanges]] includes rss, you can just subscribe to
+> that, no need to worry about commit notification emails anymore.)
+
+* Is it possible / sensible to have ikiwiki share a subversion repository with other data (either completely unrelated files or another ikiwiki instance)?  This works in part but again the post-commit hook seems problematic.
+
+--[[AdamShand]]
+
+> Sure, see ikiwiki's subversion repository for example of non-wiki files
+> in the same repo. If you have two wikis in one repository, you will need
+> to write a post-commit script that calls the post-commit wrappers for each
+> wiki. --[[Joey]] 
diff --git a/doc/forum/editing_the_style_sheet.mdwn b/doc/forum/editing_the_style_sheet.mdwn
new file mode 100644
index 000000000..c1e1ef815
--- /dev/null
+++ b/doc/forum/editing_the_style_sheet.mdwn
@@ -0,0 +1,18 @@
+[[!meta date="006-12-29 04:19:51 +0000"]]
+
+It would be nice to be able to edit the stylesheet by means of the cgi.  Or is this possible?  I wasn't able to achieve it.
+Ok, that's my last 2 cents for a while. --[Mazirian](http://mazirian.com)
+
+> I don't support editing it, but if/when ikiwiki gets [[todo/fileupload]] support,
+> it'll be possible to upload a style sheet. (If .css is in the allowed
+> extensions list.. no idea how safe that would be, a style sheet is
+> probably a great place to put XSS attacks and evil javascript that would
+> be filtered out of any regular page in ikiwiki). --[[Joey]]
+
+>> I hadn't thought of that at all.  It's a common feature and one I've
+>> relied on safely, because the wikis I am maintaining at the moment
+>> are all private and restricted to trusted users. Given that the whole
+>> point of ikiwiki is to be able to access and edit via the shell as
+>> well as the web, I suppose the features doesn't add a lot.  By the
+>> way, the w3m mode is brilliant.  I haven't tried it yet, but the idea
+>> is great.
diff --git a/doc/forum/how_do_I_translate_a_TWiki_site.mdwn b/doc/forum/how_do_I_translate_a_TWiki_site.mdwn
new file mode 100644
index 000000000..5bfdbb86c
--- /dev/null
+++ b/doc/forum/how_do_I_translate_a_TWiki_site.mdwn
@@ -0,0 +1,44 @@
+[[!meta date="2006-12-19 09:56:21 +0000"]]
+
+# Excellent - how do I translate a TWiki site?
+
+I just discovered ikiwiki quite by chance, I was looking for a console/terminal
+menu system and found pdmenu.  So pdmenu brought me to here and I've found ikiwiki!
+It looks as if it's just what I've been wanting for a long time.  I wanted something
+to create mostly text web pages which, as far as possible, have source which is human 
+readable or at least in a standard format.  ikiwiki does this twice over by using 
+markdown for the source and producing static HTML from it.
+
+I'm currently using TWiki and have a fair number of pages in that format, does
+anyone have any bright ideas for translating?  I can knock up awk scripts fairly
+easily, perl is possible (but I'm not strong in perl).
+
+> Let us know if you come up with something to transition from the other
+> format. Another option would be writing a ikiwiki plugin to support the
+> TWiki format. --[[Joey]]
+
+> Jamey Sharp and I have a set of scripts in progress to convert other wikis to ikiwiki, including history, so that we can migrate a few of our wikis.  We already have support for migrating MoinMoin wikis to ikiwiki, including conversion of the entire history to Git.  We used this to convert the [XCB wiki](http://xcb.freedesktop.org/wiki/) to ikiwiki; until we finalize the conversion and put the new wiki in place of the old one, you can browse the converted result at <http://xcb.freedesktop.org/ikiwiki>.  We already plan to add support for TWiki (including history, since you can just run parsecvs on the TWiki RCS files to get Git), so that we can convert the [Portland State Aerospace Society wiki](http://psas.pdx.edu) (currently in Moin, but with much of its history in TWiki, and with many of its pages still in TWiki format using Jamey's TWiki format for MoinMoin).
+>
+> Our scripts convert by way of HTML, using portions of the source wiki's code to render as HTML (with some additional code to do things like translate MoinMoin's `\[[TableOfContents]]` to ikiwiki's `\[[!toc ]]`), and then using a modified [[!cpan HTML::WikiConverter]] to turn this into markdown and ikiwiki.  This produces quite satisfactory results, apart from things that don't have any markdown equivalent and thus remain HTML, such as tables and definition lists.  Conversion of the history occurs by first using another script we wrote to translate MoinMoin history to Git, then using our git-map script to map a transformation over the Git history.
+>
+> We will post the scripts as soon as we have them complete enough to convert our wikis.
+>
+> -- [[JoshTriplett]]
+
+>> Thanks for an excellent Xmas present, I will appreciate the additional 
+>> users this will help switch to ikiwiki! --[[Joey]]
+
+
+>> Sounds great indeed. Learning from [here](http://www.bddebian.com/~wiki/AboutTheTWikiToIkiwikiConversion/) that HTML::WikiConverter needed for your conversion was not up-to-date on Debian I have now done an unofficial package, including your proposed Markdown patches, apt-get'able at <pre>deb http://debian.jones.dk/ sid wikitools</pre>
+>> -- [[JonasSmedegaard]]
+
+
+>>I see the "We will post the scripts ...." was committed about a year ago.  A current site search for "Moin" does not turn them up.  Any chance of an appearance in the near (end of year) future?
+>>
+>> -- [[MichaelRasmussen]]
+
+>>> It appears the scripts were never posted?  I recently imported my Mediawiki site into Iki.  If it helps, my notes are here: <http://iki.u32.net/Mediawiki_Conversion> --[[sabr]]
+
+>>>>> The scripts have been posted now, see [[joshtriplett]]'s user page, 
+>>>>> and I've pulled together all ways I can find to [[convert]] other
+>>>>> systems into ikiwiki. --[[Joey]]
diff --git a/doc/forum/installation_and_setup_questions.mdwn b/doc/forum/installation_and_setup_questions.mdwn
new file mode 100644
index 000000000..50633ec3f
--- /dev/null
+++ b/doc/forum/installation_and_setup_questions.mdwn
@@ -0,0 +1,52 @@
+[[!meta date="2007-03-02 00:57:08 +0000"]]
+
+Ikiwiki creates a .ikiwiki directory in my wikiwc working directory. Should I
+"svn add .ikiwiki" or add it to svn:ignore?
+
+> `.ikiwiki` is used by ikiwiki to store internal state. You can add it to
+> svn:ignore. --[[Joey]]
+> > Thanks a lot.
+
+Is there an easy way to log via e-mail to some webmaster address, instead
+of via syslog?
+
+> Not sure why you'd want to do that, but couldn't you use a tool like
+> logwatch to mail selected lines from the syslog? --[[Joey]]
+
+> > The reason is that I'm not logged in on the web server regularly to
+> > check the log files. I'll see whether I can install a logwatch instance.
+
+I'm trying to install from scratch on a CentOS 4.6 system.  I installed perl 5.8.8 from source and then added all the required modules via CPAN.  When I build ikiwiki from the tarball, I get this message:
+
+    rendering todo/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn
+    *** glibc detected *** double free or corruption (!prev): 0x0922e478 ***
+    make: *** [extra_build] Aborted
+
+I'm kind of at a loss how to track this down or work around it.  Any suggestions? --Monty
+
+> All I can tell you is that it looks like a problem with your C library or
+> perl. Little perl programs like ikiwiki should only be able to trigger
+> such bugs, not contain them. :-) Sorry I can't be of more help.
+> --[[Joey]]
+
+> I had a similar problem after upgrading to the latest version of
+> Text::Markdown from CPAN.  You might try either looking for a Markdown
+> package for CentOS or using the latest version of John Gruber's
+> Markdown.pl:
+> <http://daringfireball.net/projects/downloads/Markdown_1.0.2b8.tbz>
+> --[[JasonBlevins]], April 1, 2008 18:22 EDT
+
+>> Unfortunately I couldn't find a CentOS package for markdown, and I
+>> couldn't quite figure out how to use John Gruber's version instead.
+>> I tried copying it to site_perl, etc., but the build doesn't pick 
+>> it up.  For now I can just play with it on my Ubuntu laptop for which
+>> the debian package installed flawlessly.  I'll probably wait for an
+>> updated version of Markdown to see if this is fixed in the future.
+>> --Monty
+
+>I suggest that you pull an older version of Text::Markdown from CPAN. I am using <http://backpan.perl.org/authors/id/B/BO/BOBTFISH/Text-Markdown-1.0.5.tar.gz> and that works just fine.
+>There is a step change in version and size between this version (dated 11Jan2008) and the next version (1.0.12 dated 18Feb2008). I shall have a little look to see why, in due course.
+>Ubuntu Hardy Heron has a debian package now, but that does not work either.
+> --Dirk 22Apr2008
+
+> This might be related to [Text::Markdown bug #37297](http://rt.cpan.org/Public/Bug/Display.html?id=37297).--ChapmanFlack 9Jul2008
diff --git a/doc/forum/installation_as_non-root_user.mdwn b/doc/forum/installation_as_non-root_user.mdwn
new file mode 100644
index 000000000..4997af2ac
--- /dev/null
+++ b/doc/forum/installation_as_non-root_user.mdwn
@@ -0,0 +1,7 @@
+I'd like to install ikiwiki as a non-root user. I can plow through getting all the 
+perl dependencies installed because that's well documented in the perl world,
+but I don't know how to tell ikiwiki to install somewhere other than / --BrianWilson
+
+> Checkout the tips section for [[tips/DreamHost]].  It should do the trick. --MattReynolds
+
+[[!meta date="2008-01-13 16:02:52 -0500"]]
diff --git a/doc/forum/installation_of_selected_docs.mdwn b/doc/forum/installation_of_selected_docs.mdwn
new file mode 100644
index 000000000..81dd1ee00
--- /dev/null
+++ b/doc/forum/installation_of_selected_docs.mdwn
@@ -0,0 +1,29 @@
+[[!meta date="2007-09-06 19:47:23 +0000"]]
+
+# Installation of selected docs (html)
+
+The latest release has around 560 files (over 2MB) in html.
+
+Any suggestions or ideas on limiting what html is installed?
+
+For example, I don't see value in every ikiwiki install out there to also install personal "users" ikiwiki pages.
+
+For now I copy ikiwiki.setup. And then use pax with -L switch to copy the targets of the symlinks of the basewiki.
+
+I was thinking of making a list of desired documents from the html directory to install.
+
+--JeremyReed
+
+> You don't need any of them, unless you want to read ikiwiki's docs locally.
+> 
+> I don't understand why you're installing the basewiki files manually;
+> ikiwiki has a Makefile that will do this for you. --[[Joey]]
+
+>> The Makefile's install doesn't do what I want so I use different installer for it.
+>> It assumes wrong location for man pages for me. (And it should consider using INSTALLVENDORMAN1DIR and
+>> MAN1EXT but I don't know about section 8 since I don't know of perl value for that.)
+>> I don't want w3m cgi installed; it is optional for my package.
+>> I will just patch for that instead of using my own installer.
+>> Note: I am working on the pkgsrc package build specification for this. This is for creating
+>> packages for NetBSD, DragonFly and other systems that use pkgsrc package system.
+>> --JeremyReed
diff --git a/doc/forum/upgrade_steps.mdwn b/doc/forum/upgrade_steps.mdwn
new file mode 100644
index 000000000..1c85e6402
--- /dev/null
+++ b/doc/forum/upgrade_steps.mdwn
@@ -0,0 +1,147 @@
+[[!meta date="2007-08-27 21:52:18 +0000"]]
+
+I upgrades from 1.40  to 2.6.1. I ran "ikiwiki --setup" using my existing ikiwiki.setup configuration.
+I had many errors like:
+
+    /home/bsdwiki/www/wiki/wikilink/index.html independently created, not overwriting with version from wikilink
+    BEGIN failed--compilation aborted at (eval 5) line 129.
+
+and:
+
+    failed renaming /home/bsdwiki/www/wiki/smileys.ikiwiki-new to /home/bsdwiki/www/wiki/smileys: Is a directory
+    BEGIN failed--compilation aborted at (eval 5) line 129.
+
+Probably about six errors like this. I worked around this by removing the files and directories it complained about.
+Finally it finished.
+
+> As of version 2.0, ikiwiki enables usedirs by default. See
+> [[tips/switching_to_usedirs]] for details. --[[Joey]]
+
+>> I read the config wrong. I was thinking that it showed the defaults even though commented out
+>> (like ssh configs do). I fixed that part. --JeremyReed
+
+My next problem was that ikiwiki start letting me edit without any password authentication. It used to prompt
+me for a password but now just goes right into the "editing" mode.
+The release notes for 2.0 say password auth is still on by default.
+
+> It sounds like you have the anonok plugin enabled?
+
+>> Where is the default documented? My config doesn't have it uncommented.
+
+The third problem is that when editing my textbox is empty -- no content.
+
+This is using my custom rcs.pm which has been used thousands of times.
+
+> Have you rebuilt the cgi wrapper since you upgraded ikiwiki? AFAIK I
+> fixed a bug that could result in the edit box always being empty back in
+> version 2.3. The only other way it could happen is if ikiwiki does not
+> have saved state about the page that it's editing (in .ikiwiki/index).
+
+>> Rebuilt it several times. Now that I think of it, I think my early problem of having
+>> no content in the textbox was before I rebuilt the cgi. And after I rebuilt the whole webpage was empty.
+
+Now I regenerated my ikiwiki.cgi again (no change to my configuration,
+and I just get an empty HTML page when attempting editing or "create".
+
+> If the page is completly empty then ikiwiki is crashing before it can
+> output anything, though this seems unlikely. Check the webserver logs.
+
+Now I see it created directories for my data. I fixed that by setting 
+usedirs (I see that is in the release notes for 2.0) and rerunning ikiwiki --setup
+but I still have empty pages for editing (no textbox no html at all).
+
+> Is IkiWiki crashing? If so, it would probably leave error text in the apache logs. --[[TaylorKillian]]
+
+>> Not using apache. Nothing useful in logs other thn the HTTP return codes are "0" and bytes is "-"
+>> on the empty ikiwiki.cgi output (should say " 200 " followed by bytes).
+
+>>> You need to either figure out what your web server does with stderr
+>>> from cgi programs, or run ikiwiki.cgi at the command line with an
+>>> appropriate environment so it thinks it's being called from a web
+>>> server, so you can see how it's failing. --[[Joey]]
+
+(I am posting this now, but will do some research and post some more.)
+
+Is there any webpage with upgrade steps?
+
+> Users are expected to read [[news]], which points out any incompatible
+> changes or cases where manual action is needed.
+
+>> I read it but read the usedirs option wrong :(.
+>> Also it appears to be missing the news from between 1.40 to 2.0 unless they dont' exist.
+>> If they do exist maybe they have release notes I need?
+
+>>> All the old ones are in the NEWS file. --[[Joey]]
+
+--JeremyReed
+
+My followup: I used a new ikiwiki.setup based on the latest version. But no changes for me.
+
+Also I forgot to mention that do=recentchanges works good for me. It uses my 
+rcs_recentchanges in my rcs perl module.
+
+The do=prefs does nothing though -- just a blank webpage.
+
+> You need to figure out why ikiwiki is crashing. The webserver logs should
+> tell you.
+
+I also set verbose => 1 and running ikiwiki --setup was verbose, but no changes in running CGI.
+I was hoping for some output.
+
+I am guessing that my rcs perl module stopped working on the upgrade. I didn't notice any release notes
+on changes to revision control modules. Has something changed? I will also look.
+
+> No, the rcs interface has not needed to change in a long time. Also,
+> nothing is done with the rcs for do=prefs.
+
+>> Thanks. I also checked differences between 1.40 Rcs plugins and didn't notice anything significant.
+
+--JeremyReed
+
+Another Followup: I created a new ikiwiki configuration and did the --setup to 
+create an entirely different website. I have same problem there. No prompt for password
+and empty webpage when using the cgi.
+I never upgraded any perl modules so maybe a new perl module is required but I don't see any errors so I don't know.
+
+The only errors I see when building and installing ikiwiki are:
+
+    Can't exec "otl2html": No such file or directory at IkiWiki/Plugin/otl.pm line 66.
+
+    gettext 0.14 too old, not updating the pot file
+
+I don't use GNU gettext on here.
+
+I may need to revert back to my old ikiwiki install which has been used to thousands of times (with around
+1000 rcs commits via ikiwiki).
+
+--JeremyReed
+
+I downgraded to version 1.40 (that was what I had before I wrote wrong above).
+Now ikiwiki is working for me again (but using 1.40). I shouldn't have tested on production system :)
+
+--JeremyReed
+
+I am back. On a different system, I installed ikiwiki 2.6.1. Same problem -- blank CGI webpage.
+
+So I manually ran with:
+
+    REQUEST_METHOD=GET QUERY_STRING='do=create&page=jcr' kiwiki.cgi
+
+And clearly saw the error:
+
+    [IkiWiki::main] Fatal: Bad template engine CGI::FormBuilder::Template::div: Can't locate CGI/FormBuilder/Template/div.pm
+
+So I found my version was too old and 3.05 is the first to provide "Div" support. I upgraded my p5-CGI-FormBuilder to 3.0501.
+And ikiwiki CGI started working for me.
+
+The Ikiwiki docs about this requirement got removed in Revision 4367. There should be a page that lists the requirements.
+(I guess I could have used the debian/control file.)
+
+> There is a page, [[install]] documents that 3.05 is needed.
+
+>> Sorry, I missed that. With hundreds of wikipages it is hard to read all of them.
+>> I am updating the download page now to link to it.
+
+I am now using ikiwiki 2.6.1 on my testing system.
+
+--JeremyReed
diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index d52cb0a2d..749042910 100644
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -1,464 +1 @@
-Seems like there should be a page for you to post your thoughts about
-ikiwiki, both pro and con, anything that didn't work, ideas, or whatever.
-Do so here..
-
-Note that for more formal bug reports or todo items, you can also edit the
-[[bugs]] and [[todo]] pages.
-
-[[!toc ]]
-
-# Installation/Setup questions
-
-Ikiwiki creates a .ikiwiki directory in my wikiwc working directory. Should I
-"svn add .ikiwiki" or add it to svn:ignore?
-
-> `.ikiwiki` is used by ikiwiki to store internal state. You can add it to
-> svn:ignore. --[[Joey]]
-> > Thanks a lot.
-
-Is there an easy way to log via e-mail to some webmaster address, instead
-of via syslog?
-
-> Not sure why you'd want to do that, but couldn't you use a tool like
-> logwatch to mail selected lines from the syslog? --[[Joey]]
-
-> > The reason is that I'm not logged in on the web server regularly to
-> > check the log files. I'll see whether I can install a logwatch instance.
-
-I'm trying to install from scratch on a CentOS 4.6 system.  I installed perl 5.8.8 from source and then added all the required modules via CPAN.  When I build ikiwiki from the tarball, I get this message:
-
-    rendering todo/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn
-    *** glibc detected *** double free or corruption (!prev): 0x0922e478 ***
-    make: *** [extra_build] Aborted
-
-I'm kind of at a loss how to track this down or work around it.  Any suggestions? --Monty
-
-> All I can tell you is that it looks like a problem with your C library or
-> perl. Little perl programs like ikiwiki should only be able to trigger
-> such bugs, not contain them. :-) Sorry I can't be of more help.
-> --[[Joey]]
-
-> I had a similar problem after upgrading to the latest version of
-> Text::Markdown from CPAN.  You might try either looking for a Markdown
-> package for CentOS or using the latest version of John Gruber's
-> Markdown.pl:
-> <http://daringfireball.net/projects/downloads/Markdown_1.0.2b8.tbz>
-> --[[JasonBlevins]], April 1, 2008 18:22 EDT
-
->> Unfortunately I couldn't find a CentOS package for markdown, and I
->> couldn't quite figure out how to use John Gruber's version instead.
->> I tried copying it to site_perl, etc., but the build doesn't pick 
->> it up.  For now I can just play with it on my Ubuntu laptop for which
->> the debian package installed flawlessly.  I'll probably wait for an
->> updated version of Markdown to see if this is fixed in the future.
->> --Monty
-
->I suggest that you pull an older version of Text::Markdown from CPAN. I am using <http://backpan.perl.org/authors/id/B/BO/BOBTFISH/Text-Markdown-1.0.5.tar.gz> and that works just fine.
->There is a step change in version and size between this version (dated 11Jan2008) and the next version (1.0.12 dated 18Feb2008). I shall have a little look to see why, in due course.
->Ubuntu Hardy Heron has a debian package now, but that does not work either.
-> --Dirk 22Apr2008
-
-> This might be related to [Text::Markdown bug #37297](http://rt.cpan.org/Public/Bug/Display.html?id=37297).--ChapmanFlack 9Jul2008
-
-----
-
-# Installation of selected docs (html)
-
-The latest release has around 560 files (over 2MB) in html.
-
-Any suggestions or ideas on limiting what html is installed?
-
-For example, I don't see value in every ikiwiki install out there to also install personal "users" ikiwiki pages.
-
-For now I copy ikiwiki.setup. And then use pax with -L switch to copy the targets of the symlinks of the basewiki.
-
-I was thinking of making a list of desired documents from the html directory to install.
-
---JeremyReed
-
-> You don't need any of them, unless you want to read ikiwiki's docs locally.
-> 
-> I don't understand why you're installing the basewiki files manually;
-> ikiwiki has a Makefile that will do this for you. --[[Joey]]
-
->> The Makefile's install doesn't do what I want so I use different installer for it.
->> It assumes wrong location for man pages for me. (And it should consider using INSTALLVENDORMAN1DIR and
->> MAN1EXT but I don't know about section 8 since I don't know of perl value for that.)
->> I don't want w3m cgi installed; it is optional for my package.
->> I will just patch for that instead of using my own installer.
->> Note: I am working on the pkgsrc package build specification for this. This is for creating
->> packages for NetBSD, DragonFly and other systems that use pkgsrc package system.
->> --JeremyReed
-
-# Installation as non-root user
-
-I'd like to install ikiwiki as a non-root user. I can plow through getting all the 
-perl dependencies installed because that's well documented in the perl world,
-but I don't know how to tell ikiwiki to install somewhere other than / --BrianWilson
-
-> Checkout the tips section for [[tips/DreamHost]].  It should do the trick. --MattReynolds
-
-----
-
-# Upgrade steps
-
-I upgrades from 1.40  to 2.6.1. I ran "ikiwiki --setup" using my existing ikiwiki.setup configuration.
-I had many errors like:
-
-    /home/bsdwiki/www/wiki/wikilink/index.html independently created, not overwriting with version from wikilink
-    BEGIN failed--compilation aborted at (eval 5) line 129.
-
-and:
-
-    failed renaming /home/bsdwiki/www/wiki/smileys.ikiwiki-new to /home/bsdwiki/www/wiki/smileys: Is a directory
-    BEGIN failed--compilation aborted at (eval 5) line 129.
-
-Probably about six errors like this. I worked around this by removing the files and directories it complained about.
-Finally it finished.
-
-> As of version 2.0, ikiwiki enables usedirs by default. See
-> [[tips/switching_to_usedirs]] for details. --[[Joey]]
-
->> I read the config wrong. I was thinking that it showed the defaults even though commented out
->> (like ssh configs do). I fixed that part. --JeremyReed
-
-My next problem was that ikiwiki start letting me edit without any password authentication. It used to prompt
-me for a password but now just goes right into the "editing" mode.
-The release notes for 2.0 say password auth is still on by default.
-
-> It sounds like you have the anonok plugin enabled?
-
->> Where is the default documented? My config doesn't have it uncommented.
-
-The third problem is that when editing my textbox is empty -- no content.
-
-This is using my custom rcs.pm which has been used thousands of times.
-
-> Have you rebuilt the cgi wrapper since you upgraded ikiwiki? AFAIK I
-> fixed a bug that could result in the edit box always being empty back in
-> version 2.3. The only other way it could happen is if ikiwiki does not
-> have saved state about the page that it's editing (in .ikiwiki/index).
-
->> Rebuilt it several times. Now that I think of it, I think my early problem of having
->> no content in the textbox was before I rebuilt the cgi. And after I rebuilt the whole webpage was empty.
-
-Now I regenerated my ikiwiki.cgi again (no change to my configuration,
-and I just get an empty HTML page when attempting editing or "create".
-
-> If the page is completly empty then ikiwiki is crashing before it can
-> output anything, though this seems unlikely. Check the webserver logs.
-
-Now I see it created directories for my data. I fixed that by setting 
-usedirs (I see that is in the release notes for 2.0) and rerunning ikiwiki --setup
-but I still have empty pages for editing (no textbox no html at all).
-
-> Is IkiWiki crashing? If so, it would probably leave error text in the apache logs. --[[TaylorKillian]]
-
->> Not using apache. Nothing useful in logs other thn the HTTP return codes are "0" and bytes is "-"
->> on the empty ikiwiki.cgi output (should say " 200 " followed by bytes).
-
->>> You need to either figure out what your web server does with stderr
->>> from cgi programs, or run ikiwiki.cgi at the command line with an
->>> appropriate environment so it thinks it's being called from a web
->>> server, so you can see how it's failing. --[[Joey]]
-
-(I am posting this now, but will do some research and post some more.)
-
-Is there any webpage with upgrade steps?
-
-> Users are expected to read [[news]], which points out any incompatible
-> changes or cases where manual action is needed.
-
->> I read it but read the usedirs option wrong :(.
->> Also it appears to be missing the news from between 1.40 to 2.0 unless they dont' exist.
->> If they do exist maybe they have release notes I need?
-
->>> All the old ones are in the NEWS file. --[[Joey]]
-
---JeremyReed
-
-My followup: I used a new ikiwiki.setup based on the latest version. But no changes for me.
-
-Also I forgot to mention that do=recentchanges works good for me. It uses my 
-rcs_recentchanges in my rcs perl module.
-
-The do=prefs does nothing though -- just a blank webpage.
-
-> You need to figure out why ikiwiki is crashing. The webserver logs should
-> tell you.
-
-I also set verbose => 1 and running ikiwiki --setup was verbose, but no changes in running CGI.
-I was hoping for some output.
-
-I am guessing that my rcs perl module stopped working on the upgrade. I didn't notice any release notes
-on changes to revision control modules. Has something changed? I will also look.
-
-> No, the rcs interface has not needed to change in a long time. Also,
-> nothing is done with the rcs for do=prefs.
-
->> Thanks. I also checked differences between 1.40 Rcs plugins and didn't notice anything significant.
-
---JeremyReed
-
-Another Followup: I created a new ikiwiki configuration and did the --setup to 
-create an entirely different website. I have same problem there. No prompt for password
-and empty webpage when using the cgi.
-I never upgraded any perl modules so maybe a new perl module is required but I don't see any errors so I don't know.
-
-The only errors I see when building and installing ikiwiki are:
-
-    Can't exec "otl2html": No such file or directory at IkiWiki/Plugin/otl.pm line 66.
-
-    gettext 0.14 too old, not updating the pot file
-
-I don't use GNU gettext on here.
-
-I may need to revert back to my old ikiwiki install which has been used to thousands of times (with around
-1000 rcs commits via ikiwiki).
-
---JeremyReed
-
-I downgraded to version 1.40 (that was what I had before I wrote wrong above).
-Now ikiwiki is working for me again (but using 1.40). I shouldn't have tested on production system :)
-
---JeremyReed
-
-I am back. On a different system, I installed ikiwiki 2.6.1. Same problem -- blank CGI webpage.
-
-So I manually ran with:
-
-    REQUEST_METHOD=GET QUERY_STRING='do=create&page=jcr' kiwiki.cgi
-
-And clearly saw the error:
-
-    [IkiWiki::main] Fatal: Bad template engine CGI::FormBuilder::Template::div: Can't locate CGI/FormBuilder/Template/div.pm
-
-So I found my version was too old and 3.05 is the first to provide "Div" support. I upgraded my p5-CGI-FormBuilder to 3.0501.
-And ikiwiki CGI started working for me.
-
-The Ikiwiki docs about this requirement got removed in Revision 4367. There should be a page that lists the requirements.
-(I guess I could have used the debian/control file.)
-
-> There is a page, [[install]] documents that 3.05 is needed.
-
->> Sorry, I missed that. With hundreds of wikipages it is hard to read all of them.
->> I am updating the download page now to link to it.
-
-I am now using ikiwiki 2.6.1 on my testing system.
-
---JeremyReed
-
-----
-# Excellent - how do I translate a TWiki site?
-
-I just discovered ikiwiki quite by chance, I was looking for a console/terminal
-menu system and found pdmenu.  So pdmenu brought me to here and I've found ikiwiki!
-It looks as if it's just what I've been wanting for a long time.  I wanted something
-to create mostly text web pages which, as far as possible, have source which is human 
-readable or at least in a standard format.  ikiwiki does this twice over by using 
-markdown for the source and producing static HTML from it.
-
-I'm currently using TWiki and have a fair number of pages in that format, does
-anyone have any bright ideas for translating?  I can knock up awk scripts fairly
-easily, perl is possible (but I'm not strong in perl).
-
-> Let us know if you come up with something to transition from the other
-> format. Another option would be writing a ikiwiki plugin to support the
-> TWiki format. --[[Joey]]
-
-> Jamey Sharp and I have a set of scripts in progress to convert other wikis to ikiwiki, including history, so that we can migrate a few of our wikis.  We already have support for migrating MoinMoin wikis to ikiwiki, including conversion of the entire history to Git.  We used this to convert the [XCB wiki](http://xcb.freedesktop.org/wiki/) to ikiwiki; until we finalize the conversion and put the new wiki in place of the old one, you can browse the converted result at <http://xcb.freedesktop.org/ikiwiki>.  We already plan to add support for TWiki (including history, since you can just run parsecvs on the TWiki RCS files to get Git), so that we can convert the [Portland State Aerospace Society wiki](http://psas.pdx.edu) (currently in Moin, but with much of its history in TWiki, and with many of its pages still in TWiki format using Jamey's TWiki format for MoinMoin).
->
-> Our scripts convert by way of HTML, using portions of the source wiki's code to render as HTML (with some additional code to do things like translate MoinMoin's `\[[TableOfContents]]` to ikiwiki's `\[[!toc ]]`), and then using a modified [[!cpan HTML::WikiConverter]] to turn this into markdown and ikiwiki.  This produces quite satisfactory results, apart from things that don't have any markdown equivalent and thus remain HTML, such as tables and definition lists.  Conversion of the history occurs by first using another script we wrote to translate MoinMoin history to Git, then using our git-map script to map a transformation over the Git history.
->
-> We will post the scripts as soon as we have them complete enough to convert our wikis.
->
-> -- [[JoshTriplett]]
-
->> Thanks for an excellent Xmas present, I will appreciate the additional 
->> users this will help switch to ikiwiki! --[[Joey]]
-
-
->> Sounds great indeed. Learning from [here](http://www.bddebian.com/~wiki/AboutTheTWikiToIkiwikiConversion/) that HTML::WikiConverter needed for your conversion was not up-to-date on Debian I have now done an unofficial package, including your proposed Markdown patches, apt-get'able at <pre>deb http://debian.jones.dk/ sid wikitools</pre>
->> -- [[JonasSmedegaard]]
-
-
->>I see the "We will post the scripts ...." was committed about a year ago.  A current site search for "Moin" does not turn them up.  Any chance of an appearance in the near (end of year) future?
->>
->> -- [[MichaelRasmussen]]
-
->>> It appears the scripts were never posted?  I recently imported my Mediawiki site into Iki.  If it helps, my notes are here: <http://iki.u32.net/Mediawiki_Conversion> --[[sabr]]
-
->>>>> The scripts have been posted now, see [[joshtriplett]]'s user page, 
->>>>> and I've pulled together all ways I can find to [[convert]] other
->>>>> systems into ikiwiki. --[[Joey]]
-
-----
-
-# LaTeX support?
-
-Moved to [[todo/latex]] --[[Joey]]
-
-----
-
-# Using with CVS?
-
-Moved to a [[todo_item|todo/CVS_backend]]. --[[JoshTriplett]]
-
-----
-
-# Show differences before saving page?
-
-Moved to the existing [[todo_item|todo/preview_changes]]. --[[JoshTriplett]]
-
-----
-
-# Max submit size?
-
-Any setting for limiting how many kilobytes can be submitted via the "edit" form?
--- [[JeremyReed]]
-
->>> See [[todo/fileupload]] for an idea on limiting page size. --[[Joey]]
-
-----
-
-# Editing the style sheet.
-
-It would be nice to be able to edit the stylesheet by means of the cgi.  Or is this possible?  I wasn't able to achieve it.
-Ok, that's my last 2 cents for a while. --[Mazirian](http://mazirian.com)
-
-> I don't support editing it, but if/when ikiwiki gets [[todo/fileupload]] support,
-> it'll be possible to upload a style sheet. (If .css is in the allowed
-> extensions list.. no idea how safe that would be, a style sheet is
-> probably a great place to put XSS attacks and evil javascript that would
-> be filtered out of any regular page in ikiwiki). --[[Joey]]
-
->> I hadn't thought of that at all.  It's a common feature and one I've
->> relied on safely, because the wikis I am maintaining at the moment
->> are all private and restricted to trusted users. Given that the whole
->> point of ikiwiki is to be able to access and edit via the shell as
->> well as the web, I suppose the features doesn't add a lot.  By the
->> way, the w3m mode is brilliant.  I haven't tried it yet, but the idea
->> is great.
-
-----
-
-# Should not create an existing page
-
-This might be a bug, but will discuss it here first.
-Clicking on an old "?" or going to a create link but new Markdown content exists, should not go into "create" mode, but should do a regular "edit".
-
-> I belive that currently it does a redirect to the new static web page.
-> At least that's the intent of the code. --[[Joey]]
-
->> Try at your site: `?page=discussion&from=index&do=create`
->> It brings up an empty textarea to start a new webpage -- even though it already exists here. --reed
-
->>> Ah, right. Notice that the resulting form allows saving the page as
->>> discussion, or users/discussion, but not index/discussion, since this
->>> page already exists. If all the pages existed, it would do the redirect
->>> thing. --[[Joey]]
-
-----
-
-# Spaces in WikiLinks?
-
-Hello Joey,
-
-I've just switched from ikiwiki 2.0 to ikiwiki 2.2 and I'm really surprised
-that I can't use the spaces in WikiLinks. Could you please tell me why the spaces
-aren't allowed in WikiLinks now?
-
-My best regards,
-
---[[PaweB|ptecza]]
-
-> See [[bugs/Spaces_in_link_text_for_ikiwiki_links]]
-
-----
-
-# Build in OpenSolaris?
-
-Moved to [[bugs/build_in_opensolaris]] --[[Joey]]
-
-----
-
-# Various ways to use Subversion with ikiwiki
-
-I'm playing around with various ways that I can use subversion with ikiwiki.
-
-* Is it possible to have ikiwiki point to a subversion repository which is on a different server?  The basic checkin/checkout functionality seems to work but there doesn't seem to be any way to make the post-commit hook work for a non-local server?
-
-> This is difficult to do since ikiwiki's post-commit wrapper expects to
-> run on a machine that contains both the svn repository and the .ikiwiki
-> state directory. However, with recent versions of ikiwiki, you can get
-> away without running the post-commit wrapper on commit, and all you lose
-> is the ability to send commit notification emails.
-
-> (And now that [[recentchanges]] includes rss, you can just subscribe to
-> that, no need to worry about commit notification emails anymore.)
-
-* Is it possible / sensible to have ikiwiki share a subversion repository with other data (either completely unrelated files or another ikiwiki instance)?  This works in part but again the post-commit hook seems problematic.
-
---[[AdamShand]]
-
-> Sure, see ikiwiki's subversion repository for example of non-wiki files
-> in the same repo. If you have two wikis in one repository, you will need
-> to write a post-commit script that calls the post-commit wrappers for each
-> wiki.
-
-----
-
-# Regex for Valid Characters in Filenames
-
-I'm sure that this is documented somewhere but I've ransacked the wiki and I can't find it.  :-(  What are the allowed characters in an ikiwiki page name?  I'm writing a simple script to make updating my blog easier and need to filter invalid characters (so far I've found that # and , aren't allowed ;-)).  Thanks for any pointers.  -- [[AdamShand]]
-
-> The default `wiki_file_regexp` matches filenames containing only
-> `[-[:alnum:]_.:/+]`
-> 
-> The titlepage() function will convert freeform text to a valid
-> page name. See [[todo/should_use_a_standard_encoding_for_utf_chars_in_filenames]]
-> for an example. --[[Joey]]
-
->> Perfect, thanks! 
->>
->> In the end I decided that I didn't need any special characters in filenames and replaced everything but alphanumeric characters with underscores.  In addition to replacing bad characters I also collapse multiple underscores into a single one, and strip off trailing and leading underscores to make tidy filenames.  If it's useful to anybody else here's a sed example:
->>
->>     # echo "++ Bad: ~@#$%^&*()_=}{[];,? Iki: +_-:./ Num: 65.5 ++" | sed -e 's/[^A-Za-z0-9_]/_/g' -e 's/__*/_/g' -e 's/^_//g' -e 's/_$//g'
->>     Bad_Iki_Num_65_5
->>
->>--[[AdamShand]]
-
-# Upgrade steps from RecentChanges CGI to static page?
-
-Where are the upgrade steps for RecentChanges change from CGI to static feed?
-I run multiple ikiwiki-powered sites on multiple servers, but today I just upgraded one to 2.32.3.
-Please have a look at
-<http://bsdwiki.reedmedia.net/wiki/recentchanges.html>
-Any suggestions?
-
-> There are no upgrade steps required. It does look like you need to enable
-> the meta plugin to get a good recentchanges page though.. --[[Joey]]
-
-# News site where articles are submitted and then reviewed before posting?
-
-I am considering moving a news site to Ikiwiki. I am hoping that Ikiwiki has a feature where anonymous posters can submit a form that moderators can review and then accept for it to be posted on a news webpage (like front page of the website).
-
-> Well, you can have one blog that contains unreviewed articles, and
-> moderators can then add a tag that makes the article show up in the main
-> news feed. There's nothing stopping someone submitting an article
-> pre-tagged though. If you absolutely need to lock that down, you could
-> have one blog with unreviewed articles in one subdirectory, and reviewers
-> then move the file over to another subdirectory when they're ready to
-> publish it. (This second subdirectory would be locked to prevent others
-> from writing to it.) --[[Joey]]
-
-Also it would be good if the news page would keep maybe just the latest 10 entries with links to an archive that make it easy to browse to old entries by date. (Could have over a thousand news articles.)
-
-> The inline plugin allows setting up things like this.
-
-Plus users be able to post feedback to news items. If anonymous, they must be approved first. I'd prefer to not use normal "wiki" editor for feedback.
-
-Any thoughts or examples on this? Any links to examples of news sites or blogs with outside feedback using ikiwiki?
-
-Thanks --[[JeremyReed]]
-
+All discussion that used to be here has moved to the [[forum]].
-- 
cgit v1.2.3


From 18cc0aa1c2d918f16f425e4a0e18b7d16919dbf6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Dec 2009 22:18:29 -0500
Subject: remove forum from docwiki

Drops the package installed size by about 200kb
---
 docwiki.setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docwiki.setup b/docwiki.setup
index 52421e501..86f012c50 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -9,7 +9,7 @@ use IkiWiki::Setup::Standard {
 	underlaydirbase => "underlays",
 	underlaydir => "underlays/basewiki",
 	discussion => 0,
-	exclude => qr/\/discussion|bugs\/*|todo\/*/,
+	exclude => qr/\/discussion|bugs\/*|todo\/*|forum\/*/,
 	locale => '',
 	verbose => 1,
 	syslog => 0,
-- 
cgit v1.2.3


From ed7871f65af84692b56f899cbd2655181efc4007 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Dec 2009 22:26:00 -0500
Subject: typo

---
 ...e_where_articles_are_submitted_and_then_reviewed_before_posting.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/News_site_where_articles_are_submitted_and_then_reviewed_before_posting.mdwn b/doc/forum/News_site_where_articles_are_submitted_and_then_reviewed_before_posting.mdwn
index 3879c594a..8dd755274 100644
--- a/doc/forum/News_site_where_articles_are_submitted_and_then_reviewed_before_posting.mdwn
+++ b/doc/forum/News_site_where_articles_are_submitted_and_then_reviewed_before_posting.mdwn
@@ -1,4 +1,4 @@
-[[meta date="2008-04-28 14:57:25 -0400"]]
+[[!meta date="2008-04-28 14:57:25 -0400"]]
 
 I am considering moving a news site to Ikiwiki. I am hoping that Ikiwiki has a feature where anonymous posters can submit a form that moderators can review and then accept for it to be posted on a news webpage (like front page of the website).
 
-- 
cgit v1.2.3


From 10785902d42551a7833006a66a157b666f5ce4e2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Dec 2009 22:26:30 -0500
Subject: fix date to not be 80 years ago

---
 doc/forum/editing_the_style_sheet.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/editing_the_style_sheet.mdwn b/doc/forum/editing_the_style_sheet.mdwn
index c1e1ef815..b4aa8c89b 100644
--- a/doc/forum/editing_the_style_sheet.mdwn
+++ b/doc/forum/editing_the_style_sheet.mdwn
@@ -1,4 +1,4 @@
-[[!meta date="006-12-29 04:19:51 +0000"]]
+[[!meta date="2006-12-29 04:19:51 +0000"]]
 
 It would be nice to be able to edit the stylesheet by means of the cgi.  Or is this possible?  I wasn't able to achieve it.
 Ok, that's my last 2 cents for a while. --[Mazirian](http://mazirian.com)
-- 
cgit v1.2.3


From a3803f3cd82af36b77a8ee718f9057515adf05ea Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Fri, 11 Dec 2009 21:59:08 -0500
Subject: on my unixauth branch now

---
 doc/plugins/contrib/unixauth.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/unixauth.mdwn b/doc/plugins/contrib/unixauth.mdwn
index 137195139..c97312b59 100644
--- a/doc/plugins/contrib/unixauth.mdwn
+++ b/doc/plugins/contrib/unixauth.mdwn
@@ -1,7 +1,7 @@
 [[!template id=plugin name=unixauth core=0 author="[[schmonz]]"]]
 [[!tag type/auth]]
 
-[[!template id=gitbranch branch=schmonz author="[[schmonz]]"]]
+[[!template id=gitbranch branch=unixauth author="[[schmonz]]"]]
 
 This plugin authenticates users against the Unix user database. It presents a similar UI to [[plugins/passwordauth]], but simpler, as there's no need to be able to register or change one's password.
 
-- 
cgit v1.2.3


From 2b5dba4c49fce88d5783f6ccc41359e76b60c282 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sat, 12 Dec 2009 00:38:04 -0500
Subject: map for plugins I've written

---
 doc/users/KathrynAndersen.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/users/KathrynAndersen.mdwn b/doc/users/KathrynAndersen.mdwn
index 2f2838367..14fabbb01 100644
--- a/doc/users/KathrynAndersen.mdwn
+++ b/doc/users/KathrynAndersen.mdwn
@@ -2,3 +2,6 @@
 * Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need).
 * <http://kerravonsen.dreamwidth.org>
 * <http://github.com/rubykat>
+
+Has written the following plugins:
+[[!map pages="!*/Discussion and ((link(users/KathrynAndersen) or link(users/rubykat)) and plugins/*) "]]
-- 
cgit v1.2.3


From 5b48f1412e8117372af081c513b8c8a41176d4e7 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/kari.pahula"
 <http://www.google.com/profiles/kari.pahula@web>
Date: Sat, 12 Dec 2009 06:33:21 -0500
Subject: Getting OpenID verified identity externally

---
 doc/plugins/openid/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/plugins/openid/discussion.mdwn b/doc/plugins/openid/discussion.mdwn
index 39e947b82..a88da8b9d 100644
--- a/doc/plugins/openid/discussion.mdwn
+++ b/doc/plugins/openid/discussion.mdwn
@@ -19,3 +19,8 @@ It looks like OpenID 2.0 (the only supported by Yahoo) is not supported in ikiwi
 -- Ivan Z.
 
 They have more on OpenID 2.0 in [their FAQ](http://developer.yahoo.com/openid/faq.html). --Ivan Z.
+
+----
+I'm trying to add a way to query the data saved by the OpenID plugin from outside of ikiwiki, to see what identity the user has been authenticated as, if any. I'm thinking of designating some directories as internal pages and check the identity against a list in a mod_perl access hook. I would also write a CGI script that would return a JSON formatted reply to tell if the user is authenticated for those pages and query it with AJAX and only render links to the internal pages if the user would have access to them. That's just a couple of ideas I'm working on first, but I can imagine that there's any number of other tricks that people could implement with that sort of a thing.
+
+Also, this isn't really specific to OpenID but to all auth plugins, but I'm going to use only OpenID for authentication so that's what I'm targeting right now. I suppose that would be worth its own TODO item. --[[kaol]]
-- 
cgit v1.2.3


From c1ec0037ebf5dfc62bd1d132201c608f3875253d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@finch.kitenet.net>
Date: Sat, 12 Dec 2009 15:19:42 -0500
Subject: add news page for in progress server move (new server version)

---
 doc/news/server_move_2009.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/news/server_move_2009.mdwn

diff --git a/doc/news/server_move_2009.mdwn b/doc/news/server_move_2009.mdwn
new file mode 100644
index 000000000..8be5debe1
--- /dev/null
+++ b/doc/news/server_move_2009.mdwn
@@ -0,0 +1,6 @@
+[[!meta title="server move"]]
+
+The ikiwiki.info domain has been moved to a new server. If you can see 
+this, your DNS has already caught up and you are using the new server.
+By the way, the new server should be somewhat faster.
+--[[Joey]]
-- 
cgit v1.2.3


From f4cab292c6d7c3be99e60970dc6ac8d8dbdb226b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Dec 2009 15:20:03 -0500
Subject: add news page for in progress server move (old server version)

---
 doc/news/server_move_2009.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/news/server_move_2009.mdwn

diff --git a/doc/news/server_move_2009.mdwn b/doc/news/server_move_2009.mdwn
new file mode 100644
index 000000000..5865d2b7f
--- /dev/null
+++ b/doc/news/server_move_2009.mdwn
@@ -0,0 +1,6 @@
+[[!meta title="server move"]]
+
+The ikiwiki.info domain has been moved to a new server. If you can see
+this, though, your DNS has not caught up and you're using the old server
+still. Any changes made will be synced over to the new server, so don't
+worry. --[[Joey]]
-- 
cgit v1.2.3


From ff422a1d8903251da3768bd994753c2b04154ce9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 12 Dec 2009 15:47:47 -0500
Subject: Improve javascript onload handling.

I noticed the onload hook running twice sometimes when using chromium.
Change from using arguments.callee.done to a onload_done variable fixed it.
I guess that the callee differed in chromium.

Probably the cause of the problem is that chrome supports both
window.onload and document.addEventListener.
---
 debian/changelog                | 1 +
 underlays/javascript/ikiwiki.js | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ccf45df94..eb8248804 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
   * cvs: Add missing bit to Automator.
   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
     Requena.
+  * Improve javascript onload handling.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
diff --git a/underlays/javascript/ikiwiki.js b/underlays/javascript/ikiwiki.js
index 1252f244f..aebc5cf7e 100644
--- a/underlays/javascript/ikiwiki.js
+++ b/underlays/javascript/ikiwiki.js
@@ -10,11 +10,13 @@ if (document.addEventListener) {
 // other browsers
 window.onload = run_hooks_onload;
 
+var onload_done = 0;
+
 function run_hooks_onload() {
 	// avoid firing twice
-	if (arguments.callee.done)
+	if (onload_done)
 		return;
-	arguments.callee.done = true;
+	onload_done = true;
 
 	run_hooks("onload");
 }
-- 
cgit v1.2.3


From f843033749d3fd481ec74dbb0181d33cb4bf4668 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 13 Dec 2009 13:00:42 -0500
Subject: monotone: Deal with format change in version 0.45. (Thanks, Richard
 Levitte)

---
 IkiWiki/Plugin/monotone.pm | 2 +-
 debian/changelog           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 05c5a514d..c717ceefb 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -228,7 +228,7 @@ sub read_certs ($$) {
 	my @ret;
 
 	my $line = $results[0];
-	while ($line =~ m/\s+key\s"(.*?)"\nsignature\s"(ok|bad|unknown)"\n\s+name\s"(.*?)"\n\s+value\s"(.*?)"\n\s+trust\s"(trusted|untrusted)"\n/sg) {
+	while ($line =~ m/\s+key\s["\[](.*?)[\]"]\nsignature\s"(ok|bad|unknown)"\n\s+name\s"(.*?)"\n\s+value\s"(.*?)"\n\s+trust\s"(trusted|untrusted)"\n/sg) {
 		push @ret, {
 			key => $1,
 			signature => $2,
diff --git a/debian/changelog b/debian/changelog
index eb8248804..491e07a4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
     Requena.
   * Improve javascript onload handling.
+  * monotone: Deal with format change in version 0.45.
+    (Thanks, Richard Levitte)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
-- 
cgit v1.2.3


From 3f90eba5a1a5df95f2c9f7fc2d78a382731f2d10 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Mon, 14 Dec 2009 19:35:42 +0000
Subject: minor: Added an external link to the used tool.

---
 doc/w3mmode.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/w3mmode.mdwn b/doc/w3mmode.mdwn
index 3afee5c9b..04e37ba04 100644
--- a/doc/w3mmode.mdwn
+++ b/doc/w3mmode.mdwn
@@ -1,5 +1,5 @@
 It's possible to use all of ikiwiki's web features (page editing, etc) in
-the `w3m` web browser without using a web server. `w3m` supports local CGI
+the [`w3m`](http://w3m.sourceforge.net/) web browser without using a web server. `w3m` supports local CGI
 scripts, and ikiwiki can be set up to run that way. This requires some
 special configuration:
 
-- 
cgit v1.2.3


From b4bc7d17080055c615bc264c4d5b7d791161682c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 17:01:55 -0500
Subject: rename: Fix some utf-8 problems.

The crux of the problem is that the cgi object has raw values not converted
to utf-8, and rename was using its fields. Also fixed a missed place where
the form object did not get its fields utf-8 encoded.
---
 IkiWiki/Plugin/rename.pm | 9 +++++----
 debian/changelog         | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index c3e03496f..8213d21f6 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -235,6 +235,7 @@ sub formbuilder (@) {
 
 	if (defined $form->field("do") && ($form->field("do") eq "edit" ||
 	    $form->field("do") eq "create")) {
+    		IkiWiki::decode_form_utf8($form);
 		my $q=$params{cgi};
 		my $session=$params{session};
 
@@ -242,7 +243,7 @@ sub formbuilder (@) {
 			rename_start($q, $session, 0, $form->field("page"));
 		}
 		elsif ($form->submitted eq "Rename Attachment") {
-			my @selected=$q->param("attachment_select");
+			my @selected=map { Encode::decode_utf8($_) } $q->param("attachment_select");
 			if (@selected > 1) {
 				error(gettext("Only one attachment can be renamed at a time."));
 			}
@@ -278,7 +279,7 @@ sub sessioncgi ($$) {
 
 	if ($q->param("do") eq 'rename') {
         	my $session=shift;
-		my ($form, $buttons)=rename_form($q, $session, $q->param("page"));
+		my ($form, $buttons)=rename_form($q, $session, Encode::decode_utf8($q->param("page")));
 		IkiWiki::decode_form_utf8($form);
 
 		if ($form->submitted eq 'Cancel') {
@@ -290,9 +291,9 @@ sub sessioncgi ($$) {
 
 			# These untaints are safe because of the checks
 			# performed in check_canrename later.
-			my $src=$q->param("page");
+			my $src=$form->field("page");
 			my $srcfile=IkiWiki::possibly_foolish_untaint($pagesources{$src});
-			my $dest=IkiWiki::possibly_foolish_untaint(titlepage($q->param("new_name")));
+			my $dest=IkiWiki::possibly_foolish_untaint(titlepage($form->field("new_name")));
 			my $destfile=$dest;
 			if (! $q->param("attachment")) {
 				my $type=$q->param('type');
diff --git a/debian/changelog b/debian/changelog
index 491e07a4a..41f4ec870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
   * Improve javascript onload handling.
   * monotone: Deal with format change in version 0.45.
     (Thanks, Richard Levitte)
+  * rename: Fix some utf-8 problems.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
-- 
cgit v1.2.3


From bb1ce7207d9707848dfa7ebf6e32bfff5736732c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 17:16:40 -0500
Subject: attachment: Fix several utf-8 problems.

Similar to those in the rename plugin, although here we can't use
the form object.
---
 IkiWiki/Plugin/attachment.pm | 5 +++--
 debian/changelog             | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 087c315a9..953e71625 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -112,7 +112,7 @@ sub formbuilder (@) {
 
 	return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ;
 
-	my $filename=$q->param('attachment');
+	my $filename=Encode::decode_utf8($q->param('attachment'));
 	if (defined $filename && length $filename &&
             ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
 		my $session=$params{session};
@@ -189,9 +189,10 @@ sub formbuilder (@) {
 		IkiWiki::saveindex();
 	}
 	elsif ($form->submitted eq "Insert Links") {
-		my $page=quotemeta($q->param("page"));
+		my $page=quotemeta(Encode::decode_utf8($q->param("page")));
 		my $add="";
 		foreach my $f ($q->param("attachment_select")) {
+			$f=Encode::decode_utf8($f);
 			$f=~s/^$page\///;
 			$add.="[[$f]]\n";
 		}
diff --git a/debian/changelog b/debian/changelog
index 41f4ec870..c286065fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
   * monotone: Deal with format change in version 0.45.
     (Thanks, Richard Levitte)
   * rename: Fix some utf-8 problems.
+  * attachment: Fix several utf-8 problems.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
-- 
cgit v1.2.3


From cdbdf19c369c7a79251cf938b6d8d893accd4599 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 17:19:31 -0500
Subject: attachment: Fix reversion in attachment sorting by age.

Reversion was introduced by over-eager removal of mtime_raw in
2b569f99d9e7f1d4d30c7f3adde9729ff4d868cf
---
 IkiWiki/Plugin/attachment.pm | 1 +
 debian/changelog             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 953e71625..cbe6efc21 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -231,6 +231,7 @@ sub attachment_list ($) {
 				link => htmllink($page, $page, $f, noimageinline => 1),
 				size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]),
 				mtime => displaytime($IkiWiki::pagemtime{$f}),
+				mtime_raw => $IkiWiki::pagemtime{$f},
 			};
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index c286065fa..258f07b08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
     (Thanks, Richard Levitte)
   * rename: Fix some utf-8 problems.
   * attachment: Fix several utf-8 problems.
+  * attachment: Fix reversion in attachment sorting by age.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
-- 
cgit v1.2.3


From 4ee754536d14610580f852d134a842c2cb9a1665 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 17:26:48 -0500
Subject: remove: Fix problem removing pages with utf-8 in the name.

---
 IkiWiki/Plugin/remove.pm | 6 +++---
 debian/changelog         | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index cbc8a0f2c..2b8cf0414 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -166,7 +166,7 @@ sub formbuilder (@) {
 			removal_confirm($q, $session, 0, $form->field("page"));
 		}
 		elsif ($form->submitted eq "Remove Attachments") {
-			my @selected=$q->param("attachment_select");
+			my @selected=map { Encode::decode_utf8($_) } $q->param("attachment_select");
 			if (! @selected) {
 				error(gettext("Please select the attachments to remove."));
 			}
@@ -187,7 +187,7 @@ sub sessioncgi ($$) {
 			postremove($session);
 		}
 		elsif ($form->submitted eq 'Remove' && $form->validate) {
-			my @pages=$q->param("page");
+			my @pages=$form->field("page");
 	
 			# Validate removal by checking that the page exists,
 			# and that the user is allowed to edit(/remove) it.
@@ -237,7 +237,7 @@ sub sessioncgi ($$) {
 			}
 		}
 		else {
-			removal_confirm($q, $session, 0, $q->param("page"));
+			removal_confirm($q, $session, 0, $form->field("page"));
 		}
 
 		exit 0;
diff --git a/debian/changelog b/debian/changelog
index 258f07b08..d84477298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
   * rename: Fix some utf-8 problems.
   * attachment: Fix several utf-8 problems.
   * attachment: Fix reversion in attachment sorting by age.
+  * remove: Fix problem removing pages with utf-8 in the name.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
-- 
cgit v1.2.3


From 40078b1781c47228358fd193733d82f0429566eb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 18:07:24 -0500
Subject: 404: fix utf-8 encoding of REDIRECT_URL

---
 IkiWiki/Plugin/404.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
index bae9e15d1..85486e559 100644
--- a/IkiWiki/Plugin/404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -69,7 +69,8 @@ sub cgi ($) {
 
 	if (exists $ENV{REDIRECT_STATUS} && 
 	    $ENV{REDIRECT_STATUS} eq '404') {
-		my $page = cgi_page_from_404($ENV{REDIRECT_URL},
+		my $page = cgi_page_from_404(
+			Encode::decode_utf8($ENV{REDIRECT_URL}),
 			$config{url}, $config{usedirs});
 		IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
 	}
-- 
cgit v1.2.3


From 2bceb10b5fd06e8e0867cbc6d72a16cbaae35803 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 18:16:47 -0500
Subject: 404/goto: Fix 404 display of utf-8 pages.

Problem here was that no charset http header was being sent.

I fixed this globally by making cgi_custom_failure send the header.
Required changing its parameters.
---
 IkiWiki/CGI.pm              | 12 ++++++++----
 IkiWiki/Plugin/getsource.pm |  3 ++-
 IkiWiki/Plugin/goto.pm      |  3 ++-
 debian/changelog            |  1 +
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 9277223f0..866711a71 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -235,11 +235,15 @@ sub cgi_prefs ($$) {
 	showform($form, $buttons, $session, $q);
 }
 
-sub cgi_custom_failure ($$) {
-	my $header=shift;
+sub cgi_custom_failure ($$$) {
+	my $q=shift;
+	my $httpstatus=shift;
 	my $message=shift;
 
-	print $header;
+	print $q->header(
+		-status => $httpstatus,
+		-charset => 'utf-8',
+	);
 	print $message;
 
 	# Internet Explod^Hrer won't show custom 404 responses
@@ -274,7 +278,7 @@ sub check_banned ($$) {
 		$session->delete();
 		cgi_savesession($session);
 		cgi_custom_failure(
-			$q->header(-status => "403 Forbidden"),
+			$q, "403 Forbidden",
 			gettext("You are banned."));
 	}
 }
diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index ae9ea3cc7..d1555430e 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -58,7 +58,8 @@ sub cgi_getsource ($) {
 
 	if (! exists $pagesources{$page}) {
 		IkiWiki::cgi_custom_failure(
-			$cgi->header(-status => "404 Not Found"),
+			$cgi,
+			"404 Not Found",
 			IkiWiki::misctemplate(gettext("missing page"),
 				"<p>".
 				sprintf(gettext("The page %s does not exist."),
diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 2e2dc04a1..439552f62 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -51,7 +51,8 @@ sub cgi_goto ($;$) {
 
 	if (! length $link) {
 		IkiWiki::cgi_custom_failure(
-			$q->header(-status => "404 Not Found"),
+			$q,
+			"404 Not Found",
 			IkiWiki::misctemplate(gettext("missing page"),
 				"<p>".
 				sprintf(gettext("The page %s does not exist."),
diff --git a/debian/changelog b/debian/changelog
index d84477298..ff922532a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
   * attachment: Fix several utf-8 problems.
   * attachment: Fix reversion in attachment sorting by age.
   * remove: Fix problem removing pages with utf-8 in the name.
+  * 404/goto: Fix 404 display of utf-8 pages.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
-- 
cgit v1.2.3


From c0e938e972dee09c2e70c0a8e57351ec85e69c14 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 18:20:11 -0500
Subject: fix typo

This was probably not noticed because it only results in a warning, and in
the checkcontent diff having some unchanged lines in it.
---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 3430c5742..b8e599928 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1407,7 +1407,7 @@ sub check_content (@) {
 		my %old=map { $_ => 1 }
 		        split("\n", readfile(srcfile($pagesources{$params{page}})));
 		foreach my $line (split("\n", $params{content})) {
-			push @diff, $line if ! exists $old{$_};
+			push @diff, $line if ! exists $old{$line};
 		}
 		$params{diff}=join("\n", @diff);
 	}
-- 
cgit v1.2.3


From f9190f523c75fc5db93eff80e3b1dc005ee474f2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 18:54:30 -0500
Subject: reorg

---
 debian/changelog | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff922532a..cbb496e07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,14 @@
 ikiwiki (3.20091203) UNRELEASED; urgency=low
 
-  * cvs: Add missing bit to Automator.
   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
     Requena.
   * Improve javascript onload handling.
   * monotone: Deal with format change in version 0.45.
     (Thanks, Richard Levitte)
-  * rename: Fix some utf-8 problems.
-  * attachment: Fix several utf-8 problems.
+  * cvs: Add missing bit to Automator.
   * attachment: Fix reversion in attachment sorting by age.
-  * remove: Fix problem removing pages with utf-8 in the name.
-  * 404/goto: Fix 404 display of utf-8 pages.
+  * Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and
+    goto.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
-- 
cgit v1.2.3


From 18320696aefad04ce1d2576219a83347516a5772 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 15 Dec 2009 15:05:21 -0500
Subject: declutter

---
 doc/examples/softwaresite/bugs/New_bug.mdwn         | 1 -
 doc/examples/softwaresite/bugs/needs_more_bugs.mdwn | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 doc/examples/softwaresite/bugs/New_bug.mdwn

diff --git a/doc/examples/softwaresite/bugs/New_bug.mdwn b/doc/examples/softwaresite/bugs/New_bug.mdwn
deleted file mode 100644
index 85f68d2b6..000000000
--- a/doc/examples/softwaresite/bugs/New_bug.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-This is a new bug report!
diff --git a/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn b/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn
index 6627ac0b9..a150570a4 100644
--- a/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn
+++ b/doc/examples/softwaresite/bugs/needs_more_bugs.mdwn
@@ -1,4 +1,3 @@
 FooBar does not have enough bugs, which suggests that it's not a real Free
 Software project. Please help create more bugs by adding code to FooBar!
 :-)
-And what now?
-- 
cgit v1.2.3


From 985ac23ca7df3ca166be2911bdbcb3b3d9c36b1f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 18 Dec 2009 21:02:07 -0500
Subject: releasing version 3.20091218

---
 debian/changelog |  4 ++--
 ikiwiki.spec     |  2 +-
 po/ikiwiki.pot   | 30 +++++++++++++++---------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbb496e07..0e76bd727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20091203) UNRELEASED; urgency=low
+ikiwiki (3.20091218) unstable; urgency=low
 
   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
     Requena.
@@ -10,7 +10,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
   * Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and
     goto.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
+ -- Joey Hess <joeyh@debian.org>  Fri, 18 Dec 2009 20:47:24 -0500
 
 ikiwiki (3.20091202) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 1651377e1..eb6e5d039 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20091202
+Version: 3.20091218
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index eb1824411..bf78ec046 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-02 13:10-0500\n"
+"POT-Creation-Date: 2009-12-18 20:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:318
 msgid "Your login session has expired."
 msgstr ""
 
@@ -50,11 +50,11 @@ msgstr ""
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:282
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:409 ../IkiWiki/CGI.pm:410 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr ""
 
@@ -320,20 +320,20 @@ msgstr ""
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 msgid "not a page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
@@ -817,20 +817,20 @@ msgstr ""
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -1059,16 +1059,16 @@ msgstr ""
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
-- 
cgit v1.2.3


From 351b37823f803f6dcbe1e6f3ce1c3f7e48dc5951 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 18 Dec 2009 21:02:49 -0500
Subject: add news item for ikiwiki 3.20091218

---
 doc/news/version_3.20091022.mdwn | 10 ----------
 doc/news/version_3.20091218.mdwn | 11 +++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 doc/news/version_3.20091022.mdwn
 create mode 100644 doc/news/version_3.20091218.mdwn

diff --git a/doc/news/version_3.20091022.mdwn b/doc/news/version_3.20091022.mdwn
deleted file mode 100644
index 6fc9713c0..000000000
--- a/doc/news/version_3.20091022.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-ikiwiki 3.20091022 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * edittemplate: Allow template page name to be specified using anything
-     legal for a wikilink (including eg, leading slashes).
-   * edittemplate: Work around bug #551499 in CGI::FormBuilder.
-   * Fix a bug introduced in the last version that caused ikiwiki
-     to skip all files if a sourcedir of "./" was specified.
-   * Support CFLAGS when building wrapper.
-   * meta: Gather permalink info on scan pass so it is available
-     to inline when using a template that does not include page content."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091218.mdwn b/doc/news/version_3.20091218.mdwn
new file mode 100644
index 000000000..224e81c4e
--- /dev/null
+++ b/doc/news/version_3.20091218.mdwn
@@ -0,0 +1,11 @@
+ikiwiki 3.20091218 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
+     Requena.
+   * Improve javascript onload handling.
+   * monotone: Deal with format change in version 0.45.
+     (Thanks, Richard Levitte)
+   * cvs: Add missing bit to Automator.
+   * attachment: Fix reversion in attachment sorting by age.
+   * Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and
+     goto."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From c46f673d9a70aedff636574db42168c3f579e84c Mon Sep 17 00:00:00 2001
From: "http://www.tychoish.com/" <http://www.tychoish.com/@web>
Date: Sat, 19 Dec 2009 20:06:47 +0000
Subject: adding a new css sheet.

---
 doc/css_market.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index fe58e77f1..733b20676 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -49,6 +49,12 @@ gnomes will convert them to css files..)
   the action list (Edit, RecentChanges, etc.) as tabs.
   [[!meta stylesheet="actiontabs"]]
 
+* tychoish's **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]]. 
+  I typically throw this in as `local.css` in new wikis as a slightly more clear and readable
+  layout for wikis that need to be functional and elegant, but not necessarily uniquely designed. 
+  Currently in use by the [the outeralliance wiki](http://oa.criticalfutures.com/). 
+  
+
 If your web browser allows selecting between multiple stylesheets, this
 page can be viewed using many of the stylesheets above. For example, if
 using Epiphany with the Select Stylesheet extension enabled, use View ->
-- 
cgit v1.2.3


From cfbd068fa731234782c3fd571f22a1b7a79c9383 Mon Sep 17 00:00:00 2001
From: "http://www.tychoish.com/" <http://www.tychoish.com/@web>
Date: Sat, 19 Dec 2009 20:07:39 +0000
Subject: edit my entry to be less dweeby

---
 doc/css_market.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index 733b20676..a0943547c 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -49,7 +49,7 @@ gnomes will convert them to css files..)
   the action list (Edit, RecentChanges, etc.) as tabs.
   [[!meta stylesheet="actiontabs"]]
 
-* tychoish's **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]]. 
+* **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]]. 
   I typically throw this in as `local.css` in new wikis as a slightly more clear and readable
   layout for wikis that need to be functional and elegant, but not necessarily uniquely designed. 
   Currently in use by the [the outeralliance wiki](http://oa.criticalfutures.com/). 
-- 
cgit v1.2.3


From eec0c6c3282625586952c0f1d74ce5a1a026ca8a Mon Sep 17 00:00:00 2001
From: kierun <kierun@web>
Date: Mon, 21 Dec 2009 16:29:59 +0000
Subject:

---
 doc/todo/ACL.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index e9fb2717f..4c3062427 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -69,3 +69,5 @@ Here is how I see it:
     <pre>
     \[[!acl user=* page=/subsite/* acl=/subsite/acl.mdwn]]
     </pre>
+
+Any idea when this is going to be finished?  If you want, I am happy to beta test. 
-- 
cgit v1.2.3


From 407a94c6a6d5ea125f5c31787799c864e2c1b7f0 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 23 Dec 2009 15:07:11 +0000
Subject: added tag

---
 doc/plugins/contrib/pod.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/contrib/pod.mdwn b/doc/plugins/contrib/pod.mdwn
index dafffa844..d6fdf4b63 100644
--- a/doc/plugins/contrib/pod.mdwn
+++ b/doc/plugins/contrib/pod.mdwn
@@ -34,3 +34,6 @@ The following options can be set in the ikiwiki setup file.
 
 * browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/pod.pm>
 * git repo at git://github.com/rubykat/ikiplugins.git
+
+----
+[[!taglink format]]
-- 
cgit v1.2.3


From 85eab3e9ff30ba42307a53bf22ef72ce87e18616 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 23 Dec 2009 15:08:14 +0000
Subject: try again with tag

---
 doc/plugins/contrib/pod.mdwn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/plugins/contrib/pod.mdwn b/doc/plugins/contrib/pod.mdwn
index d6fdf4b63..19b0111df 100644
--- a/doc/plugins/contrib/pod.mdwn
+++ b/doc/plugins/contrib/pod.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=pod author="[[rubykat]]"]]
+[[!tag format]]
 ## NAME
 
 IkiWiki::Plugin::pod - process pages written in POD format.
@@ -35,5 +36,3 @@ The following options can be set in the ikiwiki setup file.
 * browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/pod.pm>
 * git repo at git://github.com/rubykat/ikiplugins.git
 
-----
-[[!taglink format]]
-- 
cgit v1.2.3


From 01e744af0f099fcf28d9cf0bc0f090262c092bdf Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 23 Dec 2009 15:09:59 +0000
Subject: third time lucky?

---
 doc/plugins/contrib/pod.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/pod.mdwn b/doc/plugins/contrib/pod.mdwn
index 19b0111df..97a9c648a 100644
--- a/doc/plugins/contrib/pod.mdwn
+++ b/doc/plugins/contrib/pod.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=pod author="[[rubykat]]"]]
-[[!tag format]]
+[[!tag type/format]]
 ## NAME
 
 IkiWiki::Plugin::pod - process pages written in POD format.
-- 
cgit v1.2.3


From c7e822a4962c36a3f26e1f0413734b2e67e2e607 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 23 Dec 2009 15:13:04 +0000
Subject: added tag

---
 doc/plugins/contrib/field.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/plugins/contrib/field.mdwn b/doc/plugins/contrib/field.mdwn
index 745a36bcd..a43bf24b2 100644
--- a/doc/plugins/contrib/field.mdwn
+++ b/doc/plugins/contrib/field.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=field author="[[rubykat]]"]]
+[[!tag type/meta]]
 [[!toc]]
 ## NAME
 
-- 
cgit v1.2.3


From c4a2d93115b6a7826b21f13b9d29bd947551c6c6 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 23 Dec 2009 15:14:57 +0000
Subject: added tag

---
 doc/plugins/contrib/xslt.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/plugins/contrib/xslt.mdwn b/doc/plugins/contrib/xslt.mdwn
index c30e618ea..80c956c58 100644
--- a/doc/plugins/contrib/xslt.mdwn
+++ b/doc/plugins/contrib/xslt.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=xslt author="[[rubykat]]"]]
+[[!tag type/chrome]]
 ## NAME
 
 IkiWiki::Plugin::xslt - ikiwiki directive to process an XML file with XSLT
-- 
cgit v1.2.3


From 98c00730f6455cce03c2dc7486cdc75c150baa69 Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Thu, 24 Dec 2009 07:46:42 +0000
Subject: use `SomePage <>` for wikilink?

---
 .../Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index ca7b282fa..6219f1d14 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -322,3 +322,12 @@ The page is rST-parsed once in 'scan' and once in 'htmlize' (the first to genera
 >> However, I think that if the cache does not work for a big load, it should
 >> not work at all; small loads are small so they don't matter. --ulrik
 
+-----
+
+Another possiblity is use empty url for wiki pages (gitit uses this approach), for example:
+
+    `SomePage <>`_
+
+Since it uses *empty* url, I would like to call it *proposal 0* :-)  --[weakish]
+
+[weakish]: http://weakish.pigro.net
-- 
cgit v1.2.3


From 7e0d5aa1fd912cc933c613eab9d3d58d7d71f6d3 Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Thu, 24 Dec 2009 07:47:50 +0000
Subject: typo

---
 doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index 6219f1d14..6e0f32fd5 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -324,7 +324,7 @@ The page is rST-parsed once in 'scan' and once in 'htmlize' (the first to genera
 
 -----
 
-Another possiblity is use empty url for wiki pages (gitit uses this approach), for example:
+Another possiblity is using empty url for wikilinks (gitit uses this approach), for example:
 
     `SomePage <>`_
 
-- 
cgit v1.2.3


From cf26aa6bc76ada153b265ef7851eacb1c6f2417e Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Thu, 24 Dec 2009 08:46:40 +0000
Subject: question: "still domain specific or not?"

---
 doc/plugins/google/discussion.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/plugins/google/discussion.mdwn b/doc/plugins/google/discussion.mdwn
index 94fc36a35..32a0a41b9 100644
--- a/doc/plugins/google/discussion.mdwn
+++ b/doc/plugins/google/discussion.mdwn
@@ -11,3 +11,12 @@ domain, and appears to be legal. I've got a wiki that'd benefit
 tweaked to do this? --[[schmonz]]
 
 > Done. --[[Joey]] 
+
+The main page said:
+
+> Also, if the same domain has other content, outside the wiki's
+> content, it will be searched as well.
+
+Is it still true now? (Or this statement is out of date?)  --[weakish]
+
+[weakish]: http://weakish.pigro.net
-- 
cgit v1.2.3


From db4a98973016e2c3c282d6de7c27848ff76ef729 Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Thu, 24 Dec 2009 08:54:25 +0000
Subject: add netbsd wiki

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 418768a2c..d2fff2ba9 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -2,6 +2,7 @@ Projects & Organizations
 ========================
 
 * [This wiki](http://ikiwiki.info) (of course!)
+* [NetBSD wiki](http://wiki.netbsd.org)
 * The [GNU Hurd](http://www.gnu.org/software/hurd/)
 * [DragonFly BSD](http://www.dragonflybsd.org/)
 * [Monotone](http://monotone.ca/wiki/FrontPage/)
-- 
cgit v1.2.3


From dbf0f25346a7eb0b63581639df3ac0c73753a0f0 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Thu, 24 Dec 2009 13:50:12 +0000
Subject: not yet, please

---
 doc/ikiwikiusers.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index d2fff2ba9..aa4b4b4e6 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -2,7 +2,7 @@ Projects & Organizations
 ========================
 
 * [This wiki](http://ikiwiki.info) (of course!)
-* [NetBSD wiki](http://wiki.netbsd.org)
+<!-- * [NetBSD wiki](http://wiki.netbsd.org) -->
 * The [GNU Hurd](http://www.gnu.org/software/hurd/)
 * [DragonFly BSD](http://www.dragonflybsd.org/)
 * [Monotone](http://monotone.ca/wiki/FrontPage/)
-- 
cgit v1.2.3


From 3a1c8c2b463b8a4f6b3b2c866c5e1b1500f95193 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 25 Dec 2009 14:31:51 -0500
Subject: pagestats: Add show parameter. Closes: #562129

---
 IkiWiki/Plugin/pagestats.pm          | 10 ++++++++++
 debian/changelog                     |  6 ++++++
 doc/ikiwiki/directive/pagestats.mdwn |  6 ++++++
 3 files changed, 22 insertions(+)

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 47638210a..4313aa271 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -63,6 +63,16 @@ sub preprocess (@) {
 		$max = $counts{$page} if $counts{$page} > $max;
 	}
 
+	if (exists $params{show}) {
+		my $i=0;
+		my %show;
+		foreach my $key (sort { $counts{$b} <=> $counts{$a} } keys %counts) {
+			last if ++$i > $params{show};
+			$show{$key}=$counts{$key};
+		}
+		%counts=%show;
+	}
+
 	if ($style eq 'table') {
 		return "<table class='pageStats'>\n".
 			join("\n", map {
diff --git a/debian/changelog b/debian/changelog
index 0e76bd727..e01037171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20091219) UNRELEASED; urgency=low
+
+  * pagestats: Add show parameter. Closes: #562129
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
+
 ikiwiki (3.20091218) unstable; urgency=low
 
   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn
index f14c80b07..68f4d2734 100644
--- a/doc/ikiwiki/directive/pagestats.mdwn
+++ b/doc/ikiwiki/directive/pagestats.mdwn
@@ -22,4 +22,10 @@ Or to display a cloud of tags related to Linux, you could use:
 
 	\[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]]
 
+The optional `show` parameter limits display to the specified number of
+pages. For instance, to show a table of the top ten pages with the most
+links:
+
+	\[[!pagestats style="table" show="10"]]
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From 6e632de82550e5d028391e74beb302b80bd9f7a6 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 25 Dec 2009 19:40:59 +0000
Subject: patch in diff -u format

---
 ...iling___40__opposite_of_levels__61____41__.mdwn | 47 +++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
index ce51d90a3..53cb0dd7c 100644
--- a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
+++ b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
@@ -10,19 +10,38 @@ Currently, the levels=X parameter lets you tweak how deep it will go for small h
 > > projects prefer to receive changes as unified diffs (or as
 > > branches in their chosen VCS, which is [[git]] here). --[[smcv]]
 
-	56,57c56,57
-	<       my $curlevel;
-	<       my $startlevel=0;
-	---
-	>       my $startlevel=($params{startlevel} ? $params{startlevel} : 0);
-	>       my $curlevel=$startlevel-1;
-	69a70
-	>                       # unless we're given startlevel as a parameter
-	73a75,79
-	>                       elsif (defined $params{startlevel}
-	>                              and $level < $params{startlevel})
-	>                       {
-	>                           return;
-	>                       }
+> > > Done. -- [[KathrynAndersen]]
+
+
+	--- /files/git/other/ikiwiki/IkiWiki/Plugin/toc.pm	2009-11-16 12:44:00.352050178 +1100
+	+++ toc.pm	2009-12-26 06:36:06.686512552 +1100
+	@@ -53,8 +53,8 @@
+	 	my $page="";
+	 	my $index="";
+	 	my %anchors;
+	-	my $curlevel;
+	-	my $startlevel=0;
+	+	my $startlevel=($params{startlevel} ? $params{startlevel} : 0);
+	+	my $curlevel=$startlevel-1;
+	 	my $liststarted=0;
+	 	my $indent=sub { "\t" x $curlevel };
+	 	$p->handler(start => sub {
+	@@ -67,10 +67,16 @@
+	 	
+	 			# Take the first header level seen as the topmost level,
+	 			# even if there are higher levels seen later on.
+	+			# unless we're given startlevel as a parameter
+	 			if (! $startlevel) {
+	 				$startlevel=$level;
+	 				$curlevel=$startlevel-1;
+	 			}
+	+			elsif (defined $params{startlevel}
+	+			       and $level < $params{startlevel})
+	+			{
+	+			    return;
+	+			}
+	 			elsif ($level < $startlevel) {
+	 				$level=$startlevel;
+	 			}
 
 [[!tag patch]]
-- 
cgit v1.2.3


From 51bb7d38482cdb109f163594181e8209369b658c Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 25 Dec 2009 19:53:30 +0000
Subject:

---
 doc/ikiwiki/directive/pagestats/discussion.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/pagestats/discussion.mdwn b/doc/ikiwiki/directive/pagestats/discussion.mdwn
index 3c9dc7104..001217cf1 100644
--- a/doc/ikiwiki/directive/pagestats/discussion.mdwn
+++ b/doc/ikiwiki/directive/pagestats/discussion.mdwn
@@ -7,4 +7,10 @@ I would rather not find and create a page for every tag I have created or will c
 
 Thanks
 
-----
+> Hello unknown person.
+
+> I think it would require a different approach to what "tags" are, and/or what "pagestats" are.  The pagestats plugin gives statistical information about *pages*, so it requires the pages in question to exist before it can get information about them.  The tags plugin creates links to tag *pages*, with the expectation that a human being will create said pages and put whatever content they want on them (such as describing what the tag is about, and a map linking back to the tagged pages).
+
+> The approach that [PmWiki](http://www.pmwiki.org) takes is that it enables the optional auto-creation of (empty) pages which match a particular "group" (set of sub-pages); thus one could set all the "tags/*" pages to be auto-created, creating a new tags/foo page the first time the \[[!tag foo]] directive is used.  I'm not sure how this could be done in ikiwiki.
+
+> -- [[KathrynAndersen]]
-- 
cgit v1.2.3


From cc63cee0d491c92b9a518b33d4fd7edcaef0bfc4 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 25 Dec 2009 19:56:19 +0000
Subject: and someone already thought of tag-page auto-creation

---
 doc/ikiwiki/directive/pagestats/discussion.mdwn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/ikiwiki/directive/pagestats/discussion.mdwn b/doc/ikiwiki/directive/pagestats/discussion.mdwn
index 001217cf1..d72b4058d 100644
--- a/doc/ikiwiki/directive/pagestats/discussion.mdwn
+++ b/doc/ikiwiki/directive/pagestats/discussion.mdwn
@@ -11,6 +11,5 @@ Thanks
 
 > I think it would require a different approach to what "tags" are, and/or what "pagestats" are.  The pagestats plugin gives statistical information about *pages*, so it requires the pages in question to exist before it can get information about them.  The tags plugin creates links to tag *pages*, with the expectation that a human being will create said pages and put whatever content they want on them (such as describing what the tag is about, and a map linking back to the tagged pages).
 
-> The approach that [PmWiki](http://www.pmwiki.org) takes is that it enables the optional auto-creation of (empty) pages which match a particular "group" (set of sub-pages); thus one could set all the "tags/*" pages to be auto-created, creating a new tags/foo page the first time the \[[!tag foo]] directive is used.  I'm not sure how this could be done in ikiwiki.
-
+> The approach that [PmWiki](http://www.pmwiki.org) takes is that it enables the optional auto-creation of (empty) pages which match a particular "group" (set of sub-pages); thus one could set all the "tags/*" pages to be auto-created, creating a new tags/foo page the first time the \[[!tag foo]] directive is used. See [[todo/auto-create_tag_pages_according_to_a_template]] for more discussion on this idea.
 > -- [[KathrynAndersen]]
-- 
cgit v1.2.3


From d35bf0be6765d692d97769cd2d81ed143c8e9036 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 25 Dec 2009 15:08:22 -0500
Subject: correction

---
 doc/plugins/google.mdwn            | 3 +--
 doc/plugins/google/discussion.mdwn | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/google.mdwn b/doc/plugins/google.mdwn
index 7c61e637b..349c278ee 100644
--- a/doc/plugins/google.mdwn
+++ b/doc/plugins/google.mdwn
@@ -5,8 +5,7 @@ This plugin adds a search form to the wiki, using google's site search.
 
 Google is asked to search for pages in the domain specified in the wiki's
 `url` configuration parameter. Results will depend on whether google has
-indexed the site, and how recently. Also, if the same domain has other
-content, outside the wiki's content, it will be searched as well.
+indexed the site, and how recently.
 
 The [[search]] plugin offers full text search of only the wiki, but
 requires that a search engine be installed on your site.
diff --git a/doc/plugins/google/discussion.mdwn b/doc/plugins/google/discussion.mdwn
index 32a0a41b9..e664f5723 100644
--- a/doc/plugins/google/discussion.mdwn
+++ b/doc/plugins/google/discussion.mdwn
@@ -20,3 +20,6 @@ The main page said:
 Is it still true now? (Or this statement is out of date?)  --[weakish]
 
 [weakish]: http://weakish.pigro.net
+
+> I checked, and it's never been true; google is given the url to the top
+> of the wiki and only searches things in there. --[[Joey]] 
-- 
cgit v1.2.3


From 8e0f45ae670985a0ffde8180776dd8ce5821c7d8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 25 Dec 2009 15:12:05 -0500
Subject: add example

---
 doc/todo/ACL.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index 4c3062427..d40701d60 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -70,4 +70,9 @@ Here is how I see it:
     \[[!acl user=* page=/subsite/* acl=/subsite/acl.mdwn]]
     </pre>
 
-Any idea when this is going to be finished?  If you want, I am happy to beta test. 
+Any idea when this is going to be finished?  If you want, I am happy to beta test.
+
+> It's already done, though that is sorta hidden in the above. :-)
+> Example of use to only allow two users to edit the tipjar page:
+>	locked_pages => 'tipjar and !(user(joey) or user(bob))',
+> --[[Joey]] 
-- 
cgit v1.2.3


From 7cf435b678e99ca9956de5d0454371b30c610b66 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 25 Dec 2009 15:16:01 -0500
Subject: credit

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e01037171..d3a510d4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 ikiwiki (3.20091219) UNRELEASED; urgency=low
 
-  * pagestats: Add show parameter. Closes: #562129
+  * pagestats: Add show parameter. Closes: #562129 (David Paleino)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
 
-- 
cgit v1.2.3


From ffc9f25e734a8ca5397f2dfd09c1e31725624ee0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 25 Dec 2009 15:28:18 -0500
Subject: toc: Add startlevel parameter. (kerravonsen)

---
 IkiWiki/Plugin/toc.pm          | 11 ++++++++---
 debian/changelog               |  1 +
 doc/ikiwiki/directive/toc.mdwn |  6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index a585564e7..b8537d3eb 100644
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -53,8 +53,8 @@ sub format (@) {
 	my $page="";
 	my $index="";
 	my %anchors;
-	my $curlevel;
-	my $startlevel=0;
+	my $startlevel=($params{startlevel} ? $params{startlevel} : 0);
+	my $curlevel=$startlevel-1;
 	my $liststarted=0;
 	my $indent=sub { "\t" x $curlevel };
 	$p->handler(start => sub {
@@ -65,12 +65,17 @@ sub format (@) {
 			my $anchor="index".++$anchors{$level}."h$level";
 			$page.="$text<a name=\"$anchor\"></a>";
 	
-			# Take the first header level seen as the topmost level,
+			# Unless we're given startlevel as a parameter,
+			# take the first header level seen as the topmost level,
 			# even if there are higher levels seen later on.
 			if (! $startlevel) {
 				$startlevel=$level;
 				$curlevel=$startlevel-1;
 			}
+			elsif (defined $params{startlevel} &&
+			       $level < $params{startlevel}) {
+			    return;
+			}
 			elsif ($level < $startlevel) {
 				$level=$startlevel;
 			}
diff --git a/debian/changelog b/debian/changelog
index d3a510d4a..ae0b5eefd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.20091219) UNRELEASED; urgency=low
 
   * pagestats: Add show parameter. Closes: #562129 (David Paleino)
+  * toc: Add startlevel parameter. (kerravonsen)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
 
diff --git a/doc/ikiwiki/directive/toc.mdwn b/doc/ikiwiki/directive/toc.mdwn
index bf504dafc..bb1afa1ac 100644
--- a/doc/ikiwiki/directive/toc.mdwn
+++ b/doc/ikiwiki/directive/toc.mdwn
@@ -14,6 +14,12 @@ the `levels` parameter:
 The toc directive will take the level of the first header as the topmost
 level, even if there are higher levels seen later in the file.
 
+To create a table of contents that only shows headers starting with a given
+level, use the `startlevel` parameter. For example, to show only h2 and
+smaller headers:
+
+	\[[!toc startlevel=2]]
+
 The table of contents will be created as an ordered list. If you want
 an unordered list instead, you can change the list-style in your local
 style sheet.
-- 
cgit v1.2.3


From 3bff312697c86a5580ce4bfc32f3fb77ecb7f5f5 Mon Sep 17 00:00:00 2001
From: "http://weakish.pigro.net/" <http://weakish.pigro.net/@web>
Date: Sun, 27 Dec 2009 07:18:30 +0000
Subject: repost bug: rst plugin has python hardcode in shebang line

---
 .../rst_plugin_has_python_hardcode_in_shebang_line.mdwn     | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn

diff --git a/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn b/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn
new file mode 100644
index 000000000..f89c76fe8
--- /dev/null
+++ b/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn
@@ -0,0 +1,13 @@
+Current the rst plugin uses this shebang line:
+
+   #!/usr/bin/python
+
+The problem is that rst plugin uses some feature (for example, iterator comprehension) which is unavailable on old version of Python.
+
+So rst plugin will not work on a machine which has an old version of python in system path even though
+the user have installed a new version of python in other place.  For example, I am using ikiwiki with the rst plugin on Mac OS X 10.4 which ships python 2.3 but I do have python2.6 installed on /opt/local/bin/python (via macports).
+
+Thus I suggest to change the shebang line to:
+
+   #!/usr/bin/env python
+
-- 
cgit v1.2.3


From 8a51384297c66dd1216088ceb5def61d09af021e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 27 Dec 2009 12:40:11 +0000
Subject: note as merged

---
 ...lugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
index 53cb0dd7c..07d2d383c 100644
--- a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
+++ b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn
@@ -12,6 +12,7 @@ Currently, the levels=X parameter lets you tweak how deep it will go for small h
 
 > > > Done. -- [[KathrynAndersen]]
 
+> > > > Looks like Joey has now [[merged|done]] this. Thanks! --[[smcv]]
 
 	--- /files/git/other/ikiwiki/IkiWiki/Plugin/toc.pm	2009-11-16 12:44:00.352050178 +1100
 	+++ toc.pm	2009-12-26 06:36:06.686512552 +1100
-- 
cgit v1.2.3


From 31adf108c8760f11e677f7acdb732b28c0d365ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 28 Dec 2009 12:55:54 -0500
Subject: add another github fork

---
 doc/git.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index fef2e01e0..293446772 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -53,6 +53,8 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[kaizer]] `git://github.com/engla/ikiwiki.git`
 * [[bbb]] `http://git.boulgour.com/bbb/ikiwiki.git`
 * [[KathrynAndersen]] `git://github.com/rubykat/ikiplugins.git`
+* [[ktf]] `git://github.com/ktf/ikiwiki.git`
+
 
 ## branches
 
-- 
cgit v1.2.3


From 87c84515e96ac991a67571b26d90a4f2ed58c757 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 28 Dec 2009 13:03:39 -0500
Subject: idea

---
 doc/todo/conflict_free_comment_merges.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 doc/todo/conflict_free_comment_merges.mdwn

diff --git a/doc/todo/conflict_free_comment_merges.mdwn b/doc/todo/conflict_free_comment_merges.mdwn
new file mode 100644
index 000000000..e0e8acb34
--- /dev/null
+++ b/doc/todo/conflict_free_comment_merges.mdwn
@@ -0,0 +1,14 @@
+Currently, new comments are named with an incrementing ID (comment_N). So
+if a wiki has multiple disconnected servers, and comments are made to the
+same page on both, merging is guaranteed to result in conflicts.
+
+I propose avoiding such merge problems by naming a comment with a sha1sum
+of its (full) content. Keep the incrementing ID too, so there is an
+-ordering. And so duplicate comments are allowed..)
+So, "comment_N_SHA1".
+
+Note: The comment body will need to use meta title in the case where no 
+title is specified, to retain the current behavior of the default title
+being "comment N".
+
+What do you think [[smcv]]? --[[Joey]] 
-- 
cgit v1.2.3


From 2143cfcc3d0dc03fe3a67a5cab612fac041c2c9f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 28 Dec 2009 13:14:54 -0500
Subject: thoughts

---
 doc/todo/tagging_with_a_publication_date.mdwn | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/doc/todo/tagging_with_a_publication_date.mdwn b/doc/todo/tagging_with_a_publication_date.mdwn
index 80240ec5a..39fc4e220 100644
--- a/doc/todo/tagging_with_a_publication_date.mdwn
+++ b/doc/todo/tagging_with_a_publication_date.mdwn
@@ -38,3 +38,34 @@ on vacation".
 > >
 > > I no longer have the original wiki for which I wanted this feature, but I can
 > > see using it on future ones. -- [[DonMarti]]
+
+>>> FWIW, for the case where one wants to update a site offline,
+>>> using an ikiwiki instance on a laptop, and include some deffered
+>>> posts in the push, the ad-hoc cron job type approach will be annoying.
+>>> 
+>>> In modern ikiwiki, I guess the way to accomplish this would be to
+>>> add a pagespec that matches only pages posted in the present or past.
+>>> Then a page can have its post date set to the future, using meta date,
+>>> and only show up when its post date rolls around.
+>>> 
+>>> Ikiwiki will need to somehow notice that a pagespec began matching
+>>> a page it did not match previously, despite said page not actually
+>>> changing. I'm not sure what the best way is. 
+>>>
+>>> * One way could be to 
+>>>   use a needsbuild hook and some stored data about which pagespecs
+>>>   exclude pages in the future. (But I'm not sure how evaluating the
+>>>   pagespec could lead to that metadata and hook being set up.) 
+>>> * Another way would be to use an explicit directive to delay a
+>>>   page being posted. Then the directive stores the metadata and
+>>>   sets up the needsbuild hook.
+>>> * Another way would be for ikiwiki to remember the last 
+>>>   time it ran. It could then easily find pages that have a post
+>>>   date after that time, and treat them the same as it treats actually
+>>>   modified files.  Or a plugin could do this via a needsbuild hook,
+>>>   probably. (Only downside to this is it would probably need to do
+>>>   a O(n) walk of the list of pages -- but only running an integer
+>>>   compare per page.)
+>>> 
+>>> You'd still need a cron job to run ikiwiki -refresh every hour, or
+>>> whatever, so it can update. --[[Joey]] 
-- 
cgit v1.2.3


From 008d59d3d9a933c7bcce81f777989a991c63bbf7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 28 Dec 2009 19:27:03 -0500
Subject: Remove example ikiwiki setup file from the Debian package. This
 re-enables linking to /usr/share/ikiwiki/examples which has the example sites
 also used by auto-blog.setup. The example setup file can be generated at any
 time using ikiwiki --dumpsetup so I do not see a reason to ship it. Closes:
 #562183

---
 debian/changelog | 5 +++++
 debian/examples  | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)
 delete mode 100644 debian/examples

diff --git a/debian/changelog b/debian/changelog
index ae0b5eefd..dec2423fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low
 
   * pagestats: Add show parameter. Closes: #562129 (David Paleino)
   * toc: Add startlevel parameter. (kerravonsen)
+  * Remove example ikiwiki setup file from the Debian package. This
+    re-enables linking to /usr/share/ikiwiki/examples which has the
+    example sites also used by auto-blog.setup. The example setup file
+    can be generated at any time using ikiwiki --dumpsetup so I do
+    not see a reason to ship it. Closes: #562183
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
 
diff --git a/debian/examples b/debian/examples
deleted file mode 100644
index a1e623192..000000000
--- a/debian/examples
+++ /dev/null
@@ -1 +0,0 @@
-ikiwiki.setup
-- 
cgit v1.2.3


From 9f841c07dff16433fce805111d8ab45ff38ce228 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 29 Dec 2009 15:56:25 -0500
Subject: Use env hack in python scripts.

---
 debian/changelog                                             | 1 +
 doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn | 2 ++
 plugins/pythondemo                                           | 2 +-
 plugins/rst                                                  | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dec2423fe..ee6f9adfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low
     example sites also used by auto-blog.setup. The example setup file
     can be generated at any time using ikiwiki --dumpsetup so I do
     not see a reason to ship it. Closes: #562183
+  * Use env hack in python scripts.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
 
diff --git a/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn b/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn
index f89c76fe8..a594adc09 100644
--- a/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn
+++ b/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn
@@ -11,3 +11,5 @@ Thus I suggest to change the shebang line to:
 
    #!/usr/bin/env python
 
+> [[done]], although the irony of all the perl hashbangs in ikiwiki
+> being hardcoded doesn't escape me. --[[Joey]] 
diff --git a/plugins/pythondemo b/plugins/pythondemo
index c63ce3973..911f4d7d9 100755
--- a/plugins/pythondemo
+++ b/plugins/pythondemo
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # pythondemo — demo Python ikiwiki plugin
diff --git a/plugins/rst b/plugins/rst
index 449dba415..9f64b33a0 100755
--- a/plugins/rst
+++ b/plugins/rst
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # rst — xml-rpc-based ikiwiki plugin to process RST files
-- 
cgit v1.2.3


From 6af6c89df314cf2f9c9e053c04aa2bd492072ab1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 30 Dec 2009 15:41:17 -0500
Subject: comments: Add a checksum to the name of comment pages, to avoid merge
 conflicts when comments are posted to two branches of a site.

---
 IkiWiki/Plugin/comments.pm                 | 32 ++++++++++++++++++++++--------
 debian/changelog                           |  3 +++
 doc/todo/conflict_free_comment_merges.mdwn |  9 +++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 517e16f9f..6340fc2cb 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -377,8 +377,6 @@ sub editcomment ($$) {
 	IkiWiki::check_canedit($page, $cgi, $session);
 	$postcomment=0;
 
-	my $location=unique_comment_location($page, $config{srcdir});
-
 	my $content = "[[!comment format=$type\n";
 
 	# FIXME: handling of double quotes probably wrong?
@@ -410,8 +408,11 @@ sub editcomment ($$) {
 	my $subject = $form->field('subject');
 	if (defined $subject && length $subject) {
 		$subject =~ s/"/&quot;/g;
-		$content .= " subject=\"$subject\"\n";
 	}
+	else {
+		$subject = "comment ".(num_comments($page, $config{srcdir}) + 1);
+	}
+	$content .= " subject=\"$subject\"\n";
 
 	$content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 
@@ -421,6 +422,8 @@ sub editcomment ($$) {
 	$editcontent =~ s/"/\\"/g;
 	$content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
+	my $location=unique_comment_location($page, $content, $config{srcdir});
+
 	# This is essentially a simplified version of editpage:
 	# - the user does not control the page that's created, only the parent
 	# - it's always a create operation, never an edit
@@ -458,7 +461,7 @@ sub editcomment ($$) {
 
 		if (! $ok) {
 			my $penddir=$config{wikistatedir}."/comments_pending";
-			$location=unique_comment_location($page, $penddir);
+			$location=unique_comment_location($page, $content, $penddir);
 			writefile("$location._comment", $penddir, $content);
 			IkiWiki::printheader($session);
 			print IkiWiki::misctemplate(gettext(gettext("comment stored for moderation")),
@@ -554,7 +557,7 @@ sub commentmoderation ($$) {
 				if ($action eq 'Accept') {
 					my $content=eval { readfile($file) };
 					next if $@; # file vanished since form was displayed
-					my $dest=unique_comment_location($page, $config{srcdir})."._comment";
+					my $dest=unique_comment_location($page, $content, $config{srcdir})."._comment";
 					writefile($dest, $config{srcdir}, $content);
 					if ($config{rcs} and $config{comments_commit}) {
 						IkiWiki::rcs_add($dest);
@@ -813,15 +816,28 @@ sub pagetemplate (@) {
 	}
 }
 
-sub unique_comment_location ($) {
+sub num_comments ($$) {
 	my $page=shift;
 	my $dir=shift;
 
+	my @comments=glob("$dir/$page/$config{comments_pagename}*._comment");
+	return @comments;
+}
+
+sub unique_comment_location ($$$) {
+	my $page=shift;
+
+	eval q{use Digest::MD5 'md5_hex'};
+	error($@) if $@;
+	my $content_md5=md5_hex(shift);
+
+	my $dir=shift;
+
 	my $location;
-	my $i = 0;
+	my $i = num_comments($page, $dir);
 	do {
 		$i++;
-		$location = "$page/$config{comments_pagename}$i";
+		$location = "$page/$config{comments_pagename}${i}_${content_md5}";
 	} while (-e "$dir/$location._comment");
 
 	return $location;
diff --git a/debian/changelog b/debian/changelog
index ee6f9adfb..984351415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low
     can be generated at any time using ikiwiki --dumpsetup so I do
     not see a reason to ship it. Closes: #562183
   * Use env hack in python scripts.
+  * comments: Add a checksum to the name of comment pages, to
+    avoid merge conflicts when comments are posted to two branches of a
+    site.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
 
diff --git a/doc/todo/conflict_free_comment_merges.mdwn b/doc/todo/conflict_free_comment_merges.mdwn
index e0e8acb34..2cef0ee8c 100644
--- a/doc/todo/conflict_free_comment_merges.mdwn
+++ b/doc/todo/conflict_free_comment_merges.mdwn
@@ -12,3 +12,12 @@ title is specified, to retain the current behavior of the default title
 being "comment N".
 
 What do you think [[smcv]]? --[[Joey]] 
+
+> I had to use md5sums, as sha1sum perl module may not be available and I
+> didn't want to drag it in. But I think that's ok; this doesn't need to be
+> cryptographically secure and even the chances of being able to
+> purposefully cause a md5 collision and thus an undesired merge conflict
+> are quite low since it modifies the input text and adds a date stamp to
+> it.
+>
+> Anyway, I think it's good, [[[done]] --[[Joey]] 
-- 
cgit v1.2.3


From f2dab9318fc783933dbeb37926b18e9e782eab9f Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Wed, 30 Dec 2009 12:21:10 -0800
Subject: Add title span to misc.tmpl

Add title span to misc.tmpl so that the title is styled consistently
with pages that use page.tmpl.
---
 templates/misc.tmpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index 0de56edeb..9ec9a59cb 100644
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -20,7 +20,10 @@
 <div class="pageheader">
 <div class="header">
 <span>
-<TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE>
+<TMPL_VAR INDEXLINK>/
+<span class="title">
+<TMPL_VAR TITLE>
+</span>
 </span>
 </div>
 </div> <!-- .pageheader -->
-- 
cgit v1.2.3


From 2ae1d9d928c12be21a32c9fd4809f12bebc20e77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 1 Jan 2010 03:37:59 -0500
Subject: linkmap: Add option to omit disconnected pages from the map.

---
 IkiWiki/Plugin/linkmap.pm          | 25 ++++++++++++++++++++-----
 debian/changelog                   |  1 +
 doc/ikiwiki/directive/linkmap.mdwn | 13 ++++++++++---
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 9540bd112..28acbda32 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -49,6 +49,7 @@ sub genmap ($) {
 	my $mapnum=shift;
 	return "" unless exists $maps{$mapnum};
 	my %params=%{$maps{$mapnum}};
+	my $connected=IkiWiki::yesno($params{connected});
 
 	# Get all the items to map.
 	my %mapitems = map { $_ => urlto($_, $params{destpage}) }
@@ -79,24 +80,38 @@ sub genmap ($) {
 	print OUT "charset=\"utf-8\";\n";
 	print OUT "ratio=compress;\nsize=\"".($params{width}+0).", ".($params{height}+0)."\";\n"
 		if defined $params{width} and defined $params{height};
+	my %shown;
+	my $show=sub {
+		my $item=shift;
+		if (! $shown{$item}) {
+			print OUT "\"$item\" [shape=box,href=\"$mapitems{$item}\"];\n";
+			$shown{$item}=1;
+		}
+	};
 	foreach my $item (keys %mapitems) {
-		print OUT "\"$item\" [shape=box,href=\"$mapitems{$item}\"];\n";
+		$show->($item) unless $connected;
 		foreach my $link (map { bestlink($item, $_) } @{$links{$item}}) {
-			print OUT "\"$item\" -> \"$link\";\n"
-				if $mapitems{$link};
+			next unless length $link and $mapitems{$link};
+			foreach my $endpoint ($item, $link) {
+				$show->($endpoint);
+			}
+			print OUT "\"$item\" -> \"$link\";\n";
 		}
 	}
 	print OUT "}\n";
-	close OUT;
+	close OUT || error gettext("failed to run dot");
 
 	local $/=undef;
 	my $ret="<object data=\"".urlto($dest, $params{destpage}).
 	       "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
 	        <IN>.
 	        "</object>";
-	close IN;
+	close IN || error gettext("failed to run dot");
 	
 	waitpid $pid, 0;
+	if ($?) {
+		error gettext("failed to run dot");
+	}
 	$SIG{PIPE}="DEFAULT";
 	error gettext("failed to run dot") if $sigpipe;
 
diff --git a/debian/changelog b/debian/changelog
index 984351415..eb9bf496f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low
   * comments: Add a checksum to the name of comment pages, to
     avoid merge conflicts when comments are posted to two branches of a
     site.
+  * linkmap: Add option to omit disconnected pages from the map.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
 
diff --git a/doc/ikiwiki/directive/linkmap.mdwn b/doc/ikiwiki/directive/linkmap.mdwn
index 38cf0fd11..baa6fff61 100644
--- a/doc/ikiwiki/directive/linkmap.mdwn
+++ b/doc/ikiwiki/directive/linkmap.mdwn
@@ -7,9 +7,7 @@ graph showing the links between a set of pages in the wiki. Example usage:
 
 Only links between mapped pages will be shown; links pointing to or from
 unmapped pages will be omitted. If the pages to include are not specified,
-the links between all pages (and other files) in the wiki are mapped. For
-best results, only a small set of pages should be mapped, since otherwise
-the map can become very large, unwieldy, and complicated.
+the links between all pages (and other files) in the wiki are mapped. 
 
 Here are descriptions of all the supported parameters to the `linkmap`
 directive:
@@ -18,5 +16,14 @@ directive:
 * `height`, `width` - Limit the size of the map to a given height and width,
   in inches. Both must be specified for the limiting to take effect, otherwise
   the map's size is not limited.
+* `connected` - Controls whether to include pages on the map that link to
+  no other pages (connected=no, the default), or to only show pages that
+  link to others (connected=yes).
+
+For best results, only a small set of pages should be mapped, since
+otherwise the map can become very large, unwieldy, and complicated.
+If too many pages are included, the map may get so large that graphviz
+cannot render it. Using the `connected` parameter is a good way to prune
+out pages that clutter the map.
 
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From ddda9800d6bec39a86dd8f76d67a4972138ee394 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Fri, 1 Jan 2010 18:56:37 +0000
Subject: Update on interaction between `show`, `feedshow` and `quick`.

---
 doc/ikiwiki/directive/inline/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn
index e5cfeb91c..c0d7c76c6 100644
--- a/doc/ikiwiki/directive/inline/discussion.mdwn
+++ b/doc/ikiwiki/directive/inline/discussion.mdwn
@@ -134,9 +134,13 @@ influence `show`.
 
 	 [[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]]
 
+> Somehow the line above is not displayed correctly.
+
 Only ten pages are listed in this example although `archive` is set to
 yes. Removing `feedshow=10` all matching pages are shown.
 
 Is that behaviour intended?
 
+> Is something going wrong because `quick="yes"` [[»turns off generation of any feeds«|inline]]? --[[PaulePanter]]
+
 --[[PaulePanter]]
-- 
cgit v1.2.3


From 63cc5384bb4bd6a033ff85821b1bb904150d76c2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 1 Jan 2010 15:09:15 -0500
Subject: inline: Fix bug that limited displayed pages when feedshow was
 specified w/o show.

---
 IkiWiki/Plugin/inline.pm                     | 2 +-
 debian/changelog                             | 2 ++
 doc/ikiwiki/directive/inline/discussion.mdwn | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 93dc0149e..17d1611db 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -209,7 +209,7 @@ sub preprocess_inline (@) {
 		if ($params{show}) {
 			$num=$params{show};
 		}
-		if ($params{feedshow} && $num < $params{feedshow}) {
+		if ($params{feedshow} && $num < $params{feedshow} && $num > 0) {
 			$num=$params{feedshow};
 		}
 		if ($params{skip} && $num) {
diff --git a/debian/changelog b/debian/changelog
index eb9bf496f..4ad346c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low
     avoid merge conflicts when comments are posted to two branches of a
     site.
   * linkmap: Add option to omit disconnected pages from the map.
+  * inline: Fix bug that limited displayed pages when feedshow was
+    specified w/o show.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
 
diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn
index c0d7c76c6..998ba642b 100644
--- a/doc/ikiwiki/directive/inline/discussion.mdwn
+++ b/doc/ikiwiki/directive/inline/discussion.mdwn
@@ -132,9 +132,7 @@ Else can you please suggest a smarter way of getting certain data out from pages
 Reading the documentation I would think that `feedshow` does not
 influence `show`.
 
-	 [[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]]
-
-> Somehow the line above is not displayed correctly.
+	\[[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]]
 
 Only ten pages are listed in this example although `archive` is set to
 yes. Removing `feedshow=10` all matching pages are shown.
@@ -144,3 +142,5 @@ Is that behaviour intended?
 > Is something going wrong because `quick="yes"` [[»turns off generation of any feeds«|inline]]? --[[PaulePanter]]
 
 --[[PaulePanter]]
+
+>> Bug was that if feedshow was specified without show it limited to it incorrectly. Fixed. --[[Joey]] 
-- 
cgit v1.2.3


From 2bf3b3f403f5defa84aae24216226217895e6dfb Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Fri, 1 Jan 2010 20:21:47 +0000
Subject: back from the done

---
 doc/bugs/disable_sub-discussion_pages.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/disable_sub-discussion_pages.mdwn b/doc/bugs/disable_sub-discussion_pages.mdwn
index 5e9c8c9f9..233a377f1 100644
--- a/doc/bugs/disable_sub-discussion_pages.mdwn
+++ b/doc/bugs/disable_sub-discussion_pages.mdwn
@@ -6,6 +6,9 @@ I do want discussion subpage, but I don't want to have, for example: discussion/
 > Discussion pages should clearly be a special case that don't get Discussion
 > links put at the top... aaand.. [[bugs/done]]! --[[Joey]]
 
+>> This bug appears to have returned. For example,
+>> [[plugins/contrib/unixauth/discussion]] has a Discussion link. -- [[schmonz]]
+
 >>> Joey, I've just seen that you closed that bug in ikiwiki 1.37, but it seems
 >>> you fixed it only for English "discussion" page. The bug still occurs
 >>> for the international "discussion" pages. I have backported ikiwiki 1.40
-- 
cgit v1.2.3


From b4d1a4bb9906c41da4174356708e157683f0bdd9 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Fri, 1 Jan 2010 20:36:12 +0000
Subject: when using httpauth, anonok isn't

---
 doc/bugs/anonok_vs._httpauth.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/bugs/anonok_vs._httpauth.mdwn

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
new file mode 100644
index 000000000..90c8c74c9
--- /dev/null
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -0,0 +1,10 @@
+I've got a wiki where editing requires [[plugins/httpauth]] (with
+`cgiauthurl` working nicely). I now want to let the general public
+edit Discussion subpages, so I enabled [[plugins/anonok]] and set
+`anonok_pagespec` to `'*/Discussion'`, but HTTP auth is still being
+required for those.
+
+(Actually, what I'll really want to do is probably [[plugins/lockedit]]
+and a whitelist of OpenIDs in `locked_pages`...)
+
+--[[schmonz]]
-- 
cgit v1.2.3


From ba1565acc1c92ce409aa341cd14102675f222183 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 1 Jan 2010 18:48:00 -0500
Subject: plugin names are always lowercase

---
 doc/usage.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 4ee935f73..e4808d4c2 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -249,8 +249,8 @@ also be configured using a setup file.
 
   Makes ikiwiki look in the specified directory first, before the regular
   locations when loading library files and plugins. For example, if you set
-  libdir to "/home/you/.ikiwiki/", you can install a Foo.pm plugin as
-  "/home/you/.ikiwiki/IkiWiki/Plugin/Foo.pm".
+  libdir to "/home/you/.ikiwiki/", you can install a foo.pm plugin as
+  "/home/you/.ikiwiki/IkiWiki/Plugin/foo.pm".
 
 * --discussion, --no-discussion
 
-- 
cgit v1.2.3


From 59277c9b6b6461d7097db12b1ed06c1a6a58ec17 Mon Sep 17 00:00:00 2001
From: Torsten Veller <tove@gentoo.org>
Date: Sat, 2 Jan 2010 19:22:25 +0100
Subject: Terminate the arrow entities with ";"

---
 IkiWiki/Plugin/calendar.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 77fd50827..2b87451ce 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -137,7 +137,7 @@ sub format_month (@) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/$pmonth",
 			noimageinline => 1,
-			linktext => "\&larr",
+			linktext => "\&larr;",
 			title => $pmonthname);
 	}
 	add_depends($params{page}, "$archivebase/$pyear/$pmonth",
@@ -146,7 +146,7 @@ sub format_month (@) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/$nmonth",
 			noimageinline => 1,
-			linktext => "\&rarr",
+			linktext => "\&rarr;",
 			title => $nmonthname);
 	}
 	add_depends($params{page}, "$archivebase/$nyear/$nmonth",
-- 
cgit v1.2.3


From ed67ff3b844f54392a4eb46cf7da297e7da61126 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 2 Jan 2010 15:12:05 -0500
Subject: add tove

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 293446772..d21a282e4 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -54,6 +54,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[bbb]] `http://git.boulgour.com/bbb/ikiwiki.git`
 * [[KathrynAndersen]] `git://github.com/rubykat/ikiplugins.git`
 * [[ktf]] `git://github.com/ktf/ikiwiki.git`
+* [[tove]] `git://github.com/tove/ikiwiki.git`
 
 
 ## branches
-- 
cgit v1.2.3


From 7dd074e2e712c67c8c1a26841a69281fa9d293cb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 2 Jan 2010 15:42:20 -0500
Subject: Fix several places that did not properly handle capitalization of the
 discussionpage setting.

Specifically, fixes discussion actions on discussion pages, and unbreaks the opendiscussion plugin.
---
 IkiWiki/Plugin/inline.pm                   | 4 ++--
 IkiWiki/Plugin/opendiscussion.pm           | 2 +-
 IkiWiki/Render.pm                          | 2 +-
 debian/changelog                           | 7 ++++++-
 doc/bugs/disable_sub-discussion_pages.mdwn | 3 +++
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 17d1611db..ec99300b3 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -357,9 +357,9 @@ sub preprocess_inline (@) {
 					my $file = $pagesources{$page};
 					my $type = pagetype($file);
 					if ($config{discussion}) {
-						if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+						if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
 						    (length $config{cgiurl} ||
-						     exists $pagesources{$page."/".$config{discussionpage}})) {
+						     exists $pagesources{$page."/".lc($config{discussionpage})})) {
 							$template->param(have_actions => 1);
 							$template->param(discussionlink =>
 								htmllink($page,
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 1bec4b013..4517ff88b 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -23,7 +23,7 @@ sub canedit ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
-	return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/;
+	return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i;
 	return undef;
 }
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 308d60ed0..c82d8a35a 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -92,7 +92,7 @@ sub genpage ($$) {
 		$actions++;
 	}
 	if ($config{discussion}) {
-		if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+		if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
 		   (length $config{cgiurl} ||
 		    exists $links{$page."/".$config{discussionpage}})) {
 			$template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));
diff --git a/debian/changelog b/debian/changelog
index 4ad346c13..bccb8b797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-ikiwiki (3.20091219) UNRELEASED; urgency=low
+ikiwiki (3.20100102.3) UNRELEASED; urgency=low
+
+  Happy palindrome day!
 
   * pagestats: Add show parameter. Closes: #562129 (David Paleino)
   * toc: Add startlevel parameter. (kerravonsen)
@@ -14,6 +16,9 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low
   * linkmap: Add option to omit disconnected pages from the map.
   * inline: Fix bug that limited displayed pages when feedshow was
     specified w/o show.
+  * Fix several places that did not properly handle capitalization of
+    the discussionpage setting. Specifically, fixes discussion actions
+    on discussion pages, and unbreaks the opendiscussion plugin.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
 
diff --git a/doc/bugs/disable_sub-discussion_pages.mdwn b/doc/bugs/disable_sub-discussion_pages.mdwn
index 233a377f1..39d9ba528 100644
--- a/doc/bugs/disable_sub-discussion_pages.mdwn
+++ b/doc/bugs/disable_sub-discussion_pages.mdwn
@@ -9,6 +9,9 @@ I do want discussion subpage, but I don't want to have, for example: discussion/
 >> This bug appears to have returned. For example,
 >> [[plugins/contrib/unixauth/discussion]] has a Discussion link. -- [[schmonz]]
 
+>>> Lots of case issues this time. Audited for and fixed them all. [[done]]
+>>> --[[Joey]] 
+
 >>> Joey, I've just seen that you closed that bug in ikiwiki 1.37, but it seems
 >>> you fixed it only for English "discussion" page. The bug still occurs
 >>> for the international "discussion" pages. I have backported ikiwiki 1.40
-- 
cgit v1.2.3


From 387e1cc141e474513dcc4429381ffdb147c59e38 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 2 Jan 2010 16:49:42 -0500
Subject: html5 note

---
 doc/todo/Add_label_to_search_form_input_field.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Add_label_to_search_form_input_field.mdwn b/doc/todo/Add_label_to_search_form_input_field.mdwn
index e4e83428c..51b34927d 100644
--- a/doc/todo/Add_label_to_search_form_input_field.mdwn
+++ b/doc/todo/Add_label_to_search_form_input_field.mdwn
@@ -47,4 +47,8 @@ The patch below adds a label for the field to improve usability:
 > to get it to appear higher up is to put it first, or to use Evil absolute
 > positioning. (CSS sucks.) --[[Joey]]
 
-[[!tag done wishlist]]
+> Update: html5 allows just adding `placeholder="Search"` to the input
+> element. already works in eg, chromium. However, ikiwiki does not use
+> html5 yet. --[[Joey]] 
+
+[[!tag wishlist html5]]
-- 
cgit v1.2.3


From 9fdb9561dc7e5c9e50f0fc25995f3fefd5c72980 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 2 Jan 2010 21:54:07 -0500
Subject: releasing version 3.20100102.3

---
 debian/changelog |  4 ++--
 ikiwiki.spec     |  2 +-
 po/ikiwiki.pot   | 21 +++++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bccb8b797..02d3ec65b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100102.3) UNRELEASED; urgency=low
+ikiwiki (3.20100102.3) unstable; urgency=low
 
   Happy palindrome day!
 
@@ -20,7 +20,7 @@ ikiwiki (3.20100102.3) UNRELEASED; urgency=low
     the discussionpage setting. Specifically, fixes discussion actions
     on discussion pages, and unbreaks the opendiscussion plugin.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 02 Jan 2010 21:46:16 -0500
 
 ikiwiki (3.20091218) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index eb6e5d039..78c32b962 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20091218
+Version: 3.20100102.3
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index bf78ec046..38a464141 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-18 20:48-0500\n"
+"POT-Creation-Date: 2010-01-02 21:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -224,36 +224,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr ""
 
@@ -440,7 +440,8 @@ msgstr ""
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:102 ../IkiWiki/Plugin/linkmap.pm:109
+#: ../IkiWiki/Plugin/linkmap.pm:113 ../IkiWiki/Plugin/linkmap.pm:116
 msgid "failed to run dot"
 msgstr ""
 
-- 
cgit v1.2.3


From b7bb8cdca52c00cded75510c0e6d9869f256c288 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 2 Jan 2010 21:55:24 -0500
Subject: add news item for ikiwiki 3.20100102.3

---
 doc/news/version_3.20091023.mdwn   |  3 ---
 doc/news/version_3.20100102.3.mdwn | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
 delete mode 100644 doc/news/version_3.20091023.mdwn
 create mode 100644 doc/news/version_3.20100102.3.mdwn

diff --git a/doc/news/version_3.20091023.mdwn b/doc/news/version_3.20091023.mdwn
deleted file mode 100644
index 1d4167a1a..000000000
--- a/doc/news/version_3.20091023.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-ikiwiki 3.20091023 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * inline: Fix raw mode. Closes: #[552114](http://bugs.debian.org/552114)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100102.3.mdwn b/doc/news/version_3.20100102.3.mdwn
new file mode 100644
index 000000000..9e03e5623
--- /dev/null
+++ b/doc/news/version_3.20100102.3.mdwn
@@ -0,0 +1,20 @@
+ikiwiki 3.20100102.3 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   Happy palindrome day!
+   * pagestats: Add show parameter. Closes: #[562129](http://bugs.debian.org/562129) (David Paleino)
+   * toc: Add startlevel parameter. (kerravonsen)
+   * Remove example ikiwiki setup file from the Debian package. This
+     re-enables linking to /usr/share/ikiwiki/examples which has the
+     example sites also used by auto-blog.setup. The example setup file
+     can be generated at any time using ikiwiki --dumpsetup so I do
+     not see a reason to ship it. Closes: #[562183](http://bugs.debian.org/562183)
+   * Use env hack in python scripts.
+   * comments: Add a checksum to the name of comment pages, to
+     avoid merge conflicts when comments are posted to two branches of a
+     site.
+   * linkmap: Add option to omit disconnected pages from the map.
+   * inline: Fix bug that limited displayed pages when feedshow was
+     specified w/o show.
+   * Fix several places that did not properly handle capitalization of
+     the discussionpage setting. Specifically, fixes discussion actions
+     on discussion pages, and unbreaks the opendiscussion plugin."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 9af117325a10738daa553a30c1d33fac7d115ab4 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Sun, 3 Jan 2010 03:24:18 +0000
Subject: insert linebreak so list renders properly

---
 doc/news/version_3.20100102.3.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/news/version_3.20100102.3.mdwn b/doc/news/version_3.20100102.3.mdwn
index 9e03e5623..b8f61978c 100644
--- a/doc/news/version_3.20100102.3.mdwn
+++ b/doc/news/version_3.20100102.3.mdwn
@@ -1,6 +1,7 @@
 ikiwiki 3.20100102.3 released with [[!toggle text="these changes"]]
 [[!toggleable text="""
    Happy palindrome day!
+
    * pagestats: Add show parameter. Closes: #[562129](http://bugs.debian.org/562129) (David Paleino)
    * toc: Add startlevel parameter. (kerravonsen)
    * Remove example ikiwiki setup file from the Debian package. This
@@ -17,4 +18,4 @@ ikiwiki 3.20100102.3 released with [[!toggle text="these changes"]]
      specified w/o show.
    * Fix several places that did not properly handle capitalization of
      the discussionpage setting. Specifically, fixes discussion actions
-     on discussion pages, and unbreaks the opendiscussion plugin."""]]
\ No newline at end of file
+     on discussion pages, and unbreaks the opendiscussion plugin."""]]
-- 
cgit v1.2.3


From a27fad48d45084421a74fc6d24ffc061cc6c66ca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 3 Jan 2010 14:12:26 -0500
Subject: response

---
 doc/bugs/anonok_vs._httpauth.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 90c8c74c9..d63e365c1 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -8,3 +8,11 @@ required for those.
 and a whitelist of OpenIDs in `locked_pages`...)
 
 --[[schmonz]]
+
+> The only way I can see to support this combination is for httpauth with
+> cgiauthurl to work more like other actual login types. Which would mean
+> that on editing a page that needs authentication, ikiwiki would redirect
+> them to the Signin page, which would then have a link they could follow
+> to bounce through the cgiauthurl and actually sign in. This would be
+> significantly different than the regular httpauth process, in which the
+> user signs in in passing. --[[Joey]]
-- 
cgit v1.2.3


From 0fae8d8b69ab191f98608f1dad224a6c6f99d858 Mon Sep 17 00:00:00 2001
From: Sjoerd <Sjoerd@web>
Date: Sun, 3 Jan 2010 21:37:37 +0000
Subject:

---
 ...plugin_sets_editurl_even_when_editpage_is_disabled.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html

diff --git a/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html b/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html
new file mode 100644
index 000000000..e4e37b34a
--- /dev/null
+++ b/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html
@@ -0,0 +1,14 @@
+see subject, simple patch below
+<pre>
+--- a/IkiWiki/Plugin/inline.pm
++++ b/IkiWiki/Plugin/inline.pm
+@@ -371,7 +371,8 @@ sub preprocess_inline (@) {
+          }
+          if (length $config{cgiurl} && defined $type) {
+            $template->param(have_actions => 1);
+-           $template->param(editurl => cgiurl(do => "edit", page => $page));
++           $template->param(editurl => cgiurl(do => "edit", page => $page))
++             if IkiWiki->can("cgi_editpage");
+          }
+        }
+</pre>
-- 
cgit v1.2.3


From 208c7b7ca243717ace469abc234a22c53dbba9be Mon Sep 17 00:00:00 2001
From: "http://adam.shand.net/" <http://adam.shand.net/@web>
Date: Mon, 4 Jan 2010 09:42:29 +0000
Subject:

---
 doc/news/code_swarm/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/news/code_swarm/discussion.mdwn

diff --git a/doc/news/code_swarm/discussion.mdwn b/doc/news/code_swarm/discussion.mdwn
new file mode 100644
index 000000000..427fb7dc8
--- /dev/null
+++ b/doc/news/code_swarm/discussion.mdwn
@@ -0,0 +1 @@
+Looks like ImageMagick isn't install on the new server! :-) -- AdamShand
-- 
cgit v1.2.3


From d96a5d9a7325d48524b3cb762fadcd3a08d1ce33 Mon Sep 17 00:00:00 2001
From: "http://adam.shand.net/" <http://adam.shand.net/@web>
Date: Mon, 4 Jan 2010 10:22:02 +0000
Subject:

---
 doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn

diff --git a/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn b/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn
new file mode 100644
index 000000000..a774cef16
--- /dev/null
+++ b/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn
@@ -0,0 +1,5 @@
+Using the img plugin to inline an image, the "align" parameter doesn't work as expected if you also include a "caption".
+
+As best as I can tell this is because the "caption" parameter works by wrapping the image inside a table which means that the "align" parameter is aligning within the table cell rather then the page itself.
+
+-- AdamShand
-- 
cgit v1.2.3


From a20b07b54b66e36e88201788295b4c59211c3188 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 12:47:54 -0500
Subject: responses

---
 doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn | 2 ++
 doc/news/code_swarm/discussion.mdwn                           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn b/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn
index a774cef16..6500600f3 100644
--- a/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn
+++ b/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn
@@ -3,3 +3,5 @@ Using the img plugin to inline an image, the "align" parameter doesn't work as e
 As best as I can tell this is because the "caption" parameter works by wrapping the image inside a table which means that the "align" parameter is aligning within the table cell rather then the page itself.
 
 -- AdamShand
+
+> I agree, this is annoying. --[[Joey]] 
diff --git a/doc/news/code_swarm/discussion.mdwn b/doc/news/code_swarm/discussion.mdwn
index 427fb7dc8..3ecc81b86 100644
--- a/doc/news/code_swarm/discussion.mdwn
+++ b/doc/news/code_swarm/discussion.mdwn
@@ -1 +1,3 @@
 Looks like ImageMagick isn't install on the new server! :-) -- AdamShand
+
+> Thanks for pointing out problem, fixed now. --[[Joey]] 
-- 
cgit v1.2.3


From 4c89a2693484d014c296131c58f662b62800b636 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 12:51:45 -0500
Subject: fix actions accounting

---
 IkiWiki/Render.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c82d8a35a..3ebb1a324 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -78,11 +78,14 @@ sub genpage ($$) {
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
-		$template->param(editurl => cgiurl(do => "edit", page => $page))
-			if IkiWiki->can("cgi_editpage");
-		$template->param(prefsurl => cgiurl(do => "prefs"))
-			if exists $hooks{auth};
-		$actions++;
+		if (IkiWiki->can("cgi_editpage")) {
+			$template->param(editurl => cgiurl(do => "edit", page => $page));
+			$actions++;
+		}
+		if (exists $hooks{auth}) {
+			$template->param(prefsurl => cgiurl(do => "prefs"));
+			$actions++;
+		}
 	}
 		
 	if (defined $config{historyurl} && length $config{historyurl}) {
-- 
cgit v1.2.3


From aed16b4833f98eda566f75b6a1a679febc1ba5ff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 12:54:18 -0500
Subject: inline: Avoid showing edit links if page editing is disabled.
 (Sjoerd)

---
 IkiWiki/Plugin/inline.pm                                           | 5 ++++-
 debian/changelog                                                   | 7 +++++++
 .../inline_plugin_sets_editurl_even_when_editpage_is_disabled.html | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index ec99300b3..401852513 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -369,9 +369,12 @@ sub preprocess_inline (@) {
 									forcesubpage => 1));
 						}
 					}
-					if (length $config{cgiurl} && defined $type) {
+					if (length $config{cgiurl} &&
+					    defined $type &&
+					    IkiWiki->can("cgi_editpage")) {
 						$template->param(have_actions => 1);
 						$template->param(editurl => cgiurl(do => "edit", page => $page));
+
 					}
 				}
 	
diff --git a/debian/changelog b/debian/changelog
index 02d3ec65b..df3490640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100104) UNRELEASED; urgency=low
+
+  * inline: Avoid showing edit links if page editing is disabled.
+    (Sjoerd)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
+
 ikiwiki (3.20100102.3) unstable; urgency=low
 
   Happy palindrome day!
diff --git a/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html b/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html
index e4e37b34a..62c91a932 100644
--- a/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html
+++ b/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html
@@ -12,3 +12,5 @@ see subject, simple patch below
           }
         }
 </pre>
+
+[[done]] --[[Joey]]
-- 
cgit v1.2.3


From f8bd25bfc7c590abbd31f42bb4d745d43c3d7f14 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 14:56:04 -0500
Subject: signinedit: Auto-disable the plugin when all authentication methods
 are disabled.

---
 IkiWiki/Plugin/signinedit.pm | 1 +
 debian/changelog             | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index 032a0034c..8b44a68f7 100644
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -29,6 +29,7 @@ sub canedit ($$$) {
 	# signin can override this.
         if (! defined $session->param("name") ||
             ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+	        return "" unless exists $IkiWiki::hooks{auth};
 		return sub { IkiWiki::needsignin($cgi, $session) };
 	}
 	else {
diff --git a/debian/changelog b/debian/changelog
index df3490640..aa4f1ac3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
 
   * inline: Avoid showing edit links if page editing is disabled.
     (Sjoerd)
+  * signinedit: Auto-disable the plugin when all authentication methods
+    are disabled.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
-- 
cgit v1.2.3


From ae493178cf58cf5d7edfa30ccabe758b06febcb4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 15:01:25 -0500
Subject: lockedit: Detect if no authentication plugins are enabled, and die
 with an error message as this configuration does not make sense.

---
 IkiWiki/Plugin/lockedit.pm | 7 +++++++
 debian/changelog           | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 0fa329251..8914ba498 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -7,6 +7,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "lockedit", call => \&getsetup);
+	hook(type => "checkconfig", id => "lockedit", call => \&checkconfig);
 	hook(type => "canedit", id => "lockedit", call => \&canedit);
 }
 
@@ -26,6 +27,12 @@ sub getsetup () {
 		},
 }
 
+sub checkconfig () {
+	if (! exists $IkiWiki::hooks{auth}) {
+		error gettext("lockedit plugin is enabled, but no authentication plugins are enabled");
+	}
+}
+
 sub canedit ($$) {
 	my $page=shift;
 	my $cgi=shift;
diff --git a/debian/changelog b/debian/changelog
index aa4f1ac3c..2c121ef54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
     (Sjoerd)
   * signinedit: Auto-disable the plugin when all authentication methods
     are disabled.
+  * lockedit: Detect if no authentication plugins are enabled, and
+    die with an error message as this configuration does not make sense.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
-- 
cgit v1.2.3


From 3e6331127b57fe4f3e48d3cf10536b2f2b70eefb Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Tue, 5 Jan 2010 00:29:37 +0000
Subject: response

---
 doc/bugs/anonok_vs._httpauth.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index d63e365c1..688274d67 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -16,3 +16,11 @@ and a whitelist of OpenIDs in `locked_pages`...)
 > to bounce through the cgiauthurl and actually sign in. This would be
 > significantly different than the regular httpauth process, in which the
 > user signs in in passing. --[[Joey]]
+
+>> My primary userbase has grown accustomed to the seamlessness of
+>> httpauth with SPNEGO, so I'd rather not reintroduce a seam into
+>> their web-editing experience in order to let relatively few outsiders
+>> edit relatively few pages. When is the decision made about whether
+>> the current page can be edited by the current user (if any)? What
+>> if there were a way to require particular auth plugins for particular
+>> PageSpecs? --[[schmonz]]
-- 
cgit v1.2.3


From 264f46989470db93293938e327744554b5177f82 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 19:40:33 -0500
Subject: lockedit can make sense with no auth plugins

On second though, you might want a wide-open wiki with some locked
pages that cannot be edited online.

So, the right thing for lockedit to do when there are no auth plugins is
to just say the page cannot be edited.
---
 IkiWiki/Plugin/lockedit.pm | 12 +++---------
 debian/changelog           |  2 --
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 8914ba498..74ddbb153 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -7,7 +7,6 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "lockedit", call => \&getsetup);
-	hook(type => "checkconfig", id => "lockedit", call => \&checkconfig);
 	hook(type => "canedit", id => "lockedit", call => \&canedit);
 }
 
@@ -27,12 +26,6 @@ sub getsetup () {
 		},
 }
 
-sub checkconfig () {
-	if (! exists $IkiWiki::hooks{auth}) {
-		error gettext("lockedit plugin is enabled, but no authentication plugins are enabled");
-	}
-}
-
 sub canedit ($$) {
 	my $page=shift;
 	my $cgi=shift;
@@ -46,8 +39,9 @@ sub canedit ($$) {
 		    user => $session->param("name"),
 		    ip => $ENV{REMOTE_ADDR},
 	    )) {
-		if (! defined $user ||
-		    ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+		if ((! defined $user ||
+		    ! IkiWiki::userinfo_get($session->param("name"), "regdate")) &&
+		    exists $IkiWiki::hooks{auth}) {
 			return sub { IkiWiki::needsignin($cgi, $session) };
 		}
 		else {
diff --git a/debian/changelog b/debian/changelog
index 2c121ef54..aa4f1ac3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
     (Sjoerd)
   * signinedit: Auto-disable the plugin when all authentication methods
     are disabled.
-  * lockedit: Detect if no authentication plugins are enabled, and
-    die with an error message as this configuration does not make sense.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
-- 
cgit v1.2.3


From 2a717f36ef89d062a359813cdebb2f2e30e4343e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 19:51:37 -0500
Subject: response

---
 doc/bugs/anonok_vs._httpauth.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 688274d67..0015627b0 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -24,3 +24,13 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >> the current page can be edited by the current user (if any)? What
 >> if there were a way to require particular auth plugins for particular
 >> PageSpecs? --[[schmonz]]
+
+>>> The decision about whether a user can edit a page is made by plugins
+>>> such as signinedit and lockedit, that also use canedit hooks to redirect
+>>> the user to a signin page if necessary.
+>>> 
+>>> A tweak on my earlier suggestion would be to have httpauth notice when the 
+>>> Signin page is being built and immediatly redirect to the cgiauthurl
+>>> before the page can be shown to the user. This would, though, not play
+>>> well with other authentication methods like openid, since the user
+>>> would never see the Signin form. --[[Joey]]
-- 
cgit v1.2.3


From f96a7b775617596f16252f9b8be7cf1761c24da0 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Tue, 5 Jan 2010 01:16:17 +0000
Subject: response

---
 doc/bugs/anonok_vs._httpauth.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 0015627b0..57ab95985 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -34,3 +34,7 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >>> before the page can be shown to the user. This would, though, not play
 >>> well with other authentication methods like openid, since the user
 >>> would never see the Signin form. --[[Joey]]
+
+>>>> Would I be able to do what I want with a local plugin that
+>>>> knows my auth requirements and abuses canedit -- e.g., if the page
+>>>> matches */Discussion, redirect to Signin form, else httpauth? --[[schmonz]]
-- 
cgit v1.2.3


From cd4616e39473a76854158fe3dfd1fc995389e1bc Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Tue, 5 Jan 2010 01:22:24 +0000
Subject: clarify my horrible idea

---
 doc/bugs/anonok_vs._httpauth.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 57ab95985..8cebfec90 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -36,5 +36,6 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >>> would never see the Signin form. --[[Joey]]
 
 >>>> Would I be able to do what I want with a local plugin that
->>>> knows my auth requirements and abuses canedit -- e.g., if the page
->>>> matches */Discussion, redirect to Signin form, else httpauth? --[[schmonz]]
+>>>> abuses canedit (and auth) to reach in and call the appropriate
+>>>> plugin's auth method -- e.g., if the page matches */Discussion,
+>>>> call `openid:auth()`, else `httpauth:auth()`? --[[schmonz]]
-- 
cgit v1.2.3


From f5bdfc29ee32446fcad4ad2ccc82e109445f4755 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 20:22:32 -0500
Subject: response

---
 doc/bugs/anonok_vs._httpauth.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 57ab95985..66a68032f 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -38,3 +38,10 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >>>> Would I be able to do what I want with a local plugin that
 >>>> knows my auth requirements and abuses canedit -- e.g., if the page
 >>>> matches */Discussion, redirect to Signin form, else httpauth? --[[schmonz]]
+
+>>>>> If you wanted users to need to login with openid or passwordauth
+>>>>> for discussion pages, you could do that. That seems it would be
+>>>>> annoying for httpauth users (who were not current authed) though,
+>>>>> as they would then see the openid signin form. 
+>>>>> 
+>>>>> --[[Joey]]
-- 
cgit v1.2.3


From 5fdceb49b174fb2ece7cef07479413059f1982c7 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Tue, 5 Jan 2010 01:41:13 +0000
Subject: response

---
 doc/bugs/anonok_vs._httpauth.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 1bf9a3750..e386a8d96 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -45,3 +45,12 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >>>>> as they would then see the openid signin form when going to edit a
 >>>>> Discussion page.
 >>>>> --[[Joey]]
+
+>>>>>> I finally see the problem, I think. When you initially
+>>>>>> suggested "a link they could follow to bounce through the
+>>>>>> cgiauthurl", presumably this could _be_ the Edit link for
+>>>>>> non-Discussion pages, so that the typical case of an httpauth
+>>>>>> user editing an editable-only-by-httpauth page doesn't visibly
+>>>>>> change. And then the Edit link for Discussion subpages could do
+>>>>>> as you suggest, adding one click for the httpauth user, who won't
+>>>>>> often need to edit those subpages. --[[schmonz]]
-- 
cgit v1.2.3


From d78e8ee45275060d70686e540c94aa5aa47d9f31 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 20:51:40 -0500
Subject: comments: Fix permalinks for comments using new conflict-free
 filenames.

---
 IkiWiki/Plugin/comments.pm | 2 +-
 debian/changelog           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6340fc2cb..5586cca52 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -224,7 +224,7 @@ sub preprocess {
 		$pagestate{$page}{meta}{title} = $params{subject};
 	}
 
-	if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
+	if ($params{page} =~ m/\/\Q$config{comments_pagename}\E\d+_/) {
 		$pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page}), undef, 1).
 			"#".page_to_id($params{page});
 	}
diff --git a/debian/changelog b/debian/changelog
index aa4f1ac3c..f36580d26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
     (Sjoerd)
   * signinedit: Auto-disable the plugin when all authentication methods
     are disabled.
+  * comments: Fix permalinks for comments using new conflict-free filenames.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
-- 
cgit v1.2.3


From 73420c24c626a957050d1537a8aed0b8114386a0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 21:00:58 -0500
Subject: lowercase "or Signin"

---
 templates/editcomment.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 545edb596..32e8c392d 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -7,7 +7,7 @@
 <TMPL_UNLESS NAME=USERNAME>
 <TMPL_IF NAME=ALLOWAUTHOR>
 Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional, or
-<a href="<TMPL_VAR SIGNINURL>">Signin</a>)<br />
+<a href="<TMPL_VAR SIGNINURL>">signin</a>)<br />
 Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
 <TMPL_ELSE>
 (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)<br />
-- 
cgit v1.2.3


From 5a2ffaca16cd31db7fd4ba8ed709aeff75ef8b42 Mon Sep 17 00:00:00 2001
From: "http://salas.livejournal.com/" <http://salas.livejournal.com/@web>
Date: Tue, 5 Jan 2010 04:33:34 +0000
Subject:

---
 doc/tips/optimising_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index cf166998b..5840f2eba 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -168,7 +168,7 @@ Finally, let's think about how huge number of pages can affect ikiwiki.
   quickly, but still, lots more pages will make PageSpecs more expensive.
 
 * The backlinks calculation has to consider every link on every page
-  in the wiki. (In practice, most pages only like to at most a few dozen
+  in the wiki. (In practice, most pages only link to at most a few dozen
   other pages, so this is not a `O(N^2)`, but closer to `O(N)`.)
 
 * Ikiwiki also reads and writes an `index` file, which contains information
-- 
cgit v1.2.3


From e0590970b66409c9d31dee6301695a5a8f77cc18 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 23:39:14 -0500
Subject: fix link

---
 doc/tips/optimising_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index 5840f2eba..f0ce1b0c3 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -64,7 +64,7 @@ smaller.
 	
 	\[[!inline pages="blog/* and link(tag)" show=0 archive=yes quick=yes]]
 
-Only downsides: This won't show titles set by the [[!ikiwiki/directive/meta]]
+Only downsides: This won't show titles set by the [[ikiwiki/directive/meta]]
 directive. And there's no RSS feed for users to use -- but if this page
 is only for the archives or tag for your blog, users should be subscribing
 to the blog's main page's RSS feed instead.
-- 
cgit v1.2.3


From e22b1d05214ee90e7424f856dae43a35902950cf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 23:40:19 -0500
Subject: fix link

---
 doc/tips/optimising_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index f0ce1b0c3..14d619ff8 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -85,7 +85,7 @@ The resulting html file might get big and expensive to generate as you
 keep adding pages.
 
 First, consider removing the "show=title". Then the map will not show page
-titles set by the [[!ikiwiki/directive/meta]] directive -- but will also
+titles set by the [[ikiwiki/directive/meta]] directive -- but will also
 only need to be generated when pages are added or removed, not for every
 page change.
 
-- 
cgit v1.2.3


From 86e05970ac1ab2442e3d64d9e6238647c950c0fb Mon Sep 17 00:00:00 2001
From: Enno <Enno@web>
Date: Tue, 5 Jan 2010 19:23:16 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index aa4b4b4e6..0ebab313d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -49,6 +49,7 @@ Projects & Organizations
 * [Tinc VPN](http://tinc-vpn.org/)
 * [The XCB library](http://xcb.freedesktop.org/)
 * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
+* [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 66af1428f04d8b709be5854bb1fa74da7b25fb2d Mon Sep 17 00:00:00 2001
From: "http://j9werdf.myid.net/" <http://j9werdf.myid.net/@web>
Date: Wed, 6 Jan 2010 17:12:42 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index e23c6330b..f1a6ed3b4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -74,3 +74,4 @@ bar
 
 [[!toggle  id="foobar" text="foo/bar"]]
 
+Hmm, can I dig it?
-- 
cgit v1.2.3


From 4bda18a50aab714e72fce347cb4cff32316e55de Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Tue, 5 Jan 2010 15:23:22 +0100
Subject: Support align attribute for img with caption

This is achieved by preparing CSS definitions that emulates the behavior
of the align attribute, and passing it to the outermost IMG wrapper
(A or TABLE) instead of passing the align value to IMG directly.
---
 IkiWiki/Plugin/img.pm | 21 ++++++++++++++++-----
 doc/style.css         | 20 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 32023fa97..6f1919ea0 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -155,16 +155,23 @@ sub preprocess (@) {
 		'" height="'.$dheight.'"'.
 		(exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
 		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
-		(exists $params{align} ? ' align="'.$params{align}.'"' : '').
 		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
 		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
 		' />';
 
 	if (! defined $params{link} || lc($params{link}) eq 'yes') {
-		$imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
+		if (exists $params{caption} || !exists $params{align}) {
+			$imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
+		} else {
+			$imgtag='<a href="'.$fileurl.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
+		}
 	}
 	elsif ($params{link} =~ /^\w+:\/\//) {
-		$imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
+		if (exists $params{caption} || !exists $params{align}) {
+			$imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
+		} else {
+			$imgtag='<a href="'.$params{link}.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
+		}
 	}
 	else {
 		my $b = bestlink($params{page}, $params{link});
@@ -173,12 +180,16 @@ sub preprocess (@) {
 			add_depends($params{page}, $b, deptype("presence"));
 			$imgtag=htmllink($params{page}, $params{destpage},
 				$params{link}, linktext => $imgtag,
-				noimageinline => 1);
+				noimageinline => 1,
+				(exists $params{caption} || !exists $params{align}) ?
+					() : (class => 'align-'.$params{align}));
 		}
 	}
 
 	if (exists $params{caption}) {
-		return '<table class="img">'.
+		return '<table class="img'.
+			(exists $params{align} ? ' align-'.$params{align} : '').
+			'">'.
 			'<caption>'.$params{caption}.'</caption>'.
 			'<tr><td>'.$imgtag.'</td></tr>'.
 			'</table>';
diff --git a/doc/style.css b/doc/style.css
index be86a0818..c56494fff 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -82,6 +82,26 @@ div.tags {
 	text-align: center;
 }
 
+.align-left {
+	float:left;
+}
+
+.align-right {
+	float:right;
+}
+
+.align-top {
+	vertical-align:top;
+}
+
+.align-bottom {
+	vertical-align:bottom;
+}
+
+.align-middle {
+	vertical-align:middle;
+}
+
 #backlinks {
 	margin-top: 1em;
 }
-- 
cgit v1.2.3


From a250a55baaf86c6c8ebc35f908a9fc2e3c7526b4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 6 Jan 2010 15:34:35 -0500
Subject: add repo

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index d21a282e4..5167ad004 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -55,6 +55,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[KathrynAndersen]] `git://github.com/rubykat/ikiplugins.git`
 * [[ktf]] `git://github.com/ktf/ikiwiki.git`
 * [[tove]] `git://github.com/tove/ikiwiki.git`
+* [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki`
 
 
 ## branches
-- 
cgit v1.2.3


From 436e29731026194e961ed0f11e85517308a400d9 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Thu, 7 Jan 2010 09:40:10 +0000
Subject: seasons greatings, polite nudge

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 62317ba1a..99a9cf1e2 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -178,3 +178,8 @@ definitions essentially.
      * title
 
 -- [[Jon]]
+
+>>> Merry Christmas/festive season/happy new year folks. I've been away from
+>>> ikiwiki for the break, and now I've returned to watching recentchanges.
+>>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have
+>>> you had a chance to look at this yet? -- [[Jon]]
-- 
cgit v1.2.3


From e68cce6d1d51a513f54ab7d7e77e7c249aad3c06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 7 Jan 2010 15:12:17 -0500
Subject: brace style

---
 IkiWiki/Plugin/img.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 6f1919ea0..83f003629 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -162,14 +162,16 @@ sub preprocess (@) {
 	if (! defined $params{link} || lc($params{link}) eq 'yes') {
 		if (exists $params{caption} || !exists $params{align}) {
 			$imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
-		} else {
+		}
+		else {
 			$imgtag='<a href="'.$fileurl.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
 		}
 	}
 	elsif ($params{link} =~ /^\w+:\/\//) {
 		if (exists $params{caption} || !exists $params{align}) {
 			$imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
-		} else {
+		}
+		else {
 			$imgtag='<a href="'.$params{link}.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
 		}
 	}
-- 
cgit v1.2.3


From 253b1a41c1fec81e536840decfc9ea1645a41782 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 7 Jan 2010 15:36:49 -0500
Subject: refactor

---
 IkiWiki/Plugin/img.pm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 83f003629..845a4bf36 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -159,21 +159,20 @@ sub preprocess (@) {
 		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
 		' />';
 
+	my $alignclass=exists $params{align} ? "align-$params{align}" : "";
+
+	my $link;
 	if (! defined $params{link} || lc($params{link}) eq 'yes') {
-		if (exists $params{caption} || !exists $params{align}) {
-			$imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
-		}
-		else {
-			$imgtag='<a href="'.$fileurl.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
-		}
+		$link=$fileurl;
 	}
 	elsif ($params{link} =~ /^\w+:\/\//) {
-		if (exists $params{caption} || !exists $params{align}) {
-			$imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
-		}
-		else {
-			$imgtag='<a href="'.$params{link}.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
-		}
+		$link=$params{link};
+	}
+
+	if (defined $link) {
+		$imgtag='<a href="'.$link.'"'.
+			(!exists $params{caption} && $alignclass ? ' class="'.$alignclass.'"' : '').
+			'>'.$imgtag.'</a>';
 	}
 	else {
 		my $b = bestlink($params{page}, $params{link});
@@ -183,14 +182,15 @@ sub preprocess (@) {
 			$imgtag=htmllink($params{page}, $params{destpage},
 				$params{link}, linktext => $imgtag,
 				noimageinline => 1,
-				(exists $params{caption} || !exists $params{align}) ?
-					() : (class => 'align-'.$params{align}));
+				(!exists $params{caption} && $alignclass) ?
+					(class => $alignclass) : (),
+			);
 		}
 	}
 
 	if (exists $params{caption}) {
 		return '<table class="img'.
-			(exists $params{align} ? ' align-'.$params{align} : '').
+			($alignclass ? ' '.$alignclass : '').
 			'">'.
 			'<caption>'.$params{caption}.'</caption>'.
 			'<tr><td>'.$imgtag.'</td></tr>'.
-- 
cgit v1.2.3


From e31cb975a70c43f22b2fff5d11a7ee64820c8115 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 7 Jan 2010 15:41:16 -0500
Subject: img: remove special case handling of link=yes

Only exists as an undocumented backwards compatability hack.
---
 IkiWiki/Plugin/img.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 845a4bf36..083061bf6 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -162,7 +162,7 @@ sub preprocess (@) {
 	my $alignclass=exists $params{align} ? "align-$params{align}" : "";
 
 	my $link;
-	if (! defined $params{link} || lc($params{link}) eq 'yes') {
+	if (! defined $params{link}) {
 		$link=$fileurl;
 	}
 	elsif ($params{link} =~ /^\w+:\/\//) {
-- 
cgit v1.2.3


From bde52652152cb4105665f18569fd807b08025d59 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 7 Jan 2010 15:44:32 -0500
Subject: close

---
 debian/changelog                                              | 1 +
 doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f36580d26..4f7c1a60c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
   * signinedit: Auto-disable the plugin when all authentication methods
     are disabled.
   * comments: Fix permalinks for comments using new conflict-free filenames.
+  * img: Support alignment of images with captions. (Giuseppe Bilotta)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
diff --git a/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn b/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn
index 6500600f3..e986bdc82 100644
--- a/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn
+++ b/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn
@@ -4,4 +4,4 @@ As best as I can tell this is because the "caption" parameter works by wrapping
 
 -- AdamShand
 
-> I agree, this is annoying. --[[Joey]] 
+> I agree, this is annoying... and [[done]]! --[[Joey]] 
-- 
cgit v1.2.3


From cf5f1c3a3a74d5d444736e5bbe6ecaf55c523467 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 7 Jan 2010 16:07:47 -0500
Subject: remove align-top/middle/bottom

I think we only need left and right align. The other values including top,
middle, bottom, baseline, absbottom, etc, don't make much sense when
aligning an image that has a caption included. (They're mostly of value
when including a image in a line of text like a word.)
---
 doc/style.css | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index c56494fff..317d4c7aa 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -90,18 +90,6 @@ div.tags {
 	float:right;
 }
 
-.align-top {
-	vertical-align:top;
-}
-
-.align-bottom {
-	vertical-align:bottom;
-}
-
-.align-middle {
-	vertical-align:middle;
-}
-
 #backlinks {
 	margin-top: 1em;
 }
-- 
cgit v1.2.3


From eb30cfb31073bfc6ffeb982f8180d937cc49676d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 7 Jan 2010 16:09:34 -0500
Subject: only use css alignment stuff for table

This way users can use all the other alignment values when not including a
caption. Also, it will work without the standard style, and I don't have to
worry about regressions this way.
---
 IkiWiki/Plugin/img.pm | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 083061bf6..c1048d3c9 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -156,11 +156,10 @@ sub preprocess (@) {
 		(exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
 		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
 		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
+		(exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
 		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
 		' />';
 
-	my $alignclass=exists $params{align} ? "align-$params{align}" : "";
-
 	my $link;
 	if (! defined $params{link}) {
 		$link=$fileurl;
@@ -170,9 +169,7 @@ sub preprocess (@) {
 	}
 
 	if (defined $link) {
-		$imgtag='<a href="'.$link.'"'.
-			(!exists $params{caption} && $alignclass ? ' class="'.$alignclass.'"' : '').
-			'>'.$imgtag.'</a>';
+		$imgtag='<a href="'.$link.'">'.$imgtag.'</a>';
 	}
 	else {
 		my $b = bestlink($params{page}, $params{link});
@@ -182,15 +179,13 @@ sub preprocess (@) {
 			$imgtag=htmllink($params{page}, $params{destpage},
 				$params{link}, linktext => $imgtag,
 				noimageinline => 1,
-				(!exists $params{caption} && $alignclass) ?
-					(class => $alignclass) : (),
 			);
 		}
 	}
 
 	if (exists $params{caption}) {
 		return '<table class="img'.
-			($alignclass ? ' '.$alignclass : '').
+			(exists $params{align} ? " align-$params{align}" : "").
 			'">'.
 			'<caption>'.$params{caption}.'</caption>'.
 			'<tr><td>'.$imgtag.'</td></tr>'.
-- 
cgit v1.2.3


From dfaad14f5364422489dba852b92e0746c35e2c0c Mon Sep 17 00:00:00 2001
From: "http://svend.myopenid.com/" <http://svend.myopenid.com/@web>
Date: Thu, 7 Jan 2010 21:50:11 +0000
Subject: Test commit

---
 doc/sandbox.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index f1a6ed3b4..afd7dbeab 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -75,3 +75,5 @@ bar
 [[!toggle  id="foobar" text="foo/bar"]]
 
 Hmm, can I dig it?
+
+Test
-- 
cgit v1.2.3


From 6257a714077712e818127ed0c68d9a9611d7628f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 7 Jan 2010 23:22:48 +0100
Subject: selflink detection is suboptimal when using the po plugin

---
 doc/todo/Fix_selflink_in_po_plugin.mdwn | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/todo/Fix_selflink_in_po_plugin.mdwn

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
new file mode 100644
index 000000000..ae59e14c2
--- /dev/null
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -0,0 +1,4 @@
+Using the po plugin, a link to /bla is present in the sidebar.
+When viewing /bla in the default language, this link is detected as
+a selflink. When viewing a translation of /bla, it
+isn't. --[[intrigeri]]
-- 
cgit v1.2.3


From dca9634202d9ab28c524068e17928f403ec03a2c Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/lingo.t.l.chen"
 <http://www.google.com/profiles/lingo.t.l.chen@web>
Date: Fri, 8 Jan 2010 14:55:58 +0000
Subject:

---
 doc/bugs/utf-8_bug_in_websetup.pm.mdwn | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 doc/bugs/utf-8_bug_in_websetup.pm.mdwn

diff --git a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
new file mode 100644
index 000000000..efa2c9ffe
--- /dev/null
+++ b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
@@ -0,0 +1,20 @@
+[[!tag patch]]
+
+I type chinese characters into the fields. After press "save setup" button the characters turn into gibberish.
+
+I submit a patch that solve the problem for me.  --Lingo
+
+----
+
+    --- websetup.pm	2009-12-02 05:07:46.000000000 +0800
+    +++ /usr/share/perl5/IkiWiki/Plugin/websetup.pm	2010-01-08 22:05:16.000000000 +0800
+    @@ -308,7 +308,8 @@
+     			$fields{$_}=$shown{$_} foreach keys %shown;
+     		}
+     	}
+    -	
+    +
+    +	IkiWiki::decode_form_utf8($form);	
+     	if ($form->submitted eq "Cancel") {
+     		IkiWiki::redirect($cgi, $config{url});
+     		return;
-- 
cgit v1.2.3


From fa59bfad847a9895a37803bc21fb28a27f0fc368 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/lingo.t.l.chen"
 <http://www.google.com/profiles/lingo.t.l.chen@web>
Date: Sat, 9 Jan 2010 13:56:39 +0000
Subject:

---
 doc/bugs/utf-8_bug_in_websetup.pm.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
index efa2c9ffe..c3a5262cd 100644
--- a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
+++ b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
@@ -1,4 +1,4 @@
-[[!tag patch]]
+[[!tag patch bugs]]
 
 I type chinese characters into the fields. After press "save setup" button the characters turn into gibberish.
 
-- 
cgit v1.2.3


From a8258dea709c801b148635feaa78bf99e077c5a6 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 19:47:32 +0000
Subject: new forum thread

---
 .../link_to_an_image_inside_the_wiki_without_inlining_it.mdwn    | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
new file mode 100644
index 000000000..2ec18d3a5
--- /dev/null
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -0,0 +1,9 @@
+how can I create a link to an image which is part of the wiki, without having it inserted in my page?
+
+I tought this:
+
+[[look at this|img/lolcat.png]] 
+
+would work, but it doesn't.
+
+Any hints?
-- 
cgit v1.2.3


From 3d729ee170ef7a3c1ac5210fd1b648ea1128f73d Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 19:48:19 +0000
Subject: corrected wikilink text

---
 doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 2ec18d3a5..ce7baba50 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -2,7 +2,7 @@ how can I create a link to an image which is part of the wiki, without having it
 
 I tought this:
 
-[[look at this|img/lolcat.png]] 
+    \[[look at this|img/lolcat.png]] 
 
 would work, but it doesn't.
 
-- 
cgit v1.2.3


From a0e06556db4a5c67f1fdf6f6dc4b6d275137b996 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 15:50:40 -0500
Subject: response

---
 ..._image_inside_the_wiki_without_inlining_it.mdwn | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index ce7baba50..f58b6b359 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -7,3 +7,35 @@ I tought this:
 would work, but it doesn't.
 
 Any hints?
+
+> Well, currently the syntax above will display the image
+> inline with the specified link text used as an alt attribute. Although
+> that does not seem to be documented anywhere.
+> 
+> A few places that use that (found with `git grep '\[\[' | egrep 'png|gif|jpeg|jpg' |grep \|`):
+> 
+> * [[logos]] uses it to provide useful alt texts for the logos. (This
+>   could easily be changed to use [[ikiwiki/directives/img]] though.)
+> * The `change.tmpl` template uses it to display 
+>   the [[diff|wikiicons/diff.png]] with a very useful "diff" alt text.
+>   Using [[ikiwiki/directives/img]] here would mean that the
+>   [[ikiwiki/plugins/recentchanges]] plugin would depend upon the img
+>   plugin.
+> 
+> I do like your suggestion, it makes more sense than the current behavior.
+> I'm not sure the transition pain to get from here to there is worth it,
+> though.
+> 
+> More broadly, if I were writing ikiwiki now, I might choose to leave out the
+> auto-inlining of images altogether. In practice, it has added a certian level
+> of complexity to ikiwiki, with numerous plugins needing to specify
+> `noimageinline` to avoid accidentially inlining an image. And there has not
+> been a lot of payoff from having the auto-inlining feature implicitly
+> available most places. And the img directive allows much needed control over
+> display, so it would be better for users to not have to worry about its
+> lesser cousin. But the transition from here to *there* would be another order
+> of pain.
+> 
+> Anyway, the cheap and simple answer to your question is to use html
+> or markdown instead of a [[ikiwiki/wikilink]]. Ie, 
+> `[look at this](img/lolcat.jpg)`. --[[Joey]]
-- 
cgit v1.2.3


From fb0524bd9be5f47cd71d89e2443665dd65d66c0f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 15:51:31 -0500
Subject: links

---
 doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index f58b6b359..91573d4b5 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -14,12 +14,12 @@ Any hints?
 > 
 > A few places that use that (found with `git grep '\[\[' | egrep 'png|gif|jpeg|jpg' |grep \|`):
 > 
-> * [[logos]] uses it to provide useful alt texts for the logos. (This
+> * [[logo]] uses it to provide useful alt texts for the logos. (This
 >   could easily be changed to use [[ikiwiki/directives/img]] though.)
 > * The `change.tmpl` template uses it to display 
 >   the [[diff|wikiicons/diff.png]] with a very useful "diff" alt text.
 >   Using [[ikiwiki/directives/img]] here would mean that the
->   [[ikiwiki/plugins/recentchanges]] plugin would depend upon the img
+>   [[plugins/recentchanges]] plugin would depend upon the img
 >   plugin.
 > 
 > I do like your suggestion, it makes more sense than the current behavior.
-- 
cgit v1.2.3


From 9d673e31e755a0e1595d3472de12937517d3a24a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 15:51:52 -0500
Subject: links

---
 doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 91573d4b5..8a7fd7a29 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -15,10 +15,10 @@ Any hints?
 > A few places that use that (found with `git grep '\[\[' | egrep 'png|gif|jpeg|jpg' |grep \|`):
 > 
 > * [[logo]] uses it to provide useful alt texts for the logos. (This
->   could easily be changed to use [[ikiwiki/directives/img]] though.)
+>   could easily be changed to use [[ikiwiki/directive/img]] though.)
 > * The `change.tmpl` template uses it to display 
 >   the [[diff|wikiicons/diff.png]] with a very useful "diff" alt text.
->   Using [[ikiwiki/directives/img]] here would mean that the
+>   Using [[ikiwiki/directive/img]] here would mean that the
 >   [[plugins/recentchanges]] plugin would depend upon the img
 >   plugin.
 > 
-- 
cgit v1.2.3


From 6a0af02d3f30103196b9452077b5a68177c9fde4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 16:07:01 -0500
Subject: make decode_form_utf8 safe for arrays

---
 IkiWiki/CGI.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 866711a71..cd4a5574c 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -65,8 +65,9 @@ sub decode_form_utf8 ($) {
 	if ($] >= 5.01) {
 		my $form = shift;
 		foreach my $f ($form->field) {
+			my @value=map { decode_utf8($_) } $form->field($f);
 			$form->field(name  => $f,
-			             value => decode_utf8($form->field($f)),
+			             value => \@value,
 		                     force => 1,
 			);
 		}
-- 
cgit v1.2.3


From d249f674161bcee5ee7387dfe2600e9e20292bc8 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 21:11:25 +0000
Subject:

---
 doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 8a7fd7a29..67bb7f85f 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -6,7 +6,7 @@ I tought this:
 
 would work, but it doesn't.
 
-Any hints?
+Any hints? --[[jerojasro]]
 
 > Well, currently the syntax above will display the image
 > inline with the specified link text used as an alt attribute. Although
@@ -39,3 +39,6 @@ Any hints?
 > Anyway, the cheap and simple answer to your question is to use html
 > or markdown instead of a [[ikiwiki/wikilink]]. Ie, 
 > `[look at this](img/lolcat.jpg)`. --[[Joey]]
+
+> > thanks a lot, that's a quite straightforward solution. I actually wrote a
+> > broken plugin to do that, and now I can ditch it --[[jerojasro]]
-- 
cgit v1.2.3


From fe0f6866841d6fb6e85dec42e88c56114d98e7f4 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 21:12:00 +0000
Subject:

---
 doc/users/jerojasro.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/jerojasro.mdwn

diff --git a/doc/users/jerojasro.mdwn b/doc/users/jerojasro.mdwn
new file mode 100644
index 000000000..4b331a0b9
--- /dev/null
+++ b/doc/users/jerojasro.mdwn
@@ -0,0 +1 @@
+Javier Rojas
-- 
cgit v1.2.3


From 59d929d6b1271c84c6d17ffbff65b57bf67d49e6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 16:20:09 -0500
Subject: websetup: Fix utf-8 problems.

---
 IkiWiki/Plugin/websetup.pm             | 9 +++++++--
 debian/changelog                       | 1 +
 doc/bugs/utf-8_bug_in_websetup.pm.mdwn | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 9edd22d26..75aa3681c 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -139,7 +139,11 @@ sub showfields ($$$@) {
 		my $value=$config{$key};
 
 		if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
-			$value=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion
+			$value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) }  @{$value} : ""),
+				"", ""]; # blank items for expansion
+		}
+		else {
+			$value=Encode::encode_utf8($value);
 		}
 
 		if ($info{type} eq "string") {
@@ -290,7 +294,6 @@ sub showform ($$) {
 		shift->(form => $form, cgi => $cgi, session => $session,
 			buttons => $buttons);
 	});
-	IkiWiki::decode_form_utf8($form);
 
 	my %fields=showfields($form, undef, undef, IkiWiki::getsetup());
 	
@@ -308,6 +311,8 @@ sub showform ($$) {
 			$fields{$_}=$shown{$_} foreach keys %shown;
 		}
 	}
+
+	IkiWiki::decode_form_utf8($form);
 	
 	if ($form->submitted eq "Cancel") {
 		IkiWiki::redirect($cgi, $config{url});
diff --git a/debian/changelog b/debian/changelog
index 4f7c1a60c..5d5cdd564 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
     are disabled.
   * comments: Fix permalinks for comments using new conflict-free filenames.
   * img: Support alignment of images with captions. (Giuseppe Bilotta)
+  * websetup: Fix utf-8 problems.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
diff --git a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
index c3a5262cd..debedb01c 100644
--- a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
+++ b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
@@ -4,6 +4,8 @@ I type chinese characters into the fields. After press "save setup" button the c
 
 I submit a patch that solve the problem for me.  --Lingo
 
+> Fully fixing it is slightly more complex, but now [[done]] --[[Joey]] 
+
 ----
 
     --- websetup.pm	2009-12-02 05:07:46.000000000 +0800
-- 
cgit v1.2.3


From 1f51af907e93ee45b01a4a7f6015575522a3105d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 16:27:08 -0500
Subject: websetup: Fix bug in array change detection.

---
 IkiWiki/Plugin/websetup.pm | 6 +++++-
 debian/changelog           | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 75aa3681c..e477bcc20 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -362,7 +362,11 @@ sub showform ($$) {
 				@value=sort grep { length $_ } @value;
 				my @oldvalue=sort grep { length $_ }
 					(defined $config{$key} ? @{$config{$key}} : ());
-				if ((@oldvalue) == (@value)) {
+				my $same=(@oldvalue) == (@value);
+				for (my $x=0; $same && $x < @value; $x++) {
+					$same=0 if $value[$x] ne $oldvalue[$x];
+				}
+				if ($same) {
 					delete $rebuild{$field};
 				}
 				else {
diff --git a/debian/changelog b/debian/changelog
index 5d5cdd564..bd638b36f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
   * comments: Fix permalinks for comments using new conflict-free filenames.
   * img: Support alignment of images with captions. (Giuseppe Bilotta)
   * websetup: Fix utf-8 problems.
+  * websetup: Fix bug in array change detection.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
-- 
cgit v1.2.3


From cebf8784f02d4706de4b98b76a8153cc32ff09b9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 16:30:26 -0500
Subject: followup

---
 .../link_to_an_image_inside_the_wiki_without_inlining_it.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 67bb7f85f..045f8cc68 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -42,3 +42,14 @@ Any hints? --[[jerojasro]]
 
 > > thanks a lot, that's a quite straightforward solution. I actually wrote a
 > > broken plugin to do that, and now I can ditch it --[[jerojasro]]
+
+>>> The plugin approach is not a bad idea if you want either the ability
+>>> to:
+>>>
+>>> * Have things that are wikilink-aware (like [[plugins/brokenlinks]]
+>>>   treat your link to the image as a wikilink. 
+>>> * Use standard wikilink path stuff (and not have to worry about 
+>>>   a raw html link breaking if the page it's on is inlined, for
+>>>   example).
+>>>
+>>> I can help you bang that plugin into shape if need be. --[[Joey]] 
-- 
cgit v1.2.3


From 10ca7c8f8ac2801ce50a362c58a3561add0b057e Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 21:33:05 +0000
Subject: details about user jerojasro

---
 doc/users/jerojasro.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/users/jerojasro.mdwn b/doc/users/jerojasro.mdwn
index 4b331a0b9..e2e620d3f 100644
--- a/doc/users/jerojasro.mdwn
+++ b/doc/users/jerojasro.mdwn
@@ -1 +1,3 @@
 Javier Rojas
+
+I keep a personal [wiki](http://devnull.li/~jerojasro/wiki) and my [blog](http://devnull.li/~jerojasro/blog) in ikiwiki.
-- 
cgit v1.2.3


From 88c6e2891593fd508701d728602515e47284180c Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 9 Jan 2010 22:53:45 +0100
Subject: moved selflink test to its own isselflink (overridable) sub

---
 IkiWiki.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b8e599928..5d5c7f0d0 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1026,6 +1026,13 @@ sub urlto ($$;$) {
 	return beautify_urlpath($link);
 }
 
+sub isselflink ($$) {
+	my $page=shift;
+	my $link=shift;
+
+        return $page eq $link;
+}
+
 sub htmllink ($$$;@) {
 	my $lpage=shift; # the page doing the linking
 	my $page=shift; # the page that will contain the link (different for inline)
@@ -1051,7 +1058,7 @@ sub htmllink ($$$;@) {
 	}
 	
 	return "<span class=\"selflink\">$linktext</span>"
-		if length $bestlink && $page eq $bestlink &&
+		if length $bestlink && isselflink($page, $bestlink) &&
 		   ! defined $opts{anchor};
 	
 	if (! $destsources{$bestlink}) {
-- 
cgit v1.2.3


From 73f4a8835876c8cb07808367cd72d9ae972893e8 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 9 Jan 2010 22:54:34 +0100
Subject: po: inject custom isselflink to fix selflink detection on translation
 pages

---
 IkiWiki/Plugin/po.pm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 02fc4a89e..bbbb3b870 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -63,6 +63,8 @@ sub import {
 	inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
 	$origsubs{'rootpage'}=\&IkiWiki::rootpage;
 	inject(name => "IkiWiki::rootpage", call => \&myrootpage);
+	$origsubs{'isselflink'}=\&IkiWiki::isselflink;
+	inject(name => "IkiWiki::isselflink", call => \&myisselflink);
 }
 
 
@@ -671,6 +673,17 @@ sub myrootpage (@) {
 	return $rootpage;
 }
 
+sub myisselflink ($$) {
+	my $page=shift;
+	my $link=shift;
+
+	return 1 if $origsubs{'isselflink'}->($page, $link);
+	if (istranslation($page)) {
+		return $origsubs{'isselflink'}->(masterpage($page), $link);
+        }
+	return;
+}
+
 # ,----
 # | Blackboxes for private data
 # `----
-- 
cgit v1.2.3


From cf7d03ec80e168ad18d65a90842773da353ee060 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 9 Jan 2010 22:57:11 +0100
Subject: fixed bug in my po branch, please pull

---
 doc/todo/Fix_selflink_in_po_plugin.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index ae59e14c2..55968e3d7 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -2,3 +2,5 @@ Using the po plugin, a link to /bla is present in the sidebar.
 When viewing /bla in the default language, this link is detected as
 a selflink. When viewing a translation of /bla, it
 isn't. --[[intrigeri]]
+
+Fixed in my po branch => [[!tag patch]]. --[[intrigeri]]
-- 
cgit v1.2.3


From 62a67e161bccba431b8b8a501967ba7acf6e197a Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 9 Jan 2010 22:59:46 +0100
Subject: wiki syntax fix

---
 doc/todo/Fix_selflink_in_po_plugin.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index 55968e3d7..87fa38911 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -3,4 +3,6 @@ When viewing /bla in the default language, this link is detected as
 a selflink. When viewing a translation of /bla, it
 isn't. --[[intrigeri]]
 
-Fixed in my po branch => [[!tag patch]]. --[[intrigeri]]
+Fixed in my po branch. --[[intrigeri]]
+
+[[!tag patch]]
-- 
cgit v1.2.3


From f00b15cc369e1e3b7949a10a6fa9d8688f60a82f Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 23:00:00 +0000
Subject: help request with plugin draft

---
 .../link_to_an_image_inside_the_wiki_without_inlining_it.mdwn      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 045f8cc68..2b91cd856 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -53,3 +53,10 @@ Any hints? --[[jerojasro]]
 >>>   example).
 >>>
 >>> I can help you bang that plugin into shape if need be. --[[Joey]] 
+
+>>>> both my plugin and your suggestion yield broken html links when inlining the page
+>>>>
+>>>> I thought using the `bestlink` function would take care of that, but alas, it doesn't.
+>>>> Get the "plugin" [here](http://devnull.li/~jerojasro/files/linktoimgonly.pm), see the broken 
+>>>> links generated [here](http://devnull.li/~jerojasro/blog/posts/job_offers/) and the source 
+>>>> file for that page [here](http://git.devnull.li/cgi-bin/gitweb.cgi?p=blog-jerojasro.git;a=blob;f=posts/job_offers.mdwn;hb=HEAD) --[[jerojasro]]
-- 
cgit v1.2.3


From fc760812130b2acfad6105d8444af730d3785cbe Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 23:50:23 +0000
Subject:

---
 doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 2b91cd856..3b19bab15 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -54,7 +54,7 @@ Any hints? --[[jerojasro]]
 >>>
 >>> I can help you bang that plugin into shape if need be. --[[Joey]] 
 
->>>> both my plugin and your suggestion yield broken html links when inlining the page
+>>>> both my plugin and your suggestion yield broken html links when inlining the page (although propably that's what is expected from your suggestion (`[]()`))
 >>>>
 >>>> I thought using the `bestlink` function would take care of that, but alas, it doesn't.
 >>>> Get the "plugin" [here](http://devnull.li/~jerojasro/files/linktoimgonly.pm), see the broken 
-- 
cgit v1.2.3


From a23d3b6547b80064f8e9af94076aa43798cf6558 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 23:50:45 +0000
Subject:

---
 doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 3b19bab15..53544e2c4 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -54,7 +54,7 @@ Any hints? --[[jerojasro]]
 >>>
 >>> I can help you bang that plugin into shape if need be. --[[Joey]] 
 
->>>> both my plugin and your suggestion yield broken html links when inlining the page (although propably that's what is expected from your suggestion (`[]()`))
+>>>> both my plugin and your suggestion yield broken html links when inlining the page (although probably that's what is expected from your suggestion (`[]()`))
 >>>>
 >>>> I thought using the `bestlink` function would take care of that, but alas, it doesn't.
 >>>> Get the "plugin" [here](http://devnull.li/~jerojasro/files/linktoimgonly.pm), see the broken 
-- 
cgit v1.2.3


From 149e8e1c62a11d73f2fbea4e653cff7f3460c8f2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 21:25:37 -0500
Subject: response

---
 .../link_to_an_image_inside_the_wiki_without_inlining_it.mdwn    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 53544e2c4..e92cc1b1c 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -49,7 +49,7 @@ Any hints? --[[jerojasro]]
 >>> * Have things that are wikilink-aware (like [[plugins/brokenlinks]]
 >>>   treat your link to the image as a wikilink. 
 >>> * Use standard wikilink path stuff (and not have to worry about 
->>>   a raw html link breaking if the page it's on is inlined, for
+>>>   a relative html link breaking if the page it's on is inlined, for
 >>>   example).
 >>>
 >>> I can help you bang that plugin into shape if need be. --[[Joey]] 
@@ -60,3 +60,10 @@ Any hints? --[[jerojasro]]
 >>>> Get the "plugin" [here](http://devnull.li/~jerojasro/files/linktoimgonly.pm), see the broken 
 >>>> links generated [here](http://devnull.li/~jerojasro/blog/posts/job_offers/) and the source 
 >>>> file for that page [here](http://git.devnull.li/cgi-bin/gitweb.cgi?p=blog-jerojasro.git;a=blob;f=posts/job_offers.mdwn;hb=HEAD) --[[jerojasro]]
+
+>>>>> Use this --[[Joey]] 
+
+	return htmllink($params{page}, $params{destpage}, $params{"img"},
+	    linktext => $params{text},
+	    noimageinline => 1);
+
-- 
cgit v1.2.3


From 9dc5685de44760d2c06a0376c97eb699de2f2964 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 23:10:26 -0500
Subject: linkmap: Simplify and improve browser compatability by using an img, 
 not object tag.

I noticed that chromium was not hyperlinking the areas in the object-based
linkmap, while img works ok. Dunno why, but img based is nicer anyway since
it is allowed right through the htmlscrubber with no workarounds.
---
 IkiWiki/Plugin/linkmap.pm | 30 ++++--------------------------
 debian/changelog          |  2 ++
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 28acbda32..68eb6c8c6 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -9,7 +9,6 @@ use IPC::Open2;
 sub import {
 	hook(type => "getsetup", id => "linkmap", call => \&getsetup);
 	hook(type => "preprocess", id => "linkmap", call => \&preprocess);
-	hook(type => "format", id => "linkmap", call => \&format);
 }
 
 sub getsetup () {
@@ -21,34 +20,13 @@ sub getsetup () {
 }
 
 my $mapnum=0;
-my %maps;
 
 sub preprocess (@) {
 	my %params=@_;
 
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Can't just return the linkmap here, since the htmlscrubber
-	# scrubs out all <object> tags (with good reason!)
-	# Instead, insert a placeholder tag, which will be expanded during
-	# formatting.
 	$mapnum++;
-	$maps{$mapnum}=\%params;
-	return "<div class=\"linkmap$mapnum\"></div>";
-}
-
-sub format (@) {
-        my %params=@_;
-
-	$params{content}=~s/<div class=\"linkmap(\d+)"><\/div>/genmap($1)/eg;
-
-        return $params{content};
-}
-
-sub genmap ($) {
-	my $mapnum=shift;
-	return "" unless exists $maps{$mapnum};
-	my %params=%{$maps{$mapnum}};
 	my $connected=IkiWiki::yesno($params{connected});
 
 	# Get all the items to map.
@@ -102,10 +80,10 @@ sub genmap ($) {
 	close OUT || error gettext("failed to run dot");
 
 	local $/=undef;
-	my $ret="<object data=\"".urlto($dest, $params{destpage}).
-	       "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
-	        <IN>.
-	        "</object>";
+	my $ret="<img src=\"".urlto($dest, $params{destpage}).
+	       "\" alt=\"".gettext("linkmap").
+	       "\" usemap=\"#linkmap$mapnum\" />\n".
+	        <IN>;
 	close IN || error gettext("failed to run dot");
 	
 	waitpid $pid, 0;
diff --git a/debian/changelog b/debian/changelog
index bd638b36f..55213df9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
   * img: Support alignment of images with captions. (Giuseppe Bilotta)
   * websetup: Fix utf-8 problems.
   * websetup: Fix bug in array change detection.
+  * linkmap: Simplify and improve browser compatability by using an img, 
+    not object tag.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
-- 
cgit v1.2.3


From 0c89eabcf5a7f9dd881abc8a8cb5f2271ec4e01e Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 00:37:56 +0000
Subject: more options for field configuration, additional pagespec test

---
 doc/plugins/contrib/field.mdwn | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/field.mdwn b/doc/plugins/contrib/field.mdwn
index a43bf24b2..09646d28a 100644
--- a/doc/plugins/contrib/field.mdwn
+++ b/doc/plugins/contrib/field.mdwn
@@ -13,6 +13,9 @@ IkiWiki::Plugin::field - front-end for per-page record fields.
     # simple registration
     field_register => [qw{meta}],
 
+    # allow the config to be queried as a field
+    field_allow_config => 1,
+
 ## DESCRIPTION
 
 This plugin is meant to be used in conjunction with other plugins
@@ -32,8 +35,17 @@ a given page.  This can be used in three ways:
 
 The following options can be set in the ikiwiki setup file.
 
+**field_allow_config**
+
+    field_allow_config => 1,
+
+Allow the $config hash to be queried like any other field; the 
+keys of the config hash are the field names.
+
 **field_register**
 
+    field_register => [qw{meta}],
+
 A list of plugin-IDs to register.  This assumes that the plugins in
 question store data in the %pagestatus hash using the ID of that plugin,
 and thus the field values are looked for there.
@@ -46,12 +58,17 @@ registered with the "field" plugin.
 
 The "field" PageSpec function can be used to match the value of a field for a page.
 
-field(*name* *glob*)
+**field(*name* *glob*)**
 
 For example:
 
 field(bar Foo*) will match if the "bar" field starts with "Foo".
 
+**destfield(*name* *glob*)**
+
+is the same, except that it tests the destination page (that is, in cases
+when the source page is being included in another page).
+
 ## FUNCTIONS
 
 ### field_register
-- 
cgit v1.2.3


From 9ccd1ba41bff43c1a5d06197b454c8748224e30f Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:20:34 +0000
Subject: ymlfront: backend for structured data

---
 doc/plugins/contrib/ymlfront.mdwn | 99 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 doc/plugins/contrib/ymlfront.mdwn

diff --git a/doc/plugins/contrib/ymlfront.mdwn b/doc/plugins/contrib/ymlfront.mdwn
new file mode 100644
index 000000000..f4438f23c
--- /dev/null
+++ b/doc/plugins/contrib/ymlfront.mdwn
@@ -0,0 +1,99 @@
+[[!template id=plugin name=ymlfront author="[[rubykat]]"]]
+[[!tag type/meta]]
+[[!toc]]
+## NAME
+
+IkiWiki::Plugin::ymlfront - add YAML-format data to a page
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff ymlfront ....}],
+
+## DESCRIPTION
+
+This plugin provides a way of adding arbitrary meta-data (data fields) to any
+page by prefixing the page with a YAML-format document.  This provides a way to
+create per-page structured data, where each page is treated like a record, and
+the structured data are fields in that record.  This can include the meta-data
+for that page, such as the page title.
+
+This plugin is meant to be used in conjunction with the [[field]] plugin.
+
+## DETAILS
+
+The YAML-format data in a page must be placed at the start of the page
+and delimited by lines containing precisely three dashes.  The "normal"
+content of the page then follows.
+
+For example:
+
+    ---
+    title: Foo does not work
+    Urgency: High
+    Status: Assigned
+    AssignedTo: Fred Nurk
+    Version: 1.2.3
+    ---
+    When running on the Sprongle system, the Foo function returns incorrect data.
+
+What will normally be displayed is everything following the second line of dashes.
+That will be htmlized using the page-type of the page-file.
+
+### Accessing the Data
+
+There are three ways to access the data given in the YAML section.
+
+* [[getfield]] plugin
+
+  The **getfield** plugin can display the data as individual variable values.
+
+  For example:
+
+    	---
+    	title: Foo does not work
+    	Urgency: High
+    	Status: Assigned
+    	AssignedTo: Fred Nurk
+    	Version: 1.2.3
+    	---
+    	# {{$title}}
+
+    	**Urgency:** {{$Urgency}}\\
+    	**Status:** {{$Status}}\\
+    	**Assigned To:** {{$AssignedTo}}\\
+    	**Version:** {{$Version}}
+
+    When running on the Sprongle system, the Foo function returns incorrect data.
+
+* [[ftemplate]] plugin
+
+  The **ftemplate** plugin is like the [[plugins/template]] plugin, but it is also aware of [[field]] values.
+
+  For example:
+
+    	---
+    	title: Foo does not work
+    	Urgency: High
+    	Status: Assigned
+    	AssignedTo: Fred Nurk
+    	Version: 1.2.3
+    	---
+    	\[[!ftemplate id="bug_display_template"]]
+
+    	When running on the Sprongle system, the Foo function returns incorrect data.
+
+* write your own plugin
+
+  In conjunction with the [[field]] plugin, you can write your own plugin to access the data.
+
+## PREREQUISITES
+
+    IkiWiki
+    IkiWiki::Plugin::field
+    YAML::Any
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/ymlfront.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From ccc8e8868269bf2751596e04f792c388acb85c12 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:27:59 +0000
Subject: getfield: query field (meta-data) values

---
 doc/plugins/contrib/getfield.mdwn | 85 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 doc/plugins/contrib/getfield.mdwn

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
new file mode 100644
index 000000000..ed03dc439
--- /dev/null
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -0,0 +1,85 @@
+[[!template id=plugin name=getfield author="[[rubykat]]"]]
+[[!tag type/meta]]
+[[!toc]]
+## NAME
+
+IkiWiki::Plugin::getfield - query the values of fields
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff getfield ....}],
+
+## DESCRIPTION
+
+This plugin provides a way of querying the meta-data (data fields) of a page
+inside the page content (rather than inside a template) This provides a way to
+use per-page structured data, where each page is treated like a record, and the
+structured data are fields in that record.  This can include the meta-data for
+that page, such as the page title.
+
+This plugin is meant to be used in conjunction with the B<field> plugin.
+
+### USAGE
+
+One can get the value of a field by using special markup in the page.
+This does not use directive markup, in order to make it easier to
+use the markup inside other directives.  There are two forms:
+
+* {{$*fieldname*}}
+
+  This queries the value of *fieldname* for the source page.
+
+  For example:
+
+    	\[[!meta title="My Long and Complicated Title With Potential For Spelling Mistakes"]]
+    	# {{$title}}
+
+  When the page is processed, this will give you:
+
+    	<h1>My Long and Complicated Title With Potential For Spelling Mistakes</h1>
+
+* {{+$*fieldname*+}}
+
+  This queries the value of *fieldname* for the destination page; that is,
+  the value when this page is included inside another page.
+
+  For example:
+
+  On PageA:
+
+    	\[[!meta title="I Am Page A"]]
+    	# {{+$title+}}
+
+    	Stuff about A.
+
+  On PageB:
+
+    	\[[!meta title="I Am Page B"]]
+    	\[[!inline pagespec="PageA"]]
+
+  When PageA is displayed:
+
+    	<h1>I Am Page A</h1>
+    	<p>Stuff about A.</p>
+
+  When PageB is displayed:
+
+    	<h1>I Am Page B</h1>
+    	<p>Stuff about A.</p>
+
+### More Examples
+
+Listing all the sub-pages of the current page:
+
+    \[[!map pages="{{$page}}/*"]]
+
+### LIMITATIONS
+
+One cannot query the values of fields on pages other than the current
+page or the destination page.
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/field.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From 7d997f1007b240c14c04ff73b09a2a62fa3e64ad Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:36:28 +0000
Subject: ftemplate: field-aware structured template plugin

---
 doc/plugins/contrib/ftemplate.mdwn | 94 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 doc/plugins/contrib/ftemplate.mdwn

diff --git a/doc/plugins/contrib/ftemplate.mdwn b/doc/plugins/contrib/ftemplate.mdwn
new file mode 100644
index 000000000..bcc6f2c67
--- /dev/null
+++ b/doc/plugins/contrib/ftemplate.mdwn
@@ -0,0 +1,94 @@
+[[!template id=plugin name=ftemplate author="[[rubykat]]"]]
+[[!tag type/meta type/format]]
+[[!toc]]
+## NAME
+
+IkiWiki::Plugin::ftemplate - field-aware structured template plugin
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff ftemplate ....}],
+
+## DESCRIPTION
+
+This plugin provides the **ftemplate** directive.  This is like
+the [[ikiwiki/directive/template]] directive, with the addition that one does not
+have to provide all the values in the call to the template,
+because ftemplate can query structured data ("fields") using
+the [[field]] plugin.
+
+Templates are files that can be filled out and inserted into pages in
+the wiki, by using the ftemplate directive. The directive has an id
+parameter that identifies the template to use.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is, as with the
+[[plugins/template]] plugin, in the /templates directory on the wiki.  These
+templates are wiki pages, and can be edited from the web like other wiki
+pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+### EXAMPLES
+
+#### Example 1
+
+PageA:
+
+    [[!meta title="I Am Page A"]]
+    [[!meta description="A is for Apple."]]
+    [[!meta author="Fred Nurk"]]
+    [[!ftemplate id="mytemplate"]]
+
+Template "mytemplate":
+
+    # <TMPL_VAR NAME="TITLE">
+    by <TMPL_VAR NAME="AUTHOR">
+
+    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
+
+This will give:
+
+    <h1>I Am Page A</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> A is for Apple.
+
+#### Example 2: Overriding values
+
+PageB:
+
+    [[!meta title="I Am Page B"]]
+    [[!meta description="B is for Banana."]]
+    [[!meta author="Fred Nurk"]]
+    [[!ftemplate id="mytemplate" title="Bananananananas"]]
+
+This will give:
+
+    <h1>Bananananananas</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> B is for Banana.
+
+### LIMITATIONS
+
+One cannot query the values of fields on pages other than the current
+page.
+
+## PREREQUISITES
+
+    IkiWiki
+    IkiWiki::Plugin::field
+    HTML::Template
+    Encode
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/ftemplate.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From a3527672769b93eeb4a70fbe9f316c986706c375 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:37:27 +0000
Subject: fixed title

---
 doc/plugins/contrib/ftemplate.mdwn | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/plugins/contrib/ftemplate.mdwn b/doc/plugins/contrib/ftemplate.mdwn
index bcc6f2c67..fba51e1c2 100644
--- a/doc/plugins/contrib/ftemplate.mdwn
+++ b/doc/plugins/contrib/ftemplate.mdwn
@@ -43,10 +43,10 @@ them work as wiki pages.
 
 PageA:
 
-    [[!meta title="I Am Page A"]]
-    [[!meta description="A is for Apple."]]
-    [[!meta author="Fred Nurk"]]
-    [[!ftemplate id="mytemplate"]]
+    \[[!meta title="I Am Page A"]]
+    \[[!meta description="A is for Apple."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate"]]
 
 Template "mytemplate":
 
@@ -65,10 +65,10 @@ This will give:
 
 PageB:
 
-    [[!meta title="I Am Page B"]]
-    [[!meta description="B is for Banana."]]
-    [[!meta author="Fred Nurk"]]
-    [[!ftemplate id="mytemplate" title="Bananananananas"]]
+    \[[!meta title="I Am Page B"]]
+    \[[!meta description="B is for Banana."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
 
 This will give:
 
-- 
cgit v1.2.3


From 2cbf60a431d41b3cb0767f1c0fb1ecf50103bcb0 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:38:33 +0000
Subject: correcting link

---
 doc/plugins/contrib/getfield.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
index ed03dc439..5e6b01113 100644
--- a/doc/plugins/contrib/getfield.mdwn
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -81,5 +81,5 @@ page or the destination page.
 
 ## DOWNLOAD
 
-* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/field.pm>
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/getfield.pm>
 * git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From 39e1524e9e12e538b439310a20325064657f5979 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:45:44 +0000
Subject: more progress on this approach

---
 doc/forum/an_alternative_approach_to_structured_data.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index fb007f7e9..eb6ee4445 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -1,3 +1,5 @@
+## First Pass
+
 Looking at the discussion about [[todo/structured_page_data]], it looks a bit like folks are bogged down in figuring out what *markup* to use for structured page data, something I doubt that people will really agree on.  And thus, little progress is made.
 
 I propose that, rather than worry about what the data looks like, that we take a similar approach
@@ -15,3 +17,13 @@ I think it could be really powerful and useful, especially if it becomes part of
 --[[KathrynAndersen]]
 
 > It looks like an interesting idea.  I don't have time right now to look at it in depth, but it looks interesting. -- [[Will]]
+
+## Second Pass
+
+I have written additional plugins which integrate with the [[plugins/contrib/field]] plugin to both set and get structured page data.
+
+* [[plugins/contrib/getfield]] - query field values inside a page using {{$*fieldname*}} markup
+* [[plugins/contrib/ftemplate]] - like [[plugins/template]] but uses "field" data as well as passed-in data
+* [[plugins/contrib/ymlfront]] - looks for YAML-format data at the front of a page; this is just one possible back-end for the structured data
+
+--[[KathrynAndersen]]
-- 
cgit v1.2.3


From f90827f29bc1682bf3682375972f5cc836049dc7 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:47:59 +0000
Subject: this is sort of format too

---
 doc/plugins/contrib/getfield.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
index 5e6b01113..302569f4b 100644
--- a/doc/plugins/contrib/getfield.mdwn
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=getfield author="[[rubykat]]"]]
-[[!tag type/meta]]
+[[!tag type/meta type/format]]
 [[!toc]]
 ## NAME
 
-- 
cgit v1.2.3


From f2b8f358652e76e4047f4e304870e25cac51b681 Mon Sep 17 00:00:00 2001
From: parade <parade@web>
Date: Thu, 14 Jan 2010 14:25:56 +0000
Subject:

---
 doc/index.mdwn | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..13e7564ea 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,28 +1 @@
-Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
-suitable for publishing on a website. Ikiwiki stores pages and history in a
-[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
-There are many other [[features]], including support for
-[[blogging|blog]], as well as a large array of [[plugins]].
-
-[[!template id=links]]
-
-## using ikiwiki
-
-[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
-[[man_page|usage]]. There are some [[examples]] of things you can do
-with ikiwiki, and some [[tips]].
-
-All wikis are supposed to have a [[SandBox]], so this one does too.
-
-This site generally runs the latest release of ikiwiki; currently, it runs
-ikiwiki [[!version ]].
-
-## developer resources
-
-The [[RoadMap]] describes where the project is going.
-The [[forum]] is open for discussions.
-[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
-can be submitted and tracked using this wiki.
-
-ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]].
+o
-- 
cgit v1.2.3


From b3036541674cc90b1c48203244dd711e399ce9d7 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Thu, 14 Jan 2010 16:29:09 +0100
Subject: Restore page.

This reverts commit f2b8f358652e76e4047f4e304870e25cac51b681.
---
 doc/index.mdwn | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 13e7564ea..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1 +1,28 @@
-o
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages and history in a
+[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
+There are many other [[features]], including support for
+[[blogging|blog]], as well as a large array of [[plugins]].
+
+[[!template id=links]]
+
+## using ikiwiki
+
+[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
+[[man_page|usage]]. There are some [[examples]] of things you can do
+with ikiwiki, and some [[tips]].
+
+All wikis are supposed to have a [[SandBox]], so this one does too.
+
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
+
+## developer resources
+
+The [[RoadMap]] describes where the project is going.
+The [[forum]] is open for discussions.
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
+can be submitted and tracked using this wiki.
+
+ikiwiki is developed by [[Joey]] and many contributors,
+and is [[FreeSoftware]].
-- 
cgit v1.2.3


From 4f25d90ebc2d3ff2ad7a5d7bd8578a6c4d673aa8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 14 Jan 2010 18:56:05 -0500
Subject: mention that lighttpd does support this. Example needed.

---
 doc/plugins/po.mdwn | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index f3b70b5f7..da85636ec 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -129,11 +129,10 @@ For details, see [Apache's documentation](http://httpd.apache.org/docs/2.2/conte
 lighttpd
 --------
 
-lighttpd unfortunately does not support content negotiation.
-
-**FIXME**: does `mod_magnet` provide the functionality needed to
- emulate this?
+Recent versions of lighttpd should be able to use
+`$HTTP["language"]` to configure the translatted pages to be served.
 
+TODO: Example
 
 Usage
 =====
-- 
cgit v1.2.3


From 65db2f47acfe5815952bb0bfbdbe15b5cf5ce7be Mon Sep 17 00:00:00 2001
From: Spida <Spida@web>
Date: Fri, 15 Jan 2010 00:15:33 +0000
Subject:

---
 doc/plugins/po.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index da85636ec..576d36ec1 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -132,6 +132,8 @@ lighttpd
 Recent versions of lighttpd should be able to use
 `$HTTP["language"]` to configure the translatted pages to be served.
 
+See [Lighttpd Issue](http://redmine.lighttpd.net/issues/show/1119)
+
 TODO: Example
 
 Usage
-- 
cgit v1.2.3


From a1138ae820d3ea121cbd28552a3300631179b0a5 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 16 Jan 2010 05:19:42 +0000
Subject: the pod bold thingy didn't work, making it a markdown one

---
 doc/plugins/contrib/getfield.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
index 302569f4b..929f70485 100644
--- a/doc/plugins/contrib/getfield.mdwn
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -18,7 +18,7 @@ use per-page structured data, where each page is treated like a record, and the
 structured data are fields in that record.  This can include the meta-data for
 that page, such as the page title.
 
-This plugin is meant to be used in conjunction with the B<field> plugin.
+This plugin is meant to be used in conjunction with the **field** plugin.
 
 ### USAGE
 
-- 
cgit v1.2.3


From 353f722dc439a14d7e74dab9ca2818f955ff4d41 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 16 Jan 2010 05:29:53 +0000
Subject:

---
 doc/plugins/contrib/getfield/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/plugins/contrib/getfield/discussion.mdwn

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
new file mode 100644
index 000000000..61b9f5378
--- /dev/null
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -0,0 +1,3 @@
+## Templating, and other uses
+
+Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If it can be made to work anywhere, or from a specific place in the wiki - configurable, possibly - you'll have something very similar to mediawiki's templates. I can already think of a few uses for this combined with [[template]] ;) . --[[SR|users/simonraven]]
-- 
cgit v1.2.3


From 3b2772967fdb125bb8160f968729681b7af13269 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sat, 16 Jan 2010 08:08:46 +0000
Subject: responded to discussion

---
 doc/plugins/contrib/getfield/discussion.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 61b9f5378..78462197a 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -1,3 +1,12 @@
 ## Templating, and other uses
 
 Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If it can be made to work anywhere, or from a specific place in the wiki - configurable, possibly - you'll have something very similar to mediawiki's templates. I can already think of a few uses for this combined with [[template]] ;) . --[[SR|users/simonraven]]
+
+> Yes, I mentioned "only current page" in the "LIMITATIONS" section.
+
+> What do you think would be a good syntax for querying other pages?
+> It needs to resolve to a single page, though I guess using "bestlink" to find the closest page would mean that one didn't have to spell out the whole page.
+
+> I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
+
+> -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From e3a09318a0686a7e3d01206f56ca6019c3c198e0 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 16 Jan 2010 08:42:56 +0000
Subject:

---
 doc/plugins/contrib/getfield/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 78462197a..f3c844e94 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -7,6 +7,10 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 > What do you think would be a good syntax for querying other pages?
 > It needs to resolve to a single page, though I guess using "bestlink" to find the closest page would mean that one didn't have to spell out the whole page.
 
+>> I don't know the internals very well, I think that's how other plugins do it. *goes to check* Usually it's a `foreach` loop, and use a `pagestate{foo}` to check the page's status/state. There's also some stuff like 'pagespec_match_list($params{page}` ... they do slightly different thing depending on need. --[[SR|users/simonraven]]
+
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
 > -- [[users/KathrynAndersen]]
+
+>> Ooh, sounds nice :) . --[[SR|users/simonraven]]
-- 
cgit v1.2.3


From 354468d280354234d9c8c91333534c9784f427cf Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 17 Jan 2010 00:10:55 +0000
Subject: respond: markup, not internals

---
 doc/plugins/contrib/getfield/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index f3c844e94..37d65d851 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -9,6 +9,11 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 
 >> I don't know the internals very well, I think that's how other plugins do it. *goes to check* Usually it's a `foreach` loop, and use a `pagestate{foo}` to check the page's status/state. There's also some stuff like 'pagespec_match_list($params{page}` ... they do slightly different thing depending on need. --[[SR|users/simonraven]]
 
+>>> No, I meant what markup I should use; the actual implementation probably wouldn't be too difficult.
+
+>>> The current markup is {{$*fieldname*}}; what you're wanting, perhaps it should be represented like {{$*pagename*:*fieldname*}}, or {{$*pagename*::*fieldname*}} or something else...
+>>> -- [[KathrynAndersen]]
+
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
 > -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From 1ddef7da7b170bb4bd7c816cba03e3e6338a50b2 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Sun, 17 Jan 2010 07:22:03 +0000
Subject:

---
 doc/todo/svg.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/todo/svg.mdwn b/doc/todo/svg.mdwn
index 0a15af4cd..f264f4107 100644
--- a/doc/todo/svg.mdwn
+++ b/doc/todo/svg.mdwn
@@ -3,6 +3,7 @@ We should support SVG.  In particular:
 * We could support rendering SVGs to PNGs when compiling the wiki.  Not all browsers support SVG yet.
 
 * We could support editing SVGs via the web interface.  SVG can contain unsafe content such as scripting, so we would need to whitelist safe markup.
+  * I am interested in seeing [svg-edit](http://code.google.com/p/svg-edit/) integrated --[EricDrechsel]]
 
 --[[JoshTriplett]]
 
-- 
cgit v1.2.3


From 5588abc2befbde83e43cf79f9717e323aa69da11 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Sun, 17 Jan 2010 07:22:54 +0000
Subject:

---
 doc/todo/svg.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/svg.mdwn b/doc/todo/svg.mdwn
index f264f4107..89b183db6 100644
--- a/doc/todo/svg.mdwn
+++ b/doc/todo/svg.mdwn
@@ -3,7 +3,7 @@ We should support SVG.  In particular:
 * We could support rendering SVGs to PNGs when compiling the wiki.  Not all browsers support SVG yet.
 
 * We could support editing SVGs via the web interface.  SVG can contain unsafe content such as scripting, so we would need to whitelist safe markup.
-  * I am interested in seeing [svg-edit](http://code.google.com/p/svg-edit/) integrated --[EricDrechsel]]
+  * I am interested in seeing [svg-edit](http://code.google.com/p/svg-edit/) integrated -- [[EricDrechsel]]
 
 --[[JoshTriplett]]
 
-- 
cgit v1.2.3


From d652bf3ddf33505b540b46e6916d8a36cdeacc08 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Sun, 17 Jan 2010 07:24:31 +0000
Subject:

---
 doc/users/ericdrechsel.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/ericdrechsel.mdwn

diff --git a/doc/users/ericdrechsel.mdwn b/doc/users/ericdrechsel.mdwn
new file mode 100644
index 000000000..2efb7039c
--- /dev/null
+++ b/doc/users/ericdrechsel.mdwn
@@ -0,0 +1 @@
+[My homewiki profile](http://wiki.shared.dre.am/people/eric/)
-- 
cgit v1.2.3


From b3363aa89f840fd42b8a621b011326ef41b73513 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 17 Jan 2010 09:28:07 +0000
Subject:

---
 doc/plugins/contrib/getfield/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 37d65d851..9f1337046 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -14,6 +14,8 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 >>> The current markup is {{$*fieldname*}}; what you're wanting, perhaps it should be represented like {{$*pagename*:*fieldname*}}, or {{$*pagename*::*fieldname*}} or something else...
 >>> -- [[KathrynAndersen]]
 
+>>>> Oh. Hmm. I like your idea actually, or alternately, in keeping more with other plugins, doing it like {{pagename/fieldname}}. The meaning is less clear that way, but avoids potential issues with filename clashes that have a colon in them. It also keeps a certain logic - at least to me. Either way, I think both are good choices.
+
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
 > -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From 2137d1f68c694af6135d0d84b59bbfbcffe36669 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 17 Jan 2010 09:31:07 +0000
Subject:

---
 doc/plugins/contrib/getfield/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 9f1337046..42338a3c7 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -14,7 +14,7 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 >>> The current markup is {{$*fieldname*}}; what you're wanting, perhaps it should be represented like {{$*pagename*:*fieldname*}}, or {{$*pagename*::*fieldname*}} or something else...
 >>> -- [[KathrynAndersen]]
 
->>>> Oh. Hmm. I like your idea actually, or alternately, in keeping more with other plugins, doing it like {{pagename/fieldname}}. The meaning is less clear that way, but avoids potential issues with filename clashes that have a colon in them. It also keeps a certain logic - at least to me. Either way, I think both are good choices.
+>>>> Oh. Hmm. I like your idea actually, or alternately, in keeping more with other plugins, doing it like {{pagename/fieldname}}. The meaning of the separator is less clear with /, but avoids potential issues with filename clashes that have a colon in them. It also keeps a certain logic - at least to me. Either way, I think both are good choices. [[SR|users/simonraven]]
 
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
-- 
cgit v1.2.3


From fc7a047a474cc19cc24a5a7d7119ef6f32f395b6 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Sun, 17 Jan 2010 09:55:07 +0000
Subject:

---
 doc/users/Oblomov.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/Oblomov.mdwn

diff --git a/doc/users/Oblomov.mdwn b/doc/users/Oblomov.mdwn
new file mode 100644
index 000000000..be6e666cb
--- /dev/null
+++ b/doc/users/Oblomov.mdwn
@@ -0,0 +1 @@
+Getting started with Ikiwiki, like the git backend a lot, would like to see a dynamic version of it.
-- 
cgit v1.2.3


From fa0bbaab21a456f8115d9af508fef06443b8d275 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Sun, 17 Jan 2010 09:56:26 +0000
Subject: Suggest # as page-field separator

---
 doc/plugins/contrib/getfield/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 42338a3c7..900ca65b2 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -16,6 +16,9 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 
 >>>> Oh. Hmm. I like your idea actually, or alternately, in keeping more with other plugins, doing it like {{pagename/fieldname}}. The meaning of the separator is less clear with /, but avoids potential issues with filename clashes that have a colon in them. It also keeps a certain logic - at least to me. Either way, I think both are good choices. [[SR|users/simonraven]]
 
+>>>>> What about using {{pagename#fieldname}}? The meaning of the hash in URLs sort of fits with what is needed here (reference to a 'named' thing within the page) and it won't conflict with actual hash usages (unless we expect different named parts of pages to define different values for the same field ...)
+>>>>> -- [[Oblomov]]
+
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
 > -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From 9c0c8b57fb9ccaf21888a7eb9e93dc0d312773e0 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 17 Jan 2010 17:27:51 +0000
Subject:

---
 doc/plugins/contrib/getfield/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 900ca65b2..ce6246034 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -18,6 +18,8 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 
 >>>>> What about using {{pagename#fieldname}}? The meaning of the hash in URLs sort of fits with what is needed here (reference to a 'named' thing within the page) and it won't conflict with actual hash usages (unless we expect different named parts of pages to define different values for the same field ...)
 >>>>> -- [[Oblomov]]
+>>>>>> That's a good one too. --[[simonraven]]
+
 
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
-- 
cgit v1.2.3


From 97bc5d8bcacd482874d0050166ba3f7a87ef9fd1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 12:08:26 -0500
Subject: typos

---
 IkiWiki/CGI.pm   | 2 +-
 debian/changelog | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cd4a5574c..bb26add9a 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -52,7 +52,7 @@ sub redirect ($$) {
 }
 
 sub decode_cgi_utf8 ($) {
-	# decode_form_utf8 method is needed for 5.10
+	# decode_form_utf8 method is needed for 5.01
 	if ($] < 5.01) {
 		my $cgi = shift;
 		foreach my $f ($cgi->param) {
diff --git a/debian/changelog b/debian/changelog
index 55213df9c..f17eed3e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -262,7 +262,7 @@ ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
-  * po: New plugin<F11>, suporting translation of wiki pages using po files.
+  * po: New plugin, suporting translation of wiki pages using po files.
     (intrigeri)
   * Add build machinery to build po files to translate the underlay wikis,
   * Add further build machinery to generate translated underlays from
-- 
cgit v1.2.3


From 461804a5e4e267dce332e0b953a164ba6b82a91e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 12:09:54 -0500
Subject: clarify error

---
 IkiWiki/Plugin/remove.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 2b8cf0414..3c1e0c713 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -51,7 +51,7 @@ sub check_canremove ($$$) {
 			IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
 		}
 		else {
-			error("renaming of attachments is not allowed");
+			error("removal of attachments is not allowed");
 		}
 	}
 
-- 
cgit v1.2.3


From f072f3a9c57bc590b4fb754a7cf65b5f93684006 Mon Sep 17 00:00:00 2001
From: "http://apoca.myopenid.com/" <http://apoca.myopenid.com/@web>
Date: Mon, 18 Jan 2010 17:25:13 +0000
Subject:

---
 doc/bugs/removing_pages_with_utf8_characters.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 doc/bugs/removing_pages_with_utf8_characters.mdwn

diff --git a/doc/bugs/removing_pages_with_utf8_characters.mdwn b/doc/bugs/removing_pages_with_utf8_characters.mdwn
new file mode 100644
index 000000000..a962a328a
--- /dev/null
+++ b/doc/bugs/removing_pages_with_utf8_characters.mdwn
@@ -0,0 +1,18 @@
+I have a page with the name "umläute". When I try to remove it, ikiwiki says:
+
+Error: ?umläute does not exist 
+
+I wrote the following patch, which seems to work on my machine. I'm running on FreeBSD 6.3-RELEASE with ikiwiki-3.20100102.3 and perl-5.8.9_3.
+
+    --- remove.pm.orig      2009-12-14 23:26:20.000000000 +0100
+    +++ remove.pm   2010-01-18 17:49:39.000000000 +0100
+    @@ -193,6 +193,7 @@
+                            # and that the user is allowed to edit(/remove) it.
+                            my @files;
+                            foreach my $page (@pages) {
+    +                               $page = Encode::decode_utf8($page);
+                                    check_canremove($page, $q, $session);
+     
+                                    # This untaint is safe because of the
+
+
-- 
cgit v1.2.3


From 32472c02ebcd646783855fcabd7f9f8c7f2bb4be Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 12:33:25 -0500
Subject: brace style

---
 IkiWiki/CGI.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index bb26add9a..07369ac10 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -15,7 +15,8 @@ sub printheader ($) {
 	if ($config{sslcookie}) {
 		print $session->header(-charset => 'utf-8',
 			-cookie => $session->cookie(-httponly => 1, -secure => 1));
-	} else {
+	}
+	else {
 		print $session->header(-charset => 'utf-8',
 			-cookie => $session->cookie(-httponly => 1));
 	}
-- 
cgit v1.2.3


From ccf14b185e37fad9b208b6a3d4490e1130ad9def Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 12:34:19 -0500
Subject: brace style and layout

---
 IkiWiki/Plugin/git.pm      | 5 ++++-
 IkiWiki/Plugin/monotone.pm | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index c5c83a3a7..786c7b1f2 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -419,7 +419,10 @@ sub git_sha1 (;$) {
 		'--', $file);
 	if ($sha1) {
 		($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
-	} else { debug("Empty sha1sum for '$file'.") }
+	}
+	else {
+		debug("Empty sha1sum for '$file'.");
+	}
 	return defined $sha1 ? $sha1 : q{};
 }
 
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index c717ceefb..9502804f1 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -558,7 +558,8 @@ sub rcs_recentchanges ($) {
 					# from the changelog
 					if ($cert->{key} eq $config{mtnkey}) {
 						$committype = "web";
-					} else {
+					}
+					else {
 						$committype = "mtn";
 					}
 				} elsif ($cert->{name} eq "date") {
-- 
cgit v1.2.3


From 265b4f0576d5e6be61d80239db372430c52f31b7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 12:38:05 -0500
Subject: response

---
 doc/bugs/removing_pages_with_utf8_characters.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/bugs/removing_pages_with_utf8_characters.mdwn b/doc/bugs/removing_pages_with_utf8_characters.mdwn
index a962a328a..77ec00575 100644
--- a/doc/bugs/removing_pages_with_utf8_characters.mdwn
+++ b/doc/bugs/removing_pages_with_utf8_characters.mdwn
@@ -2,6 +2,10 @@ I have a page with the name "umläute". When I try to remove it, ikiwiki says:
 
 Error: ?umläute does not exist 
 
+> I'm curious about the '?' in the "?umläute" message. Suggests that the
+> filename starts with another strange character. Can I get a copy of a
+> git repository or tarball containing this file? --[[Joey]] 
+
 I wrote the following patch, which seems to work on my machine. I'm running on FreeBSD 6.3-RELEASE with ikiwiki-3.20100102.3 and perl-5.8.9_3.
 
     --- remove.pm.orig      2009-12-14 23:26:20.000000000 +0100
@@ -16,3 +20,9 @@ I wrote the following patch, which seems to work on my machine. I'm running on F
                                     # This untaint is safe because of the
 
 
+> The problem with this patch is that, in a recent fix to the same
+> plugin, I made `@pages` come from `$form->field("page")`, and
+> that, in turn is already run through `decode_form_utf8` just above the
+> code you patched. So I need to understand why that is apparently not
+> working for you. (It works fine for me, even when deleting a file named 
+> "umläute" --[[Joey]] 
-- 
cgit v1.2.3


From be523e7740339d7884dabfa915c7c2df8c60bf27 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Mon, 18 Jan 2010 19:13:00 +0000
Subject: response

---
 doc/bugs/anonok_vs._httpauth.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index e386a8d96..0a62164cb 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -54,3 +54,7 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >>>>>> change. And then the Edit link for Discussion subpages could do
 >>>>>> as you suggest, adding one click for the httpauth user, who won't
 >>>>>> often need to edit those subpages. --[[schmonz]]
+
+>> On reflection, I've stopped being bothered by the
+>> redirect-to-signin-page approach. (It only needs to happen once per
+>> browser session, anyway.) Can we try that? --[[schmonz]]
-- 
cgit v1.2.3


From 4a8389825ae0715ba68846881ddc8d25b3f9ccb8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 18:00:10 -0500
Subject: update

---
 doc/bugs/removing_pages_with_utf8_characters.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/doc/bugs/removing_pages_with_utf8_characters.mdwn b/doc/bugs/removing_pages_with_utf8_characters.mdwn
index 77ec00575..2fa4efa8b 100644
--- a/doc/bugs/removing_pages_with_utf8_characters.mdwn
+++ b/doc/bugs/removing_pages_with_utf8_characters.mdwn
@@ -26,3 +26,24 @@ I wrote the following patch, which seems to work on my machine. I'm running on F
 > code you patched. So I need to understand why that is apparently not
 > working for you. (It works fine for me, even when deleting a file named 
 > "umläute" --[[Joey]] 
+
+----
+
+> Update, having looked at the file in the src of the wiki that
+> is causing trouble for remove, it is: `uml\303\203\302\244ute.mdwn`  
+> And that is not utf-8 encoded, which, represented the same
+> would be: `uml\303\244ute.mdwn`
+> 
+> I think it's doubly-utf-8 encoded, which perhaps explains why the above
+> patch works around the problem (since the page name gets doubly-decoded
+> with it). The patch doesn't fix related problems when using remove, etc.
+> 
+> Apparently, on apoca's system, perl encodes filenames differently
+> depending on locale settings. On mine, it does not. Ie, this perl
+> program always creates a file named `uml\303\244ute`, no matter
+> whether I run it with LANG="" or LANG="en_US.UTF-8":
+> 
+>	perl -e 'use IkiWiki; writefile("umläute", "./", "baz")'
+> 
+> Remains to be seen if this is due to the older version of perl used
+> there, or perhaps FreeBSD itself. --[[Joey]] 
-- 
cgit v1.2.3


From 30c5f62f741b8be4677b46b19a6c7ccb5963e101 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 20:41:12 -0500
Subject: update

---
 doc/bugs/removing_pages_with_utf8_characters.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/removing_pages_with_utf8_characters.mdwn b/doc/bugs/removing_pages_with_utf8_characters.mdwn
index 2fa4efa8b..0d96aa75f 100644
--- a/doc/bugs/removing_pages_with_utf8_characters.mdwn
+++ b/doc/bugs/removing_pages_with_utf8_characters.mdwn
@@ -47,3 +47,5 @@ I wrote the following patch, which seems to work on my machine. I'm running on F
 > 
 > Remains to be seen if this is due to the older version of perl used
 > there, or perhaps FreeBSD itself. --[[Joey]] 
+> 
+> Update: Perl 5.10 fixed the problem. --[[Joey]] 
-- 
cgit v1.2.3


From 8bf2f5a31ae3569b0c1c5b139640f7e8356a90f4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 19 Jan 2010 23:42:04 -0500
Subject: handle git-notes breakage

The new git-notes feature in git 1.6.6 changes git log output in a way that
broke ikiwiki's parser if notes are added to commits.

I decided to deal with this by disabling notes when ikiwiki uses git,
by setting GIT_NOTES_REF="". AFAICS, looking up notes when dumping logs
will only waste time, since it does not currently seem to make sense for
ikiwiki to do anything with the notes.
---
 IkiWiki/Plugin/git.pm | 3 +++
 debian/changelog      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 786c7b1f2..1eec6aee6 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -51,6 +51,9 @@ sub checkconfig () {
 			wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
 		};
 	}
+
+	# Avoid notes, parser does not handle and they only slow things down.
+	$ENV{GIT_NOTES_REF}="";
 	
 	# Run receive test only if being called by the wrapper, and not
 	# when generating same.
diff --git a/debian/changelog b/debian/changelog
index f17eed3e5..6fbbe0a23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
   * websetup: Fix bug in array change detection.
   * linkmap: Simplify and improve browser compatability by using an img, 
     not object tag.
+  * git: The new git-notes feature in git 1.6.6 changes git log output
+    in a way that broke ikiwiki's parser if notes are added to commits.
+    Deal with this.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
-- 
cgit v1.2.3


From ee9ae0a3149f04e9373a0b7b1fece99f5cc78e9c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 Jan 2010 15:23:25 -0500
Subject: po: avoid crash when page is empty

Note that there is an associated po4a warning when a page is empty:
  Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/Locale/Po4a/Text.pm line 205.
I've filed a bug with po4a about that, but the important thing is fixing
the crash here.
---
 IkiWiki/Plugin/po.pm | 12 ++----------
 debian/changelog     |  1 +
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 02fc4a89e..f8801185e 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -1057,11 +1057,8 @@ sub commit_and_refresh ($$) {
 	IkiWiki::saveindex();
 }
 
-# on success, returns the filtered content.
-# on error, if $nonfatal, warn and return undef; else, error out.
-sub po_to_markup ($$;$) {
+sub po_to_markup ($$) {
 	my ($page, $content) = (shift, shift);
-	my $nonfatal = shift;
 
 	$content = '' unless defined $content;
 	$content = decode_utf8(encode_utf8($content));
@@ -1084,10 +1081,6 @@ sub po_to_markup ($$;$) {
 
 	my $fail = sub ($) {
 		my $msg = "po(po_to_markup) - $page : " . shift;
-		if ($nonfatal) {
-			warn $msg;
-			return undef;
-		}
 		error($msg, sub { unlink $infile, $outfile});
 	};
 
@@ -1108,8 +1101,7 @@ sub po_to_markup ($$;$) {
 	$doc->write($outfile)
 		or return $fail->(sprintf(gettext("failed to write %s"), $outfile));
 
-	$content = readfile($outfile)
-		or return $fail->(sprintf(gettext("failed to read %s"), $outfile));
+	$content = readfile($outfile);
 
 	# Unlinking should happen automatically, thanks to File::Temp,
 	# but it does not work here, probably because of the way writefile()
diff --git a/debian/changelog b/debian/changelog
index 6fbbe0a23..91f5d7807 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
   * git: The new git-notes feature in git 1.6.6 changes git log output
     in a way that broke ikiwiki's parser if notes are added to commits.
     Deal with this.
+  * po: Avoid crash when a page is empty.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
-- 
cgit v1.2.3


From 2e585ec001e5b593b14307f7a871e48891c606df Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 22 Jan 2010 07:36:24 +0000
Subject: query, help!

---
 ...e_than_one_dest_page_from_same_source_page.mdwn | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn

diff --git a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
new file mode 100644
index 000000000..db7b49ae4
--- /dev/null
+++ b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
@@ -0,0 +1,23 @@
+Is it possible to render more than one destination page from the same source page?
+That is, same source, slightly different presentation at the other end, needing a different output file.
+
+I have two problems that would be solved by being able to do this.
+
+1. "full" and "print" versions of a page.
+
+One has a page "foo", which is rendered into foo.html.
+One also wants a foo-print.html page, which uses "page-print.tmpl" rather than "page.tmpl" as its template.
+
+I want to do this for every page on the site, automatically, so it isn't feasible to do it by hand.
+
+2. "en" and "en-us" versions of a page.
+
+My site is in non-US English.  However, I want US-English people to find my site when they search for it when they use US spelling on certain search terms (such as "optimise" versus "optimize").  This requires a (crude) US-English version of the site where the spellings are changed automatically, and the LANG is "en-us" rather than "en".  (No, don't tell me to use keywords; Google ignores keywords and has for a number of years).
+
+So I want the page "foo" to render to "foo.en.html" and "foo.en-us.html" where the content is the same, just some automated word-substitution applied before foo.en-us.html is written.  And do this for every page on the site.
+
+I can't do this with the "po" plugin, as it considers "en-us" not to be a valid language.  And the "po" plugin is probably overkill for what I want anyway.
+
+But I'm not sure how to achieve the result I need.
+
+-- [[KathrynAndersen]]
-- 
cgit v1.2.3


From f24ca627ddf147491dfc987c99b7fda9d5a63f95 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 22 Jan 2010 07:38:12 +0000
Subject: formatting

---
 doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
index db7b49ae4..73375938c 100644
--- a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
+++ b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
@@ -3,14 +3,16 @@ That is, same source, slightly different presentation at the other end, needing
 
 I have two problems that would be solved by being able to do this.
 
-1. "full" and "print" versions of a page.
+[[!toc startlevel=2]]
+
+##"full" and "print" versions of a page.
 
 One has a page "foo", which is rendered into foo.html.
 One also wants a foo-print.html page, which uses "page-print.tmpl" rather than "page.tmpl" as its template.
 
 I want to do this for every page on the site, automatically, so it isn't feasible to do it by hand.
 
-2. "en" and "en-us" versions of a page.
+##"en" and "en-us" versions of a page.
 
 My site is in non-US English.  However, I want US-English people to find my site when they search for it when they use US spelling on certain search terms (such as "optimise" versus "optimize").  This requires a (crude) US-English version of the site where the spellings are changed automatically, and the LANG is "en-us" rather than "en".  (No, don't tell me to use keywords; Google ignores keywords and has for a number of years).
 
-- 
cgit v1.2.3


From d264164673fd64f2e15bd14fa8179d182afd03d7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 Jan 2010 15:54:00 -0500
Subject: response

---
 ...ore_than_one_dest_page_from_same_source_page.mdwn | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
index 73375938c..e88c23b07 100644
--- a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
+++ b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
@@ -1,6 +1,17 @@
 Is it possible to render more than one destination page from the same source page?
 That is, same source, slightly different presentation at the other end, needing a different output file.
 
+> It's possible to render more than one output _file_ from a given source
+> page. See, for example, the inline plugin's generation of rss files.
+> This is done by calling `will_render()` and using `writefile()` to
+> generate the additional files. Probably in a format hook if you want
+> to generate html files.
+> 
+> It's not possible for one source file to represent multiple wiki pages.
+> There is a 1:1 mapping between source filenames and page names. The
+> difference between wiki pages and output files is that you can use
+> wikilinks to link to wiki pages, etc. --[[Joey]] 
+
 I have two problems that would be solved by being able to do this.
 
 [[!toc startlevel=2]]
@@ -12,6 +23,12 @@ One also wants a foo-print.html page, which uses "page-print.tmpl" rather than "
 
 I want to do this for every page on the site, automatically, so it isn't feasible to do it by hand.
 
+> Did you know that ikiwiki's `style.css` arranges for pages to display
+> differently when printed out? Things like the Action bar are hidden in
+> printouts (search for `@media print`). So I don't see a reason to need
+> whole files for printing when you can use these style sheet tricks.
+> --[[Joey]] 
+
 ##"en" and "en-us" versions of a page.
 
 My site is in non-US English.  However, I want US-English people to find my site when they search for it when they use US spelling on certain search terms (such as "optimise" versus "optimize").  This requires a (crude) US-English version of the site where the spellings are changed automatically, and the LANG is "en-us" rather than "en".  (No, don't tell me to use keywords; Google ignores keywords and has for a number of years).
@@ -23,3 +40,6 @@ I can't do this with the "po" plugin, as it considers "en-us" not to be a valid
 But I'm not sure how to achieve the result I need.
 
 -- [[KathrynAndersen]]
+
+> Sounds like this could be considered a single page that generates two
+> html files, so could be handled per above. --[[Joey]] 
-- 
cgit v1.2.3


From ac1b40643113893f9bc58bd92e23e2e94d475231 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 Jan 2010 16:25:22 -0500
Subject: releasing version 3.20100122

---
 debian/changelog |   7 ++-
 ikiwiki.spec     |   2 +-
 po/bg.po         | 138 ++++++++++++++++++++++++++++---------------------------
 po/cs.po         | 137 +++++++++++++++++++++++++++---------------------------
 po/da.po         | 137 +++++++++++++++++++++++++++---------------------------
 po/de.po         | 137 +++++++++++++++++++++++++++---------------------------
 po/es.po         | 138 ++++++++++++++++++++++++++++---------------------------
 po/fr.po         | 137 +++++++++++++++++++++++++++---------------------------
 po/gu.po         | 138 ++++++++++++++++++++++++++++---------------------------
 po/ikiwiki.pot   |  89 ++++++++++++++++++-----------------
 po/it.po         | 137 +++++++++++++++++++++++++++---------------------------
 po/pl.po         | 138 ++++++++++++++++++++++++++++---------------------------
 po/sv.po         | 138 ++++++++++++++++++++++++++++---------------------------
 po/tr.po         | 124 ++++++++++++++++++++++++-------------------------
 po/vi.po         | 138 ++++++++++++++++++++++++++++---------------------------
 15 files changed, 886 insertions(+), 849 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91f5d7807..4e76b1d69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100104) UNRELEASED; urgency=low
+ikiwiki (3.20100122) unstable; urgency=low
 
   * inline: Avoid showing edit links if page editing is disabled.
     (Sjoerd)
@@ -8,14 +8,13 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
   * img: Support alignment of images with captions. (Giuseppe Bilotta)
   * websetup: Fix utf-8 problems.
   * websetup: Fix bug in array change detection.
-  * linkmap: Simplify and improve browser compatability by using an img, 
+  * linkmap: Simplify and improve browser compatibility by using an img, 
     not object tag.
   * git: The new git-notes feature in git 1.6.6 changes git log output
     in a way that broke ikiwiki's parser if notes are added to commits.
-    Deal with this.
   * po: Avoid crash when a page is empty.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
+ -- Joey Hess <joeyh@debian.org>  Fri, 22 Jan 2010 16:02:36 -0500
 
 ikiwiki (3.20100102.3) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 78c32b962..044c7c033 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100102.3
+Version: 3.20100122
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index 8f62d4652..810a16e95 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -16,46 +16,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Първо трябва да влезете."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 #, fuzzy
 msgid "Preferences"
 msgstr "Предпочитанията са запазени."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Предпочитанията са запазени."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Грешка"
 
@@ -229,36 +229,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr ""
 
@@ -328,38 +328,38 @@ msgstr ""
 msgid "fortune failed"
 msgstr "грешшка в приставката „fortune”"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 #, fuzzy
 msgid "missing page"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 #, fuzzy
 msgid "not a page"
 msgstr "грешка при четене на „%s”: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -453,16 +453,21 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 #, fuzzy
 msgid "failed to run dot"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
@@ -608,7 +613,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
@@ -662,23 +667,18 @@ msgstr "грешка при запис на файла „%s”: %s"
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, fuzzy, perl-format
-msgid "failed to read %s"
-msgstr "грешка при запис на файла „%s”: %s"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -847,20 +847,20 @@ msgstr "обновяване на страницата „%s”"
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”"
@@ -998,30 +998,30 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1036,54 +1036,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1099,16 +1099,16 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1181,25 +1181,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
@@ -1224,6 +1224,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to read %s"
+#~ msgstr "грешка при запис на файла „%s”: %s"
+
 #~ msgid "discussion"
 #~ msgstr "дискусия"
 
diff --git a/po/cs.po b/po/cs.po
index 37374be28..399111069 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -15,11 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Nejprve se musíte přihlásit."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -27,35 +27,35 @@ msgstr ""
 "pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale "
 "Ezkoušíte se přihlásit přes http a ne přes https"
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "přihlášení selhalo; možná si musíte povolit cookies?"
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr "Vaše sezení expirovalo."
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr "Přihlášení"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr "Správce"
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Nastavení uloženo."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Chyba"
 
@@ -227,36 +227,36 @@ msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat"
 msgid "comments on page '%s' are closed"
 msgstr "komentáře na stránce „%s“ jsou uzamčeny"
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr "komentář uložen pro schválení"
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr "Váš komentář bude zobrazen po schválení moderátorem"
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr "Přidán komentář"
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Přidán komentář: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr "nejste přihlášeni jako správce"
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr "Schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr "schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr "Komentáře"
 
@@ -323,36 +323,36 @@ msgstr "musíte zadat formát a text"
 msgid "fortune failed"
 msgstr "fortune selhal"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 msgid "missing page"
 msgstr "chybějící stránka"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Stránka %s neexistuje."
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 msgid "not a page"
 msgstr "není stránkou"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s není ani příloha, ani stránka."
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "nejste oprávněni měnit %s"
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
@@ -439,15 +439,20 @@ msgstr "Přidat nový příspěvek nazvaný:"
 msgid "nonexistant template %s"
 msgstr "neexistující šablona %s"
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 msgid "failed to run dot"
 msgstr "nepodařilo se spustit dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "Stránka %s je zamknutá a nelze ji měnit"
@@ -589,7 +594,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "sestavuji %s"
@@ -647,22 +652,17 @@ msgstr "nepodařilo se přeložit %s"
 msgid "removed obsolete PO files"
 msgstr "odstraněny zastaralé PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, perl-format
 msgid "failed to write %s"
 msgstr "nepodařilo se zapsat %s"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 msgid "failed to translate"
 msgstr "překlad se nezdařil"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, perl-format
-msgid "failed to read %s"
-msgstr "nepodařilo se přečíst %s"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
@@ -830,20 +830,20 @@ msgstr "přejmenování %s"
 msgid "Also rename SubPages and attachments"
 msgstr "Také přejmenovat podstránky a přílohy"
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Najednou lze přejmenovat pouze jednu přílohu."
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Vyberte přílohu, kterou chcete přejmenovat."
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "přejmenování %s na %s"
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizace pro přejmenování %s na %s"
@@ -971,24 +971,24 @@ msgstr "modul"
 msgid "enable %s?"
 msgstr "povolit %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr "konfigurační soubor této wiki je neznámý"
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr "hlavní"
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr "moduly"
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -996,7 +996,7 @@ msgstr ""
 "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset "
 "znovusestavit wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1013,12 +1013,12 @@ msgstr "nemohu určit identitu nedůvěryhodného uživatele %s"
 msgid "bad file name %s"
 msgstr "chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1027,42 +1027,42 @@ msgstr ""
 "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-"
 "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s má několik možných zdrojových stránek"
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "sestavuji %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "odstraňuji %s, již není sestavována pomocí %s"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "sestavuji %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze sestavit %s"
@@ -1078,16 +1078,16 @@ msgstr "nemohu číst %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)"
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nepodporovaný systém pro správu verzí: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:"
@@ -1158,25 +1158,25 @@ msgstr "nelze použít několik rcs modulů"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
@@ -1201,6 +1201,9 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?"
 msgid "What is the domain name of the web server?"
 msgstr "Jaké je doménové jméno webového serveru?"
 
+#~ msgid "failed to read %s"
+#~ msgstr "nepodařilo se přečíst %s"
+
 #~ msgid "Failed to parse url, cannot determine domain name"
 #~ msgstr "Nepodařilo se syntakticky rozebrat url, nelze určit doménová jméno."
 
diff --git a/po/da.po b/po/da.po
index 9801ca011..4bff9254c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -19,11 +19,11 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Du skal først logge på."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -31,35 +31,35 @@ msgstr ""
 "mulig opsætningsfejl: sslcookie er sat, men du forsøger at logge på via "
 "http, ikke https"
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?"
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr "Din kørsel (login session) er udløbet"
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr "Pålogning"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr "Admin"
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Indstillinger gemt"
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Fejl"
 
@@ -234,36 +234,36 @@ msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere"
 msgid "comments on page '%s' are closed"
 msgstr "kommentarer på side '%s' er lukket"
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr "kommentar gemt for moderering"
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn"
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr "Tilføjede en kommentar"
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr "Kommentarmoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr "kommentarkoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr "Kommentarer"
 
@@ -330,37 +330,37 @@ msgstr "skal angive format og tekst"
 msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 msgid "missing page"
 msgstr "manglende side"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Siden %s eksisterer ikke."
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 #, fuzzy
 msgid "not a page"
 msgstr "kan ikke få sider til at passe sammen: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Du har ikke lov til at ændre %s"
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "du kan ikke påvirke en fil med modus %s"
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
@@ -450,15 +450,20 @@ msgstr "Tilføj nyt indlæg med følgende titel:"
 msgid "nonexistant template %s"
 msgstr "ikke-eksisterende skabelon: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 msgid "failed to run dot"
 msgstr "dot-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s er låst og kan ikke redigeres"
@@ -605,7 +610,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
@@ -663,22 +668,17 @@ msgstr "oversættelse af %s mislykkedes"
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, perl-format
-msgid "failed to read %s"
-msgstr "læsning af %s mislykkedes"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -845,20 +845,20 @@ msgstr "omdøb %s"
 msgid "Also rename SubPages and attachments"
 msgstr "Omdøb også UnderSider og vedhæftninger"
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Kun en vedhæftning kan blive omdøbt ad gangen."
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Vælg vedhæftningen som skal omdøbes."
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "omdøb %s til %s"
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "opdatering til omdøbning af %s til %s"
@@ -986,26 +986,26 @@ msgstr "udvidelse"
 msgid "enable %s?"
 msgstr "aktivér %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr "opsætningsfilen for denne wiki er ukendt"
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr "primær"
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr "udvidelser"
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i "
 "kraft."
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1013,7 +1013,7 @@ msgstr ""
 "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du "
 "muligvis genopbygge wikien."
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
@@ -1028,12 +1028,12 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "gennemlæser %s"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1042,42 +1042,42 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1093,16 +1093,16 @@ msgstr "kan ikke læse %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)"
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "revisionskontrolsystem %s ikke understøttet"
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes"
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:"
@@ -1174,25 +1174,25 @@ msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally krævet for title_natural sortering"
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
@@ -1217,6 +1217,9 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er webserverens domænenavn?"
 
+#~ msgid "failed to read %s"
+#~ msgstr "læsning af %s mislykkedes"
+
 #~ msgid "Failed to parse url, cannot determine domain name"
 #~ msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn"
 
diff --git a/po/de.po b/po/de.po
index e4b5ed9c4..53d0db850 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -15,11 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Sie müssen sich zuerst anmelden."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -27,36 +27,36 @@ msgstr ""
 "vermutliche Fehlkonfiguration: sslcookie ist gesetzt, aber Sie versuchen "
 "sich via http anzumelden, nicht https"
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?"
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr "Ihre Anmeldezeit ist abgelaufen."
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr "Administrator"
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Einstellungen gespeichert."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Fehler"
 
@@ -232,36 +232,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr "Kommentare zur Seite %s sind gesperrt"
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr "Der Kommentar wurde zur Moderation gespeichert"
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr "Ihr Kommentar wird nach Moderation verschickt"
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr "Kommentar hinzugefügt"
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Kommentar hinzugefügt: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr "Sie sind nicht als Administrator angemeldet"
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr "Kommentare"
 
@@ -328,37 +328,37 @@ msgstr "Format und Text müssen spezifiziert werden"
 msgid "fortune failed"
 msgstr "fortune fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 msgid "missing page"
 msgstr "fehlende Seite"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Die Seite %s existiert nicht."
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 #, fuzzy
 msgid "not a page"
 msgstr "Kann die Seiten nicht zuordnen: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Sie dürfen %s nicht verändern"
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
@@ -450,15 +450,20 @@ msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 msgid "nonexistant template %s"
 msgstr "nicht-vorhandene Vorlage %s"
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 msgid "failed to run dot"
 msgstr "dot konnte nicht ausgeführt werden"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s ist gesperrt und kann nicht bearbeitet werden"
@@ -608,7 +613,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
@@ -666,22 +671,17 @@ msgstr "übersetzen von %s fehlgeschlagen"
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, perl-format
-msgid "failed to read %s"
-msgstr "lesen von %s fehlgeschlagen"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -851,20 +851,20 @@ msgstr "benenne %s um"
 msgid "Also rename SubPages and attachments"
 msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen"
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden."
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll."
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "benenne %s in %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualisiert zum Umbenennen von %s nach %s"
@@ -992,26 +992,26 @@ msgstr "Erweiterung"
 msgid "enable %s?"
 msgstr "%s aktivieren?"
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt"
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr "Hauptseite"
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr "Erweiterungen"
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des "
 "Wikis, um wirksam zu werden."
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1019,7 +1019,7 @@ msgstr ""
 "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam "
 "werden, kann es notwendig sein, das Wikis neu zu bauen."
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1037,12 +1037,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "durchsuche %s"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1051,42 +1051,42 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1103,16 +1103,16 @@ msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)"
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nicht unterstütztes Versionskontrollsystem %s"
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen"
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1188,25 +1188,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally wird benötigt für title_natural sort"
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
@@ -1231,6 +1231,9 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?"
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
 
+#~ msgid "failed to read %s"
+#~ msgstr "lesen von %s fehlgeschlagen"
+
 #~ msgid "Failed to parse url, cannot determine domain name"
 #~ msgstr ""
 #~ "auswerten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen"
diff --git a/po/es.po b/po/es.po
index ca26b0bf6..de85edbdf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Antes es necesario identificarse."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -31,36 +31,36 @@ msgstr ""
 "activa, pero está intentando registrarse en el sistema vía el protocolo "
 "'http' y no 'https'"
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr "Su registro en el sistema ha expirado."
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr "Identificación"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr "Administración"
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Las preferencias se han guardado."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Error"
 
@@ -236,36 +236,36 @@ msgstr "la página '%s' no existe, así que no se puede comentar sobre ella"
 msgid "comments on page '%s' are closed"
 msgstr "los comentarios para la página '%s' están cerrados"
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr "comentario guardado a la espera de aprobación"
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr "Su comentario será publicado después de que el moderador lo revise"
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr "Añadir un comentario"
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr "No está registrado como un administrador"
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr "Aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr "aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -332,37 +332,37 @@ msgstr "se deben especificar tanto el formato como el texto"
 msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 msgid "missing page"
 msgstr "página no encontrada"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 #, fuzzy
 msgid "not a page"
 msgstr "no encuentro páginas coincidentes: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No puede cambiar %s"
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "no puede actuar sobre un archivo con permisos %s"
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
@@ -454,15 +454,20 @@ msgstr "Añadir una entrada nueva titulada:"
 msgid "nonexistant template %s"
 msgstr "la plantilla %s no existe "
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 msgid "failed to run dot"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "La página %s está bloqueada y no puede modificarse"
@@ -609,7 +614,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
@@ -663,23 +668,18 @@ msgstr "dimensionamiento fallido: %s"
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, fuzzy, perl-format
-msgid "failed to read %s"
-msgstr "no puedo leer de %s: %s "
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -845,20 +845,20 @@ msgstr "cambiando de nombre %s"
 msgid "Also rename SubPages and attachments"
 msgstr "También cambia de nombre las subpáginas y los adjuntos"
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Únicamente un adjunto puede ser renombrado a la vez."
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Por favor, seleccione el adjunto al que cambiar el nombre."
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "%s cambia de nombre a %s"
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "actualizado el cambio de nombre de %s a %s"
@@ -990,26 +990,26 @@ msgstr "complemento"
 msgid "enable %s?"
 msgstr "¿ activar %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr "El archivo de configuración para este wiki es desconocido"
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr "principal"
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr "complementos"
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Los cambios en la configuración que se muestran más abajo precisan una "
 "reconstrucción del wiki para tener efecto."
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1017,7 +1017,7 @@ msgstr ""
 "Para que los cambios en la configuración mostrados más abajo tengan efecto, "
 "es posible que necesite reconstruir el wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1034,12 +1034,12 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1048,44 +1048,44 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1101,16 +1101,16 @@ msgstr "no puedo leer el archivo %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)"
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "el sistema de control de versiones %s no está soportado"
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1185,29 +1185,29 @@ msgstr "no puedo emplear varios complementos rcs"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 "Se necesita el módulo Sort::Naturally para el tipo de ordenación "
 "title_natural"
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
@@ -1235,6 +1235,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#, fuzzy
+#~ msgid "failed to read %s"
+#~ msgstr "no puedo leer de %s: %s "
+
 #~ msgid "Failed to parse url, cannot determine domain name"
 #~ msgstr ""
 #~ "Error en el análisis del URL, no puedo determinar el nombre del dominio"
diff --git a/po/fr.po b/po/fr.po
index fbfb49a88..5ba71d6cf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Vous devez d'abord vous identifier."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -29,35 +29,35 @@ msgstr ""
 "Erreur de configuration probable : sslcookie est positionné mais vous tentez "
 "de vous connecter avec http au lieu de https"
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Échec de l'identification, vous devez autoriser les cookies."
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr "Session d'authentification expirée."
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr "S’identifier"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr "Administrateur"
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Les préférences ont été enregistrées."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Erreur"
 
@@ -229,36 +229,36 @@ msgstr "La page '%s' n'existe pas, commentaire impossible."
 msgid "comments on page '%s' are closed"
 msgstr "Le commentaire pour la page '%s' est terminé."
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr "Le commentaire a été enregistré, en attente de « modération »"
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr "Votre commentaire sera publié après vérification par le modérateur"
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr "Commentaire ajouté"
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr "Vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr "Modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr "modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr "Commentaires"
 
@@ -325,36 +325,36 @@ msgstr "le format et le texte doivent être indiqués"
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 msgid "missing page"
 msgstr "Page manquante"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La page %s n'existe pas."
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 msgid "not a page"
 msgstr "Ce n'est pas une page."
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s est une pièce jointe, pas une page."
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Vous n'êtes pas autorisé à modifier %s"
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
@@ -446,15 +446,20 @@ msgstr "Ajouter un nouvel article dont le titre est :"
 msgid "nonexistant template %s"
 msgstr "Le modèle de page %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 msgid "failed to run dot"
 msgstr "Échec du lancement de dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s est verrouillé et ne peut être modifié"
@@ -607,7 +612,7 @@ msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
@@ -665,22 +670,17 @@ msgstr "Impossible de traduire %s"
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, perl-format
-msgid "failed to read %s"
-msgstr "Impossible de lire %s"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -849,20 +849,20 @@ msgstr "%s renommé"
 msgid "Also rename SubPages and attachments"
 msgstr "« SubPages » et attachements renommés."
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Modification de pièce jointe : une seule à la fois"
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Veuillez sélectionner la pièce jointe à renommer"
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "Renomme %s en %s"
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "mise à jour, suite au changement de %s en %s"
@@ -990,26 +990,26 @@ msgstr "greffon"
 msgid "enable %s?"
 msgstr "activer %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr "Le fichier de configuration de ce wiki n'est pas connu"
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr "Partie principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr "Greffons"
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Les changements de configuration ci-dessous nécessitent une recompilation du "
 "wiki pour prendre effet"
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1017,7 +1017,7 @@ msgstr ""
 "Pour que les changements de configuration ci-dessous prennent effet vous "
 "devez recompiler le wiki"
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées."
@@ -1033,12 +1033,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1047,42 +1047,42 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1100,16 +1100,16 @@ msgstr ""
 "Vous devez spécifier un nom de wiki (contenant des caractères "
 "alphanumériques)"
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "Système de contrôle de version non reconnu : %s"
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1184,25 +1184,25 @@ msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
@@ -1227,6 +1227,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "failed to read %s"
+#~ msgstr "Impossible de lire %s"
+
 #~ msgid "Failed to parse url, cannot determine domain name"
 #~ msgstr "Impossible d'analyser l'URL, pas de nom de domaine"
 
diff --git a/po/gu.po b/po/gu.po
index 96e9ad184..83afdef4c 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -15,46 +15,46 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?"
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 #, fuzzy
 msgid "Preferences"
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -227,36 +227,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr ""
 
@@ -326,38 +326,38 @@ msgstr ""
 msgid "fortune failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 #, fuzzy
 msgid "missing page"
 msgstr "ખોવાયેલ કિંમતો"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 #, fuzzy
 msgid "not a page"
 msgstr "વાંચી શકાતી નથી %s: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -448,15 +448,20 @@ msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેર
 msgid "nonexistant template %s"
 msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 msgid "failed to run dot"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી"
@@ -598,7 +603,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
@@ -652,23 +657,18 @@ msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, fuzzy, perl-format
-msgid "failed to read %s"
-msgstr "%s વાંચવામાં નિષ્ફળ: %s"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -837,20 +837,20 @@ msgstr "રેન્ડર કરે છે %s"
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "%s નો સુધારો %s નાં %s વડે"
@@ -984,30 +984,30 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1022,54 +1022,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1085,16 +1085,16 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1165,25 +1165,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
@@ -1208,6 +1208,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to read %s"
+#~ msgstr "%s વાંચવામાં નિષ્ફળ: %s"
+
 #~ msgid "discussion"
 #~ msgstr "ચર્ચા"
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 38a464141..f4749b841 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-02 21:47-0500\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,45 +16,45 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:318
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 msgid "Preferences"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:282
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:409 ../IkiWiki/CGI.pm:410 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -338,18 +338,18 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -436,16 +436,20 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:621
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:102 ../IkiWiki/Plugin/linkmap.pm:109
-#: ../IkiWiki/Plugin/linkmap.pm:113 ../IkiWiki/Plugin/linkmap.pm:116
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 msgid "failed to run dot"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
@@ -583,7 +587,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:652
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr ""
@@ -637,22 +641,17 @@ msgstr ""
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, perl-format
-msgid "failed to read %s"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -959,30 +958,30 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -997,54 +996,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:483
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:492
+#: ../IkiWiki/Render.pm:495
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:615
+#: ../IkiWiki/Render.pm:618
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:628
+#: ../IkiWiki/Render.pm:631
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:693
+#: ../IkiWiki/Render.pm:696
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 7e0d3dd90..3b0f45348 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Occorre prima effettuare l'accesso."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -25,35 +25,35 @@ msgstr ""
 "possibile errore di configurazione: sslcookie è impostato, ma si sta "
 "tentando un accesso via http, non https"
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?"
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr "La sessione è scaduta."
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr "Entra"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr "Amministrazione"
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Errore"
 
@@ -226,36 +226,36 @@ msgstr "la pagina «%s» non esiste, impossibile commentarla"
 msgid "comments on page '%s' are closed"
 msgstr "i commenti per la pagina «%s» sono chiusi"
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr "commento trattenuto per moderazione"
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr "Il commento sarà pubblicato dopo la verifica del moderatore"
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr "Aggiunto commento"
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Aggiunto commento: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr "non siete autenticati come amministratore"
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr "Moderazione commenti"
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr "moderazione commento"
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr "Commenti"
 
@@ -322,36 +322,36 @@ msgstr "occorre specificare formato e testo"
 msgid "fortune failed"
 msgstr "errore nel fortune"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 msgid "missing page"
 msgstr "pagina mancante"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La pagina %s non esiste."
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 msgid "not a page"
 msgstr "non è una pagina"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s è un allegato, non una pagina."
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "non è permesso modificare %s"
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "non è permesso lavorare su un file in modalità %s"
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
@@ -441,15 +441,20 @@ msgstr "Aggiungere un nuovo articolo dal titolo:"
 msgid "nonexistant template %s"
 msgstr "modello %s non esistente"
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 msgid "failed to run dot"
 msgstr "impossibile eseguire dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s è bloccata e non può essere modificata"
@@ -598,7 +603,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
@@ -656,22 +661,17 @@ msgstr "impossibile tradurre %s"
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, perl-format
-msgid "failed to read %s"
-msgstr "impossibile leggere %s"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
@@ -841,20 +841,20 @@ msgstr "rinomina di %s"
 msgid "Also rename SubPages and attachments"
 msgstr "Rinomina anche SottoPagine e allegati"
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Si può rinominare un solo allegato alla volta."
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Selezionare l'allegato da rinominare."
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "rinomina %s in %s"
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aggiornamento per rinomina di %s in %s"
@@ -982,26 +982,26 @@ msgstr "plugin"
 msgid "enable %s?"
 msgstr "abilitare %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr "il file di setup di questo wiki non è noto"
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr "principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr "plugin"
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Le sottostanti modifiche alla configurazione richiedono la ricompilazione "
 "del wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1009,7 +1009,7 @@ msgstr ""
 "Affinché le sottostanti modifiche alla configurazione abbiano effetto, "
 "occorre ricostruire il wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
@@ -1024,12 +1024,12 @@ msgstr "impossibile determinare l'id del committer non fidato %s"
 msgid "bad file name %s"
 msgstr "nome file %s scorretto"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "scansione %s"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1038,42 +1038,42 @@ msgstr ""
 "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare "
 "allow_symlinks_before_srcdir per abilitare questa configurazione"
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorato il file dal nome scorretto %s"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s ha diverse pagine sorgenti possibili"
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "rimozione della vecchia pagina %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "compilazione di %s, che è collegato a %s"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "rimozione di %s, non più richiesto da %s"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "compilazione di %s, che dipende da %s"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1089,16 +1089,16 @@ msgstr "impossibile leggere %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)"
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "sistema di controllo di revisione %s non supportato"
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "impossibile creare un repository tramite ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1170,25 +1170,25 @@ msgstr "impossibile usare più plugin rcs"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
@@ -1213,6 +1213,9 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
 msgid "What is the domain name of the web server?"
 msgstr "Qual è il nome del dominio del server web?"
 
+#~ msgid "failed to read %s"
+#~ msgstr "impossibile leggere %s"
+
 #~ msgid "Failed to parse url, cannot determine domain name"
 #~ msgstr ""
 #~ "Errore nell'interpretazione dell'URL, impossibile determinare il nome del "
diff --git a/po/pl.po b/po/pl.po
index 81addd8d9..203155cfb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -16,48 +16,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Proszę najpierw zalogować się."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są "
 "ciasteczka (ang. cookies)"
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 #, fuzzy
 msgid "Preferences"
 msgstr "Preferencje zapisane."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Preferencje zapisane."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Błąd"
 
@@ -231,36 +231,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr ""
 
@@ -330,38 +330,38 @@ msgstr ""
 msgid "fortune failed"
 msgstr "awaria fortunki"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 #, fuzzy
 msgid "missing page"
 msgstr "brakujące wartości"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 #, fuzzy
 msgid "not a page"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -455,16 +455,21 @@ msgstr "Tytuł nowego wpisu"
 msgid "nonexistant template %s"
 msgstr "brakujący szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 #, fuzzy
 msgid "failed to run dot"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
@@ -611,7 +616,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
@@ -665,23 +670,18 @@ msgstr "awaria w trakcie zmiany rozmiaru: %s"
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, fuzzy, perl-format
-msgid "failed to read %s"
-msgstr "awaria w trakcie odczytu %s: %s"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -852,20 +852,20 @@ msgstr "renderowanie %s"
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s"
@@ -1006,30 +1006,30 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1044,54 +1044,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "skanowanie %s"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1107,16 +1107,16 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1189,25 +1189,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
@@ -1232,6 +1232,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to read %s"
+#~ msgstr "awaria w trakcie odczytu %s: %s"
+
 #~ msgid "discussion"
 #~ msgstr "dyskusja"
 
diff --git a/po/sv.po b/po/sv.po
index 21a65ae5d..49518e2a8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -15,46 +15,46 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Du måste logga in först."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 #, fuzzy
 msgid "Preferences"
 msgstr "Inställningar sparades."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Inställningar sparades."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Fel"
 
@@ -228,36 +228,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr ""
 
@@ -327,38 +327,38 @@ msgstr ""
 msgid "fortune failed"
 msgstr "fortune misslyckades"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 #, fuzzy
 msgid "missing page"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 #, fuzzy
 msgid "not a page"
 msgstr "kan inte läsa %s: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -450,16 +450,21 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 #, fuzzy
 msgid "failed to run dot"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s är låst av %s och kan inte redigeras"
@@ -604,7 +609,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
@@ -658,23 +663,18 @@ msgstr "misslyckades med att skriva %s: %s"
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, fuzzy, perl-format
-msgid "failed to read %s"
-msgstr "misslyckades med att skriva %s: %s"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -842,20 +842,20 @@ msgstr "ritar upp %s"
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "uppdatering av %s, %s av %s"
@@ -993,30 +993,30 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1031,54 +1031,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1094,16 +1094,16 @@ msgstr "kan inte läsa %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1174,25 +1174,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
@@ -1217,6 +1217,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to read %s"
+#~ msgstr "misslyckades med att skriva %s: %s"
+
 #~ msgid "discussion"
 #~ msgstr "diskussion"
 
diff --git a/po/tr.po b/po/tr.po
index f3bce9f4f..113427f9b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-02 13:10-0500\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -13,45 +13,45 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Önce sisteme giriş yapmanız gerekiyor."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr "Giriş"
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr "Yönet"
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Hata"
 
@@ -221,36 +221,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr ""
 
@@ -317,36 +317,36 @@ msgstr ""
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 msgid "not a page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -433,15 +433,20 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:621
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 msgid "failed to run dot"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
@@ -579,7 +584,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:652
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr ""
@@ -633,22 +638,17 @@ msgstr ""
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, perl-format
-msgid "failed to read %s"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -814,20 +814,20 @@ msgstr ""
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -955,30 +955,30 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -993,54 +993,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:483
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:492
+#: ../IkiWiki/Render.pm:495
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:615
+#: ../IkiWiki/Render.pm:618
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:628
+#: ../IkiWiki/Render.pm:631
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:693
+#: ../IkiWiki/Render.pm:696
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1056,16 +1056,16 @@ msgstr ""
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 03ff3bf76..9fccf87b5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-31 18:31-0400\n"
+"POT-Creation-Date: 2010-01-22 16:04-0500\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -16,46 +16,46 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.6fc1\n"
 
-#: ../IkiWiki/CGI.pm:114
+#: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
 msgstr "Trước tiên bạn cần phải đăng nhập."
 
-#: ../IkiWiki/CGI.pm:147
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:150
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:193
 #, fuzzy
 msgid "Preferences"
 msgstr "Tùy thích đã được lưu."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:232
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Tùy thích đã được lưu."
 
-#: ../IkiWiki/CGI.pm:278
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
 msgid "Error"
 msgstr "Lỗi"
 
@@ -229,36 +229,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:466
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:479
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:576
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:615
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:766
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comments"
 msgstr ""
 
@@ -328,38 +328,38 @@ msgstr ""
 msgid "fortune failed"
 msgstr "fortune bị lỗi"
 
-#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55
+#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
 #, fuzzy
 msgid "missing page"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:73
+#: ../IkiWiki/Plugin/getsource.pm:74
 #, fuzzy
 msgid "not a page"
 msgstr "không thể đọc %s: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:75
+#: ../IkiWiki/Plugin/getsource.pm:76
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669
+#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:691
+#: ../IkiWiki/Plugin/git.pm:697
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:695
+#: ../IkiWiki/Plugin/git.pm:701
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -453,16 +453,21 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:598
+#: ../IkiWiki/Plugin/inline.pm:624
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
-#: ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
+#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
 #, fuzzy
 msgid "failed to run dot"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:84
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:48
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s bị %s khoá nên không thể sửa được"
@@ -605,7 +610,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638
+#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
@@ -659,23 +664,18 @@ msgstr "lỗi ghi %s: %s"
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109
-#: ../IkiWiki/Plugin/po.pm:1149
+#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1141
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1107
+#: ../IkiWiki/Plugin/po.pm:1100
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1112
-#, fuzzy, perl-format
-msgid "failed to read %s"
-msgstr "lỗi ghi %s: %s"
-
-#: ../IkiWiki/Plugin/po.pm:1161
+#: ../IkiWiki/Plugin/po.pm:1153
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -843,20 +843,20 @@ msgstr "đang vẽ %s"
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:247
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:347
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:571
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "cập nhật %2$s của %1$s bởi %3$s"
@@ -994,30 +994,30 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:244
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:257
+#: ../IkiWiki/Plugin/websetup.pm:261
 msgid "plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:404
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:408
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:436
+#: ../IkiWiki/Plugin/websetup.pm:445
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1032,54 +1032,54 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:150
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
-#: ../IkiWiki/Render.pm:271
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:305
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:395
+#: ../IkiWiki/Render.pm:413
 #, perl-format
 msgid "removing old page %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:471
+#: ../IkiWiki/Render.pm:486
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:480
+#: ../IkiWiki/Render.pm:495
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
-#: ../IkiWiki/Render.pm:603
+#: ../IkiWiki/Render.pm:618
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:616
+#: ../IkiWiki/Render.pm:631
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:696
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
@@ -1095,16 +1095,16 @@ msgstr "không thể đọc %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:76
+#: ../IkiWiki/Setup/Automator.pm:79
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:102
+#: ../IkiWiki/Setup/Automator.pm:105
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:120
+#: ../IkiWiki/Setup/Automator.pm:123
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1175,25 +1175,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1264
+#: ../IkiWiki.pm:1263
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1863
+#: ../IkiWiki.pm:1862
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2006
+#: ../IkiWiki.pm:2005
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2017
+#: ../IkiWiki.pm:2016
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2036
+#: ../IkiWiki.pm:2035
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
@@ -1218,6 +1218,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to read %s"
+#~ msgstr "lỗi ghi %s: %s"
+
 #~ msgid "discussion"
 #~ msgstr "thảo luận"
 
-- 
cgit v1.2.3


From 450f8b78b87e18374a0c0f4d7461ed29a4d8cdcb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 Jan 2010 16:26:31 -0500
Subject: add news item for ikiwiki 3.20100122

---
 doc/news/version_3.20091031.mdwn | 13 -------------
 doc/news/version_3.20100122.mdwn | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 doc/news/version_3.20091031.mdwn
 create mode 100644 doc/news/version_3.20100122.mdwn

diff --git a/doc/news/version_3.20091031.mdwn b/doc/news/version_3.20091031.mdwn
deleted file mode 100644
index bb77bfa31..000000000
--- a/doc/news/version_3.20091031.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-ikiwiki 3.20091031 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * po: Fix breakage caused by changes to render code.
-   * mdwn: Avoid trying to use multimarkdown if it is not installed.
-   * moderatedcomments: New plugin to allow comment moderation w/o relying
-     on blogspam.net.
-   * When redirecting to a page, ie, after editing, ensure that the
-     url is uri-encoded. Most browsers other than MSIE don't care, but it's
-     the right thing to do.
-   * Add a spec file to allow building rpm from the source package.
-   * google: Pass the whole wiki url to google, not just the domain,
-     so that search works correctly for wikis that are located in
-     subdirectories of domains."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100122.mdwn b/doc/news/version_3.20100122.mdwn
new file mode 100644
index 000000000..11051fad8
--- /dev/null
+++ b/doc/news/version_3.20100122.mdwn
@@ -0,0 +1,15 @@
+ikiwiki 3.20100122 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * inline: Avoid showing edit links if page editing is disabled.
+     (Sjoerd)
+   * signinedit: Auto-disable the plugin when all authentication methods
+     are disabled.
+   * comments: Fix permalinks for comments using new conflict-free filenames.
+   * img: Support alignment of images with captions. (Giuseppe Bilotta)
+   * websetup: Fix utf-8 problems.
+   * websetup: Fix bug in array change detection.
+   * linkmap: Simplify and improve browser compatibility by using an img,
+     not object tag.
+   * git: The new git-notes feature in git 1.6.6 changes git log output
+     in a way that broke ikiwiki's parser if notes are added to commits.
+   * po: Avoid crash when a page is empty."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 6c5f9b914a067056e1d42921e639515507b34302 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Fri, 22 Jan 2010 22:46:31 +0000
Subject: new forum thread - file navigation

---
 ...of_wiki_pages_on_local_filesystem_with_vim.mdwn | 72 ++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
new file mode 100644
index 000000000..1f67a041d
--- /dev/null
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -0,0 +1,72 @@
+I wrote a vim function to help me navigate the wiki when I'm editing it. It extends the 'gf' (goto file) functionality. Once installed, you place the cursor on a wiki page name and press 'gf' (without the quotes); if the file exists, it gets loaded.
+
+This function takes into account the ikiwiki linking rules when deciding which file to go to.
+
+let me know what you think
+
+To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
+
+    " returns the directory which can be considered the root of the wiki the
+    " current buffer belongs to, or an empty string if we are not inside an
+    " ikiwiki wiki
+    "
+    " NOTE: the root of the wiki is considered the first directory that contains a
+    " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
+    "
+    " if you can think of a better heuristic to get ikiwiki's root, let me know!
+    function! GetWikiRootDir()
+      let check_str = '%:p:h'
+      let pos_wiki_root = expand(check_str)
+      while pos_wiki_root != '/'
+        if isdirectory(pos_wiki_root . '/.ikiwiki') && pos_wiki_root != $HOME
+          return pos_wiki_root
+        endif
+        let check_str = check_str . ':h'
+        let pos_wiki_root = expand(check_str)
+      endwhile
+      if isdirectory('/.ikiwiki')
+        return '/'
+      endif
+      return ''
+    endfunction
+    
+    " This function searches for a .mdwn file (<a:name>.mdwn) using the ikiwiki
+    " WikiLink rules and returns its full path.
+    "
+    " The rules are the following
+    "
+    " if the filename starts with '/', use as base dir the root directory of the
+    " wiki
+    "
+    " if not:
+    "
+    " try first ./<bufname>/<a:name>.mdwn
+    " then for  ./<a:name>.mdwn
+    " then for  <root_of_wiki>/<a:name>.mdwn
+    "
+    " return the first one that exists
+    "
+    " the base path (. above) is the directory that contains the current buffer
+    "
+    function! FileForWikiLink(name)
+      let target_fname=a:name . ".mdwn"
+      let wikiroot_dir = GetWikiRootDir()
+      if match(target_fname, '^/') >= 0
+        return wikiroot_dir . target_fname
+      endif
+      let subdir_file = expand('%:p:r') . "/" . target_fname
+      let currdir_file = expand('%:p:h') . "/" . target_fname
+      let wikiroot_file = wikiroot_dir . "/" . target_fname
+      if filewritable(subdir_file)
+        return subdir_file
+      endif
+      if filewritable(currdir_file)
+        return currdir_file
+      endif
+      if filewritable(wikiroot_file)
+        return wikiroot_file
+      endif
+      return a:name
+    endfunction
+    
+    setlocal includeexpr=FileForWikiLink(v:fname)
-- 
cgit v1.2.3


From cefcf60843968389ad85c232ecbf38dff19a4b67 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 22 Jan 2010 23:24:20 +0000
Subject:

---
 .../Render_more_than_one_dest_page_from_same_source_page.mdwn     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
index e88c23b07..e7362c903 100644
--- a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
+++ b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
@@ -6,7 +6,9 @@ That is, same source, slightly different presentation at the other end, needing
 > This is done by calling `will_render()` and using `writefile()` to
 > generate the additional files. Probably in a format hook if you want
 > to generate html files.
-> 
+
+>> Thanks for the tip, I'll take a look at that. -- [[KathrynAndersen]]
+ 
 > It's not possible for one source file to represent multiple wiki pages.
 > There is a 1:1 mapping between source filenames and page names. The
 > difference between wiki pages and output files is that you can use
@@ -29,6 +31,8 @@ I want to do this for every page on the site, automatically, so it isn't feasibl
 > whole files for printing when you can use these style sheet tricks.
 > --[[Joey]] 
 
+>>Fair enough. --[[KathrynAndersen]]
+
 ##"en" and "en-us" versions of a page.
 
 My site is in non-US English.  However, I want US-English people to find my site when they search for it when they use US spelling on certain search terms (such as "optimise" versus "optimize").  This requires a (crude) US-English version of the site where the spellings are changed automatically, and the LANG is "en-us" rather than "en".  (No, don't tell me to use keywords; Google ignores keywords and has for a number of years).
@@ -43,3 +47,5 @@ But I'm not sure how to achieve the result I need.
 
 > Sounds like this could be considered a single page that generates two
 > html files, so could be handled per above. --[[Joey]] 
+
+>>Thanks! --[[KathrynAndersen]]
-- 
cgit v1.2.3


From b3b2402647e1628cea76922f5a6dc12adaa5a2b7 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 22 Jan 2010 23:36:17 +0000
Subject: discovered a wrinkle

---
 .../discussion.mdwn                                            | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
new file mode 100644
index 000000000..183a8ef55
--- /dev/null
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
@@ -0,0 +1,10 @@
+        " NOTE: the root of the wiki is considered the first directory that contains a
+        " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
+
+That's not going to work in all situations; for example, with an ikiwiki which uses git as the backend, the normal setup is that one has
+
+* a bare git repository
+* a git repository which ikiwiki builds the wiki from (which has a .ikiwiki directory in it)
+* an *additional* git repository cloned from the bare repository, which is used for making changes from the command-line rather than the web.  It is this repository in which one would be editing files with vim, and *this* repository does not have a .ikiwiki directory in it.  It does have a .git directory in the root, however, so I suppose you could use that as a method of detection of a root directory, but of course that would only work for git repositories.
+
+-- [[KathrynAndersen]]
-- 
cgit v1.2.3


From d0a06e6952f13a9a0c7d2959e393f700ee66c192 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 23 Jan 2010 16:37:42 +0000
Subject: update about wiki page navigation

---
 .../navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 1f67a041d..9545fda53 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -2,6 +2,14 @@ I wrote a vim function to help me navigate the wiki when I'm editing it. It exte
 
 This function takes into account the ikiwiki linking rules when deciding which file to go to.
 
+> 'gf' gets in the way when there are directories with the same name of a wiki page. The 
+> function below doesn't implement the linking rules properly (test the link (ignoring case),
+> if there is no match ascend the dir. hierarchy and start over, until we reach the root of
+> the wiki). I'm rewriting it to follow these rules properly
+> 
+> I think the page for [[LinkingRules|ikiwiki/subpage/linkingrules]] should say that ikiwiki **ascends**
+> the dir. hierarchy when looking for a wikilink, not that it **descends** it. Am I correct? --[[jerojasro]]
+
 let me know what you think
 
 To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
-- 
cgit v1.2.3


From 5456f720cd6fca6c5d8ec2d7da3dd745799ea26c Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/gsvick"
 <http://www.google.com/profiles/gsvick@web>
Date: Sat, 23 Jan 2010 19:03:32 +0000
Subject:

---
 doc/forum/Error:_bad_page_name.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/forum/Error:_bad_page_name.mdwn

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
new file mode 100644
index 000000000..59974ca00
--- /dev/null
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -0,0 +1,5 @@
+I'm trying to use ikiwiki for the first time. In the start, I had problems with installing the package, because I don't have a root account on my server.
+
+When I solved this, I finally set up my wiki, but whenever I try to edit a page, I get an error: “Error: bad page name”.
+
+What am I doing wrong? The wiki is at <http://atrey.karlin.mff.cuni.cz/~onderka/wiki/>, the setupfile I used at <http://atrey.karlin.mff.cuni.cz/~onderka/wiki/ikiwiki.setup>.
-- 
cgit v1.2.3


From 8b2977ea7a78556ace2e14a5d30b48e455e37ad0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 14:14:34 -0500
Subject: response

---
 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 9545fda53..14f592fd7 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -10,6 +10,9 @@ This function takes into account the ikiwiki linking rules when deciding which f
 > I think the page for [[LinkingRules|ikiwiki/subpage/linkingrules]] should say that ikiwiki **ascends**
 > the dir. hierarchy when looking for a wikilink, not that it **descends** it. Am I correct? --[[jerojasro]]
 
+>> Conventionally, the root directory is considered to be lower than other
+>> directories, so I think the current wording is correct. --[[Joey]]
+
 let me know what you think
 
 To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
-- 
cgit v1.2.3


From dcc70ca629cf999b43bf32d38980df6381f8f282 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 14:34:31 -0500
Subject: response

---
 doc/forum/Error:_bad_page_name.mdwn | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 59974ca00..a16decedb 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -1,5 +1,21 @@
-I'm trying to use ikiwiki for the first time. In the start, I had problems with installing the package, because I don't have a root account on my server.
+I'm trying to use ikiwiki for the first time. In the start, I had problems
+with installing the package, because I don't have a root account on my
+server.
 
-When I solved this, I finally set up my wiki, but whenever I try to edit a page, I get an error: “Error: bad page name”.
+When I solved this, I finally set up my wiki, but whenever I try to edit a
+page, I get an error: “Error: bad page name”.
 
-What am I doing wrong? The wiki is at <http://atrey.karlin.mff.cuni.cz/~onderka/wiki/>, the setupfile I used at <http://atrey.karlin.mff.cuni.cz/~onderka/wiki/ikiwiki.setup>.
+What am I doing wrong? The wiki is at
+<http://atrey.karlin.mff.cuni.cz/~onderka/wiki/>, the setupfile I used at
+<http://atrey.karlin.mff.cuni.cz/~onderka/wiki/ikiwiki.setup>.
+
+> This means that one of the checks that ikiwiki uses to prevent
+> editing files with strange or insecure names has fired incorrectly.
+> Your setup file seems fine.
+> We can figure out what is going wrong through a series of tests:
+> 
+> * Test if your perl has a problem with matching alphanumerics:
+>   `perl -le 'print int "index"=~/^([-[:alnum:]+\/.:_]+)$/'`
+> * Check if something is breaking pruning of disallowed files:
+>   `perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")'`
+> --[[Joey]] 
-- 
cgit v1.2.3


From a94039601a46c9679aa81ee01f6462f67652b114 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/gsvick"
 <http://www.google.com/profiles/gsvick@web>
Date: Sat, 23 Jan 2010 19:55:06 +0000
Subject:

---
 doc/forum/Error:_bad_page_name.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index a16decedb..17979fd13 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -19,3 +19,10 @@ What am I doing wrong? The wiki is at
 > * Check if something is breaking pruning of disallowed files:
 >   `perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")'`
 > --[[Joey]] 
+
+>>Both seem to run fine:
+
+    onderka@atrey:~$ perl -le 'print int "index"=~/^([-[:alnum:]+\/.:_]+)$/'
+    1
+    onderka@atrey:~$ perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")'
+    1
-- 
cgit v1.2.3


From ce6432128253310dd65dea35a6f7f0a258eb621b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 15:26:12 -0500
Subject: response

---
 doc/forum/Error:_bad_page_name.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 17979fd13..a1d6890a6 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -26,3 +26,8 @@ What am I doing wrong? The wiki is at
     1
     onderka@atrey:~$ perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")'
     1
+
+>>> Try installing this [instrumented
+>>> version](http://kitenet.net/~joey/tmp/editpage.pm) of
+>>> `IkiWiki/Plugin/editpage.pm`, which will add some debugging info
+>>> to the error message. --[[Joey]] 
-- 
cgit v1.2.3


From c301ce26a4d5d58a6b57b22fc184a763b310b257 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/gsvick"
 <http://www.google.com/profiles/gsvick@web>
Date: Sat, 23 Jan 2010 20:46:58 +0000
Subject:

---
 doc/forum/Error:_bad_page_name.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index a1d6890a6..54fb83532 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -31,3 +31,7 @@ What am I doing wrong? The wiki is at
 >>> version](http://kitenet.net/~joey/tmp/editpage.pm) of
 >>> `IkiWiki/Plugin/editpage.pm`, which will add some debugging info
 >>> to the error message. --[[Joey]] 
+
+>>>>When I tried to `make` ikiwiki with this file, I got the error
+
+    ../IkiWiki/Plugin/editpage.pm:101: invalid variable interpolation at "$"
-- 
cgit v1.2.3


From 58eaf27137f57b9a58cec114280125a2c00357e9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 18:33:13 -0500
Subject: response

---
 doc/forum/Error:_bad_page_name.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 54fb83532..401815f7c 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -35,3 +35,5 @@ What am I doing wrong? The wiki is at
 >>>>When I tried to `make` ikiwiki with this file, I got the error
 
     ../IkiWiki/Plugin/editpage.pm:101: invalid variable interpolation at "$"
+
+>>>>> Sorry about that, I've corrected the above file. --[[Joey]] 
-- 
cgit v1.2.3


From 5bcbb584134cf5a52dedd498a973691a2a45d10f Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/gsvick"
 <http://www.google.com/profiles/gsvick@web>
Date: Sun, 24 Jan 2010 00:03:08 +0000
Subject:

---
 doc/forum/Error:_bad_page_name.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 401815f7c..23b5e7262 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -37,3 +37,5 @@ What am I doing wrong? The wiki is at
     ../IkiWiki/Plugin/editpage.pm:101: invalid variable interpolation at "$"
 
 >>>>> Sorry about that, I've corrected the above file. --[[Joey]] 
+
+>>>>>> Hmm, funny. Now that I reinstalled it with your changed file, it started working. I didn't remember how exactly did I install it the last time, so this time, it seems I did it correctly. Thank you very much for your help.
-- 
cgit v1.2.3


From 4affa37f8b5fdc61e2e07cfb7c8190041a4ffa4e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 21:13:29 -0500
Subject: response

---
 doc/forum/Error:_bad_page_name.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 23b5e7262..70277a1e4 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -39,3 +39,8 @@ What am I doing wrong? The wiki is at
 >>>>> Sorry about that, I've corrected the above file. --[[Joey]] 
 
 >>>>>> Hmm, funny. Now that I reinstalled it with your changed file, it started working. I didn't remember how exactly did I install it the last time, so this time, it seems I did it correctly. Thank you very much for your help.
+
+>>>>>>> Well, this makes me suspect you installed an older version of
+>>>>>>> ikiwiki and my file, which is from the latest version, included a
+>>>>>>> fix for whatever bug you were seeing. If I were you, I'd ensure
+>>>>>>> that I have a current version of ikiwiki installed. --[[Joey]] 
-- 
cgit v1.2.3


From bcde9b74120d0572d41447d798917ae02134e059 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 02:52:57 +0000
Subject: new report plugin

---
 doc/plugins/contrib/report.mdwn | 166 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 166 insertions(+)
 create mode 100644 doc/plugins/contrib/report.mdwn

diff --git a/doc/plugins/contrib/report.mdwn b/doc/plugins/contrib/report.mdwn
new file mode 100644
index 000000000..7130bcb5f
--- /dev/null
+++ b/doc/plugins/contrib/report.mdwn
@@ -0,0 +1,166 @@
+[[!template id=plugin name=report author="[[rubykat]]"]]
+[[!tag type/meta type/format]]
+[[!toc]]
+## NAME
+
+IkiWiki::Plugin::report - Produce templated reports from page field data.
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff report ....}],
+
+    \[[!report template="blog_summary"
+    pages="blog/*"
+    sort="mtime"]]
+
+## DESCRIPTION
+
+This plugin provides the **report** directive.  This enables one to report on
+the structured data ("field" values) of multiple pages; the output is formatted
+via a template.  This depends on the "field" plugin.
+
+The pages to report on are selected by a PageSpec given by the "pages"
+parameter.  The template is given by the "template" parameter.
+The template expects the data from a single page; it is applied
+to each matching page separately, one after the other.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One, as with the
+[[plugins/template]] plugin, is in the /templates directory on the wiki.  These
+templates are wiki pages, and can be edited from the web like other wiki
+pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+## OPTIONS
+
+**template**: The template to use for the report.
+
+**pages**: A PageSpec to determine the pages to report on.
+
+**sort**: How the matching pages should be sorted.  Sorting criteria are separated by spaces.
+
+The possible values for sorting are:
+
+* **page**: Sort by the full page ID.
+* **pagename**: Sort by the base page name.
+* **pagename_natural**: Sort by the base page name, using Sort::Naturally if it is installed.
+* **mtime**: Sort by the page modification time.
+* **age**: Sort by the page creation time, newest first.
+
+Any other value is taken to be a field name to sort by.
+If a sort value begins with a minus (-) then the order for that field is reversed.
+
+### Headers
+
+An additional option is the "headers" option.  This is a space-separated
+list of field names which are to be used as headers in the report.  This
+is a way of getting around one of the limitations of HTML::Template, that
+is, not being able to do tests such as
+"if this-header is not equal to previous-header".
+
+Instead, that logic is performed inside the plugin.  The template is
+given parameters "HEADER1", "HEADER2" and so on, for each header.
+If the value of a header field is the same as the previous value,
+then HEADER**N** is set to be empty, but if the value of the header
+field is new, then HEADER**N** is given that value.
+
+#### Example
+
+Suppose you're writing a blog in which you record "moods", and you
+want to display your blog posts by mood.
+
+    \[[!report template="mood_summary"
+    pages="blog/*"
+    sort="Mood Date title"
+    headers="Mood"]]
+
+The "mood_summary" template might be like this:
+
+    <TMPL_IF NAME="HEADER1">
+    ## <TMPL_VAR NAME="HEADER1">
+    </TMPL_IF>
+    ### <TMPL_VAR NAME="TITLE">
+    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE"]]
+    <TMPL_VAR NAME="DESCRIPTION">
+    
+### Advanced Options
+
+The following options are used to improve efficiency when dealing
+with large numbers of pages; most people probably won't need them.
+
+**trail**:
+
+A page or pages to use as a "trail" page.  When a trail page is used,
+the matching pages are limited to (a subset of) the pages which that
+page links to; the "pages" pagespec in this case, rather than selecting
+pages from the entire wiki, will select pages from within the set of pages
+given by the trail page.
+
+**doscan**:
+
+Whether this report should be called in "scan" mode; if it is, then
+the pages which match the pagespec are added to the list of links from
+this page.  This can be used by *another* report by setting this
+page to be a "trail" page in *that* report.
+It is not possible to use "trail" and "doscan" at the same time.
+By default, "doscan" is false.
+
+## TEMPLATE PARAMETERS
+
+The templates are in HTML::Template format, just as [[plugins/template]] and
+[[ftemplate]] are.  The parameters passed in to the template are as follows:
+
+***fields***:
+
+The structured data from the current matching page.  This includes
+"title" and "description" if they are defined.
+
+***common values***:
+
+Values known for all pages: "page", "destpage".  Also "basename" (the base name of the page).
+
+***passed-in values***:
+
+Any additional parameters to the report directive are passed to the
+template; a parameter will override the matching "field" value.
+For example, if you have a "Mood" field, and you pass Mood="bad" to
+the report, then that will be the Mood which is given for the whole
+report.
+
+Generally this is useful if one wishes to make a more generic
+template and hide or show portions of it depending on what
+values are passed in the report directive call.
+
+For example, one could have a "hide_mood" parameter which would hide
+the "Mood" section of your template when it is true, which one could
+use when the Mood is one of the headers.
+
+***headers***:
+
+See the section on Headers.
+
+***first and last***:
+
+If this is the first page-record in the report, then "first" is true.
+If this is the last page-record in the report, then "last" is true.
+
+## PREREQUISITES
+
+    IkiWiki
+    IkiWiki::Plugin::field
+    HTML::Template
+    Encode
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/report.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From 27d2d7115df82908396d460d92857fd0990c556d Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 02:59:11 +0000
Subject: note that report is now released

---
 doc/plugins/contrib/getfield/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index ce6246034..015e9f5a1 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -26,3 +26,6 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 > -- [[users/KathrynAndersen]]
 
 >> Ooh, sounds nice :) . --[[SR|users/simonraven]]
+
+>>> I've now released the [[plugins/contrib/report]] plugin.  I've been using it on my site; the holdup on releasing was because I hadn't yet written the docs for it. I hope you find it useful.
+>>> -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From 29c475af4da5a50a857b94ff131313a05b1d7221 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 03:06:06 +0000
Subject: link to site

---
 doc/users/KathrynAndersen.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/users/KathrynAndersen.mdwn b/doc/users/KathrynAndersen.mdwn
index 14fabbb01..16cb390c4 100644
--- a/doc/users/KathrynAndersen.mdwn
+++ b/doc/users/KathrynAndersen.mdwn
@@ -1,6 +1,7 @@
 * aka [[rubykat]]
 * Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need).
 * <http://kerravonsen.dreamwidth.org>
+* <http://www.katspace.org>
 * <http://github.com/rubykat>
 
 Has written the following plugins:
-- 
cgit v1.2.3


From f6b2edef642ccda83a4c96aeeb2e146202707a67 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 09:38:40 +0000
Subject: new release of getfield; can now get values from other pages as well
 as current page

---
 doc/plugins/contrib/getfield.mdwn | 60 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
index 929f70485..0a92894f1 100644
--- a/doc/plugins/contrib/getfield.mdwn
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -18,13 +18,13 @@ use per-page structured data, where each page is treated like a record, and the
 structured data are fields in that record.  This can include the meta-data for
 that page, such as the page title.
 
-This plugin is meant to be used in conjunction with the **field** plugin.
+This plugin is meant to be used in conjunction with the [[field]] plugin.
 
 ### USAGE
 
 One can get the value of a field by using special markup in the page.
 This does not use directive markup, in order to make it easier to
-use the markup inside other directives.  There are two forms:
+use the markup inside other directives.  There are four forms:
 
 * {{$*fieldname*}}
 
@@ -39,6 +39,26 @@ use the markup inside other directives.  There are two forms:
 
     	<h1>My Long and Complicated Title With Potential For Spelling Mistakes</h1>
 
+* {{$*pagename*#*fieldname*}}
+
+  This queries the value of *fieldname* for the page *pagename*.
+
+  For example:
+
+  On PageFoo:
+
+    \[[!meta title="I Am Page Foo"]]
+
+    Stuff about Foo.
+
+  On PageBar:
+
+    For more info, see \[[{{$PageFoo#title}}|PageFoo]].
+
+  When PageBar is displayed:
+
+    &lt;p&gt;For more info, see &lt;a href="PageFoo"&gt;I Am Page Foo&lt;/a&gt;.&lt;/p&gt;
+
 * {{+$*fieldname*+}}
 
   This queries the value of *fieldname* for the destination page; that is,
@@ -68,17 +88,43 @@ use the markup inside other directives.  There are two forms:
     	<h1>I Am Page B</h1>
     	<p>Stuff about A.</p>
 
+* {{+$*pagename*#*fieldname*+}}
+
+  This queries the value of *fieldname* for the page *pagename*; the
+  only difference between this and {{$*pagename*#*fieldname*}} is
+  that the full name of *pagename* is calculated relative to the
+  destination page rather than the source page.
+
+  I can't really think of a reason why this should be needed, but
+  this format has been added for completeness.
+
+### No Value Found
+
+If no value is found for the given field, then the field name is returned.
+
+For example:
+
+On PageFoo:
+
+    \[[!meta title="Foo"]]
+    My title is {{$title}}.
+    
+    My description is {{$description}}.
+
+When PageFoo is displayed:
+
+    <p>My title is Foo.</p>
+    
+    <p>My description is description.</p>
+
+This is because "description" hasn't been defined for that page.
+
 ### More Examples
 
 Listing all the sub-pages of the current page:
 
     \[[!map pages="{{$page}}/*"]]
 
-### LIMITATIONS
-
-One cannot query the values of fields on pages other than the current
-page or the destination page.
-
 ## DOWNLOAD
 
 * browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/getfield.pm>
-- 
cgit v1.2.3


From e9ee3d7d85e792ee6720696abe62f25cdd7f945a Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 09:41:44 +0000
Subject: note new version of getfield

---
 doc/plugins/contrib/getfield/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 015e9f5a1..5f7fffead 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -19,6 +19,7 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 >>>>> What about using {{pagename#fieldname}}? The meaning of the hash in URLs sort of fits with what is needed here (reference to a 'named' thing within the page) and it won't conflict with actual hash usages (unless we expect different named parts of pages to define different values for the same field ...)
 >>>>> -- [[Oblomov]]
 >>>>>> That's a good one too. --[[simonraven]]
+>>>>>>> Done!  I used {{$*pagename*#*fieldname*}} for the format. -- [[users/KathrynAndersen]]
 
 
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
-- 
cgit v1.2.3


From 2f4ae4fa057bd46001453b5e70f56b4e2ad77b83 Mon Sep 17 00:00:00 2001
From: HelenOliver <HelenOliver@web>
Date: Mon, 25 Jan 2010 04:21:27 +0000
Subject: added references

---
 doc/blog.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/blog.mdwn b/doc/blog.mdwn
index c4a379fdb..222351498 100644
--- a/doc/blog.mdwn
+++ b/doc/blog.mdwn
@@ -1,4 +1,8 @@
-Ikiwiki allows turning any page into a weblog, by using the
+Ikiwiki allows turning any page into a weblog, or any information reflected on a [research paper](http://www.superiorpapers.com/) by using the
 [[ikiwiki/directive/inline]] [[ikiwiki/directive]]. For example:
 
 	\[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
+
+For additional information or [homework help](http://www.superiorpapers.com/homework.php) about ikiwiki, consult these online information:
+1. [Ikiwiki on Wikipedia](http://en.wikipedia.org/wiki/Ikiwiki)
+2. [Debian package of ikiwiki](http://packages.debian.org/sid/ikiwiki)
-- 
cgit v1.2.3


From f89b6f49d021762de8a260e92a4a3787cbf89b32 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 24 Jan 2010 23:32:19 -0500
Subject: Revert spam

---
 doc/blog.mdwn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/blog.mdwn b/doc/blog.mdwn
index 222351498..c4a379fdb 100644
--- a/doc/blog.mdwn
+++ b/doc/blog.mdwn
@@ -1,8 +1,4 @@
-Ikiwiki allows turning any page into a weblog, or any information reflected on a [research paper](http://www.superiorpapers.com/) by using the
+Ikiwiki allows turning any page into a weblog, by using the
 [[ikiwiki/directive/inline]] [[ikiwiki/directive]]. For example:
 
 	\[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
-
-For additional information or [homework help](http://www.superiorpapers.com/homework.php) about ikiwiki, consult these online information:
-1. [Ikiwiki on Wikipedia](http://en.wikipedia.org/wiki/Ikiwiki)
-2. [Debian package of ikiwiki](http://packages.debian.org/sid/ikiwiki)
-- 
cgit v1.2.3


From 73253d6925ef84f9dd9e72919f8a136b93a0d277 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 26 Jan 2010 22:26:50 -0500
Subject: template: Preprocess parameters before htmlizing.

Consider a template like:

[[!template type=note text="""
[[!inline pages="*foo*"]]
"""]]

The text parameter is htmlized before being passed into the template (in
case the template wraps it in a <span> that prevents markdown from
htmlizing it later).

But, when markdown sees "*foo*", it turns that into <em>foo</em>.
Later, when preprocessing the inline directive, that leads to suprising
results.

To fix this, I made template parameters be preprocessed (and filtered)
before being htmlized.

Note that I left in the preprocessing (and filtering) of the template
output at the end. That's still relevant when the template itself contains
preprocessor directives.
---
 IkiWiki/Plugin/template.pm | 19 +++++++++++--------
 debian/changelog           |  6 ++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index b6097bb49..39d9667f9 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -25,6 +25,10 @@ sub getsetup () {
 sub preprocess (@) {
 	my %params=@_;
 
+	# This needs to run even in scan mode, in order to process
+	# links and other metadata included via the template.
+	my $scan=! defined wantarray;
+
 	if (! exists $params{id}) {
 		error gettext("missing id parameter")
 	}
@@ -58,24 +62,23 @@ sub preprocess (@) {
 	$params{basename}=IkiWiki::basename($params{page});
 
 	foreach my $param (keys %params) {
+		my $value=IkiWiki::preprocess($params{page}, $params{destpage},
+		          IkiWiki::filter($params{page}, $params{destpagea},
+		          $params{$param}), $scan);
 		if ($template->query(name => $param)) {
 			$template->param($param =>
 				IkiWiki::htmlize($params{page}, $params{destpage},
 					pagetype($pagesources{$params{page}}),
-					$params{$param}));
+					$value));
 		}
 		if ($template->query(name => "raw_$param")) {
-			$template->param("raw_$param" => $params{$param});
+			$template->param("raw_$param" => $value);
 		}
 	}
 
-	# This needs to run even in scan mode, in order to process
-	# links and other metadata includes via the template.
-	my $scan=! defined wantarray;
-
 	return IkiWiki::preprocess($params{page}, $params{destpage},
-		IkiWiki::filter($params{page}, $params{destpage},
-		$template->output), $scan);
+	       IkiWiki::filter($params{page}, $params{destpage},
+	       $template->output), $scan);
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index 4e76b1d69..0ec696d3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100123) UNRELEASED; urgency=low
+
+  * template: Preprocess parameters before htmlizing.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
+
 ikiwiki (3.20100122) unstable; urgency=low
 
   * inline: Avoid showing edit links if page editing is disabled.
-- 
cgit v1.2.3


From e269fbd7af187b986c9e52ae8459b57d70c64bcd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 04:35:58 -0500
Subject: new repo

---
 doc/git.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 5167ad004..30fed6afc 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -56,7 +56,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[ktf]] `git://github.com/ktf/ikiwiki.git`
 * [[tove]] `git://github.com/tove/ikiwiki.git`
 * [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki`
-
+* [[roktas]] `git://github.com/roktas/ikiwiki.git``
 
 ## branches
 
-- 
cgit v1.2.3


From bcf74bd8f8b72abb6466fef1b6848dc4cb5eb7b2 Mon Sep 17 00:00:00 2001
From: MariaJackson <MariaJackson@web>
Date: Thu, 28 Jan 2010 09:58:20 +0000
Subject:

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 683a3f8ac..8e1ab2e56 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -8,6 +8,7 @@ there are some variations on the approach that might be useful:
  * Or, querying the mysql back-end to get the names
  * using WWW::MediaWiki for importing/exporting pages from the wiki, instead
    of Special::Export
+ * use <a href="http://www.overnightpools.com/Winter_Covers.htm">pool covers</a>
 
 Also, some detail on converting mediawiki transclusion to ikiwiki inlines...
 
-- 
cgit v1.2.3


From 7f462b658953c7907d942e71a17b53a678b2ccc6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 05:23:28 -0500
Subject: revert spam

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 8e1ab2e56..683a3f8ac 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -8,7 +8,6 @@ there are some variations on the approach that might be useful:
  * Or, querying the mysql back-end to get the names
  * using WWW::MediaWiki for importing/exporting pages from the wiki, instead
    of Special::Export
- * use <a href="http://www.overnightpools.com/Winter_Covers.htm">pool covers</a>
 
 Also, some detail on converting mediawiki transclusion to ikiwiki inlines...
 
-- 
cgit v1.2.3


From f91d79f469956c423373c8747c92218c668f0ba8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 21:07:23 -0500
Subject: img: Fix a bug that could taint @links with undef values.

---
 IkiWiki/Plugin/img.pm | 4 ++++
 debian/changelog      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index c1048d3c9..82db15a7e 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -26,6 +26,10 @@ sub preprocess (@) {
 	my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
 	my %params=@_;
 
+	if (! defined $image) {
+		error("bad image filename");
+	}
+
 	if (exists $imgdefaults{$params{page}}) {
 		foreach my $key (keys %{$imgdefaults{$params{page}}}) {
 			if (! exists $params{$key}) {
diff --git a/debian/changelog b/debian/changelog
index 0ec696d3c..5d27b7af0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.20100123) UNRELEASED; urgency=low
 
   * template: Preprocess parameters before htmlizing.
+  * img: Fix a bug that could taint @links with undef values.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
cgit v1.2.3


From 5ba9a0ae9797ad5e147985f3ea450a21bfe28667 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 22:41:06 -0500
Subject: added Anna and Mark's bevvy of websites

---
 doc/ikiwikiusers.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 0ebab313d..aa4d9b96a 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -50,6 +50,7 @@ Projects & Organizations
 * [The XCB library](http://xcb.freedesktop.org/)
 * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
 * [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/)
+* [Wetknee Books](http://www.wetknee.com/)
 
 Personal sites and blogs
 ========================
@@ -131,6 +132,10 @@ Personal sites and blogs
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 * [Nico Schottelius' homepage](http://www.nico.schottelius.org)
 * [Andreas Zwinkaus homepage](http://beza1e1.tuxen.de)
+* [Walden Effect](http://waldeneffect.org)
+* [Avian Aqua Miser](http://www.avianaquamiser.com/)
+* [Cosmic Cookout](http://www.cosmiccookout.com/)
+* [Backyard Deer Deterrents](http://www.backyarddeer.com/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 3f822ed95fec3a9396cd4afe384ccf5067b82f2c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 22:41:35 -0500
Subject: iainmclaren.com not using ikiwiki now

---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index aa4d9b96a..153a7fd92 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -82,7 +82,6 @@ Personal sites and blogs
 * [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/)
 * [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall
 * [Ronan Le Hy's blog](http://bayesien.org), in French.
-* <http://iainmclaren.com>.
 * [formorers blog and website](http://www.formorer.de/webwiki/)
 * [Mark Jaroski's blog](http://movemearound.org/)
 * I keep my personal project notes and specs in a private ikiwiki - it's the perfect tool for this task. - [the daniel](http://neoglam.com)
-- 
cgit v1.2.3


From ca76d8f38beccfeba40d52e1d8fd2362cada3197 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 22:43:23 -0500
Subject: oh, we didn't convert this one yet.

---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 153a7fd92..f750fb4b0 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -134,7 +134,6 @@ Personal sites and blogs
 * [Walden Effect](http://waldeneffect.org)
 * [Avian Aqua Miser](http://www.avianaquamiser.com/)
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
-* [Backyard Deer Deterrents](http://www.backyarddeer.com/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From a2ee2aa9c733b2a8df1fc564e5634abe7d209c05 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 29 Jan 2010 16:05:45 -0500
Subject: note on filtering

---
 doc/tips/add_chatterbox_to_blog.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/tips/add_chatterbox_to_blog.mdwn b/doc/tips/add_chatterbox_to_blog.mdwn
index aa35b9331..e07e36b07 100644
--- a/doc/tips/add_chatterbox_to_blog.mdwn
+++ b/doc/tips/add_chatterbox_to_blog.mdwn
@@ -18,4 +18,7 @@ from there, like I have on [my blog](http://kitenet.net/~joey/blog/)
 	show=5 feeds=no]]
 	"""]]
 
+* To filter out `@-replies`, append "and !*@*" to the [[ikiwiki/PageSpec]].
+  The same technique can be used for other filtering.
+
 Note: Works best with ikiwiki 3.10 or better.
-- 
cgit v1.2.3


From e9b349fdb0d9bcd3ff8389b4cbf6d5f14e84a740 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Sat, 30 Jan 2010 21:30:14 -0500
Subject: testing push

---
 .../discussion.mdwn                                                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
index 183a8ef55..62f853f8c 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
@@ -8,3 +8,5 @@ That's not going to work in all situations; for example, with an ikiwiki which u
 * an *additional* git repository cloned from the bare repository, which is used for making changes from the command-line rather than the web.  It is this repository in which one would be editing files with vim, and *this* repository does not have a .ikiwiki directory in it.  It does have a .git directory in the root, however, so I suppose you could use that as a method of detection of a root directory, but of course that would only work for git repositories.
 
 -- [[KathrynAndersen]]
+
+
-- 
cgit v1.2.3


From a4611bdebdf8f55bd163b7b3d38366cd2998d931 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Sat, 30 Jan 2010 21:35:12 -0500
Subject: reply to forum discussion

---
 .../discussion.mdwn                                               | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
index 62f853f8c..99e83b50f 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
@@ -9,4 +9,12 @@ That's not going to work in all situations; for example, with an ikiwiki which u
 
 -- [[KathrynAndersen]]
 
+You are completely right; all of my wikis are compiled both locally and
+remotely, and so the local repo also has a `.ikiwiki` folder. And that's not the
+"usual" setup.
 
+checking for a `.git` dir would not work when the wiki's source files aren't
+located at the root of the repo.
+
+So, besides of doing a `touch .ikiwiki` at the root of the wiki in your local
+repo, do you see any alternative?
-- 
cgit v1.2.3


From 91cb8d75de2c0a8a57d79935aab7bde381c70b3b Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Sat, 30 Jan 2010 21:38:47 -0500
Subject: missing signature

---
 .../discussion.mdwn                                                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
index 99e83b50f..7b323860b 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
@@ -18,3 +18,5 @@ located at the root of the repo.
 
 So, besides of doing a `touch .ikiwiki` at the root of the wiki in your local
 repo, do you see any alternative?
+
+-- [[jerojasro]]
-- 
cgit v1.2.3


From 03bb16cf180f0d3af713b4b54a71787aa13fb9af Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Sun, 31 Jan 2010 11:35:33 -0500
Subject: moved discussion to the forum main page

---
 ...of_wiki_pages_on_local_filesystem_with_vim.mdwn | 22 ++++++++++++++++++++++
 .../discussion.mdwn                                | 22 ----------------------
 2 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 14f592fd7..fd9f67ee4 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -15,6 +15,28 @@ This function takes into account the ikiwiki linking rules when deciding which f
 
 let me know what you think
 
+>         " NOTE: the root of the wiki is considered the first directory that contains a
+>         " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
+> 
+> That's not going to work in all situations; for example, with an ikiwiki which uses git as the backend, the normal setup is that one has
+> 
+> * a bare git repository
+> * a git repository which ikiwiki builds the wiki from (which has a .ikiwiki directory in it)
+> * an *additional* git repository cloned from the bare repository, which is used for making changes from the command-line rather than the web.  It is this repository in which one would be editing files with vim, and *this* repository does not have a .ikiwiki directory in it.  It does have a .git directory in the root, however, so I suppose you could use that as a method of detection of a root directory, but of course that would only work for git repositories.
+> 
+> -- [[KathrynAndersen]]
+> 
+>> You are completely right; all of my wikis are compiled both locally and
+>> remotely, and so the local repo also has a `.ikiwiki` folder. And that's not the
+>> "usual" setup.
+>> 
+>> checking for a `.git` dir would not work when the wiki's source files aren't
+>> located at the root of the repo.
+>> 
+>> So, besides of doing a `touch .ikiwiki` at the root of the wiki in your local
+>> repo, do you see any alternative?
+>> 
+>> -- [[jerojasro]]
 To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
 
     " returns the directory which can be considered the root of the wiki the
diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
deleted file mode 100644
index 7b323860b..000000000
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-        " NOTE: the root of the wiki is considered the first directory that contains a
-        " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
-
-That's not going to work in all situations; for example, with an ikiwiki which uses git as the backend, the normal setup is that one has
-
-* a bare git repository
-* a git repository which ikiwiki builds the wiki from (which has a .ikiwiki directory in it)
-* an *additional* git repository cloned from the bare repository, which is used for making changes from the command-line rather than the web.  It is this repository in which one would be editing files with vim, and *this* repository does not have a .ikiwiki directory in it.  It does have a .git directory in the root, however, so I suppose you could use that as a method of detection of a root directory, but of course that would only work for git repositories.
-
--- [[KathrynAndersen]]
-
-You are completely right; all of my wikis are compiled both locally and
-remotely, and so the local repo also has a `.ikiwiki` folder. And that's not the
-"usual" setup.
-
-checking for a `.git` dir would not work when the wiki's source files aren't
-located at the root of the repo.
-
-So, besides of doing a `touch .ikiwiki` at the root of the wiki in your local
-repo, do you see any alternative?
-
--- [[jerojasro]]
-- 
cgit v1.2.3


From 1e0b724bac67d3f31bfb3620876937ec4291a326 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 31 Jan 2010 14:03:19 -0500
Subject: document that state variables are not available in the checkconfig
 hook

---
 doc/plugins/write.mdwn | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 45f083b42..082f0e38f 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -68,20 +68,21 @@ In roughly the order they are called.
 
 This allows for plugins to perform their own processing of command-line
 options and so add options to the ikiwiki command line. It's called during
-command line processing, with @ARGV full of any options that ikiwiki was
+command line processing, with `@ARGV` full of any options that ikiwiki was
 not able to process on its own. The function should process any options it
-can, removing them from @ARGV, and probably recording the configuration
-settings in %config. It should take care not to abort if it sees
+can, removing them from `@ARGV`, and probably recording the configuration
+settings in `%config`. It should take care not to abort if it sees
 an option it cannot process, and should just skip over those options and
-leave them in @ARGV.
+leave them in `@ARGV`.
 
 ### checkconfig
 
 	hook(type => "checkconfig", id => "foo", call => \&checkconfig);
 
 This is useful if the plugin needs to check for or modify ikiwiki's
-configuration. It's called early in the startup process. The
-function is passed no values. It's ok for the function to call
+configuration. It's called early in the startup process. `%config`
+is populated at this point, but other state has not yet been loaded.
+The function is passed no values. It's ok for the function to call
 `error()` if something isn't configured right.
 
 ### refresh
-- 
cgit v1.2.3


From 541406818b0ebc0023600db2d6e3fadaec7f9b41 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 1 Feb 2010 11:09:27 +0000
Subject: also potwiki

---
 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index fd9f67ee4..c29985497 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -103,3 +103,5 @@ To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwik
     endfunction
     
     setlocal includeexpr=FileForWikiLink(v:fname)
+
+> Interesting. I was at one point looking at "potwiki.vim", which implements a local wiki and follows CamelCase links, creating new files where necessary etc., to see if it could be adapted for ikiwiki (See [[tips/vim syntax highlighting/discussion]]). I didn't get anywhere. -- [[Jon]]
-- 
cgit v1.2.3


From 438cb249a3f2bc9e04ea4b50d247daa7a43c281d Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Mon, 1 Feb 2010 14:32:21 +0000
Subject:

---
 ...of_wiki_pages_on_local_filesystem_with_vim.mdwn | 85 +++++-----------------
 1 file changed, 20 insertions(+), 65 deletions(-)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index c29985497..261f1579f 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -37,71 +37,26 @@ let me know what you think
 >> repo, do you see any alternative?
 >> 
 >> -- [[jerojasro]]
-To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
 
-    " returns the directory which can be considered the root of the wiki the
-    " current buffer belongs to, or an empty string if we are not inside an
-    " ikiwiki wiki
-    "
-    " NOTE: the root of the wiki is considered the first directory that contains a
-    " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
-    "
-    " if you can think of a better heuristic to get ikiwiki's root, let me know!
-    function! GetWikiRootDir()
-      let check_str = '%:p:h'
-      let pos_wiki_root = expand(check_str)
-      while pos_wiki_root != '/'
-        if isdirectory(pos_wiki_root . '/.ikiwiki') && pos_wiki_root != $HOME
-          return pos_wiki_root
-        endif
-        let check_str = check_str . ':h'
-        let pos_wiki_root = expand(check_str)
-      endwhile
-      if isdirectory('/.ikiwiki')
-        return '/'
-      endif
-      return ''
-    endfunction
-    
-    " This function searches for a .mdwn file (<a:name>.mdwn) using the ikiwiki
-    " WikiLink rules and returns its full path.
-    "
-    " The rules are the following
-    "
-    " if the filename starts with '/', use as base dir the root directory of the
-    " wiki
-    "
-    " if not:
-    "
-    " try first ./<bufname>/<a:name>.mdwn
-    " then for  ./<a:name>.mdwn
-    " then for  <root_of_wiki>/<a:name>.mdwn
-    "
-    " return the first one that exists
-    "
-    " the base path (. above) is the directory that contains the current buffer
-    "
-    function! FileForWikiLink(name)
-      let target_fname=a:name . ".mdwn"
-      let wikiroot_dir = GetWikiRootDir()
-      if match(target_fname, '^/') >= 0
-        return wikiroot_dir . target_fname
-      endif
-      let subdir_file = expand('%:p:r') . "/" . target_fname
-      let currdir_file = expand('%:p:h') . "/" . target_fname
-      let wikiroot_file = wikiroot_dir . "/" . target_fname
-      if filewritable(subdir_file)
-        return subdir_file
-      endif
-      if filewritable(currdir_file)
-        return currdir_file
-      endif
-      if filewritable(wikiroot_file)
-        return wikiroot_file
-      endif
-      return a:name
-    endfunction
-    
-    setlocal includeexpr=FileForWikiLink(v:fname)
+well. I've rewritten the whole thing, to take into account:
+  
+  * file matching ignoring case (MyPage matches mypage.mdwn)
+  * checking all the way down (up) to the root of the wiki (if there is a link `\[[foo]]` on `a/b/page`),
+  try `a/b/page/foo`, then `a/b/foo`, and so on, up to `foo`
+  * the alternate name for a page: when looking for the file for `\[[foo]]`, try both `foo.mdwn` and `foo/index.mdwn`
+
+you can find the file [here](http://git.devnull.li/cgi-bin/gitweb.cgi?p=vim-jerojasro.git;a=blob;f=.vim/ftplugin/ikiwiki_nav.vim;hb=HEAD). To use it, place it in `$HOME/.vim/ftplugin`. After that, hitting `<CR>` (Enter) in normal mode over a wikilink will take you to that page, if it exists.
+
+the plugin has, as of now, two problems:
+ 
+  * doesn't work with wikilinks that take more than one line (though this isn't really that bad)
+  * it assumes that the root of the wiki is the first directory down the filesystem hierarchy that 
+  has a `.ikiwiki` folder on it. If your copy of the wiki doesn't have it, you must create it for 
+  the plugin to work
+
+-- [[jerojasro]]
 
 > Interesting. I was at one point looking at "potwiki.vim", which implements a local wiki and follows CamelCase links, creating new files where necessary etc., to see if it could be adapted for ikiwiki (See [[tips/vim syntax highlighting/discussion]]). I didn't get anywhere. -- [[Jon]]
+
+>> when I wrote the plugin I also considered the possibility of creating files (and their dirs, if necessary) 
+>> from new wikilinks; the changes needed to get that working are fairly small -- [[jerojasro]]
-- 
cgit v1.2.3


From 49d8c5b821743355fa60b30e1b2b456c44aaa221 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 1 Feb 2010 15:18:53 -0500
Subject: setup automator: Configure Term::Readline to use bold for prompt,
 rather than default underline. Closes: #517656

---
 IkiWiki/Setup/Automator.pm | 1 +
 debian/changelog           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 7af93e73c..9fee4dcb7 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -15,6 +15,7 @@ sub ask ($$) {
 	my ($question, $default)=@_;
 
 	my $r=Term::ReadLine->new("ikiwiki");
+	$r->ornaments("md,me");
 	$r->readline(encode_utf8($question)." ", $default);
 }
 
diff --git a/debian/changelog b/debian/changelog
index 5d27b7af0..8e01950a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
 
   * template: Preprocess parameters before htmlizing.
   * img: Fix a bug that could taint @links with undef values.
+  * setup automator: Configure Term::Readline to use bold for prompt, rather
+    than default underline. Closes: #517656
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
cgit v1.2.3


From f963700a4f418f3498c8d855b5ce88d951391867 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 1 Feb 2010 15:34:10 -0500
Subject: ready to pull, and thoughts

---
 ...of_wiki_pages_on_local_filesystem_with_vim.mdwn | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 261f1579f..1cb5ed27e 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -60,3 +60,36 @@ the plugin has, as of now, two problems:
 
 >> when I wrote the plugin I also considered the possibility of creating files (and their dirs, if necessary) 
 >> from new wikilinks; the changes needed to get that working are fairly small -- [[jerojasro]]
+
+> Seems about ready for me to think about pulling it into ikiwiki
+> alongside [[tips/vim_syntax_highlighting/ikiwiki.vim]]. If you'll
+> please slap a license on it. :) --[[Joey]] 
+> 
+> Also, I have a possible other approach for finding ikiwiki's root. One
+> could consider that any subdirectory of an ikiwiki wiki is itself
+> a standalone wiki, though probably one missing a toplevel index page.
+> The relative wikilinks work such that this assumption makes sense;
+> you can build any subdirectory with ikiwiki and probably get something
+> reasonable with links that work, etc.
+> 
+> So, if that's the case, then one could say that the directory that the
+> user considers to be the toplevel of their wiki is really also a subwiki,
+> enclosed in a succession of parents that go all the way down to the root
+> directory (or alternatively, to the user's home directory). I think that
+> logically makes some sense.
+> 
+> And if that's the case, you can resolve an absolute link by looking for
+> the page closest to the root that matches the link.
+> 
+> It may even make sense to change ikiwiki's own handling of "absolute"
+> links to work that way. But even without changing ikiwiki, I think it
+> would be a reasonable thing for vim to do. It would only fail in two
+> unusual circumstances:
+> 
+> 1. There is a file further down, outside what the user considers
+>    the wiki, that matches. Say a `$HOME/index.mdwn`
+> 2. An absolute link is broken in that the page linked to does
+>    not exist in the root of the wiki. But it does exist in a subdir, 
+>    and vim would go to that file.
+> 
+> --[[Joey]] 
-- 
cgit v1.2.3


From b30fd6327966c4591c76041968b375b04c7e8982 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 1 Feb 2010 16:06:51 -0500
Subject: thanks schmonz for your kind donation

---
 doc/tipjar.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index 87a497fd1..b725a2eff 100644
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -15,6 +15,7 @@ Thanks to the following people for their kind contributions:
 * Mick Pollard
 * Nico Schottelius
 * Jon Dowland
+* Amitai Schlair
 
 (Note that this page is locked to prevent anyone from tampering with the PayPal button.
 If you prefer your donation *not* be listed here, let [[Joey]] know.)
-- 
cgit v1.2.3


From deb0bc8bd57bc74709ecb12de36a9cb96c684a93 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Tue, 2 Feb 2010 02:56:06 -0800
Subject: New todo item for wrapperuser configuration option

---
 doc/todo/wrapperuser.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/todo/wrapperuser.mdwn

diff --git a/doc/todo/wrapperuser.mdwn b/doc/todo/wrapperuser.mdwn
new file mode 100644
index 000000000..4c42b046f
--- /dev/null
+++ b/doc/todo/wrapperuser.mdwn
@@ -0,0 +1,7 @@
+ikiwiki's .setup file can specify wrappergroup, and ikiwiki will set the group
+of the wrappers accordingly.  Having had people encounter difficulty before
+when trying to do the same thing with users (for instance, making all wrappers
+6755 ikiwiki:ikiwiki), I think it would help to have "wrapperuser".  This could
+only actually take effect if building the wrappers as root (not really the best
+plan), but ikiwiki could at least warn if wrapperuser does not match the user
+the wrapper will end up with.
-- 
cgit v1.2.3


From 05b99e3cfa8c9044d18d5b07aec24fff555f2889 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 13:54:51 +0100
Subject: Document git branch for automatically creating tag pages.

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index f1d33114f..95710ced0 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -123,3 +123,40 @@ On the second extra pass, it doesn't notice that it has to update the "?"-link.
                 }
 
 is not satisfied for the newly created tag page. I shall put debug msgs into Render.pm to find out better how it works. --Ivan Z.
+
+---
+
+I've made another attempt at fixiing this
+
+The current progress can be found at my [git repository][gitweb] on branch
+`autotag`:
+
+	git://git.liegesta.at/git/ikiwiki
+
+[gitweb]: http://git.liegesta.at/?p=ikiwiki.git;a=shortlog;h=refs/heads/autotag (gitweb for branch autotag)
+
+It's not entirely finished yet, but already quite usable. Testing and comments
+on code quality, implementation details, as well as other patches would be
+appreciated.
+
+Here's what it does right now:
+
+* enabled by setting `tag_autocreate=1` in the configuration.
+* Tag pages will be created in `tagbase` from the template `autotag.tmpl`.
+* Will correctly render all links, and dependencies. Well, AFAIK.
+* When a tag page is deleted it will automatically recreated from template. (I
+consider this a feature, not a bug)
+* Requires a rebuild on first use.
+* Adds a function `add_autofile()` to the plugin API, to do all this.
+
+Todo/Bugs:
+
+* Will still create a page even if there's a page other than `$tag` under
+`tagbase` satisfying the tag link.
+* Call from `IkiWiki.pm` to `Render.pm`, which adds a module dependency in the
+wrong direction.
+* Add files to RCS.
+* Unit tests.
+* Proper documentation.
+
+--[[David_Riebenbauer]]
-- 
cgit v1.2.3


From 4af4d26582f0c2b915d7102fb4a604b176385748 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sat, 30 Jan 2010 10:25:10 +0100
Subject: Make srcfile() return undef, if the file isn't there.

This has the advantage that it's now possible to check for the existence of a
sourcefile with that function.
---
 IkiWiki.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b8e599928..cb1c46a68 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -743,7 +743,10 @@ sub srcfile_stat {
 }
 
 sub srcfile ($;$) {
-	return (srcfile_stat(@_))[0];
+	if (my @stat=srcfile_stat(@_)) {
+		return $stat[0];
+	}
+	return undef
 }
 
 sub add_underlay ($) {
-- 
cgit v1.2.3


From f3abeac919c4736429bd3362af6edf51ede8e7fe Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sat, 30 Jan 2010 18:12:01 +0100
Subject: Code deduplication fin find_src_files()

This also has the advantage that I can use the resulting new function
elsewhere.
---
 IkiWiki/Render.pm | 59 +++++++++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 3ebb1a324..44b2fb9c2 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -280,6 +280,27 @@ sub srcdir_check () {
 	
 }
 
+sub verify_src_file ($$) {
+	my $file=decode_utf8(shift);
+	my $dir=shift;
+
+	return if -l $file || -d $file;
+	$file=~s/^\Q$dir\E\/?//;
+	return if ! length $file;
+	my $page = pagename($file);
+	if (! exists $pagesources{$page} &&
+		file_pruned($file)) {
+		$File::Find::prune=1;
+		return;
+	}
+
+	my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+	if (! defined $f) {
+		warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+	}
+	return ($file,$page,$f);
+}
+
 sub find_src_files () {
 	my @files;
 	my %pages;
@@ -288,22 +309,9 @@ sub find_src_files () {
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			my $file=decode_utf8($_);
-			$file=~s/^\Q$config{srcdir}\E\/?//;
-			return if -l $_ || -d _ || ! length $file;
-			my $page = pagename($file);
-			if (! exists $pagesources{$page} &&
-			    file_pruned($file)) {
-				$File::Find::prune=1;
-				return;
-			}
-
-			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-			if (! defined $f) {
-				warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-			}
-			else {
-				push @files, $f;
+			my ($file,$page,$f) = verify_src_file($_,$config{srcdir});
+			if ($file) {
+				push @files, $file;
 				if ($pages{$page}) {
 					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 				}
@@ -315,24 +323,11 @@ sub find_src_files () {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				my $file=decode_utf8($_);
-				$file=~s/^\Q$dir\E\/?//;
-				return if -l $_ || -d _ || ! length $file;
-				my $page=pagename($file);
-				if (! exists $pagesources{$page} &&
-				    file_pruned($file)) {
-					$File::Find::prune=1;
-					return;
-				}
-
-				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-				if (! defined $f) {
-					warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-				}
-				else {
+				my ($file,$page,$f) = verify_src_file($_,$dir);
+				if ($f) {
 					# avoid underlaydir override
 					# attacks; see security.mdwn
-					if (! -l "$config{srcdir}/$f" && 
+					if (! -l "$config{srcdir}/$f" &&
 					    ! -e _) {
 						if (! $pages{$page}) {
 							push @files, $f;
-- 
cgit v1.2.3


From f35d35abe36166893f68061a1fcb2a26bc056fbc Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sat, 30 Jan 2010 18:22:32 +0100
Subject: Automatically create tag pages,

if "tag_autocreate=1" is set in the configuration. The pages will be created in
tagbase, if and only if they do not exist in the srcdir yet. Tag pages will be create from
"autotag.tmpl".

At this stage a second refresh is needed for the tag pages to be rendered.

Add autotag.tmpl template.
---
 IkiWiki/Plugin/tag.pm  | 26 ++++++++++++++++++++++++++
 templates/autotag.tmpl |  3 +++
 2 files changed, 29 insertions(+)
 create mode 100644 templates/autotag.tmpl

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index cdcfaf536..6c43a053d 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -36,6 +36,13 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		tag_autocreate => {
+			type => "boolean",
+			example => 0,
+			description => "Autocreate new tag pages",
+			safe => 1,
+			rebuild => 1,
+		},
 }
 
 sub tagpage ($) {
@@ -59,6 +66,21 @@ sub taglink ($$$;@) {
 	return htmllink($page, $destpage, tagpage($tag), %opts);
 }
 
+sub gentag ($) {
+	my $tag=shift;
+	if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
+		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
+		$tagfile=~s/^\///;
+		return if (srcfile($tagfile,1));
+
+		debug(sprintf(gettext("creating tag page %s"), $tag));
+
+		my $template=template("autotag.tmpl");
+		$template->param(tag => $tag);
+		writefile($tagfile, $config{srcdir}, $template->output);
+	}
+}
+
 sub preprocess_tag (@) {
 	if (! @_) {
 		return "";
@@ -72,6 +94,10 @@ sub preprocess_tag (@) {
 	foreach my $tag (keys %params) {
 		$tag=linkpage($tag);
 		$tags{$page}{$tag}=1;
+
+		# add tagpage if necessary
+		gentag($tag);
+
 		# hidden WikiLink
 		add_link($page, tagpage($tag));
 	}
diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl
new file mode 100644
index 000000000..754e0b35b
--- /dev/null
+++ b/templates/autotag.tmpl
@@ -0,0 +1,3 @@
+## Pagest tagged <TMPL_VAR TAG> ##
+
+[[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"]]
-- 
cgit v1.2.3


From b18fde2bde0c7d445fd4aab3cd35add8c211aab4 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sun, 31 Jan 2010 02:31:12 +0100
Subject: Add a function add_autofiles().

The objective is to provide a sensible way to let plugins add files during the
"scan stage" of the build.

Currently does a little verification and adds the file to the global array
@add_autofiles.
---
 IkiWiki.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index cb1c46a68..115c512d3 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,7 +14,7 @@ use open qw{:utf8 :std};
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
 	    %pagesources %destsources %depends %depends_simple %hooks
-	    %forcerebuild %loaded_plugins};
+	    %forcerebuild %loaded_plugins @autofiles};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
@@ -1898,6 +1898,14 @@ sub add_link ($$) {
 		unless grep { $_ eq $link } @{$links{$page}};
 }
 
+sub add_autofile ($) {
+	my $addfile=shift;
+	my ($file,$page) = verify_src_file($addfile,$config{srcdir});
+	if ($page) {
+		push @autofiles, $file;
+	}
+}
+
 sub pagespec_translate ($) {
 	my $spec=shift;
 
-- 
cgit v1.2.3


From f3c59ed3e52f6e68e73338f6e7799a4de7b6f9d6 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sun, 31 Jan 2010 02:23:11 +0100
Subject: Process files from @autofiles in refresh().

To make automatically added files render they have to be added to the $files,
$pages, $new, and $changed variables.

After that scan() is called on them.
---
 IkiWiki/Render.pm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 44b2fb9c2..dd4d9ca0c 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -642,6 +642,20 @@ sub refresh () {
 		scan($file);
 	}
 
+	while (my $autofile = shift (@autofiles)) {
+		my $page=pagename($autofile);
+		if ($pages->{$page}) {
+			debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+		}
+		$pages->{$page}=1;
+
+		push @{$files}, $autofile;
+		push @{$new}, $autofile if find_new_files([$autofile]);
+		push @{$changed}, $autofile if find_changed([$autofile]);
+
+		scan($autofile);
+	}
+
 	calculate_links();
 	
 	remove_del(@$del, @$internal_del);
-- 
cgit v1.2.3


From a8d313aba1094fc6d976c9ba3d09f58b768435c5 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sun, 31 Jan 2010 01:12:20 +0100
Subject: Use add_autofile() in tag.pm

to make the automatically created tagpages render.
---
 IkiWiki/Plugin/tag.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 6c43a053d..90833fd9c 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -78,6 +78,8 @@ sub gentag ($) {
 		my $template=template("autotag.tmpl");
 		$template->param(tag => $tag);
 		writefile($tagfile, $config{srcdir}, $template->output);
+
+		IkiWiki::add_autofile("$config{srcdir}/$tagfile");
 	}
 }
 
-- 
cgit v1.2.3


From f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 11:01:24 +0100
Subject: Revert the effects of find_del_files() for (re)autoadded files.

This also means that if autoadded files are deleted they will just be
recreated.
---
 IkiWiki.pm        | 3 ++-
 IkiWiki/Render.pm | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 115c512d3..ad9fb7c79 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,7 +14,8 @@ use open qw{:utf8 :std};
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
 	    %pagesources %destsources %depends %depends_simple %hooks
-	    %forcerebuild %loaded_plugins @autofiles};
+	    %forcerebuild %loaded_plugins @autofiles %dellinks
+	    %delrenderedfiles};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index dd4d9ca0c..d2fa80fbb 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -392,7 +392,9 @@ sub find_del_files ($) {
 			else {
 				push @del, $pagesources{$page};
 			}
+			$dellinks{$page}= $links{$page};
 			$links{$page}=[];
+			$delrenderedfiles{$page}= $renderedfiles{$page};
 			$renderedfiles{$page}=[];
 			$pagemtime{$page}=0;
 		}
@@ -642,8 +644,14 @@ sub refresh () {
 		scan($file);
 	}
 
+	my %del_hash = map {$_, 1} @$del;
 	while (my $autofile = shift (@autofiles)) {
 		my $page=pagename($autofile);
+    if (exists $del_hash{$page}) {
+			$links{$page}= $dellinks{$page};
+			$renderedfiles{$page}= $delrenderedfiles{$page};
+			delete $del_hash{$page};
+		}
 		if ($pages->{$page}) {
 			debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 		}
@@ -655,6 +663,7 @@ sub refresh () {
 
 		scan($autofile);
 	}
+	$del = [keys %del_hash];
 
 	calculate_links();
 	
-- 
cgit v1.2.3


From 25741100b0a0d81ae5113dfabe5a1ed84cdf8746 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 12:12:23 +0100
Subject: Export add_autofile() for use in Plugins.

---
 IkiWiki.pm            | 2 +-
 IkiWiki/Plugin/tag.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ad9fb7c79..7d7f430b3 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -23,7 +23,7 @@ our @EXPORT = qw(hook debug error template htmlpage deptype
 		 htmllink readfile writefile pagetype srcfile pagename
 		 displaytime will_render gettext urlto targetpage
 		 add_underlay pagetitle titlepage linkpage newpagefile
-		 inject add_link
+		 inject add_link add_autofile
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 90833fd9c..c0b7feb23 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -79,7 +79,7 @@ sub gentag ($) {
 		$template->param(tag => $tag);
 		writefile($tagfile, $config{srcdir}, $template->output);
 
-		IkiWiki::add_autofile("$config{srcdir}/$tagfile");
+		add_autofile("$config{srcdir}/$tagfile");
 	}
 }
 
-- 
cgit v1.2.3


From c6f27f9dfaa689a32342a412d6fd19d63453ee85 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 14:32:51 +0100
Subject: add git repository 'davrieb' and document branch on userpage

---
 doc/git.mdwn                     | 4 +++-
 doc/users/David_Riebenbauer.mdwn | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 30fed6afc..289937121 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -56,7 +56,9 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[ktf]] `git://github.com/ktf/ikiwiki.git`
 * [[tove]] `git://github.com/tove/ikiwiki.git`
 * [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki`
-* [[roktas]] `git://github.com/roktas/ikiwiki.git``
+* [[roktas]] `git://github.com/roktas/ikiwiki.git`
+* [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki`
+  ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
 
 ## branches
 
diff --git a/doc/users/David_Riebenbauer.mdwn b/doc/users/David_Riebenbauer.mdwn
index 372a28588..d7469696e 100644
--- a/doc/users/David_Riebenbauer.mdwn
+++ b/doc/users/David_Riebenbauer.mdwn
@@ -1,2 +1,8 @@
 Runs ikiwiki on his [homepage](http://liegesta.at/) and can be reached through
 <davrieb@liegesta.at>
+
+## Branches in his [[git]] repository ##
+
+* `autotag`
+([browse](http://git.liegesta.at/?p=ikiwiki.git;a=shortlog;h=refs/heads/autotag))
+See [[todo/auto-create_tag_pages_according_to_a_template]]
-- 
cgit v1.2.3


From 1febfda911d29a52b4c4aa1bb286f4c9e1862c5c Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 14:50:01 +0100
Subject: also tag 'patch/core', considering that over half of the changes are
 there

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 95710ced0..8c586d706 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -4,7 +4,7 @@ Tags are mainly specific to the object to which they’re stuck. However, I ofte
 
 Also see: <http://madduck.net/blog/2008.01.06:new-blog/> and <http://users.itk.ppke.hu/~cstamas/code/ikiwiki/autocreatetagpage/>
 
-[[!tag wishlist plugins/tag patch]]
+[[!tag wishlist plugins/tag patch patch/core]]
 
 I would love to see this as well. -- dato
 
-- 
cgit v1.2.3


From 9330b91703ba245ceb9c36e0682b8cfc0d225eaa Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 16:29:27 +0100
Subject: fix typo in autotag.tmpl

---
 templates/autotag.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl
index 754e0b35b..a8824171b 100644
--- a/templates/autotag.tmpl
+++ b/templates/autotag.tmpl
@@ -1,3 +1,3 @@
-## Pagest tagged <TMPL_VAR TAG> ##
+## Pages tagged <TMPL_VAR TAG> ##
 
 [[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"]]
-- 
cgit v1.2.3


From 6b98269aa310abc121875753ded37042f3a95988 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 2 Feb 2010 13:31:07 -0500
Subject: partial review

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 8c586d706..a0e76fd48 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -160,3 +160,35 @@ wrong direction.
 * Proper documentation.
 
 --[[David_Riebenbauer]]
+
+> Starting review of this. Some of your commits are to very delicate,
+> optimised, and security-sensitive ground, so I have to look at them very
+> carefully. --[[Joey]]
+> 
+> * In the refactoring in f3abeac919c4736429bd3362af6edf51ede8e7fe,
+>   you introduced at least 2 bugs, one a possible security hole.
+>   Now one part of the code tests `if ($file)` and the other
+>   caller tests `if ($f)`. These two tests both tested `if (! defined $f)`
+>   before. Notice that the variable needs to be the untainted variable
+>   for both. Also notice that `if ($f)` fails if `$f` contains `0`,
+>   which is a very common perl gotcha.
+> * Your refactored code changes `-l $_ || -d _` to `-l $file || -d $file`.
+>   The latter makes one more stat system call; note the use of a
+>   bare `_` in the first to make perl reuse the stat buffer.
+> * (As a matter of style, could you put a space after the commas in your
+>   perl?)
+> 
+> I'd like to cherry-pick the above commit, once it's in shape, before
+> looking at the rest in detail. So just a few other things that stood out.
+> 
+> * Commit 4af4d26582f0c2b915d7102fb4a604b176385748 seems unnecessary.
+>   `srcfile($file, 1)` already is documented to return undef if the
+>   file does not exist. (But without the second parameter, it throws
+>   an error.)
+>
+> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 adds a line
+>   that is intented by a space, not a tab.
+> 
+> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 says that auto-added
+>   files will be recreated if the user deletes them. That seems bad.
+>   `autoindex` goes to some trouble to not recreate deleted files.
-- 
cgit v1.2.3


From bd1e29b8c4d2c2e0329789d1baf0a879617aeee4 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Wed, 3 Feb 2010 02:35:19 +0100
Subject: Revert "Make srcfile() return undef, if the file isn't there."

This reverts commit 1bde208ec9b915db0187030c33450b5accb4892c.
---
 IkiWiki.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7d7f430b3..90e623330 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -744,10 +744,7 @@ sub srcfile_stat {
 }
 
 sub srcfile ($;$) {
-	if (my @stat=srcfile_stat(@_)) {
-		return $stat[0];
-	}
-	return undef
+	return (srcfile_stat(@_))[0];
 }
 
 sub add_underlay ($) {
-- 
cgit v1.2.3


From da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Wed, 3 Feb 2010 06:57:20 +0100
Subject: fix bugs in `find_src_files()`.

Use `_` to avoid superfluous stat.

Check for `defined $file`, instead of just `$file`.

Add spaces after commas.

Change return values of `verify_src_file()` to not return the tainted filename.
Rename `$f` to `$file_untainted in `verify_src_file()`.
$f changes to `$file` in `find_src_files()`.

This attempts to fix commit f3abeac919c4736429bd3362af6edf51ede8e7fe.
For discussion see
<http://ikiwiki.info/todo/auto-create_tag_pages_according_to_a_template/>
---
 IkiWiki/Render.pm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d2fa80fbb..5b72b6de1 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -284,7 +284,7 @@ sub verify_src_file ($$) {
 	my $file=decode_utf8(shift);
 	my $dir=shift;
 
-	return if -l $file || -d $file;
+	return if -l $file || -d _;
 	$file=~s/^\Q$dir\E\/?//;
 	return if ! length $file;
 	my $page = pagename($file);
@@ -294,11 +294,11 @@ sub verify_src_file ($$) {
 		return;
 	}
 
-	my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-	if (! defined $f) {
+	my ($file_untainted) = $file =~ /$config{wiki_file_regexp}/; # untaint
+	if (! defined $file_untainted) {
 		warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
 	}
-	return ($file,$page,$f);
+	return ($file_untainted, $page);
 }
 
 sub find_src_files () {
@@ -309,8 +309,8 @@ sub find_src_files () {
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			my ($file,$page,$f) = verify_src_file($_,$config{srcdir});
-			if ($file) {
+			my ($file, $page) = verify_src_file($_, $config{srcdir});
+			if (defined $file) {
 				push @files, $file;
 				if ($pages{$page}) {
 					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
@@ -323,14 +323,14 @@ sub find_src_files () {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				my ($file,$page,$f) = verify_src_file($_,$dir);
-				if ($f) {
+				my ($file, $page) = verify_src_file($_, $dir);
+				if (defined $file) {
 					# avoid underlaydir override
 					# attacks; see security.mdwn
-					if (! -l "$config{srcdir}/$f" &&
+					if (! -l "$config{srcdir}/$file" &&
 					    ! -e _) {
 						if (! $pages{$page}) {
-							push @files, $f;
+							push @files, $file;
 							$pages{$page}=1;
 						}
 					}
-- 
cgit v1.2.3


From 261dcd04750acb166915bfb1cf8d3c31a8fccb96 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Wed, 3 Feb 2010 21:59:38 -0500
Subject: response

---
 ...navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 1cb5ed27e..0497b66b6 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -64,6 +64,9 @@ the plugin has, as of now, two problems:
 > Seems about ready for me to think about pulling it into ikiwiki
 > alongside [[tips/vim_syntax_highlighting/ikiwiki.vim]]. If you'll
 > please slap a license on it. :) --[[Joey]] 
+>
+>> GPL version 2 or later (if that doesn't cause any problems here). I'll add it
+>> to the file --[[jerojasro]]
 > 
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
@@ -80,6 +83,10 @@ the plugin has, as of now, two problems:
 > 
 > And if that's the case, you can resolve an absolute link by looking for
 > the page closest to the root that matches the link.
+>
+>> I like your idea; it doesn't alter the matching of the relative links, and
+>> should work fine with absolute links too. I'll implement it, though I see
+>> some potential (but small) issues with it --[[jerojasro]]
 > 
 > It may even make sense to change ikiwiki's own handling of "absolute"
 > links to work that way. But even without changing ikiwiki, I think it
@@ -93,3 +100,7 @@ the plugin has, as of now, two problems:
 >    and vim would go to that file.
 > 
 > --[[Joey]] 
+>
+>> your approach will add more noise when the plugin grows the page-creation
+>> feature, since there will be no real root to limit the possible locations for
+>> the new page. But it is far better than demanding for a `.ikiwiki` dir --[[jerojasro]]
-- 
cgit v1.2.3


From c4db8d89a5c1b3eab519fc6268e1fed6b1f4eb2f Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Wed, 3 Feb 2010 22:47:26 -0500
Subject: new forum post

---
 doc/forum/where_are_the_tags.mdwn | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/forum/where_are_the_tags.mdwn

diff --git a/doc/forum/where_are_the_tags.mdwn b/doc/forum/where_are_the_tags.mdwn
new file mode 100644
index 000000000..f70c2e69a
--- /dev/null
+++ b/doc/forum/where_are_the_tags.mdwn
@@ -0,0 +1,2 @@
+Where is the tag cloud/tag listing of all the tags used in this wiki? I know we
+have tags enabled.
-- 
cgit v1.2.3


From 208335ec80f4678ea352823111b953f1d7eccff9 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Wed, 3 Feb 2010 22:48:15 -0500
Subject: signature

---
 doc/forum/where_are_the_tags.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/where_are_the_tags.mdwn b/doc/forum/where_are_the_tags.mdwn
index f70c2e69a..3a4debfe5 100644
--- a/doc/forum/where_are_the_tags.mdwn
+++ b/doc/forum/where_are_the_tags.mdwn
@@ -1,2 +1,2 @@
 Where is the tag cloud/tag listing of all the tags used in this wiki? I know we
-have tags enabled.
+have tags enabled. --[[jerojasro]]
-- 
cgit v1.2.3


From 345b40c65288874e458e2bec51f81f429f0b3db1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Feb 2010 14:51:56 -0500
Subject: Allow jumping directly into account registration process by going to 
 ikiwiki.cgi?do=register

---
 IkiWiki/Plugin/passwordauth.pm | 16 ++++++++++++----
 debian/changelog               |  2 ++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 8cf5af51e..1898030b5 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -104,11 +104,11 @@ sub formbuilder_setup (@) {
 	my $session=$params{session};
 	my $cgi=$params{cgi};
 
-	if ($form->title eq "signin" || $form->title eq "register") {
+	if ($form->title eq "signin" || $form->title eq "register" || $cgi->param("do") eq "register") {
 		$form->field(name => "name", required => 0);
 		$form->field(name => "password", type => "password", required => 0);
 		
-		if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
+		if ($form->submitted eq "Register" || $form->submitted eq "Create Account" || $cgi->param("do") eq "register") {
 			$form->field(name => "confirm_password", type => "password");
 			$form->field(name => "account_creation_password", type => "password")
 				 if (defined $config{account_creation_password} &&
@@ -232,7 +232,7 @@ sub formbuilder (@) {
 	my $buttons=$params{buttons};
 
 	if ($form->title eq "signin" || $form->title eq "register") {
-		if ($form->submitted && $form->validate) {
+		if (($form->submitted && $form->validate) || $cgi->param("do") eq "register") {
 			if ($form->submitted eq 'Login') {
 				$session->param("name", $form->field("name"));
 				IkiWiki::cgi_postsignin($cgi, $session);
@@ -295,7 +295,7 @@ sub formbuilder (@) {
 				$form->field(name => "name", required => 0);
 				push @$buttons, "Reset Password";
 			}
-			elsif ($form->submitted eq "Register") {
+			elsif ($form->submitted eq "Register" || $cgi->param("do") eq "register") {
 				@$buttons="Create Account";
 			}
 		}
@@ -336,6 +336,14 @@ sub sessioncgi ($$) {
 		IkiWiki::cgi_prefs($q, $session);
 		exit;
 	}
+	elsif ($q->param("do") eq "register") {
+		# After registration, need to go somewhere, so show prefs page.
+		$session->param(postsignin => "do=prefs");
+		# Due to do=register, this will run in registration-only
+		# mode.
+		IkiWiki::cgi_signin($q, $session);
+		exit;
+	}
 }
 
 sub auth ($$) {
diff --git a/debian/changelog b/debian/changelog
index 8e01950a8..7beb0db82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * img: Fix a bug that could taint @links with undef values.
   * setup automator: Configure Term::Readline to use bold for prompt, rather
     than default underline. Closes: #517656
+  * Allow jumping directly into account registration process by going to 
+    ikiwiki.cgi?do=register
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
cgit v1.2.3


From b547170a965e93a759de1612d4ce64d38eeea59c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Feb 2010 15:07:10 -0500
Subject: Improve display of openid in preferences page.

Now that openiduser is in IkiWiki core, it's ok to have passwordauth check
for it, and avoid displaying useless password fields when showing
preferences for an openid.

Also improved the styling of the display of the openid in the preferneces
page.
---
 IkiWiki/Plugin/openid.pm       | 14 +++++++-------
 IkiWiki/Plugin/passwordauth.pm |  3 ++-
 debian/changelog               |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index dc0e0f48e..b60740c0e 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -82,13 +82,13 @@ sub formbuilder_setup (@) {
 			}
 		}
 	}
-	elsif ($form->title eq "preferences") {
-		if (! defined $form->field(name => "name")) {
-			$form->field(name => "OpenID", disabled => 1,
-				value => $session->param("name"), 
-				size => 50, force => 1,
-				fieldset => "login");
-		}
+	elsif ($form->title eq "preferences" &&
+	       IkiWiki::openiduser($session->param("name"))) {
+		$form->field(name => "openid_url", disabled => 1,
+			label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
+			value => $session->param("name"), 
+			size => 50, force => 1,
+			fieldset => "login");
 	}
 }
 
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 1898030b5..b70f9b788 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -206,7 +206,8 @@ sub formbuilder_setup (@) {
 			}
 		}
 	}
-	elsif ($form->title eq "preferences") {
+	elsif ($form->title eq "preferences" &&
+	        IkiWiki::openiduser($session->param("name"))) {
 		$form->field(name => "name", disabled => 1, 
 			value => $session->param("name"), force => 1,
 			fieldset => "login");
diff --git a/debian/changelog b/debian/changelog
index 7beb0db82..9867cf75a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     than default underline. Closes: #517656
   * Allow jumping directly into account registration process by going to 
     ikiwiki.cgi?do=register
+  * Improve display of openid in preferences page.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
cgit v1.2.3


From 68f7be91e59b304f4deb4ce84506a2bdd63917db Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Feb 2010 15:10:55 -0500
Subject: typo

---
 IkiWiki/Plugin/passwordauth.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index b70f9b788..94c5b0492 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -207,7 +207,7 @@ sub formbuilder_setup (@) {
 		}
 	}
 	elsif ($form->title eq "preferences" &&
-	        IkiWiki::openiduser($session->param("name"))) {
+	       ! IkiWiki::openiduser($session->param("name"))) {
 		$form->field(name => "name", disabled => 1, 
 			value => $session->param("name"), force => 1,
 			fieldset => "login");
-- 
cgit v1.2.3


From cfcb3d18808a753a90b042462d1dd71fcb7c82b5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Feb 2010 15:17:21 -0500
Subject: remove userlink()

That was dead code; changes to lockedit and recentchanges removed the last
callers.
---
 IkiWiki.pm | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b8e599928..6226824df 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1125,23 +1125,6 @@ sub openiduser ($) {
 	return;
 }
 
-sub userlink ($) {
-	my $user=shift;
-
-	my $oiduser=eval { openiduser($user) };
-	if (defined $oiduser) {
-		return "<a href=\"$user\">$oiduser</a>";
-	}
-	else {
-		eval q{use CGI 'escapeHTML'};
-		error($@) if $@;
-
-		return htmllink("", "", escapeHTML(
-			length $config{userdir} ? $config{userdir}."/".$user : $user
-		), noimageinline => 1);
-	}
-}
-
 sub htmlize ($$$$) {
 	my $page=shift;
 	my $destpage=shift;
-- 
cgit v1.2.3


From a2e78ebcf27680eedf30e00f1ee9b86ed1d9e127 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Feb 2010 15:30:41 -0500
Subject: Add link to userpage (or creation link) to top of preferences page.

---
 IkiWiki/Plugin/passwordauth.pm | 44 ++++++++++++++++++++++++++++--------------
 debian/changelog               |  1 +
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 94c5b0492..b3a798055 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -206,21 +206,35 @@ sub formbuilder_setup (@) {
 			}
 		}
 	}
-	elsif ($form->title eq "preferences" &&
-	       ! IkiWiki::openiduser($session->param("name"))) {
-		$form->field(name => "name", disabled => 1, 
-			value => $session->param("name"), force => 1,
-			fieldset => "login");
-		$form->field(name => "password", type => "password",
-			fieldset => "login",
-			validate => sub {
-				shift eq $form->field("confirm_password");
-			}),
-		$form->field(name => "confirm_password", type => "password",
-			fieldset => "login",
-			validate => sub {
-				shift eq $form->field("password");
-			}),
+	elsif ($form->title eq "preferences") {
+		my $user=$session->param("name");
+		if (! IkiWiki::openiduser($user)) {
+			$form->field(name => "name", disabled => 1, 
+				value => $user, force => 1,
+				fieldset => "login");
+			$form->field(name => "password", type => "password",
+				fieldset => "login",
+				validate => sub {
+					shift eq $form->field("confirm_password");
+				});
+			$form->field(name => "confirm_password", type => "password",
+				fieldset => "login",
+				validate => sub {
+					shift eq $form->field("password");
+				});
+			
+			my $userpage=$config{userdir} ? $config{userdir}."/".$user : $user;
+			if (exists $pagesources{$userpage}) {
+				$form->text(gettext("Your user page: ").
+					htmllink("", "", $userpage,
+						noimageinline => 1));
+			}
+			else {
+				$form->text("<a href=\"".
+					IkiWiki::cgiurl(do => "edit", page => $userpage).
+					"\">".gettext("Create your user page")."</a>");
+			}
+		}
 	}
 }
 
diff --git a/debian/changelog b/debian/changelog
index 9867cf75a..e07bada28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * Allow jumping directly into account registration process by going to 
     ikiwiki.cgi?do=register
   * Improve display of openid in preferences page.
+  * Add link to userpage (or creation link) to top of preferences page.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
cgit v1.2.3


From 8380a9d0009fee740f980aee3d45a933a5b24219 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Feb 2010 18:24:15 -0500
Subject: factor out a userpage function

Not yet exported, as only 4 quite core plugins use it.
---
 IkiWiki.pm                      | 5 +++++
 IkiWiki/Plugin/comments.pm      | 5 ++---
 IkiWiki/Plugin/editpage.pm      | 5 +++--
 IkiWiki/Plugin/passwordauth.pm  | 2 +-
 IkiWiki/Plugin/recentchanges.pm | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6226824df..0715f1869 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1090,6 +1090,11 @@ sub htmllink ($$$;@) {
 	return "<a href=\"$bestlink\"@attrs>$linktext</a>";
 }
 
+sub userpage ($) {
+	my $user=shift;
+	return length $config{userdir} ? "$config{userdir}/$user" : $user;
+}
+
 sub openiduser ($) {
 	my $user=shift;
 
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 5586cca52..caed0d58c 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -171,9 +171,8 @@ sub preprocess {
 		else {
 			$commentauthorurl = IkiWiki::cgiurl(
 				do => 'goto',
-				page => (length $config{userdir}
-					? "$config{userdir}/$commentuser"
-					: "$commentuser"));
+				page => IkiWiki::userpage($commentuser)
+			);
 
 			$commentauthor = $commentuser;
 		}
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index fca970c60..219386a30 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -245,8 +245,9 @@ sub cgi_editpage ($$) {
 					push @page_locs, $dir.$page;
 				}
 			
-				push @page_locs, "$config{userdir}/$page"
-					if length $config{userdir};
+				my $userpage=IkiWiki::userpage($page);
+				push @page_locs, $userpage
+					if ! grep { $_ eq $userpage } @page_locs;
 			}
 
 			@page_locs = grep {
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index b3a798055..c07065b7d 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -223,7 +223,7 @@ sub formbuilder_setup (@) {
 					shift eq $form->field("password");
 				});
 			
-			my $userpage=$config{userdir} ? $config{userdir}."/".$user : $user;
+			my $userpage=IkiWiki::userpage($user);
 			if (exists $pagesources{$userpage}) {
 				$form->text(gettext("Your user page: ").
 					htmllink("", "", $userpage,
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index fa851e466..5c7b71aaa 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -124,7 +124,7 @@ sub store ($$$) {
 	elsif (length $config{cgiurl}) {
 		$change->{authorurl} = IkiWiki::cgiurl(
 			do => "goto",
-			page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
+			page => IkiWiki::userpage($change->{author}),
 		);
 	}
 
-- 
cgit v1.2.3


From 0e67c26e2e656cf54aa13033c56e204237ef5775 Mon Sep 17 00:00:00 2001
From: "http://edward.myopenid.com/" <http://edward.myopenid.com/@web>
Date: Fri, 5 Feb 2010 03:25:22 +0000
Subject: add 'or' to pagespec

---
 doc/users/Edward_Betts.mdwn | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index b32927a1c..61d6150ef 100644
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,9 +1,4 @@
 My watchlist:
 
-[[!inline archive="yes" sort="mtime" atom="yes" pages="
-todo/allow_wiki_syntax_in_commit_messages*
-todo/shortcut_with_different_link_text*
-todo/structured_page_data*
-tips/convert_mediawiki_to_ikiwiki*
-"]]
+[[!inline archive="yes" sort="mtime" atom="yes" pages="todo/allow_wiki_syntax_in_commit_messages* or todo/shortcut_with_different_link_text* or todo/structured_page_data* or tips/convert_mediawiki_to_ikiwiki*"]]
 
-- 
cgit v1.2.3


From 34a64557cf5f4a913c07f04d021debdd5fb58b1b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Feb 2010 13:46:12 -0500
Subject: scratch patch

---
 doc/bugs/anonok_vs._httpauth.mdwn | 42 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 0a62164cb..1c492139b 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -58,3 +58,45 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >> On reflection, I've stopped being bothered by the
 >> redirect-to-signin-page approach. (It only needs to happen once per
 >> browser session, anyway.) Can we try that? --[[schmonz]]
+
+Here is an attempt. With this httpauth will only redirect to the
+`cgiauth_url` when a page is edited, and it will defer to other plugins
+like anonok first. I have not tested this. --[[Joey]] 
+
+<pre>
+diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
+index 127c321..c181164 100644
+--- a/IkiWiki/Plugin/httpauth.pm
++++ b/IkiWiki/Plugin/httpauth.pm
+@@ -9,6 +9,8 @@ use IkiWiki 3.00;
+ sub import {
+ 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
+ 	hook(type => "auth", id => "httpauth", call => \&auth);
++	hook(type => "canedit", id => "httpauth", call => \&canedit,
++		last => 1);
+ }
+ 
+ sub getsetup () {
+@@ -33,10 +35,20 @@ sub auth ($$) {
+ 	if (defined $cgi->remote_user()) {
+ 		$session->param("name", $cgi->remote_user());
+ 	}
+-	elsif (defined $config{cgiauthurl}) {
++}
++
++sub canedit ($$$) {
++	my $page=shift;
++	my $cgi=shift;
++	my $session=shift;
++
++	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+ 		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+ 		exit;
+ 	}
++	else {
++		return undef;
++	}
+}
+ 
+ 1
+</pre>
-- 
cgit v1.2.3


From 5541b06de43c70ca9c23231d175d474789dacd25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Feb 2010 15:22:02 -0500
Subject: response

---
 IkiWiki/Plugin/httpauth.pm        | 14 +++++++++++++-
 doc/forum/where_are_the_tags.mdwn |  7 +++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 127c321f0..c1811643b 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,6 +9,8 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 	hook(type => "auth", id => "httpauth", call => \&auth);
+	hook(type => "canedit", id => "httpauth", call => \&canedit,
+		last => 1);
 }
 
 sub getsetup () {
@@ -33,10 +35,20 @@ sub auth ($$) {
 	if (defined $cgi->remote_user()) {
 		$session->param("name", $cgi->remote_user());
 	}
-	elsif (defined $config{cgiauthurl}) {
+}
+
+sub canedit ($$$) {
+	my $page=shift;
+	my $cgi=shift;
+	my $session=shift;
+
+	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
 		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
 		exit;
 	}
+	else {
+		return undef;
+	}
 }
 
 1
diff --git a/doc/forum/where_are_the_tags.mdwn b/doc/forum/where_are_the_tags.mdwn
index 3a4debfe5..ecb49fe43 100644
--- a/doc/forum/where_are_the_tags.mdwn
+++ b/doc/forum/where_are_the_tags.mdwn
@@ -1,2 +1,9 @@
 Where is the tag cloud/tag listing of all the tags used in this wiki? I know we
 have tags enabled. --[[jerojasro]]
+
+> This wiki does not use one global toplevel set of tags (`tagbase` is not
+> set).
+> 
+> There are tags used for the [[plugins]], and a tag cloud of those
+> there. [[wishlist]] and [[patch]] are tags too, but I don't see the point
+> of a tag cloud for such tags. --[[Joey]]
-- 
cgit v1.2.3


From 1af8db763b76856a3f8fb4d79333b19ef5083637 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Feb 2010 23:06:29 -0500
Subject: revert accidental code change

---
 IkiWiki/Plugin/httpauth.pm | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index c1811643b..127c321f0 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,8 +9,6 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 	hook(type => "auth", id => "httpauth", call => \&auth);
-	hook(type => "canedit", id => "httpauth", call => \&canedit,
-		last => 1);
 }
 
 sub getsetup () {
@@ -35,20 +33,10 @@ sub auth ($$) {
 	if (defined $cgi->remote_user()) {
 		$session->param("name", $cgi->remote_user());
 	}
-}
-
-sub canedit ($$$) {
-	my $page=shift;
-	my $cgi=shift;
-	my $session=shift;
-
-	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+	elsif (defined $config{cgiauthurl}) {
 		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
 		exit;
 	}
-	else {
-		return undef;
-	}
 }
 
 1
-- 
cgit v1.2.3


From 03777230ea17220527b7cd45b9a57770e859623c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 15:29:25 -0500
Subject: update comment re openid library version

---
 IkiWiki.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0715f1869..2a0132745 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1103,11 +1103,10 @@ sub openiduser ($) {
 		my $display;
 
 		if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) {
-			# this works in at least 2.x
 			$display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user);
 		}
 		else {
-			# this only works in 1.x
+			# backcompat with old version
 			my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
 			$display=$oid->display;
 		}
-- 
cgit v1.2.3


From eda1d1321b7510d717c236b668e430bf1f656bed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 15:53:54 -0500
Subject: auto-blog.setup: Lock all pages, so only admin can post to the blog
 by default.

---
 auto-blog.setup  | 1 +
 debian/changelog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/auto-blog.setup b/auto-blog.setup
index 82aa8d415..e3059e32e 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -47,4 +47,5 @@ IkiWiki::Setup::Automator->import(
 	comments_pagespec => "posts/* and !*/Discussion",
 	blogspam_pagespec => "postcomment(*)",
 	discussion => 0,
+	locked_pages => "*",
 )
diff --git a/debian/changelog b/debian/changelog
index e07bada28..b4acac633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     ikiwiki.cgi?do=register
   * Improve display of openid in preferences page.
   * Add link to userpage (or creation link) to top of preferences page.
+  * auto-blog.setup: Lock all pages, so only admin can post to the blog
+    by default.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
cgit v1.2.3


From e33a65719a58a65201c1c742f544f5cab38ad23c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 16:12:29 -0500
Subject: ensure opendiscussion hook is always called before lockedit

This was only ordered ok due to luck before.
---
 IkiWiki/Plugin/opendiscussion.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 4517ff88b..4b91f5d83 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -7,7 +7,8 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "opendiscussion", call => \&getsetup);
-	hook(type => "canedit", id => "opendiscussion", call => \&canedit);
+	hook(type => "canedit", id => "opendiscussion", call => \&canedit,
+		first => 1);
 }
 
 sub getsetup () {
-- 
cgit v1.2.3


From b384af237df92e787f84f845d0d2bc182f7775ff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 16:19:17 -0500
Subject: opendiscussion: This plugin will also now allow posting comments to
 otherwise locked-down sites.

---
 IkiWiki/Plugin/opendiscussion.pm |  1 +
 debian/changelog                 |  2 ++
 doc/plugins/comments.mdwn        |  4 ++--
 doc/plugins/lockedit.mdwn        | 11 +++--------
 doc/plugins/opendiscussion.mdwn  |  5 +++--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 4b91f5d83..5a455940b 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -25,6 +25,7 @@ sub canedit ($$) {
 	my $session=shift;
 
 	return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i;
+	return "" if pagespec_match($page, "postcomment(*)");
 	return undef;
 }
 
diff --git a/debian/changelog b/debian/changelog
index b4acac633..a65592277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * Add link to userpage (or creation link) to top of preferences page.
   * auto-blog.setup: Lock all pages, so only admin can post to the blog
     by default.
+  * opendiscussion: This plugin will also now allow posting comments
+    to otherwise locked-down sites. 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index b6d4d252b..f933d32be 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -14,8 +14,8 @@ authorship should hopefully be unforgeable by CGI users.
 The intention is that on a non-wiki site (like a blog) you can lock all
 pages for admin-only access, then allow otherwise unprivileged (or perhaps
 even anonymous) users to comment on posts. See the documentation of the
-[[lockedit]] and [[anonok]] pages for details on locking down a wiki so
-users can only post comments.
+[[opendiscussion]], [[lockedit]] and [[anonok]] pages for details on locking
+down a wiki so readers can only post comments.
 
 Individual comments are stored as internal-use pages named something like
 `page/comment_1`, `page/comment_2`, etc. These pages internally use a
diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn
index c8f64ea47..681163203 100644
--- a/doc/plugins/lockedit.mdwn
+++ b/doc/plugins/lockedit.mdwn
@@ -12,14 +12,9 @@ to lock. For example, you could choose to lock all pages created before
 2006, or all pages that are linked to from the page named "locked". More
 usually though, you'll just list some names of pages to lock.
 
-One handy thing to do if you're using ikiwiki for your blog is to lock
-"* and !*/Discussion". This prevents others from adding to or modifying
-posts in your blog, while still letting them comment via the Discussion
-pages.
-
-Alternatively, if you're using the [[comments]] plugin, you can lock
-"!postcomment(*)" to allow users to comment on pages, but not edit anything
-else.
+If you want to lock down a blog so only you can post to it, you can just
+lock "*", and enable the [[opendiscussion]] plugin, so readers can still post
+[[comments]].
 
 Wiki administrators can always edit locked pages. The [[ikiwiki/PageSpec]]
 can specify that some pages are not locked for some users. For example,
diff --git a/doc/plugins/opendiscussion.mdwn b/doc/plugins/opendiscussion.mdwn
index b2ba68bf7..3b5ab4858 100644
--- a/doc/plugins/opendiscussion.mdwn
+++ b/doc/plugins/opendiscussion.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=opendiscussion author="[[Joey]]"]]
 [[!tag type/auth]]
 
-This plugin allows editing of Discussion pages by anonymous users who have
-not logged into the wiki.
+This plugin allows editing of Discussion pages, and posting of comments,
+even when the [[lockedit]] plugin has been configured to otherwise prevent
+editing.
-- 
cgit v1.2.3


From caa5db6c54c5c6368d511214961e749f5451379c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 16:20:03 -0500
Subject: add opendiscussion to auto-blog.setup

---
 auto-blog.setup  | 2 +-
 debian/changelog | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/auto-blog.setup b/auto-blog.setup
index e3059e32e..7ff413187 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import(
 	cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
 	cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",
 	adminemail => "$ENV{USER}\@$domain",
-	add_plugins => [qw{goodstuff websetup comments blogspam}],
+	add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam}],
 	disable_plugins => [qw{}],
 	libdir => "$ENV{HOME}/.ikiwiki",
 	rss => 1,
diff --git a/debian/changelog b/debian/changelog
index a65592277..794dec418 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,10 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     ikiwiki.cgi?do=register
   * Improve display of openid in preferences page.
   * Add link to userpage (or creation link) to top of preferences page.
-  * auto-blog.setup: Lock all pages, so only admin can post to the blog
-    by default.
   * opendiscussion: This plugin will also now allow posting comments
     to otherwise locked-down sites. 
+  * auto-blog.setup: Lock all pages, so only admin can post to the blog
+    by default, and enable opendiscussion so others can comment.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
cgit v1.2.3


From 5a2de27947d084f73fdbbc55028af378f62b42b3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 16:25:39 -0500
Subject: Fix color and format plugins to appear in the websetup interface.

---
 IkiWiki/Plugin/color.pm  | 9 +++++++++
 IkiWiki/Plugin/format.pm | 9 +++++++++
 debian/changelog         | 1 +
 3 files changed, 19 insertions(+)

diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index 20505893b..b9407ba28 100644
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -10,6 +10,15 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "preprocess", id => "color", call => \&preprocess);
 	hook(type => "format",     id => "color", call => \&format);
+	hook(type => "getsetup",   id => "color", call => \&getsetup);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
 }
 
 sub preserve_style ($$$) {
diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index 1513cbed7..c8041209f 100644
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -7,6 +7,15 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "preprocess", id => "format", call => \&preprocess);
+	hook(type => "getsetup",   id => "format", call => \&getsetup);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
 }
 
 sub preprocess (@) {
diff --git a/debian/changelog b/debian/changelog
index 794dec418..06d11aa29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     to otherwise locked-down sites. 
   * auto-blog.setup: Lock all pages, so only admin can post to the blog
     by default, and enable opendiscussion so others can comment.
+  * Fix color and format plugins to appear in the websetup interface.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
cgit v1.2.3


From 03810ebf4003a5c1cb8c8a247f0e2b429923a675 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 16:29:04 -0500
Subject: add noindex robots directives

---
 doc/ikiwiki/directive/date.mdwn   | 2 ++
 doc/ikiwiki/pagespec/po.mdwn      | 2 ++
 doc/ikiwiki/pagespec/sorting.mdwn | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/doc/ikiwiki/directive/date.mdwn b/doc/ikiwiki/directive/date.mdwn
index df45fa840..b89241e4c 100644
--- a/doc/ikiwiki/directive/date.mdwn
+++ b/doc/ikiwiki/directive/date.mdwn
@@ -12,3 +12,5 @@ For example, an update to a page with an embedded date stamp could look
 like:
 
 	Updated \[[!date "Wed, 25 Nov 2009 01:11:55 -0500"]]: mumble mumble
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/ikiwiki/pagespec/po.mdwn b/doc/ikiwiki/pagespec/po.mdwn
index e0264dd50..40ed9efb6 100644
--- a/doc/ikiwiki/pagespec/po.mdwn
+++ b/doc/ikiwiki/pagespec/po.mdwn
@@ -14,3 +14,5 @@ wiki:
 
 Note that every non-po page is considered to be written in
 `po_master_language`, as specified in `ikiwiki.setup`.
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 41aa58151..697818a2a 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -9,3 +9,5 @@ orders can be specified.
 * `title_natural` - Only available if [[!cpan Sort::Naturally]] is
   installed. Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+
+[[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From aca4c725c37e6d75c7c8f4ba7596bb8358fb34b4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 16:35:01 -0500
Subject: update

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index f750fb4b0..3035aa8b0 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -134,6 +134,7 @@ Personal sites and blogs
 * [Walden Effect](http://waldeneffect.org)
 * [Avian Aqua Miser](http://www.avianaquamiser.com/)
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
+* [Backyard Deer](http://www.backyarddeer.com/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From b0857e75553f33114a0bd5484be86a02b35a09e6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 17:01:16 -0500
Subject: remove pigro.net

Unfortunatly, www.pigro.net is down, and has been for some time.
---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 3035aa8b0..469fc0f6d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -42,7 +42,6 @@ Projects & Organizations
 * [The Walden Effect](http://www.waldeneffect.org/)
 * The support pages for [Trinity Centre for High Performance Computing](http://www.tchpc.tcd.ie/support/)
 * [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/)
-* [Pigro Network](http://www.pigro.net) is running a hg based ikiwiki. (And provides ikiwiki hosting for $10/m.)
 * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
-- 
cgit v1.2.3


From 961473473ae8f2a386322149cd4668f213aeed25 Mon Sep 17 00:00:00 2001
From: AlbertF <AlbertF@web>
Date: Sun, 7 Feb 2010 00:43:34 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index afd7dbeab..62f3ad21a 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -47,6 +47,7 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
+* [make money online](http://www.mooladays.com)
 
 -----
 
-- 
cgit v1.2.3


From a752bc3d1263c65958d978441ca850f6d70eabc2 Mon Sep 17 00:00:00 2001
From: AlbertF <AlbertF@web>
Date: Sun, 7 Feb 2010 00:44:09 +0000
Subject:

---
 doc/sandbox.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 62f3ad21a..1420c1d36 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -46,9 +46,11 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
+* [make money online](http://www.mooladays.com)
 * [GNU](http://www.gnu.org/)
 * [make money online](http://www.mooladays.com)
 
+
 -----
 
 [[!progress percent=27]]
-- 
cgit v1.2.3


From 343c8768220b3802e479ba466721ed2d2e43db0d Mon Sep 17 00:00:00 2001
From: AlbertF <AlbertF@web>
Date: Sun, 7 Feb 2010 00:45:02 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1420c1d36..29c592502 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -51,6 +51,7 @@ Bulleted list
 * [make money online](http://www.mooladays.com)
 
 
+
 -----
 
 [[!progress percent=27]]
-- 
cgit v1.2.3


From 2700379ef3ffbb504c1be05cc32a3f5f44ab5981 Mon Sep 17 00:00:00 2001
From: AlbertF <AlbertF@web>
Date: Sun, 7 Feb 2010 00:46:09 +0000
Subject:

---
 doc/sandbox.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 29c592502..cfa4e88f9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -48,7 +48,6 @@ Bulleted list
 * <http://www.gnu.org/>
 * [make money online](http://www.mooladays.com)
 * [GNU](http://www.gnu.org/)
-* [make money online](http://www.mooladays.com)
 
 
 
-- 
cgit v1.2.3


From 698386604a4cfa90a89595cfd3164b60046de474 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 20:04:33 -0500
Subject: silly wabbit. spam written in sand washes away. ban for life of IP
 remains

---
 doc/sandbox.mdwn | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index cfa4e88f9..afd7dbeab 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -46,11 +46,8 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
-* [make money online](http://www.mooladays.com)
 * [GNU](http://www.gnu.org/)
 
-
-
 -----
 
 [[!progress percent=27]]
-- 
cgit v1.2.3


From 1bb06210e956801d4b64641dbc84059ad36f797e Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Sun, 7 Feb 2010 01:51:30 +0000
Subject: tested

---
 doc/bugs/anonok_vs._httpauth.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 1c492139b..1940fdad8 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -100,3 +100,6 @@ index 127c321..c181164 100644
  
  1
 </pre>
+
+> With `anonok` enabled, this works for anonymous editing of an
+> existing Discussion page. auth is still needed to create one. --[[schmonz]]
-- 
cgit v1.2.3


From 2e55a598350f422a8c064cad6bbba4e2fde13ed8 Mon Sep 17 00:00:00 2001
From: "http://gustaf.thorslund.org/" <http://gustaf.thorslund.org/@web>
Date: Sun, 7 Feb 2010 14:09:15 +0000
Subject: Added missing '!' in "!format perl..."

---
 doc/ikiwiki/directive/format.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/format.mdwn b/doc/ikiwiki/directive/format.mdwn
index 23830e9cd..7d11d225f 100644
--- a/doc/ikiwiki/directive/format.mdwn
+++ b/doc/ikiwiki/directive/format.mdwn
@@ -22,7 +22,7 @@ Note that if the highlight plugin is enabled, this directive can also be
 used to display syntax highlighted code. Many languages and formats are
 supported. For example:
 
-	\[[format perl """
+	\[[!format perl """
 	print "hello, world\n";
 	"""]]
 
-- 
cgit v1.2.3


From ef65fd58cf77c27b9063b46b5b61b3090662ddce Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 7 Feb 2010 20:29:24 +0000
Subject: HTTP:BL plugin/inclusion

---
 doc/wishlist/http_bl_support.mdwn | 59 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 doc/wishlist/http_bl_support.mdwn

diff --git a/doc/wishlist/http_bl_support.mdwn b/doc/wishlist/http_bl_support.mdwn
new file mode 100644
index 000000000..30fb9c9b3
--- /dev/null
+++ b/doc/wishlist/http_bl_support.mdwn
@@ -0,0 +1,59 @@
+[Project Honeypot](http://projecthoneypot.org/) has an HTTP:BL API available to subscribed (it's free, accept donations) people/orgs. There's a basic perl package someone wrote, I'm including a copy here.
+
+[from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112)
+
+<pre>
+package Honeypot;
+
+use Socket qw/inet_ntoa/;
+
+my $dns = 'dnsbl.httpbl.org';
+my %types = (
+0	=> 'Search Engine',
+1	=> 'Suspicious',
+2	=> 'Harvester',
+4	=> 'Comment Spammer'
+);
+sub query {
+my $key = shift || die 'You need a key for this, you get one at http://www.projecthoneypot.org';
+my $ip = shift || do {
+warn 'no IP for request in Honeypot::query().';
+return;
+};
+
+my @parts = reverse split /\./, $ip;
+my $lookup_name = join'.', $key, @parts, $dns;
+
+my $answer = gethostbyname ($lookup_name);
+return unless $answer;
+$answer = inet_ntoa($answer);
+my(undef, $days, $threat, $type) = split /\./, $answer;
+my @types;
+while(my($bit, $typename) = each %types) {
+push @types, $typename if $bit & $type;
+}
+return {
+days => $days,
+threat => $threat,
+type => join ',', @types
+};
+
+}
+1;
+</pre>
+
+From the page:
+
+> The usage is simple:
+
+> use Honeypot;
+> my $key = 'XXXXXXX'; # your key
+> my $ip = '....'; the IP you want to check
+> my $q = Honeypot::query($key, $ip);
+
+> use Data::Dumper;
+> print Dumper $q;
+
+Any chance of having this as a plugin?
+
+I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]]
-- 
cgit v1.2.3


From c926d2d3f7a47e2c2918fd70634581ea8f1d11ff Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 7 Feb 2010 20:30:59 +0000
Subject:

---
 doc/wishlist/http_bl_support.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/wishlist/http_bl_support.mdwn b/doc/wishlist/http_bl_support.mdwn
index 30fb9c9b3..024c770d8 100644
--- a/doc/wishlist/http_bl_support.mdwn
+++ b/doc/wishlist/http_bl_support.mdwn
@@ -57,3 +57,5 @@ From the page:
 Any chance of having this as a plugin?
 
 I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]]
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From fb6e73b3698089f47ae63d1569225938699d84e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Feb 2010 13:46:49 -0500
Subject: move to correct location

---
 doc/todo/http_bl_support.mdwn     | 61 +++++++++++++++++++++++++++++++++++++++
 doc/wishlist/http_bl_support.mdwn | 61 ---------------------------------------
 2 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 doc/todo/http_bl_support.mdwn
 delete mode 100644 doc/wishlist/http_bl_support.mdwn

diff --git a/doc/todo/http_bl_support.mdwn b/doc/todo/http_bl_support.mdwn
new file mode 100644
index 000000000..024c770d8
--- /dev/null
+++ b/doc/todo/http_bl_support.mdwn
@@ -0,0 +1,61 @@
+[Project Honeypot](http://projecthoneypot.org/) has an HTTP:BL API available to subscribed (it's free, accept donations) people/orgs. There's a basic perl package someone wrote, I'm including a copy here.
+
+[from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112)
+
+<pre>
+package Honeypot;
+
+use Socket qw/inet_ntoa/;
+
+my $dns = 'dnsbl.httpbl.org';
+my %types = (
+0	=> 'Search Engine',
+1	=> 'Suspicious',
+2	=> 'Harvester',
+4	=> 'Comment Spammer'
+);
+sub query {
+my $key = shift || die 'You need a key for this, you get one at http://www.projecthoneypot.org';
+my $ip = shift || do {
+warn 'no IP for request in Honeypot::query().';
+return;
+};
+
+my @parts = reverse split /\./, $ip;
+my $lookup_name = join'.', $key, @parts, $dns;
+
+my $answer = gethostbyname ($lookup_name);
+return unless $answer;
+$answer = inet_ntoa($answer);
+my(undef, $days, $threat, $type) = split /\./, $answer;
+my @types;
+while(my($bit, $typename) = each %types) {
+push @types, $typename if $bit & $type;
+}
+return {
+days => $days,
+threat => $threat,
+type => join ',', @types
+};
+
+}
+1;
+</pre>
+
+From the page:
+
+> The usage is simple:
+
+> use Honeypot;
+> my $key = 'XXXXXXX'; # your key
+> my $ip = '....'; the IP you want to check
+> my $q = Honeypot::query($key, $ip);
+
+> use Data::Dumper;
+> print Dumper $q;
+
+Any chance of having this as a plugin?
+
+I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]]
+
+[[!tag wishlist]]
diff --git a/doc/wishlist/http_bl_support.mdwn b/doc/wishlist/http_bl_support.mdwn
deleted file mode 100644
index 024c770d8..000000000
--- a/doc/wishlist/http_bl_support.mdwn
+++ /dev/null
@@ -1,61 +0,0 @@
-[Project Honeypot](http://projecthoneypot.org/) has an HTTP:BL API available to subscribed (it's free, accept donations) people/orgs. There's a basic perl package someone wrote, I'm including a copy here.
-
-[from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112)
-
-<pre>
-package Honeypot;
-
-use Socket qw/inet_ntoa/;
-
-my $dns = 'dnsbl.httpbl.org';
-my %types = (
-0	=> 'Search Engine',
-1	=> 'Suspicious',
-2	=> 'Harvester',
-4	=> 'Comment Spammer'
-);
-sub query {
-my $key = shift || die 'You need a key for this, you get one at http://www.projecthoneypot.org';
-my $ip = shift || do {
-warn 'no IP for request in Honeypot::query().';
-return;
-};
-
-my @parts = reverse split /\./, $ip;
-my $lookup_name = join'.', $key, @parts, $dns;
-
-my $answer = gethostbyname ($lookup_name);
-return unless $answer;
-$answer = inet_ntoa($answer);
-my(undef, $days, $threat, $type) = split /\./, $answer;
-my @types;
-while(my($bit, $typename) = each %types) {
-push @types, $typename if $bit & $type;
-}
-return {
-days => $days,
-threat => $threat,
-type => join ',', @types
-};
-
-}
-1;
-</pre>
-
-From the page:
-
-> The usage is simple:
-
-> use Honeypot;
-> my $key = 'XXXXXXX'; # your key
-> my $ip = '....'; the IP you want to check
-> my $q = Honeypot::query($key, $ip);
-
-> use Data::Dumper;
-> print Dumper $q;
-
-Any chance of having this as a plugin?
-
-I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]]
-
-[[!tag wishlist]]
-- 
cgit v1.2.3


From 4ce14aa621be4c6b8551555395b80b68fbcc1ffe Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Feb 2010 13:49:34 -0500
Subject: nte blogspam

---
 doc/todo/http_bl_support.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/http_bl_support.mdwn b/doc/todo/http_bl_support.mdwn
index 024c770d8..f7a46ee6c 100644
--- a/doc/todo/http_bl_support.mdwn
+++ b/doc/todo/http_bl_support.mdwn
@@ -2,6 +2,12 @@
 
 [from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112)
 
+> The [[plugins/blogspam]] service already checks urls against
+> the surbl, and has its own IP blacklist. The best way to
+> support the HTTP:BL may be to add a plugin
+> [there](http://blogspam.repository.steve.org.uk/file/cc858e497cae/server/plugins/).
+> --[[Joey]] 
+
 <pre>
 package Honeypot;
 
-- 
cgit v1.2.3


From 06a56ea9d51d472175cb9279d92f9fb7a62fdf46 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 8 Feb 2010 23:32:05 -0500
Subject: added tip about page navigation from within vim

---
 doc/tips/follow_wikilinks_from_inside_vim.mdwn | 43 ++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 doc/tips/follow_wikilinks_from_inside_vim.mdwn

diff --git a/doc/tips/follow_wikilinks_from_inside_vim.mdwn b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
new file mode 100644
index 000000000..93a95bc7a
--- /dev/null
+++ b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
@@ -0,0 +1,43 @@
+The [ikiwiki-nav](http://www.vim.org/scripts/script.php?script_id=2968) plugin
+for vim eases the editing of IkiWiki wikis, by letting you "follow" the
+wikilinks on your file (page), and loading the file associated with a given
+wikilink in vim. The plugin takes care of following the ikiwiki linking rules
+to figure out which file a wikilink points to 
+
+The plugin also includes commands (and mappings) to make the cursor jump to the
+previous/next wikilink in the current file 
+
+##  Jumping to pages 
+
+To open the file associated to a wikilink, place the cursor over its text, and
+hit Enter (`<CR>`). This functionality is also available through the
+`:IkiJumpToPage` command 
+
+## Moving to next/previous wikilink in current file 
+
+`Ctrl-j` will move the cursor to the next wikilink. `Ctrl-k` will move it to the
+previous wikilink. This functionality is also available through the
+`:IkiNextWikiLink` command. This command takes one argument, the direction to
+move into 
+
+  * `:IkiNextWikiLink 0` will look forward for the wikilink 
+  * `:IkiNextWikiLink 1` will look backwards for the wikilink 
+
+## Current issues: 
+
+  * The plugin only works for wikilinks contained in a single text line;
+    multiline wikilinks are not (yet) seen as such 
+
+## Notes 
+
+The official releases of the plugin are in the
+[vim.org script page](http://www.vim.org/scripts/script.php?script_id=2968)
+
+The latest version of this script can be found in the following location 
+
+<http://git.devnull.li/cgi-bin/gitweb.cgi?p=ikiwiki-nav.git;a=blob;f=ftplugin/ikiwiki_nav.vim;hb=HEAD>
+
+Any feedback you can provide is appreciated; the contact details can be found
+inside the plugin
+
+[[!tag vim]]
-- 
cgit v1.2.3


From 59868bce02f10e1ed378f5625618198daca58d3a Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 8 Feb 2010 23:37:24 -0500
Subject: more notes about the ikiwiki-nav plugin

added installation notes

added pointer in the forum page to the created tip
---
 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 4 ++++
 doc/tips/follow_wikilinks_from_inside_vim.mdwn                       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 0497b66b6..980b92740 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -1,3 +1,7 @@
+**UPDATE** I have created a [[page|tips/follow_wikilinks_from_inside_vim]] in
+the tips section about the plugin, how to get it, install it and use it. Check
+that out. --[[jerojasro]]
+
 I wrote a vim function to help me navigate the wiki when I'm editing it. It extends the 'gf' (goto file) functionality. Once installed, you place the cursor on a wiki page name and press 'gf' (without the quotes); if the file exists, it gets loaded.
 
 This function takes into account the ikiwiki linking rules when deciding which file to go to.
diff --git a/doc/tips/follow_wikilinks_from_inside_vim.mdwn b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
index 93a95bc7a..df8145a51 100644
--- a/doc/tips/follow_wikilinks_from_inside_vim.mdwn
+++ b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
@@ -23,6 +23,10 @@ move into
   * `:IkiNextWikiLink 0` will look forward for the wikilink 
   * `:IkiNextWikiLink 1` will look backwards for the wikilink 
 
+## Installation
+
+Copy the `ikiwiki_nav.vim` file to your `.vim/ftplugin` directory.
+
 ## Current issues: 
 
   * The plugin only works for wikilinks contained in a single text line;
-- 
cgit v1.2.3


From f48e98a2ac0325f3e17b2c25151aa6af4ba93b20 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 8 Feb 2010 23:39:06 -0500
Subject: redaction

---
 doc/tips/follow_wikilinks_from_inside_vim.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/follow_wikilinks_from_inside_vim.mdwn b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
index df8145a51..015a4ecee 100644
--- a/doc/tips/follow_wikilinks_from_inside_vim.mdwn
+++ b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
@@ -1,6 +1,6 @@
 The [ikiwiki-nav](http://www.vim.org/scripts/script.php?script_id=2968) plugin
 for vim eases the editing of IkiWiki wikis, by letting you "follow" the
-wikilinks on your file (page), and loading the file associated with a given
+wikilinks on your file (page), by loading the file associated with a given
 wikilink in vim. The plugin takes care of following the ikiwiki linking rules
 to figure out which file a wikilink points to 
 
-- 
cgit v1.2.3


From a4ec579d1a6632447db91f2e52e90633b96a070f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 9 Feb 2010 16:24:14 -0500
Subject: amazon_s3: Fix to support the EU S3 datacenter, which is more picky
 about attempts to create already existing buckets.

---
 IkiWiki/Plugin/amazon_s3.pm | 6 +++++-
 debian/changelog            | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index 3571c4189..cfd8cd347 100644
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -132,6 +132,10 @@ sub getbucket {
 		});
 	}
 
+	if (! $bucket) {
+		# Try to use existing bucket.
+		$bucket=$s3->bucket($config{amazon_s3_bucket});
+	}
 	if (! $bucket) {
 		error(gettext("Failed to create S3 bucket: ").
 			$s3->err.": ".$s3->errstr."\n");
@@ -178,7 +182,7 @@ sub writefile ($$$;$$) {
 
 	# First, write the file to disk.
 	my $ret=$IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::writefile'}->($file, $destdir, $content, $binary, $writer);
-		
+
 	my @keys=IkiWiki::Plugin::amazon_s3::file2keys("$destdir/$file");
 
 	# Store the data in S3.
diff --git a/debian/changelog b/debian/changelog
index 06d11aa29..358a5dc5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * auto-blog.setup: Lock all pages, so only admin can post to the blog
     by default, and enable opendiscussion so others can comment.
   * Fix color and format plugins to appear in the websetup interface.
+  * amazon_s3: Fix to support the EU S3 datacenter, which is more picky
+    about attempts to create already existing buckets.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
-- 
cgit v1.2.3


From 5b55237ab14b9916bf51dff06d9a12c9ad81d21e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 10 Feb 2010 12:51:11 -0500
Subject: add a link to another vim plugin

---
 doc/tips/vim_syntax_highlighting.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn
index 172b763c3..416318f28 100644
--- a/doc/tips/vim_syntax_highlighting.mdwn
+++ b/doc/tips/vim_syntax_highlighting.mdwn
@@ -1,4 +1,6 @@
 [[ikiwiki.vim]] is a vim syntax highlighting file for ikiwiki
-[[ikiwiki/markdown]] files. 
+[[ikiwiki/markdown]] files.
 
 Installation instructions are at the top of the file.
+
+See also: [[navigation_of_wiki_pages_on_local_filesystem_with_vim]]
-- 
cgit v1.2.3


From 99f32638fa768be331dfb20318082f7a49690bf2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 10 Feb 2010 12:52:04 -0500
Subject: question

---
 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 980b92740..d3f074c96 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -71,6 +71,9 @@ the plugin has, as of now, two problems:
 >
 >> GPL version 2 or later (if that doesn't cause any problems here). I'll add it
 >> to the file --[[jerojasro]]
+>>
+>>> I see you've put the plugin on vim.org. Do you think it makes sense to
+>>> also include a copy in ikiwiki? --[[Joey]] 
 > 
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
-- 
cgit v1.2.3


From 8e75bcd2dc192da1e649ae70c3dd6a181367eb2c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 10 Feb 2010 12:55:46 -0500
Subject: fix

---
 doc/tips/vim_syntax_highlighting.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn
index 416318f28..18b2f1c92 100644
--- a/doc/tips/vim_syntax_highlighting.mdwn
+++ b/doc/tips/vim_syntax_highlighting.mdwn
@@ -3,4 +3,5 @@
 
 Installation instructions are at the top of the file.
 
-See also: [[navigation_of_wiki_pages_on_local_filesystem_with_vim]]
+See also: [[follow_wikilinks_from_inside_vim]]
+[[!tag vim]]
-- 
cgit v1.2.3


From 08b335638c809268697bd97078225ece1065ff1c Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Wed, 10 Feb 2010 19:59:35 +0000
Subject: reply, and suggestion

---
 .../navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index d3f074c96..781245f03 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -74,6 +74,12 @@ the plugin has, as of now, two problems:
 >>
 >>> I see you've put the plugin on vim.org. Do you think it makes sense to
 >>> also include a copy in ikiwiki? --[[Joey]] 
+>>> 
+>>>> mmm, no. There would be two copies of it, and the git repo. I'd rather have 
+>>>> a unique place for the "official" version (vim.org), and another for the dev 
+>>>> version (its git repo).
+>>>> 
+>>>> actually, I would also suggest to upload the [[`ikiwiki.vim`|tips/vim_syntax_highlighting]] file to vim.org --[[jerojasro]]
 > 
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
-- 
cgit v1.2.3


From e91e88d68a833361f89a9c2fec119643f1295618 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 10 Feb 2010 15:09:08 -0500
Subject: response

---
 .../navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 781245f03..6bd2eb110 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -80,7 +80,12 @@ the plugin has, as of now, two problems:
 >>>> version (its git repo).
 >>>> 
 >>>> actually, I would also suggest to upload the [[`ikiwiki.vim`|tips/vim_syntax_highlighting]] file to vim.org --[[jerojasro]]
-> 
+>>>>>
+>>>>> If you have any interest in maintaining the syntax highlighting
+>>>>> plugin and putting it there, I'd be fine with that. I think it needs
+>>>>> some slight work to catch up with changes to ikiwiki's directives
+>>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]] 
+>
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
 > a standalone wiki, though probably one missing a toplevel index page.
-- 
cgit v1.2.3


From 8e0c0214bbef5ac67c5bd0a300e44d20f12f02f2 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Wed, 10 Feb 2010 23:30:11 +0000
Subject:

---
 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 6bd2eb110..7bc032949 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -84,7 +84,10 @@ the plugin has, as of now, two problems:
 >>>>> If you have any interest in maintaining the syntax highlighting
 >>>>> plugin and putting it there, I'd be fine with that. I think it needs
 >>>>> some slight work to catch up with changes to ikiwiki's directives
->>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]] 
+>>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]]
+>>>>> 
+>>>>>> I don't really know too much about syntax definitions in vim. But I'll give it a stab. I know it fails when there are 2 \[[my text|link]] wikilinks in the same page.
+>>>>>> I'm not promising anything, though ;) --[[jerojasro]]
 >
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
-- 
cgit v1.2.3


From 26c68a0c7ae6dd7810a2c4277b6589e03e4e9c47 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 16:28:22 -0500
Subject: refresh patch; remaining problem

---
 doc/bugs/anonok_vs._httpauth.mdwn | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 1940fdad8..d301b53fb 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -65,7 +65,7 @@ like anonok first. I have not tested this. --[[Joey]]
 
 <pre>
 diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
-index 127c321..c181164 100644
+index 127c321..a18f8ca 100644
 --- a/IkiWiki/Plugin/httpauth.pm
 +++ b/IkiWiki/Plugin/httpauth.pm
 @@ -9,6 +9,8 @@ use IkiWiki 3.00;
@@ -77,11 +77,13 @@ index 127c321..c181164 100644
  }
  
  sub getsetup () {
-@@ -33,10 +35,20 @@ sub auth ($$) {
+@@ -33,9 +35,21 @@ sub auth ($$) {
  	if (defined $cgi->remote_user()) {
  		$session->param("name", $cgi->remote_user());
  	}
 -	elsif (defined $config{cgiauthurl}) {
+-		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+-		exit;
 +}
 +
 +sub canedit ($$$) {
@@ -90,16 +92,29 @@ index 127c321..c181164 100644
 +	my $session=shift;
 +
 +	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
- 		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
- 		exit;
- 	}
++		return sub {
++			IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
++			exit;
++		};
++	}
 +	else {
 +		return undef;
-+	}
-}
+ 	}
+ }
  
- 1
 </pre>
 
 > With `anonok` enabled, this works for anonymous editing of an
 > existing Discussion page. auth is still needed to create one. --[[schmonz]]
+
+>> Refreshed above patch to fix that. --[[Joey]] 
+
+>> Remaining issue: Since both signinedit and httpauth have canedit hooks that
+>> run "last", behavior will vary depending on which wins and really goes
+>> last. So mixing this with openid or passwordauth won't work yet, though
+>> it will work mixed with anonok.
+>>
+>> Seems like what needs to happen is for httpauth's canedit to run before
+>> signinedit's, however it still needs to run relatively late; after eg,
+>> anonok's hook. Better hook ordering needed. I knew we'd need it sooner
+>> or later! --[[Joey]] 
-- 
cgit v1.2.3


From c47712b340153fca4015f8d0e344ced5b12a3e17 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 16:35:55 -0500
Subject: clarify

---
 doc/bugs/anonok_vs._httpauth.mdwn | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index d301b53fb..b738e3b6c 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -109,12 +109,8 @@ index 127c321..a18f8ca 100644
 
 >> Refreshed above patch to fix that. --[[Joey]] 
 
->> Remaining issue: Since both signinedit and httpauth have canedit hooks that
->> run "last", behavior will vary depending on which wins and really goes
->> last. So mixing this with openid or passwordauth won't work yet, though
->> it will work mixed with anonok.
->>
->> Seems like what needs to happen is for httpauth's canedit to run before
->> signinedit's, however it still needs to run relatively late; after eg,
->> anonok's hook. Better hook ordering needed. I knew we'd need it sooner
->> or later! --[[Joey]] 
+>> Remaining issue: This patch will work with anonok, but not openid or
+>> passwordauth, both of which want to display a login page at the same
+>> time that httpauth is redirecting to the cgiauthurl. As mentioned above,
+>> the only way to deal with that would be to add a link to the signin page
+>> that does the httpauth signin. --[[Joey]] 
-- 
cgit v1.2.3


From f2d6d4f6b24bb399481c40dc6eb6f3fe25190c5d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 16:36:19 -0500
Subject: patch so far

---
 IkiWiki/Plugin/httpauth.pm | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 127c321f0..a18f8ca54 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,6 +9,8 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 	hook(type => "auth", id => "httpauth", call => \&auth);
+	hook(type => "canedit", id => "httpauth", call => \&canedit,
+		last => 1);
 }
 
 sub getsetup () {
@@ -33,9 +35,21 @@ sub auth ($$) {
 	if (defined $cgi->remote_user()) {
 		$session->param("name", $cgi->remote_user());
 	}
-	elsif (defined $config{cgiauthurl}) {
-		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
-		exit;
+}
+
+sub canedit ($$$) {
+	my $page=shift;
+	my $cgi=shift;
+	my $session=shift;
+
+	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+		return sub {
+			IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+			exit;
+		};
+	}
+	else {
+		return undef;
 	}
 }
 
-- 
cgit v1.2.3


From 046095552ac231366d71a3c7a84bdc6d46662212 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 17:26:09 -0500
Subject: httpauth: When cgiauthurl is configured, httpauth can now be used
 alongside other authentication methods (like openid or anonok). Rather than
 always redirect to the cgiauthurl for authentication, there is now a button
 on the login form to use it.

---
 IkiWiki/Plugin/httpauth.pm        | 35 +++++++++++++++++++++++++++++++----
 IkiWiki/Plugin/openid.pm          |  2 +-
 debian/changelog                  |  4 ++++
 doc/bugs/anonok_vs._httpauth.mdwn |  2 ++
 doc/plugins/httpauth.mdwn         |  9 +++++----
 5 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index a18f8ca54..d0d4da0b7 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -11,6 +11,8 @@ sub import {
 	hook(type => "auth", id => "httpauth", call => \&auth);
 	hook(type => "canedit", id => "httpauth", call => \&canedit,
 		last => 1);
+	hook(type => "formbuilder_setup", id => "httpauth",
+		call => \&formbuilder_setup);
 }
 
 sub getsetup () {
@@ -27,6 +29,14 @@ sub getsetup () {
 			rebuild => 0,
 		},
 }
+			
+sub redir_cgiauthurl ($$) {
+	my $cgi=shift;
+	my $params=shift;
+
+	IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$params);
+	exit;
+}
 
 sub auth ($$) {
 	my $cgi=shift;
@@ -43,14 +53,31 @@ sub canedit ($$$) {
 	my $session=shift;
 
 	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
-		return sub {
-			IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
-			exit;
-		};
+		return sub { redir_cgiauthurl($cgi, $cgi->query_string()) };
 	}
 	else {
 		return undef;
 	}
 }
 
+sub formbuilder_setup (@) {
+	my %params=@_;
+
+	my $form=$params{form};
+	my $session=$params{session};
+	my $cgi=$params{cgi};
+	my $buttons=$params{buttons};
+
+	if ($form->title eq "signin" &&
+	    ! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+		my $button_text="Login with HTTP auth";
+		push @$buttons, $button_text;
+
+		if ($form->submitted && $form->submitted eq $button_text) {
+			redir_cgiauthurl($cgi, "do=postsignin");
+			exit;
+		}
+	}
+}
+
 1
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index b60740c0e..382d8286f 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -56,7 +56,7 @@ sub formbuilder_setup (@) {
 		# OpenID fieldset.
 		$form->fieldsets("OpenID");
 
- 		$form->field(
+		$form->field(
 			name => "openid_url",
 			label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
 			fieldset => "OpenID",
diff --git a/debian/changelog b/debian/changelog
index 358a5dc5c..3dd68558e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * Fix color and format plugins to appear in the websetup interface.
   * amazon_s3: Fix to support the EU S3 datacenter, which is more picky
     about attempts to create already existing buckets.
+  * httpauth: When cgiauthurl is configured, httpauth can now be used
+    alongside other authentication methods (like openid or anonok). Rather
+    than always redirect to the cgiauthurl for authentication, there is now
+    a button on the login form to use it.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index b738e3b6c..bff37e18b 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -114,3 +114,5 @@ index 127c321..a18f8ca 100644
 >> time that httpauth is redirecting to the cgiauthurl. As mentioned above,
 >> the only way to deal with that would be to add a link to the signin page
 >> that does the httpauth signin. --[[Joey]] 
+
+>>> That's dealt with in final version. [[done]] --[[Joey]] 
diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index 77796a3d7..a7aac558b 100644
--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@@ -14,10 +14,11 @@ signed into the wiki. This method is suitable only for private wikis.
 ## separate cgiauthurl
 
 To use httpauth for a wiki where the content is public, and where
-the `ikiwiki.cgi` needs to be usable without authentication (for searching
-and so on), you can configure a separate url that is used for
-authentication, via the `cgiauthurl` option in the setup file. This
-url will then be redirected to whenever authentication is needed.
+the `ikiwiki.cgi` needs to be usable without authentication (for searching,
+or logging in using other methods, and so on), you can configure a separate
+url that is used for authentication, via the `cgiauthurl` option in the setup
+file. This url will then be redirected to when a user chooses to log in using
+httpauth.
 
 A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi` 
 into it. Then configure the web server to require authentication only for
-- 
cgit v1.2.3


From e11876b7003c700fbc3717ca9c5af5aac3b72ac2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 18:25:10 -0500
Subject: httpauth: Add httpauth_pagespec setting that can be used to limit
 pages to only being edited via users authed with httpauth.

---
 IkiWiki.pm                 |  7 ++++-
 IkiWiki/Plugin/httpauth.pm | 75 +++++++++++++++++++++++++++++++++-------------
 debian/changelog           |  2 ++
 doc/plugins/httpauth.mdwn  |  9 ++++++
 4 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2a0132745..de7dbfc79 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -941,7 +941,12 @@ sub linkpage ($) {
 sub cgiurl (@) {
 	my %params=@_;
 
-	return $config{cgiurl}."?".
+	my $cgiurl=$config{cgiurl};
+	if (exists $params{cgiurl}) {
+		$cgiurl=$params{cgiurl};
+		delete $params{cgiurl};
+	}
+	return $cgiurl."?".
 		join("&amp;", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 }
 
diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index d0d4da0b7..202ca1153 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,10 +9,10 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 	hook(type => "auth", id => "httpauth", call => \&auth);
-	hook(type => "canedit", id => "httpauth", call => \&canedit,
-		last => 1);
 	hook(type => "formbuilder_setup", id => "httpauth",
 		call => \&formbuilder_setup);
+	hook(type => "canedit", id => "httpauth", call => \&canedit);
+	hook(type => "pagetemplate", id => "httpauth", call => \&pagetemplate);
 }
 
 sub getsetup () {
@@ -28,13 +28,20 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 0,
 		},
+		httpauth_pagespec => {
+			type => "pagespec",
+			example => "!*/Discussion",
+			description => "PageSpec of pages where only httpauth will be used for authentication",
+			safe => 0,
+			rebuild => 0,
+		},
 }
 			
-sub redir_cgiauthurl ($$) {
+sub redir_cgiauthurl ($;@) {
 	my $cgi=shift;
-	my $params=shift;
 
-	IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$params);
+	IkiWiki::redirect($cgi, 
+		IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_));
 	exit;
 }
 
@@ -47,19 +54,6 @@ sub auth ($$) {
 	}
 }
 
-sub canedit ($$$) {
-	my $page=shift;
-	my $cgi=shift;
-	my $session=shift;
-
-	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
-		return sub { redir_cgiauthurl($cgi, $cgi->query_string()) };
-	}
-	else {
-		return undef;
-	}
-}
-
 sub formbuilder_setup (@) {
 	my %params=@_;
 
@@ -74,10 +68,51 @@ sub formbuilder_setup (@) {
 		push @$buttons, $button_text;
 
 		if ($form->submitted && $form->submitted eq $button_text) {
-			redir_cgiauthurl($cgi, "do=postsignin");
-			exit;
+			# bounce thru cgiauthurl and then back to
+			# the stored postsignin action
+			redir_cgiauthurl($cgi, do => "postsignin");
 		}
 	}
 }
 
+sub test_httpauth_pagespec ($) {
+	my $page=shift;
+
+	return defined $config{httpauth_pagespec} &&
+	       length $config{httpauth_pagespec} &&
+	       defined $config{cgiauthurl} &&
+	       pagespec_match($page, $config{httpauth_pagespec});
+}
+
+sub canedit ($$$) {
+	my $page=shift;
+	my $cgi=shift;
+	my $session=shift;
+
+	if (! defined $cgi->remote_user() && test_httpauth_pagespec($page)) {
+		return sub {
+			IkiWiki::redirect($cgi, 
+				$config{cgiauthurl}.'?'.$cgi->query_string());
+			exit;
+		};
+	}
+	else {
+		return undef;
+	}
+}
+
+sub pagetemplate (@_) {
+	my %params=@_;
+	my $template=$params{template};
+
+	if ($template->param("editurl") &&
+	    test_httpauth_pagespec($params{page})) {
+		# go directly to cgiauthurl when editing a page matching
+		# the pagespec
+		$template->param(editurl => IkiWiki::cgiurl(
+			cgiurl => $config{cgiauthurl},
+			do => "edit", page => $params{page}));
+	}
+}
+
 1
diff --git a/debian/changelog b/debian/changelog
index 3dd68558e..14be7ec69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     alongside other authentication methods (like openid or anonok). Rather
     than always redirect to the cgiauthurl for authentication, there is now
     a button on the login form to use it.
+  * httpauth: Add httpauth_pagespec setting that can be used to limit
+    pages to only being edited via users authed with httpauth.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index a7aac558b..0eda5554f 100644
--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@@ -24,3 +24,12 @@ A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi`
 into it. Then configure the web server to require authentication only for
 access to the `auth` subdirectory. Then `cgiauthurl` is pointed at this
 symlink.
+
+## using only httpauth for some pages
+
+If you want to only use httpauth for editing some pages, while allowing
+other authentication methods to be used for other pages, you can
+configure `httpauth_pagespec` in the setup file. This makes Edit
+links on pages that match the [[ikiwiki/PageSpec]] automatically use
+the `cgiauthurl`, and prevents matching pages from being edited by
+users authentication via other methods.
-- 
cgit v1.2.3


From e6678275a98bd00e888018409998fd67686149c8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 18:32:07 -0500
Subject: fix logic error

---
 IkiWiki/Plugin/httpauth.pm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 202ca1153..5b7d65253 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -75,13 +75,16 @@ sub formbuilder_setup (@) {
 	}
 }
 
+sub need_httpauth_pagespec () {
+	return defined $config{httpauth_pagespec} &&
+	       length $config{httpauth_pagespec} &&
+	       defined $config{cgiauthurl};
+}
+
 sub test_httpauth_pagespec ($) {
 	my $page=shift;
 
-	return defined $config{httpauth_pagespec} &&
-	       length $config{httpauth_pagespec} &&
-	       defined $config{cgiauthurl} &&
-	       pagespec_match($page, $config{httpauth_pagespec});
+	pagespec_match($page, $config{httpauth_pagespec});
 }
 
 sub canedit ($$$) {
@@ -89,7 +92,9 @@ sub canedit ($$$) {
 	my $cgi=shift;
 	my $session=shift;
 
-	if (! defined $cgi->remote_user() && test_httpauth_pagespec($page)) {
+	if (! defined $cgi->remote_user() &&
+	    need_httpauth_pagespec() &&
+    	    ! test_httpauth_pagespec($page)) {
 		return sub {
 			IkiWiki::redirect($cgi, 
 				$config{cgiauthurl}.'?'.$cgi->query_string());
@@ -106,6 +111,7 @@ sub pagetemplate (@_) {
 	my $template=$params{template};
 
 	if ($template->param("editurl") &&
+	    need_httpauth_pagespec() &&
 	    test_httpauth_pagespec($params{page})) {
 		# go directly to cgiauthurl when editing a page matching
 		# the pagespec
-- 
cgit v1.2.3


From 6f1d6236185148930a2c7694c9ae59877997d0d4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 19:54:40 -0500
Subject: partially fix httpauth canedit hook

My logic was right before. Cleaned up some code.

(Page creation is still a problem.)

Also, I removed the Edit url munging, because that is not
necessary with the canedit hook, since canedit will handle
redirection through cgiauthurl if necessary.
---
 IkiWiki/Plugin/httpauth.pm | 43 +++++++++++++------------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 5b7d65253..b2bb2701a 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -11,8 +11,8 @@ sub import {
 	hook(type => "auth", id => "httpauth", call => \&auth);
 	hook(type => "formbuilder_setup", id => "httpauth",
 		call => \&formbuilder_setup);
-	hook(type => "canedit", id => "httpauth", call => \&canedit);
-	hook(type => "pagetemplate", id => "httpauth", call => \&pagetemplate);
+	hook(type => "canedit", id => "httpauth", call => \&canedit,
+		first => 1);
 }
 
 sub getsetup () {
@@ -41,7 +41,9 @@ sub redir_cgiauthurl ($;@) {
 	my $cgi=shift;
 
 	IkiWiki::redirect($cgi, 
-		IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_));
+		@_ > 1 ? IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_)
+		       : $config{cgiauthurl}."?@_"
+	);
 	exit;
 }
 
@@ -75,16 +77,11 @@ sub formbuilder_setup (@) {
 	}
 }
 
-sub need_httpauth_pagespec () {
-	return defined $config{httpauth_pagespec} &&
-	       length $config{httpauth_pagespec} &&
-	       defined $config{cgiauthurl};
-}
-
 sub test_httpauth_pagespec ($) {
 	my $page=shift;
 
-	pagespec_match($page, $config{httpauth_pagespec});
+	return (
+       );
 }
 
 sub canedit ($$$) {
@@ -93,12 +90,13 @@ sub canedit ($$$) {
 	my $session=shift;
 
 	if (! defined $cgi->remote_user() &&
-	    need_httpauth_pagespec() &&
-    	    ! test_httpauth_pagespec($page)) {
+	    defined $config{httpauth_pagespec} &&
+	    length $config{httpauth_pagespec} &&
+	    defined $config{cgiauthurl} &&
+	    pagespec_match($page, $config{httpauth_pagespec})) {
 		return sub {
-			IkiWiki::redirect($cgi, 
-				$config{cgiauthurl}.'?'.$cgi->query_string());
-			exit;
+			# bounce thru cgiauthurl and back to edit action
+			redir_cgiauthurl($cgi, $cgi->query_string());
 		};
 	}
 	else {
@@ -106,19 +104,4 @@ sub canedit ($$$) {
 	}
 }
 
-sub pagetemplate (@_) {
-	my %params=@_;
-	my $template=$params{template};
-
-	if ($template->param("editurl") &&
-	    need_httpauth_pagespec() &&
-	    test_httpauth_pagespec($params{page})) {
-		# go directly to cgiauthurl when editing a page matching
-		# the pagespec
-		$template->param(editurl => IkiWiki::cgiurl(
-			cgiurl => $config{cgiauthurl},
-			do => "edit", page => $params{page}));
-	}
-}
-
 1
-- 
cgit v1.2.3


From 7af18f2a1ec8b5ce4764813b0464112f517e806f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 20:13:30 -0500
Subject: reorder canedit checks during page creation to have best_loc first

When creating a page, multiple locations are tested to see if they can be
edited. If all fail, one of the failure subs is called, to log the user in
to allow them to proceed with the edit. So far so good.

But, what if some pages fail for one reason, and some for another? This
occurs when httpauth_pagespec is used in conjunction with signinedit (and
openid or something). When the user is not signed in at all
The former will fail to edit a page because the user was not httpauthed.
The latter will fail to edit a different page, because the user was not
signed in. One of their failure methods gets to run first.

The page creation code always ran the failure method corresponding to the
topmost page location. So, when editing a foo/Discussion page, and with
httpauth_pagespec => "*!/Discussion", it ran the httpauth failure method,
which was exactly the wrong thing to do.

I fixed this by making it instead run the failure method for the *best*
page location. In the above example, that's foo/Discussion, so signinedit
runs, as desired, and we get the signin page.

This seems like it will be the right choice, or at least an acceptable
choice. If a user wants to use httpauth they can always choose it on the
signin page.
---
 IkiWiki/Plugin/editpage.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 219386a30..9211cca89 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -272,8 +272,10 @@ sub cgi_editpage ($$) {
 				check_canedit($_, $q, $session, 1)
 			} @page_locs;
 			if (! @editable_locs) {
-				# let it throw an error this time
-				map { check_canedit($_, $q, $session) } @page_locs;
+				# now let it throw an error, or prompt for
+				# login
+				map { check_canedit($_, $q, $session) }
+					($best_loc, @page_locs);
 			}
 			
 			my @page_types;
-- 
cgit v1.2.3


From c923e0ba3377f85107ccea1933a042aaec675c77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 20:39:10 -0500
Subject: Allow globs to be used in user() pagespecs.

---
 IkiWiki.pm                | 4 +++-
 debian/changelog          | 1 +
 doc/ikiwiki/pagespec.mdwn | 3 ++-
 t/pagespec_match.t        | 9 ++++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index de7dbfc79..a96ff1236 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2266,11 +2266,13 @@ sub match_user ($$;@) {
 	my $user=shift;
 	my %params=@_;
 	
+	my $regexp=IkiWiki::glob2re($user);
+	
 	if (! exists $params{user}) {
 		return IkiWiki::ErrorReason->new("no user specified");
 	}
 
-	if (defined $params{user} && lc $params{user} eq lc $user) {
+	if (defined $params{user} && $params{user}=~/^$regexp$/i) {
 		return IkiWiki::SuccessReason->new("user is $user");
 	}
 	elsif (! defined $params{user}) {
diff --git a/debian/changelog b/debian/changelog
index 14be7ec69..d74abd0f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     a button on the login form to use it.
   * httpauth: Add httpauth_pagespec setting that can be used to limit
     pages to only being edited via users authed with httpauth.
+  * Allow globs to be used in user() pagespecs.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 5f0f44e2e..8d8b1a507 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -44,7 +44,8 @@ Some more elaborate limits can be added to what matches using these functions:
   metadata, matching the specified glob.
 * "`user(username)`" - tests whether a modification is being made by a
   user with the specified username. If openid is enabled, an openid can also
-  be put here.
+  be put here. Glob patterns can be used in the username. For example, 
+  to match all openid users, use `user(*://.*)`
 * "`admin()`" - tests whether a modification is being made by one of the
   wiki admins.
 * "`ip(address)`" - tests whether a modification is being made from the
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index b96947407..197ff818b 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 64;
+use Test::More tests => 70;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -40,6 +40,13 @@ ok(! pagespec_match("foo", "foo and bar"), "foo and bar");
 ok(pagespec_match("{f}oo", "{*}*"), "curly match");
 ok(! pagespec_match("foo", "{*}*"), "curly !match");
 
+ok(pagespec_match("somepage", "user(frodo)", user => "frodo"));
+ok(pagespec_match("somepage", "user(frodo)", user => "Frodo"));
+ok(! pagespec_match("somepage", "user(frodo)", user => "Sam"));
+ok(pagespec_match("somepage", "user(*o)", user => "Bilbo"));
+ok(pagespec_match("somepage", "user(*o)", user => "frodo"));
+ok(! pagespec_match("somepage", "user(*o)", user => "Sam"));
+
 # The link and backlink stuff needs this.
 $config{userdir}="";
 $links{foo}=[qw{bar baz}];
-- 
cgit v1.2.3


From a63929f6cc7778ffc4ba57d784cdf2206ec650c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 22:24:15 -0500
Subject: Group related plugins into sections in the setup file, and drop
 unused rcs plugins from the setup file.

---
 IkiWiki/Plugin/anonok.pm            |  1 +
 IkiWiki/Plugin/blogspam.pm          |  1 +
 IkiWiki/Plugin/bzr.pm               |  1 +
 IkiWiki/Plugin/conditional.pm       |  1 +
 IkiWiki/Plugin/cvs.pm               |  1 +
 IkiWiki/Plugin/darcs.pm             |  1 +
 IkiWiki/Plugin/editpage.pm          |  1 +
 IkiWiki/Plugin/git.pm               |  1 +
 IkiWiki/Plugin/htmlscrubber.pm      |  1 +
 IkiWiki/Plugin/httpauth.pm          |  1 +
 IkiWiki/Plugin/inline.pm            |  1 +
 IkiWiki/Plugin/link.pm              |  1 +
 IkiWiki/Plugin/lockedit.pm          |  1 +
 IkiWiki/Plugin/mdwn.pm              |  1 +
 IkiWiki/Plugin/mercurial.pm         |  1 +
 IkiWiki/Plugin/meta.pm              |  1 +
 IkiWiki/Plugin/moderatedcomments.pm |  1 +
 IkiWiki/Plugin/monotone.pm          |  1 +
 IkiWiki/Plugin/opendiscussion.pm    |  1 +
 IkiWiki/Plugin/openid.pm            |  1 +
 IkiWiki/Plugin/parentlinks.pm       |  1 +
 IkiWiki/Plugin/passwordauth.pm      |  1 +
 IkiWiki/Plugin/recentchanges.pm     |  1 +
 IkiWiki/Plugin/signinedit.pm        |  1 +
 IkiWiki/Plugin/svn.pm               |  1 +
 IkiWiki/Plugin/tla.pm               |  1 +
 IkiWiki/Setup.pm                    | 32 ++++++++++++++++++++++++++------
 IkiWiki/Setup/Standard.pm           |  8 ++++++++
 debian/changelog                    |  2 ++
 doc/plugins/write.mdwn              | 13 ++++++++-----
 30 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm
index 243b98920..0e74cbfad 100644
--- a/IkiWiki/Plugin/anonok.pm
+++ b/IkiWiki/Plugin/anonok.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		anonok_pagespec => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 626c8ec42..c4e5cf390 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		blogspam_pagespec => {
 			type => 'pagespec',
diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 883007367..1ffdc2353 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -36,6 +36,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		bzr_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index aad617812..beeddc672 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -16,6 +16,7 @@ sub getsetup {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index f6db8bc98..26a3e9dd2 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -85,6 +85,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		cvsrepo => {
 			type => "string",
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 0d68f27e5..1c9538e83 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -92,6 +92,7 @@ sub getsetup() {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		darcs_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 9211cca89..44fe5514a 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 1eec6aee6..b02f4a5ed 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -68,6 +68,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		git_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index a249cdf7a..ee284a45c 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -40,6 +40,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 		htmlscrubber_skip => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index b2bb2701a..478f67446 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		cgiauthurl => {
 			type => "string",
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 401852513..44919e58c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -49,6 +49,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 		rss => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 4c1add985..3838aec09 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 74ddbb153..1466e8337 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		locked_pages => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 3de59ef3d..4ddf097ba 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "core",
 		},
 		multimarkdown => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 11fdec529..ea00a3364 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -36,6 +36,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		mercurial_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 55c9ddbd1..5f046cb2a 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index 2555927b7..afe1ceedf 100644
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		moderate_users => {
 			type => 'boolean',
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 9502804f1..c33cf7e3a 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -68,6 +68,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		mtn_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 5a455940b..2805f60ef 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 }
 
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 382d8286f..bb99446b4 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -26,6 +26,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		openidsignup => {
 			type => "string",
diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index e678a057d..728bbc399 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index c07065b7d..4848b47bb 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		account_creation_password => {
 			type => "string",
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 5c7b71aaa..04219b721 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -22,6 +22,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 		recentchangespage => {
 			type => "string",
diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index 8b44a68f7..31160c02f 100644
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 }
 
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 06b987f51..7d27ec842 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -44,6 +44,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		svnrepo => {
 			type => "string",
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index f4b20a6ec..16d73b136 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -34,6 +34,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		tla_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 8a25ecc57..b21bd7bfe 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -77,7 +77,6 @@ sub merge ($) {
 sub getsetup () {
 	# Gets all available setup data from all plugins. Returns an
 	# ordered list of [plugin, setup] pairs.
-	my @ret;
 
         # disable logging to syslog while dumping, broken plugins may
 	# whine when loaded
@@ -85,27 +84,48 @@ sub getsetup () {
         $config{syslog}=undef;
 
 	# Load all plugins, so that all setup options are available.
-	my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());
-	unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
+	my @plugins=IkiWiki::listplugins();
 	foreach my $plugin (@plugins) {
 		eval { IkiWiki::loadplugin($plugin) };
 		if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
 			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
 		}
 	}
-
+	
+	my %sections;
 	foreach my $plugin (@plugins) {
 		if (exists $IkiWiki::hooks{getsetup}{$plugin}{call}) {
 			# use an array rather than a hash, to preserve order
 			my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() };
 			next unless @s;
-			push @ret, [ $plugin, \@s ],
+
+			# set default section value (note use of shared
+			# hashref between array and hash)
+			my %s=@s;
+			if (! exists $s{plugin} || ! $s{plugin}->{section}) {
+				$s{plugin}->{section}="misc";
+			}
+
+			# only the selected rcs plugin is included
+			if ($config{rcs} && $plugin eq $config{rcs}) {
+				$s{plugin}->{section}="core";
+			}
+			elsif ($s{plugin}->{section} eq "rcs") {
+				next;
+			}
+
+			push @{$sections{$s{plugin}->{section}}}, [ $plugin, \@s ];
 		}
 	}
 	
         $config{syslog}=$syslog;
 
-	return @ret;
+	return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} }
+		sort { # core first, then alphabetical
+			($b eq "core") <=> ($a eq "core")
+			   ||
+			$a cmp $b
+		} keys %sections;
 }
 
 sub dump ($) {
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 951bcfc56..c99dbb620 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -90,10 +90,18 @@ sub gendump ($) {
 	# disable logging to syslog while dumping
 	$config{syslog}=undef;
 
+	my $curr_section;
 	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
 	foreach my $pair (IkiWiki::Setup::getsetup()) {
 		my $plugin=$pair->[0];
 		my $setup=$pair->[1];
+		my %s=@{$setup};
+		my $section=$s{plugin}->{section};
+		if (! defined $curr_section || $curr_section ne $section) {
+			$curr_section=$section;
+			push @ret, "", "\t#", "\t# $section plugins", "\t#";
+		}
+
 		my @values=dumpvalues(\%setup, @{$setup});
 		if (@values) {
 			push @ret, "", "\t# $plugin plugin", @values;
diff --git a/debian/changelog b/debian/changelog
index d74abd0f9..f24a453c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * httpauth: Add httpauth_pagespec setting that can be used to limit
     pages to only being edited via users authed with httpauth.
   * Allow globs to be used in user() pagespecs.
+  * Group related plugins into sections in the setup file, and drop
+    unused rcs plugins from the setup file.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 082f0e38f..68454d56c 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -457,6 +457,12 @@ describing the option. There can also be an item named "plugin", which
 describes the plugin as a whole. For example:
 
                 return
+			plugin => {
+				description => "description of this plugin",
+				safe => 1,
+				rebuild => 1,
+				section => "misc",
+			},
 			option_foo => {
 				type => "boolean",
 				description => "enable foo?",
@@ -471,11 +477,6 @@ describes the plugin as a whole. For example:
 				safe => 1,
 				rebuild => 0,
 			},
-			plugin => {
-				description => "description of this plugin",
-				safe => 1,
-				rebuild => 1,
-			},
 
 * `type` can be "boolean", "string", "integer", "pagespec",
   or "internal" (used for values that are not user-visible). The type is
@@ -496,6 +497,8 @@ describes the plugin as a whole. For example:
   the plugin) will require a wiki rebuild, false if no rebuild is needed,
   and undef if a rebuild could be needed in some circumstances, but is not
   strictly required.
+* `section` can optionally specify which section in the config file
+  the plugin fits in.
 
 ### genwrapper
 
-- 
cgit v1.2.3


From e091fab0e742c3e3f9029c86d47c858e286becf3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 22:42:10 -0500
Subject: fix openid pagespec example

---
 doc/ikiwiki/pagespec.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 8d8b1a507..5c191f23f 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -45,7 +45,7 @@ Some more elaborate limits can be added to what matches using these functions:
 * "`user(username)`" - tests whether a modification is being made by a
   user with the specified username. If openid is enabled, an openid can also
   be put here. Glob patterns can be used in the username. For example, 
-  to match all openid users, use `user(*://.*)`
+  to match all openid users, use `user(*://*)`
 * "`admin()`" - tests whether a modification is being made by one of the
   wiki admins.
 * "`ip(address)`" - tests whether a modification is being made from the
-- 
cgit v1.2.3


From 6f3641f16c0043f42212976ccba93b3cf7e4e36f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 22:42:24 -0500
Subject: add some openid matching tests

---
 t/pagespec_match.t | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 197ff818b..8b0be4e8a 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 70;
+use Test::More tests => 72;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -46,6 +46,8 @@ ok(! pagespec_match("somepage", "user(frodo)", user => "Sam"));
 ok(pagespec_match("somepage", "user(*o)", user => "Bilbo"));
 ok(pagespec_match("somepage", "user(*o)", user => "frodo"));
 ok(! pagespec_match("somepage", "user(*o)", user => "Sam"));
+ok(pagespec_match("somepage", "user(http://*.myopenid.com/)", user => "http://foo.myopenid.com/"));
+ok(pagespec_match("somepage", "user(*://*)", user => "http://foo.myopenid.com/"));
 
 # The link and backlink stuff needs this.
 $config{userdir}="";
-- 
cgit v1.2.3


From 8fdc238c8c9bdfd196310c6261d9ad328a4d9fd2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 22:55:35 -0500
Subject: fix websetup display of unsafe arrays in expert mode

---
 IkiWiki/Plugin/websetup.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index e477bcc20..76ca1c9e2 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -138,9 +138,9 @@ sub showfields ($$$@) {
 
 		my $value=$config{$key};
 
-		if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
-			$value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) }  @{$value} : ""),
-				"", ""]; # blank items for expansion
+		if (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY') {
+			$value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) }  @{$value} : "")];
+			push @$value, "", "" if $info{safe}; # blank items for expansion
 		}
 		else {
 			$value=Encode::encode_utf8($value);
-- 
cgit v1.2.3


From 18394f6ba99422b50e3796e91030498f93e7c4a1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 00:21:12 -0500
Subject: improve websetup fieldset display

to handle sections
---
 IkiWiki/Plugin/websetup.pm | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 76ca1c9e2..445552e40 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -66,6 +66,11 @@ sub showfields ($$$@) {
 	while (@_) {
 		my $key=shift;
 		my %info=%{shift()};
+		
+		if ($key eq 'plugin') {
+			%plugininfo=%info;
+			next;
+		}
 
 		# skip internal settings
 		next if defined $info{type} && $info{type} eq "internal";
@@ -78,15 +83,12 @@ sub showfields ($$$@) {
 		# these are handled specially, so don't show
 		next if $key eq 'add_plugins' || $key eq 'disable_plugins';
 
-		if ($key eq 'plugin') {
-			%plugininfo=%info;
-			next;
-		}
-		
 		push @show, $key, \%info;
 	}
 
-	my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main";
+	my $section=defined $plugin
+		? sprintf(gettext("%s plugin:"), $plugininfo{section}).$plugin
+		: "main";
 	my %enabledfields;
 	my $shownfields=0;
 	
@@ -97,6 +99,16 @@ sub showfields ($$$@) {
 		@show=();
 	}
 
+	my $section_fieldset;
+	if (defined $plugin) {
+		# Define the combined fieldset for the plugin's section.
+		# This ensures that this fieldset comes first.
+		$section_fieldset=sprintf(gettext("%s plugins"), $plugininfo{section});
+		$form->field(name => "placeholder.$plugininfo{section}",
+			type => "hidden",
+			fieldset => $section_fieldset);
+	}
+
 	# show plugin toggle
 	if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) {
 		my $name="enable.$plugin";
@@ -137,6 +149,9 @@ sub showfields ($$$@) {
 		my $name=defined $plugin ? $plugin.".".$key : $section.".".$key;
 
 		my $value=$config{$key};
+		if (! defined $value) {
+			$value="";
+		}
 
 		if (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY') {
 			$value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) }  @{$value} : "")];
@@ -203,11 +218,11 @@ sub showfields ($$$@) {
 		$shownfields++;
 	}
 	
-	# if no fields were shown for the plugin, drop it into the
-	# plugins fieldset
+	# if no fields were shown for the plugin, drop it into a combined
+	# fieldset for its section
 	if (defined $plugin && (! $plugin_forced || $config{websetup_advanced}) &&
 	    ! $shownfields) {
-		$form->field(name => "enable.$plugin", fieldset => "plugins");
+		$form->field(name => "enable.$plugin", fieldset => $section_fieldset);
 	}
 
 	return %enabledfields;
@@ -258,7 +273,6 @@ sub showform ($$) {
 		params => $cgi,
 		fieldsets => [
 			[main => gettext("main")], 
-			[plugins => gettext("plugins")]
 		],
 		action => $config{cgiurl},
 		template => {type => 'div'},
-- 
cgit v1.2.3


From 5b76fc824cf5fdf8d78afb74724a6d5453c79baa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 00:22:00 -0500
Subject: reword

---
 IkiWiki/Setup.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index b21bd7bfe..7a7683fab 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -103,7 +103,7 @@ sub getsetup () {
 			# hashref between array and hash)
 			my %s=@s;
 			if (! exists $s{plugin} || ! $s{plugin}->{section}) {
-				$s{plugin}->{section}="misc";
+				$s{plugin}->{section}="other";
 			}
 
 			# only the selected rcs plugin is included
-- 
cgit v1.2.3


From 0ea2f0936bf9d51f4760fe5a8e57d46d1b6ecce6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 00:51:19 -0500
Subject: add plugin section, and show which plugins need no configuration

---
 IkiWiki/Setup/Standard.pm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index c99dbb620..bdf52f25a 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -90,16 +90,24 @@ sub gendump ($) {
 	# disable logging to syslog while dumping
 	$config{syslog}=undef;
 
-	my $curr_section;
+	eval q{use Text::Wrap};
+	die $@ if $@;
+
+	my %section_plugins;
 	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
 	foreach my $pair (IkiWiki::Setup::getsetup()) {
 		my $plugin=$pair->[0];
 		my $setup=$pair->[1];
 		my %s=@{$setup};
 		my $section=$s{plugin}->{section};
-		if (! defined $curr_section || $curr_section ne $section) {
-			$curr_section=$section;
-			push @ret, "", "\t#", "\t# $section plugins", "\t#";
+		push @{$section_plugins{$section}}, $plugin;
+		if (@{$section_plugins{$section}} == 1) {
+			push @ret, "", "\t#", "\t# $section plugins",
+				sub {
+					wrap("\t#   (", "\t#   ",
+						join(", ", @{$section_plugins{$section}})).")"
+				},
+				"\t#";
 		}
 
 		my @values=dumpvalues(\%setup, @{$setup});
@@ -119,7 +127,7 @@ sub gendump ($) {
 		"use IkiWiki::Setup::Standard {";
 	push @ret, "}";
 
-	return @ret;
+	return map { ref $_ ? $_->() : $_ } @ret;
 }
 
 1
-- 
cgit v1.2.3


From 9cee2962e01ef0538cc8498951867a543f91b47d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 01:10:36 -0500
Subject: format plugin categorization

---
 IkiWiki/Plugin/creole.pm     | 1 +
 IkiWiki/Plugin/highlight.pm  | 1 +
 IkiWiki/Plugin/hnb.pm        | 1 +
 IkiWiki/Plugin/html.pm       | 1 +
 IkiWiki/Plugin/mdwn.pm       | 2 +-
 IkiWiki/Plugin/otl.pm        | 1 +
 IkiWiki/Plugin/po.pm         | 3 ++-
 IkiWiki/Plugin/rawhtml.pm    | 1 +
 IkiWiki/Plugin/textile.pm    | 1 +
 IkiWiki/Plugin/txt.pm        | 1 +
 IkiWiki/Plugin/wikitext.pm   | 1 +
 doc/plugins/conditional.mdwn | 2 +-
 doc/plugins/format.mdwn      | 2 +-
 doc/plugins/graphviz.mdwn    | 2 +-
 doc/plugins/more.mdwn        | 2 +-
 doc/plugins/shortcut.mdwn    | 2 +-
 doc/plugins/table.mdwn       | 2 +-
 doc/plugins/template.mdwn    | 2 +-
 doc/plugins/typography.mdwn  | 2 +-
 plugins/rst                  | 2 +-
 20 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index 425e71043..a1e4b31d3 100644
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -17,6 +17,7 @@ sub getsetup {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 9bdde85ae..947fb692e 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -23,6 +23,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 		tohighlight => {
 			type => "string",
diff --git a/IkiWiki/Plugin/hnb.pm b/IkiWiki/Plugin/hnb.pm
index bd2177a06..32c9cf3ad 100644
--- a/IkiWiki/Plugin/hnb.pm
+++ b/IkiWiki/Plugin/hnb.pm
@@ -23,6 +23,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm
index a7d5e8ce9..4dbae081b 100644
--- a/IkiWiki/Plugin/html.pm
+++ b/IkiWiki/Plugin/html.pm
@@ -21,6 +21,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 4ddf097ba..b892eabee 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -16,7 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
-			section => "core",
+			section => "format",
 		},
 		multimarkdown => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm
index 3ab2441bf..3801a6ec2 100644
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index f8801185e..2cbfb0a45 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -85,7 +85,8 @@ sub getsetup () {
 	return
 		plugin => {
 			safe => 0,
-			rebuild => 1,
+			rebuild => 1, # format plugin
+			section => "format",
 		},
 		po_master_language => {
 			type => "string",
diff --git a/IkiWiki/Plugin/rawhtml.pm b/IkiWiki/Plugin/rawhtml.pm
index ad8a610c1..0838bcb22 100644
--- a/IkiWiki/Plugin/rawhtml.pm
+++ b/IkiWiki/Plugin/rawhtml.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # changes file types
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/textile.pm b/IkiWiki/Plugin/textile.pm
index 8cc5a7951..56bb4bffc 100644
--- a/IkiWiki/Plugin/textile.pm
+++ b/IkiWiki/Plugin/textile.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index 8599bdc8e..1ed9f0856 100644
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -29,6 +29,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index accb03bbe..b24630b15 100644
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # format plugin
 			rebuild => undef,
+			section => "format",
 		},
 }
 
diff --git a/doc/plugins/conditional.mdwn b/doc/plugins/conditional.mdwn
index 95ffb2764..27a99bb7c 100644
--- a/doc/plugins/conditional.mdwn
+++ b/doc/plugins/conditional.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=conditional core=1 author="[[Joey]]"]]
-[[!tag type/format]]
+[[!tag type/special-purpose]]
 
 This plugin provides the [[ikiwiki/directive/if]] [[ikiwiki/directive]].
 With this directive, you can make text be conditionally displayed on a page.
diff --git a/doc/plugins/format.mdwn b/doc/plugins/format.mdwn
index 91e707fcf..5ec0842ae 100644
--- a/doc/plugins/format.mdwn
+++ b/doc/plugins/format.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=format core=0 author="[[Joey]]"]]
-[[!tag type/format]]
+[[!tag type/useful]]
 
 This plugin allows mixing different page formats together, by embedding
 text formatted one way inside a page formatted another way. This is done
diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn
index b89f16b59..8237ae9dc 100644
--- a/doc/plugins/graphviz.mdwn
+++ b/doc/plugins/graphviz.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=graphviz author="[[JoshTriplett]]"]]
-[[!tag type/chrome type/format]]
+[[!tag type/chrome]]
 
 This plugin provides the [[ikiwiki/directive/graph]] [[ikiwiki/directive]].
 This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a
diff --git a/doc/plugins/more.mdwn b/doc/plugins/more.mdwn
index e9a971289..81a9e67e8 100644
--- a/doc/plugins/more.mdwn
+++ b/doc/plugins/more.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=more author="Ben"]]
-[[!tag type/format]]
+[[!tag type/chrome]]
 
 This plugin provides the [[ikiwiki/directive/more]] [[ikiwiki/directive]],
 which is a way to have a "more" link on a post in a blog, that leads to the
diff --git a/doc/plugins/shortcut.mdwn b/doc/plugins/shortcut.mdwn
index cca1f4bdd..68896f4d3 100644
--- a/doc/plugins/shortcut.mdwn
+++ b/doc/plugins/shortcut.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=shortcut author="[[Joey]]"]]
-[[!tag type/format]]
+[[!tag type/useful]]
 
 This plugin provides the [[ikiwiki/directive/shortcut]] [[ikiwiki/directive]].
 It allows external links to commonly linked to sites to be made
diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index 10a85bb2c..fb830044f 100644
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=table author="[[VictorMoral]]"]]
-[[!tag type/format]]
+[[!tag type/useful]]
 
 This plugin provides the [[ikiwiki/directive/table]] [[ikiwiki/directive]].
 It can build HTML tables from data in CSV (comma-separated values)
diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn
index 3485fe64c..6675207b2 100644
--- a/doc/plugins/template.mdwn
+++ b/doc/plugins/template.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=template author="[[Joey]]"]]
-[[!tag type/format]]
+[[!tag type/useful]]
 
 This plugin provides the [[ikiwiki/directive/template]] [[ikiwiki/directive]].
 With this plugin, you can set up templates, and cause them to be filled out
diff --git a/doc/plugins/typography.mdwn b/doc/plugins/typography.mdwn
index 030ef8052..9ff6c4ffd 100644
--- a/doc/plugins/typography.mdwn
+++ b/doc/plugins/typography.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=typography author="[[Roktas]]"]]
-[[!tag type/format]]
+[[!tag type/chrome]]
 
 This plugin, also known as
 [SmartyPants](http://daringfireball.net/projects/smartypants/), translates
diff --git a/plugins/rst b/plugins/rst
index 9f64b33a0..838667507 100755
--- a/plugins/rst
+++ b/plugins/rst
@@ -33,7 +33,7 @@ def _to_dict(args):
     return dict((k, v) for k, v in zip(*[iter(args)]*2))
 
 def getsetup(proxy, *kwargs):
-    return 'plugin', { 'safe' : 1, 'rebuild' : 1 }
+    return 'plugin', { 'safe' : 1, 'rebuild' : 1, 'section' : 'format' }
 
 import sys
 def debug(s):
-- 
cgit v1.2.3


From 2d4b84e45f1dc947e8bb9ff92ab543861223ff42 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 01:16:20 -0500
Subject: borders

---
 IkiWiki/Setup/Standard.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index bdf52f25a..71abb1cfb 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -102,12 +102,12 @@ sub gendump ($) {
 		my $section=$s{plugin}->{section};
 		push @{$section_plugins{$section}}, $plugin;
 		if (@{$section_plugins{$section}} == 1) {
-			push @ret, "", "\t#", "\t# $section plugins",
+			push @ret, "", "\t".("#" x 70), "\t# $section plugins",
 				sub {
 					wrap("\t#   (", "\t#   ",
 						join(", ", @{$section_plugins{$section}})).")"
 				},
-				"\t#";
+				"\t".("#" x 70);
 		}
 
 		my @values=dumpvalues(\%setup, @{$setup});
-- 
cgit v1.2.3


From 04a99c84406d7b1552b15fc0b5ea598644f94c23 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 03:38:00 -0500
Subject: plugin tag reorg

---
 doc/plugins/404.mdwn            |  2 +-
 doc/plugins/aggregate.mdwn      |  2 +-
 doc/plugins/autoindex.mdwn      |  2 +-
 doc/plugins/calendar.mdwn       |  2 +-
 doc/plugins/color.mdwn          |  2 +-
 doc/plugins/comments.mdwn       |  2 +-
 doc/plugins/contrib/postal.mdwn |  2 +-
 doc/plugins/cutpaste.mdwn       |  2 +-
 doc/plugins/ddate.mdwn          |  1 +
 doc/plugins/filecheck.mdwn      |  2 +-
 doc/plugins/format.mdwn         |  2 +-
 doc/plugins/fortune.mdwn        |  1 +
 doc/plugins/goto.mdwn           |  2 +-
 doc/plugins/graphviz.mdwn       |  2 +-
 doc/plugins/haiku.mdwn          |  1 +
 doc/plugins/img.mdwn            |  2 +-
 doc/plugins/mirrorlist.mdwn     |  2 +-
 doc/plugins/more.mdwn           |  2 +-
 doc/plugins/poll.mdwn           |  2 +-
 doc/plugins/polygen.mdwn        |  1 +
 doc/plugins/prettydate.mdwn     |  1 +
 doc/plugins/relativedate.mdwn   |  1 +
 doc/plugins/repolist.mdwn       |  2 +-
 doc/plugins/shortcut.mdwn       |  2 +-
 doc/plugins/sparkline.mdwn      |  2 +-
 doc/plugins/table.mdwn          |  2 +-
 doc/plugins/template.mdwn       |  2 +-
 doc/plugins/testpagespec.mdwn   |  2 +-
 doc/plugins/teximg.mdwn         |  2 +-
 doc/plugins/toc.mdwn            |  2 +-
 doc/plugins/toggle.mdwn         |  2 +-
 doc/plugins/type/chrome.mdwn    |  2 +-
 doc/plugins/type/useful.mdwn    |  1 -
 doc/plugins/type/widget.mdwn    |  2 ++
 doc/plugins/underlay.mdwn       | 18 +++++++++---------
 doc/plugins/wmd.mdwn            |  2 +-
 36 files changed, 44 insertions(+), 37 deletions(-)
 delete mode 100644 doc/plugins/type/useful.mdwn
 create mode 100644 doc/plugins/type/widget.mdwn

diff --git a/doc/plugins/404.mdwn b/doc/plugins/404.mdwn
index ad332ee04..53dace3c9 100644
--- a/doc/plugins/404.mdwn
+++ b/doc/plugins/404.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=404 author="[[Simon_McVittie|smcv]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin lets you use the IkiWiki CGI script as an Apache 404 handler,
 to give the behaviour of various other wiki engines where visiting a
diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn
index e2efcd83f..bb828b05c 100644
--- a/doc/plugins/aggregate.mdwn
+++ b/doc/plugins/aggregate.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=aggregate author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 This plugin allows content from other feeds to be aggregated into the
 wiki. To specify feeds to aggregate, use the
diff --git a/doc/plugins/autoindex.mdwn b/doc/plugins/autoindex.mdwn
index 03e2d12f3..d1133e4f5 100644
--- a/doc/plugins/autoindex.mdwn
+++ b/doc/plugins/autoindex.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=autoindex core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 This plugin searches for [[SubPages|ikiwiki/subpage]] with a missing parent
 page, and generates the parent pages. The generated page content is
diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index bc1bc6c71..49fd90627 100644
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=calendar author="[[ManojSrivastava]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides a [[ikiwiki/directive/calendar]] [[ikiwiki/directive]].
 The directive displays a calendar, similar to the typical calendars shown on
diff --git a/doc/plugins/color.mdwn b/doc/plugins/color.mdwn
index dbb8b870c..d639bf563 100644
--- a/doc/plugins/color.mdwn
+++ b/doc/plugins/color.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=color core=0 author="[[ptecza]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides a [[ikiwiki/directive/color]] [[ikiwiki/directive]].
 The directive can be used to color a piece of text on a page.
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index f933d32be..775ef75a0 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=comments author="[[Simon_McVittie|smcv]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin adds "blog-style" comments. Unlike the wiki-style freeform 
 Discussion pages, these comments are posted by a simple form, cannot later
diff --git a/doc/plugins/contrib/postal.mdwn b/doc/plugins/contrib/postal.mdwn
index b2f875393..c522f8bcb 100644
--- a/doc/plugins/contrib/postal.mdwn
+++ b/doc/plugins/contrib/postal.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=postal author="[[DavidBremner]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 The `postal` plugin allows users to send mail to
 a special address to comment on a page. It uses the [[mailbox]]
diff --git a/doc/plugins/cutpaste.mdwn b/doc/plugins/cutpaste.mdwn
index f74f8a269..ea3665c44 100644
--- a/doc/plugins/cutpaste.mdwn
+++ b/doc/plugins/cutpaste.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=cutpaste author="[[Enrico]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/cut]],
 [[ikiwiki/directive/copy]] and [[ikiwiki/directive/paste]]
diff --git a/doc/plugins/ddate.mdwn b/doc/plugins/ddate.mdwn
index 741606a6e..17bb16cff 100644
--- a/doc/plugins/ddate.mdwn
+++ b/doc/plugins/ddate.mdwn
@@ -1,6 +1,7 @@
 [[!template id=plugin name=ddate author="[[Joey]]"]]
 [[!tag type/fun]]
 [[!tag type/date]]
+[[!tag type/chrome]]
 
 Enables use of Discordian dates. `--timeformat` can be used to change
 the date format; see `ddate(1)`.
diff --git a/doc/plugins/filecheck.mdwn b/doc/plugins/filecheck.mdwn
index f4563d58e..e5f68b29c 100644
--- a/doc/plugins/filecheck.mdwn
+++ b/doc/plugins/filecheck.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=filecheck core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 This plugin enhances the regular [[ikiwiki/PageSpec]] syntax with
 some additional tests, for things like file size, mime type, and virus
diff --git a/doc/plugins/format.mdwn b/doc/plugins/format.mdwn
index 5ec0842ae..b41d365aa 100644
--- a/doc/plugins/format.mdwn
+++ b/doc/plugins/format.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=format core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/widget]]
 
 This plugin allows mixing different page formats together, by embedding
 text formatted one way inside a page formatted another way. This is done
diff --git a/doc/plugins/fortune.mdwn b/doc/plugins/fortune.mdwn
index 9966f456d..3cb125ac1 100644
--- a/doc/plugins/fortune.mdwn
+++ b/doc/plugins/fortune.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=fortune author="[[Joey]]"]]
 [[!tag type/fun]]
+[[!tag type/widget]]
 
 This plugin implements the [[ikiwiki/directive/fortune]] [[ikiwiki/directive]].
 This directive  uses the `fortune` program to insert a fortune into the page.
diff --git a/doc/plugins/goto.mdwn b/doc/plugins/goto.mdwn
index 9c401c5d2..8e1de7a10 100644
--- a/doc/plugins/goto.mdwn
+++ b/doc/plugins/goto.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=goto author="[[Simon_McVittie|smcv]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin adds a `do=goto` mode for the IkiWiki CGI script. It's mainly
 for internal use by the [[404]], [[comments]] and [[recentchanges]]
diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn
index 8237ae9dc..65130ae8c 100644
--- a/doc/plugins/graphviz.mdwn
+++ b/doc/plugins/graphviz.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=graphviz author="[[JoshTriplett]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/graph]] [[ikiwiki/directive]].
 This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a
diff --git a/doc/plugins/haiku.mdwn b/doc/plugins/haiku.mdwn
index 74eac1c29..448733d95 100644
--- a/doc/plugins/haiku.mdwn
+++ b/doc/plugins/haiku.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=haiku author="[[Joey]]"]]
 [[!tag type/fun]]
+[[!tag type/widget]]
 
 This plugin provides a [[ikiwiki/directive/haiku]] [[ikiwiki/directive]].
 The directive allows inserting a randomly generated haiku into a wiki page.
diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn
index 114438765..a6cd90f28 100644
--- a/doc/plugins/img.mdwn
+++ b/doc/plugins/img.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=img author="Christian Mock"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/img]] [[ikiwiki/directive]].
 While ikiwiki supports inlining full-size images by making a
diff --git a/doc/plugins/mirrorlist.mdwn b/doc/plugins/mirrorlist.mdwn
index b371e8eb7..6e4964ed1 100644
--- a/doc/plugins/mirrorlist.mdwn
+++ b/doc/plugins/mirrorlist.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=mirror author="[[Joey]]"]]
-[[!tag type/special-purpose]]
+[[!tag type/chrome]]
 
 This plugin allows adding links a list of mirrors to each page in the
 wiki. For each mirror, a name and an url should be specified. Pages are
diff --git a/doc/plugins/more.mdwn b/doc/plugins/more.mdwn
index 81a9e67e8..a0664e843 100644
--- a/doc/plugins/more.mdwn
+++ b/doc/plugins/more.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=more author="Ben"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/more]] [[ikiwiki/directive]],
 which is a way to have a "more" link on a post in a blog, that leads to the
diff --git a/doc/plugins/poll.mdwn b/doc/plugins/poll.mdwn
index 510f67798..099cb399c 100644
--- a/doc/plugins/poll.mdwn
+++ b/doc/plugins/poll.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=poll author="[[Joey]]"]]
-[[!tag type/web]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/poll]] [[ikiwiki/directive]],
 which allows inserting an online poll into a page.
diff --git a/doc/plugins/polygen.mdwn b/doc/plugins/polygen.mdwn
index 6045c1ec9..f9cea1f4d 100644
--- a/doc/plugins/polygen.mdwn
+++ b/doc/plugins/polygen.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=polygen author="Enrico Zini"]]
 [[!tag type/fun]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/polygen]] [[ikiwiki/directive]],
 which allows inserting text generated by polygen into a wiki page.
diff --git a/doc/plugins/prettydate.mdwn b/doc/plugins/prettydate.mdwn
index 11ad4252f..149b7c29c 100644
--- a/doc/plugins/prettydate.mdwn
+++ b/doc/plugins/prettydate.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=prettydate author="[[Joey]]"]]
 [[!tag type/date]]
+[[!tag type/chrome]]
 
 Enabling this plugin changes the dates displayed on pages in the wiki to
 a format that is nice and easy to read. Examples: "late Wednesday evening, 
diff --git a/doc/plugins/relativedate.mdwn b/doc/plugins/relativedate.mdwn
index 50c96c5d7..d6e8eb08b 100644
--- a/doc/plugins/relativedate.mdwn
+++ b/doc/plugins/relativedate.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=relativedate author="[[Joey]]"]]
 [[!tag type/date]]
+[[!tag type/chrome]]
 
 This plugin lets dates be displayed in relative form. Examples: "2 days ago", 
 "1 month and 3 days ago", "30 minutes ago". Hovering over the date will
diff --git a/doc/plugins/repolist.mdwn b/doc/plugins/repolist.mdwn
index 9b3a7575e..efd9c9352 100644
--- a/doc/plugins/repolist.mdwn
+++ b/doc/plugins/repolist.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=repolist author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin allows you to configure ikiwiki with the location of
 [[rcs]] repositories for your wiki's source. This is done via the
diff --git a/doc/plugins/shortcut.mdwn b/doc/plugins/shortcut.mdwn
index 68896f4d3..1e8e85ed8 100644
--- a/doc/plugins/shortcut.mdwn
+++ b/doc/plugins/shortcut.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=shortcut author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/shortcut]] [[ikiwiki/directive]].
 It allows external links to commonly linked to sites to be made
diff --git a/doc/plugins/sparkline.mdwn b/doc/plugins/sparkline.mdwn
index bcc5daec6..ee3928d7e 100644
--- a/doc/plugins/sparkline.mdwn
+++ b/doc/plugins/sparkline.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=sparkline author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/sparkline]]
 [[ikiwiki/directive]], which allows for easily embedding sparklines into
diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index fb830044f..fe66f90a8 100644
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=table author="[[VictorMoral]]"]]
-[[!tag type/useful]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/table]] [[ikiwiki/directive]].
 It can build HTML tables from data in CSV (comma-separated values)
diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn
index 6675207b2..da775f232 100644
--- a/doc/plugins/template.mdwn
+++ b/doc/plugins/template.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=template author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/template]] [[ikiwiki/directive]].
 With this plugin, you can set up templates, and cause them to be filled out
diff --git a/doc/plugins/testpagespec.mdwn b/doc/plugins/testpagespec.mdwn
index dabcb0bec..8180d5d4b 100644
--- a/doc/plugins/testpagespec.mdwn
+++ b/doc/plugins/testpagespec.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=testpagespec author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 This plugin provides a [[ikiwiki/directive/testpagespec]] [[ikiwiki/directive]].
 The directive allows testing a [[ikiwiki/PageSpec]] to see if it matches a
diff --git a/doc/plugins/teximg.mdwn b/doc/plugins/teximg.mdwn
index ae052837f..f3cade85f 100644
--- a/doc/plugins/teximg.mdwn
+++ b/doc/plugins/teximg.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=teximg author="[[PatrickWinnertz]]"]]
-[[!tag type/chrome type/slow]]
+[[!tag type/widget type/slow]]
 
 This plugin provides a [[ikiwiki/directive/teximg]] [[ikiwiki/directive]],
 that renders LaTeX formulas into images.
diff --git a/doc/plugins/toc.mdwn b/doc/plugins/toc.mdwn
index 2b7686681..a0ad3a5d0 100644
--- a/doc/plugins/toc.mdwn
+++ b/doc/plugins/toc.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=toc author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/toc]] [[ikiwiki/directive]],
 which adds a table of contents to a page.
diff --git a/doc/plugins/toggle.mdwn b/doc/plugins/toggle.mdwn
index 69ac613e0..d1500eba0 100644
--- a/doc/plugins/toggle.mdwn
+++ b/doc/plugins/toggle.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=toggle author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/toggle]] and
 [[ikiwiki/directive/toggleable]] [[directives|ikiwiki/directive]].
diff --git a/doc/plugins/type/chrome.mdwn b/doc/plugins/type/chrome.mdwn
index d3f0eb3d3..a1c6d0728 100644
--- a/doc/plugins/type/chrome.mdwn
+++ b/doc/plugins/type/chrome.mdwn
@@ -1 +1 @@
-These plugins affect the look and feel of the wiki.
+These plugins affect the look and feel of the overall wiki.
diff --git a/doc/plugins/type/useful.mdwn b/doc/plugins/type/useful.mdwn
deleted file mode 100644
index 92fcf5af1..000000000
--- a/doc/plugins/type/useful.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-These plugins perform various miscellaneous useful functions.
diff --git a/doc/plugins/type/widget.mdwn b/doc/plugins/type/widget.mdwn
new file mode 100644
index 000000000..875829d0b
--- /dev/null
+++ b/doc/plugins/type/widget.mdwn
@@ -0,0 +1,2 @@
+These plugins allow inserting various things into pages via a
+[[ikiwiki/directive]].
diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn
index f7eafee7c..8836a394c 100644
--- a/doc/plugins/underlay.mdwn
+++ b/doc/plugins/underlay.mdwn
@@ -1,17 +1,17 @@
 [[!template id=plugin name=underlay author="[[Simon_McVittie|smcv]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
-This plugin adds an `add_underlays` option to the setup file.
-Its value is a list of underlay directories whose content is added to the wiki.
+This plugin adds an `add_underlays` option to the setup file. Its value is
+a list of underlay directories whose content is added to the wiki.
 
 Multiple underlays are normally set up automatically by other plugins (for
-instance, the images used by the [[plugins/smiley]] plugin), but they can also be
-used as a way to pull in external files that you don't want in revision control,
-like photos or software releases.
+instance, the images used by the [[plugins/smiley]] plugin), but they can
+also be used as a way to pull in external files that you don't want in
+revision control, like photos or software releases.
 
-Directories in `add_underlays` should usually be absolute. If relative, they're
-interpreted as relative to the parent directory of the basewiki underlay, which
-is probably not particularly useful in this context.
+Directories in `add_underlays` should usually be absolute. If relative,
+they're interpreted as relative to the parent directory of the basewiki
+underlay, which is probably not particularly useful in this context.
 
 --
 
diff --git a/doc/plugins/wmd.mdwn b/doc/plugins/wmd.mdwn
index dc9a30703..96c6e2e6c 100644
--- a/doc/plugins/wmd.mdwn
+++ b/doc/plugins/wmd.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=wmd author="[[Will]]"]]
-[[!tag type/chrome]]
+[[!tag type/web]]
 
 [WMD](http://wmd-editor.com/) is a What You See Is What You Mean editor for
 [[mdwn]]. This plugin makes WMD be used for editing pages in the wiki.
-- 
cgit v1.2.3


From 3ce8030dafc40a8188f6a32567c04d157b0ac39f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 03:43:01 -0500
Subject: more tag reorg

---
 doc/plugins/date.mdwn           | 2 +-
 doc/plugins/linkmap.mdwn        | 1 +
 doc/plugins/listdirectives.mdwn | 1 +
 doc/plugins/orphans.mdwn        | 1 +
 doc/plugins/pagecount.mdwn      | 1 +
 doc/plugins/pagestats.mdwn      | 2 +-
 doc/plugins/progress.mdwn       | 2 +-
 doc/plugins/version.mdwn        | 1 +
 8 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/plugins/date.mdwn b/doc/plugins/date.mdwn
index b8dbdfee5..2a33f014c 100644
--- a/doc/plugins/date.mdwn
+++ b/doc/plugins/date.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=date author="[[Joey]]"]]
-[[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/date]]
 [[ikiwiki/directive]], which provides a way to display an arbitrary date
diff --git a/doc/plugins/linkmap.mdwn b/doc/plugins/linkmap.mdwn
index 89cb9d8ae..7e51cd935 100644
--- a/doc/plugins/linkmap.mdwn
+++ b/doc/plugins/linkmap.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=linkmap author="[[Joey]]"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 [[!tag type/slow]]
 
 This plugin provides the [[ikiwiki/directive/linkmap]] [[ikiwiki/directive]].
diff --git a/doc/plugins/listdirectives.mdwn b/doc/plugins/listdirectives.mdwn
index 2d9bce01d..df854de52 100644
--- a/doc/plugins/listdirectives.mdwn
+++ b/doc/plugins/listdirectives.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=listdirectives author="Will"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/listdirectives]]
 [[ikiwiki/directive]], which inserts a list of currently available
diff --git a/doc/plugins/orphans.mdwn b/doc/plugins/orphans.mdwn
index e403c2d18..09ad0a51d 100644
--- a/doc/plugins/orphans.mdwn
+++ b/doc/plugins/orphans.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=orphans author="[[Joey]]"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/orphans]]
 [[ikiwiki/directive]], which generates a list of possibly orphaned pages --
diff --git a/doc/plugins/pagecount.mdwn b/doc/plugins/pagecount.mdwn
index a56027e60..71872fae8 100644
--- a/doc/plugins/pagecount.mdwn
+++ b/doc/plugins/pagecount.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=pagecount author="[[Joey]]"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/pagecount]]
 [[ikiwiki/directive]], which displays the number of pages
diff --git a/doc/plugins/pagestats.mdwn b/doc/plugins/pagestats.mdwn
index c3eba6363..347e39a89 100644
--- a/doc/plugins/pagestats.mdwn
+++ b/doc/plugins/pagestats.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=pagestats author="Enrico Zini"]]
-[[!tag type/meta type/tags]]
+[[!tag type/meta type/tags type/widget]]
 
 This plugin provides the [[ikiwiki/directive/pagestats]]
 [[ikiwiki/directive]], which can generate stats about how pages link to
diff --git a/doc/plugins/progress.mdwn b/doc/plugins/progress.mdwn
index e1b560cc8..20736d18c 100644
--- a/doc/plugins/progress.mdwn
+++ b/doc/plugins/progress.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=progress author="[[Will]]"]]
-[[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/progress]]
 [[ikiwiki/directive]], which generates a progress bar.
diff --git a/doc/plugins/version.mdwn b/doc/plugins/version.mdwn
index 43027bdd7..326a2e7ce 100644
--- a/doc/plugins/version.mdwn
+++ b/doc/plugins/version.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=version author="[[Joey]]"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/version]]
 [[ikiwiki/directive]], which inserts the current version
-- 
cgit v1.2.3


From 21b4f11cbb0796e858f95dcee2ff117fb4e10afe Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 03:47:21 -0500
Subject: more tag reorg

---
 doc/plugins/editpage.mdwn          | 1 +
 doc/plugins/getsource.mdwn         | 1 +
 doc/plugins/inline.mdwn            | 1 +
 doc/plugins/mirrorlist.mdwn        | 2 +-
 doc/plugins/parentlinks.mdwn       | 2 +-
 doc/plugins/recentchanges.mdwn     | 1 +
 doc/plugins/recentchangesdiff.mdwn | 1 +
 doc/plugins/rsync.mdwn             | 1 +
 8 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/editpage.mdwn b/doc/plugins/editpage.mdwn
index b830e51aa..346ee7c78 100644
--- a/doc/plugins/editpage.mdwn
+++ b/doc/plugins/editpage.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=editpage core=1 author="[[Joey]]"]]
+[[!tag type/web]]
 
 This plugin allows editing wiki pages in the web interface. It's enabled by
 default if [[cgi]] is enabled; disable it if you want cgi for other things
diff --git a/doc/plugins/getsource.mdwn b/doc/plugins/getsource.mdwn
index 20040ccee..d5404a628 100644
--- a/doc/plugins/getsource.mdwn
+++ b/doc/plugins/getsource.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=getsource author="[[Will_Uther|Will]]"]]
+[[!tag type/web]]
 
 This plugin adds a "Source" link to the top of each page that uses
 the CGI to display the page's source.
diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn
index 6c3282576..3eb849fdb 100644
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=inline core=1 author="[[Joey]]"]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/inline]]
 [[ikiwiki/directive]], which allows including one wiki page
diff --git a/doc/plugins/mirrorlist.mdwn b/doc/plugins/mirrorlist.mdwn
index 6e4964ed1..aedc1f4a0 100644
--- a/doc/plugins/mirrorlist.mdwn
+++ b/doc/plugins/mirrorlist.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=mirror author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/web]]
 
 This plugin allows adding links a list of mirrors to each page in the
 wiki. For each mirror, a name and an url should be specified. Pages are
diff --git a/doc/plugins/parentlinks.mdwn b/doc/plugins/parentlinks.mdwn
index ef262a30c..c2d364bef 100644
--- a/doc/plugins/parentlinks.mdwn
+++ b/doc/plugins/parentlinks.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=parentlinks core=1 author="[[intrigeri]]"]]
-[[!tag type/link]]
+[[!tag type/link type/chrome]]
 
 This plugin generates the links to a page's parents that typically appear
 at the top of a wiki page.
diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn
index 9375296a4..823f68502 100644
--- a/doc/plugins/recentchanges.mdwn
+++ b/doc/plugins/recentchanges.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=recentchanges core=1 author="[[Joey]]"]]
+[[!tag type/meta]]
 
 This plugin examines the [[revision_control_system|rcs]] history and
 generates a page describing each recent change made to the wiki. These
diff --git a/doc/plugins/recentchangesdiff.mdwn b/doc/plugins/recentchangesdiff.mdwn
index a7b113ade..57299f92d 100644
--- a/doc/plugins/recentchangesdiff.mdwn
+++ b/doc/plugins/recentchangesdiff.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=recentchangesdiff core=0 author="[[Joey]]"]]
+[[!tag type/meta]]
 
 This plugin extends the [[recentchanges]] plugin, adding a diff for each
 change. The diffs are by default hidden from display on the recentchanges
diff --git a/doc/plugins/rsync.mdwn b/doc/plugins/rsync.mdwn
index 315b663c0..e48886168 100644
--- a/doc/plugins/rsync.mdwn
+++ b/doc/plugins/rsync.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=rsync author="[[schmonz]]"]]
+[[!tag type/special-purpose]]
 
 This plugin allows ikiwiki to push generated pages to another host
 by running a command such as `rsync`.
-- 
cgit v1.2.3


From 1db0dd855ae49e4bb7b74e1158fc0356836d45a7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 03:56:56 -0500
Subject: one more

---
 doc/plugins/map.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/map.mdwn b/doc/plugins/map.mdwn
index 8f5a9f15e..b164d5ca8 100644
--- a/doc/plugins/map.mdwn
+++ b/doc/plugins/map.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=map author="Alessandro Dotti Contra"]]
-[[!tag type/meta]]
+[[!tag type/meta type/widget]]
 
 This plugin provides the [[ikiwiki/directive/map]] [[ikiwiki/directive]],
 which generates a hierarchical page map for the wiki.
-- 
cgit v1.2.3


From 73242f0890eb7823e2e864dab6477d8fc2bdd69f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 04:01:04 -0500
Subject: remove unnecessary IkiWiki::

---
 IkiWiki/Plugin/typography.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm
index f62be82bb..9389b24d4 100644
--- a/IkiWiki/Plugin/typography.pm
+++ b/IkiWiki/Plugin/typography.pm
@@ -9,7 +9,7 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getopt", id => "typography", call => \&getopt);
 	hook(type => "getsetup", id => "typography", call => \&getsetup);
-	IkiWiki::hook(type => "sanitize", id => "typography", call => \&sanitize);
+	hook(type => "sanitize", id => "typography", call => \&sanitize);
 }
 
 sub getopt () {
-- 
cgit v1.2.3


From 805b3afff7158a7912b06948d134478308b5855b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 04:09:57 -0500
Subject: formatting sillyness

---
 IkiWiki/Setup/Standard.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 71abb1cfb..f7a322317 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -104,7 +104,7 @@ sub gendump ($) {
 		if (@{$section_plugins{$section}} == 1) {
 			push @ret, "", "\t".("#" x 70), "\t# $section plugins",
 				sub {
-					wrap("\t#   (", "\t#   ",
+					wrap("\t#   (", "\t#    ",
 						join(", ", @{$section_plugins{$section}})).")"
 				},
 				"\t".("#" x 70);
-- 
cgit v1.2.3


From a7eb434afd216e0b473ac82777544c9c45852792 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 04:10:11 -0500
Subject: another (last?) tag change

---
 doc/plugins/postsparkline.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/postsparkline.mdwn b/doc/plugins/postsparkline.mdwn
index c81f91bdc..b0733e343 100644
--- a/doc/plugins/postsparkline.mdwn
+++ b/doc/plugins/postsparkline.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=postsparkline author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/postsparkline]] [[ikiwiki/directive]].
 It uses the [[sparkline]] plugin to create a sparkline of
-- 
cgit v1.2.3


From 20ba12802b3897bf48d8a7704a57e9cede2466bd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 04:22:15 -0500
Subject: add section information

---
 IkiWiki/Plugin/404.pm          | 1 +
 IkiWiki/Plugin/aggregate.pm    | 1 +
 IkiWiki/Plugin/amazon_s3.pm    | 1 +
 IkiWiki/Plugin/attachment.pm   | 1 +
 IkiWiki/Plugin/autoindex.pm    | 1 +
 IkiWiki/Plugin/comments.pm     | 1 +
 IkiWiki/Plugin/editdiff.pm     | 1 +
 IkiWiki/Plugin/edittemplate.pm | 1 +
 IkiWiki/Plugin/getsource.pm    | 1 +
 IkiWiki/Plugin/google.pm       | 1 +
 IkiWiki/Plugin/goto.pm         | 1 +
 IkiWiki/Plugin/mirrorlist.pm   | 1 +
 IkiWiki/Plugin/norcs.pm        | 1 +
 IkiWiki/Plugin/pingee.pm       | 1 +
 IkiWiki/Plugin/pinger.pm       | 1 +
 IkiWiki/Plugin/remove.pm       | 1 +
 IkiWiki/Plugin/rename.pm       | 1 +
 IkiWiki/Plugin/repolist.pm     | 1 +
 IkiWiki/Plugin/rsync.pm        | 1 +
 IkiWiki/Plugin/search.pm       | 1 +
 IkiWiki/Plugin/testpagespec.pm | 1 +
 IkiWiki/Plugin/underlay.pm     | 1 +
 IkiWiki/Plugin/websetup.pm     | 1 +
 IkiWiki/Plugin/wmd.pm          | 2 ++
 doc/plugins/write.mdwn         | 3 ++-
 25 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
index 85486e559..8adfd5dd9 100644
--- a/IkiWiki/Plugin/404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -21,6 +21,7 @@ sub getsetup () {
 			# server admin action too
 			safe => 0,
 			rebuild => 0,
+			section => "web",
 		}
 }
 
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 5a9eb433d..c18d413e6 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -43,6 +43,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "special-purpose",
 		},
 		aggregateinternal => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index cfd8cd347..f2f4dbcf2 100644
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -45,6 +45,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => 0,
+			section => "special-purpose",
 		},
 		amazon_s3_key_id => {
 			type => "string",
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index cbe6efc21..ad1dd9bca 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 		allowed_attachments => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 555856b11..e50464dca 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index caed0d58c..1e71749a4 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -38,6 +38,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 		comments_pagespec => {
 			type => 'pagespec',
diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index 7df6a9ffb..d8f53a42e 100644
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index a163b0d84..5f0551d92 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -23,6 +23,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index d1555430e..b362de726 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 		getsource_mimetype => {
 			type => "string",
diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 483fa1707..48ad4c8ce 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 439552f62..03bd682b3 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -14,6 +14,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		}
 }
 
diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index d0a6107ef..92be7913e 100644
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 		mirrorlist => {
 			type => "string",
diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm
index bfe84c0e1..e6a05a3c5 100644
--- a/IkiWiki/Plugin/norcs.pm
+++ b/IkiWiki/Plugin/norcs.pm
@@ -25,6 +25,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => 0,
+			section => "rcs",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pingee.pm b/IkiWiki/Plugin/pingee.pm
index f5386d0ca..aafce9e70 100644
--- a/IkiWiki/Plugin/pingee.pm
+++ b/IkiWiki/Plugin/pingee.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index c20ecb5d4..a797fc7bd 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -21,6 +21,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "special-purpose",
 		},
 		pinger_timeout => {
 			type => "integer",
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 3c1e0c713..f59d0269e 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 8213d21f6..3908443ca 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/repolist.pm b/IkiWiki/Plugin/repolist.pm
index f69ec3988..ba7c5f0aa 100644
--- a/IkiWiki/Plugin/repolist.pm
+++ b/IkiWiki/Plugin/repolist.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "web",
 		},
 		repositories => {
 			type => "string",
diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index e38801e4a..8dd983be7 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => 0,
+			section => "special-purpose",
 		},
 		rsync_command => {
 			type => "string",
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 393c17e0f..fb68396a1 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 		omega_cgi => {
 			type => "string",
diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 440fca33b..17a77cb69 100644
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 116fe7324..ab74fc37e 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => undef,
+			section => "special-purpose",
 		},
 		add_underlays => {
 			type => "string",
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 445552e40..5c19c9b63 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 		websetup_force_plugins => {
 			type => "string",
diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 9ddd237ab..5361d2914 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -17,6 +17,8 @@ sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
+			rebuild => 0,
+			section => "web",
 		},
 }
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 68454d56c..fbaabb6a0 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -498,7 +498,8 @@ describes the plugin as a whole. For example:
   and undef if a rebuild could be needed in some circumstances, but is not
   strictly required.
 * `section` can optionally specify which section in the config file
-  the plugin fits in.
+  the plugin fits in. The convention is to name the sections the
+  same as the tags used for [[plugins|plugin]] on this wiki.
 
 ### genwrapper
 
-- 
cgit v1.2.3


From 34fff64e7b56f4f8cd99430f9f927d2a5d1e3619 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 06:35:52 -0500
Subject: setup file ordering

---
 IkiWiki/Plugin/aggregate.pm      | 1 -
 IkiWiki/Plugin/amazon_s3.pm      | 1 -
 IkiWiki/Plugin/autoindex.pm      | 1 -
 IkiWiki/Plugin/calendar.pm       | 1 +
 IkiWiki/Plugin/color.pm          | 1 +
 IkiWiki/Plugin/conditional.pm    | 2 +-
 IkiWiki/Plugin/cutpaste.pm       | 1 +
 IkiWiki/Plugin/date.pm           | 1 +
 IkiWiki/Plugin/format.pm         | 1 +
 IkiWiki/Plugin/fortune.pm        | 1 +
 IkiWiki/Plugin/graphviz.pm       | 1 +
 IkiWiki/Plugin/haiku.pm          | 1 +
 IkiWiki/Plugin/img.pm            | 1 +
 IkiWiki/Plugin/linkmap.pm        | 1 +
 IkiWiki/Plugin/listdirectives.pm | 1 +
 IkiWiki/Plugin/map.pm            | 1 +
 IkiWiki/Plugin/more.pm           | 1 +
 IkiWiki/Plugin/orphans.pm        | 1 +
 IkiWiki/Plugin/pagecount.pm      | 1 +
 IkiWiki/Plugin/pagestats.pm      | 1 +
 IkiWiki/Plugin/pingee.pm         | 1 -
 IkiWiki/Plugin/pinger.pm         | 1 -
 IkiWiki/Plugin/poll.pm           | 1 +
 IkiWiki/Plugin/polygen.pm        | 1 +
 IkiWiki/Plugin/postsparkline.pm  | 1 +
 IkiWiki/Plugin/progress.pm       | 1 +
 IkiWiki/Plugin/recentchanges.pm  | 1 -
 IkiWiki/Plugin/rsync.pm          | 1 -
 IkiWiki/Plugin/shortcut.pm       | 1 +
 IkiWiki/Plugin/sparkline.pm      | 1 +
 IkiWiki/Plugin/table.pm          | 1 +
 IkiWiki/Plugin/template.pm       | 1 +
 IkiWiki/Plugin/testpagespec.pm   | 1 -
 IkiWiki/Plugin/teximg.pm         | 1 +
 IkiWiki/Plugin/toc.pm            | 1 +
 IkiWiki/Plugin/toggle.pm         | 1 +
 IkiWiki/Plugin/underlay.pm       | 1 -
 IkiWiki/Plugin/version.pm        | 1 +
 IkiWiki/Setup.pm                 | 4 +++-
 39 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index c18d413e6..5a9eb433d 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -43,7 +43,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
-			section => "special-purpose",
 		},
 		aggregateinternal => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index f2f4dbcf2..cfd8cd347 100644
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -45,7 +45,6 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => 0,
-			section => "special-purpose",
 		},
 		amazon_s3_key_id => {
 			type => "string",
diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index e50464dca..555856b11 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -16,7 +16,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
-			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 2b87451ce..aaee2c610 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -38,6 +38,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 		archivebase => {
 			type => "string",
diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index b9407ba28..d550dd9f4 100644
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index beeddc672..892b1cff9 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -16,7 +16,7 @@ sub getsetup {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
-			section => "core",
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index 417442f34..01e9ce043 100644
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/date.pm b/IkiWiki/Plugin/date.pm
index 652e6df0a..ea5c9a9c5 100644
--- a/IkiWiki/Plugin/date.pm
+++ b/IkiWiki/Plugin/date.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index c8041209f..d54e71131 100644
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm
index 17e57dea1..f481c7eac 100644
--- a/IkiWiki/Plugin/fortune.pm
+++ b/IkiWiki/Plugin/fortune.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 32e994d6b..bec122076 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index 5a062a276..bf23dce67 100644
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -16,6 +16,7 @@ sub getsetup {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 82db15a7e..f06121578 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 68eb6c8c6..ac26e072e 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index 09f08c567..8a67f7160 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 		directive_description_dir => {
 			type => "string",
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 788b96827..ce3ac1d24 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -21,6 +21,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
index 77d5fb077..266c8e1d0 100644
--- a/IkiWiki/Plugin/more.pm
+++ b/IkiWiki/Plugin/more.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 702943f87..e3cc3c940 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 8d36f057e..dd5de3c83 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 4313aa271..1c0b46830 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -27,6 +27,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pingee.pm b/IkiWiki/Plugin/pingee.pm
index aafce9e70..f5386d0ca 100644
--- a/IkiWiki/Plugin/pingee.pm
+++ b/IkiWiki/Plugin/pingee.pm
@@ -15,7 +15,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
-			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index a797fc7bd..c20ecb5d4 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -21,7 +21,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
-			section => "special-purpose",
 		},
 		pinger_timeout => {
 			type => "integer",
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index bc1e3501e..6bc4579c2 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index bc21d71c7..78e3611e1 100644
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 0d5a12e33..2fae9c5fe 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index fe64b40b1..d27df5ca8 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 04219b721..5c7b71aaa 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -22,7 +22,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
-			section => "core",
 		},
 		recentchangespage => {
 			type => "string",
diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 8dd983be7..e38801e4a 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -16,7 +16,6 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => 0,
-			section => "special-purpose",
 		},
 		rsync_command => {
 			type => "string",
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 1840a5722..0cedbe447 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index fb4849492..42665ac63 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -24,6 +24,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 96d63f455..2edd1eacd 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 39d9667f9..3e024c5f8 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 17a77cb69..440fca33b 100644
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -15,7 +15,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
-			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index f92ed0132..0aaa79698 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -31,6 +31,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 		teximg_dvipng => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index b8537d3eb..ac07b9af6 100644
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index ef066a42f..f9c899540 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index ab74fc37e..116fe7324 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -18,7 +18,6 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => undef,
-			section => "special-purpose",
 		},
 		add_underlays => {
 			type => "string",
diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm
index 587cd55fa..c13643478 100644
--- a/IkiWiki/Plugin/version.pm
+++ b/IkiWiki/Plugin/version.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 7a7683fab..a3fd5ce66 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -121,9 +121,11 @@ sub getsetup () {
         $config{syslog}=$syslog;
 
 	return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} }
-		sort { # core first, then alphabetical
+		sort { # core first, other last, otherwise alphabetical
 			($b eq "core") <=> ($a eq "core")
 			   ||
+			($a eq "other") <=> ($b eq "other")
+			   ||
 			$a cmp $b
 		} keys %sections;
 }
-- 
cgit v1.2.3


From 5d566d8b32e7ec260df996366b471631d6a3b47c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 14:38:43 -0500
Subject: reorg and expand docs of some variables

---
 doc/plugins/write.mdwn | 99 ++++++++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 44 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index fbaabb6a0..712dda8bf 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -31,7 +31,7 @@ they're the same as far as how they hook into ikiwiki. This document will
 explain how to write both sorts of plugins, albeit with an emphasis on perl
 plugins.
 
-## Considerations
+## Remember: Ikiwiki is a compiler
 
 One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
 *compiler*. So plugins influence pages when they are built, not when they
@@ -40,7 +40,23 @@ example, will insert the build time. Also, as a compiler, ikiwiki avoids
 rebuilding pages unless they have changed, so a plugin that prints some
 random or changing thing on a page will generate a static page that won't
 change until ikiwiki rebuilds the page for some other reason, like the page
-being edited.
+being edited. The [[tutorial]] has some other examples of ways that ikiwiki
+being a compiler may trip up the unwary.
+
+## Plugin interface
+
+To import the ikiwiki plugin interface:
+
+	use IkiWiki '3.00';
+
+This will import several variables and functions into your plugin's
+namespace. These variables and functions are the ones most plugins need,
+and a special effort will be made to avoid changing them in incompatible
+ways, and to document any changes that have to be made in the future.
+
+Note that IkiWiki also provides other variables and functions that are not
+exported by default. No guarantee is made about these in the future, so if
+it's not exported, the wise choice is to not use it.
 
 ## Registering plugins
 
@@ -508,28 +524,17 @@ describes the plugin as a whole. For example:
 This hook is used to inject C code (which it returns) into the `main`
 function of the ikiwiki wrapper when it is being generated.
 
-## Plugin interface
-
-To import the ikiwiki plugin interface:
+### Exported variables
 
-	use IkiWiki '3.00';
+Several variables are exported to your plugin when you `use IkiWiki;`
 
-This will import several variables and functions into your plugin's
-namespace. These variables and functions are the ones most plugins need,
-and a special effort will be made to avoid changing them in incompatible
-ways, and to document any changes that have to be made in the future.
-
-Note that IkiWiki also provides other variables and functions that are not
-exported by default. No guarantee is made about these in the future, so if
-it's not exported, the wise choice is to not use it.
-
-### %config
+#### %config
 
 A plugin can access the wiki's configuration via the `%config`
 hash. The best way to understand the contents of the hash is to look at
 your ikiwiki setup file, which sets the hash content to configure the wiki.
 
-### %pagestate
+#### %pagestate
 
 The `%pagestate` hash can be used by plugins to save state that they will need
 next time ikiwiki is run. The hash holds per-page state, so to set a value,
@@ -547,7 +552,7 @@ When pages are deleted, ikiwiki automatically deletes their pagestate too.
 Note that page state does not persist across wiki rebuilds, only across
 wiki updates.
 
-### %wikistate
+#### %wikistate
 
 The `%wikistate` hash can be used by a plugin to store persistant state
 that is not bound to any one page. To set a value, use
@@ -556,19 +561,25 @@ serialize, `$key` is any string you like, and `$id` must be the same as the
 "id" parameter passed to `hook()` when registering the plugin, so that the
 state can be dropped if the plugin is no longer used.
 
-### Other variables
+#### %links
+
+The `%links` hash can be used to look up the names of each page that
+a page links to. The name of the page is the key; the value is an array
+reference. Do not modify this hash directly; call `add_link()`.
+
+#### %destsources
 
-If your plugin needs to access data about other pages in the wiki. It can
-use the following hashes, using a page name as the key:
+The `%destsources` hash records the name of the source file used to
+create each destination file. The key is the output filename (ie,
+"foo/index.html"), and the value is the source filename that it was built
+from (eg, "foo.mdwn"). Note that a single source file may create multiple
+destination files. Do not modify this hash directly; call `will_render()`.
 
-* `%links` lists the names of each page that a page links to, in an array
-  reference.
-* `%destsources` contains the name of the source file used to create each
-  destination file.
-* `%pagesources` contains the name of the source file for each page.
+#### %pagesources
 
-Also, the `%IkiWiki::version` variable contains the version number for the
-ikiwiki program.
+The `%pagesources` has can be used to look up the source filename
+of a page. So the key is the page name, and the value is the source
+filename. Do not modify this hash.
 
 ### Library functions
 
@@ -614,22 +625,6 @@ page created from it. (Ie, it appends ".html".)
 Use this when constructing the filename of a html file. Use `urlto` when
 generating a link to a page.
 
-### `deptype(@)`
-
-Use this function to generate ikiwiki's internal representation of a
-dependency type from one or more of these keywords:
-
-* `content` is the default. Any change to the content
-  of a page triggers the dependency.
-* `presence` is only triggered by a change to the presence
-  of a page.
-* `links` is only triggered by a change to the links of a page.
-  This includes when a link is added, removed, or changes what
-  it points to due to other changes. It does not include the
-  addition or removal of a duplicate link.
-
-If multiple types are specified, they are combined.
-
 #### `pagespec_match_list($$;@)`
 
 Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages
@@ -683,6 +678,22 @@ The most often used is "location", which specifies the location the
 PageSpec should match against. If not passed, relative PageSpecs will match
 relative to the top of the wiki.
 
+#### `deptype(@)`
+
+Use this function to generate ikiwiki's internal representation of a
+dependency type from one or more of these keywords:
+
+* `content` is the default. Any change to the content
+  of a page triggers the dependency.
+* `presence` is only triggered by a change to the presence
+  of a page.
+* `links` is only triggered by a change to the links of a page.
+  This includes when a link is added, removed, or changes what
+  it points to due to other changes. It does not include the
+  addition or removal of a duplicate link.
+
+If multiple types are specified, they are combined.
+
 #### `bestlink($$)`
 
 Given a page and the text of a link on the page, determine which
-- 
cgit v1.2.3


From b1c47b4065b245ccf46b99292d7de61800468237 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 14:41:28 -0500
Subject: heading tweaks

---
 doc/plugins/write.mdwn | 64 +++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 712dda8bf..17c54ffc7 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -524,17 +524,17 @@ describes the plugin as a whole. For example:
 This hook is used to inject C code (which it returns) into the `main`
 function of the ikiwiki wrapper when it is being generated.
 
-### Exported variables
+## Exported variables
 
 Several variables are exported to your plugin when you `use IkiWiki;`
 
-#### %config
+### %config
 
 A plugin can access the wiki's configuration via the `%config`
 hash. The best way to understand the contents of the hash is to look at
 your ikiwiki setup file, which sets the hash content to configure the wiki.
 
-#### %pagestate
+### %pagestate
 
 The `%pagestate` hash can be used by plugins to save state that they will need
 next time ikiwiki is run. The hash holds per-page state, so to set a value,
@@ -552,7 +552,7 @@ When pages are deleted, ikiwiki automatically deletes their pagestate too.
 Note that page state does not persist across wiki rebuilds, only across
 wiki updates.
 
-#### %wikistate
+### %wikistate
 
 The `%wikistate` hash can be used by a plugin to store persistant state
 that is not bound to any one page. To set a value, use
@@ -561,13 +561,13 @@ serialize, `$key` is any string you like, and `$id` must be the same as the
 "id" parameter passed to `hook()` when registering the plugin, so that the
 state can be dropped if the plugin is no longer used.
 
-#### %links
+### %links
 
 The `%links` hash can be used to look up the names of each page that
 a page links to. The name of the page is the key; the value is an array
 reference. Do not modify this hash directly; call `add_link()`.
 
-#### %destsources
+### %destsources
 
 The `%destsources` hash records the name of the source file used to
 create each destination file. The key is the output filename (ie,
@@ -575,15 +575,15 @@ create each destination file. The key is the output filename (ie,
 from (eg, "foo.mdwn"). Note that a single source file may create multiple
 destination files. Do not modify this hash directly; call `will_render()`.
 
-#### %pagesources
+### %pagesources
 
 The `%pagesources` has can be used to look up the source filename
 of a page. So the key is the page name, and the value is the source
 filename. Do not modify this hash.
 
-### Library functions
+## Library functions
 
-#### `hook(@)`
+### `hook(@)`
 
 Hook into ikiwiki's processing. See the discussion of hooks above.
 
@@ -592,12 +592,12 @@ named `no_override` is supported, If it's set to a true value, then this hook
 will not override any existing hook with the same id. This is useful if
 the id can be controled by the user.
 
-#### `debug($)`
+### `debug($)`
 
 Logs a debugging message. These are supressed unless verbose mode is turned
 on.
 
-#### `error($;$)`
+### `error($;$)`
 
 Aborts with an error message. If the second parameter is passed, it is a
 function that is called after the error message is printed, to do any final
@@ -611,13 +611,13 @@ In other hooks, error() is a fatal error, so use with care. Try to avoid
 dying on bad input when building a page, as that will halt
 the entire wiki build and make the wiki unusable.
 
-#### `template($;@)`
+### `template($;@)`
 
 Creates and returns a [[!cpan HTML::Template]] object. The first parameter
 is the name of the file in the template directory. The optional remaining
 parameters are passed to `HTML::Template->new`.
 
-#### `htmlpage($)`
+### `htmlpage($)`
 
 Passed a page name, returns the base name that will be used for a the html
 page created from it. (Ie, it appends ".html".)
@@ -625,7 +625,7 @@ page created from it. (Ie, it appends ".html".)
 Use this when constructing the filename of a html file. Use `urlto` when
 generating a link to a page.
 
-#### `pagespec_match_list($$;@)`
+### `pagespec_match_list($$;@)`
 
 Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages
 in the wiki that match the [[ikiwiki/PageSpec]]. 
@@ -656,7 +656,7 @@ Additional named parameters can be specified:
 Any other named parameters are passed on to `pagespec_match`, to further
 limit the match.
 
-#### `add_depends($$;$)`
+### `add_depends($$;$)`
 
 Makes the specified page depend on the specified [[ikiwiki/PageSpec]].
 
@@ -678,7 +678,7 @@ The most often used is "location", which specifies the location the
 PageSpec should match against. If not passed, relative PageSpecs will match
 relative to the top of the wiki.
 
-#### `deptype(@)`
+### `deptype(@)`
 
 Use this function to generate ikiwiki's internal representation of a
 dependency type from one or more of these keywords:
@@ -730,7 +730,7 @@ control some options. These are:
 * class - set to add a css class to the link
 * title - set to add a title attribute to the link
 
-#### `readfile($;$)`
+### `readfile($;$)`
 
 Given a filename, reads and returns the entire file.
 
@@ -739,7 +739,7 @@ in binary mode.
 
 A failure to read the file will result in it dying with an error.
 
-#### `writefile($$$;$$)`
+### `writefile($$$;$$)`
 
 Given a filename, a directory to put it in, and the file's content,
 writes a file. 
@@ -767,7 +767,7 @@ generally the directory parameter is a trusted toplevel directory like
 the srcdir or destdir, and any subdirectories of this are included in the
 filename parameter.
 
-#### `will_render($$)`
+### `will_render($$)`
 
 Given a page name and a destination file name (not including the base
 destination directory), register that the page will result in that file
@@ -783,34 +783,34 @@ Ikiwiki uses this information to automatically clean up rendered files when
 the page that rendered them goes away or is changed to no longer render
 them. will_render also does a few important security checks.
 
-#### `pagetype($)`
+### `pagetype($)`
 
 Given the name of a source file, returns the type of page it is, if it's
 a type that ikiwiki knowns how to htmlize. Otherwise, returns undef.
 
-#### `pagename($)`
+### `pagename($)`
 
 Given the name of a source file, returns the name of the wiki page
 that corresponds to that file.
 
-#### `pagetitle($)`
+### `pagetitle($)`
 
 Give the name of a wiki page, returns a version suitable to be displayed as
 the page's title. This is accomplished by de-escaping escaped characters in
 the page name. "_" is replaced with a space, and '__NN__' is replaced by 
 the UTF character with code NN.
 
-#### `titlepage($)`
+### `titlepage($)`
 
 This performs the inverse of `pagetitle`, ie, it converts a page title into
 a wiki page name.
 
-#### `linkpage($)`
+### `linkpage($)`
 
 This converts text that could have been entered by the user as a
 [[ikiwiki/WikiLink]] into a wiki page name.
 
-#### `srcfile($;$)`
+### `srcfile($;$)`
 
 Given the name of a source file in the wiki, searches for the file in
 the source directory and the underlay directories (most recently added
@@ -820,7 +820,7 @@ Normally srcfile will fail with an error message if the source file cannot
 be found. The second parameter can be set to a true value to make it return
 undef instead.
 
-#### `add_underlay($)`
+### `add_underlay($)`
 
 Adds a directory to the set of underlay directories that ikiwiki will
 search for files.
@@ -828,18 +828,18 @@ search for files.
 If the directory name is not absolute, ikiwiki will assume it is in
 the parent directory of the configured underlaydir.
 
-#### `displaytime($;$)`
+### `displaytime($;$)`
 
 Given a time, formats it for display.
 
 The optional second parameter is a strftime format to use to format the
 time.
 
-#### `gettext`
+### `gettext`
 
 This is the standard gettext function, although slightly optimised.
 
-#### `urlto($$;$)`
+### `urlto($$;$)`
 
 Construct a relative url to the first parameter from the page named by the
 second. The first parameter can be either a page name, or some other
@@ -848,13 +848,13 @@ destination file, as registered by `will_render`.
 If the third parameter is passed and is true, an absolute url will be
 constructed instead of the default relative url.
 
-#### `newpagefile($$)`
+### `newpagefile($$)`
 
 This can be called when creating a new page, to determine what filename
 to save the page to. It's passed a page name, and its type, and returns
 the name of the file to create, relative to the srcdir.
 
-#### `targetpage($$;$)`
+### `targetpage($$;$)`
 
 Passed a page and an extension, returns the filename that page will be
 rendered to.
@@ -863,7 +863,7 @@ Optionally, a third parameter can be passed, to specify the preferred
 filename of the page. For example, `targetpage("foo", "rss", "feed")`
 will yield something like `foo/feed.rss`.
 
-#### `add_link($$)`
+### `add_link($$)`
 
 This adds a link to `%links`, ensuring that duplicate links are not
 added. Pass it the page that contains the link, and the link text.
-- 
cgit v1.2.3


From ba19f940bd071f7065246594751dd49041cbbaba Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 14:44:26 -0500
Subject: move note to sidebox

---
 doc/plugins/write.mdwn | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 17c54ffc7..07bfd72ac 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -3,6 +3,20 @@ written to extend ikiwiki in many ways. Despite the length of this page,
 it's not really hard. This page is a complete reference to everything a
 plugin might want to do. There is also a quick [[tutorial]].
 
+[[!template type="note" text="""
+Ikiwiki is a compiler
+
+One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
+*compiler*. So plugins influence pages when they are built, not when they
+are loaded. A plugin that inserts the current time into a page, for
+example, will insert the build time. Also, as a compiler, ikiwiki avoids
+rebuilding pages unless they have changed, so a plugin that prints some
+random or changing thing on a page will generate a static page that won't
+change until ikiwiki rebuilds the page for some other reason, like the page
+being edited. The [[tutorial]] has some other examples of ways that ikiwiki
+being a compiler may trip up the unwary.
+"""]]
+
 [[!toc levels=2]]
 
 ## Types of plugins
@@ -31,18 +45,6 @@ they're the same as far as how they hook into ikiwiki. This document will
 explain how to write both sorts of plugins, albeit with an emphasis on perl
 plugins.
 
-## Remember: Ikiwiki is a compiler
-
-One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
-*compiler*. So plugins influence pages when they are built, not when they
-are loaded. A plugin that inserts the current time into a page, for
-example, will insert the build time. Also, as a compiler, ikiwiki avoids
-rebuilding pages unless they have changed, so a plugin that prints some
-random or changing thing on a page will generate a static page that won't
-change until ikiwiki rebuilds the page for some other reason, like the page
-being edited. The [[tutorial]] has some other examples of ways that ikiwiki
-being a compiler may trip up the unwary.
-
 ## Plugin interface
 
 To import the ikiwiki plugin interface:
-- 
cgit v1.2.3


From 60410369daef9ce990d516f0d538571db4623ceb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 14:48:22 -0500
Subject: add variable value examples

---
 doc/plugins/write.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 07bfd72ac..f2b96b6d9 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -3,7 +3,7 @@ written to extend ikiwiki in many ways. Despite the length of this page,
 it's not really hard. This page is a complete reference to everything a
 plugin might want to do. There is also a quick [[tutorial]].
 
-[[!template type="note" text="""
+[[!template id="note" text="""
 Ikiwiki is a compiler
 
 One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
@@ -569,6 +569,8 @@ The `%links` hash can be used to look up the names of each page that
 a page links to. The name of the page is the key; the value is an array
 reference. Do not modify this hash directly; call `add_link()`.
 
+	$links{"foo"} = ["bar", "baz"];
+
 ### %destsources
 
 The `%destsources` hash records the name of the source file used to
@@ -576,6 +578,8 @@ create each destination file. The key is the output filename (ie,
 "foo/index.html"), and the value is the source filename that it was built
 from (eg, "foo.mdwn"). Note that a single source file may create multiple
 destination files. Do not modify this hash directly; call `will_render()`.
+	
+	$destsources{"foo/index.html"} = "foo.mdwn";
 
 ### %pagesources
 
@@ -583,6 +587,8 @@ The `%pagesources` has can be used to look up the source filename
 of a page. So the key is the page name, and the value is the source
 filename. Do not modify this hash.
 
+	$pagesources{"foo"} = "foo.mdwn";
+
 ## Library functions
 
 ### `hook(@)`
-- 
cgit v1.2.3


From 4a7558539cd9d0f1ed5c586c29811035f7c14d14 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 15:38:07 -0500
Subject: add highlevel view of when hooks are called during compile and cgi
 phases

---
 doc/plugins/write.mdwn | 97 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 78 insertions(+), 19 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index f2b96b6d9..d94216e17 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -9,16 +9,73 @@ Ikiwiki is a compiler
 One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
 *compiler*. So plugins influence pages when they are built, not when they
 are loaded. A plugin that inserts the current time into a page, for
-example, will insert the build time. Also, as a compiler, ikiwiki avoids
-rebuilding pages unless they have changed, so a plugin that prints some
-random or changing thing on a page will generate a static page that won't
-change until ikiwiki rebuilds the page for some other reason, like the page
-being edited. The [[tutorial]] has some other examples of ways that ikiwiki
-being a compiler may trip up the unwary.
+example, will insert the build time.
+
+Also, as a compiler, ikiwiki avoids rebuilding pages unless they have
+changed, so a plugin that prints some random or changing thing on a page
+will generate a static page that won't change until ikiwiki rebuilds the
+page for some other reason, like the page being edited.
+
+The [[tutorial]] has some other examples of ways that ikiwiki being a
+compiler may trip up the unwary.
 """]]
 
 [[!toc levels=2]]
 
+## Highlevel view of ikiwiki
+
+Ikiwiki mostly has two modes of operation. It can either be running
+as a compiler, building or updating a wiki; or as a cgi program, providing
+user interface for editing pages, etc. Almost everything ikiwiki does
+is accomplished by calling various hooks provided by plugins.
+
+### compiler
+
+As a compiler, starts by calling the `refresh` hook. Then it checks
+the wiki's source to find new or changed pages. The `needsbuild` hook is
+then called to allow manipulation of the list of pages that need to be
+built. 
+
+Now that it knows what pages it needs to build, ikiwiki runs two
+compile passes. First, it runs `scan` hooks, which collect metadata about
+the pages. Then it runs a page rendering pipeline, by calling in turn these
+hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`,
+`pagetemplate`, `sanitize`, `format`.
+
+After all necessary pages are built, it calls the `change` hook. Finally,
+if a page is was deleted, the `delete` hook is called, and the files that
+page had previously produced are removed.
+
+### cgi
+
+The flow between hooks when ikiwiki is run as a cgi is best illistrated by
+an example.
+
+* *Alice browses to a page and clicks Edit.*
+* Ikiwiki is run as a cgi. It assigns Alice a session cookie, and,
+  by calling the `auth` hooks, sees that she is not yet logged in.
+* The `sessioncgi` hooks are then called, and one of them,
+  from the [[editpage]] plugin, notices that the cgi has been told "do=edit".
+* The [[editpage]] plugin calls the `canedit` hook to check if this
+  page edit is allowed. The [[signinedit]] plugin has a hook that says not:
+  Alice is not signed in.
+* The [[signinedit]] plugin then launches the signin process. A signin
+  page is built by calling the `formbuilder_setup` hook.
+* *Alice signs in with her openid.*
+* The [[openid]] plugin's `formbuilder` hook sees that an openid was
+  entered in the signin form, and redirects to Alice's openid provider.
+* Alice's openid provider calls back to ikiwiki. The [[openid]] plugin
+  has an `auth` hook that finishes the openid signin process.
+* Signin complete, ikiwiki returns to what Alice was doing before; editing
+  a page.
+* Now all the `canedit` hooks are happy. The [[editpage]] plugin calls
+  `formbuilder_setup` to display the page editing form.
+* *Alice saves her change to the page.*
+* The [[editpage]] plugin's `formbuilder` hook sees that the Save button
+  was pressed, and calls the `checkcontent` and `editcontent` hooks.
+  Then it saves the page to disk, and branches into the compiler part
+  of ikiwiki to refresh the wiki.
+
 ## Types of plugins
 
 Most ikiwiki [[plugins]] are written in perl, like ikiwiki. This gives the
@@ -530,13 +587,13 @@ function of the ikiwiki wrapper when it is being generated.
 
 Several variables are exported to your plugin when you `use IkiWiki;`
 
-### %config
+### `%config`
 
 A plugin can access the wiki's configuration via the `%config`
 hash. The best way to understand the contents of the hash is to look at
 your ikiwiki setup file, which sets the hash content to configure the wiki.
 
-### %pagestate
+### `%pagestate`
 
 The `%pagestate` hash can be used by plugins to save state that they will need
 next time ikiwiki is run. The hash holds per-page state, so to set a value,
@@ -554,7 +611,7 @@ When pages are deleted, ikiwiki automatically deletes their pagestate too.
 Note that page state does not persist across wiki rebuilds, only across
 wiki updates.
 
-### %wikistate
+### `%wikistate`
 
 The `%wikistate` hash can be used by a plugin to store persistant state
 that is not bound to any one page. To set a value, use
@@ -563,7 +620,7 @@ serialize, `$key` is any string you like, and `$id` must be the same as the
 "id" parameter passed to `hook()` when registering the plugin, so that the
 state can be dropped if the plugin is no longer used.
 
-### %links
+### `%links`
 
 The `%links` hash can be used to look up the names of each page that
 a page links to. The name of the page is the key; the value is an array
@@ -571,7 +628,15 @@ reference. Do not modify this hash directly; call `add_link()`.
 
 	$links{"foo"} = ["bar", "baz"];
 
-### %destsources
+### `%pagesources`
+
+The `%pagesources` has can be used to look up the source filename
+of a page. So the key is the page name, and the value is the source
+filename. Do not modify this hash.
+
+	$pagesources{"foo"} = "foo.mdwn";
+
+### `%destsources`
 
 The `%destsources` hash records the name of the source file used to
 create each destination file. The key is the output filename (ie,
@@ -581,16 +646,10 @@ destination files. Do not modify this hash directly; call `will_render()`.
 	
 	$destsources{"foo/index.html"} = "foo.mdwn";
 
-### %pagesources
-
-The `%pagesources` has can be used to look up the source filename
-of a page. So the key is the page name, and the value is the source
-filename. Do not modify this hash.
-
-	$pagesources{"foo"} = "foo.mdwn";
-
 ## Library functions
 
+Several functions are exported to your plugin when you `use IkiWiki;`
+
 ### `hook(@)`
 
 Hook into ikiwiki's processing. See the discussion of hooks above.
-- 
cgit v1.2.3


From 7b07286a6f4a9903d5a346205b8eaaf93dbb9d0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 15:41:19 -0500
Subject: layout

---
 doc/plugins/write.mdwn | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index d94216e17..4fd9c4369 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -31,7 +31,7 @@ is accomplished by calling various hooks provided by plugins.
 
 ### compiler
 
-As a compiler, starts by calling the `refresh` hook. Then it checks
+As a compiler, ikiwiki starts by calling the `refresh` hook. Then it checks
 the wiki's source to find new or changed pages. The `needsbuild` hook is
 then called to allow manipulation of the list of pages that need to be
 built. 
@@ -48,10 +48,11 @@ page had previously produced are removed.
 
 ### cgi
 
-The flow between hooks when ikiwiki is run as a cgi is best illistrated by
+The flow between hooks when ikiwiki is run as a cgi is best illustrated by
 an example.
 
-* *Alice browses to a page and clicks Edit.*
+Alice browses to a page and clicks Edit.
+
 * Ikiwiki is run as a cgi. It assigns Alice a session cookie, and,
   by calling the `auth` hooks, sees that she is not yet logged in.
 * The `sessioncgi` hooks are then called, and one of them,
@@ -61,7 +62,9 @@ an example.
   Alice is not signed in.
 * The [[signinedit]] plugin then launches the signin process. A signin
   page is built by calling the `formbuilder_setup` hook.
-* *Alice signs in with her openid.*
+
+Alice signs in with her openid.
+
 * The [[openid]] plugin's `formbuilder` hook sees that an openid was
   entered in the signin form, and redirects to Alice's openid provider.
 * Alice's openid provider calls back to ikiwiki. The [[openid]] plugin
@@ -70,7 +73,9 @@ an example.
   a page.
 * Now all the `canedit` hooks are happy. The [[editpage]] plugin calls
   `formbuilder_setup` to display the page editing form.
-* *Alice saves her change to the page.*
+
+Alice saves her change to the page.
+
 * The [[editpage]] plugin's `formbuilder` hook sees that the Save button
   was pressed, and calls the `checkcontent` and `editcontent` hooks.
   Then it saves the page to disk, and branches into the compiler part
-- 
cgit v1.2.3


From f4c517110e1bc1ab9bf6e931073959cdcff1302b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 15:52:03 -0500
Subject: formatting

---
 doc/plugins/write.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 4fd9c4369..a8c9de2d3 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -536,7 +536,7 @@ The data returned is a list of `%config` options, followed by a hash
 describing the option. There can also be an item named "plugin", which
 describes the plugin as a whole. For example:
 
-                return
+		return
 			plugin => {
 				description => "description of this plugin",
 				safe => 1,
@@ -736,7 +736,7 @@ By default, dependencies are full content dependencies, meaning that the
 page will be updated whenever anything matching the PageSpec is modified.
 This can be overridden by passing a `deptype` value as the third parameter.
 
-#### `pagespec_match($$;@)`
+### `pagespec_match($$;@)`
 
 Passed a page name, and [[ikiwiki/PageSpec]], returns a true value if the
 [[ikiwiki/PageSpec]] matches the page.
@@ -766,7 +766,7 @@ dependency type from one or more of these keywords:
 
 If multiple types are specified, they are combined.
 
-#### `bestlink($$)`
+### `bestlink($$)`
 
 Given a page and the text of a link on the page, determine which
 existing page that link best points to. Prefers pages under a
@@ -774,7 +774,7 @@ subdirectory with the same name as the source page, failing that
 goes down the directory tree to the base looking for matching
 pages, as described in [[ikiwiki/SubPage/LinkingRules]].
 
-#### `htmllink($$$;@)`
+### `htmllink($$$;@)`
 
 Many plugins need to generate html links and add them to a page. This is
 done by using the `htmllink` function. The usual way to call
-- 
cgit v1.2.3


From 0b9b3f3e0a10a9617d6f83bcff63136f20072453 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 17:07:54 -0500
Subject: releasing version 3.20100212

---
 debian/changelog |   4 +-
 debian/control   |   2 +-
 ikiwiki.spec     |   2 +-
 po/bg.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/cs.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/da.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/de.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/es.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/fr.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/gu.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/ikiwiki.pot   | 344 ++++++++++++++++++++++++++++---------------------------
 po/it.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/pl.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/sv.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/tr.po         | 344 ++++++++++++++++++++++++++++---------------------------
 po/vi.po         | 344 ++++++++++++++++++++++++++++---------------------------
 16 files changed, 2305 insertions(+), 2175 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f24a453c8..c91feae0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100123) UNRELEASED; urgency=low
+ikiwiki (3.20100212) unstable; urgency=low
 
   * template: Preprocess parameters before htmlizing.
   * img: Fix a bug that could taint @links with undef values.
@@ -25,7 +25,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * Group related plugins into sections in the setup file, and drop
     unused rcs plugins from the setup file.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
+ -- Joey Hess <joeyh@debian.org>  Fri, 12 Feb 2010 16:45:50 -0500
 
 ikiwiki (3.20100122) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 172e1b23d..b20f4db55 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libfile-chdir-perl
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
 Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 044c7c033..865c9a325 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100122
+Version: 3.20100212
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index 810a16e95..a211b7685 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Грешка"
 
@@ -146,35 +146,35 @@ msgstr "готово"
 msgid "Must specify %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 #, fuzzy
 msgid "Failed to create S3 bucket: "
 msgstr "Грешка при изпращане на поща"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 #, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "Грешка при изпращане на поща"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 #, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr ""
 
@@ -182,7 +182,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -197,12 +197,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Няма „счупени” връзки!"
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr ""
 
@@ -210,7 +210,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -262,133 +262,133 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, fuzzy, perl-format
 msgid "removing old preview %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 #, fuzzy
 msgid "template not specified"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 #, fuzzy
 msgid "match not specified"
 msgstr "не е указан файл на обвивката"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 #, fuzzy
 msgid "failed to process"
 msgstr "грешка при обработване на шаблона"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "грешшка в приставката „fortune”"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 #, fuzzy
 msgid "missing page"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 #, fuzzy
 msgid "not a page"
 msgstr "грешка при четене на „%s”: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "При използване на приеставката „search” е необходимо е да се укаже %s"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 #, fuzzy
 msgid "failed to run graphviz"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -398,116 +398,116 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "няма разпознати усмивки; изключване на приставката „smiley”"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "не е инсталиран polygen"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 "Когато се използва „--rss” или „--atom” трябва да се укаже и "
 "местоположението на уикито посредством параметъра „--url”"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 #, fuzzy
 msgid "page editing not allowed"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 #, fuzzy
 msgid "missing pages parameter"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 #, fuzzy
 msgid "failed to run dot"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
 "Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/"
 "markdown” (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 #, fuzzy
 msgid "redir page not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Огледала"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Огледало"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 msgid "comment needs moderation"
 msgstr ""
 
@@ -515,19 +515,19 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "функцията „getctime” не е реализирана"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Получаване на OpenID номер"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Всички страници имат връзки от други страници."
@@ -536,31 +536,39 @@ msgstr "Всички страници имат връзки от други ст
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Акаунтът е създаден. Можете да влезете."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Грешка при създаване на акаунта."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Грешка при изпращане на поща"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr ""
 
@@ -591,119 +599,119 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "гласуване"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Общо гласове:"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "не е инсталиран polygen"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 #, fuzzy
 msgid "command failed"
 msgstr "грешшка в приставката „fortune”"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr ""
 
@@ -771,12 +779,12 @@ msgstr ""
 msgid "at noon on %A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -784,83 +792,83 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, fuzzy, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr ""
 "Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 #, fuzzy
 msgid "no change to the file name was specified"
 msgstr "не е указан файл на обвивката"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "обновяване на страницата „%s”"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”"
@@ -875,21 +883,21 @@ msgstr "грешка при запис на файла „%s”: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "препратката няма указани параметрите „name” или „url”"
@@ -897,7 +905,7 @@ msgstr "препратката няма указани параметрите 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "препратката „%s” сочи към „%s”"
@@ -907,121 +915,123 @@ msgstr "препратката „%s” сочи към „%s”"
 msgid "failed to parse any smileys"
 msgstr "няма разпознати усмивки; изключване на приставката „smiley”"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 #, fuzzy
 msgid "parse error"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 #, fuzzy
 msgid "invalid height value"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 #, fuzzy
 msgid "missing width parameter"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 #, fuzzy
 msgid "invalid width value"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 #, fuzzy
 msgid "failed to run php"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, fuzzy, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 #, fuzzy
 msgid "missing id parameter"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 #, fuzzy
 msgid "failed to process:"
 msgstr "грешка при обработване на шаблона"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, perl-format
+msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
 #, perl-format
-msgid "enable %s?"
+msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:244
-msgid "setup file for this wiki is not known"
+#: ../IkiWiki/Plugin/websetup.pm:121
+#, perl-format
+msgid "enable %s?"
 msgstr ""
 
 #: ../IkiWiki/Plugin/websetup.pm:260
-msgid "main"
+msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
+#: ../IkiWiki/Plugin/websetup.pm:276
+msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1095,20 +1105,20 @@ msgstr "ikiwiki: неуспех при обновяване на страниц
 msgid "cannot read %s: %s"
 msgstr "грешка при четене на „%s”: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1181,25 +1191,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
diff --git a/po/cs.po b/po/cs.po
index 399111069..d3cf3f5b9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -55,7 +55,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Chyba"
 
@@ -145,32 +145,32 @@ msgstr "hotovo"
 msgid "Must specify %s"
 msgstr "Musíte zadat %s"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 msgid "Failed to create S3 bucket: "
 msgstr "Nepodařilo se vytvořit S3 bucket:"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 msgid "Failed to save file to S3: "
 msgstr "Nepodařilo se uložit soubor na S3:"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 msgid "Failed to delete file from S3: "
 msgstr "Nelze smazat soubor z S3:"
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "stránka nazvaná %s již existuje"
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr "zakázáno proměnnou allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr "chybné jméno souboru s přílohou"
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr "příloha nahrána"
 
@@ -178,7 +178,7 @@ msgstr "příloha nahrána"
 msgid "automatic index generation"
 msgstr "automatické vytváření indexu"
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -195,12 +195,12 @@ msgstr "%s z %s"
 msgid "There are no broken links!"
 msgstr "Žádné porušené odkazy!"
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nepodporovaný formát stránky %s"
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr "komentář musí mít obsah"
 
@@ -208,7 +208,7 @@ msgstr "komentář musí mít obsah"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "chybný název stránky"
 
@@ -244,7 +244,7 @@ msgstr "Přidán komentář"
 msgid "Added a comment: %s"
 msgstr "Přidán komentář: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr "nejste přihlášeni jako správce"
 
@@ -260,127 +260,127 @@ msgstr "schvalování komentářů"
 msgid "Comments"
 msgstr "Komentáře"
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr "parametr %s je povinný"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr "na této stránce nebyl zkopírován žádný text"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr "na této stránce nebyl zkopírován žádný text s id %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, perl-format
 msgid "removing old preview %s"
 msgstr "odstraňuji starý náhled %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 msgid "template not specified"
 msgstr "nebyl zadán parametr template"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 msgid "match not specified"
 msgstr "nebyl zadán parametr match"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s byla zaregistrována pro %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 msgid "failed to process"
 msgstr "nepodařilo se zpracovat"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr "musíte zadat formát a text"
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "fortune selhal"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 msgid "missing page"
 msgstr "chybějící stránka"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Stránka %s neexistuje."
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 msgid "not a page"
 msgstr "není stránkou"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s není ani příloha, ani stránka."
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "nejste oprávněni měnit %s"
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "%s musíte zadat při každém použití modulu %s"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 msgid "failed to run graphviz"
 msgstr "nepodařilo se spustit graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr "program není platným programem graphviz"
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr "tohighlight obsahuje neznámý typ souboru „%s“"
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr "Zdrojový kód: %s"
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj"
@@ -389,105 +389,105 @@ msgstr "varování: perlový modul highlight není dostupný; pokračuji bez ně
 msgid "htmltidy failed to parse this html"
 msgstr "htmltidy se nepodařilo zpracovat toto html"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick není nainstalován"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "nelze číst %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "chybné rozměry „%s“ (formát má být ŠxV)"
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "nelze určit velikost obrázku %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 msgid "page editing not allowed"
 msgstr "úprava stránky není povolena"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
 msgstr "chybí parametr pages"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr "parametry %s a %s nelze použít zároveň"
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr "Přidat nový příspěvek nazvaný:"
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "neexistující šablona %s"
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 msgid "failed to run dot"
 msgstr "nepodařilo se spustit dot"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "Stránka %s je zamknutá a nelze ji měnit"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr "je povolen multimarkdown, ale Text::MultiMarkdown není nainstalován"
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr "styl nebyl nalezen"
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 msgid "redir page not found"
 msgstr "stránka, na kterou vede přesměrování, nebyla nalezena"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 msgid "redir cycle is not allowed"
 msgstr "cykly nejsou v přesměrování povoleny"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Zrcadla"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Zrcadlo"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "schvalování komentářů"
@@ -496,19 +496,19 @@ msgstr "schvalování komentářů"
 msgid "more"
 msgstr "více"
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "getctime není implementováno"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Přihlásit pomocí"
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Získat OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
 msgstr "Na každou stránku vede odkaz z jiné stránky."
 
@@ -516,31 +516,39 @@ msgstr "Na každou stránku vede odkaz z jiné stránky."
 msgid "bad or missing template"
 msgstr "chybná nebo chybějící šablona"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Vytvoření účtu bylo úspěšné. Nyní se můžete přihlásit."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Chyba při vytváření účtu."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr "Bez e-mailové adresy nelze zaslat postup na resetování hesla."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Nepodařilo se odeslat email."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr "Postup na resetování hesla vám byl odeslán na e-mail."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr "chybné URL pro resetování hesla"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr "resetování hesla bylo zamítnuto"
 
@@ -570,40 +578,40 @@ msgstr "LWP nebyl nalezen, nepinkám"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není platným kódem jazyka"
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "sestavuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "aktualizovány PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -611,7 +619,7 @@ msgstr ""
 "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
 "budou odstraněny také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -619,76 +627,76 @@ msgstr ""
 "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
 "budou přejmenovány také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT soubor (%s) neexistuje"
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nepodařilo se zkopírovat PO soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "nepodařilo se aktualizovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nepodařilo se zkopírovat POT soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "nepodařilo se přeložit %s"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "odstraněny zastaralé PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, perl-format
 msgid "failed to write %s"
 msgstr "nepodařilo se zapsat %s"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 msgid "failed to translate"
 msgstr "překlad se nezdařil"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
 "stránku"
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "hlasovat"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Celkem hlasů:"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "polygen není nainstalován"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 msgid "command failed"
 msgstr "příkaz selhal"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr "chybí vzorec"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr "neznámý vzorec"
 
@@ -756,12 +764,12 @@ msgstr "o půlnoci"
 msgid "at noon on %A"
 msgstr "%A o poledni"
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr "neplatná procentuální hodnota %s"
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`"
 
@@ -769,81 +777,81 @@ msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`"
 msgid "(Diff truncated)"
 msgstr "(Diff oříznut)"
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s neexistuje"
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s není ve zdrojovém adresáři a proto nelze smazat"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr "%s není souborem"
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "potvrďte odstranění %s"
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr "Vyberte prosím přílohy, které se mají odstranit."
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr "odstraněno"
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr "%s není ve zdrojovém adresáři a proto nelze přejmenovat"
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 msgid "no change to the file name was specified"
 msgstr "jméno souboru nebylo změněno"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr "neplatné jméno"
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr "%s již existuje"
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s již na disku existuje"
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr "přejmenování %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr "Také přejmenovat podstránky a přílohy"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr "Najednou lze přejmenovat pouze jednu přílohu."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr "Vyberte přílohu, kterou chcete přejmenovat."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr "přejmenování %s na %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizace pro přejmenování %s na %s"
@@ -858,28 +866,28 @@ msgstr "nepodařilo se přečíst %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "pro indexování %s je potřeba Digest::SHA1"
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr "hledání"
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr "Modul shortcut nebude pracovat bez %s"
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr "chybí parametr jméno nebo url"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "zkratka %s odkazuje na <i>%s</i>"
@@ -888,107 +896,109 @@ msgstr "zkratka %s odkazuje na <i>%s</i>"
 msgid "failed to parse any smileys"
 msgstr "nepodařilo se rozpoznat žádné smajlíky"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr "chyba syntaktického rozboru"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr "chybný průměr zvýrazněného bodu"
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr "chybné umístění zvýrazněného bodu"
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr "chybí hodnoty"
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 msgid "invalid height value"
 msgstr "chybná výška"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr "chybí parametr šířka (width)"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 msgid "invalid width value"
 msgstr "chybná šířka"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr "nepodařilo se spustit php"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr "nemohu najít soubor"
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr "neznámý formát dat"
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr "prázdná data"
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr "Stáhnout zdrojová data"
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "zpracovávání selhalo na řádku %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr "chybí parametr id"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "šablona %s nebyla nalezena"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 msgid "failed to process:"
 msgstr "nepodařilo se zpracovat:"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr "chybí TeXový kód"
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 msgid "failed to generate image from code"
 msgstr "z kódu se nepodařilo vygenerovat obrázek"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, fuzzy, perl-format
+msgid "%s plugin:"
 msgstr "modul"
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
+#, fuzzy, perl-format
+msgid "%s plugins"
+msgstr "moduly"
+
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "enable %s?"
 msgstr "povolit %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:244
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "setup file for this wiki is not known"
 msgstr "konfigurační soubor této wiki je neznámý"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "main"
 msgstr "hlavní"
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
-msgstr "moduly"
-
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -996,7 +1006,7 @@ msgstr ""
 "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset "
 "znovusestavit wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1074,20 +1084,20 @@ msgstr "ikiwiki: nelze sestavit %s"
 msgid "cannot read %s: %s"
 msgstr "nemohu číst %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)"
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nepodporovaný systém pro správu verzí: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:"
@@ -1158,25 +1168,25 @@ msgstr "nelze použít několik rcs modulů"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
diff --git a/po/da.po b/po/da.po
index 4bff9254c..b30730aa4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Fejl"
 
@@ -149,35 +149,35 @@ msgstr "færdig"
 msgid "Must specify %s"
 msgstr "Skal angive %s"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 #, fuzzy
 msgid "Failed to create S3 bucket: "
 msgstr "Oprettelse af bundt i S3 mislykkedes: "
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 #, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "Arkivering af fil i S3 mislykkedes: "
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 #, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "Sletning af fil fra S3 mislykkedes: "
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "der er allerede en side ved navn %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr "forhindret af allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr "dårligt vedhæftningsfilnavn"
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr "vedhæftningsoplægning"
 
@@ -185,7 +185,7 @@ msgstr "vedhæftningsoplægning"
 msgid "automatic index generation"
 msgstr "automatisk indeks-dannelse"
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -202,12 +202,12 @@ msgstr "%s fra %s"
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Ikke-understøttet sideformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr "kommentar skal have indhold"
 
@@ -215,7 +215,7 @@ msgstr "kommentar skal have indhold"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "dårligt sidenavn"
 
@@ -251,7 +251,7 @@ msgstr "Tilføjede en kommentar"
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr "du er ikke logget på som en administrator"
 
@@ -267,128 +267,128 @@ msgstr "kommentarkoderering"
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr "parametren %s er krævet"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr "ingen tekst blev kopieret i denne side"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr "ingen tekst blev kopieret i denne side med id %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, perl-format
 msgid "removing old preview %s"
 msgstr "fjerner gammelt smugkig %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "redigerer %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 msgid "template not specified"
 msgstr "skabelon %s ikke angivet"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 msgid "match not specified"
 msgstr "sammenligning ikke angivet"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "redigeringsskabelon %s registreret for %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 msgid "failed to process"
 msgstr "dannelsen mislykkedes"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr "skal angive format og tekst"
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 msgid "missing page"
 msgstr "manglende side"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Siden %s eksisterer ikke."
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 #, fuzzy
 msgid "not a page"
 msgstr "kan ikke få sider til at passe sammen: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Du har ikke lov til at ændre %s"
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "du kan ikke påvirke en fil med modus %s"
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Skal angive %s når udvidelsen %s bruges"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 msgid "failed to run graphviz"
 msgstr "graphviz-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr "prog er ikke et gyldigt graphviz-program"
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr "tohighlight indeholder ukendt filtype '%s'"
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr "Kildekode: %s"
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -400,107 +400,107 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "afkodning af smileys mislykkedes"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ikke installeret"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "læsning af %s mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "forkert størrelsesformat \"%s\" (burde være WxH)"
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Ændring af størrelse mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Vurdering af billedstørrelse mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "Skal angive url til wiki med --url når --rss eller --atom anvendes"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 msgid "page editing not allowed"
 msgstr "sideredigering er ikke tilladt"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
 msgstr "mangler pages-parametren"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr "Tilføj nyt indlæg med følgende titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "ikke-eksisterende skabelon: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 msgid "failed to run dot"
 msgstr "dot-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s er låst og kan ikke redigeres"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret"
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) "
 "mislykkedes"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr "stilsnit (stylesheet) ikke fundet"
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 msgid "redir page not found"
 msgstr "henvisningsside ikke fundet"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 msgid "redir cycle is not allowed"
 msgstr "ring af henvisninger er ikke tilladt"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Spejle"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Spejl"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "kommentarkoderering"
@@ -509,19 +509,19 @@ msgstr "kommentarkoderering"
 msgid "more"
 msgstr "mere"
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "getctime ikke implementeret"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Log på med"
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Skaf en OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
 msgstr "Alle sider har henvisninger fra andre sider."
 
@@ -529,32 +529,40 @@ msgstr "Alle sider har henvisninger fra andre sider."
 msgid "bad or missing template"
 msgstr "dårlig eller manglende skabelon"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Konto korrekt oprettet. Nu kan du logge på."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Fejl ved kontooprettelse."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Afsendelse af mail mislykkedes"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr "Du har fået tilsendt adgangskodenulstillingsinstruktioner."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr "Ukorrekt adgangskodenumstillings-URL"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr "adgangskodenulstilling afvist"
 
@@ -584,12 +592,12 @@ msgstr "LWP ikke fundet, pinger ikke"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -597,7 +605,7 @@ msgstr ""
 "%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -605,21 +613,21 @@ msgstr ""
 "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -627,7 +635,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -635,75 +643,75 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "stem"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Samlede stemmer:"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "polygen ikke installeret"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 msgid "command failed"
 msgstr "kommando fejlede"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr "manglende formular"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr "ukendt formular"
 
@@ -771,12 +779,12 @@ msgstr "ved midnat"
 msgid "at noon on %A"
 msgstr "midt på dagen %A"
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr "ugyldig procentværdi %s"
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`"
 
@@ -784,81 +792,81 @@ msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`"
 msgid "(Diff truncated)"
 msgstr "(Diff trunkeret)"
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s er ikke i srcdir, så kan ikke blive slettet"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr "%s er ikke en fil"
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "bekræft at %s bliver fjernet"
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr "Vælg vedhæftning der skal slettes."
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr "fjernet"
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr "%s er ikke i srcdir, så kan ikke blive omdøbt"
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 msgid "no change to the file name was specified"
 msgstr "ingen ændring til filnavnet blev angivet"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr "ugyldigt navn"
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr "%s eksisterer allerede"
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s eksisterer allerede på disken"
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr "omdøb %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr "Omdøb også UnderSider og vedhæftninger"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr "Kun en vedhæftning kan blive omdøbt ad gangen."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr "Vælg vedhæftningen som skal omdøbes."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr "omdøb %s til %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "opdatering til omdøbning af %s til %s"
@@ -873,28 +881,28 @@ msgstr "læsning af %s mislykkedes"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "behøver Digest::SHA1 til indeks %s"
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr "søg"
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr "genvejsudvidelsen vil ikke fungere uden %s"
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr "manglende navn eller url parameter"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "genvej %s viser til <i>%s</i>"
@@ -903,109 +911,111 @@ msgstr "genvej %s viser til <i>%s</i>"
 msgid "failed to parse any smileys"
 msgstr "afkodning af smileys mislykkedes"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr "afkodningsfejl"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr "forkert featurepoint-parameter diameter"
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr "forkert featurepoint-parameter location"
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr "manglende værdier"
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 msgid "invalid height value"
 msgstr "forkert højdeværdi"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr "manglende breddeparameter"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 msgid "invalid width value"
 msgstr "forkert breddeværdi"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr "php-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr "kan ikke finde fil"
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr "ukendt dataformat"
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr "blanke data"
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr "Direkte datanedlastning"
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "afkodningsfejl på linje %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr "manglende id-parameter"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "skabelon %s ikke fundet"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 msgid "failed to process:"
 msgstr "dannelsen mislykkedes:"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr "manglende tex-kode"
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 msgid "failed to generate image from code"
 msgstr "billedopbygning fra kode mislykkedes"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, fuzzy, perl-format
+msgid "%s plugin:"
 msgstr "udvidelse"
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
+#, fuzzy, perl-format
+msgid "%s plugins"
+msgstr "udvidelser"
+
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "enable %s?"
 msgstr "aktivér %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:244
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "setup file for this wiki is not known"
 msgstr "opsætningsfilen for denne wiki er ukendt"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "main"
 msgstr "primær"
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
-msgstr "udvidelser"
-
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i "
 "kraft."
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1013,7 +1023,7 @@ msgstr ""
 "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du "
 "muligvis genopbygge wikien."
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
@@ -1089,20 +1099,20 @@ msgstr "ikiwiki: kan ikke danne %s"
 msgid "cannot read %s: %s"
 msgstr "kan ikke læse %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)"
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "revisionskontrolsystem %s ikke understøttet"
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes"
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:"
@@ -1174,25 +1184,25 @@ msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally krævet for title_natural sortering"
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
diff --git a/po/de.po b/po/de.po
index 53d0db850..b024e3be7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Fehler"
 
@@ -146,35 +146,35 @@ msgstr "fertig"
 msgid "Must specify %s"
 msgstr "%s muss angegeben werden"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 #, fuzzy
 msgid "Failed to create S3 bucket: "
 msgstr "Konnte Behälter (bucket) in S3 nicht anlegen: "
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 #, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "Konnte die Datei nicht in S3 speichern: "
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 #, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "Konnte die Datei nicht in S3 löschen: "
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "eine Seite mit dem Namen %s existiert bereits"
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr "durch allowed_attachements verboten"
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr "fehlerhafter Dateiname für Anhang"
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr "Anhang hochladen"
 
@@ -182,7 +182,7 @@ msgstr "Anhang hochladen"
 msgid "automatic index generation"
 msgstr "automatische Index-Erstellung"
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -199,12 +199,12 @@ msgstr "%s von %s"
 msgid "There are no broken links!"
 msgstr "Es gibt keine ungültigen Verweise!"
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nicht unterstütztes Seitenformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr "ein Kommentar sollte Inhalt haben"
 
@@ -212,7 +212,7 @@ msgstr "ein Kommentar sollte Inhalt haben"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "fehlerhafter Seitenname"
 
@@ -249,7 +249,7 @@ msgstr "Kommentar hinzugefügt"
 msgid "Added a comment: %s"
 msgstr "Kommentar hinzugefügt: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr "Sie sind nicht als Administrator angemeldet"
 
@@ -265,128 +265,128 @@ msgstr "Kommentar-Moderation"
 msgid "Comments"
 msgstr "Kommentare"
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr "der Parameter %s wird benötigt"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr "es wurde kein Text in diese Seite kopiert"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr "es wurde kein Text in diese Seite mit der id %s kopiert"
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, perl-format
 msgid "removing old preview %s"
 msgstr "entferne alte Vorschau %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "erstelle %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "bearbeite %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 msgid "template not specified"
 msgstr "Vorlage nicht angegeben"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 msgid "match not specified"
 msgstr "Übereinstimmung nicht angegeben"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s für %s registriert"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 msgid "failed to process"
 msgstr "Ablauf fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr "Format und Text müssen spezifiziert werden"
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "fortune fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 msgid "missing page"
 msgstr "fehlende Seite"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Die Seite %s existiert nicht."
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 #, fuzzy
 msgid "not a page"
 msgstr "Kann die Seiten nicht zuordnen: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Sie dürfen %s nicht verändern"
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 msgid "failed to run graphviz"
 msgstr "graphviz konnte nicht ausgeführt werden"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr "prog ist kein gültiges graphviz-Programm"
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr "tohighlight enteilt unbekannten Dateityp '%s'"
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr "Quellcode: %s"
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -398,110 +398,110 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "Smileys konnten nicht ausgewertet werden"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ist nicht installiert"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "Lesen von %s fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "falsches Format in \"%s\" für size (sollte BxH sein)"
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Größenänderung fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Größe des Bildes %s konnte nicht festgestellt werden."
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 "Die URL zum Wiki muss mit --url angegeben werden, wenn --rss oder --atom "
 "genutzt wird"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 msgid "page editing not allowed"
 msgstr "bearbeiten der Seiten nicht erlaubt"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
 msgstr "fehlender Seitenparameter"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "nicht-vorhandene Vorlage %s"
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 msgid "failed to run dot"
 msgstr "dot konnte nicht ausgeführt werden"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s ist gesperrt und kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 "multimarkdown ist eingeschaltet, aber Text::MultiMarkdown ist nicht "
 "installiert"
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) "
 "fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr "Stylesheet nicht gefunden"
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 msgid "redir page not found"
 msgstr "Umleitungsseite nicht gefunden"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 msgid "redir cycle is not allowed"
 msgstr "Zyklische Umleitungen sind nicht erlaubt"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Spiegel"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Spiegel"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "Kommentar-Moderation"
@@ -510,19 +510,19 @@ msgstr "Kommentar-Moderation"
 msgid "more"
 msgstr "mehr"
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "getctime ist nicht implementiert"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Anmelden mit"
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Eine OpenID anfordern"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite."
@@ -531,33 +531,41 @@ msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite."
 msgid "bad or missing template"
 msgstr "fehlerhafte oder fehlende Vorlage"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Kontoerstellung erfolgreich. Sie können sich jetzt anmelden."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Konto konnte nicht erstellt werden."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "es gibt keine E-Mail Adresse, deshalb kann keine Anweisung zum Zurücksetzen "
 "des Passwortes zugeschickt werden."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Es konnte keine E-Mail versandt werden"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr "Ihnen wurden Anweisungen zum Zurücksetzen des Passworts zugesandt."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr "fehlerhafte URL zum Zurücksetzen des Passworts"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr "zurücksetzen des Passworts abgelehnt"
 
@@ -587,12 +595,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist keine gültige Sprachkodierung"
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -600,7 +608,7 @@ msgstr ""
 "%s ist kein gültiger Wert für po_link_to, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -608,21 +616,21 @@ msgstr ""
 "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -630,7 +638,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -638,76 +646,76 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
 "arbeiten"
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "abstimmen"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Alle Stimmen:"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "polygen ist nicht installiert"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 msgid "command failed"
 msgstr "Befehl fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr "fehlende Formel"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr "unbekannte Formel"
 
@@ -775,12 +783,12 @@ msgstr "um Mitternacht"
 msgid "at noon on %A"
 msgstr "am Nachmittag des %A"
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr "unzulässiger Prozentwert %s"
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 "es werden entweder `percent` oder `totalpages` und `donepages` Parameter "
@@ -790,81 +798,81 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr "(Diff wurde gekürzt)"
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s existiert nicht"
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s ist nicht im srcdir und kann deshalb nicht gelöscht werden"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr "%s ist keine Datei"
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "bestätigen Sie die Entfernung von %s"
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus."
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr "entfernt"
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr "%s ist nicht im srcdir und kann deshalb nicht umbenannt werden"
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 msgid "no change to the file name was specified"
 msgstr "es wurde keine Änderung des Dateinamens angegeben"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr "unzulässiger Name"
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr "%s existiert bereits"
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s existiert bereits auf der Festplatte"
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr "benenne %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr "benenne %s in %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualisiert zum Umbenennen von %s nach %s"
@@ -879,28 +887,28 @@ msgstr "lesen von %s fehlgeschlagen"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen"
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr "suchen"
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr "die shortcut Erweiterung wird ohne %s nicht funktionieren"
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr "fehlender Name oder URL-Parameter"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "Tastenkürzel %s verweist nach <i>%s</i>"
@@ -909,109 +917,111 @@ msgstr "Tastenkürzel %s verweist nach <i>%s</i>"
 msgid "failed to parse any smileys"
 msgstr "Smileys konnten nicht ausgewertet werden"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr "Auswertungsfehler"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr "ungültiger featurepoint diameter"
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr "ungültige featurepoint location"
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr "fehlende Werte"
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 msgid "invalid height value"
 msgstr "ungültige Wert für height"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr "fehlender Parameter für width"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 msgid "invalid width value"
 msgstr "ungültige Wert für width"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr "konnte PHP nicht ausführen"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr "konnte Datei nicht finden"
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr "unbekanntes Datenformat"
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr "keine Daten"
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr "Direkter Daten-Download"
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "Auswertungsfehler in Zeile %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr "fehlender Parameter id"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "Vorlage %s nicht gefunden"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 msgid "failed to process:"
 msgstr "Fehler beim Ablauf:"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr "fehlender TeX-Code"
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 msgid "failed to generate image from code"
 msgstr "konnte kein Bild aus dem Code erzeugen"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, fuzzy, perl-format
+msgid "%s plugin:"
 msgstr "Erweiterung"
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
+#, fuzzy, perl-format
+msgid "%s plugins"
+msgstr "Erweiterungen"
+
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "enable %s?"
 msgstr "%s aktivieren?"
 
-#: ../IkiWiki/Plugin/websetup.pm:244
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "setup file for this wiki is not known"
 msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "main"
 msgstr "Hauptseite"
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
-msgstr "Erweiterungen"
-
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des "
 "Wikis, um wirksam zu werden."
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1019,7 +1029,7 @@ msgstr ""
 "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam "
 "werden, kann es notwendig sein, das Wikis neu zu bauen."
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1098,21 +1108,21 @@ msgstr "ikiwiki: kann %s nicht erzeugen"
 msgid "cannot read %s: %s"
 msgstr "kann %s nicht lesen: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)"
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nicht unterstütztes Versionskontrollsystem %s"
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen"
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1188,25 +1198,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally wird benötigt für title_natural sort"
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
diff --git a/po/es.po b/po/es.po
index de85edbdf..2923ac199 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Error"
 
@@ -151,35 +151,35 @@ msgstr "completado"
 msgid "Must specify %s"
 msgstr "Debe especificar %s"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 #, fuzzy
 msgid "Failed to create S3 bucket: "
 msgstr "Creación de directorio en S3 fallida: "
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 #, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "No puedo guardar el archivo en S3: "
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 #, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "No puedo borrar archivo en S3: "
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "ya existe una página de nombre %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr "prohibido por la claúsula allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr "nombre de archivo adjunto erróneo"
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr "enviado el adjunto"
 
@@ -187,7 +187,7 @@ msgstr "enviado el adjunto"
 msgid "automatic index generation"
 msgstr "creación de índice automática"
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -204,12 +204,12 @@ msgstr "%s desde la página %s"
 msgid "There are no broken links!"
 msgstr "¡ No hay enlaces rotos !"
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato de página %s no soportado"
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr "Un comentario debe tener algún contenido"
 
@@ -217,7 +217,7 @@ msgstr "Un comentario debe tener algún contenido"
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nombre de página erróneo"
 
@@ -253,7 +253,7 @@ msgstr "Añadir un comentario"
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr "No está registrado como un administrador"
 
@@ -269,128 +269,128 @@ msgstr "aprobación de comentarios"
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr "el parámetro %s es obligatorio"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr "no se ha copiado ningún texto en esta página"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina"
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, perl-format
 msgid "removing old preview %s"
 msgstr "eliminando la antigua previsualización %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 msgid "template not specified"
 msgstr "falta indicar la plantilla (template)"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 msgid "match not specified"
 msgstr "falta indicar la coincidencia de páginas (match)"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "plantilla de edición %s registrada para %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 msgid "failed to process"
 msgstr "fallo en el proceso"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr "se deben especificar tanto el formato como el texto"
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 msgid "missing page"
 msgstr "página no encontrada"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 #, fuzzy
 msgid "not a page"
 msgstr "no encuentro páginas coincidentes: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No puede cambiar %s"
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "no puede actuar sobre un archivo con permisos %s"
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 msgid "failed to run graphviz"
 msgstr "no he podido ejecutar el programa graphviz "
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr "prog no es un programa graphviz válido "
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' "
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr "Código fuente: %s"
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -402,109 +402,109 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "Algunos emoticonos tienen errores"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
 msgstr "El complemento Image::Magick no ha sido instalado"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "no puedo leer de %s: %s "
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "no he podido determinar el tamaño de la imagen %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 "Es obligatorio indicar un url al wiki cuando se usan los parámetros --rss ó "
 "--atom"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 msgid "page editing not allowed"
 msgstr "no está permitida la modificación de páginas"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
 msgstr "falta el parámetro pages"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr "Añadir una entrada nueva titulada:"
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "la plantilla %s no existe "
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 msgid "failed to run dot"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "La página %s está bloqueada y no puede modificarse"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar "
 "el programa /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr "hoja de estilo no encontrada "
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 msgid "redir page not found"
 msgstr "falta la página a donde redirigir"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 msgid "redir cycle is not allowed"
 msgstr "ciclo de redirección no permitido"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Réplicas"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Réplica"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "aprobación de comentarios"
@@ -513,19 +513,19 @@ msgstr "aprobación de comentarios"
 msgid "more"
 msgstr "ver más"
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "la funcionalidad getctime no está incluida"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Identificarse mediante "
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Consiga un identificador OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Todas las páginas están referenciadas entre sí."
@@ -534,35 +534,43 @@ msgstr "Todas las páginas están referenciadas entre sí."
 msgid "bad or missing template"
 msgstr "plantilla errónea ó no existente"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Cuenta de usuario creada con éxito. Ahora puede identificarse."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Error creando la cuenta de usuario."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "No tengo dirección de correo electrónica, así que no puedo enviar "
 "instrucciones para reiniciar la contraseña"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "No he podido enviar el mensaje de correo electrónico"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Las instrucciones para reiniciar la contraseña se le han enviado por correo "
 "electrónico"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr "el url para reiniciar la contraseña es incorrecto"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr "reinicio de contraseña denegado"
 
@@ -592,118 +600,118 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "Votar"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Recuento de votos:"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "El complemento polygen no ha sido instalado"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 msgid "command failed"
 msgstr "la ejecución del programa ha fallado"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr "falta la fórmula"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr "fórmula desconocida "
 
@@ -771,12 +779,12 @@ msgstr "a medianoche"
 msgid "at noon on %A"
 msgstr "el %A a media tarde"
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr "%s es un valor erróneo para un porcentaje"
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'"
 
@@ -784,81 +792,81 @@ msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'"
 msgid "(Diff truncated)"
 msgstr "(Lista de diferencias truncada)"
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s no está en el directorio fuente por lo que no puede ser borrada"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "confirme el borrado de %s"
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr "Por favor seleccione los adjuntos que serán borrados."
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr "borrado"
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr "%s no está en el directorio fuente por lo que no puede ser renombrado"
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 msgid "no change to the file name was specified"
 msgstr "no se ha indicado cambio alguno en el nombre del archivo"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr "nombre no válido"
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr "%s ya existe"
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s ya existe en el disco"
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr "cambiando de nombre %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr "También cambia de nombre las subpáginas y los adjuntos"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr "Únicamente un adjunto puede ser renombrado a la vez."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr "Por favor, seleccione el adjunto al que cambiar el nombre."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr "%s cambia de nombre a %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "actualizado el cambio de nombre de %s a %s"
@@ -873,28 +881,28 @@ msgstr "no puedo leer de %s: %s "
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "se necesita la instalación de Digest::SHA1 para indexar %s"
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr "buscar"
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr "el complemento shortcut no funcionará si no existe la página %s"
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr "shortcut necesita el parámetro 'name' ó el parámetro 'url'"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "El atajo %s apunta a <i>%s</i>"
@@ -903,113 +911,115 @@ msgstr "El atajo %s apunta a <i>%s</i>"
 msgid "failed to parse any smileys"
 msgstr "Algunos emoticonos tienen errores"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr "error de análisis "
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 #, fuzzy
 msgid "invalid featurepoint diameter"
 msgstr "diámetro inválido "
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 #, fuzzy
 msgid "invalid featurepoint location"
 msgstr "localización errónea "
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr "faltan valores"
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 #, fuzzy
 msgid "invalid height value"
 msgstr "valor incorrecto para la altura"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr "falta el parámetro que indica el ancho"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 #, fuzzy
 msgid "invalid width value"
 msgstr "valor incorrecto para el ancho"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr "error fatal invocando el programa php"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr "no puedo encontrar el archivo"
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr "formato de datos desconocido"
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr "sin datos"
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr "Enlace directo para descarga"
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "error de análisis en la línea %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr "falta el parámetro \"id\""
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "no he encontrado la plantilla %s"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 msgid "failed to process:"
 msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr "falta el código tex"
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 msgid "failed to generate image from code"
 msgstr "no he podido crear la imagen desde el código"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, fuzzy, perl-format
+msgid "%s plugin:"
 msgstr "complemento"
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
+#, fuzzy, perl-format
+msgid "%s plugins"
+msgstr "complementos"
+
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "enable %s?"
 msgstr "¿ activar %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:244
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "setup file for this wiki is not known"
 msgstr "El archivo de configuración para este wiki es desconocido"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "main"
 msgstr "principal"
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
-msgstr "complementos"
-
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Los cambios en la configuración que se muestran más abajo precisan una "
 "reconstrucción del wiki para tener efecto."
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1017,7 +1027,7 @@ msgstr ""
 "Para que los cambios en la configuración mostrados más abajo tengan efecto, "
 "es posible que necesite reconstruir el wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1097,20 +1107,20 @@ msgstr "ikiwiki: no puedo convertir la página %s"
 msgid "cannot read %s: %s"
 msgstr "no puedo leer el archivo %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)"
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "el sistema de control de versiones %s no está soportado"
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1185,29 +1195,29 @@ msgstr "no puedo emplear varios complementos rcs"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 "Se necesita el módulo Sort::Naturally para el tipo de ordenación "
 "title_natural"
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
diff --git a/po/fr.po b/po/fr.po
index 5ba71d6cf..573168d51 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Erreur"
 
@@ -147,32 +147,32 @@ msgstr "Terminé"
 msgid "Must specify %s"
 msgstr "Vous devez spécifier %s"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 msgid "Failed to create S3 bucket: "
 msgstr "Impossible de créer un compartiment S3 :"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 msgid "Failed to save file to S3: "
 msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 msgid "Failed to delete file from S3: "
 msgstr "Échec lors de la suppression du fichier sur S3 :"
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "Il existe déjà une page nommée %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr "Action interdite par allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr "Nom de la pièce jointe incorrect"
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr "Envoi de la pièce jointe"
 
@@ -180,7 +180,7 @@ msgstr "Envoi de la pièce jointe"
 msgid "automatic index generation"
 msgstr "Génération de l'index automatique"
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -197,12 +197,12 @@ msgstr "%s sur %s"
 msgid "There are no broken links!"
 msgstr "Aucun lien cassé !"
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Format de page non reconnu %s"
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr "Un commentaire doit avoir un contenu."
 
@@ -210,7 +210,7 @@ msgstr "Un commentaire doit avoir un contenu."
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "Nom de page incorrect"
 
@@ -246,7 +246,7 @@ msgstr "Commentaire ajouté"
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr "Vous n'êtes pas authentifié comme administrateur"
 
@@ -262,127 +262,127 @@ msgstr "modération du commentaire"
 msgid "Comments"
 msgstr "Commentaires"
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr "Le paramètre %s est obligatoire"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr "Aucun texte n'a été copié dans cette page"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, perl-format
 msgid "removing old preview %s"
 msgstr "Suppression de l'ancienne prévisualisation %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s n'est pas une page éditable"
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "Édition de %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 msgid "template not specified"
 msgstr "modèle (« template ») non indiqué"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 msgid "match not specified"
 msgstr "correspondance non indiquée"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s enregistré pour %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 msgid "failed to process"
 msgstr "Échec du traitement"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr "le format et le texte doivent être indiqués"
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 msgid "missing page"
 msgstr "Page manquante"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La page %s n'existe pas."
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 msgid "not a page"
 msgstr "Ce n'est pas une page."
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s est une pièce jointe, pas une page."
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Vous n'êtes pas autorisé à modifier %s"
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s."
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 msgid "failed to run graphviz"
 msgstr "Échec du lancement de graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr "Ce programme n'est pas un programme graphviz valable"
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr "tohighlight contient un type de fichier inconnu : '%s'"
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr "Code source : %s"
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -394,108 +394,108 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "Aucun smiley n'a pu être analysé"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick n'est pas installé"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "Échec de la lecture de %s : %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)"
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Échec de la détermination de la taille de l'image : %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --rss "
 "ou --atom"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 msgid "page editing not allowed"
 msgstr "Modification de page interdite"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
 msgstr "Paramètre « pages » manquant"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble."
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "Le modèle de page %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 msgid "failed to run dot"
 msgstr "Échec du lancement de dot"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s est verrouillé et ne peut être modifié"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr "mulitmarkdown est activé mais Text::Multimarkdown n'est pas installé"
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown "
 "(%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr "Feuille de style introuvable "
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 msgid "redir page not found"
 msgstr "Page de redirection introuvable"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 msgid "redir cycle is not allowed"
 msgstr "Redirection cyclique non autorisée"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Miroirs"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Miroir"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "modération du commentaire"
@@ -504,19 +504,19 @@ msgstr "modération du commentaire"
 msgid "more"
 msgstr "lire la suite"
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "getctime n'est pas implémenté"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "S'identifier en tant que"
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Obtenir un compte OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
 msgstr "Toutes les pages sont liées à d'autres pages."
 
@@ -524,35 +524,43 @@ msgstr "Toutes les pages sont liées à d'autres pages."
 msgid "bad or missing template"
 msgstr "Modèle de page incorrect ou manquant"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Erreur lors de la création du compte."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Aucune adresse indiquée. Impossible d'envoyer les instructions pour "
 "réinitialiser le mot de passe."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Impossible d'envoyer un courriel"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Vous avez reçu un message contenant les instructions pour réinitialiser le "
 "mot de passe"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr "Adresse pour la réinitialisation du mot de passe incorrecte"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr "réinitialisation du mot de passe refusée"
 
@@ -584,12 +592,12 @@ msgstr ""
 "Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
 "version 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un code de langue valable"
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -597,7 +605,7 @@ msgstr ""
 "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
 "défaut."
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -605,23 +613,23 @@ msgstr ""
 "po_link_to=negotiated nécessite que usedirs soit activé, retour à "
 "po_link_to=default."
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -629,7 +637,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -637,76 +645,76 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
 "des modifications."
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "Voter"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Total des suffrages :"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "polygen n'est pas installé"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 msgid "command failed"
 msgstr "Échec de la commande"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr "formule manquante"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr "formule inconnue"
 
@@ -774,12 +782,12 @@ msgstr "à minuit"
 msgid "at noon on %A"
 msgstr "%A, à midi"
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr "pourcentage %s illégal"
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 "L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire."
@@ -788,81 +796,81 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr "(fichier de différences tronqué)"
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s n'existe pas"
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr "%s n'est pas un fichier"
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "Suppression de %s confirmée"
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr "Veuillez choisir la pièce jointe à supprimer"
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr "supprimé"
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr "%s n'est pas dans srcdir. Impossible de le renommer"
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 msgid "no change to the file name was specified"
 msgstr "Aucun changement dans le nom du fichier n'a été spécifié"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr "Appellation interdite"
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s existe déjà sur le disque"
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr "%s renommé"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr "« SubPages » et attachements renommés."
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr "Modification de pièce jointe : une seule à la fois"
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr "Veuillez sélectionner la pièce jointe à renommer"
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr "Renomme %s en %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "mise à jour, suite au changement de %s en %s"
@@ -877,28 +885,28 @@ msgstr "Impossible de lire %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "Digest::SHA1 est nécessaire pour indexer %s"
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr "recherche"
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr "Le greffon « shortcut » ne fonctionnera pas sans %s"
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr "Il manque le paramètre nom ou URL."
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "Le raccourci %s pointe vers <i>%s</i>"
@@ -907,109 +915,111 @@ msgstr "Le raccourci %s pointe vers <i>%s</i>"
 msgid "failed to parse any smileys"
 msgstr "Aucun smiley n'a pu être analysé"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr "Erreur d'analyse"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr "Diamètre du point incorrect"
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr "Emplacement du point incorrect"
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr "Il manque des valeurs"
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 msgid "invalid height value"
 msgstr "Hauteur incorrecte"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr "Le paramètre largeur manque"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 msgid "invalid width value"
 msgstr "Largeur incorrecte"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr "Échec du lancement de php"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr "Fichier introuvable"
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr "Format de données inconnu"
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr "Pas de données"
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr "Téléchargement direct des données"
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "Erreur d'analyse à la ligne %d : %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr "Paramètre d'identification manquant"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "Modèle de page %s introuvable"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 msgid "failed to process:"
 msgstr "Échec du traitement :"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr "Il manque le code TeX"
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 msgid "failed to generate image from code"
 msgstr "Échec de la création de l'image à partir du code"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, fuzzy, perl-format
+msgid "%s plugin:"
 msgstr "greffon"
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
+#, fuzzy, perl-format
+msgid "%s plugins"
+msgstr "Greffons"
+
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "enable %s?"
 msgstr "activer %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:244
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "setup file for this wiki is not known"
 msgstr "Le fichier de configuration de ce wiki n'est pas connu"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "main"
 msgstr "Partie principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
-msgstr "Greffons"
-
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Les changements de configuration ci-dessous nécessitent une recompilation du "
 "wiki pour prendre effet"
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1017,7 +1027,7 @@ msgstr ""
 "Pour que les changements de configuration ci-dessous prennent effet vous "
 "devez recompiler le wiki"
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées."
@@ -1094,22 +1104,22 @@ msgstr "ikiwiki : impossible de reconstruire %s"
 msgid "cannot read %s: %s"
 msgstr "Lecture impossible de %s : %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Vous devez spécifier un nom de wiki (contenant des caractères "
 "alphanumériques)"
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "Système de contrôle de version non reconnu : %s"
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1184,25 +1194,25 @@ msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
diff --git a/po/gu.po b/po/gu.po
index 83afdef4c..3cb505efe 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -144,35 +144,35 @@ msgstr "સંપૂર્ણ"
 msgid "Must specify %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 #, fuzzy
 msgid "Failed to create S3 bucket: "
 msgstr "મેઇલ મોકલવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 #, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "મેઇલ મોકલવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 #, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -195,12 +195,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "અહીં કોઇ તૂટેલ કડી નથી!"
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr ""
 
@@ -208,7 +208,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -260,132 +260,132 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, fuzzy, perl-format
 msgid "%s parameter is required"
 msgstr "\"test\" અને \"then\" વિકલ્પો જરૂરી છે"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, fuzzy, perl-format
 msgid "removing old preview %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 #, fuzzy
 msgid "template not specified"
 msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 #, fuzzy
 msgid "match not specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 #, fuzzy
 msgid "failed to process"
 msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 #, fuzzy
 msgid "missing page"
 msgstr "ખોવાયેલ કિંમતો"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 #, fuzzy
 msgid "not a page"
 msgstr "વાંચી શકાતી નથી %s: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 msgid "failed to run graphviz"
 msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી"
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -395,109 +395,109 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "પોલિગોન સ્થાપિત નથી"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "--rss અથવા --atom ઉપયોગ કરતી વખતે વીકીમાં --url ઉપયોગ કરવું જ પડશે"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 #, fuzzy
 msgid "page editing not allowed"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 #, fuzzy
 msgid "missing pages parameter"
 msgstr "ખોવાયેલ %s વિકલ્પ"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:"
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 msgid "failed to run dot"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr "સ્ટાઇલશીટ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 #, fuzzy
 msgid "redir page not found"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "મિરરો"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "મિરર"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 msgid "comment needs moderation"
 msgstr ""
 
@@ -505,19 +505,19 @@ msgstr ""
 msgid "more"
 msgstr "વધુ"
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "getctime અમલમાં મૂકાયેલ નથી"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "ઓપનઆઇડી મેળવો"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે."
@@ -526,31 +526,39 @@ msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે 
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "ખાતું બનાવવાનું સફળ. તમે હવે લોગઇન કરી શકો છો."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "ખાતું બનાવવામાં ક્ષતિ."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "મેઇલ મોકલવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr ""
 
@@ -581,119 +589,119 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "મત"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "કુલ મત:"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "પોલિગોન સ્થાપિત નથી"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 #, fuzzy
 msgid "command failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr "ખોવાયેલ સૂત્ર"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr "અજાણ્યું સૂત્ર"
 
@@ -762,12 +770,12 @@ msgstr "મધ્યરાત્રે"
 msgid "at noon on %A"
 msgstr "બપોરે %A પર"
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -775,82 +783,82 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, fuzzy, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, fuzzy, perl-format
 msgid "%s is not a file"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 #, fuzzy
 msgid "no change to the file name was specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "રેન્ડર કરે છે %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "%s નો સુધારો %s નાં %s વડે"
@@ -865,28 +873,28 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr "ખોવાયેલ નામ અથવા યુઆરએલ વિકલ્પ"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "ટુંકોરસ્તો %s એ <i>%s</i> નો નિર્દેશ કરે છે"
@@ -895,119 +903,121 @@ msgstr "ટુંકોરસ્તો %s એ <i>%s</i> નો નિર્દ
 msgid "failed to parse any smileys"
 msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr "ઉકેલવામાં ક્ષતિ"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 #, fuzzy
 msgid "invalid featurepoint diameter"
 msgstr "ખરાબ લાક્ષણિકબિંદુ વ્યાસ"
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 #, fuzzy
 msgid "invalid featurepoint location"
 msgstr "ખરાબ લાક્ષણિકબિંદુ સ્થિતિ"
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr "ખોવાયેલ કિંમતો"
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 #, fuzzy
 msgid "invalid height value"
 msgstr "ખરાબ ઉંચાઇ કિંમત"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr "ખોવાયેલ પહોળાઇ વિકલ્પ"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 #, fuzzy
 msgid "invalid width value"
 msgstr "ખરાબ પહોળાઇ કિંમત"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr "php ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr "ફાઇલ મળી શકી નહી"
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr "અજાણ્યો માહિતી પ્રકાર"
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr "ખાલી માહિતી"
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr "સીધી માહિતી ડાઉનલોડ"
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "ઉકેલવાનું લીટી %d પર નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr "ખોવાયેલ આઇડી વિકલ્પ"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 msgid "failed to process:"
 msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 #, fuzzy
 msgid "missing tex code"
 msgstr "ખોવાયેલ કિંમતો"
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, perl-format
+msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
 #, perl-format
-msgid "enable %s?"
+msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:244
-msgid "setup file for this wiki is not known"
+#: ../IkiWiki/Plugin/websetup.pm:121
+#, perl-format
+msgid "enable %s?"
 msgstr ""
 
 #: ../IkiWiki/Plugin/websetup.pm:260
-msgid "main"
+msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
+#: ../IkiWiki/Plugin/websetup.pm:276
+msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1081,20 +1091,20 @@ msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
 msgid "cannot read %s: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1165,25 +1175,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index f4749b841..4f44e7c74 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr ""
 
@@ -144,32 +144,32 @@ msgstr ""
 msgid "Must specify %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 msgid "Failed to create S3 bucket: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 msgid "Failed to save file to S3: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 msgid "Failed to delete file from S3: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr ""
 
@@ -177,7 +177,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -192,12 +192,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -257,127 +257,127 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, perl-format
 msgid "removing old preview %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 msgid "template not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 msgid "match not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 msgid "failed to process"
 msgstr ""
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 msgid "not a page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 msgid "failed to run graphviz"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -386,104 +386,104 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 msgid "page editing not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 msgid "failed to run dot"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 msgid "redir page not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 msgid "redir cycle is not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr ""
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 msgid "comment needs moderation"
 msgstr ""
 
@@ -491,19 +491,19 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr ""
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
 msgstr ""
 
@@ -511,31 +511,39 @@ msgstr ""
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr ""
 
@@ -565,117 +573,117 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 msgid "command failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr ""
 
@@ -743,12 +751,12 @@ msgstr ""
 msgid "at noon on %A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -756,81 +764,81 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 msgid "no change to the file name was specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -845,28 +853,28 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr ""
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr ""
@@ -875,113 +883,115 @@ msgstr ""
 msgid "failed to parse any smileys"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 msgid "invalid height value"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 msgid "invalid width value"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 msgid "failed to process:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 msgid "failed to generate image from code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, perl-format
+msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
 #, perl-format
-msgid "enable %s?"
+msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:244
-msgid "setup file for this wiki is not known"
+#: ../IkiWiki/Plugin/websetup.pm:121
+#, perl-format
+msgid "enable %s?"
 msgstr ""
 
 #: ../IkiWiki/Plugin/websetup.pm:260
-msgid "main"
+msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
+#: ../IkiWiki/Plugin/websetup.pm:276
+msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1055,20 +1065,20 @@ msgstr ""
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1139,25 +1149,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 3b0f45348..cc24cccd5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -53,7 +53,7 @@ msgstr "Preferenze salvate."
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Errore"
 
@@ -144,32 +144,32 @@ msgstr "fatto"
 msgid "Must specify %s"
 msgstr "Occorre specificare %s"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 msgid "Failed to create S3 bucket: "
 msgstr "Impossibile creare il contenitore S3: "
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 msgid "Failed to save file to S3: "
 msgstr "Impossibile salvare il file sul S3: "
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 msgid "Failed to delete file from S3: "
 msgstr "Impossibile eliminare il file dal S3: "
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "esiste già una pagina chiamata %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr "non permesso da allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr "nome file dell'allegato non valido"
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr "carica allegato"
 
@@ -177,7 +177,7 @@ msgstr "carica allegato"
 msgid "automatic index generation"
 msgstr "generazione automatica dell'indice"
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -194,12 +194,12 @@ msgstr "%s da %s"
 msgid "There are no broken links!"
 msgstr "Non ci sono collegamenti rotti."
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato pagina %s non supportato"
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr "i commenti devono avere un contenuto"
 
@@ -207,7 +207,7 @@ msgstr "i commenti devono avere un contenuto"
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nome pagina non valido"
 
@@ -243,7 +243,7 @@ msgstr "Aggiunto commento"
 msgid "Added a comment: %s"
 msgstr "Aggiunto commento: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr "non siete autenticati come amministratore"
 
@@ -259,127 +259,127 @@ msgstr "moderazione commento"
 msgid "Comments"
 msgstr "Commenti"
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr "parametro %s necessario"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr "nessun testo è stato copiato in questa pagina"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr "nessun testo è stato copiato in questa pagina con l'id %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, perl-format
 msgid "removing old preview %s"
 msgstr "rimozione vecchia anteprima %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s non è una pagina modificabile"
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "creazione %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "modifica %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 msgid "template not specified"
 msgstr "modello non specificato"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 msgid "match not specified"
 msgstr "corrispondenza non specificata"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s registrato per %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 msgid "failed to process"
 msgstr "errore nell'elaborazione"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr "occorre specificare formato e testo"
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "errore nel fortune"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 msgid "missing page"
 msgstr "pagina mancante"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La pagina %s non esiste."
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 msgid "not a page"
 msgstr "non è una pagina"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "%s è un allegato, non una pagina."
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "non è permesso modificare %s"
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "non è permesso lavorare su un file in modalità %s"
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Occorre specificare %s quando si usa il plugin %s"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 msgid "failed to run graphviz"
 msgstr "errore nell'eseguire graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr "prog non è un programma graphviz valido"
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr "tohighlight contiene il tipo di file sconosciuto «%s»"
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr "Sorgente: %s"
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -390,107 +390,107 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "impossibile interpretare gli smile"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick non è installato"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr "impossibile leggere %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)"
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "impossibile ridimensionare: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "impossibile determinare la dimensione dell'immagine %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 msgid "page editing not allowed"
 msgstr "modifica della pagina non ammessa"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
 msgstr "parametro pagine mancante"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr "i parametri %s e %s non possono essere usati insieme"
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr "Aggiungere un nuovo articolo dal titolo:"
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "modello %s non esistente"
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 msgid "failed to run dot"
 msgstr "impossibile eseguire dot"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s è bloccata e non può essere modificata"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato"
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr "foglio di stile non trovato"
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 msgid "redir page not found"
 msgstr "pagina di reindirizzamento non trovata"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 msgid "redir cycle is not allowed"
 msgstr "ciclo di reindirizzamento non ammesso"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Mirror"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Mirror"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "moderazione commento"
@@ -499,19 +499,19 @@ msgstr "moderazione commento"
 msgid "more"
 msgstr "altro"
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "getctime non implementata"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Accedi tramite"
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Ottieni un OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
 msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine."
 
@@ -519,34 +519,42 @@ msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine."
 msgid "bad or missing template"
 msgstr "modello errato o mancante"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Account creato con successo. È ora possibile effettuare l'accesso."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Errore nella creazione dell'account."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Nessun indirizzo email, impossibile inviare per email le istruzioni per "
 "reimpostare la password."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Impossibile spedire il messaggio"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Il messaggio con le istruzioni per reimpostare la password è stato inviato."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr "url per il reset della password non corretto"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr "reset della password non permesso"
 
@@ -578,19 +586,19 @@ msgstr ""
 "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno "
 "alla versione 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s non è una codifica di lingua valida"
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -598,21 +606,21 @@ msgstr ""
 "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "file PO aggiornati"
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -620,7 +628,7 @@ msgstr ""
 "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
 "stata eliminata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -628,76 +636,76 @@ msgstr ""
 "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
 "stata rinominata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Il file POT (%s) non esiste"
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "impossibile copiare il file PO di underlay in %s"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "impossibile copiare il file POT in %s"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/D"
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "impossibile tradurre %s"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
 "modifiche"
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "voto"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Voti totali:"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "polygen non è installato"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 msgid "command failed"
 msgstr "errore nel comando"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr "formula mancante"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr "formula sconosciuta"
 
@@ -765,12 +773,12 @@ msgstr "a mezzanotte"
 msgid "at noon on %A"
 msgstr "%A a mezzogiorno"
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr "valore percentuale %s non ammesso"
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e "
@@ -780,81 +788,81 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr "(Diff troncato)"
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s non esiste"
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s non è in src, quindi non può essere eliminato"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr "%s non è un file"
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "conferma rimozione di %s"
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr "Selezionare l'allegato da rimuovere."
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr "rimosso"
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr "%s non è in src, quindi non può essere rinominato"
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 msgid "no change to the file name was specified"
 msgstr "non è stata specificata nessuna modifica al nome del file"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr "nome non valido"
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr "%s esiste già"
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s già presente su disco"
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr "rinomina di %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr "Rinomina anche SottoPagine e allegati"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr "Si può rinominare un solo allegato alla volta."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr "Selezionare l'allegato da rinominare."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr "rinomina %s in %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aggiornamento per rinomina di %s in %s"
@@ -869,28 +877,28 @@ msgstr "impossibile leggere %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "è necessario Digest::SHA1 per l'indice di %s"
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr "cerca"
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr "il plugin scorciatoia non può funzionare senza %s"
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr "parametro nome o url mancante"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "la scorciatoia %s punta a <i>%s</i>"
@@ -899,109 +907,111 @@ msgstr "la scorciatoia %s punta a <i>%s</i>"
 msgid "failed to parse any smileys"
 msgstr "impossibile interpretare gli smile"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr "errore nell'interpretazione"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr "Diametro featurepoint non valido"
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr "Posizione featurepoint non valida"
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr "valori mancanti"
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 msgid "invalid height value"
 msgstr "valore altezza non valido"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr "parametro larghezza mancante"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 msgid "invalid width value"
 msgstr "valore larghezza non valido"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr "impossibile eseguire php"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr "impossibile trovare il file"
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr "formato dati sconosiuto"
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr "nessun dato"
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr "Scaricamento diretto dei dati"
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "errore di interpretazione alla riga %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr "parametro id mancante"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "modello %s non trovato"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 msgid "failed to process:"
 msgstr "errore nell'elaborazione:"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr "codice tex mancante"
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 msgid "failed to generate image from code"
 msgstr "impossibile generare l'immagine dal codice"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, fuzzy, perl-format
+msgid "%s plugin:"
+msgstr "plugin"
+
+#: ../IkiWiki/Plugin/websetup.pm:107
+#, fuzzy, perl-format
+msgid "%s plugins"
 msgstr "plugin"
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "enable %s?"
 msgstr "abilitare %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:244
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "setup file for this wiki is not known"
 msgstr "il file di setup di questo wiki non è noto"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "main"
 msgstr "principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
-msgstr "plugin"
-
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Le sottostanti modifiche alla configurazione richiedono la ricompilazione "
 "del wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1009,7 +1019,7 @@ msgstr ""
 "Affinché le sottostanti modifiche alla configurazione abbiano effetto, "
 "occorre ricostruire il wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
@@ -1085,20 +1095,20 @@ msgstr "ikiwiki: impossibile compilare %s"
 msgid "cannot read %s: %s"
 msgstr "impossibile leggere %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)"
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "sistema di controllo di revisione %s non supportato"
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "impossibile creare un repository tramite ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1170,25 +1180,25 @@ msgstr "impossibile usare più plugin rcs"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
diff --git a/po/pl.po b/po/pl.po
index 203155cfb..5c8fc1390 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Błąd"
 
@@ -148,35 +148,35 @@ msgstr "gotowe"
 msgid "Must specify %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 #, fuzzy
 msgid "Failed to create S3 bucket: "
 msgstr "Awaria w trakcie wysyłania wiadomości"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 #, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "Awaria w trakcie wysyłania wiadomości"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 #, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr ""
 
@@ -184,7 +184,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -199,12 +199,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Wszystkie odnośniki są aktualne!"
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr ""
 
@@ -212,7 +212,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -264,133 +264,133 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, fuzzy, perl-format
 msgid "%s parameter is required"
 msgstr "Parametry \"test\" i \"then\" są wymagane"
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, fuzzy, perl-format
 msgid "removing old preview %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 #, fuzzy
 msgid "template not specified"
 msgstr "nieznaleziony szablon %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 #, fuzzy
 msgid "match not specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 #, fuzzy
 msgid "failed to process"
 msgstr "awaria w trakcie przetwarzania:"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "awaria fortunki"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 #, fuzzy
 msgid "missing page"
 msgstr "brakujące wartości"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 #, fuzzy
 msgid "not a page"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, fuzzy, perl-format
 msgid "%s is an attachment, not a page."
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 #, fuzzy
 msgid "failed to run graphviz"
 msgstr "awaria w trakcie uruchamiania wtyczki graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr "prog nie jest poprawnym programem graphviz"
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -400,117 +400,117 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "awaria w trakcie przetwarzania emitoikonki"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "wtyczka polygen nie jest zainstalowana"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 "Użycie parametru --rss lub --atom wymaga podania adresu URL do wiki za "
 "pomocą parametru --url"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 #, fuzzy
 msgid "page editing not allowed"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 #, fuzzy
 msgid "missing pages parameter"
 msgstr "brakujący parametr %s"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr "Tytuł nowego wpisu"
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "brakujący szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 #, fuzzy
 msgid "failed to run dot"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
 "strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być "
 "teraz edytowana"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub "
 "uruchamiania programu /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "nieznaleziony szablon ze stylami CSS"
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 #, fuzzy
 msgid "redir page not found"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Kopie lustrzane"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Kopia lustrzana"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 msgid "comment needs moderation"
 msgstr ""
 
@@ -518,19 +518,19 @@ msgstr ""
 msgid "more"
 msgstr "więcej"
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "niedostępna funkcja getctime"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Pobierz OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Dla każdej strony istnieje odnośnik z innej strony"
@@ -539,31 +539,39 @@ msgstr "Dla każdej strony istnieje odnośnik z innej strony"
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Konto założone pomyślnie. Teraz można zalogować się."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Błąd w trakcie zakładania konta."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Awaria w trakcie wysyłania wiadomości"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr ""
 
@@ -594,119 +602,119 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "głosuj"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Oddane głosy:"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "wtyczka polygen nie jest zainstalowana"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 #, fuzzy
 msgid "command failed"
 msgstr "awaria fortunki"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr "brakująca reguła"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr "nieznana reguła"
 
@@ -775,12 +783,12 @@ msgstr "o północy"
 msgid "at noon on %A"
 msgstr "w południe w %A"
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -788,84 +796,84 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, fuzzy, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr ""
 "strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być "
 "teraz edytowana"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, fuzzy, perl-format
 msgid "%s is not a file"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 #, fuzzy
 msgid "no change to the file name was specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "renderowanie %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s"
@@ -880,21 +888,21 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "brakujący parametr name lub url"
@@ -902,7 +910,7 @@ msgstr "brakujący parametr name lub url"
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "skrót %s wskazuje na adres <i>%s</i>"
@@ -912,124 +920,126 @@ msgstr "skrót %s wskazuje na adres <i>%s</i>"
 msgid "failed to parse any smileys"
 msgstr "awaria w trakcie przetwarzania emitoikonki"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 #, fuzzy
 msgid "parse error"
 msgstr "błąd w trakcie przetwarzania"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 #, fuzzy
 msgid "invalid featurepoint diameter"
 msgstr "nieprawidłowa średnica dla featurepoint"
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 #, fuzzy
 msgid "invalid featurepoint location"
 msgstr "nieprawidłowe położenie dla featurepoint"
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr "brakujące wartości"
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 #, fuzzy
 msgid "invalid height value"
 msgstr "nieprawidłowa wysokość"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 #, fuzzy
 msgid "missing width parameter"
 msgstr "brakujący parametr width"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 #, fuzzy
 msgid "invalid width value"
 msgstr "nieprawidłowa szerokość"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 #, fuzzy
 msgid "failed to run php"
 msgstr "awaria w trakcie uruchamiania php"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr "nie można znaleźć pliku"
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr "nieznany format danych"
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr "brak danych"
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr "Bezpośrednie pobieranie danych"
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, fuzzy, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "awaria w trakcie przetwarzania linii %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 #, fuzzy
 msgid "missing id parameter"
 msgstr "brakujący parametr id"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "nieznaleziony szablon %s"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 #, fuzzy
 msgid "failed to process:"
 msgstr "awaria w trakcie przetwarzania:"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 #, fuzzy
 msgid "missing tex code"
 msgstr "brakujące wartości"
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, perl-format
+msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
 #, perl-format
-msgid "enable %s?"
+msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:244
-msgid "setup file for this wiki is not known"
+#: ../IkiWiki/Plugin/websetup.pm:121
+#, perl-format
+msgid "enable %s?"
 msgstr ""
 
 #: ../IkiWiki/Plugin/websetup.pm:260
-msgid "main"
+msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
+#: ../IkiWiki/Plugin/websetup.pm:276
+msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1103,20 +1113,20 @@ msgstr "ikiwiki: awaria w trakcie tworzenia %s"
 msgid "cannot read %s: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1189,25 +1199,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 49518e2a8..62b9d6905 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Fel"
 
@@ -145,35 +145,35 @@ msgstr "klar"
 msgid "Must specify %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 #, fuzzy
 msgid "Failed to create S3 bucket: "
 msgstr "Misslyckades med att skicka e-post"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 #, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "Misslyckades med att skicka e-post"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 #, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr ""
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -196,12 +196,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Det finns inga trasiga länkar!"
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr ""
 
@@ -209,7 +209,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
@@ -245,7 +245,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -261,133 +261,133 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, fuzzy, perl-format
 msgid "removing old preview %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 #, fuzzy
 msgid "template not specified"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 #, fuzzy
 msgid "match not specified"
 msgstr "filnamn för wrapper har inte angivits"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 #, fuzzy
 msgid "failed to process"
 msgstr "misslyckades med att behandla mall:"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "fortune misslyckades"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 #, fuzzy
 msgid "missing page"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 #, fuzzy
 msgid "not a page"
 msgstr "kan inte läsa %s: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Måste ange %s när sökinsticket används"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 #, fuzzy
 msgid "failed to run graphviz"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -397,113 +397,113 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "misslyckades med att tolka smilisar, inaktiverar instick"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "polygen inte installerad"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "Måste ange url till wiki med --url när --rss eller --atom används"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 #, fuzzy
 msgid "page editing not allowed"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 #, fuzzy
 msgid "missing pages parameter"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 #, fuzzy
 msgid "failed to run dot"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s är låst av %s och kan inte redigeras"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/"
 "markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 #, fuzzy
 msgid "redir page not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Speglar"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Spegel"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 msgid "comment needs moderation"
 msgstr ""
 
@@ -511,19 +511,19 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "getctime inte implementerad"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Skaffa ett OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Alla sidor länkas till av andra sidor."
@@ -532,31 +532,39 @@ msgstr "Alla sidor länkas till av andra sidor."
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Kontot har skapats. Du kan nu logga in."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Fel vid skapandet av konto."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Misslyckades med att skicka e-post"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr ""
 
@@ -587,119 +595,119 @@ msgstr "RPC::XML::Client hittades inte, pingar inte"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "röst"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Antal röster:"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "polygen inte installerad"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 #, fuzzy
 msgid "command failed"
 msgstr "fortune misslyckades"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr ""
 
@@ -767,12 +775,12 @@ msgstr ""
 msgid "at noon on %A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -780,82 +788,82 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, fuzzy, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s är låst av %s och kan inte redigeras"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 #, fuzzy
 msgid "no change to the file name was specified"
 msgstr "filnamn för wrapper har inte angivits"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "ritar upp %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "uppdatering av %s, %s av %s"
@@ -870,21 +878,21 @@ msgstr "misslyckades med att skriva %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "genväg saknar parameter för namn eller url"
@@ -892,7 +900,7 @@ msgstr "genväg saknar parameter för namn eller url"
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "genvägen %s pekar på %s"
@@ -902,121 +910,123 @@ msgstr "genvägen %s pekar på %s"
 msgid "failed to parse any smileys"
 msgstr "misslyckades med att tolka smilisar, inaktiverar instick"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 #, fuzzy
 msgid "parse error"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 #, fuzzy
 msgid "invalid height value"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 #, fuzzy
 msgid "missing width parameter"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 #, fuzzy
 msgid "invalid width value"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 #, fuzzy
 msgid "failed to run php"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, fuzzy, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 #, fuzzy
 msgid "missing id parameter"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 #, fuzzy
 msgid "failed to process:"
 msgstr "misslyckades med att behandla mall:"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, perl-format
+msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
 #, perl-format
-msgid "enable %s?"
+msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:244
-msgid "setup file for this wiki is not known"
+#: ../IkiWiki/Plugin/websetup.pm:121
+#, perl-format
+msgid "enable %s?"
 msgstr ""
 
 #: ../IkiWiki/Plugin/websetup.pm:260
-msgid "main"
+msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
+#: ../IkiWiki/Plugin/websetup.pm:276
+msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1090,20 +1100,20 @@ msgstr "ikiwiki: kan inte rita upp %s"
 msgid "cannot read %s: %s"
 msgstr "kan inte läsa %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1174,25 +1184,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
diff --git a/po/tr.po b/po/tr.po
index 113427f9b..94ad12e9e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgstr "Tercihler kaydedildi."
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Hata"
 
@@ -141,32 +141,32 @@ msgstr ""
 msgid "Must specify %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 msgid "Failed to create S3 bucket: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 msgid "Failed to save file to S3: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 msgid "Failed to delete file from S3: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr ""
 
@@ -174,7 +174,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -189,12 +189,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr ""
 
@@ -202,7 +202,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -254,127 +254,127 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, perl-format
 msgid "removing old preview %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 msgid "template not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 msgid "match not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 msgid "failed to process"
 msgstr ""
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 msgid "not a page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 msgid "failed to run graphviz"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -383,104 +383,104 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 msgid "page editing not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 msgid "failed to run dot"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 msgid "redir page not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 msgid "redir cycle is not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr ""
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 msgid "comment needs moderation"
 msgstr ""
 
@@ -488,19 +488,19 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr ""
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
 msgstr ""
 
@@ -508,31 +508,39 @@ msgstr ""
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr ""
 
@@ -562,117 +570,117 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 msgid "command failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr ""
 
@@ -740,12 +748,12 @@ msgstr "geceyarısında"
 msgid "at noon on %A"
 msgstr "%A öğleyin"
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -753,81 +761,81 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 msgid "no change to the file name was specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -842,28 +850,28 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr ""
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr ""
@@ -872,113 +880,115 @@ msgstr ""
 msgid "failed to parse any smileys"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 msgid "invalid height value"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 msgid "invalid width value"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 msgid "failed to process:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 msgid "failed to generate image from code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, perl-format
+msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
 #, perl-format
-msgid "enable %s?"
+msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:244
-msgid "setup file for this wiki is not known"
+#: ../IkiWiki/Plugin/websetup.pm:121
+#, perl-format
+msgid "enable %s?"
 msgstr ""
 
 #: ../IkiWiki/Plugin/websetup.pm:260
-msgid "main"
+msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
+#: ../IkiWiki/Plugin/websetup.pm:276
+msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1052,20 +1062,20 @@ msgstr ""
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1136,25 +1146,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 9fccf87b5..9326f2975 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 16:04-0500\n"
+"POT-Creation-Date: 2010-02-12 16:48-0500\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
 msgid "Error"
 msgstr "Lỗi"
 
@@ -146,35 +146,35 @@ msgstr "xong"
 msgid "Must specify %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
 #, fuzzy
 msgid "Failed to create S3 bucket: "
 msgstr "Lỗi gửi thư"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 #, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "Lỗi gửi thư"
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247
 #, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr ""
 
@@ -182,7 +182,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:108
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -197,12 +197,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 
-#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:129
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr ""
 
@@ -210,7 +210,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -262,133 +262,133 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67
 msgid "no text was copied in this page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, fuzzy, perl-format
 msgid "removing old preview %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:114
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:292
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329
-#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383
-#: ../IkiWiki/Plugin/editpage.pm:422
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52
 #, fuzzy
 msgid "template not specified"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55
 #, fuzzy
 msgid "match not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:63
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/edittemplate.pm:138
 #, fuzzy
 msgid "failed to process"
 msgstr "mẫu không xử lý được:"
 
-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr "fortune bị lỗi"
 
-#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 #, fuzzy
 msgid "missing page"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:74
+#: ../IkiWiki/Plugin/getsource.pm:75
 #, fuzzy
 msgid "not a page"
 msgstr "không thể đọc %s: %s"
 
-#: ../IkiWiki/Plugin/getsource.pm:76
+#: ../IkiWiki/Plugin/getsource.pm:77
 #, perl-format
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:697
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:701
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68
 #, fuzzy
 msgid "failed to run graphviz"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:47
+#: ../IkiWiki/Plugin/highlight.pm:48
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:58
+#: ../IkiWiki/Plugin/highlight.pm:59
 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:123
+#: ../IkiWiki/Plugin/highlight.pm:124
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -398,113 +398,113 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "lỗi phân tách hình cười nào nên tắt bổ sung"
 
-#: ../IkiWiki/Plugin/img.pm:64
+#: ../IkiWiki/Plugin/img.pm:69
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "chưa cài đặt polygen"
 
-#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:74
+#: ../IkiWiki/Plugin/img.pm:79
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:120
+#: ../IkiWiki/Plugin/img.pm:125
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:140
+#: ../IkiWiki/Plugin/img.pm:145
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay « --"
 "atom »"
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 #, fuzzy
 msgid "page editing not allowed"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 #, fuzzy
 msgid "missing pages parameter"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/inline.pm:191
+#: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:312
+#: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:332
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:624
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
-#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87
-#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
 #, fuzzy
 msgid "failed to run dot"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/linkmap.pm:84
+#: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:48
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s bị %s khoá nên không thể sửa được"
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:69
+#: ../IkiWiki/Plugin/mdwn.pm:70
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:161
+#: ../IkiWiki/Plugin/meta.pm:162
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:200
 #, fuzzy
 msgid "redir page not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/meta.pm:213
+#: ../IkiWiki/Plugin/meta.pm:214
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Nhân bản"
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:43
+#: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirror"
 msgstr "Nhân bản"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:41
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 msgid "comment needs moderation"
 msgstr ""
 
@@ -512,19 +512,19 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:65
+#: ../IkiWiki/Plugin/norcs.pm:66
 msgid "getctime not implemented"
 msgstr "chưa thực hiện getctime"
 
-#: ../IkiWiki/Plugin/openid.pm:61
+#: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:64
+#: ../IkiWiki/Plugin/openid.pm:65
 msgid "Get an OpenID"
 msgstr "Lấy OpenID"
 
-#: ../IkiWiki/Plugin/orphans.pm:55
+#: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
 msgid "All pages have other pages linking to them."
 msgstr "Mọi trang được liên kết với trang khác."
@@ -533,31 +533,39 @@ msgstr "Mọi trang được liên kết với trang khác."
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:248
+#: ../IkiWiki/Plugin/passwordauth.pm:229
+msgid "Your user page: "
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:236
+msgid "Create your user page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:251
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Gặp lỗi khi tạo tài khoản."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:258
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:292
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Lỗi gửi thư"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:294
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:329
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:332
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr ""
 
@@ -588,119 +596,119 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:138
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:155
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:385
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:427
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:451
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:471
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:870
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:884
+#: ../IkiWiki/Plugin/po.pm:885
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:893
+#: ../IkiWiki/Plugin/po.pm:894
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:900
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:935
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:948
+#: ../IkiWiki/Plugin/po.pm:949
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102
-#: ../IkiWiki/Plugin/po.pm:1141
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1100
+#: ../IkiWiki/Plugin/po.pm:1101
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1153
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/poll.pm:70
 msgid "vote"
 msgstr "bỏ phiếu"
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78
 msgid "Total votes:"
 msgstr "Tổng số phiếu :"
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42
 msgid "polygen not installed"
 msgstr "chưa cài đặt polygen"
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61
 #, fuzzy
 msgid "command failed"
 msgstr "fortune bị lỗi"
 
-#: ../IkiWiki/Plugin/postsparkline.pm:46
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:53
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr ""
 
@@ -768,12 +776,12 @@ msgstr ""
 msgid "at noon on %A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:55
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
@@ -781,82 +789,82 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39
 #, fuzzy, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s bị %s khoá nên không thể sửa được"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:134
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:171
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:211
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 #, fuzzy
 msgid "no change to the file name was specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "đang vẽ %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:573
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "cập nhật %2$s của %1$s bởi %3$s"
@@ -871,21 +879,21 @@ msgstr "lỗi ghi %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "lối tắt thiếu tên hay tham số url"
@@ -893,7 +901,7 @@ msgstr "lối tắt thiếu tên hay tham số url"
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "lối tắt %s chỉ tới %s"
@@ -903,121 +911,123 @@ msgstr "lối tắt %s chỉ tới %s"
 msgid "failed to parse any smileys"
 msgstr "lỗi phân tách hình cười nào nên tắt bổ sung"
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 #, fuzzy
 msgid "parse error"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
+#: ../IkiWiki/Plugin/sparkline.pm:79
 msgid "invalid featurepoint diameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
+#: ../IkiWiki/Plugin/sparkline.pm:89
 msgid "invalid featurepoint location"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
+#: ../IkiWiki/Plugin/sparkline.pm:105
 #, fuzzy
 msgid "invalid height value"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 #, fuzzy
 msgid "missing width parameter"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
+#: ../IkiWiki/Plugin/sparkline.pm:116
 #, fuzzy
 msgid "invalid width value"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 #, fuzzy
 msgid "failed to run php"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, fuzzy, perl-format
 msgid "parse fail at line %d: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/template.pm:34
 #, fuzzy
 msgid "missing id parameter"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/template.pm:41
 #, perl-format
 msgid "template %s not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/template.pm:55
+#: ../IkiWiki/Plugin/template.pm:60
 #, fuzzy
 msgid "failed to process:"
 msgstr "mẫu không xử lý được:"
 
-#: ../IkiWiki/Plugin/teximg.pm:70
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:122
+#: ../IkiWiki/Plugin/teximg.pm:123
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, perl-format
+msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:107
 #, perl-format
-msgid "enable %s?"
+msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:244
-msgid "setup file for this wiki is not known"
+#: ../IkiWiki/Plugin/websetup.pm:121
+#, perl-format
+msgid "enable %s?"
 msgstr ""
 
 #: ../IkiWiki/Plugin/websetup.pm:260
-msgid "main"
+msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:261
-msgid "plugins"
+#: ../IkiWiki/Plugin/websetup.pm:276
+msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:404
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:408
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:445
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1091,20 +1101,20 @@ msgstr "ikiwiki: không thể vẽ %s"
 msgid "cannot read %s: %s"
 msgstr "không thể đọc %s: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:79
+#: ../IkiWiki/Setup/Automator.pm:80
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:105
+#: ../IkiWiki/Setup/Automator.pm:106
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:123
+#: ../IkiWiki/Setup/Automator.pm:124
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1175,25 +1185,25 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1263
+#: ../IkiWiki.pm:1255
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1862
+#: ../IkiWiki.pm:1854
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2005
+#: ../IkiWiki.pm:1997
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2016
+#: ../IkiWiki.pm:2008
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2035
+#: ../IkiWiki.pm:2027
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From 6e8fd3890e96d3b0fdbf1ad91fc84628d2e1aa47 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 17:09:40 -0500
Subject: add news item for ikiwiki 3.20100212

---
 doc/news/version_3.20091113.mdwn | 18 ------------------
 doc/news/version_3.20100212.mdwn | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 18 deletions(-)
 delete mode 100644 doc/news/version_3.20091113.mdwn
 create mode 100644 doc/news/version_3.20100212.mdwn

diff --git a/doc/news/version_3.20091113.mdwn b/doc/news/version_3.20091113.mdwn
deleted file mode 100644
index 579174011..000000000
--- a/doc/news/version_3.20091113.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-ikiwiki 3.20091113 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * underlay: Fix example values put in setup file to be array
-     references.
-   * underlay: Avoid crashing if lists of underlays (or template
-     directories) are not configured.
-   * Moved the postscan hook to run on the raw html of a page, before
-     the template is filled out. This improves the search plugin's indexing,
-     since it will not include navigational elements from the page template
-     or sidebar.
-   * localstyle: New plugin, allows overrding the toplevel local.css
-     with one that is closer to a page.
-   * httpauth: Add cgiauthurl setting that can be used to do http basic auth
-     only when ikiwiki needs authentication, rather than for any access to
-     the cgi/wiki.
-   * inline: Do not generate feeds for nested inlines.
-   * inline: Allow direct inclusion of non-page files in raw mode.
-   * inline: Fix display of all pages when archive=yes or show=0 are used."""]]
diff --git a/doc/news/version_3.20100212.mdwn b/doc/news/version_3.20100212.mdwn
new file mode 100644
index 000000000..3dcfe5f84
--- /dev/null
+++ b/doc/news/version_3.20100212.mdwn
@@ -0,0 +1,26 @@
+ikiwiki 3.20100212 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * template: Preprocess parameters before htmlizing.
+   * img: Fix a bug that could taint @links with undef values.
+   * setup automator: Configure Term::Readline to use bold for prompt, rather
+     than default underline. Closes: #[517656](http://bugs.debian.org/517656)
+   * Allow jumping directly into account registration process by going to
+     ikiwiki.cgi?do=register
+   * Improve display of openid in preferences page.
+   * Add link to userpage (or creation link) to top of preferences page.
+   * opendiscussion: This plugin will also now allow posting comments
+     to otherwise locked-down sites.
+   * auto-blog.setup: Lock all pages, so only admin can post to the blog
+     by default, and enable opendiscussion so others can comment.
+   * Fix color and format plugins to appear in the websetup interface.
+   * amazon\_s3: Fix to support the EU S3 datacenter, which is more picky
+     about attempts to create already existing buckets.
+   * httpauth: When cgiauthurl is configured, httpauth can now be used
+     alongside other authentication methods (like openid or anonok). Rather
+     than always redirect to the cgiauthurl for authentication, there is now
+     a button on the login form to use it.
+   * httpauth: Add httpauth\_pagespec setting that can be used to limit
+     pages to only being edited via users authed with httpauth.
+   * Allow globs to be used in user() pagespecs.
+   * Group related plugins into sections in the setup file, and drop
+     unused rcs plugins from the setup file."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 172dfa9f64b5a248042af7c4b741fdd4c71813ec Mon Sep 17 00:00:00 2001
From: "http://seeitcoming.myopenid.com/"
 <http://seeitcoming.myopenid.com/@web>
Date: Sat, 13 Feb 2010 15:16:09 +0000
Subject: Added information about python implementation for reference

---
 doc/todo/abbreviation.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/abbreviation.mdwn b/doc/todo/abbreviation.mdwn
index d24166710..f2880091c 100644
--- a/doc/todo/abbreviation.mdwn
+++ b/doc/todo/abbreviation.mdwn
@@ -2,4 +2,6 @@ We might want some kind of abbreviation and acronym plugin. --[[JoshTriplett]]
 
  * Not sure if this is what you mean, but I'd love a way to make works which match existing page names automatically like (eg. if there is a page called "MySQL" then any time the word MySQL is mentioned it should become a link to that page).  -- [[AdamShand]]
 
+ * The python-markdown-extras package has support for [abbreviations](http://www.freewisdom.org/projects/python-markdown/Abbreviations), with the syntax that you just use the abbreviation in text (e.g. HTML) and then define the abbreviations at the end (like "footnote-style" links). For consistency, it might be good to use the same syntax, which apparently derives from [PHP-markdown-extra](http://michelf.com/projects/php-markdown/extra/#abbr).
+
 [[wishlist]]
-- 
cgit v1.2.3


From a38418a8a3652bad60c83a0dd7502f7afb991512 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Feb 2010 14:07:56 -0500
Subject: close

---
 doc/todo/openid_user_filtering.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/todo/openid_user_filtering.mdwn b/doc/todo/openid_user_filtering.mdwn
index 8b2d0082e..7f8b2a55e 100644
--- a/doc/todo/openid_user_filtering.mdwn
+++ b/doc/todo/openid_user_filtering.mdwn
@@ -7,3 +7,7 @@ So I suggest an ikiwiki configuration like:
      users => ["*.webvm.net"],
 
 Would only allow edits from openIDs of that form.
+
+> This kind of thing can be [[done]] now: --[[Joey]] 
+> 
+>	locked_pages => "user(http://*.webvm.net/)"
-- 
cgit v1.2.3


From 6fc25c8df79c4ce9afde256be5d377ee82562c31 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Feb 2010 14:13:30 -0500
Subject: clarify

---
 doc/todo/openid_user_filtering.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/openid_user_filtering.mdwn b/doc/todo/openid_user_filtering.mdwn
index 7f8b2a55e..6a318c4c0 100644
--- a/doc/todo/openid_user_filtering.mdwn
+++ b/doc/todo/openid_user_filtering.mdwn
@@ -10,4 +10,4 @@ Would only allow edits from openIDs of that form.
 
 > This kind of thing can be [[done]] now: --[[Joey]] 
 > 
->	locked_pages => "user(http://*.webvm.net/)"
+>	locked_pages => "* and !user(http://*.webvm.net/)"
-- 
cgit v1.2.3


From 0cc5ed592db082a815d2588d378dd9a3995dcd9f Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Sun, 14 Feb 2010 12:40:03 +0000
Subject: new thread

---
 ...ine_774__44_____60____36__in__62___chunk_1.__39__.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn

diff --git a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
new file mode 100644
index 000000000..56ac4b894
--- /dev/null
+++ b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
@@ -0,0 +1,15 @@
+# getting Warnings about UTF8-Chars.
+
+I'm  getting multiple warnings:
+
+      utf8 "\xAB" does not map to Unicode at /usr/share/perl5/IkiWiki.pm line 774, <$in> chunk 1.
+
+
+I'm assuming this is once per File, but even in verbose mode, it doesn't tell me which file is a problem.
+It first reads all the files, and afterwards when parsing/compiling them, it outputs the warning, so I can't
+deduce the offending files.
+
+Is there a way to have ikiwiki output the position, where it encounters the character?
+
+Probably all this has to do with locale-settings, and usage of mixed locales in a distributed setup ...
+I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalzer]]
-- 
cgit v1.2.3


From 5107530344ca728fc73418a4032a41f22a172a3a Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Sun, 14 Feb 2010 14:21:55 +0000
Subject: Update - trying to debug it

---
 ...4__44_____60____36__in__62___chunk_1.__39__.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
index 56ac4b894..931e339e2 100644
--- a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
+++ b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
@@ -13,3 +13,24 @@ Is there a way to have ikiwiki output the position, where it encounters the char
 
 Probably all this has to do with locale-settings, and usage of mixed locales in a distributed setup ...
 I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalzer]]
+
+--------
+
+**Update** : So I took the chance to insert debug into ikiwiki.pm:
+
+     root@novalis:/usr/share/perl5# diff -p /tmp/IkiWiki.orig.pm IkiWiki.pm 
+     *** /tmp/IkiWiki.orig.pm        Sun Feb 14 15:16:08 2010
+     --- IkiWiki.pm  Sun Feb 14 15:16:28 2010
+     *************** sub readfile ($;$$) {
+     *** 768,773 ****
+     --- 768,774 ----
+             }
+       
+             local $/=undef;
+     +       debug("opening File: $file:");
+             open (my $in, "<", $file) || error("failed to read $file: $!");
+             binmode($in) if ($binary);
+             return \*$in if $wantfd;
+
+
+But what I see now is not quite helpful, as it seems, STDERR and DEBUG are asyncronous, so they mix up in a way, that I can't really see, whats the problem ...  Maybe I'm better off for troubleshooting, to insert an printf to strerr to have it in the same stream.. --[[jwalzer]]
-- 
cgit v1.2.3


From 693fb3b18654abae84efeccd046a358f56dc2be7 Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Sun, 14 Feb 2010 14:50:51 +0000
Subject:

---
 ...pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
index 931e339e2..72f2d38e0 100644
--- a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
+++ b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
@@ -34,3 +34,14 @@ I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalze
 
 
 But what I see now is not quite helpful, as it seems, STDERR and DEBUG are asyncronous, so they mix up in a way, that I can't really see, whats the problem ...  Maybe I'm better off for troubleshooting, to insert an printf to strerr to have it in the same stream.. --[[jwalzer]]
+
+
+----
+
+**Update:** The "print STDERR $file;"-Trick did it .. I was able to find a mdwn-file, that (was generated by a script of me) had \0xAB in it.
+
+Nevertheless I still wonder if this should be a problem. This character happend to be in an *\[\[meta title='$CHAR'\]\]-tag* and an *\[$CHAR\]http://foo)-Link*
+
+Should this throw an warning? Maybe this warning could be catched an reported inclusively the containing filename? maybe even with an override, if one knows that it is correct that way? --[[jwalzer]]
+
+[[!tag solved]]
-- 
cgit v1.2.3


From f1183cbf0c9c09725192dcc8384381f9112ae222 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Feb 2010 17:25:30 -0500
Subject: add ngettext support & optimize gettext handling

As I was adding ngettext support, I realized I could optimize the gettext
functions by memoizing the creation of the gettext object. Note that
the object creation is still deferred until a gettext function is called,
to avoid unnecessary startup penalties on code paths that do not need
gettext.

A side benefit is that separate stub functions are no longer needed to
handle the C language case.
---
 IkiWiki.pm             | 44 ++++++++++++++++++++++++++++++--------------
 doc/plugins/write.mdwn |  4 ++++
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a96ff1236..b9a419d1d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -20,7 +20,7 @@ use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
                  add_depends pagespec_match pagespec_match_list bestlink
 		 htmllink readfile writefile pagetype srcfile pagename
-		 displaytime will_render gettext urlto targetpage
+		 displaytime will_render gettext ngettext urlto targetpage
 		 add_underlay pagetitle titlepage linkpage newpagefile
 		 inject add_link
                  %config %links %pagestate %wikistate %renderedfiles
@@ -1820,27 +1820,38 @@ sub file_pruned ($;$) {
 sub define_gettext () {
 	# If translation is needed, redefine the gettext function to do it.
 	# Otherwise, it becomes a quick no-op.
-	no warnings 'redefine';
+	my $gettext_obj;
+	my $getobj;
 	if ((exists $ENV{LANG} && length $ENV{LANG}) ||
 	    (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
 	    (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) {
-	    	*gettext=sub {
-			my $gettext_obj=eval q{
+	    	$getobj=sub {
+			$gettext_obj=eval q{
 				use Locale::gettext q{textdomain};
 				Locale::gettext->domain('ikiwiki')
 			};
-
-			if ($gettext_obj) {
-				$gettext_obj->get(shift);
-			}
-			else {
-				return shift;
-			}
 		};
 	}
-	else {
-		*gettext=sub { return shift };
-	}
+
+	no warnings 'redefine';
+	*gettext=sub {
+		$getobj->() if $getobj;
+		if ($gettext_obj) {
+			$gettext_obj->get(shift);
+		}
+		else {
+			return shift;
+		}
+	};
+  	*ngettext=sub {
+		$getobj->() if $getobj;
+		if ($gettext_obj) {
+			$gettext_obj->nget(@_);
+		}
+		else {
+			return ($_[2] == 1 ? $_[0] : $_[1])
+		}
+	};
 }
 
 sub gettext {
@@ -1848,6 +1859,11 @@ sub gettext {
 	gettext(@_);
 }
 
+sub ngettext {
+	define_gettext();
+	ngettext(@_);
+}
+
 sub yesno ($) {
 	my $val=shift;
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index a8c9de2d3..96a2aa16d 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -911,6 +911,10 @@ time.
 
 This is the standard gettext function, although slightly optimised.
 
+### `ngettext`
+
+This is the standard ngettext function, although slightly optimised.
+
 ### `urlto($$;$)`
 
 Construct a relative url to the first parameter from the page named by the
-- 
cgit v1.2.3


From 9a0b9bdc88c1b47c14ad0b587c93bbac400e61ac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Feb 2010 18:09:28 -0500
Subject: minor refactor/optimisation

---
 IkiWiki/Plugin/comments.pm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 1e71749a4..5bcf4a981 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -742,28 +742,24 @@ sub pagetemplate (@) {
 		}
 	}
 
-	if ($template->query(name => 'commentsurl')) {
-		if ($shown) {
+	if ($shown) {
+		if ($template->query(name => 'commentsurl')) {
 			$template->param(commentsurl =>
 				urlto($page, undef, 1).'#comments');
 		}
-	}
 
-	if ($template->query(name => 'atomcommentsurl') && $config{usedirs}) {
-		if ($shown) {
+		if ($template->query(name => 'atomcommentsurl') && $config{usedirs}) {
 			# This will 404 until there are some comments, but I
 			# think that's probably OK...
 			$template->param(atomcommentsurl =>
 				urlto($page, undef, 1).'comments.atom');
 		}
-	}
 
-	if ($template->query(name => 'commentslink')) {
 		# XXX Would be nice to say how many comments there are in
 		# the link. But, to update the number, blog pages
 		# would have to update whenever comments of any inlines
 		# page are added, which is not currently done.
-		if ($shown) {
+		if ($template->query(name => 'commentslink')) {
 			$template->param(commentslink =>
 				htmllink($page, $params{destpage}, $page,
 					linktext => gettext("Comments"),
-- 
cgit v1.2.3


From c21eb47e627de2dfd5409b459b2e11498c534f3c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Feb 2010 18:27:47 -0500
Subject: comments: Display number of comments in comment action link.

This was not doable before, but when I added transitive dependency handling
in the big dependency rewrite, it became possible to include a comment
count when inlining.

This also improves the action link when a page has no comments. It will
link direct to the cgi to allow posting the first comment. And if the page
is locked to prevent posting new comments, the link is no longer shown.
---
 IkiWiki/Plugin/comments.pm | 36 +++++++++++++++++++++++++-----------
 debian/changelog           |  8 ++++++++
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 5bcf4a981..8f8472f07 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -736,9 +736,7 @@ sub pagetemplate (@) {
 		}
 
 		if ($shown && commentsopen($page)) {
-			my $addcommenturl = IkiWiki::cgiurl(do => 'comment',
-				page => $page);
-			$template->param(addcommenturl => $addcommenturl);
+			$template->param(addcommenturl => addcommenturl($page));
 		}
 	}
 
@@ -755,16 +753,26 @@ sub pagetemplate (@) {
 				urlto($page, undef, 1).'comments.atom');
 		}
 
-		# XXX Would be nice to say how many comments there are in
-		# the link. But, to update the number, blog pages
-		# would have to update whenever comments of any inlines
-		# page are added, which is not currently done.
 		if ($template->query(name => 'commentslink')) {
-			$template->param(commentslink =>
-				htmllink($page, $params{destpage}, $page,
-					linktext => gettext("Comments"),
+			my $num=num_comments($page, $config{srcdir});
+			my $link;
+			if ($num > 0) {
+				$link = htmllink($page, $params{destpage}, $page,
+					linktext => sprintf(ngettext("%i comment", "%i comments", $num), $num),
 					anchor => "comments",
-					noimageinline => 1));
+					noimageinline => 1
+				);
+			}
+			elsif (commentsopen($page)) {
+				$link = "<a href=\"".addcommenturl($page)."\">".
+					#translators: Here "Comment" is a verb;
+					#translators: the user clicks on it to
+					#translators: post a comment.
+					gettext("Comment").
+					"</a>";
+			}
+			$template->param(commentslink => $link)
+				if defined $link;
 		}
 	}
 
@@ -812,6 +820,12 @@ sub pagetemplate (@) {
 	}
 }
 
+sub addcommenturl ($) {
+	my $page=shift;
+
+	return IkiWiki::cgiurl(do => 'comment', page => $page);
+}
+
 sub num_comments ($$) {
 	my $page=shift;
 	my $dir=shift;
diff --git a/debian/changelog b/debian/changelog
index c91feae0d..e3ec89eed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20100213) UNRELEASED; urgency=low
+
+  * comments: Display number of comments in comment action link.
+  * Rebuild wikis on upgrade to this version to get the comment counts
+    added to existing pages.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500
+
 ikiwiki (3.20100212) unstable; urgency=low
 
   * template: Preprocess parameters before htmlizing.
-- 
cgit v1.2.3


From 21997387d40326e623cddb10a93dcb208025b77a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Feb 2010 19:23:09 -0500
Subject: optimise whitespace in feed templates

---
 templates/atomitem.tmpl | 80 ++++++++++++++++++++++++-------------------------
 templates/atompage.tmpl | 34 ++++++++++-----------
 templates/rssitem.tmpl  | 34 ++++++++++-----------
 3 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 768695a2c..87cbee9e0 100644
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,48 +1,48 @@
 <entry>
 	<title><TMPL_VAR TITLE></title>
-	<TMPL_IF NAME="GUID">
-	  <id><TMPL_VAR GUID></id>
-	<TMPL_ELSE>
-	  <id><TMPL_VAR URL></id>
-	</TMPL_IF>
+<TMPL_IF NAME="GUID">
+	<id><TMPL_VAR GUID></id>
+<TMPL_ELSE>
+	<id><TMPL_VAR URL></id>
+</TMPL_IF>
 	<link href="<TMPL_VAR PERMALINK>"/>
-	<TMPL_IF NAME="AUTHOR">
-	 <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
-	</TMPL_IF>
-	<TMPL_IF NAME="COPYRIGHT">
-	 <rights type="html" xml:lang="en">
-	   <TMPL_IF NAME="LICENSE">
-	    <TMPL_VAR LICENSE ESCAPE=HTML>
-	    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-	   <TMPL_ELSE>
-	    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-	   </TMPL_IF>
-	 </rights>
-	<TMPL_ELSE>
-	 <TMPL_IF NAME="LICENSE">
-	  <rights type="html" xml:lang="en">
-	    <TMPL_VAR LICENSE ESCAPE=HTML>
-	  </rights>
-	 </TMPL_IF>
-	</TMPL_IF>
-	<TMPL_IF NAME="CATEGORIES">
-	 <TMPL_LOOP NAME="CATEGORIES">
-	  <category term="<TMPL_VAR CATEGORY>" />
-	 </TMPL_LOOP>
-	</TMPL_IF>
+<TMPL_IF NAME="AUTHOR">
+	<author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
+</TMPL_IF>
+<TMPL_IF NAME="COPYRIGHT">
+	<rights type="html" xml:lang="en">
+<TMPL_IF NAME="LICENSE">
+		<TMPL_VAR LICENSE ESCAPE=HTML>
+		<TMPL_VAR COPYRIGHT ESCAPE=HTML>
+<TMPL_ELSE>
+		<TMPL_VAR COPYRIGHT ESCAPE=HTML>
+</TMPL_IF>
+	</rights>
+<TMPL_ELSE>
+<TMPL_IF NAME="LICENSE">
+	<rights type="html" xml:lang="en">
+	<TMPL_VAR LICENSE ESCAPE=HTML>
+	</rights>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF NAME="CATEGORIES">
+<TMPL_LOOP NAME="CATEGORIES">
+	<category term="<TMPL_VAR CATEGORY>" />
+</TMPL_LOOP>
+</TMPL_IF>
 	<updated><TMPL_VAR MDATE_3339></updated>
 	<published><TMPL_VAR CDATE_3339></published>
-	<TMPL_IF NAME="ENCLOSURE">
-	 <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
-	<TMPL_ELSE>
-	 <content type="html" xml:lang="en">
-	  <TMPL_VAR CONTENT ESCAPE=HTML>
-	 </content>
-	</TMPL_IF>
-	<TMPL_IF NAME="COMMENTSURL">
+<TMPL_IF NAME="ENCLOSURE">
+	<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
+<TMPL_ELSE>
+	<content type="html" xml:lang="en">
+	<TMPL_VAR CONTENT ESCAPE=HTML>
+	</content>
+</TMPL_IF>
+<TMPL_IF NAME="COMMENTSURL">
 	<link rel="comments" href="<TMPL_VAR NAME="COMMENTSURL">" type="text/html" />
-	</TMPL_IF>
-	<TMPL_IF NAME="ATOMCOMMENTSURL">
+</TMPL_IF>
+<TMPL_IF NAME="ATOMCOMMENTSURL">
 	<link rel="comments" href="<TMPL_VAR NAME="ATOMCOMMENTSURL">" type="application/atom+xml" />
-	</TMPL_IF>
+</TMPL_IF>
 </entry>
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index dcb89ab5c..fc0088ae8 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -6,31 +6,31 @@
 <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <author>
 <TMPL_IF NAME="AUTHOR">
- <name><TMPL_VAR AUTHOR></name>
+<name><TMPL_VAR AUTHOR></name>
 <TMPL_ELSE>
- <name><TMPL_VAR WIKINAME></name>
+<name><TMPL_VAR WIKINAME></name>
 </TMPL_IF>
 </author>
 <TMPL_IF NAME="COPYRIGHT">
- <rights type="html" xml:lang="en">
-   <TMPL_IF NAME="LICENSE">
-    <TMPL_VAR LICENSE>
-    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-   <TMPL_ELSE>
-    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-   </TMPL_IF>
- </rights>
+<rights type="html" xml:lang="en">
+<TMPL_IF NAME="LICENSE">
+	<TMPL_VAR LICENSE>
+	<TMPL_VAR COPYRIGHT ESCAPE=HTML>
 <TMPL_ELSE>
- <TMPL_IF NAME="LICENSE">
-  <rights type="html">
-    <TMPL_VAR LICENSE ESCAPE=HTML>
-  </rights>
- </TMPL_IF>
+	<TMPL_VAR COPYRIGHT ESCAPE=HTML>
+</TMPL_IF>
+</rights>
+<TMPL_ELSE>
+<TMPL_IF NAME="LICENSE">
+<rights type="html">
+	<TMPL_VAR LICENSE ESCAPE=HTML>
+</rights>
+</TMPL_IF>
 </TMPL_IF>
 <TMPL_IF NAME="GUID">
-  <id><TMPL_VAR GUID></id>
+<id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
-  <id><TMPL_VAR PAGEURL></id>
+<id><TMPL_VAR PAGEURL></id>
 </TMPL_IF>
 <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
 <generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index a61b92b61..069ae1997 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,29 +1,29 @@
 <item>
-	<TMPL_IF NAME="AUTHOR">
+<TMPL_IF NAME="AUTHOR">
 	<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
 	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
-	<TMPL_ELSE>
+<TMPL_ELSE>
 	<title><TMPL_VAR TITLE></title>
-	</TMPL_IF>
-	<TMPL_IF NAME="GUID">
-	  <guid isPermaLink="no"><TMPL_VAR GUID></guid>
-	<TMPL_ELSE>
-	  <guid><TMPL_VAR URL></guid>
-	</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF NAME="GUID">
+	<guid isPermaLink="no"><TMPL_VAR GUID></guid>
+<TMPL_ELSE>
+	<guid><TMPL_VAR URL></guid>
+</TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
-	<TMPL_IF NAME="CATEGORIES">
-	<TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF NAME="CATEGORIES">
+<TMPL_LOOP NAME="CATEGORIES">
 	<category><TMPL_VAR CATEGORY></category>
-	</TMPL_LOOP>
-	</TMPL_IF>
+</TMPL_LOOP>
+</TMPL_IF>
 	<pubDate><TMPL_VAR CDATE_822></pubDate>
 	<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
-	<TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF NAME="ENCLOSURE">
 	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
-	<TMPL_ELSE>
+<TMPL_ELSE>
 	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
-	</TMPL_IF>
-	<TMPL_IF NAME="COMMENTSURL">
+</TMPL_IF>
+<TMPL_IF NAME="COMMENTSURL">
 	<comments><TMPL_VAR NAME="COMMENTSURL"></comments>
-	</TMPL_IF>
+</TMPL_IF>
 </item>
-- 
cgit v1.2.3


From 427720a21fb202f83c9e8df912cd464a2f5011aa Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Mon, 15 Feb 2010 02:10:23 +0000
Subject: + ipol.im

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 469fc0f6d..4502b589b 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -50,6 +50,7 @@ Projects & Organizations
 * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
 * [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/)
 * [Wetknee Books](http://www.wetknee.com/)
+* [IPOL Image Processing On Line](http://www.ipol.im)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 079377427fbddb20b2b5e7d4e687c6b9631c90ab Mon Sep 17 00:00:00 2001
From: aghitza <aghitza@web>
Date: Mon, 15 Feb 2010 10:58:40 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4502b589b..ee060e063 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -135,6 +135,7 @@ Personal sites and blogs
 * [Avian Aqua Miser](http://www.avianaquamiser.com/)
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
 * [Backyard Deer](http://www.backyarddeer.com/)
+* [Alex Ghitza homepage and blog](http://aghitza.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From bf33edc573952a8e21b41c8aaf35c66ee5073a12 Mon Sep 17 00:00:00 2001
From: "http://mem.myopenid.com/" <http://mem.myopenid.com/@web>
Date: Mon, 15 Feb 2010 22:38:06 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index ee060e063..df2d6b68b 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -51,6 +51,7 @@ Projects & Organizations
 * [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/)
 * [Wetknee Books](http://www.wetknee.com/)
 * [IPOL Image Processing On Line](http://www.ipol.im)
+* [Debian Costa Rica](http://cr.debian.net/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From b12f65d4dcee8063de5252a407491a1dc212cb9a Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:32:39 +0000
Subject: redirect

---
 doc/users/NicolasLimare.mdwn | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/doc/users/NicolasLimare.mdwn b/doc/users/NicolasLimare.mdwn
index 003449d40..602d28ba2 100644
--- a/doc/users/NicolasLimare.mdwn
+++ b/doc/users/NicolasLimare.mdwn
@@ -1,9 +1 @@
-Nicolas (nil) uses ikiwiki on a site/wiki/blog/something... and feels this approach much more comfortable than the usual web-only ones.
-
-He didn't touch any perl code before using ikiwiki, ant that was the first opportunity to propose tiny patches.
-
-Actualy, he would have felt much more comfortable with a python ikiwiki... :)
-
-Can be reached at nicolas at limare.net
-
-By the way, I can make translations to french if needed. And maybe to japanese.
\ No newline at end of file
+[[meta redirect="nil"]]
-- 
cgit v1.2.3


From 1ae028d4fa92d2f6e7a7ec9e2bccabe28ca496b7 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:33:11 +0000
Subject: fix

---
 doc/users/NicolasLimare.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/NicolasLimare.mdwn b/doc/users/NicolasLimare.mdwn
index 602d28ba2..c409e3a2d 100644
--- a/doc/users/NicolasLimare.mdwn
+++ b/doc/users/NicolasLimare.mdwn
@@ -1 +1 @@
-[[meta redirect="nil"]]
+[[!meta redirect="nil"]]
-- 
cgit v1.2.3


From 8df6055f4cb95b3d8f541acfccc6b0ba2d88f7b6 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:36:36 +0000
Subject: import

---
 doc/users/nil.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/users/nil.mdwn

diff --git a/doc/users/nil.mdwn b/doc/users/nil.mdwn
new file mode 100644
index 000000000..e1826cec6
--- /dev/null
+++ b/doc/users/nil.mdwn
@@ -0,0 +1,8 @@
+nil first used ikiwiki on a site/wiki/blog/something... and felt this approach much more comfortable than the usual web-only ones.
+Since then, ikiwiki is a kind of swiss army knife when it comes to build anything for the web.
+
+Can be reached at nicolas at limare.net
+
+The current big ikiwiki-powered project is <http://www.ipol.im> 
+
+TODO: document "how to split public/edition interfaces"
-- 
cgit v1.2.3


From ce8bb219586332032110da8835fde8dd5f0ed91f Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:42:11 +0000
Subject: whishlist

---
 doc/todo/cdate_and_mdate_available_for_templates.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/todo/cdate_and_mdate_available_for_templates.mdwn

diff --git a/doc/todo/cdate_and_mdate_available_for_templates.mdwn b/doc/todo/cdate_and_mdate_available_for_templates.mdwn
new file mode 100644
index 000000000..29c36b9f7
--- /dev/null
+++ b/doc/todo/cdate_and_mdate_available_for_templates.mdwn
@@ -0,0 +1,15 @@
+[[!tag whishlist]]
+
+`CDATE_3339`, `CDATE_822`, `MDATE_3339` and `MDATE_822` template variables would be useful for evey page, at least for my templates with Dublin Core metadata.
+
+I tried to pick the relevant lines of the [[inline|plugins/inline]] plugin and hack it into a custom plugin, but it failed miserably because of my obvious lack of perl litteracy...
+
+Anyway, I'm sure this is almost nothing...
+
+* `sub date_822 ($) {}`
+* `sub date_3339 ($) {}`
+* and something like `$template->param('cdate_822' => date_822($IkiWiki::pagectime{$page}));`
+
+Anyone can fill the missing lines?
+
+-- [[nil]]
-- 
cgit v1.2.3


From d4bc6e25e43f0cb2f12d7e9d954cbfc227c1686d Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:43:10 +0000
Subject: typo

---
 doc/todo/cdate_and_mdate_available_for_templates.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/cdate_and_mdate_available_for_templates.mdwn b/doc/todo/cdate_and_mdate_available_for_templates.mdwn
index 29c36b9f7..70d8fc8c9 100644
--- a/doc/todo/cdate_and_mdate_available_for_templates.mdwn
+++ b/doc/todo/cdate_and_mdate_available_for_templates.mdwn
@@ -1,4 +1,4 @@
-[[!tag whishlist]]
+[[!tag wishlist]]
 
 `CDATE_3339`, `CDATE_822`, `MDATE_3339` and `MDATE_822` template variables would be useful for evey page, at least for my templates with Dublin Core metadata.
 
-- 
cgit v1.2.3


From f02b87433b271b6229686d1494fbe419c6eca149 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:44:28 +0000
Subject: s/redirect/redir/

---
 doc/users/NicolasLimare.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/NicolasLimare.mdwn b/doc/users/NicolasLimare.mdwn
index c409e3a2d..56a950f7e 100644
--- a/doc/users/NicolasLimare.mdwn
+++ b/doc/users/NicolasLimare.mdwn
@@ -1 +1 @@
-[[!meta redirect="nil"]]
+[[!meta redir="nil"]]
-- 
cgit v1.2.3


From 34d6403a4b12c9578e7b0ea3fb765e1c5e72520f Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Wed, 17 Feb 2010 11:54:26 +0000
Subject: new feature request: identifying trivial edits

---
 ...trivial__44___identify__47__filter_on_trivial_changes.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn

diff --git a/doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn b/doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn
new file mode 100644
index 000000000..2b2b0242e
--- /dev/null
+++ b/doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn
@@ -0,0 +1,11 @@
+One feature of mediawiki which I quite like is the ability to mark a change as 'minor', or 'trivial'. This can then be used to filter the 'recentchanges' page, to only show substantial edits.
+
+The utility of this depends entirely on whether the editors use it properly.
+
+I currently use an inline on the front page of my personal homepage to show the most recent pages (by creation date) within a subsection of my site (a blog). Blog posts are rarely modified much after they are 'created' (or published - I bodge the creation time via meta when I publish a post. It might sit in draft form indefinitely), so this effectively shows only non-trivial changes.
+
+I would like to have a short list of the most recent modifications to the site on the front page. I therefore want to sort by modified time rather than creation time, but exclude edits that I self-identify as minor. I also only want to take a short number of items, the top 5, and display only their titles (which may be derived from filename, or set via meta again).
+
+I'm still thinking through how this might be achieved in an ikiwiki-suitable fashion, but I think I need a scheme to identify certain edits as trivial. This would have to work via web edits (easier: could add a check box to the edit form) and plain changes in the VCS (harder: scan for keywords in a commit message? in a VCS-agnostic fashion?)
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From 995e247f42e88eeefa47e62d1fada49edaa953a3 Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Thu, 18 Feb 2010 11:43:11 +0000
Subject: Add my homepage generated by Ikiwiki

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index df2d6b68b..c9dea83a8 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -137,6 +137,7 @@ Personal sites and blogs
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
+* [Mukund's homepage](http://www.mukund.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 3200be56e5fc6c89115277f9f842a3f417f8d7db Mon Sep 17 00:00:00 2001
From: prosper <prosper@web>
Date: Fri, 19 Feb 2010 10:23:26 +0000
Subject:

---
 doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn

diff --git a/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
new file mode 100644
index 000000000..8cc97a032
--- /dev/null
+++ b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
@@ -0,0 +1,7 @@
+It seems that rebuild a wiki (`ikiwiki --rebuild`) after changing the `underlaydir` config option doesn't remove the pages coming from the previous underlaydir. 
+
+I've noticed this with the debian package version 3.20100102.3~bpo50+1.
+
+Perhaps it is possible to improve this or mention it in the manual page?
+
+--prosper
-- 
cgit v1.2.3


From 598fdfd1aa1180e296af42f5b15f6b3add716be7 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Fri, 19 Feb 2010 10:56:31 +0000
Subject: Correct broken links

---
 doc/users/jogo.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/users/jogo.mdwn b/doc/users/jogo.mdwn
index 6f87cbc45..e8068a10f 100644
--- a/doc/users/jogo.mdwn
+++ b/doc/users/jogo.mdwn
@@ -1,5 +1,5 @@
  * An [economic game](http://sef.matabio.net/) in french, which [use](http://sef.matabio.net/wiki/) IkiWiki.
- * Some [plugins](http://kimya.matabio.net/tcgi/hg/IkiPlugins/file/).
- * An alternative [base wiki](http://kimya.matabio.net/tcgi/hg/FrIkiWiki/file/) in french.
+ * Some [plugins](http://www.matabio.net/tcgi/hg/IkiPlugins/file/).
+ * An alternative [base wiki](http://www.matabio.net/tcgi/hg/FrIkiWiki/file/) in french.
 
 email: `jogo matabio net`.
-- 
cgit v1.2.3


From d1137697a80ca5e90bfc9d1c1f00b455871b99c5 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 19 Feb 2010 14:00:52 +0000
Subject: fix 'done' link

---
 doc/todo/conflict_free_comment_merges.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/conflict_free_comment_merges.mdwn b/doc/todo/conflict_free_comment_merges.mdwn
index 2cef0ee8c..e84400c17 100644
--- a/doc/todo/conflict_free_comment_merges.mdwn
+++ b/doc/todo/conflict_free_comment_merges.mdwn
@@ -20,4 +20,4 @@ What do you think [[smcv]]? --[[Joey]]
 > are quite low since it modifies the input text and adds a date stamp to
 > it.
 >
-> Anyway, I think it's good, [[[done]] --[[Joey]] 
+> Anyway, I think it's good, [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 59017c6ae19f661761d0ae3f143fbda643ca1e8d Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 19 Feb 2010 14:02:29 +0000
Subject: prevent keyboard mashing

---
 doc/todo/double-click_protection_for_form_buttons.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/todo/double-click_protection_for_form_buttons.mdwn

diff --git a/doc/todo/double-click_protection_for_form_buttons.mdwn b/doc/todo/double-click_protection_for_form_buttons.mdwn
new file mode 100644
index 000000000..4c0d95bd6
--- /dev/null
+++ b/doc/todo/double-click_protection_for_form_buttons.mdwn
@@ -0,0 +1 @@
+A small piece of JS to prevent double-submitting forms would be quite nice. I seem to have developed a habit of doing this and having to resolve a merge conflict for two initial commits. -- [[Jon]]
-- 
cgit v1.2.3


From d01e7248bf4c9f6a7ec6920a0fe4cda4d776e171 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Feb 2010 13:33:48 -0500
Subject: response

---
 doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
index 8cc97a032..8613ef03c 100644
--- a/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
+++ b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
@@ -5,3 +5,8 @@ I've noticed this with the debian package version 3.20100102.3~bpo50+1.
 Perhaps it is possible to improve this or mention it in the manual page?
 
 --prosper
+
+> --rebuild causes ikiwiki to throw away all its info about what it built
+> before, so it will never clean up pages that have been removed, by any
+> means. Suggest you do a --refresh, possibly followed by a --rebuild
+> if that is really necessary. --[[Joey]]
-- 
cgit v1.2.3


From ef537ed3553c590abbc302a97299ae5082471fea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Feb 2010 13:38:37 -0500
Subject: response

---
 doc/todo/double-click_protection_for_form_buttons.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/todo/double-click_protection_for_form_buttons.mdwn b/doc/todo/double-click_protection_for_form_buttons.mdwn
index 4c0d95bd6..501be4498 100644
--- a/doc/todo/double-click_protection_for_form_buttons.mdwn
+++ b/doc/todo/double-click_protection_for_form_buttons.mdwn
@@ -1 +1,5 @@
 A small piece of JS to prevent double-submitting forms would be quite nice. I seem to have developed a habit of doing this and having to resolve a merge conflict for two initial commits. -- [[Jon]]
+
+> By the time you see that merge conflict, the first commit has
+> already successfully happened, so you can just hit cancel
+> and throw away the second submit. --[[Joey]] 
-- 
cgit v1.2.3


From f0b0bb5894e056eeb67c50cf096f950f1fbc718a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Feb 2010 14:27:42 -0500
Subject: ctime idea

---
 doc/todo/auto_getctime_on_fresh_build.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/todo/auto_getctime_on_fresh_build.mdwn

diff --git a/doc/todo/auto_getctime_on_fresh_build.mdwn b/doc/todo/auto_getctime_on_fresh_build.mdwn
new file mode 100644
index 000000000..ea95fb8c9
--- /dev/null
+++ b/doc/todo/auto_getctime_on_fresh_build.mdwn
@@ -0,0 +1,9 @@
+[[!tag wishlist]]
+
+It might be a good idea to enable --getctime when `.ikiwiki` does not
+exist. This way a new checkout of a `srcdir` would automatically get
+ctimes right. (Running --getctime whenever a rebuild is done would be too
+slow.) --[[Joey]] 
+
+Could this be too annoying in some cases, eg, checking out a large wiki
+that needs to get set up right away? --[[Joey]] 
-- 
cgit v1.2.3


From d83c4b91576131e1f1815357387e1505e6b59fc1 Mon Sep 17 00:00:00 2001
From: ThomasAdam <ThomasAdam@web>
Date: Sun, 21 Feb 2010 13:43:26 +0000
Subject: The Fvwmwiki uses ikiwiki

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index c9dea83a8..958bd54ff 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -138,6 +138,7 @@ Personal sites and blogs
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
 * [Mukund's homepage](http://www.mukund.org/)
+* [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From c67f96752642d4f01895f8ab135f2c5c6892b8be Mon Sep 17 00:00:00 2001
From: ThomasAdam <ThomasAdam@web>
Date: Sun, 21 Feb 2010 13:44:29 +0000
Subject: The Fvwm Wiki not a personal site or blog.

---
 doc/ikiwikiusers.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 958bd54ff..62064e024 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -52,6 +52,7 @@ Projects & Organizations
 * [Wetknee Books](http://www.wetknee.com/)
 * [IPOL Image Processing On Line](http://www.ipol.im)
 * [Debian Costa Rica](http://cr.debian.net/)
+* [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 
 Personal sites and blogs
 ========================
@@ -138,7 +139,6 @@ Personal sites and blogs
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
 * [Mukund's homepage](http://www.mukund.org/)
-* [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 9d8ae8a483d8fc32de95d7855202d00f85250794 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Wed, 24 Feb 2010 12:30:40 +0000
Subject: add a backlink-style map to the bottom of my page

---
 doc/users/jon.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index f08076c2a..35bdb5d7c 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -45,9 +45,14 @@ The following I have been looking at, but are on the back-burner:
   bugs such as [[bugs/tagged() matching wikilinks]]. Code for this lives
   in my github `tag2` branch: <http://github.com/jmtd/ikiwiki>
 
-Finally, the following are merely half-formed thoughts:
+Penultimately, the following are merely half-formed thoughts:
 
  * adding and removing tags to pages via the edit form by ticking and
    unticking checkboxes next to a tag name (rather than entering the 
    directive into the text of the page directly)
  * perhaps the same for meta
+
+Finally, backlinks (since I have issues with the current backlinks
+implementation, see [[bugs/backlinks onhover thing can go weird]]):
+
+[[!map pages="link(users/Jon)"]]
-- 
cgit v1.2.3


From cd1c861b151621f76fece06899500f0dac2fec57 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Wed, 24 Feb 2010 12:32:32 +0000
Subject: switch to inline, instead of map

---
 doc/users/jon.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 35bdb5d7c..d5593dcbf 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -55,4 +55,4 @@ Penultimately, the following are merely half-formed thoughts:
 Finally, backlinks (since I have issues with the current backlinks
 implementation, see [[bugs/backlinks onhover thing can go weird]]):
 
-[[!map pages="link(users/Jon)"]]
+[[!inline pages="link(users/Jon)" archive="yes" feeds="no"]]
-- 
cgit v1.2.3


From b9aca496920ffd0edfcaba5d003bb68aa47dcb6a Mon Sep 17 00:00:00 2001
From: "http://people.ee.ethz.ch/~andrmuel/openid/"
 <http://people.ee.ethz.ch/~andrmuel/openid/@web>
Date: Wed, 24 Feb 2010 14:59:31 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 62064e024..12d692979 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -139,6 +139,7 @@ Personal sites and blogs
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
 * [Mukund's homepage](http://www.mukund.org/)
+* [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From feeacaba028afe2e0b8835e2ebedc930de0f33a5 Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Wed, 24 Feb 2010 15:12:40 +0000
Subject:

---
 ...by_pagename_and_not_title_when_show__61__title_is_used.mdwn | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
index f8e257daf..bc19e7d87 100644
--- a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
+++ b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
@@ -1,4 +1,4 @@
-The [[directive/map]] directive sorty by pagename. That looks kind of odd, when used together with show=title. I would expect it to sort by title then.
+The [[ikiwiki/directive/map]] directive sort by pagename. That looks kind of odd, when used together with show=title. I would expect it to sort by title then.
 
 > This would be quite hard to fix. Map sorts the pages it displays by page
 > name, which has the happy effect of making "foo/bar" come after "foo";
@@ -6,3 +6,11 @@ The [[directive/map]] directive sorty by pagename. That looks kind of odd, when
 > it's located in. If sorting by title, that wouldn't hold. So, map
 > would have to be effectively totally rewritten, to build up each group
 > of child pages, and then re-sort those. --[[Joey]] 
+
+>> Ok, you are right, that does would break the tree. This made me think that I do not
+>> need to generate a tree for my particular use case just a list, so i thought i could use [[ikiwiki/directive/inline]] instead.
+>> This created two new issues:
+>>
+>> 1. inline also does sort by pagename even when explicitly told to sort by title.
+>>
+>> 2. I cannot get inline to create a list when the htmltidy plugin is switched on. I have a template which is enclosed in an li tag, and i put the ul tag around the inline manually, but htmltidy breaks this. --martin
-- 
cgit v1.2.3


From 068e47aa459028c260880ed5f27da2044cb79998 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Feb 2010 20:28:52 -0500
Subject: catch failure to open the filetypes file

---
 IkiWiki/Plugin/highlight.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 947fb692e..e517ac5c0 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -80,7 +80,7 @@ my %highlighters;
 
 # Parse highlight's config file to get extension => language mappings.
 sub read_filetypes () {
-	open (IN, $filetypes);
+	open (IN, $filetypes) || error("$filetypes: $!");
 	while (<IN>) {
 		chomp;
 		if (/^\$ext\((.*)\)=(.*)$/) {
-- 
cgit v1.2.3


From 983ecb0915b27f33e14e4b2e20090df69419f374 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Feb 2010 06:37:42 +0000
Subject: made a suggestion

---
 ...ap_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
index bc19e7d87..de178d415 100644
--- a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
+++ b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
@@ -14,3 +14,5 @@ The [[ikiwiki/directive/map]] directive sort by pagename. That looks kind of odd
 >> 1. inline also does sort by pagename even when explicitly told to sort by title.
 >>
 >> 2. I cannot get inline to create a list when the htmltidy plugin is switched on. I have a template which is enclosed in an li tag, and i put the ul tag around the inline manually, but htmltidy breaks this. --martin
+
+>>>> You might want to check if the [[plugins/contrib/report]] plugin solves your problem.  It can sort by title, among other things. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From b3c3c42b269c102123dcd80979cb9c49ce13bca7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Feb 2010 11:49:51 -0500
Subject: Loosen regexp, to allow empty quoted parameters in directives.

---
 IkiWiki.pm       |  6 +++---
 debian/changelog |  1 +
 t/preprocess.t   | 12 +++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b9a419d1d..9df6c90d6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1220,7 +1220,7 @@ sub preprocess ($$$;$$) {
 				(?:
 					"""(.*?)"""	# 2: triple-quoted value
 				|
-					"([^"]+)"	# 3: single-quoted value
+					"([^"]*?)"	# 3: single-quoted value
 				|
 					(\S+)		# 4: unquoted value
 				)
@@ -1306,7 +1306,7 @@ sub preprocess ($$$;$$) {
 					(?:
 						""".*?"""	# triple-quoted value
 						|
-						"[^"]+"		# single-quoted value
+						"[^"]*?"	# single-quoted value
 						|
 						[^"\s\]]+	# unquoted value
 					)
@@ -1329,7 +1329,7 @@ sub preprocess ($$$;$$) {
 					(?:
 						""".*?"""	# triple-quoted value
 						|
-						"[^"]+"		# single-quoted value
+						"[^"]*?"	# single-quoted value
 						|
 						[^"\s\]]+	# unquoted value
 					)
diff --git a/debian/changelog b/debian/changelog
index e3ec89eed..1960a1226 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low
   * comments: Display number of comments in comment action link.
   * Rebuild wikis on upgrade to this version to get the comment counts
     added to existing pages.
+  * Loosen regexp, to allow empty quoted parameters in directives.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500
 
diff --git a/t/preprocess.t b/t/preprocess.t
index e5026ed64..7bb9878d0 100755
--- a/t/preprocess.t
+++ b/t/preprocess.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 21;
+use Test::More tests => 31;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -26,6 +26,16 @@ is(IkiWiki::preprocess("foo", "foo", "[[foo ]]", 0, 0), "foo()", "simple");
 is(IkiWiki::preprocess("foo", "foo", "[[!foo ]]", 0, 0), "foo()", "prefixed");
 is(IkiWiki::preprocess("foo", "foo", "[[!foo]]", 0, 0), "[[!foo]]", "prefixed, no space");
 is(IkiWiki::preprocess("foo", "foo", "[[foo a=1]]", 0, 0), "foo(a => 1)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a="1"]]}, 0, 0), "foo(a => 1)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""1"""]]}, 0, 0), "foo(a => 1)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a=""]]}, 0, 0), "foo(a)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a="" b="1"]]}, 0, 0), "foo(a, b => 1)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a=""""""]]}, 0, 0), "foo(a)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""""" b="1"]]}, 0, 0), "foo(a, b => 1)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""""" b="""1"""]]}, 0, 0), "foo(a, b => 1)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""""" b=""""""]]}, 0, 0), "foo(a, b)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a="" b=""""""]]}, 0, 0), "foo(a, b)");
+is(IkiWiki::preprocess("foo", "foo", q{[[foo a="" b="""1"""]]}, 0, 0), "foo(a, b => 1)");
 is(IkiWiki::preprocess("foo", "foo", "[[foo a=\"1 2 3 4\"]]", 0, 0), "foo(a => 1 2 3 4)");
 is(IkiWiki::preprocess("foo", "foo", "[[foo ]] then [[foo a=2]]", 0, 0),
 	"foo() then foo(a => 2)");
-- 
cgit v1.2.3


From 7bf28731d767e1d9b1b69df3927c27bd85974fdf Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/will.uther"
 <http://www.google.com/profiles/will.uther@web>
Date: Sat, 27 Feb 2010 02:38:58 +0000
Subject: disable some inlines that I don't use much.

---
 doc/users/Will.mdwn | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/users/Will.mdwn b/doc/users/Will.mdwn
index f5effdbe3..1956263e0 100644
--- a/doc/users/Will.mdwn
+++ b/doc/users/Will.mdwn
@@ -13,14 +13,16 @@ Unless otherwise specified, any code that I post to this wiki I release under th
 
 ------
 
+Disabling these as I'm not using them much any more...
+
 ### Open Bugs:
 
-[[!inline pages="link(users/Will) and bugs/* and !bugs/done and !bugs/discussion and !link(patch) and !link(bugs/done) and !bugs/*/*" archive="yes" feeds="no" ]]
+\[[!inline pages="link(users/Will) and bugs/* and !bugs/done and !bugs/discussion and !link(patch) and !link(bugs/done) and !bugs/*/*" archive="yes" feeds="no" ]]
 
 ### Open ToDos:
 
-[[!inline pages="link(users/Will) and todo/* and !todo/done and !todo/discussion and !link(patch) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]]
+\[[!inline pages="link(users/Will) and todo/* and !todo/done and !todo/discussion and !link(patch) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]]
 
 ### Unapplied Patches:
 
-[[!inline pages="link(users/Will) and (todo/* or bugs/*) and !bugs/done and !bugs/discussion and !todo/done and !todo/discussion and link(patch) and !link(bugs/done) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]]
+\[[!inline pages="link(users/Will) and (todo/* or bugs/*) and !bugs/done and !bugs/discussion and !todo/done and !todo/discussion and link(patch) and !link(bugs/done) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]]
-- 
cgit v1.2.3


From 100636afa253c9808654b5db45feabc4ca1c6f8c Mon Sep 17 00:00:00 2001
From: "http://privat.myopenid.com/" <http://privat.myopenid.com/@web>
Date: Sat, 27 Feb 2010 15:12:39 +0000
Subject: patch for multiple sidebars

---
 ..._up_sidebar_to_allow_for_multiple_sidebars.mdwn | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index fb942a495..02b83244e 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -13,5 +13,57 @@ those contents instead.
 
 > In mine I just copied sidebar out and made some extra "sidebars", but they go elsewhere. Ugly hack, but it works. --[[simonraven]]
 
+>> Here a simple [[patch]] for multiple sidebars. Not too fancy but better than having multiple copies of the sidebar plugin. --[[jeanprivat]]
+
+<pre>
+--- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
++++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
+@@ -19,12 +19,20 @@
+ 			safe => 1,
+ 			rebuild => 1,
+ 		},
++		active_sidebars => {
++			type => "string",
++			example => qw(sidebar banner footer),
++			description => "Which sidebars must be activated and processed.",
++			safe => 1,
++			rebuild => 1
++		},
+ }
+ 
+-sub sidebar_content ($) {
++sub sidebar_content ($$) {
+ 	my $page=shift;
++	my $sidebar=shift;
+ 	
+-	my $sidebar_page=bestlink($page, "sidebar") || return;
++	my $sidebar_page=bestlink($page, $sidebar) || return;
+ 	my $sidebar_file=$pagesources{$sidebar_page} || return;
+ 	my $sidebar_type=pagetype($sidebar_file);
+ 	
+@@ -49,11 +57,17 @@
+ 
+ 	my $page=$params{page};
+ 	my $template=$params{template};
+-	
+-	if ($template->query(name => "sidebar")) {
+-		my $content=sidebar_content($page);
+-		if (defined $content && length $content) {
+-		        $template->param(sidebar => $content);
++
++	my @sidebars;
++	if (defined $config{active_sidebars} && length $config{active_sidebars}) { @sidebars = @{$config{active_sidebars}}; }
++	else { @sidebars = qw(sidebar); }
++
++	foreach my $sidebar (@sidebars) {
++		if ($template->query(name => $sidebar)) {
++			my $content=sidebar_content($page, $sidebar);
++			if (defined $content && length $content) {
++				$template->param($sidebar => $content);
++			}
+ 		}
+ 	}
+ }
+</pre>
 
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 7e2a22e0bf48ba58677b68d0950e18d2517b7bb3 Mon Sep 17 00:00:00 2001
From: "http://privat.myopenid.com/" <http://privat.myopenid.com/@web>
Date: Sat, 27 Feb 2010 15:16:25 +0000
Subject:

---
 doc/users/jeanprivat.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/jeanprivat.mdwn

diff --git a/doc/users/jeanprivat.mdwn b/doc/users/jeanprivat.mdwn
new file mode 100644
index 000000000..4d75a9867
--- /dev/null
+++ b/doc/users/jeanprivat.mdwn
@@ -0,0 +1 @@
+Jean Privat is <jean@pryen.org>.
-- 
cgit v1.2.3


From a12c386c86d000971125d70bf22213fd9595ed45 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 27 Feb 2010 16:26:13 -0500
Subject: Add force_overwrite setting to make setup automator overwrite
 existing files/directories.

This can be useful if you're driving the setup automator from another
program.
---
 IkiWiki/Setup/Automator.pm | 22 ++++++++++++----------
 debian/changelog           |  2 ++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 9fee4dcb7..79a610e20 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -40,17 +40,19 @@ sub import (@) {
 	my $this=shift;
 	IkiWiki::Setup::merge({@_});
 
-	# Avoid overwriting any existing files.
-	foreach my $key (qw{srcdir destdir repository dumpsetup}) {
-		next unless exists $config{$key};
-		my $add="";
-		my $dir=IkiWiki::dirname($config{$key})."/";
-		my $base=IkiWiki::basename($config{$key});
-		while (-e $dir.$add.$base) {
-			$add=1 if ! $add;
-			$add++;
+	if (! $config{force_overwrite}) {
+		# Avoid overwriting any existing files.
+		foreach my $key (qw{srcdir destdir repository dumpsetup}) {
+			next unless exists $config{$key};
+			my $add="";
+			my $dir=IkiWiki::dirname($config{$key})."/";
+			my $base=IkiWiki::basename($config{$key});
+			while (-e $dir.$add.$base) {
+				$add=1 if ! $add;
+				$add++;
+			}
+			$config{$key}=$dir.$add.$base;
 		}
-		$config{$key}=$dir.$add.$base;
 	}
 	
 	# Set up wrapper
diff --git a/debian/changelog b/debian/changelog
index 1960a1226..bdbd818e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low
   * Rebuild wikis on upgrade to this version to get the comment counts
     added to existing pages.
   * Loosen regexp, to allow empty quoted parameters in directives.
+  * Add force_overwrite setting to make setup automator overwrite existing
+    files/directories.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500
 
-- 
cgit v1.2.3


From 6aaa6e0d245e450315a073f62e27c233cefbe9ec Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 27 Feb 2010 16:36:57 -0500
Subject: Fix admin openid detection in setup automator, and avoid prompting
 for a password.

---
 IkiWiki/Setup/Automator.pm | 2 +-
 debian/changelog           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 79a610e20..9da594e99 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -144,7 +144,7 @@ sub import (@) {
 
 	# Create admin user(s).
 	foreach my $admin (@{$config{adminuser}}) {
-		next if $admin=~/^http\?:\/\//; # openid
+		next if defined IkiWiki::openiduser($admin);
 		
 		# Prompt for password w/o echo.
 		my ($password, $password2);
diff --git a/debian/changelog b/debian/changelog
index bdbd818e1..832bbaa85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low
   * Loosen regexp, to allow empty quoted parameters in directives.
   * Add force_overwrite setting to make setup automator overwrite existing
     files/directories.
+  * Fix admin openid detection in setup automator, and avoid prompting
+    for a password.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500
 
-- 
cgit v1.2.3


From 60d2dd318f66563c3ee3bde950d7f53426530acc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Feb 2010 00:12:47 -0500
Subject: Add new --clean option; this makes ikiwiki remove all built files in
 the destdir, as well as wrappers and the .ikiwiki directory.

---
 IkiWiki.pm        |  7 +++++++
 IkiWiki/Render.pm | 11 +++++++++++
 Makefile.PL       |  2 +-
 debian/changelog  |  4 +++-
 doc/usage.mdwn    |  8 ++++++++
 ikiwiki.in        | 12 +++++++++++-
 ikiwiki.spec      |  2 +-
 7 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 9df6c90d6..00eadfd98 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -409,6 +409,13 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
+	clean => {
+		type => "internal",
+		default => 0,
+		description => "running in clean mode",
+		safe => 0,
+		rebuild => 0,
+	},
 	refresh => {
 		type => "internal",
 		default => 0,
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 3ebb1a324..af24df155 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -683,6 +683,17 @@ sub refresh () {
 	}
 }
 
+sub clean_rendered {
+	lockwiki();
+	loadindex();
+	remove_unrendered();
+	foreach my $page (keys %oldrenderedfiles) {
+		foreach my $file (@{$oldrenderedfiles{$page}}) {
+			prune($config{destdir}."/".$file);
+		}
+	}
+}
+
 sub commandline_render () {
 	lockwiki();
 	loadindex();
diff --git a/Makefile.PL b/Makefile.PL
index 462f7364d..52421a711 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -51,7 +51,7 @@ docwiki: ikiwiki.out
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
 
 extra_clean:
-	rm -rf html doc/.ikiwiki
+	$(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
 	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
diff --git a/debian/changelog b/debian/changelog
index 832bbaa85..3b92c598d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100213) UNRELEASED; urgency=low
+ikiwiki (3.20100228) UNRELEASED; urgency=low
 
   * comments: Display number of comments in comment action link.
   * Rebuild wikis on upgrade to this version to get the comment counts
@@ -8,6 +8,8 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low
     files/directories.
   * Fix admin openid detection in setup automator, and avoid prompting
     for a password.
+  * Add new --clean option; this makes ikiwiki remove all built
+    files in the destdir, as well as wrappers and the .ikiwiki directory.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500
 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index e4808d4c2..a105d7e59 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -50,6 +50,14 @@ These options control the mode that ikiwiki operates in.
   If used with --setup --refresh, this makes it also update any configured
   wrappers.
 
+* --clean
+
+  This makes ikiwiki clean up by removing any files it denerated in the 
+  `destination` directory, as well as any configured wrappers, and the
+  `.ikiwiki` state directory. This is mostly useful if you're running
+  ikiwiki in a Makefile to build documentation and want a corresponding
+  `clean` target.
+
 * --cgi
 
   Enable [[CGI]] mode. In cgi mode ikiwiki runs as a cgi script, and
diff --git a/ikiwiki.in b/ikiwiki.in
index b8581d880..ae1251ff6 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -37,6 +37,7 @@ sub getconfig () {
 			"syslog!" => \$config{syslog},
 			"rebuild!" => \$config{rebuild},
 			"refresh!" => \$config{refresh},
+			"clean!" => \$config{clean},
 			"post-commit" => \$config{post_commit},
 			"render=s" => \$config{render},
 			"wrappers!" => \$config{genwrappers},
@@ -135,6 +136,7 @@ sub main () {
 
 		if (@{$config{wrappers}} && 
 		    ! $config{render} && ! $config{dumpsetup} &&
+		    ! $config{clean} &&
 		    ((! $config{refresh} && ! $config{post_commit})
 		     || $config{genwrappers})) {
 			debug(gettext("generating wrappers.."));
@@ -159,7 +161,7 @@ sub main () {
 		
 		# setup implies a wiki rebuild by default
 		if (! $config{refresh} && ! $config{render} &&
-		    ! $config{post_commit}) {
+		    ! $config{post_commit} && ! $config{clean}) {
 			$config{rebuild}=1;
 		}
 	}
@@ -190,6 +192,14 @@ sub main () {
 	elsif ($config{post_commit} && ! commit_hook_enabled()) {
 		# do nothing
 	}
+	elsif ($config{clean}) {
+		require IkiWiki::Render;
+		foreach my $wrapper (@{$config{wrappers}}) {
+			prune($wrapper->{wrapper});
+		}
+		clean_rendered();
+		system("rm", "-rf", $config{wikistatedir});
+	}
 	else {
 		if ($config{rebuild}) {
 			debug(gettext("rebuilding wiki.."));
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 865c9a325..1dba9f463 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100212
+Version: 3.20100228
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
-- 
cgit v1.2.3


From 4be426ab1ad01a2a90151d741f737d41a12a6cbe Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 1 Mar 2010 10:28:59 +0000
Subject: wl from report to field plugin pages

---
 doc/plugins/contrib/report.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/report.mdwn b/doc/plugins/contrib/report.mdwn
index 7130bcb5f..e8cbd0486 100644
--- a/doc/plugins/contrib/report.mdwn
+++ b/doc/plugins/contrib/report.mdwn
@@ -18,7 +18,7 @@ IkiWiki::Plugin::report - Produce templated reports from page field data.
 
 This plugin provides the **report** directive.  This enables one to report on
 the structured data ("field" values) of multiple pages; the output is formatted
-via a template.  This depends on the "field" plugin.
+via a template.  This depends on the [[plugins/contrib/field]] plugin.
 
 The pages to report on are selected by a PageSpec given by the "pages"
 parameter.  The template is given by the "template" parameter.
-- 
cgit v1.2.3


From a982b9cf193445dccec0e9ba87eeed324825c2cc Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 1 Mar 2010 13:14:48 +0000
Subject: new tip: spam and software sites

---
 doc/tips/spam_and_softwaresites.mdwn | 86 ++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 doc/tips/spam_and_softwaresites.mdwn

diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn
new file mode 100644
index 000000000..fe73518ef
--- /dev/null
+++ b/doc/tips/spam_and_softwaresites.mdwn
@@ -0,0 +1,86 @@
+Any wiki with a form of web-editing enabled will have to deal with
+spam. (See the [[plugins/blogspam]] plugin for one defensive tool you
+can deploy).
+
+If:
+
+ * you are using ikiwiki to manage the website for a [[examples/softwaresite]]
+ * you allow web-based commits, to let people correct documentation, or report
+   bugs, etc.
+ * the documentation is stored in the same revision control repository as your
+   software
+
+It is undesirable to have your software's VCS history tainted by spam and spam
+clean-up commits. Here is one approach you can use to prevent this. This
+example is for the [[git]] version control system, but the principles should
+apply to others.
+
+## Isolate web commits to a specific branch
+
+Create a separate branch to contain web-originated edits (named `doc` in this
+example):
+
+    $ git checkout -b doc
+
+Adjust your setup file accordingly:
+
+    gitmaster_branch => 'doc',
+
+## merging good web commits into the master branch
+
+You will want to periodically merge legitimate web-based commits back into
+your master branch. Ensure that there is no spam in the documentation
+branch. If there is, see 'erase spam from the commit history', below, first.
+
+Once you are confident it's clean:
+
+    # ensure you are on the doc branch
+    $ git branch
+      doc
+    * master
+    $ git merge --ff doc
+
+## removing spam
+
+### short term
+
+In the short term, just revert the spammy commit.
+
+If the spammy commit was the top-most:
+
+    $ git revert HEAD
+
+This will clean the spam out of the files, but it will leave both the spam
+commit and the revert commit in the history.
+
+### erase spam from the commit history
+
+Git allows you to rewrite your commit history.  We will take advantage of this
+to eradicate spam from the history of the doc branch.
+
+This is a useful tool, but it is considered bad practise to rewrite the
+history of public repositories. If your software's repository is public, you
+should make it clear that the history of the `doc` branch in your repository
+is unstable.
+
+Once you have been spammed, use `git rebase` to remove the spam commits from
+the history.  Assuming that your `doc` branch was split off from a branch
+called `master`:
+
+    # ensure you are on the doc branch
+    $ git branch
+    * doc
+      master
+    $ git rebase --interactive master
+
+In your editor session, you will see a series of lines for each commit made to
+the `doc` branch since it was branched from `master` (or since the last merge
+back into `master`). Delete the lines corresponding to spammy commits, then
+save and exit your editor.
+
+Caveat: if there are no commits you want to keep (i.e. all the commits since
+the last merge into master are either spam or spam reverts) then `git rebase`
+will abort. Therefore, this approach only works if you have at least one
+non-spam commit to the documentation since the last merge into `master`. For
+this reason, it's best to tackle spam with reverts until you have at least one
+commit you want merged back into the main history.
-- 
cgit v1.2.3


From 397fc5b2a3dff0ff3a105573f3b1fa5ea8169dfe Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 1 Mar 2010 13:16:54 +0000
Subject: ref new tip from softwaresite page

---
 doc/examples/softwaresite.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/examples/softwaresite.mdwn b/doc/examples/softwaresite.mdwn
index e43a9d116..99f791177 100644
--- a/doc/examples/softwaresite.mdwn
+++ b/doc/examples/softwaresite.mdwn
@@ -14,3 +14,6 @@ Some additional configuration you might want to do:
 
 * Read the [[tips/integrated_issue_tracking_with_ikiwiki]] article for tips
   about how to use ikiwiki as a BTS.
+
+* Read [[tips/spam_and_softwaresites]] for information on how to keep spam
+  and spam-fighting commits out of your main version control history.
-- 
cgit v1.2.3


From 0284ccf5eb6163d4fe49ac829a1f976336bc5908 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 1 Mar 2010 14:43:55 +0000
Subject: fixed typo

---
 doc/plugins/contrib/report.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/report.mdwn b/doc/plugins/contrib/report.mdwn
index e8cbd0486..c364d4a3a 100644
--- a/doc/plugins/contrib/report.mdwn
+++ b/doc/plugins/contrib/report.mdwn
@@ -89,7 +89,7 @@ The "mood_summary" template might be like this:
     ## <TMPL_VAR NAME="HEADER1">
     </TMPL_IF>
     ### <TMPL_VAR NAME="TITLE">
-    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE"]]
+    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
     <TMPL_VAR NAME="DESCRIPTION">
     
 ### Advanced Options
-- 
cgit v1.2.3


From fe571e959007e7e4f895869c980b474f5ee6e995 Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <http://liw.fi/@web>
Date: Mon, 1 Mar 2010 21:12:48 +0000
Subject:

---
 doc/plugins/rename.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/rename.mdwn b/doc/plugins/rename.mdwn
index ddaede8b0..abb361329 100644
--- a/doc/plugins/rename.mdwn
+++ b/doc/plugins/rename.mdwn
@@ -2,7 +2,8 @@
 [[!tag type/web]]
 
 This plugin allows pages or other files to be renamed using the web
-interface.
+interface. Following Unix tradition, renaming also allows moving to a
+different directory.
 
 Users can only rename things that they are allowed to edit or upload.
 
-- 
cgit v1.2.3


From 7495d30a6ab00d09ea142cfdc599c8abfb64340e Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Mon, 1 Mar 2010 21:15:29 +0000
Subject:

---
 doc/ikiwiki/directive/inline/discussion.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn
index 998ba642b..6a186cd93 100644
--- a/doc/ikiwiki/directive/inline/discussion.mdwn
+++ b/doc/ikiwiki/directive/inline/discussion.mdwn
@@ -1,3 +1,10 @@
+## Combine inline and toggle
+
+Is it possible to combine the behaviour of toggle and inline? ie, have it present of list of 'headlines' which are created from seperate subpages which can be clicked to expand to the body of the inlined page. Thanks.
+
+-- Thiana
+
+---
 ## How do you provide the per post discussion links in your own blog?
 
 > That's configured by the "actions" parameter to the inline directive. See
-- 
cgit v1.2.3


From 837b04759c0895d6341a6a51fc05be1c3e5ef2ca Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Mon, 1 Mar 2010 21:17:09 +0000
Subject:

---
 doc/plugins/creole/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/plugins/creole/discussion.mdwn b/doc/plugins/creole/discussion.mdwn
index 38ee2bd78..eab41349a 100644
--- a/doc/plugins/creole/discussion.mdwn
+++ b/doc/plugins/creole/discussion.mdwn
@@ -12,4 +12,9 @@ I've installed Text::WikiCreole 0.05 and enabled the plugin, but I get an error
 
 >>> forgot, done now --[[Joey]] 
 
+---
+## External Links
+
 I'm moving over a really stinkingly old UseMod and creole seems the nearest match. I've worked out that Bare /Subpage links need to become \[\[Subpage\]\], and Top/Sub links need to be \[\[Top/Sub\]\] (or \[\[Top/Sub|Top/Sub\]\], to display in exactly the same way), but I'm stuck on generic hyperlinks. The creole cheat sheet says I should be able to do \[\[http://url.path/foo|LinkText\]\], but that comes out as a link to create the "linktext" page, and Markdown-style \[Link Text\](http://url.path/foo) just gets rendered as is. Any suggestions? --[[schmonz]]
+
+> Was this problem ever solved? -- Thiana
-- 
cgit v1.2.3


From 159471c92359c2da77bd0025f1718acbe7ff2a0c Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Mon, 1 Mar 2010 21:23:00 +0000
Subject: response

---
 doc/plugins/creole/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/creole/discussion.mdwn b/doc/plugins/creole/discussion.mdwn
index eab41349a..7f47c2c97 100644
--- a/doc/plugins/creole/discussion.mdwn
+++ b/doc/plugins/creole/discussion.mdwn
@@ -18,3 +18,5 @@ I've installed Text::WikiCreole 0.05 and enabled the plugin, but I get an error
 I'm moving over a really stinkingly old UseMod and creole seems the nearest match. I've worked out that Bare /Subpage links need to become \[\[Subpage\]\], and Top/Sub links need to be \[\[Top/Sub\]\] (or \[\[Top/Sub|Top/Sub\]\], to display in exactly the same way), but I'm stuck on generic hyperlinks. The creole cheat sheet says I should be able to do \[\[http://url.path/foo|LinkText\]\], but that comes out as a link to create the "linktext" page, and Markdown-style \[Link Text\](http://url.path/foo) just gets rendered as is. Any suggestions? --[[schmonz]]
 
 > Was this problem ever solved? -- Thiana
+
+>> Not by me. If I were looking at the problem now, with fresh eyes, I'd probably bite the bullet and just convert everything to Markdown. --[[schmonz]]
-- 
cgit v1.2.3


From b3df992552b2a608fd46740252b8fd76bf3c09bb Mon Sep 17 00:00:00 2001
From: "http://cdombroski.myopenid.com/" <http://cdombroski.myopenid.com/@web>
Date: Tue, 2 Mar 2010 02:19:51 +0000
Subject:

---
 doc/bugs/External_links_with_Creole.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/bugs/External_links_with_Creole.mdwn

diff --git a/doc/bugs/External_links_with_Creole.mdwn b/doc/bugs/External_links_with_Creole.mdwn
new file mode 100644
index 000000000..3d800b04e
--- /dev/null
+++ b/doc/bugs/External_links_with_Creole.mdwn
@@ -0,0 +1,3 @@
+When using Creole for markup, creating an external link appears to be impossible. Neither \[[Outside URL|http://example.com]] nor <<http://example.com>> nor \[Outside URL]\(http://example.com) work. The first gets rendered as a broken WikiLink, the second get eaten and the last is not parsed in anyway so you end up with that exact text in your page. 
+
+I'd have made this as a Creole page as a practical demonstration, but that doesn't seem possible here. Here's a page with an example: <https://www.icanttype.org//demo/CreoleExternalLinks>
-- 
cgit v1.2.3


From d469a410eaad03553cb5ef41a69c772c6d50bf76 Mon Sep 17 00:00:00 2001
From: "http://cdombroski.myopenid.com/" <http://cdombroski.myopenid.com/@web>
Date: Tue, 2 Mar 2010 15:47:23 +0000
Subject: Bug: 404 plugin & lighttpd

---
 doc/bugs/404_plugin_and_lighttpd.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/bugs/404_plugin_and_lighttpd.mdwn

diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn
new file mode 100644
index 000000000..e60fd209a
--- /dev/null
+++ b/doc/bugs/404_plugin_and_lighttpd.mdwn
@@ -0,0 +1,5 @@
+Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 page. This breaks the 404 plugin which checks this variable for 404 before processing the URI. It also doesn't seem to set REDIRECT_URL.
+
+I was able to fix my server to check the REQUEST_URI for ikiwiki.cgi and to continue processing if it was not found, passing $ENV{SEVER_NAME} . $ENV{REQUEST_URI} as the first parameter to cgi_page_from_404. However, my perl is terrible and I just made it work rather than figuring out exactly what to do to get it to work on both lighttpd and apache.
+
+This is with lighttpd 1.4.19 on Debian.
-- 
cgit v1.2.3


From 8aae08aafda8be4d17dd45bd04318b40e276878a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 2 Mar 2010 19:56:53 +0000
Subject:

---
 doc/bugs/404_plugin_and_lighttpd.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn
index e60fd209a..29ca107dc 100644
--- a/doc/bugs/404_plugin_and_lighttpd.mdwn
+++ b/doc/bugs/404_plugin_and_lighttpd.mdwn
@@ -3,3 +3,11 @@ Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 pa
 I was able to fix my server to check the REQUEST_URI for ikiwiki.cgi and to continue processing if it was not found, passing $ENV{SEVER_NAME} . $ENV{REQUEST_URI} as the first parameter to cgi_page_from_404. However, my perl is terrible and I just made it work rather than figuring out exactly what to do to get it to work on both lighttpd and apache.
 
 This is with lighttpd 1.4.19 on Debian.
+
+> /cgi-bin/ikiwiki.cgi?do=goto also provides redirection in the same way,
+> if that's any help? You might need to set the lighttpd 404 handler to
+> that, then compose REDIRECT_URL from other variables if necessary.
+>
+> I originally wrote the plugin for Apache; [[weakish]] contributed the
+> lighttpd docs and might know more about how to make it work there.
+> --[[smcv]]
-- 
cgit v1.2.3


From 8b6fb02ab5482c46ea53ee08eff4f8b65ef99a0d Mon Sep 17 00:00:00 2001
From: "http://cdombroski.myopenid.com/" <http://cdombroski.myopenid.com/@web>
Date: Tue, 2 Mar 2010 21:00:28 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 12d692979..345604c36 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -140,6 +140,7 @@ Personal sites and blogs
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
 * [Mukund's homepage](http://www.mukund.org/)
 * [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
+* [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 4a7fb67ee6c32b1d66e19f345998b98b169100f0 Mon Sep 17 00:00:00 2001
From: "http://cdombroski.myopenid.com/" <http://cdombroski.myopenid.com/@web>
Date: Wed, 3 Mar 2010 00:14:47 +0000
Subject: Posting my change to the 404 module

---
 doc/bugs/404_plugin_and_lighttpd.mdwn | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn
index 29ca107dc..ffbad8add 100644
--- a/doc/bugs/404_plugin_and_lighttpd.mdwn
+++ b/doc/bugs/404_plugin_and_lighttpd.mdwn
@@ -11,3 +11,25 @@ This is with lighttpd 1.4.19 on Debian.
 > I originally wrote the plugin for Apache; [[weakish]] contributed the
 > lighttpd docs and might know more about how to make it work there.
 > --[[smcv]]
+
+>> As I said, I got it working for me, but somebody who knows perl should probably look at it with the aim of making it work for everyone.
+>> I considered having lighttpd construct a proper url for the 404 redirect itself, but I don't know if it can do something like that or not.
+>> For what it's worth, here's the change I made to the module:
+
+    sub cgi ($) {
+            my $cgi=shift;
+            if ($ENV{REQUEST_URI} !~ /ikiwiki\.cgi/) {
+                    my $page = cgi_page_from_404(
+                            Encode::decode_utf8($ENV{SERVER_NAME} . $ENV{REQUEST_URI}),
+                            $config{url}, $config{usedirs});
+                    IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
+            }
+    
+    #       if (exists $ENV{REDIRECT_STATUS} &&
+    #           $ENV{REDIRECT_STATUS} eq '404') {
+    #               my $page = cgi_page_from_404(
+    #                       Encode::decode_utf8($ENV{REDIRECT_URL}),
+    #                       $config{url}, $config{usedirs});
+    #               IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
+    #       }
+    }
-- 
cgit v1.2.3


From 0385e4080dea208e6683492c9b8f52ff37b5b173 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 2 Mar 2010 22:23:07 -0500
Subject: releasing version 3.20100302

---
 debian/changelog |  4 ++--
 ikiwiki.spec     |  2 +-
 po/bg.po         | 52 +++++++++++++++++++++++++++++++---------------------
 po/cs.po         | 53 ++++++++++++++++++++++++++++++++---------------------
 po/da.po         | 53 ++++++++++++++++++++++++++++++++---------------------
 po/de.po         | 53 ++++++++++++++++++++++++++++++++---------------------
 po/es.po         | 53 ++++++++++++++++++++++++++++++++---------------------
 po/fr.po         | 53 ++++++++++++++++++++++++++++++++---------------------
 po/gu.po         | 52 +++++++++++++++++++++++++++++++---------------------
 po/ikiwiki.pot   | 53 ++++++++++++++++++++++++++++++++---------------------
 po/it.po         | 53 ++++++++++++++++++++++++++++++++---------------------
 po/pl.po         | 52 +++++++++++++++++++++++++++++++---------------------
 po/sv.po         | 52 +++++++++++++++++++++++++++++++---------------------
 po/tr.po         | 52 +++++++++++++++++++++++++++++++---------------------
 po/vi.po         | 51 ++++++++++++++++++++++++++++++---------------------
 15 files changed, 412 insertions(+), 276 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b92c598d..c0f99291f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100228) UNRELEASED; urgency=low
+ikiwiki (3.20100302) unstable; urgency=low
 
   * comments: Display number of comments in comment action link.
   * Rebuild wikis on upgrade to this version to get the comment counts
@@ -11,7 +11,7 @@ ikiwiki (3.20100228) UNRELEASED; urgency=low
   * Add new --clean option; this makes ikiwiki remove all built
     files in the destdir, as well as wrappers and the .ikiwiki directory.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500
+ -- Joey Hess <joeyh@debian.org>  Tue, 02 Mar 2010 22:17:30 -0500
 
 ikiwiki (3.20100212) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 1dba9f463..73ea7a9c6 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100228
+Version: 3.20100302
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index a211b7685..0e2108597 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Грешка"
 
@@ -137,7 +137,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "готово"
 
@@ -258,8 +258,18 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+msgid "Comment"
 msgstr ""
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1093,7 +1103,7 @@ msgstr "обновяване на страницата „%s”, зависещ
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1109,16 +1119,16 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1156,19 +1166,19 @@ msgstr "формат: ikiwiki [опции] източник местоназна
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
@@ -1176,40 +1186,40 @@ msgstr "осъвременяване на уики..."
 msgid "Discussion"
 msgstr "Дискусия"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
diff --git a/po/cs.po b/po/cs.po
index d3cf3f5b9..09d411e98 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -55,7 +55,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Chyba"
 
@@ -136,7 +136,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr "mažu bucket..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "hotovo"
 
@@ -256,8 +256,19 @@ msgstr "Schvalování komentářů"
 msgid "comment moderation"
 msgstr "schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, fuzzy, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] "Komentáře"
+msgstr[1] "Komentáře"
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+#, fuzzy
+msgid "Comment"
 msgstr "Komentáře"
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1072,7 +1083,7 @@ msgstr "sestavuji %s, která závisí na %s"
 msgid "building %s, to update its backlinks"
 msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze sestavit %s"
@@ -1088,16 +1099,16 @@ msgstr "nemohu číst %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)"
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nepodporovaný systém pro správu verzí: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:"
@@ -1135,19 +1146,19 @@ msgstr "použití: ikiwiki [volby] zdroj cíl"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup konfigurační.soubor"
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr "použití: --set proměnná=hodnota"
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "znovusestavuji wiki..."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
@@ -1155,38 +1166,38 @@ msgstr "obnovuji wiki..."
 msgid "Discussion"
 msgstr "Diskuse"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr "nelze použít několik rcs modulů"
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
diff --git a/po/da.po b/po/da.po
index b30730aa4..13d1dca59 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Fejl"
 
@@ -140,7 +140,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "færdig"
 
@@ -263,8 +263,19 @@ msgstr "Kommentarmoderering"
 msgid "comment moderation"
 msgstr "kommentarkoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, fuzzy, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] "Kommentarer"
+msgstr[1] "Kommentarer"
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+#, fuzzy
+msgid "Comment"
 msgstr "Kommentarer"
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1087,7 +1098,7 @@ msgstr "danner %s, som afhænger af %s"
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1103,16 +1114,16 @@ msgstr "kan ikke læse %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)"
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "revisionskontrolsystem %s ikke understøttet"
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes"
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:"
@@ -1150,19 +1161,19 @@ msgstr "brug: ikiwiki [valg] kilde mål"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup opsætningsfil"
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "bygger wrappers.."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
@@ -1170,39 +1181,39 @@ msgstr "genopfrisker wiki..."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally krævet for title_natural sortering"
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
diff --git a/po/de.po b/po/de.po
index b024e3be7..9433501cc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2009-07-23 01:07+0100\n"
 "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Fehler"
 
@@ -137,7 +137,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr "lösche Behälter (bucket)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "fertig"
 
@@ -261,8 +261,19 @@ msgstr "Kommentar-Moderation"
 msgid "comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, fuzzy, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] "Kommentare"
+msgstr[1] "Kommentare"
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+#, fuzzy
+msgid "Comment"
 msgstr "Kommentare"
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1096,7 +1107,7 @@ msgstr "erzeuge %s, die von %s abhängt"
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1113,16 +1124,16 @@ msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)"
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nicht unterstütztes Versionskontrollsystem %s"
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen"
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1162,19 +1173,19 @@ msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup Konfigurationsdatei"
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr "Aufruf: --set Variable=Wert"
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper.."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
@@ -1182,41 +1193,41 @@ msgstr "aktualisiere Wiki.."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally wird benötigt für title_natural sort"
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
diff --git a/po/es.po b/po/es.po
index 2923ac199..465e9c1a1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Error"
 
@@ -142,7 +142,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "completado"
 
@@ -265,8 +265,19 @@ msgstr "Aprobación de comentarios"
 msgid "comment moderation"
 msgstr "aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, fuzzy, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] "Comentarios"
+msgstr[1] "Comentarios"
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+#, fuzzy
+msgid "Comment"
 msgstr "Comentarios"
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1095,7 +1106,7 @@ msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1111,16 +1122,16 @@ msgstr "no puedo leer el archivo %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)"
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "el sistema de control de versiones %s no está soportado"
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1160,19 +1171,19 @@ msgstr "uso: ikiwiki [opciones] origen destino"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup archivo_de_configuración"
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
@@ -1180,44 +1191,44 @@ msgstr "actualizando el wiki.."
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 "Se necesita el módulo Sort::Naturally para el tipo de ordenación "
 "title_natural"
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
diff --git a/po/fr.po b/po/fr.po
index 573168d51..723d3a036 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Erreur"
 
@@ -138,7 +138,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "Suppression du compartiment S3 (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "Terminé"
 
@@ -258,8 +258,19 @@ msgstr "Modération du commentaire"
 msgid "comment moderation"
 msgstr "modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, fuzzy, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] "Commentaires"
+msgstr[1] "Commentaires"
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+#, fuzzy
+msgid "Comment"
 msgstr "Commentaires"
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1092,7 +1103,7 @@ msgstr "Reconstruction de %s, qui dépend de %s"
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1110,16 +1121,16 @@ msgstr ""
 "Vous devez spécifier un nom de wiki (contenant des caractères "
 "alphanumériques)"
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "Système de contrôle de version non reconnu : %s"
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1160,19 +1171,19 @@ msgstr "Syntaxe : ikiwiki [options] source destination"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup fichier de configuration"
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
@@ -1180,39 +1191,39 @@ msgstr "Rafraîchissement du wiki..."
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
diff --git a/po/gu.po b/po/gu.po
index 3cb505efe..f7725abb9 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -135,7 +135,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -256,8 +256,18 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+msgid "Comment"
 msgstr ""
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1079,7 +1089,7 @@ msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિ
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1095,16 +1105,16 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1142,19 +1152,19 @@ msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
@@ -1162,38 +1172,38 @@ msgstr "વીકીને તાજી કરે છે.."
 msgid "Discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 4f44e7c74..11af9e4cd 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../IkiWiki/CGI.pm:116
 msgid "You need to log in first."
@@ -54,7 +55,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr ""
 
@@ -135,7 +136,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr ""
 
@@ -253,8 +254,18 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+msgid "Comment"
 msgstr ""
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1053,7 +1064,7 @@ msgstr ""
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1069,16 +1080,16 @@ msgstr ""
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1116,19 +1127,19 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1136,38 +1147,38 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index cc24cccd5..d664c4d30 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -53,7 +53,7 @@ msgstr "Preferenze salvate."
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Errore"
 
@@ -135,7 +135,7 @@ msgstr "creazione nuova pagina %s"
 msgid "deleting bucket.."
 msgstr "eliminazione contenitore..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "fatto"
 
@@ -255,8 +255,19 @@ msgstr "Moderazione commenti"
 msgid "comment moderation"
 msgstr "moderazione commento"
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, fuzzy, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] "Commenti"
+msgstr[1] "Commenti"
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+#, fuzzy
+msgid "Comment"
 msgstr "Commenti"
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1083,7 +1094,7 @@ msgstr "compilazione di %s, che dipende da %s"
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1099,16 +1110,16 @@ msgstr "impossibile leggere %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)"
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "sistema di controllo di revisione %s non supportato"
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "impossibile creare un repository tramite ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1147,19 +1158,19 @@ msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup configfile"
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr "utilizzo: --set var=valore"
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "generazione contenitori..."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "ricostruzione wiki..."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
@@ -1167,38 +1178,38 @@ msgstr "aggiornamento wiki..."
 msgid "Discussion"
 msgstr "Discussione"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr "impossibile usare più plugin rcs"
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
diff --git a/po/pl.po b/po/pl.po
index 5c8fc1390..77e1537f4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Błąd"
 
@@ -139,7 +139,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "gotowe"
 
@@ -260,8 +260,18 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+msgid "Comment"
 msgstr ""
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1101,7 +1111,7 @@ msgstr "renderowanie %s zależącego od %s"
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1117,16 +1127,16 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1164,19 +1174,19 @@ msgstr "użycie: ikiwiki [parametry] źródło cel"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
@@ -1184,40 +1194,40 @@ msgstr "odświeżanie wiki..."
 msgid "Discussion"
 msgstr "Dyskusja"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 62b9d6905..20a8020c1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Fel"
 
@@ -136,7 +136,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "klar"
 
@@ -257,8 +257,18 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+msgid "Comment"
 msgstr ""
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1088,7 +1098,7 @@ msgstr "ritar upp %s, vilken är beroende av %s"
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1104,16 +1114,16 @@ msgstr "kan inte läsa %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1151,19 +1161,19 @@ msgstr "användning: ikiwiki [flaggor] källa mål"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
@@ -1171,38 +1181,38 @@ msgstr "uppdaterar wiki.."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
diff --git a/po/tr.po b/po/tr.po
index 94ad12e9e..b3742ca36 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgstr "Tercihler kaydedildi."
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Hata"
 
@@ -132,7 +132,7 @@ msgstr "%s için yeni sayfa oluşturuluyor"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr ""
 
@@ -250,8 +250,18 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+msgid "Comment"
 msgstr ""
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1050,7 +1060,7 @@ msgstr ""
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1066,16 +1076,16 @@ msgstr ""
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1113,19 +1123,19 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1133,38 +1143,38 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 9326f2975..cfc7184ef 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 16:48-0500\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Lỗi"
 
@@ -137,7 +137,7 @@ msgstr "đang tạo trang mới %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "xong"
 
@@ -258,8 +258,17 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:769
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:761
+#, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] ""
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:771
+msgid "Comment"
 msgstr ""
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
@@ -1089,7 +1098,7 @@ msgstr "đang vẽ %s mà phụ thuộc vào %s"
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:696
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
@@ -1105,16 +1114,16 @@ msgstr "không thể đọc %s: %s"
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:80
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:106
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:124
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1152,19 +1161,19 @@ msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:140
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
@@ -1172,38 +1181,38 @@ msgstr "đang làm tươi wiki.."
 msgid "Discussion"
 msgstr "Thảo luận"
 
-#: ../IkiWiki.pm:507
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
-#: ../IkiWiki.pm:553
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:582
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1255
+#: ../IkiWiki.pm:1262
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1854
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1997
+#: ../IkiWiki.pm:2020
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2008
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2027
+#: ../IkiWiki.pm:2050
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From 7265dbe4149642fff28ad296fc6a65d692f16be1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 2 Mar 2010 22:23:29 -0500
Subject: add news item for ikiwiki 3.20100302

---
 doc/news/version_3.20091202.mdwn | 17 -----------------
 doc/news/version_3.20100302.mdwn | 12 ++++++++++++
 2 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 doc/news/version_3.20091202.mdwn
 create mode 100644 doc/news/version_3.20100302.mdwn

diff --git a/doc/news/version_3.20091202.mdwn b/doc/news/version_3.20091202.mdwn
deleted file mode 100644
index 60f17fe63..000000000
--- a/doc/news/version_3.20091202.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-ikiwiki 3.20091202 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * meta: Generate meta description tags even when the html scrubber is
-     enabled.
-   * meta: Allow use of DESCRIPTION in templates to get at the meta description
-     value. (Thanks, NicolasLimare)
-   * inline: Use caching of inlined pages to speed up builds of inlines that
-     include feeds. Speedup of about 25% for small inlines; could be much
-     larger for inlines of many, or complex pages.
-   * Added (incomplete) Turkish po file. Closes: #[556744](http://bugs.debian.org/556744)
-     Thanks, Recai Oktaş
-   * date: New plugin that allows inserting date directives that expand to
-     pretty-printed dates, using the same formatting as used for page
-     modification date display, etc.
-   * htmllink: Allow a title attribute to be specified.
-   * calendar: Add title attributes for all links in the calendars.
-   * calendar: Fix month wraparound error that broke in December."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100302.mdwn b/doc/news/version_3.20100302.mdwn
new file mode 100644
index 000000000..f439b1b23
--- /dev/null
+++ b/doc/news/version_3.20100302.mdwn
@@ -0,0 +1,12 @@
+ikiwiki 3.20100302 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * comments: Display number of comments in comment action link.
+   * Rebuild wikis on upgrade to this version to get the comment counts
+     added to existing pages.
+   * Loosen regexp, to allow empty quoted parameters in directives.
+   * Add force\_overwrite setting to make setup automator overwrite existing
+     files/directories.
+   * Fix admin openid detection in setup automator, and avoid prompting
+     for a password.
+   * Add new --clean option; this makes ikiwiki remove all built
+     files in the destdir, as well as wrappers and the .ikiwiki directory."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From b849c63ce337f988fcbb08b39d197583e6fa6012 Mon Sep 17 00:00:00 2001
From: "http://dmarti.myopenid.com/" <http://dmarti.myopenid.com/@web>
Date: Thu, 4 Mar 2010 00:15:00 +0000
Subject:

---
 doc/todo/salmon_protocol_for_comment_sharing.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/todo/salmon_protocol_for_comment_sharing.mdwn

diff --git a/doc/todo/salmon_protocol_for_comment_sharing.mdwn b/doc/todo/salmon_protocol_for_comment_sharing.mdwn
new file mode 100644
index 000000000..f4fa0c535
--- /dev/null
+++ b/doc/todo/salmon_protocol_for_comment_sharing.mdwn
@@ -0,0 +1,3 @@
+The <a href="http://www.salmon-protocol.org/home">Salmon protocol</a> provides for aggregating comments across sites.  If a site that syndicates a feed receives a comment on an item in that feed, it can re-post the comment to the original source.
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From d72603534e677a4fbc0547ca3e5c9273d0d502ca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 3 Mar 2010 19:48:23 -0500
Subject: comments

---
 doc/todo/salmon_protocol_for_comment_sharing.mdwn | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/todo/salmon_protocol_for_comment_sharing.mdwn b/doc/todo/salmon_protocol_for_comment_sharing.mdwn
index f4fa0c535..1e56b0a8b 100644
--- a/doc/todo/salmon_protocol_for_comment_sharing.mdwn
+++ b/doc/todo/salmon_protocol_for_comment_sharing.mdwn
@@ -1,3 +1,21 @@
-The <a href="http://www.salmon-protocol.org/home">Salmon protocol</a> provides for aggregating comments across sites.  If a site that syndicates a feed receives a comment on an item in that feed, it can re-post the comment to the original source.
+The <a href="http://www.salmon-protocol.org/home">Salmon protocol</a>
+provides for aggregating comments across sites.  If a site that syndicates
+a feed receives a comment on an item in that feed, it can re-post the
+comment to the original source.
+
+> Ikiwiki does not allow comments to be posted on items it aggregates.
+> So salmon protocol support would only need to handle the comment
+> receiving side of the protocol.
+> 
+> The current draft protocol document confuses me when it starts talking
+> about using OAuth in the abuse prevention section, since their example
+> does not show use of OAuth, and it's not at all clear to me where the
+> OAuth relationship between aggregator and original source is supposed
+> to come from.
+> 
+> Their security model, which goes on to include Webfinger,
+> thirdparty validation services, XRD, and Magic Signatures, looks sorta
+> like they kept throwing technology,  at it, hoping something will stick. :-P
+> --[[Joey]]
 
 [[!tag wishlist]]
-- 
cgit v1.2.3


From cb4833742739ebaa2e875b97ae0035285f5b27b6 Mon Sep 17 00:00:00 2001
From: testerer <testerer@web>
Date: Thu, 4 Mar 2010 09:15:41 +0000
Subject:

---
 doc/index.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..b1ef36b2e 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,6 +19,8 @@ ikiwiki [[!version ]].
 
 ## developer resources
 
+[jup](http://www.google.de)
+
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
@@ -26,3 +28,5 @@ can be submitted and tracked using this wiki.
 
 ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
+
+
-- 
cgit v1.2.3


From dd438d3a62615908adfe92868b95151b8c60506a Mon Sep 17 00:00:00 2001
From: testerer <testerer@web>
Date: Thu, 4 Mar 2010 09:19:22 +0000
Subject:

---
 doc/index.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index b1ef36b2e..88eafa114 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,7 +19,6 @@ ikiwiki [[!version ]].
 
 ## developer resources
 
-[jup](http://www.google.de)
 
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
-- 
cgit v1.2.3


From 54f03304b13aa961d433a2e590ae5108bd4e21b3 Mon Sep 17 00:00:00 2001
From: testerer <testerer@web>
Date: Thu, 4 Mar 2010 09:21:26 +0000
Subject:

---
 doc/TourBusStop.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/TourBusStop.mdwn b/doc/TourBusStop.mdwn
index 8e382bd77..5317c6718 100644
--- a/doc/TourBusStop.mdwn
+++ b/doc/TourBusStop.mdwn
@@ -9,7 +9,7 @@ This wiki serves as the home for the ikiwiki wiki engine, providing collaborativ
 * You can turn any set of pages into a [[blog]] or similar news feed,
 * complete with RSS and Atom support.  You can run your weblog on ikiwiki (and [[many_people_do|ikiwikiusers]]), run a Planet-like [[aggregator|plugins/aggregate]] for external feeds, or keep a [[TODO]] and [[bug|bugs]] list with tags for completed items.
 
-* ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages.  You can then serve these pages as static content.  ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your site will survive.  Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server.  So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
+* ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages.  You can then serve these pages as static content.  ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your [site](http://dessouse.net) will survive.  Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server.  So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
 
 ![Picture of the TourBus](http://www.wikiservice.at/image/wikibus.gif)
 
-- 
cgit v1.2.3


From 07253bb25049eaed06564021accaba1b8cab210c Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Thu, 4 Mar 2010 09:30:24 +0000
Subject: revert spam

---
 doc/TourBusStop.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/TourBusStop.mdwn b/doc/TourBusStop.mdwn
index 5317c6718..8e382bd77 100644
--- a/doc/TourBusStop.mdwn
+++ b/doc/TourBusStop.mdwn
@@ -9,7 +9,7 @@ This wiki serves as the home for the ikiwiki wiki engine, providing collaborativ
 * You can turn any set of pages into a [[blog]] or similar news feed,
 * complete with RSS and Atom support.  You can run your weblog on ikiwiki (and [[many_people_do|ikiwikiusers]]), run a Planet-like [[aggregator|plugins/aggregate]] for external feeds, or keep a [[TODO]] and [[bug|bugs]] list with tags for completed items.
 
-* ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages.  You can then serve these pages as static content.  ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your [site](http://dessouse.net) will survive.  Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server.  So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
+* ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages.  You can then serve these pages as static content.  ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your site will survive.  Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server.  So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
 
 ![Picture of the TourBus](http://www.wikiservice.at/image/wikibus.gif)
 
-- 
cgit v1.2.3


From 070026f12a1e75d4f86ec224abf01fe566f739c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Mar 2010 12:37:12 -0500
Subject: Revert spammer's whitespace changes

(PS, you're banned.)
---
 doc/index.mdwn | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 88eafa114..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,7 +19,6 @@ ikiwiki [[!version ]].
 
 ## developer resources
 
-
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
@@ -27,5 +26,3 @@ can be submitted and tracked using this wiki.
 
 ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
-
-
-- 
cgit v1.2.3


From 48e64aa567fd5e1f997f9a6c201e4e6007057c04 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Sun, 7 Mar 2010 08:31:57 +0000
Subject:

---
 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
new file mode 100644
index 000000000..05d4e3a0a
--- /dev/null
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -0,0 +1,3 @@
+I'm very excited to try out ikiwiki, since it should fit my purposes extremely well, but I'm having trouble with the search plugin. I'm pretty sure that right after I installed ikiwiki and needed dependencies, the search plugin was working fine. However, now when I try to use search, I get "Exception: Unknown function `this'" error on a blank page. I'm not sure how I should go about debugging this issue - my server's (I use Lighttpd 1.4.22) error log has no mention of the exception and there's nothing in /var/log/syslog either.
+
+What might be causing this exception and how I might go about debugging exceptions?
-- 
cgit v1.2.3


From 8026c09b346c760b3f1ec4a5d1fedc71dc2843df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 7 Mar 2010 11:40:53 -0500
Subject: response

---
 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 05d4e3a0a..628276b3c 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -1,3 +1,12 @@
 I'm very excited to try out ikiwiki, since it should fit my purposes extremely well, but I'm having trouble with the search plugin. I'm pretty sure that right after I installed ikiwiki and needed dependencies, the search plugin was working fine. However, now when I try to use search, I get "Exception: Unknown function `this'" error on a blank page. I'm not sure how I should go about debugging this issue - my server's (I use Lighttpd 1.4.22) error log has no mention of the exception and there's nothing in /var/log/syslog either.
 
 What might be causing this exception and how I might go about debugging exceptions?
+
+> Appears to be coming from your xapian omega cgi binary. If you
+> run `strings /usr/lib/cgi-bin/omega/omega` you can see it has
+> "Exception: " in it.
+> 
+> I don´t know what to suggest, other than upgrade/downgrade/reinstall
+> xapian-omega. You could try rebuilding your wiki in case it is somehow
+> caused by a problem with the xapian database. Failing everything, you
+> could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
-- 
cgit v1.2.3


From 9ba3035ebcbd17888009189131cb34033baf4c3b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 7 Mar 2010 11:44:07 -0500
Subject: update

---
 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 628276b3c..3cbcdc485 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -4,9 +4,11 @@ What might be causing this exception and how I might go about debugging exceptio
 
 > Appears to be coming from your xapian omega cgi binary. If you
 > run `strings /usr/lib/cgi-bin/omega/omega` you can see it has
-> "Exception: " in it.
+> "Exception: " in it, and I have found some similar (but not identical)
+> error messages from xapian in a web search.
 > 
 > I don´t know what to suggest, other than upgrade/downgrade/reinstall
-> xapian-omega. You could try rebuilding your wiki in case it is somehow
+> xapian-omega, and contacting the xapian developers for debugging.
+> You could try rebuilding your wiki in case it is somehow
 > caused by a problem with the xapian database. Failing everything, you
 > could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
-- 
cgit v1.2.3


From 904e2c2d1e3eace5f208073d424209bcd5826504 Mon Sep 17 00:00:00 2001
From: danc <danc@web>
Date: Sun, 7 Mar 2010 22:21:35 +0000
Subject:

---
 doc/sandbox/danc.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/sandbox/danc.mdwn

diff --git a/doc/sandbox/danc.mdwn b/doc/sandbox/danc.mdwn
new file mode 100644
index 000000000..9766475a4
--- /dev/null
+++ b/doc/sandbox/danc.mdwn
@@ -0,0 +1 @@
+ok
-- 
cgit v1.2.3


From b44e42baf13a1798e723cdd5d19ffdfe2c751a4b Mon Sep 17 00:00:00 2001
From: danc <danc@web>
Date: Sun, 7 Mar 2010 22:23:26 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index afd7dbeab..1a1b128e6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -77,3 +77,4 @@ bar
 Hmm, can I dig it?
 
 Test
+pop
-- 
cgit v1.2.3


From 7559c7b3ae382191e8d4acde8ddd9e2323edb9a2 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Mon, 8 Mar 2010 02:09:00 +0000
Subject:

---
 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 3cbcdc485..94de18ceb 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -12,3 +12,5 @@ What might be causing this exception and how I might go about debugging exceptio
 > You could try rebuilding your wiki in case it is somehow
 > caused by a problem with the xapian database. Failing everything, you
 > could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
+
+>> Thanks, Joey. With your help I was able to figure out what was wrong. It's a fun little bug (or feature): the title of my wiki had string `$this` in title and that's what was causing the omega binary to choke. My wiki's title was inserted without escaping into the query template used by omega. Omega treated `$this` in the title as a function name and threw an exception because no such function was defined. To avoid this behavior, I used an html entity in the title, so `$this` became `&#36;this`. I don't think that the wiki title should be inserted into the template without escaping - it can produce an error that's not trivial to debug. If users want to modify the html in the title, they should be editing respective templates, not typing html in the wiki title input. What do you think? --[[dkobozev]]
-- 
cgit v1.2.3


From 12b5aec2985ece32ee640f7d90feaaac464f795d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 7 Mar 2010 22:47:32 -0500
Subject: response

---
 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 94de18ceb..7db12c34a 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -14,3 +14,10 @@ What might be causing this exception and how I might go about debugging exceptio
 > could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
 
 >> Thanks, Joey. With your help I was able to figure out what was wrong. It's a fun little bug (or feature): the title of my wiki had string `$this` in title and that's what was causing the omega binary to choke. My wiki's title was inserted without escaping into the query template used by omega. Omega treated `$this` in the title as a function name and threw an exception because no such function was defined. To avoid this behavior, I used an html entity in the title, so `$this` became `&#36;this`. I don't think that the wiki title should be inserted into the template without escaping - it can produce an error that's not trivial to debug. If users want to modify the html in the title, they should be editing respective templates, not typing html in the wiki title input. What do you think? --[[dkobozev]]
+
+>>> Sounds like a bug in omega, and one that probably would affect other
+>>> users of omega too. Ikiwiki could work around it by pre-escaping
+>>> data before passing it to xapian. I have not quite managed to reproduce it though;
+>>> tried setting a page title to '$this' and 'foo $this'.
+>>> That's with version 1.0.18 of omega.
+>>> --[[Joey]]
-- 
cgit v1.2.3


From e7755506d10dfd03cc615d74aeaa3cec156631ac Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Mon, 8 Mar 2010 04:53:05 +0000
Subject:

---
 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 7db12c34a..cb75895c8 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -21,3 +21,5 @@ What might be causing this exception and how I might go about debugging exceptio
 >>> tried setting a page title to '$this' and 'foo $this'.
 >>> That's with version 1.0.18 of omega.
 >>> --[[Joey]]
+
+>>>> I tried it with both omega 1.0.13 and omega 1.0.18 and the issue is present in both. If I view the contents of {$srcdir}/.ikiwiki/xapian/templates/query, I can see that the wiki title is inserted verbatim and there are calls to `$setmap`, `$set` and `$def` etc in the template. --[[dkobozev]]
-- 
cgit v1.2.3


From 84d41fb86707890ae3bebe5f82fd438715f88c44 Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Tue, 9 Mar 2010 00:07:17 +0000
Subject:

---
 doc/ikiwiki/directive/map/discussion.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
index 062b4267a..075b91b4d 100644
--- a/doc/ikiwiki/directive/map/discussion.mdwn
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -1,3 +1,12 @@
+### Sorting
+
+Is there a way to have the generated maps sorted by *title* instead of *filename* when show=title is used?
+Thanks 
+
+-- Thiana
+
+----
+
 Question: Is there a way to generate a listing that shows *both* title and description meta information? Currently, a \[\[!map ...]] shows only one of the two, but I'd like to generate a navigation that looks like a description list. For example:
 
  * This is the title meta information.
-- 
cgit v1.2.3


From b9e7064f70980b58b1bae754bee7fe3eff5fc84d Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Tue, 9 Mar 2010 00:42:38 +0000
Subject: Added use of tag directive so I can play with tags in the sandbox.

---
 doc/templates/plugin.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn
index c1d1974d6..d62c87924 100644
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@@ -6,6 +6,7 @@ Enabled by default: <TMPL_IF core>yes<TMPL_ELSE>no</TMPL_IF><br />
 Included in [[/plugins/goodstuff]]: [[!if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]<br />
 Currently enabled: [[!if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br />
 </span>
+[[!tag plugin <TMPL_VAR name>]]
 [[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
 <TMPL_IF core>[[!tag plugins/type/core]]</TMPL_IF>
 <TMPL_UNLESS NAME="name">
-- 
cgit v1.2.3


From 9d6a755d3983d1d7cd1c67c923c8907e09108a70 Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Tue, 9 Mar 2010 00:50:45 +0000
Subject:

---
 doc/plugins/conditional/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn
index 629d05940..e34df70a1 100644
--- a/doc/plugins/conditional/discussion.mdwn
+++ b/doc/plugins/conditional/discussion.mdwn
@@ -1,3 +1,11 @@
+## Conditional broken?
+
+Using \[\[!if test="tagged(plugin)" then="= Tagged as plugin =" else="*No plugins found*"]] on this wiki *should* present the 'Tagged as plugin' heading, instead it emits 'no plugins found'. Is the conditional plugin currently broken for tags or am I misusing it? Thanks.
+
+-- Thiana
+
+----
+
 Would there be a way for this plugin to emit fewer blank lines (i.e. *none at all*)?
 
 For example, having a look at [this page](http://www.bddebian.com/~wiki/Hurd/)'s sidebar.
-- 
cgit v1.2.3


From 2af6a32aba4a7f96f63b3dfc176e1d4b40488a34 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Mar 2010 20:24:02 -0500
Subject: add link

---
 doc/ikiwiki/directive/map/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
index 075b91b4d..f6eaa6b80 100644
--- a/doc/ikiwiki/directive/map/discussion.mdwn
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -5,6 +5,8 @@ Thanks
 
 -- Thiana
 
+> [[bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used]] --[[Joey]] 
+
 ----
 
 Question: Is there a way to generate a listing that shows *both* title and description meta information? Currently, a \[\[!map ...]] shows only one of the two, but I'd like to generate a navigation that looks like a description list. For example:
-- 
cgit v1.2.3


From 8f13e52a0d9458470753d8fde13e1e19bb872384 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Mar 2010 20:24:43 -0500
Subject: Revert "Added use of tag directive so I can play with tags in the
 sandbox."

This reverts commit b9e7064f70980b58b1bae754bee7fe3eff5fc84d.

Er, no, I don't want a broken tag link on every plugin page, really.
---
 doc/templates/plugin.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn
index d62c87924..c1d1974d6 100644
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@@ -6,7 +6,6 @@ Enabled by default: <TMPL_IF core>yes<TMPL_ELSE>no</TMPL_IF><br />
 Included in [[/plugins/goodstuff]]: [[!if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]<br />
 Currently enabled: [[!if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br />
 </span>
-[[!tag plugin <TMPL_VAR name>]]
 [[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
 <TMPL_IF core>[[!tag plugins/type/core]]</TMPL_IF>
 <TMPL_UNLESS NAME="name">
-- 
cgit v1.2.3


From 376d0dc9b76a384bc505b4ebc8c70dde4134c220 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Mar 2010 20:27:30 -0500
Subject: response

---
 doc/plugins/conditional/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn
index e34df70a1..09e3df923 100644
--- a/doc/plugins/conditional/discussion.mdwn
+++ b/doc/plugins/conditional/discussion.mdwn
@@ -4,6 +4,10 @@ Using \[\[!if test="tagged(plugin)" then="= Tagged as plugin =" else="*No plugin
 
 -- Thiana
 
+> This wiki has no page named "plugin", so nothing links to it; tags are a species of link
+> so tagging a large number of pages with a tag that doesn't exist (which change has
+> been reverted) doesn't make the pagespec match. It would if the tag's page existed. --[[Joey]]
+
 ----
 
 Would there be a way for this plugin to emit fewer blank lines (i.e. *none at all*)?
-- 
cgit v1.2.3


From 857bcb33eeaa2bc503630646e5a01376f0e8b5b5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Mar 2010 20:30:29 -0500
Subject: response

---
 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index cb75895c8..ac4d7ed12 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -23,3 +23,7 @@ What might be causing this exception and how I might go about debugging exceptio
 >>> --[[Joey]]
 
 >>>> I tried it with both omega 1.0.13 and omega 1.0.18 and the issue is present in both. If I view the contents of {$srcdir}/.ikiwiki/xapian/templates/query, I can see that the wiki title is inserted verbatim and there are calls to `$setmap`, `$set` and `$def` etc in the template. --[[dkobozev]]
+
+>>>>> I don't see how that's relevant. It would help if you showed me
+>>>>> exactly something that could be inserted into a page to cause the
+>>>>> problem. --[[Joey]] 
-- 
cgit v1.2.3


From 20635d3610619814e3c36bec913d53cb83d41640 Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Tue, 9 Mar 2010 03:55:28 +0000
Subject: Clarification request

---
 doc/plugins/conditional/discussion.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn
index 09e3df923..6e84fdfc1 100644
--- a/doc/plugins/conditional/discussion.mdwn
+++ b/doc/plugins/conditional/discussion.mdwn
@@ -8,6 +8,19 @@ Using \[\[!if test="tagged(plugin)" then="= Tagged as plugin =" else="*No plugin
 > so tagging a large number of pages with a tag that doesn't exist (which change has
 > been reverted) doesn't make the pagespec match. It would if the tag's page existed. --[[Joey]]
 
+>> So if I understand this correctly... Assuming the tags Tag_A and Tag_B, the existence of 
+>> @wiki-home@/tags/Tag_A.creole, and a number of files with a \[\[!tag Tag_A Tag_B]] the 
+>> following is correct?
+>>
+>> * \[\[!if test="tagged(Tag_A)" then="OK" else="Fail"]] => OK
+>> * \[\[!if test="tagged(Tag_B)" then="OK" else="Fail"]] => Fail
+>> * \[\[!if test="tagged(Tag_A) and tagged(Tag_B)" then="OK" else="Fail"]] => Fail
+>>
+>> Is that the expected behaviour? If so, that's not what I'm seeing here since they all result 
+>> in a Fail. If not, what exactly is wrong with those conditionals? Thanks.
+>>
+>> -- Thiana 
+
 ----
 
 Would there be a way for this plugin to emit fewer blank lines (i.e. *none at all*)?
-- 
cgit v1.2.3


From 9e603d2640758d8b4c0420f2984ffe21bd78c7d6 Mon Sep 17 00:00:00 2001
From: capitaine <capitaine@web>
Date: Tue, 9 Mar 2010 05:30:53 +0000
Subject:

---
 doc/bugs/bestlink_returns_deleted_pages.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/bugs/bestlink_returns_deleted_pages.mdwn b/doc/bugs/bestlink_returns_deleted_pages.mdwn
index 874f18ead..d3c5c8012 100644
--- a/doc/bugs/bestlink_returns_deleted_pages.mdwn
+++ b/doc/bugs/bestlink_returns_deleted_pages.mdwn
@@ -28,7 +28,7 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
 > maybe by keeping a copy of the old backlinks info, then that fix could be
 > applied here too. --[[Joey]]
 
->> Cool that was fast! Well at least half the bug is solved :) For now I'll
+>> Cool that was fast! Well at least half the <a href="http://www.college-paper.org/custom-essay.html college essay">college essay</a> bug is solved :) For now I'll
 >> probably try using a workaround if using bestlink within the needsbuild
 >> or scan hooks. Maybe by testing if pagemtime equals zero. --[[harishcm]]
 
@@ -48,8 +48,8 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
     use IkiWiki 3.00;
     
     sub import {
-    	hook(type => "getsetup", id => "bestlinkbug", call => \&getsetup);
-    	hook(type => "needsbuild", id => "bestlinkbug", call => \&needsbuild);
+    	hook(type => "getsetup", id => "bestlinkbug", call => &getsetup);
+    	hook(type => "needsbuild", id => "bestlinkbug", call => &needsbuild);
     }
     
     sub getsetup () {
-- 
cgit v1.2.3


From 9ac58f4b88654846e2ffdba5190a1785c3ae6c88 Mon Sep 17 00:00:00 2001
From: capitaine <capitaine@web>
Date: Tue, 9 Mar 2010 05:34:52 +0000
Subject:

---
 doc/bugs.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index f634b6e78..f44cfdca2 100644
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -1,5 +1,5 @@
 If you've found a bug in ikiwiki, post about it here. [[TODO]] items go
-elsewhere. Link items to [[bugs/done]] when done.
+elsewhere. Link <a href="http://www.college-paper.org/custom-essay.html">college essay</a> items to [[bugs/done]] when done.
 
 Also see the [Debian bugs](http://bugs.debian.org/ikiwiki).
 
-- 
cgit v1.2.3


From 312b7d05f82045f400931c8e110efb7d76b69eed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 9 Mar 2010 00:40:51 -0500
Subject: Revert spam

---
 doc/bugs.mdwn                                | 2 +-
 doc/bugs/bestlink_returns_deleted_pages.mdwn | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index f44cfdca2..f634b6e78 100644
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -1,5 +1,5 @@
 If you've found a bug in ikiwiki, post about it here. [[TODO]] items go
-elsewhere. Link <a href="http://www.college-paper.org/custom-essay.html">college essay</a> items to [[bugs/done]] when done.
+elsewhere. Link items to [[bugs/done]] when done.
 
 Also see the [Debian bugs](http://bugs.debian.org/ikiwiki).
 
diff --git a/doc/bugs/bestlink_returns_deleted_pages.mdwn b/doc/bugs/bestlink_returns_deleted_pages.mdwn
index d3c5c8012..874f18ead 100644
--- a/doc/bugs/bestlink_returns_deleted_pages.mdwn
+++ b/doc/bugs/bestlink_returns_deleted_pages.mdwn
@@ -28,7 +28,7 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
 > maybe by keeping a copy of the old backlinks info, then that fix could be
 > applied here too. --[[Joey]]
 
->> Cool that was fast! Well at least half the <a href="http://www.college-paper.org/custom-essay.html college essay">college essay</a> bug is solved :) For now I'll
+>> Cool that was fast! Well at least half the bug is solved :) For now I'll
 >> probably try using a workaround if using bestlink within the needsbuild
 >> or scan hooks. Maybe by testing if pagemtime equals zero. --[[harishcm]]
 
@@ -48,8 +48,8 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
     use IkiWiki 3.00;
     
     sub import {
-    	hook(type => "getsetup", id => "bestlinkbug", call => &getsetup);
-    	hook(type => "needsbuild", id => "bestlinkbug", call => &needsbuild);
+    	hook(type => "getsetup", id => "bestlinkbug", call => \&getsetup);
+    	hook(type => "needsbuild", id => "bestlinkbug", call => \&needsbuild);
     }
     
     sub getsetup () {
-- 
cgit v1.2.3


From fa6d082955dbc75de62839e285c0d441cd83acb1 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Tue, 9 Mar 2010 10:50:03 +0000
Subject:

---
 ...eption:_Unknown_function___96__this__39___.mdwn | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index ac4d7ed12..4f94b77bd 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -27,3 +27,26 @@ What might be causing this exception and how I might go about debugging exceptio
 >>>>> I don't see how that's relevant. It would help if you showed me
 >>>>> exactly something that could be inserted into a page to cause the
 >>>>> problem. --[[Joey]] 
+
+>>>>>> Correct me if I'm wrong: ikiwiki generates an Omega template from its own templates, such as searchquery.tmpl and puts it into {$srcdir}/.ikiwiki/xapian/templates/query. Omega has its own template syntax, where function names are prefixed with dollar signs (`$`). So, when I call my wiki `$foobar`, ikiwiki generates an Omega template that looks like this snippet:
+
+    <div id="container">
+        <div class="pageheader">
+            <div class="header">
+            <span>
+            <a href="http://example.com">$foobar</    a>/search
+            </span>
+            </div>
+        </div> <!-- .pageheader -->
+    
+        <div id="content">
+            $setmap{prefix,title,S}
+    $setmap{prefix,link,XLINK}
+    $set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France}
+    ${
+    $def{PREV,
+    $if{$ne{$topdoc,0},<INPUT TYPE=image NAME="&lt;" ALT="&lt;"
+    SRC="/images/xapian-omega/prev.png" BORDER=0 HEIGHT=30 WIDTH=30>,
+    <IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>}
+
+>>>>>> So `$foobar` clashes with Omega's template tags. Does this help?
-- 
cgit v1.2.3


From 6d27bbd026ebed85f8501b6b4daefaba73061574 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 9 Mar 2010 19:55:19 -0500
Subject: Fix utf8 issues in calls to md5_hex.

This prevented comments containing some utf-8, including euro sign, from
being submitted. Since md5_hex is a C implementation, the string has to be
converted from perl's internal encoding to utf-8 when it is called. Some
utf-8 happened to work before, apparently by accident.

Note that this will change the checksums returned.

unique_comment_location is only used when posting comments, so the checksum
does not need to be stable there.

I only changed page_to_id for completeness; it is passed a comment page
name, and they can currently never contain utf-8.

In teximg, the bug could perhaps be triggered if the tex source contained
utf-8. If that happens, the checksum will change, and some extra work might
be performed on upgrade to rebuild the image.
---
 IkiWiki/Plugin/comments.pm | 4 ++--
 IkiWiki/Plugin/teximg.pm   | 3 ++-
 debian/changelog           | 6 ++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 8f8472f07..bbf850a17 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -839,7 +839,7 @@ sub unique_comment_location ($$$) {
 
 	eval q{use Digest::MD5 'md5_hex'};
 	error($@) if $@;
-	my $content_md5=md5_hex(shift);
+	my $content_md5=md5_hex(Encode::encode_utf8(shift));
 
 	my $dir=shift;
 
@@ -862,7 +862,7 @@ sub page_to_id ($) {
 	eval q{use Digest::MD5 'md5_hex'};
 	error($@) if $@;
 
-	return "comment-".md5_hex($page);
+	return "comment-".md5_hex(Encode::encode_utf8(($page));
 }
 	
 package IkiWiki::PageSpec;
diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index 0aaa79698..521af499f 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -8,6 +8,7 @@ use strict;
 use Digest::MD5 qw(md5_hex);
 use File::Temp qw(tempdir);
 use HTML::Entities;
+use Encode;
 use IkiWiki 3.00;
 
 my $default_prefix = <<EOPREFIX;
@@ -103,7 +104,7 @@ sub create ($$$) {
 		$height = 12;
 	}
 
-	my $digest = md5_hex($code, $height);
+	my $digest = md5_hex(Encode::encode_utf8($code), $height);
 
 	my $imglink= $params->{page} . "/$digest.png";
 	my $imglog =  $params->{page} .  "/$digest.log";
diff --git a/debian/changelog b/debian/changelog
index c0f99291f..d1253c079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100303) UNRELEASED; urgency=low
+
+  * Fix utf8 issues in calls to md5_hex.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
+
 ikiwiki (3.20100302) unstable; urgency=low
 
   * comments: Display number of comments in comment action link.
-- 
cgit v1.2.3


From 6eb71547dd5ba29d18bf8f19213e58e5d785a015 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 9 Mar 2010 19:55:50 -0500
Subject: typo

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index bbf850a17..ceb7c7836 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -855,7 +855,7 @@ sub unique_comment_location ($$$) {
 
 sub page_to_id ($) {
 	# Converts a comment page name into a unique, legal html id
-	# addtibute value, that can be used as an anchor to link to the
+	# attribute value, that can be used as an anchor to link to the
 	# comment.
 	my $page=shift;
 
-- 
cgit v1.2.3


From f64c04040717baf89f0583b59ded4819c5be29c6 Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Wed, 10 Mar 2010 15:26:27 +0000
Subject: suggesting List of tags when editing content (wishlist)

---
 ...shlist-discussion:_Editformular_showing_existing_tags.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn

diff --git a/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
new file mode 100644
index 000000000..98e4280cd
--- /dev/null
+++ b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
@@ -0,0 +1,11 @@
+# How about:
+
+having a list of all existing tags in the Edit-Formular as a selectionbox?
+
+Assume I have tagbase=/tags/ and for every tag I have given to articles an existing page there.
+
+Would it be possible to list all these tags together with the Formular, as selectionbox.
+Maybe even with parsing of the content and preselecting the tags, that are given in the article and vice-versa when selecting the fields then also generating the \[\[\!tag\]\]-sourcecode ?
+
+this would need a bit JS-work and somehow on compiletime we need to put the list of tags somewhere, where the cgi could read them from.
+This way, even a pagespec would suffice to determine the usable list of tags and not only the tagbase-variable.
-- 
cgit v1.2.3


From 2f2fbdf3a32ae7c7132441ad90c67553f80c306d Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Wed, 10 Mar 2010 16:07:55 +0000
Subject: tag2

---
 .../wishlist-discussion:_Editformular_showing_existing_tags.mdwn      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
index 98e4280cd..49c55e20e 100644
--- a/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
+++ b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
@@ -9,3 +9,7 @@ Maybe even with parsing of the content and preselecting the tags, that are given
 
 this would need a bit JS-work and somehow on compiletime we need to put the list of tags somewhere, where the cgi could read them from.
 This way, even a pagespec would suffice to determine the usable list of tags and not only the tagbase-variable.
+
+> I think this would be very hard to achieve with the current tag plugin, due to the nature of its implementation.
+> 
+> I've had a "tag2" plugin on the go for a while which supports this. It's in a very rough stage but I'll try to find it and upload it somewhere. -- [[Jon]]
-- 
cgit v1.2.3


From 9f82e93fca0da9c325ebf907d7dab00bd5baa3b1 Mon Sep 17 00:00:00 2001
From: dkowis <dkowis@web>
Date: Wed, 10 Mar 2010 19:13:50 +0000
Subject:

---
 doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn

diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
new file mode 100644
index 000000000..4c819816e
--- /dev/null
+++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
@@ -0,0 +1,16 @@
+In the template for ikiwiki's recent changes page
+
+     /usr/share/ikiwiki/templates/change.tmpl
+
+there is a missing </span> tag after the
+
+     <span class="changedate"><TMPL_VAR COMMITDATE>
+
+This results in the recentchanges/ page being invalid and rendering quite horrifyingly in Internet Exploder.
+
+[I'm running](http://wiki.shlrm.org) (linked so you can see the one I'm running if you need to) the latest version of ikiwiki, and I note that it's broken on [ikiwiki.info](http://validator.w3.org/check?uri=http%3A%2F%2Fikiwiki.info%2Frecentchanges%2F&charset=%28detect+automatically%29&doctype=Inline&group=0&user-agent=W3C_Validator%2F1.767) too :)
+
+[This one on debian](https://www.icanttype.org/recentchanges/) is somehow [valid](http://validator.w3.org/check?uri=https%3A%2F%2Fwww.icanttype.org%2F%2Frecentchanges%2F&charset=%28detect+automatically%29&doctype=Inline&group=0&user-agent=W3C_Validator%2F1.767), although it's using the same template. Perhaps there's an additional scrubbing going on his end.
+
+Thanks,
+David
-- 
cgit v1.2.3


From 1c03cf9ba2aaa4ac6d28eb1d13c0015809fad2c1 Mon Sep 17 00:00:00 2001
From: dkowis <dkowis@web>
Date: Wed, 10 Mar 2010 19:27:26 +0000
Subject: noted that I fixed the template on my box

---
 doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
index 4c819816e..007d763b5 100644
--- a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
+++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
@@ -14,3 +14,5 @@ This results in the recentchanges/ page being invalid and rendering quite horrif
 
 Thanks,
 David
+
+PS: I have fixed the template by hand on my server, so it will validate, however ikiwiki.info will not.
-- 
cgit v1.2.3


From 03c2cf94e28ac8b90e92dbd18181d52f2338385c Mon Sep 17 00:00:00 2001
From: "http://adam.shand.net/" <http://adam.shand.net/@web>
Date: Thu, 11 Mar 2010 05:32:00 +0000
Subject:

---
 doc/plugins/getsource/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/plugins/getsource/discussion.mdwn

diff --git a/doc/plugins/getsource/discussion.mdwn b/doc/plugins/getsource/discussion.mdwn
new file mode 100644
index 000000000..45a1d62b5
--- /dev/null
+++ b/doc/plugins/getsource/discussion.mdwn
@@ -0,0 +1 @@
+It would be very cool if this plugin was enabled by default.  One of the best ways to learn how to do various advanced things is to be able to "view source" on other wiki's which do things you like.  -- [[AdamShand]]
-- 
cgit v1.2.3


From 9b656e27ea4045d72698949f19fae120c51b7e3c Mon Sep 17 00:00:00 2001
From: JoshTriplett <JoshTriplett@web>
Date: Thu, 11 Mar 2010 07:42:07 +0000
Subject: Add my homepage.

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 345604c36..bd9bee3ab 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -141,6 +141,7 @@ Personal sites and blogs
 * [Mukund's homepage](http://www.mukund.org/)
 * [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
+* [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From d021a1ddbc1890dbeb904711a581ac4fc084545b Mon Sep 17 00:00:00 2001
From: JoshTriplett <JoshTriplett@web>
Date: Thu, 11 Mar 2010 07:44:56 +0000
Subject: Add Serialist, and the amusing/frightening way it uses ikiwiki.

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index bd9bee3ab..8e567ec0d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -53,6 +53,7 @@ Projects & Organizations
 * [IPOL Image Processing On Line](http://www.ipol.im)
 * [Debian Costa Rica](http://cr.debian.net/)
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
+* [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From b72757b6aecfd2a5d8d3789bc0cdb6fb5783f8fb Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 11 Mar 2010 18:15:44 +0000
Subject: Add missing </span> to change.tmpl COMMITDATE, fixing well-formedness

This only affects people who don't use either htmltidy or htmlbalance.

Bug: http://ikiwiki.info/bugs/templateForRecentChangesMissingCloseSpan/
---
 templates/change.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/change.tmpl b/templates/change.tmpl
index 0e61a80f4..c9f6ce42b 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -27,7 +27,7 @@
 <span class="desc"><br />Commit type:</span>
 <span class="committype"><TMPL_VAR COMMITTYPE></span>
 <span class="desc"><br />Date:</span>
-<span class="changedate"><TMPL_VAR COMMITDATE>
+<span class="changedate"><TMPL_VAR COMMITDATE></span>
 </div>
 <div class=changelog>
 <TMPL_LOOP NAME="MESSAGE">
-- 
cgit v1.2.3


From e4ed8a51c1eb7bd80f416dcc59231a13e3d1255e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 11 Mar 2010 18:20:10 +0000
Subject: fix in a branch

---
 doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
index 007d763b5..536af3473 100644
--- a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
+++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
@@ -16,3 +16,9 @@ Thanks,
 David
 
 PS: I have fixed the template by hand on my server, so it will validate, however ikiwiki.info will not.
+
+> [[!template id="gitbranch" branch=smcv/trivia author="[[smcv]]"]] [[!tag patch]]
+> Enabling either [[plugins/htmltidy]] or [[plugins/htmlbalance]] will automatically fix unbalanced
+> markup like this; using [[plugins/comments]] without having one or other of those is a bad idea
+> from the point of view of avoiding comment forgery, which is probably why icanttype.org works
+> correctly. Anyway, I've fixed this in a branch: Joey, care to review smcv/trivia? --[[smcv]]
-- 
cgit v1.2.3


From ac3aac560f74457ded48ba3b5a14d0bbbf9b6d92 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Mar 2010 15:44:10 -0500
Subject: moderatedcomments: Added moderate_pagespec

* moderatedcomments: Added moderate_pagespec that can be used
  to control which users or comment locations are moderated.
  This can be used, just for example, to moderate http://myopenid.com/*
  if you're getting a lot of spammers from one particular openid
  provider (who should perhaps answer your emails about them),
  while not moderating other users.
* moderatedcomments: The moderate_users setting is deprecated. Instead,
  set moderate_pagespec to "!admin()" or "user(*)" instead.
---
 IkiWiki/Plugin/moderatedcomments.pm | 37 ++++++++++++++++++++++++++++---------
 debian/changelog                    |  8 ++++++++
 doc/plugins/moderatedcomments.mdwn  |  8 +++++---
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index afe1ceedf..b0a328a06 100644
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -17,10 +17,11 @@ sub getsetup () {
 			rebuild => 0,
 			section => "auth",
 		},
-		moderate_users => {
-			type => 'boolean',
-			example => 1,
-			description => 'Moderate comments of logged-in users?',
+		moderate_pagespec => {
+			type => 'pagespec',
+			example => 'user(http://*)',
+			description => 'PageSpec matching users or comment locations to moderate',
+			link => 'ikiwiki/PageSpec',
 			safe => 1,
 			rebuild => 0,
 		},
@@ -32,14 +33,32 @@ sub checkcontent (@) {
 	# only handle comments	
 	return undef unless pagespec_match($params{page}, "postcomment(*)",
 	                	location => $params{page});
+	
+	# backwards compatability
+	if (exists $config{moderate_users} &&
+	    ! exists $config{moderate_pagespec}) {
+		$config{moderate_pagespec} = $config{moderate_users}
+			? "!admin()"
+			: "!user(*)";
+	}
+
+	# default is to moderate all except admins
+	if (! exists $config{moderate_pagespec}) {
+		$config{moderate_pagespec}="!admin()";
+	}
 
-	# admins and maybe users can comment w/o moderation
 	my $session=$params{session};
 	my $user=$session->param("name") if $session;
-	return undef if defined $user && (IkiWiki::is_admin($user) ||
-		(exists $config{moderate_users} && ! $config{moderate_users}));
-
-	return gettext("comment needs moderation");
+	if (pagespec_match($params{page}, $config{moderate_pagespec},
+			location => $params{page},
+			(defined $user ? (user => $user) : ()),
+			(defined $ENV{REMOTE_ADDR} ? (ip => $ENV{REMOTE_ADDR}) : ()),
+	)) {
+		return gettext("comment needs moderation");
+	}
+	else {
+		return undef;
+	}
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index d1253c079..c58e612db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
 ikiwiki (3.20100303) UNRELEASED; urgency=low
 
   * Fix utf8 issues in calls to md5_hex.
+  * moderatedcomments: Added moderate_pagespec that can be used
+    to control which users or comment locations are moderated.
+    This can be used, just for example, to moderate http://myopenid.com/*
+    if you're getting a lot of spammers from one particular openid
+    provider (who should perhaps answer your emails about them),
+    while not moderating other users.
+  * moderatedcomments: The moderate_users setting is deprecated. Instead,
+    set moderate_pagespec to "!admin()" or "user(*)" instead.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
 
diff --git a/doc/plugins/moderatedcomments.mdwn b/doc/plugins/moderatedcomments.mdwn
index 97924d742..c29b0b052 100644
--- a/doc/plugins/moderatedcomments.mdwn
+++ b/doc/plugins/moderatedcomments.mdwn
@@ -5,6 +5,8 @@ This plugin causes [[comments]] to be held for manual moderation.
 Admins can access the comment moderation queue via their preferences page.
 
 By default, all comments made by anyone who is not an admin will be held
-for moderation. The `moderate_users` setting can be set to false to avoid
-moderating comments of logged-in users, while still moderating anonymous
-comments.
+for moderation. The `moderate_pagespec` setting can be used to specify a
+[[ikiwiki/PageSpec]] to match comments and users who should be moderated.
+For example, to avoid moderating comments from logged-in users, set
+`moderate_pagespec` to "!user(*)". Or to moderate everyone except for
+admins, set it to "!admin(*)".
-- 
cgit v1.2.3


From f259f33a0ad4858ce33f458148f1733351b91d92 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Mar 2010 15:49:48 -0500
Subject: Fix missing span on recentchanges page template.

---
 debian/changelog                                       | 1 +
 doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c58e612db..6b5671e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low
     while not moderating other users.
   * moderatedcomments: The moderate_users setting is deprecated. Instead,
     set moderate_pagespec to "!admin()" or "user(*)" instead.
+  * Fix missing span on recentchanges page template.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
 
diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
index 536af3473..5c322991a 100644
--- a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
+++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
@@ -22,3 +22,5 @@ PS: I have fixed the template by hand on my server, so it will validate, however
 > markup like this; using [[plugins/comments]] without having one or other of those is a bad idea
 > from the point of view of avoiding comment forgery, which is probably why icanttype.org works
 > correctly. Anyway, I've fixed this in a branch: Joey, care to review smcv/trivia? --[[smcv]]
+
+[[done]], thanks guys --[[Joey]]
-- 
cgit v1.2.3


From 45dfdcb2571953be6815342510b9bb2a73ce59e7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Mar 2010 16:10:04 -0500
Subject: search: Avoid '$' in the wikiname appearing unescaped on omega's
 query template, where it might crash omega.

Really, a more general fix, this deals with any $ that might appear on the
misctemplate.
---
 IkiWiki/Plugin/search.pm                                  | 15 +++++++++++++--
 debian/changelog                                          |  2 ++
 .../Exception:_Unknown_function___96__this__39___.mdwn    |  6 ++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index fb68396a1..c0e8703d8 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -110,6 +110,7 @@ sub index (@) {
 	# data used by omega
 	# Decode html entities in it, since omega re-encodes them.
 	eval q{use HTML::Entities};
+	error $@ if $@;
 	$doc->set_data(
 		"url=".urlto($params{page}, "")."\n".
 		"sample=".decode_entities($sample)."\n".
@@ -214,9 +215,19 @@ sub setupfiles () {
 		writefile("omega.conf", $config{wikistatedir}."/xapian",
 			"database_dir .\n".
 			"template_dir ./templates\n");
+		
+		# Avoid omega interpreting anything in the misctemplate
+		# as an omegascript command.
+		my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0");
+		eval q{use HTML::Entities};
+		error $@ if $@;
+		$misctemplate=encode_entities($misctemplate, '\$');
+
+		my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
+		$misctemplate=~s/\0/$querytemplate/;
+
 		writefile("query", $config{wikistatedir}."/xapian/templates",
-			IkiWiki::misctemplate(gettext("search"),
-				readfile(IkiWiki::template_file("searchquery.tmpl"))));
+			$misctemplate);
 		$setup=1;
 	}
 }
diff --git a/debian/changelog b/debian/changelog
index 6b5671e3e..6828e6b3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low
   * moderatedcomments: The moderate_users setting is deprecated. Instead,
     set moderate_pagespec to "!admin()" or "user(*)" instead.
   * Fix missing span on recentchanges page template.
+  * search: Avoid '$' in the wikiname appearing unescaped on omega's
+    query template, where it might crash omega.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
 
diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 4f94b77bd..035247100 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -50,3 +50,9 @@ What might be causing this exception and how I might go about debugging exceptio
     <IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>}
 
 >>>>>> So `$foobar` clashes with Omega's template tags. Does this help?
+
+>>>>>>> Ahh. I had somehow gotten it into my head that you were talking
+>>>>>>> about the title of a single page, not of the whole wiki. But
+>>>>>>> you were clear all along it was the wiki title. Sorry for
+>>>>>>> misunderstanding. I've put in a complete fix for this problem.
+>>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] 
-- 
cgit v1.2.3


From d1ebdcd0a23617a578e78e464e3b36f0390f3c4d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Mar 2010 16:28:32 -0500
Subject: redundancy

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6828e6b3f..2a0217dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low
     provider (who should perhaps answer your emails about them),
     while not moderating other users.
   * moderatedcomments: The moderate_users setting is deprecated. Instead,
-    set moderate_pagespec to "!admin()" or "user(*)" instead.
+    set moderate_pagespec to "!admin()" or "user(*)".
   * Fix missing span on recentchanges page template.
   * search: Avoid '$' in the wikiname appearing unescaped on omega's
     query template, where it might crash omega.
-- 
cgit v1.2.3


From 9c274a001a17df01d9ea609c1c39eae72e4c6404 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Mar 2010 16:29:00 -0500
Subject: formatting

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2a0217dc4..bae0e7ee0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low
   * Fix utf8 issues in calls to md5_hex.
   * moderatedcomments: Added moderate_pagespec that can be used
     to control which users or comment locations are moderated.
-    This can be used, just for example, to moderate http://myopenid.com/*
+    This can be used, just for example, to moderate "user(http://myopenid.com/*)"
     if you're getting a lot of spammers from one particular openid
     provider (who should perhaps answer your emails about them),
     while not moderating other users.
-- 
cgit v1.2.3


From 98facfc958fedf459c838269cd2b6cdf67bbac80 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 17:50:16 +0000
Subject: Added a page for myself.

---
 doc/users/ivan_shmakov.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/users/ivan_shmakov.mdwn

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
new file mode 100644
index 000000000..41bf9b09a
--- /dev/null
+++ b/doc/users/ivan_shmakov.mdwn
@@ -0,0 +1,3 @@
+&hellip; To put it short: an Ikiwiki newbie.
+
+I run an Ikiwiki instance at <http://gray.am-1.org/~ivan/lhc/> (though the DNS servers seem to be temporarily out of smoke as of 2010-03-12Z.)
-- 
cgit v1.2.3


From 58a6847cfb445dbb87716e4064f8151cc44a233a Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 17:51:17 +0000
Subject: Note that, actually, SVG could be embedded into an Ikiwiki page,
 albeit in a somewhat crude manner.

---
 doc/todo/svg.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/todo/svg.mdwn b/doc/todo/svg.mdwn
index 89b183db6..2099751e3 100644
--- a/doc/todo/svg.mdwn
+++ b/doc/todo/svg.mdwn
@@ -57,3 +57,11 @@ in the trunk if other people think it's useful.
 
 [htmlscrubber.pm]:http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blob;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hb=fe333c8e5b4a5f374a059596ee698dacd755182d
 [diff]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blobdiff;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hp=3bdaccea119ec0e1b289a0da2f6d90e2219b8d66;hb=fe333c8e5b4a5f374a059596ee698dacd755182d;hpb=be0b4f603f918444b906e42825908ddac78b7073
+
+* * *
+
+Actually, there's a way to embed SVG into MarkDown sources using the [data: URI scheme][rfc2397], [like this](data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8c3ZnIHdpZHRoPSIxOTIiIGhlaWdodD0iMTkyIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KIDwhLS0gQ3JlYXRlZCB3aXRoIFNWRy1lZGl0IC0gaHR0cDovL3N2Zy1lZGl0Lmdvb2dsZWNvZGUuY29tLyAtLT4KIDx0aXRsZT5IZWxsbywgd29ybGQhPC90aXRsZT4KIDxnPgogIDx0aXRsZT5MYXllciAxPC90aXRsZT4KICA8ZyB0cmFuc2Zvcm09InJvdGF0ZSgtNDUsIDk3LjY3MTksIDk3LjY2OCkiIGlkPSJzdmdfNyI+CiAgIDxyZWN0IHN0cm9rZS13aWR0aD0iNSIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjRkYwMDAwIiBpZD0ic3ZnXzUiIGhlaWdodD0iNTYuMDAwMDAzIiB3aWR0aD0iMTc1IiB5PSI2OS42Njc5NjkiIHg9IjEwLjE3MTg3NSIvPgogICA8dGV4dCB4bWw6c3BhY2U9InByZXNlcnZlIiB0ZXh0LWFuY2hvcj0ibWlkZGxlIiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iMjQiIHN0cm9rZS13aWR0aD0iMCIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjZmZmZjAwIiBpZD0ic3ZnXzYiIHk9IjEwNS42NjgiIHg9Ijk5LjY3MTkiPkhlbGxvLCB3b3JsZCE8L3RleHQ+CiAgPC9nPgogPC9nPgo8L3N2Zz4=).
+Of course, this way to display an image one needs to click a link, but it may be considered a feature.
+&mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
+[rfc2397]: http://tools.ietf.org/html/rfc2397
-- 
cgit v1.2.3


From 844bb8134b5ff6e3d73dc3c8b91ed516fa618c41 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 18:33:10 +0000
Subject: Added an <object /> wishlist item.

---
 ...er_control_over___60__object___47____62__s.mdwn | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 doc/todo/finer_control_over___60__object___47____62__s.mdwn

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
new file mode 100644
index 000000000..714f5ae50
--- /dev/null
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -0,0 +1,41 @@
+IIUC, the current version of [HTML::Scrubber][] allows for the `object` tags to be either enabled or disabled entirely.  However, while `object` can be used to add *code* (which is indeed a potential security hole) to a document, reading [Objects, Images, and Applets in HTML documents][objects-html] reveals that the &ldquo;dangerous&rdquo; are not all the `object`s, but rather those having the following attributes:
+
+    classid     %URI;          #IMPLIED  -- identifies an implementation --
+    codebase    %URI;          #IMPLIED  -- base URI for classid, data, archive--
+    codetype    %ContentType;  #IMPLIED  -- content type for code --
+    archive     CDATA          #IMPLIED  -- space-separated list of URIs --
+
+It seems that the following attributes are, OTOH, safe:
+
+    declare     (declare)      #IMPLIED  -- declare but don't instantiate flag --
+    data        %URI;          #IMPLIED  -- reference to object's data --
+    type        %ContentType;  #IMPLIED  -- content type for data --
+    standby     %Text;         #IMPLIED  -- message to show while loading --
+    height      %Length;       #IMPLIED  -- override height --
+    width       %Length;       #IMPLIED  -- override width --
+    usemap      %URI;          #IMPLIED  -- use client-side image map --
+    name        CDATA          #IMPLIED  -- submit as part of form --
+    tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+
+Should the former attributes be *scrubbed* while the latter left intact, the use of the `object` tag would seemingly become safe.
+
+Note also that allowing `object` (either restricted in such a way or not) automatically solves the [[/todo/svg]] issue.
+
+For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by the `data` and `usemap` attributes) to, say, relative and `data:` (as per [RFC 2397][]) ones as well, though it requires some more consideration.
+
+&mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
+[[wishlist]]
+
+## See also
+
+* [Objects, Images, and Applets in HTML documents][objects-html]
+* [[plugins/htmlscrubber|/plugins/htmlscrubber]]
+* [[todo/svg|/todo/svg]]
+* [RFC 2397: The &ldquo;data&rdquo; URL scheme. L.&nbsp;Masinter. August 1998.][RFC 2397]
+* [Uniform Resource Identifier &mdash; the free encyclopedia][URI]
+
+[HTML::Scrubber]: http://search.cpan.org/~podmaster/HTML-Scrubber-0.08/Scrubber.pm
+[objects-html]: http://www.w3.org/TR/1999/REC-html401-19991224/struct/objects.html
+[RFC 2397]: http://tools.ietf.org/html/rfc2397
+[URI]: http://en.wikipedia.org/wiki/Uniform_Resource_Identifier
-- 
cgit v1.2.3


From 556181d417e3461de56c43445ec9b2b0aefc7141 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 14:29:54 -0500
Subject: data:image/svg is a security hole as javascript can presumably be
 inserted

---
 doc/todo/svg.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/todo/svg.mdwn b/doc/todo/svg.mdwn
index 2099751e3..274ebf3e3 100644
--- a/doc/todo/svg.mdwn
+++ b/doc/todo/svg.mdwn
@@ -58,6 +58,8 @@ in the trunk if other people think it's useful.
 [htmlscrubber.pm]:http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blob;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hb=fe333c8e5b4a5f374a059596ee698dacd755182d
 [diff]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blobdiff;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hp=3bdaccea119ec0e1b289a0da2f6d90e2219b8d66;hb=fe333c8e5b4a5f374a059596ee698dacd755182d;hpb=be0b4f603f918444b906e42825908ddac78b7073
 
+> Unfortuantly these links are broken. --[[Joey]]
+
 * * *
 
 Actually, there's a way to embed SVG into MarkDown sources using the [data: URI scheme][rfc2397], [like this](data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8c3ZnIHdpZHRoPSIxOTIiIGhlaWdodD0iMTkyIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KIDwhLS0gQ3JlYXRlZCB3aXRoIFNWRy1lZGl0IC0gaHR0cDovL3N2Zy1lZGl0Lmdvb2dsZWNvZGUuY29tLyAtLT4KIDx0aXRsZT5IZWxsbywgd29ybGQhPC90aXRsZT4KIDxnPgogIDx0aXRsZT5MYXllciAxPC90aXRsZT4KICA8ZyB0cmFuc2Zvcm09InJvdGF0ZSgtNDUsIDk3LjY3MTksIDk3LjY2OCkiIGlkPSJzdmdfNyI+CiAgIDxyZWN0IHN0cm9rZS13aWR0aD0iNSIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjRkYwMDAwIiBpZD0ic3ZnXzUiIGhlaWdodD0iNTYuMDAwMDAzIiB3aWR0aD0iMTc1IiB5PSI2OS42Njc5NjkiIHg9IjEwLjE3MTg3NSIvPgogICA8dGV4dCB4bWw6c3BhY2U9InByZXNlcnZlIiB0ZXh0LWFuY2hvcj0ibWlkZGxlIiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iMjQiIHN0cm9rZS13aWR0aD0iMCIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjZmZmZjAwIiBpZD0ic3ZnXzYiIHk9IjEwNS42NjgiIHg9Ijk5LjY3MTkiPkhlbGxvLCB3b3JsZCE8L3RleHQ+CiAgPC9nPgogPC9nPgo8L3N2Zz4=).
@@ -65,3 +67,11 @@ Of course, this way to display an image one needs to click a link, but it may be
 &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
 
 [rfc2397]: http://tools.ietf.org/html/rfc2397
+
+> You can do the same with img src actually.
+> 
+> If svg markup allows unsafe elements (ie, javascript),
+> which it appears to, 
+> then this is a security hole, and the htmlscrubber
+> needs to lock it down more. Darn, now I have to spend my afternoon making
+> security releases! --[[Joey]] 
-- 
cgit v1.2.3


From 2ad3e60ee8272b7cccfd83ae02d5b45e2cec003d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 14:49:13 -0500
Subject: htmlscrubber: Security fix: In data:image/* uris, only allow a few
 whitelisted image types. No svg.

---
 IkiWiki/Plugin/htmlscrubber.pm |  6 +++---
 debian/changelog               |  4 +++-
 doc/security.mdwn              | 12 ++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index ee284a45c..26e18ffc7 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -30,9 +30,9 @@ sub import {
 		"msnim", "notes", "rsync", "secondlife", "skype", "ssh",
 		"sftp", "smb", "sms", "snews", "webcal", "ymsgr",
 	);
-	# data is a special case. Allow data:image/*, but
-	# disallow data:text/javascript and everything else.
-	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/|[^:]+(?:$|\/))/i;
+	# data is a special case. Allow a few data:image/ types,
+	# but disallow data:text/javascript and everything else.
+	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|\/))/i;
 }
 
 sub getsetup () {
diff --git a/debian/changelog b/debian/changelog
index bae0e7ee0..7fdbbcb63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100303) UNRELEASED; urgency=low
+ikiwiki (3.20100312) unstable; urgency=HIGH
 
   * Fix utf8 issues in calls to md5_hex.
   * moderatedcomments: Added moderate_pagespec that can be used
@@ -12,6 +12,8 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low
   * Fix missing span on recentchanges page template.
   * search: Avoid '$' in the wikiname appearing unescaped on omega's
     query template, where it might crash omega.
+  * htmlscrubber: Security fix: In data:image/* uris, only allow a few
+    whitelisted image types. No svg.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
 
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 3924186c2..21aef316b 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -427,3 +427,15 @@ enabling TeX configuration options that disallow unsafe TeX commands.
 The fix was released on 30 Aug 2009 in version 3.1415926, and was
 backported to stable in version 2.53.4. If you use the teximg plugin,
 I recommend upgrading. ([[!cve CVE-2009-2944]])
+
+## javascript insertion via svg uris
+
+Ivan Shmakov pointed out that the htmlscrubber allowed `data:image/*` urls,
+including `data:image/svg+xml`. But svg can contain javascript, so that is
+unsafe.
+
+This hole was discovered on 12 March 2010 and fixed the same day
+with the release of ikiwiki 3.20100312.
+A fix was also backported to Debian etch, as version 2.53.5. I recommend
+upgrading to one of these versions if your wiki can be edited by third
+parties.
-- 
cgit v1.2.3


From 4711076fad54ff8152f03a7e4bdd4b5c2df1916c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 15:00:39 -0500
Subject: clarify

---
 doc/todo/mercurial.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/todo/mercurial.mdwn b/doc/todo/mercurial.mdwn
index e71c8106a..de1f148e5 100644
--- a/doc/todo/mercurial.mdwn
+++ b/doc/todo/mercurial.mdwn
@@ -119,3 +119,11 @@ I have a few notes on mercurial usage after trying it out for a while:
 >> I think the ideal solution would be to build `$destdir/recentchanges/*` directly from the output of `hg log`. --[[buo]]
 
 >>>> That would be 100 times as slow, so I chose not to do that. --[[Joey]]
+
+>>>> Since this is confusing people, allow me to clarify: Ikiwiki's
+>>>> recentchanges generation pulls log information directly out of the VCS as
+>>>> needed. It caches it in recentchanges/* in the `scrdir`. These cache
+>>>> files need not be preserved, should never be checked into VCS, and if
+>>>> you want to you can configure your VCSignore file to ignore them,
+>>>> just as you can configure it to ignore the `.ikiwiki` directory in the
+>>>> `scrdir`. --[[Joey]] 
-- 
cgit v1.2.3


From edec9514f49bf335e8c71a19b169ccbba6a0ba95 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 15:01:24 -0500
Subject: typo

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ceb7c7836..98786f432 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -862,7 +862,7 @@ sub page_to_id ($) {
 	eval q{use Digest::MD5 'md5_hex'};
 	error($@) if $@;
 
-	return "comment-".md5_hex(Encode::encode_utf8(($page));
+	return "comment-".md5_hex(Encode::encode_utf8(($page)));
 }
 	
 package IkiWiki::PageSpec;
-- 
cgit v1.2.3


From 0daa7a122f5e5c51fbd091a1f0c7b720b59a6172 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 15:09:33 -0500
Subject: fix escaping of indented dot

---
 mdwn2man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mdwn2man b/mdwn2man
index e4ba5aadf..090174534 100755
--- a/mdwn2man
+++ b/mdwn2man
@@ -9,7 +9,7 @@ print ".TH $prog $section\n";
 while (<>) {
 	s{(\\?)\[\[([^\s\|\]]+)(\|[^\s\]]+)?\]\]}{$1 ? "[[$2]]" : $2}eg;
 	s/\`//g;
-	s/^\./\\&./g;
+	s/^\s*\./\\&./g;
 	if (/^#\s/) {
 		s/^#\s/.SH /;
 		<>; # blank;
-- 
cgit v1.2.3


From 20bf162e30e26e7e3bd97edc3b0c5956ec0f7791 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 15:14:28 -0500
Subject: releasing version 3.20100312

---
 ikiwiki.spec   |  2 +-
 po/ikiwiki.pot | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 73ea7a9c6..2bb87724d 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100302
+Version: 3.20100312
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 11af9e4cd..df3000feb 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-03-12 15:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -494,7 +494,7 @@ msgstr ""
 msgid "Mirror"
 msgstr ""
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 msgid "comment needs moderation"
 msgstr ""
 
@@ -864,12 +864,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr ""
 
@@ -960,11 +960,11 @@ msgstr ""
 msgid "failed to process:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 msgid "failed to generate image from code"
 msgstr ""
 
-- 
cgit v1.2.3


From afa930a9c4ada59ea840d626f583f8b4fb3c3f20 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 15:22:32 -0500
Subject: add news item for ikiwiki 3.20100312

---
 doc/news/version_3.20091218.mdwn | 11 -----------
 doc/news/version_3.20100312.mdwn | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100644 doc/news/version_3.20091218.mdwn
 create mode 100644 doc/news/version_3.20100312.mdwn

diff --git a/doc/news/version_3.20091218.mdwn b/doc/news/version_3.20091218.mdwn
deleted file mode 100644
index 224e81c4e..000000000
--- a/doc/news/version_3.20091218.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-ikiwiki 3.20091218 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
-     Requena.
-   * Improve javascript onload handling.
-   * monotone: Deal with format change in version 0.45.
-     (Thanks, Richard Levitte)
-   * cvs: Add missing bit to Automator.
-   * attachment: Fix reversion in attachment sorting by age.
-   * Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and
-     goto."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100312.mdwn b/doc/news/version_3.20100312.mdwn
new file mode 100644
index 000000000..10c34425d
--- /dev/null
+++ b/doc/news/version_3.20100312.mdwn
@@ -0,0 +1,16 @@
+ikiwiki 3.20100312 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix utf8 issues in calls to md5\_hex.
+   * moderatedcomments: Added moderate\_pagespec that can be used
+     to control which users or comment locations are moderated.
+     This can be used, just for example, to moderate "user(http://myopenid.com/*)"
+     if you're getting a lot of spammers from one particular openid
+     provider (who should perhaps answer your emails about them),
+     while not moderating other users.
+   * moderatedcomments: The moderate\_users setting is deprecated. Instead,
+     set moderate\_pagespec to "!admin()" or "user(*)".
+   * Fix missing span on recentchanges page template.
+   * search: Avoid '$' in the wikiname appearing unescaped on omega's
+     query template, where it might crash omega.
+   * htmlscrubber: Security fix: In data:image/* uris, only allow a few
+     whitelisted image types. No svg."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 08485ec444cf81015e39c52e6ce8e7b933a036f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 15:40:47 -0500
Subject: response

---
 doc/todo/finer_control_over___60__object___47____62__s.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
index 714f5ae50..ac4b55568 100644
--- a/doc/todo/finer_control_over___60__object___47____62__s.mdwn
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -27,6 +27,13 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 
 [[wishlist]]
 
+> SVG can contain embedded javascript. The spec that you link to contains
+> examples of objects that contain python scripts, Microsoft OLE 
+> objects, and Java. And then there's flash. I don't think ikiwiki can
+> assume all the possibilities are handled securely, particularly WRT XSS
+> attacks.
+> --[[Joey]]
+
 ## See also
 
 * [Objects, Images, and Applets in HTML documents][objects-html]
-- 
cgit v1.2.3


From 0c3f59d33aa6af6c327d863a4110337ac9cae898 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 16:16:47 -0500
Subject: move bug report to bugs and close

---
 ...eption:_Unknown_function___96__this__39___.mdwn | 60 ++++++++++++++++++++++
 ...eption:_Unknown_function___96__this__39___.mdwn | 58 ---------------------
 2 files changed, 60 insertions(+), 58 deletions(-)
 create mode 100644 doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
 delete mode 100644 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn

diff --git a/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
new file mode 100644
index 000000000..9eac8eae5
--- /dev/null
+++ b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
@@ -0,0 +1,60 @@
+I'm very excited to try out ikiwiki, since it should fit my purposes extremely well, but I'm having trouble with the search plugin. I'm pretty sure that right after I installed ikiwiki and needed dependencies, the search plugin was working fine. However, now when I try to use search, I get "Exception: Unknown function `this'" error on a blank page. I'm not sure how I should go about debugging this issue - my server's (I use Lighttpd 1.4.22) error log has no mention of the exception and there's nothing in /var/log/syslog either.
+
+What might be causing this exception and how I might go about debugging exceptions?
+
+> Appears to be coming from your xapian omega cgi binary. If you
+> run `strings /usr/lib/cgi-bin/omega/omega` you can see it has
+> "Exception: " in it, and I have found some similar (but not identical)
+> error messages from xapian in a web search.
+> 
+> I don´t know what to suggest, other than upgrade/downgrade/reinstall
+> xapian-omega, and contacting the xapian developers for debugging.
+> You could try rebuilding your wiki in case it is somehow
+> caused by a problem with the xapian database. Failing everything, you
+> could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
+
+>> Thanks, Joey. With your help I was able to figure out what was wrong. It's a fun little bug (or feature): the title of my wiki had string `$this` in title and that's what was causing the omega binary to choke. My wiki's title was inserted without escaping into the query template used by omega. Omega treated `$this` in the title as a function name and threw an exception because no such function was defined. To avoid this behavior, I used an html entity in the title, so `$this` became `&#36;this`. I don't think that the wiki title should be inserted into the template without escaping - it can produce an error that's not trivial to debug. If users want to modify the html in the title, they should be editing respective templates, not typing html in the wiki title input. What do you think? --[[dkobozev]]
+
+>>> Sounds like a bug in omega, and one that probably would affect other
+>>> users of omega too. Ikiwiki could work around it by pre-escaping
+>>> data before passing it to xapian. I have not quite managed to reproduce it though;
+>>> tried setting a page title to '$this' and 'foo $this'.
+>>> That's with version 1.0.18 of omega.
+>>> --[[Joey]]
+
+>>>> I tried it with both omega 1.0.13 and omega 1.0.18 and the issue is present in both. If I view the contents of {$srcdir}/.ikiwiki/xapian/templates/query, I can see that the wiki title is inserted verbatim and there are calls to `$setmap`, `$set` and `$def` etc in the template. --[[dkobozev]]
+
+>>>>> I don't see how that's relevant. It would help if you showed me
+>>>>> exactly something that could be inserted into a page to cause the
+>>>>> problem. --[[Joey]] 
+
+>>>>>> Correct me if I'm wrong: ikiwiki generates an Omega template from its own templates, such as searchquery.tmpl and puts it into {$srcdir}/.ikiwiki/xapian/templates/query. Omega has its own template syntax, where function names are prefixed with dollar signs (`$`). So, when I call my wiki `$foobar`, ikiwiki generates an Omega template that looks like this snippet:
+
+    <div id="container">
+        <div class="pageheader">
+            <div class="header">
+            <span>
+            <a href="http://example.com">$foobar</    a>/search
+            </span>
+            </div>
+        </div> <!-- .pageheader -->
+    
+        <div id="content">
+            $setmap{prefix,title,S}
+    $setmap{prefix,link,XLINK}
+    $set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France}
+    ${
+    $def{PREV,
+    $if{$ne{$topdoc,0},<INPUT TYPE=image NAME="&lt;" ALT="&lt;"
+    SRC="/images/xapian-omega/prev.png" BORDER=0 HEIGHT=30 WIDTH=30>,
+    <IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>}
+
+>>>>>> So `$foobar` clashes with Omega's template tags. Does this help?
+
+>>>>>>> Ahh. I had somehow gotten it into my head that you were talking
+>>>>>>> about the title of a single page, not of the whole wiki. But
+>>>>>>> you were clear all along it was the wiki title. Sorry for
+>>>>>>> misunderstanding. I've put in a complete fix for this problem.
+>>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] 
+
+[[done]]
diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
deleted file mode 100644
index 035247100..000000000
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ /dev/null
@@ -1,58 +0,0 @@
-I'm very excited to try out ikiwiki, since it should fit my purposes extremely well, but I'm having trouble with the search plugin. I'm pretty sure that right after I installed ikiwiki and needed dependencies, the search plugin was working fine. However, now when I try to use search, I get "Exception: Unknown function `this'" error on a blank page. I'm not sure how I should go about debugging this issue - my server's (I use Lighttpd 1.4.22) error log has no mention of the exception and there's nothing in /var/log/syslog either.
-
-What might be causing this exception and how I might go about debugging exceptions?
-
-> Appears to be coming from your xapian omega cgi binary. If you
-> run `strings /usr/lib/cgi-bin/omega/omega` you can see it has
-> "Exception: " in it, and I have found some similar (but not identical)
-> error messages from xapian in a web search.
-> 
-> I don´t know what to suggest, other than upgrade/downgrade/reinstall
-> xapian-omega, and contacting the xapian developers for debugging.
-> You could try rebuilding your wiki in case it is somehow
-> caused by a problem with the xapian database. Failing everything, you
-> could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
-
->> Thanks, Joey. With your help I was able to figure out what was wrong. It's a fun little bug (or feature): the title of my wiki had string `$this` in title and that's what was causing the omega binary to choke. My wiki's title was inserted without escaping into the query template used by omega. Omega treated `$this` in the title as a function name and threw an exception because no such function was defined. To avoid this behavior, I used an html entity in the title, so `$this` became `&#36;this`. I don't think that the wiki title should be inserted into the template without escaping - it can produce an error that's not trivial to debug. If users want to modify the html in the title, they should be editing respective templates, not typing html in the wiki title input. What do you think? --[[dkobozev]]
-
->>> Sounds like a bug in omega, and one that probably would affect other
->>> users of omega too. Ikiwiki could work around it by pre-escaping
->>> data before passing it to xapian. I have not quite managed to reproduce it though;
->>> tried setting a page title to '$this' and 'foo $this'.
->>> That's with version 1.0.18 of omega.
->>> --[[Joey]]
-
->>>> I tried it with both omega 1.0.13 and omega 1.0.18 and the issue is present in both. If I view the contents of {$srcdir}/.ikiwiki/xapian/templates/query, I can see that the wiki title is inserted verbatim and there are calls to `$setmap`, `$set` and `$def` etc in the template. --[[dkobozev]]
-
->>>>> I don't see how that's relevant. It would help if you showed me
->>>>> exactly something that could be inserted into a page to cause the
->>>>> problem. --[[Joey]] 
-
->>>>>> Correct me if I'm wrong: ikiwiki generates an Omega template from its own templates, such as searchquery.tmpl and puts it into {$srcdir}/.ikiwiki/xapian/templates/query. Omega has its own template syntax, where function names are prefixed with dollar signs (`$`). So, when I call my wiki `$foobar`, ikiwiki generates an Omega template that looks like this snippet:
-
-    <div id="container">
-        <div class="pageheader">
-            <div class="header">
-            <span>
-            <a href="http://example.com">$foobar</    a>/search
-            </span>
-            </div>
-        </div> <!-- .pageheader -->
-    
-        <div id="content">
-            $setmap{prefix,title,S}
-    $setmap{prefix,link,XLINK}
-    $set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France}
-    ${
-    $def{PREV,
-    $if{$ne{$topdoc,0},<INPUT TYPE=image NAME="&lt;" ALT="&lt;"
-    SRC="/images/xapian-omega/prev.png" BORDER=0 HEIGHT=30 WIDTH=30>,
-    <IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>}
-
->>>>>> So `$foobar` clashes with Omega's template tags. Does this help?
-
->>>>>>> Ahh. I had somehow gotten it into my head that you were talking
->>>>>>> about the title of a single page, not of the whole wiki. But
->>>>>>> you were clear all along it was the wiki title. Sorry for
->>>>>>> misunderstanding. I've put in a complete fix for this problem.
->>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] 
-- 
cgit v1.2.3


From b5e27e60ba38365f3e252df80c2a22503f00eb06 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 21:24:53 +0000
Subject: Note that <object /> still may be allowed, although in a form not
 suitable for, say, SVG inclusion.

---
 ...er_control_over___60__object___47____62__s.mdwn | 34 +++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
index ac4b55568..c37d052db 100644
--- a/doc/todo/finer_control_over___60__object___47____62__s.mdwn
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -27,13 +27,43 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 
 [[wishlist]]
 
-> SVG can contain embedded javascript. The spec that you link to contains
+> SVG can contain embedded javascript.
+
+>> Indeed.
+
+>> So, a more general tool (`XML::Scrubber`?) will be necessary to
+>> refine both [XHTML][] and SVG.
+
+>> &hellip; And to leave [MathML][] as is (?.)
+
+>> &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
+> The spec that you link to contains
 > examples of objects that contain python scripts, Microsoft OLE 
 > objects, and Java. And then there's flash. I don't think ikiwiki can
 > assume all the possibilities are handled securely, particularly WRT XSS
 > attacks.
 > --[[Joey]]
 
+>> I've scanned over all the `object` examples in the specification and
+>> all of those that hold references to code (as opposed to data) have a
+>> distinguishing `classid` attribute.
+
+>> While I won't assert that it's impossible to reference code with
+>> `data` (and, thanks to `text/xhtml+xml` and `image/svg+xml`, it is
+>> *not* impossible), throwing away any of the &ldquo;insecure&rdquo;
+>> attributes listed above together with limiting the possible URI's
+>> (i.&nbsp;e., only *local* and certain `data:` ones for `data` and
+>> `usemap`) should make `object` almost as harmless as, say, `img`.
+
+>> (Though it certainly won't solve the [[SVG_problem|/todo/SVG]] being
+>> restricted in such a way.)
+
+>> Of the remaining issues I could only think of recursive
+>> `object` &mdash; the one that references its container document.
+
+>> &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
 ## See also
 
 * [Objects, Images, and Applets in HTML documents][objects-html]
@@ -43,6 +73,8 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 * [Uniform Resource Identifier &mdash; the free encyclopedia][URI]
 
 [HTML::Scrubber]: http://search.cpan.org/~podmaster/HTML-Scrubber-0.08/Scrubber.pm
+[MathML]: http://en.wikipedia.org/wiki/MathML
 [objects-html]: http://www.w3.org/TR/1999/REC-html401-19991224/struct/objects.html
 [RFC 2397]: http://tools.ietf.org/html/rfc2397
 [URI]: http://en.wikipedia.org/wiki/Uniform_Resource_Identifier
+[XHTML]: http://en.wikipedia.org/wiki/XHTML
-- 
cgit v1.2.3


From 29ca20b87c565412fa603127425ccdaf4ca58b79 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 16:50:04 -0500
Subject: response

---
 doc/todo/finer_control_over___60__object___47____62__s.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
index c37d052db..0ca949954 100644
--- a/doc/todo/finer_control_over___60__object___47____62__s.mdwn
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -56,6 +56,11 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 >> (i.&nbsp;e., only *local* and certain `data:` ones for `data` and
 >> `usemap`) should make `object` almost as harmless as, say, `img`.
 
+>>> But with local data, one could not embed youtube videos, which surely
+>>> is the most obvious use case? Note that youtube embedding uses an
+>>> object element with no classid. The swf file is provided via an
+>>> enclosed param element. --[[Joey]]
+
 >> (Though it certainly won't solve the [[SVG_problem|/todo/SVG]] being
 >> restricted in such a way.)
 
-- 
cgit v1.2.3


From c26b6c3be864aaf49fe0b0fc15c0af59323b7dde Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 22:12:41 +0000
Subject: Note the use of <embed /> on YouTube.

---
 .../finer_control_over___60__object___47____62__s.mdwn    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
index 0ca949954..50c4d43bf 100644
--- a/doc/todo/finer_control_over___60__object___47____62__s.mdwn
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -57,10 +57,23 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 >> `usemap`) should make `object` almost as harmless as, say, `img`.
 
 >>> But with local data, one could not embed youtube videos, which surely
->>> is the most obvious use case? Note that youtube embedding uses an
+>>> is the most obvious use case?
+
+>>>> Allowing a &ldquo;remote&rdquo; object to render on one's page is a
+     security issue by itself.
+     Though, of course, having an explicit whitelist of URI's may make
+     this issue more tolerable.
+     &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
+>>> Note that youtube embedding uses an
 >>> object element with no classid. The swf file is provided via an
 >>> enclosed param element. --[[Joey]]
 
+>>>> I've just checked a random video on YouTube and I see that the
+     `.swf` file is provided via an enclosed `embed` element.  Whether
+     to allow those or not is a different issue.
+     &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
 >> (Though it certainly won't solve the [[SVG_problem|/todo/SVG]] being
 >> restricted in such a way.)
 
-- 
cgit v1.2.3


From e56ec7a96c3a2064941a82619bf6cb0d2e8392e0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 15:08:00 -0500
Subject: websetup: Add websetup_unsafe to allow marking other settings as
 unsafe.

---
 IkiWiki/Plugin/websetup.pm | 22 ++++++++++++++++++----
 debian/changelog           |  7 +++++++
 doc/plugins/websetup.mdwn  |  3 ++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 5c19c9b63..d444c0a3d 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -27,6 +27,13 @@ sub getsetup () {
 			safe => 0,
 			rebuild => 0,
 		},
+		websetup_unsafe => {
+			type => "string",
+			example => [],
+			description => "list of additional setup field keys to treat as unsafe",
+			safe => 0,
+			rebuild => 0,
+		},
 		websetup_show_unsafe => {
 			type => "boolean",
 			example => 1,
@@ -57,6 +64,12 @@ sub formatexample ($$) {
 	}
 }
 
+sub issafe ($) {
+	my $key=shift;
+
+	return ! grep { $_ eq $key } @{$config{websetup_unsafe}};
+}
+
 sub showfields ($$$@) {
 	my $form=shift;
 	my $plugin=shift;
@@ -78,7 +91,8 @@ sub showfields ($$$@) {
 		# XXX hashes not handled yet
 		next if ref $config{$key} && ref $config{$key} eq 'HASH' || ref $info{example} eq 'HASH';
 		# maybe skip unsafe settings
-		next if ! $info{safe} && ! ($config{websetup_show_unsafe} && $config{websetup_advanced});
+		next if ! ($config{websetup_show_unsafe} && $config{websetup_advanced}) &&
+			(! $info{safe} || ! issafe($key));
 		# maybe skip advanced settings
 		next if $info{advanced} && ! $config{websetup_advanced};
 		# these are handled specially, so don't show
@@ -156,7 +170,7 @@ sub showfields ($$$@) {
 
 		if (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY') {
 			$value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) }  @{$value} : "")];
-			push @$value, "", "" if $info{safe}; # blank items for expansion
+			push @$value, "", "" if $info{safe} && issafe($key); # blank items for expansion
 		}
 		else {
 			$value=Encode::encode_utf8($value);
@@ -210,7 +224,7 @@ sub showfields ($$$@) {
 			}
 		}
 		
-		if (! $info{safe}) {
+		if (! $info{safe} || ! issafe($key)) {
 			$form->field(name => $name, disabled => 1);
 		}
 		else {
@@ -346,7 +360,7 @@ sub showform ($$) {
 				@value=0;
 			}
 		
-			if (! $info{safe}) {
+			if (! $info{safe} || ! issafe($key)) {
 	 			error("unsafe field $key"); # should never happen
 			}
 		
diff --git a/debian/changelog b/debian/changelog
index 7fdbbcb63..9e779bb18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100313) UNRELEASED; urgency=low
+
+  * websetup: Add websetup_unsafe to allow marking other settings
+    as unsafe.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
+
 ikiwiki (3.20100312) unstable; urgency=HIGH
 
   * Fix utf8 issues in calls to md5_hex.
diff --git a/doc/plugins/websetup.mdwn b/doc/plugins/websetup.mdwn
index f1756ba8f..b4d23ba9c 100644
--- a/doc/plugins/websetup.mdwn
+++ b/doc/plugins/websetup.mdwn
@@ -16,7 +16,8 @@ enabled and disabled using it too. Some settings are not considered safe
 enough to be manipulated over the web; these are still shown, by default,
 but cannot be modified. To hide them, set `websetup_show_unsafe` to false
 in the setup file. A few settings have too complex a data type to be
-configured via the web.
+configured via the web. To mark additional settings as unsafe, you can
+list them in `websetup_unsafe`.
 
 Plugins that should not be enabled/disabled via the web interface can be
 listed in `websetup_force_plugins` in the setup file.
-- 
cgit v1.2.3


From 4da6e94305c2c7f4adab057b362d9e58a7494439 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawm-ebiIfxbKD3KNa-Cu9LvvD9edMLW7BAo"
 <https://www.google.com/accounts/o8/id?id=AItOawm-ebiIfxbKD3KNa-Cu9LvvD9edMLW7BAo@web>
Date: Sat, 13 Mar 2010 21:14:35 +0000
Subject: Google's OpenID and discovery protocol

---
 doc/forum/google_openid_broken__63__.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 68b44f2c1..0e41d4ced 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -50,3 +50,11 @@ The openid is
 <https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4>
 (what a mouthfull!), and I don't know who that is or how to use it since it
 points to a fairly useless xml document, rather than a web page. --[[Joey]]
+
+> That string is what's received via the discovery protocol. The user logging in with a Google account is not supposed to write that when logging in, but rather <https://www.google.com/accounts/o8/id>. The OpenID client library will accept that and redirect the user to a sign in page, which will return that string as the OpenID. It's not really usable as an identifier for edits and whatnots, but an alternative would be to use the attribute exchange extension to get the email address and display that. See <http://code.google.com/apis/accounts/docs/OpenID.html#Parameters>.
+
+> Yahoo's OpenID implementation works alike, but I haven't looked at it as much. It uses <https://me.yahoo.com/> to receive the endpoint.
+
+> I've added buttons that submit the two above URLs for logging in with a Google and Yahoo OpenID, respectively, to my locally changed OpenID login plugin.
+
+> Using the Google profile page as the OpenID is really orthogonal to the above. --[[kaol]]
-- 
cgit v1.2.3


From e8f6c06ca81e4ebd8d244e3863d21517d87b6620 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 17:29:06 -0500
Subject: update; openid email addresses now available so this is unblocked

---
 doc/todo/avatar.mdwn | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn
index b8aa2327f..4409e7b14 100644
--- a/doc/todo/avatar.mdwn
+++ b/doc/todo/avatar.mdwn
@@ -1,35 +1,24 @@
 [[!tag wishlist]]
 
 It would be nice if ikiwiki, particularly [[plugins/comments]]
-supported user avatar icons. I was considering adding a directive for this,
-as designed below.
+supported user avatar icons.
 
-However, there is no *good* service for mapping openids to avatars --
-openavatar has many issues, including not supporting delegated openids, and
-after trying it, I don't trust it to push users toward. 
-Perhaps instead ikiwiki could get the email address from the openid
-provider, though I think the perl openid modules don't support the openid
-2.x feature that allows that.
-
-At the moment, working on this doesn't feel like a good use of my time.
---[[Joey]]
-
-Hmm.. unless is just always used a single provider (gravatar) and hashed
-the openid. Then wavatars could be used to get a unique avatar per openid
-at least. --[[Joey]] 
-
-----
-
-The directive displays a small avatar image for a user. Pass it the
-email address, openid, or wiki username of the user.
+Idea is to add a directive that displays a small avatar image for a user.
+Pass it the email address, openid, or wiki username of the user.
 
 	\[[!avatar user@example.com]]
 	\[[!avatar http://joey.kitenet.net/]]
 	\[[!avatar user]]
 
+These directives can then be hand-inserted onto pages, or more likely,
+included in eg, a comment post via a template. Possibly included in a
+recentchanges page item via that template too?
+
 The avatars are provided by various sites. For email addresses, it uses a
 [gravatar](http://gravatar.com/). For openid,
-[openavatar](http://www.openvatar.com/) is used. For a wiki username, the
+[openavatar](http://www.openvatar.com/) could used, but I am not very happy
+with it; probably better to just get the email via SREG (as is done now for
+openid), and use that. For a wiki username, the
 user's email address is looked up and the gravatar for that user is
 displayed. (Of course, the user has to have filled in their email address
 on their Preferences page for that to work.)
-- 
cgit v1.2.3


From e2c9b425415a00012b2c579c40c369da4ac7c98b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 17:46:28 -0500
Subject: thoughts

---
 doc/todo/Separate_OpenIDs_and_usernames.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index 2cd52e8c4..ae427d540 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -6,6 +6,25 @@ I see this being implemented in one of two possible ways. The easiest seems like
 
 A slightly more complex next step would be to request sreg from the provider and, if provided, automatically set the identity's username and email address from the provided persona. If username login to accounts with blank passwords is disabled, then you have the best of both worlds. Passwordless signin, human-friendly attribution, automatic setting of preferences.
 
+> Given that openids are a global user identifier, that can look as pretty
+> as the user cares to make it look via delegation, I am not a fan of 
+> having a site-local identifier that layered on top of that. Perhaps
+> partly because every site that I have seen that does that has openid
+> implemented as a badly-done wart on the side of their regular login
+> system.
+> 
+> Openid Simple Registration is now used to populate the userdb with the
+> email address for openid users.
+> 
+> I am considering displaying the userid or fullname, if available,
+> instead of the munged openid url in recentchanges. It would be nice
+> for those nasty [[google_openids|forum/google_openid_broken?]]. But,
+> I first have to find a way to encode the name in the VCS commit log,
+> while still keeping the openid of the committer in there too.
+> Perhaps something like this (for git): --[[Joey]] 
+> 
+>	Author: Joey Hess <http://joey.kitenet.net/@web>
+
 Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat.
 
 [[!tag wishlist]]
-- 
cgit v1.2.3


From a01e0679f4134f849473f8a98cb43f5a4aa8d7d8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 19:08:15 -0500
Subject: openid: Use Openid Simple Registration or OpenID Attribute Exchange
 to get the user's email address and username.

The info is stored in the session database, not the user database.
There should be no reason to need it when a user is not logged in.

Also, hide the email field in the preferences page for openid users.

Note that the email and username are not yet actually used for anything.
The email will be useful for gravatar, while the username might be used
for a more pretty display of the openid.
---
 IkiWiki/Plugin/openid.pm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog         |  2 ++
 2 files changed, 46 insertions(+)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index bb99446b4..9355cd85a 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -90,6 +90,7 @@ sub formbuilder_setup (@) {
 			value => $session->param("name"), 
 			size => 50, force => 1,
 			fieldset => "login");
+		$form->field(name => "email", type => "hidden");
 	}
 }
 
@@ -113,6 +114,26 @@ sub validate ($$$;$) {
 		}
 	}
 
+	# Ask for client to provide a name and email, if possible.
+	# Try sreg and ax
+	$claimed_identity->set_extension_args(
+		'http://openid.net/extensions/sreg/1.1',
+		{
+			optional => 'email,fullname,nickname',
+		},
+	);
+	$claimed_identity->set_extension_args(
+		'http://openid.net/srv/ax/1.0',
+		{
+			mode => 'fetch_request',
+			'required' => 'email,fullname,nickname,firstname',
+			'type.email' => "http://schema.openid.net/contact/email",
+			'type.fullname' => "http://axschema.org/namePerson",
+			'type.nickname' => "http://axschema.org/namePerson/friendly",
+			'type.firstname' => "http://axschema.org/namePerson/first",
+		},
+	);
+
 	my $check_url = $claimed_identity->check_url(
 		return_to => IkiWiki::cgiurl(do => "postsignin"),
 		trust_root => $config{cgiurl},
@@ -139,6 +160,29 @@ sub auth ($$) {
 		}
 		elsif (my $vident = $csr->verified_identity) {
 			$session->param(name => $vident->url);
+
+			my @extensions=grep { defined } (
+				$vident->signed_extension_fields('http://openid.net/extensions/sreg/1.1'),
+				$vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
+			);
+			foreach my $ext (@extensions) {
+				foreach my $field (qw{value.email email}) {
+					if (exists $ext->{$field} &&
+					    defined $ext->{$field} &&
+					    length $ext->{$field}) {
+						$session->param(email => $ext->{$field});
+						last;
+					}
+				}
+				foreach my $field (qw{value.nickname nickname value.fullname fullname value.firstname}) {
+					if (exists $ext->{$field} &&
+					    defined $ext->{$field} &&
+					    length $ext->{$field}) {
+						$session->param(username => $ext->{$field});
+						last;
+					}
+				}
+			}
 		}
 		else {
 			error("OpenID failure: ".$csr->err);
diff --git a/debian/changelog b/debian/changelog
index 9e779bb18..854d83130 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.
+  * openid: Use Openid Simple Registration or OpenID Attribute Exchange
+    to get the user's email address and username.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
-- 
cgit v1.2.3


From 4f6c544fa8e7dd21450952f0a9fc3918ee600705 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 19:12:52 -0500
Subject: munge to avoid markdown eating email addresses

---
 doc/todo/git_attribution/discussion.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/todo/git_attribution/discussion.mdwn b/doc/todo/git_attribution/discussion.mdwn
index dfb490bc2..6905d9b4b 100644
--- a/doc/todo/git_attribution/discussion.mdwn
+++ b/doc/todo/git_attribution/discussion.mdwn
@@ -72,7 +72,7 @@ no determination of uniqueness)
 > GIT_AUTHOR_EMAIL can also be set.
 > 
 > There is one thing yet to be solved, and that is how to tell the
-> difference between a web commit by 'Joey Hess <joey@kitenet.net>',
+> difference between a web commit by 'Joey Hess <joey\@kitenet.net>',
 > and a git commit by the same. I think we do want to differentiate these,
 > and the best way to do it seems to be to add a line to the end of the
 > commit message. Something like: "\n\nWeb-commit: true"
@@ -94,5 +94,5 @@ no determination of uniqueness)
 > * github pushes to twitter ;-)
 > 
 > So while I tried that way at first, I'm now leaning toward encoding the
-> username in the email address. Like "user <user@web>", or
-> "joey <http://joey.kitenet.net/@web>".
+> username in the email address. Like "user <user\@web>", or
+> "joey <http://joey.kitenet.net/\@web>".
-- 
cgit v1.2.3


From 8f4f81cdfdcb68be5efb385dc07e4a0a04352a9d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 19:24:51 -0500
Subject: wrinkles

---
 doc/todo/Separate_OpenIDs_and_usernames.mdwn |  9 ++++++---
 doc/todo/avatar.mdwn                         | 14 ++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index ae427d540..3fb952f96 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -13,8 +13,9 @@ A slightly more complex next step would be to request sreg from the provider and
 > implemented as a badly-done wart on the side of their regular login
 > system.
 > 
-> Openid Simple Registration is now used to populate the userdb with the
-> email address for openid users.
+> The openid plugin now attempts to get an email and a username, and stores
+> them in the session database for later use (ie, when the user edits a
+> page).
 > 
 > I am considering displaying the userid or fullname, if available,
 > instead of the munged openid url in recentchanges. It would be nice
@@ -23,7 +24,9 @@ A slightly more complex next step would be to request sreg from the provider and
 > while still keeping the openid of the committer in there too.
 > Perhaps something like this (for git): --[[Joey]] 
 > 
->	Author: Joey Hess <http://joey.kitenet.net/@web>
+>	Author: Joey Hess &lt;http://joey.kitenet.net/@web&gt;
+> 
+> 
 
 Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat.
 
diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn
index 4409e7b14..3a4e64b95 100644
--- a/doc/todo/avatar.mdwn
+++ b/doc/todo/avatar.mdwn
@@ -15,14 +15,20 @@ included in eg, a comment post via a template. Possibly included in a
 recentchanges page item via that template too?
 
 The avatars are provided by various sites. For email addresses, it uses a
-[gravatar](http://gravatar.com/). For openid,
-[openavatar](http://www.openvatar.com/) could used, but I am not very happy
-with it; probably better to just get the email via SREG (as is done now for
-openid), and use that. For a wiki username, the
+[gravatar](http://gravatar.com/). For a wiki username, the
 user's email address is looked up and the gravatar for that user is
 displayed. (Of course, the user has to have filled in their email address
 on their Preferences page for that to work.)
 
+For openid, openavatar sucked and is now dead. So we need to use an email
+address instead, I guess. Problem is that the email address of a given
+openid is only known when that user is logged in and making a change.
+And we don't want to leak an openid user's email into a page either.
+Hmm. Suppose the gravatar hash could be calculated from the email address
+and embedded instead of the openid?
+
+Or, for openid, could use <http://paulisageek.com/openidavatar>.
+
 An optional second parameter can be included, containing additional
 options to pass in the 
 [gravatar url](http://en.gravatar.com/site/implement/url).
-- 
cgit v1.2.3


From 702c097ac29f1b208158936a99317ebad3e4116f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 19:40:20 -0500
Subject: update

---
 doc/todo/Separate_OpenIDs_and_usernames.mdwn | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index 3fb952f96..7cfe49a5a 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -18,15 +18,25 @@ A slightly more complex next step would be to request sreg from the provider and
 > page).
 > 
 > I am considering displaying the userid or fullname, if available,
-> instead of the munged openid url in recentchanges. It would be nice
-> for those nasty [[google_openids|forum/google_openid_broken?]]. But,
-> I first have to find a way to encode the name in the VCS commit log,
+> instead of the munged openid url in recentchanges and comments.
+> It would be nice for those nasty [[google_openids|forum/google_openid_broken?]].
+> But, I first have to find a way to encode the name in the VCS commit log,
 > while still keeping the openid of the committer in there too.
 > Perhaps something like this (for git): --[[Joey]] 
 > 
 >	Author: Joey Hess &lt;http://joey.kitenet.net/@web&gt;
 > 
+> So, what needs to be done:
 > 
+> * Change `rcs_commit` and `rcs_commit_staged` to take a session object,
+>   instead of just a userid. (For back-compat, if the parameter is 
+>   not an object, it's a userid.) Bump ikiwiki plugin interface version.
+> * Modify all RCS plugins to include the session username somewhere
+>   in the commit, and parse it back out in `rcs_recentchanges`.
+> * Modify recentchanges plugin to display the username instead of the
+>   `openiduser`.
+> * Modify comment plugin to put the session username in the comment
+>   template instead of the `openiduser`.
 
 Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat.
 
-- 
cgit v1.2.3


From fd43e83fcf7bf24493ecfff54111c1c5f1cab573 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 19:56:54 -0500
Subject: update

---
 doc/forum/google_openid_broken__63__.mdwn    | 13 +++++++++++++
 doc/todo/Separate_OpenIDs_and_usernames.mdwn |  7 +++++++
 2 files changed, 20 insertions(+)

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 0e41d4ced..4ca5cac93 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -58,3 +58,16 @@ points to a fairly useless xml document, rather than a web page. --[[Joey]]
 > I've added buttons that submit the two above URLs for logging in with a Google and Yahoo OpenID, respectively, to my locally changed OpenID login plugin.
 
 > Using the Google profile page as the OpenID is really orthogonal to the above. --[[kaol]]
+
+>> Displaying email addresses is not really an option, because ikiwiki
+>> can't leak user email addresses like that. Displaying nicknames or
+>> usernames is, see [[todo/Separate_OpenIDs_and_usernames]].
+>>
+>> It would probably be good if the openid plugin could be configured with
+>> a list of generic openid urls, so it can add quick login buttons using
+>> those urls.
+>>
+>> The ugly google url will still be exposed here and there where
+>> a unique user id is needed. That can be avoided by not using the generic
+>> <https://www.google.com/accounts/o8/id>, but instead your own profile
+>> like <http://www.google.com/profiles/joeyhess>. --[[Joey]] 
diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index 7cfe49a5a..fcdb49f6d 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -26,6 +26,13 @@ A slightly more complex next step would be to request sreg from the provider and
 > 
 >	Author: Joey Hess &lt;http://joey.kitenet.net/@web&gt;
 > 
+> Only problem with the above is that the openid will still be displayed
+> by CIA. Other option is this, which solves that, but at the expense of
+> having to munge the username to fit inside the email address,
+> and generally seems backwards: --[[Joey]] 
+> 
+>	Author: http://joey.kitenet.net/ &lt;Joey_Hess@web&gt;
+> 
 > So, what needs to be done:
 > 
 > * Change `rcs_commit` and `rcs_commit_staged` to take a session object,
-- 
cgit v1.2.3


From c0ad4929deb455804ddfc6451820c6c67a298ea1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 20:10:50 -0500
Subject: Improve openid url munging; do not display anchors and cgi
 parameters, as used by yahoo and google urls.

---
 IkiWiki.pm                                | 2 +-
 debian/changelog                          | 2 ++
 doc/forum/google_openid_broken__63__.mdwn | 6 ++++++
 t/openiduser.t                            | 7 ++++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 00eadfd98..251ed8cc8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1131,7 +1131,7 @@ sub openiduser ($) {
 		# Convert "http://somehost.com/user" to "user [somehost.com]".
 		# (also "https://somehost.com/user/")
 		if ($display !~ /\[/) {
-			$display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/;
+			$display=~s/^https?:\/\/(.+)\/([^\/#?]+)\/?(?:[#?].*)?$/$2 [$1]/;
 		}
 		$display=~s!^https?://!!; # make sure this is removed
 		eval q{use CGI 'escapeHTML'};
diff --git a/debian/changelog b/debian/changelog
index 854d83130..0a9679618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low
     as unsafe.
   * openid: Use Openid Simple Registration or OpenID Attribute Exchange
     to get the user's email address and username.
+  * Improve openid url munging; do not display anchors and cgi parameters,
+    as used by yahoo and google urls.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 4ca5cac93..96ba2d791 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -59,6 +59,12 @@ points to a fairly useless xml document, rather than a web page. --[[Joey]]
 
 > Using the Google profile page as the OpenID is really orthogonal to the above. --[[kaol]]
 
+>> First, I don't accept that the openid google returns from their 
+>> generic signin url *has* to be so freaking ugly. For contrast, 
+>> look at the openid you log in as if you use the yahoo url.
+>> <https://me.yahoo.com/joeyhess#35f22>. Nice and clean, now
+>> munged by ikiwiki to "joeyhess [me.yahoo.com]".
+>> 
 >> Displaying email addresses is not really an option, because ikiwiki
 >> can't leak user email addresses like that. Displaying nicknames or
 >> usernames is, see [[todo/Separate_OpenIDs_and_usernames]].
diff --git a/t/openiduser.t b/t/openiduser.t
index 52d879484..caabbcefc 100755
--- a/t/openiduser.t
+++ b/t/openiduser.t
@@ -10,7 +10,7 @@ BEGIN {
 		eval q{use Test::More skip_all => "Net::OpenID::VerifiedIdentity not available"};
 	}
 	else {
-		eval q{use Test::More tests => 9};
+		eval q{use Test::More tests => 11};
 	}
 	use_ok("IkiWiki::Plugin::openid");
 }
@@ -28,6 +28,11 @@ $^W=1;
 is(IkiWiki::openiduser('http://yam655.livejournal.com/'), 'yam655 [livejournal.com]');
 is(IkiWiki::openiduser('http://id.mayfirst.org/jamie/'), 'jamie [id.mayfirst.org]');
 
+# yahoo has an anchor in the url
+is(IkiWiki::openiduser('https://me.yahoo.com/joeyhess#35f22'), 'joeyhess [me.yahoo.com]');
+# google urls are horrendous, but the worst bit is after a ?, so can be dropped
+is(IkiWiki::openiduser('https://www.google.com/accounts/o8/id?id=AItOawm-ebiIfxbKD3KNa-Cu9LvvD9edMLW7BAo'), 'id [www.google.com/accounts/o8]');
+
 # and some less typical ones taken from the ikiwiki commit history
 
 is(IkiWiki::openiduser('http://thm.id.fedoraproject.org/'), 'thm [id.fedoraproject.org]');
-- 
cgit v1.2.3


From 725a1cf0e8d1fbdb7f449b632ee1fa3cb84835c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 20:45:44 -0500
Subject: update; bleargh

---
 doc/todo/avatar.mdwn | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn
index 3a4e64b95..f0599e4ed 100644
--- a/doc/todo/avatar.mdwn
+++ b/doc/todo/avatar.mdwn
@@ -1,42 +1,60 @@
 [[!tag wishlist]]
 
 It would be nice if ikiwiki, particularly [[plugins/comments]]
-supported user avatar icons.
+(but also, ideally, recentchanges) supported user avatar icons.
 
 Idea is to add a directive that displays a small avatar image for a user.
-Pass it the email address, openid, or wiki username of the user.
+Pass it a user's the email address, openid, username, or the md5 hash
+of their email address:
 
 	\[[!avatar user@example.com]]
 	\[[!avatar http://joey.kitenet.net/]]
 	\[[!avatar user]]
+	\[[!avatar hash]]
 
 These directives can then be hand-inserted onto pages, or more likely,
-included in eg, a comment post via a template. Possibly included in a
-recentchanges page item via that template too?
+included in eg, a comment post via a template.
+
+An optional second parameter can be included, containing additional
+options to pass in the 
+[gravatar url](http://en.gravatar.com/site/implement/url).
+For example, this asks for a smaller gravatar, and if a user does
+not have a gravatar, uses a cute auto-generated "wavatar" avatar.
+
+	\[[!gravatar user@example.com "size=40&default=wavatar"]]
+
+The `gravitar_options` setting in the setup file can be used to
+specify additional options to pass. So for example if you want
+to use wavatars everywhere, set it to "default=wavatar".
 
 The avatars are provided by various sites. For email addresses, it uses a
 [gravatar](http://gravatar.com/). For a wiki username, the
 user's email address is looked up and the gravatar for that user is
 displayed. (Of course, the user has to have filled in their email address
-on their Preferences page for that to work.)
+on their Preferences page for that to work. Also, when the user changes
+their email address in Preferences, the gravatar won't change until the
+wiki is rebuilt.)
 
 For openid, openavatar sucked and is now dead. So we need to use an email
 address instead, I guess. Problem is that the email address of a given
 openid is only known when that user is logged in and making a change.
 And we don't want to leak an openid user's email into a page either.
 Hmm. Suppose the gravatar hash could be calculated from the email address
-and embedded instead of the openid?
+and embedded instead of the openid? That would work for comments,
+but not if the directive were used elsewhere.
 
-Or, for openid, could use <http://paulisageek.com/openidavatar>.
+Or, for openid, could use <http://paulisageek.com/openidavatar>. Which
+works fine, but users are not likely to figure out what they need to do to
+get an avatar associated with their openid.
 
-An optional second parameter can be included, containing additional
-options to pass in the 
-[gravatar url](http://en.gravatar.com/site/implement/url).
-For example, this asks for a smaller gravatar, and if a user does
-not have a gravatar, uses a cute auto-generated "wavatar" avatar.
+---
 
-	\[[!gravatar user@example.com "size=40&default=wavatar"]]
+Alternative, not overdesigned approach:
 
-The `gravitar_options` setting in the setup file can be used to
-specify additional options to pass. So for example if you want
-to use wavatars everywhere, set it to "default=wavatar".
+Modify comments plugin to have an option to display avatars.
+
+When posting a comment, fill in the avatarhash field in the template.
+The hash is calculated from the user's email address. If the user's email
+is not known, skip it. 
+
+End. :P
-- 
cgit v1.2.3


From 7bca48f5ce8233cada3a4d87a4c93c1fed8aae80 Mon Sep 17 00:00:00 2001
From: "https://launchpad.net/~ojwb" <https://launchpad.net/~ojwb@web>
Date: Sun, 14 Mar 2010 04:56:13 +0000
Subject:

---
 doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
index 9eac8eae5..189ba740f 100644
--- a/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
@@ -57,4 +57,14 @@ What might be causing this exception and how I might go about debugging exceptio
 >>>>>>> misunderstanding. I've put in a complete fix for this problem.
 >>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] 
 
+>>>>>>>> Rather than escaping `$` as an HTML entity, it would be more natural
+>>>>>>>> to escape it as `$$` (since you are escaping it for Omega, not for
+>>>>>>>> the web browser.
+>>>>>>>>
+>>>>>>>> Also if ikiwiki can put arbitrary text inside the parameters of an
+>>>>>>>> OmegaScript command, you should also escape `{`, `}` and `,` as
+>>>>>>>> `$(`, `$)` and `$.`.  It's only necessary to do so inside the
+>>>>>>>> parameters of a command, but it will work and be easier to escape
+>>>>>>>> them in any substituted text. --OllyBetts
+
 [[done]]
-- 
cgit v1.2.3


From 7c5bfbe2b614b1cadc13fcab2a427abc711579b0 Mon Sep 17 00:00:00 2001
From: "http://pmate.myopenid.com/" <http://pmate.myopenid.com/@web>
Date: Sun, 14 Mar 2010 12:19:34 +0000
Subject:

---
 doc/sandbox/prova_blog.html | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/sandbox/prova_blog.html

diff --git a/doc/sandbox/prova_blog.html b/doc/sandbox/prova_blog.html
new file mode 100644
index 000000000..d69937ea8
--- /dev/null
+++ b/doc/sandbox/prova_blog.html
@@ -0,0 +1,8 @@
+Questa è una prova.
+Vediamo se funziona
+
+<pre>
+#!/bin/bash
+
+echo "ciao"
+</pre>
-- 
cgit v1.2.3


From 30c30a0cdde44491370a1e5a0ef371a4f92c4965 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 13:15:55 -0400
Subject: Add complete German basewiki and directives translation done by
 Sebastian Kuhnert.

---
 debian/changelog                                   |   2 +
 debian/copyright                                   |   1 +
 po/de.po                                           |  57 ++-
 po/underlay.setup                                  |   2 +-
 po/underlays/basewiki/ikiwiki.de.po                |  69 ++++
 po/underlays/basewiki/ikiwiki/directive.de.po      | 137 +++++++
 po/underlays/basewiki/ikiwiki/formatting.de.po     | 299 ++++++++++++++
 po/underlays/basewiki/ikiwiki/markdown.de.po       |  52 +++
 po/underlays/basewiki/ikiwiki/openid.de.po         | 115 ++++++
 po/underlays/basewiki/ikiwiki/pagespec.de.po       | 258 ++++++++++++
 .../basewiki/ikiwiki/pagespec/attachment.de.po     | 122 ++++++
 po/underlays/basewiki/ikiwiki/pagespec/po.de.po    |  70 ++++
 .../basewiki/ikiwiki/pagespec/sorting.de.po        |  48 +++
 po/underlays/basewiki/ikiwiki/searching.de.po      |  92 +++++
 po/underlays/basewiki/ikiwiki/subpage.de.po        |  54 +++
 .../basewiki/ikiwiki/subpage/linkingrules.de.po    | 109 +++++
 po/underlays/basewiki/ikiwiki/wikilink.de.po       | 111 +++++
 po/underlays/basewiki/index.de.po                  |  29 ++
 po/underlays/basewiki/recentchanges.de.po          |  38 ++
 po/underlays/basewiki/sandbox.de.po                |  91 +++++
 po/underlays/basewiki/shortcuts.de.po              | 287 +++++++++++++
 po/underlays/basewiki/templates.de.po              | 256 ++++++++++++
 po/underlays/basewiki/templates/note.de.po         |  42 ++
 po/underlays/basewiki/templates/popup.de.po        |  59 +++
 .../directives/ikiwiki/directive/aggregate.de.po   | 189 +++++++++
 .../directives/ikiwiki/directive/brokenlinks.de.po |  57 +++
 .../directives/ikiwiki/directive/calendar.de.po    | 183 +++++++++
 .../directives/ikiwiki/directive/color.de.po       |  97 +++++
 .../directives/ikiwiki/directive/comment.de.po     | 133 ++++++
 .../directives/ikiwiki/directive/copy.de.po        |  25 ++
 .../directives/ikiwiki/directive/cut.de.po         |  25 ++
 .../directives/ikiwiki/directive/cutpaste.de.po    | 153 +++++++
 .../directives/ikiwiki/directive/date.de.po        |  64 +++
 .../ikiwiki/directive/edittemplate.de.po           |  99 +++++
 .../directives/ikiwiki/directive/format.de.po      |  93 +++++
 .../directives/ikiwiki/directive/fortune.de.po     |  42 ++
 .../directives/ikiwiki/directive/graph.de.po       |  88 ++++
 .../directives/ikiwiki/directive/haiku.de.po       |  60 +++
 po/underlays/directives/ikiwiki/directive/if.de.po | 145 +++++++
 .../directives/ikiwiki/directive/img.de.po         | 115 ++++++
 .../directives/ikiwiki/directive/inline.de.po      | 385 +++++++++++++++++
 .../directives/ikiwiki/directive/linkmap.de.po     |  99 +++++
 .../ikiwiki/directive/listdirectives.de.po         |  72 ++++
 .../directives/ikiwiki/directive/map.de.po         |  77 ++++
 .../directives/ikiwiki/directive/meta.de.po        | 455 +++++++++++++++++++++
 .../directives/ikiwiki/directive/more.de.po        |  63 +++
 .../directives/ikiwiki/directive/orphans.de.po     |  60 +++
 .../directives/ikiwiki/directive/pagecount.de.po   |  48 +++
 .../directives/ikiwiki/directive/pagestats.de.po   |  99 +++++
 .../ikiwiki/directive/pagetemplate.de.po           |  64 +++
 .../directives/ikiwiki/directive/paste.de.po       |  25 ++
 .../directives/ikiwiki/directive/ping.de.po        |  69 ++++
 .../directives/ikiwiki/directive/poll.de.po        |  87 ++++
 .../directives/ikiwiki/directive/polygen.de.po     |  50 +++
 .../ikiwiki/directive/postsparkline.de.po          | 149 +++++++
 .../directives/ikiwiki/directive/progress.de.po    |  68 +++
 .../directives/ikiwiki/directive/shortcut.de.po    |  46 +++
 .../directives/ikiwiki/directive/sparkline.de.po   | 178 ++++++++
 .../directives/ikiwiki/directive/table.de.po       | 147 +++++++
 .../directives/ikiwiki/directive/tag.de.po         | 112 +++++
 .../directives/ikiwiki/directive/taglink.de.po     |  25 ++
 .../directives/ikiwiki/directive/template.de.po    |  71 ++++
 .../ikiwiki/directive/testpagespec.de.po           |  84 ++++
 .../directives/ikiwiki/directive/teximg.de.po      |  84 ++++
 .../directives/ikiwiki/directive/toc.de.po         |  85 ++++
 .../directives/ikiwiki/directive/toggle.de.po      | 113 +++++
 .../directives/ikiwiki/directive/toggleable.de.po  |  25 ++
 .../directives/ikiwiki/directive/version.de.po     |  50 +++
 po/underlays/smiley/smileys.de.po                  | 211 ++++++++++
 69 files changed, 7036 insertions(+), 33 deletions(-)
 create mode 100644 po/underlays/basewiki/ikiwiki.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/directive.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/formatting.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/markdown.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/openid.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/po.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/searching.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/subpage.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po
 create mode 100644 po/underlays/basewiki/ikiwiki/wikilink.de.po
 create mode 100644 po/underlays/basewiki/index.de.po
 create mode 100644 po/underlays/basewiki/recentchanges.de.po
 create mode 100644 po/underlays/basewiki/sandbox.de.po
 create mode 100644 po/underlays/basewiki/shortcuts.de.po
 create mode 100644 po/underlays/basewiki/templates.de.po
 create mode 100644 po/underlays/basewiki/templates/note.de.po
 create mode 100644 po/underlays/basewiki/templates/popup.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/aggregate.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/brokenlinks.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/calendar.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/color.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/comment.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/copy.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/cut.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/cutpaste.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/date.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/edittemplate.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/format.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/fortune.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/graph.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/haiku.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/if.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/img.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/inline.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/linkmap.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/listdirectives.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/map.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/meta.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/more.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/orphans.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/pagecount.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/pagestats.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/pagetemplate.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/paste.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/ping.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/poll.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/polygen.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/postsparkline.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/progress.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/shortcut.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/sparkline.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/table.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/tag.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/taglink.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/template.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/testpagespec.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/teximg.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/toc.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/toggle.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/toggleable.de.po
 create mode 100644 po/underlays/directives/ikiwiki/directive/version.de.po
 create mode 100644 po/underlays/smiley/smileys.de.po

diff --git a/debian/changelog b/debian/changelog
index 0a9679618..92afe661f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low
     to get the user's email address and username.
   * Improve openid url munging; do not display anchors and cgi parameters,
     as used by yahoo and google urls.
+  * Add complete German basewiki and directives translation done by
+    Sebastian Kuhnert.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/debian/copyright b/debian/copyright
index 050a4dd61..ad72a0459 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -163,6 +163,7 @@ Copyright:
   2007 Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
   2007 Daniel Nylander <po@danielnylander.se>
   2009 Fernando González de Requena <fgrequena@gmail.com>
+  2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
 License: 
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
diff --git a/po/de.po b/po/de.po
index 9433501cc..f69b98603 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-02 22:18-0500\n"
-"PO-Revision-Date: 2009-07-23 01:07+0100\n"
-"Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n"
+"PO-Revision-Date: 2010-03-14 16:09+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -152,12 +152,10 @@ msgid "Failed to create S3 bucket: "
 msgstr "Konnte Behälter (bucket) in S3 nicht anlegen: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:225
-#, fuzzy
 msgid "Failed to save file to S3: "
 msgstr "Konnte die Datei nicht in S3 speichern: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:247
-#, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "Konnte die Datei nicht in S3 löschen: "
 
@@ -262,19 +260,18 @@ msgid "comment moderation"
 msgstr "Kommentar-Moderation"
 
 #: ../IkiWiki/Plugin/comments.pm:761
-#, fuzzy, perl-format
+#, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
-msgstr[0] "Kommentare"
-msgstr[1] "Kommentare"
+msgstr[0] "%i Kommentar"
+msgstr[1] "%i Kommentare"
 
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
 #: ../IkiWiki/Plugin/comments.pm:771
-#, fuzzy
 msgid "Comment"
-msgstr "Kommentare"
+msgstr "Kommentieren"
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
 #: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
@@ -349,14 +346,13 @@ msgid "The page %s does not exist."
 msgstr "Die Seite %s existiert nicht."
 
 #: ../IkiWiki/Plugin/getsource.pm:75
-#, fuzzy
 msgid "not a page"
-msgstr "Kann die Seiten nicht zuordnen: %s"
+msgstr "Keine Seite"
 
 #: ../IkiWiki/Plugin/getsource.pm:77
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is an attachment, not a page."
-msgstr "Seite %s kann nicht bearbeitet werden"
+msgstr "Seite %s ist ein Anhang und keine Seite."
 
 #: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
@@ -405,9 +401,8 @@ msgstr ""
 "through"
 
 #: ../IkiWiki/Plugin/htmltidy.pm:50
-#, fuzzy
 msgid "htmltidy failed to parse this html"
-msgstr "Smileys konnten nicht ausgewertet werden"
+msgstr "htmltidy konnte dieses HTML nicht auswerten"
 
 #: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
@@ -450,7 +445,7 @@ msgstr "fehlender Seitenparameter"
 #: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
-msgstr ""
+msgstr "die Parameter %s und %s können nicht zusammen benutzt werden"
 
 #: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
@@ -472,7 +467,7 @@ msgstr "dot konnte nicht ausgeführt werden"
 
 #: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
-msgstr ""
+msgstr "Verknüpfungskarte"
 
 #: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
@@ -513,9 +508,8 @@ msgid "Mirror"
 msgstr "Spiegel"
 
 #: ../IkiWiki/Plugin/moderatedcomments.pm:42
-#, fuzzy
 msgid "comment needs moderation"
-msgstr "Kommentar-Moderation"
+msgstr "Kommentar muss moderiert werden"
 
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
@@ -534,9 +528,8 @@ msgid "Get an OpenID"
 msgstr "Eine OpenID anfordern"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
-#, fuzzy
 msgid "All pages have other pages linking to them."
-msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite."
+msgstr "Alle Seiten haben mindestens einen Verweis von einer anderen Seite."
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
 msgid "bad or missing template"
@@ -544,11 +537,11 @@ msgstr "fehlerhafte oder fehlende Vorlage"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:229
 msgid "Your user page: "
-msgstr ""
+msgstr "Ihre Benutzerseite: "
 
 #: ../IkiWiki/Plugin/passwordauth.pm:236
 msgid "Create your user page"
-msgstr ""
+msgstr "Benutzerseite erstellen"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
@@ -604,7 +597,7 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus"
 
 #: ../IkiWiki/Plugin/po.pm:15
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
-msgstr ""
+msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35"
 
 #: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
@@ -663,9 +656,9 @@ msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
 #: ../IkiWiki/Plugin/po.pm:885
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to copy underlay PO file to %s"
-msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
+msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren"
 
 #: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
@@ -889,14 +882,14 @@ msgid "update for rename of %s to %s"
 msgstr "aktualisiert zum Umbenennen von %s nach %s"
 
 #: ../IkiWiki/Plugin/rsync.pm:37
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to execute rsync_command: %s"
-msgstr "lesen von %s fehlgeschlagen"
+msgstr "konnte das rsync_command nicht ausführen: %s"
 
 #: ../IkiWiki/Plugin/rsync.pm:40
 #, perl-format
 msgid "rsync_command exited %d"
-msgstr ""
+msgstr "rsync_command gibt Fehler %d zurück"
 
 #: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
@@ -1003,14 +996,14 @@ msgid "failed to generate image from code"
 msgstr "konnte kein Bild aus dem Code erzeugen"
 
 #: ../IkiWiki/Plugin/websetup.pm:91
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s plugin:"
-msgstr "Erweiterung"
+msgstr "%s-Erweiterung:"
 
 #: ../IkiWiki/Plugin/websetup.pm:107
 #, fuzzy, perl-format
 msgid "%s plugins"
-msgstr "Erweiterungen"
+msgstr "%s-Erweiterungen"
 
 #: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
diff --git a/po/underlay.setup b/po/underlay.setup
index 333d331d1..c34045981 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -8,7 +8,7 @@ use IkiWiki::Setup::Standard {
 	# will excessively bloat things.
         po_slave_languages => {
 		'es' => 'Español',
-		#'de' => 'Deutsch',
+		'de' => 'Deutsch',
 		'fr' => 'Français',
 		'da' => 'Dansk',
 		'cs' => 'česky',
diff --git a/po/underlays/basewiki/ikiwiki.de.po b/po/underlays/basewiki/ikiwiki.de.po
new file mode 100644
index 000000000..1420df3e6
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki.de.po
@@ -0,0 +1,69 @@
+# German translation of basewiki/ikiwiki page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-12 09:37+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Currently running version [[!version ]].)\"\n"
+"]]\n"
+msgstr ""
+"Dieses Wiki basiert auf [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Es läuft Version [[!version ]].)\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid "Some documentation on using ikiwiki:"
+msgstr "Dokumentation zur Verwendung von ikiwiki:"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/formatting]]"
+msgstr "[[Formatierung|ikiwiki/formatting]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/wikilink]]"
+msgstr "[[ikiwiki/wikilink]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/subpage]]"
+msgstr "[[Unterseiten|ikiwiki/subpage]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/pagespec]]"
+msgstr "[[ikiwiki/pagespec]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/directive]]"
+msgstr "[[Anweisungen|ikiwiki/directive]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/markdown]]"
+msgstr "[[ikiwiki/markdown]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/openid]]"
+msgstr "[[ikiwiki/openid]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/searching]]"
+msgstr "[[Suchen|ikiwiki/searching]]"
+
diff --git a/po/underlays/basewiki/ikiwiki/directive.de.po b/po/underlays/basewiki/ikiwiki/directive.de.po
new file mode 100644
index 000000000..b8a610c83
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/directive.de.po
@@ -0,0 +1,137 @@
+# German translation of basewiki/ikiwiki/directive page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 15:16+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
+"[[!meta title=\"Anweisungen\"]]\n"
+"[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin "
+"with `!` and may contain parameters. The general form is:"
+msgstr ""
+"Anweisungen haben eine ähnliche Form wie ein [[ikiwiki/WikiLink]], "
+"allerdings beginnen sie mit `!` und sie können Parameter enthalten. "
+"Die allgemeine Form ist:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgstr "\t\\[[!anweisung param=\"Wert\" param=\"Wert\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This gets expanded before the rest of the page is processed, and can be used "
+"to transform the page in various ways."
+msgstr ""
+"Dies wird expandiert, bevor der Rest der Seite verarbeitet wird, und kann "
+"auf unterschiedliche Weise genutzt werden, die Seite zu verändern."
+
+#. type: Plain text
+msgid ""
+"The quotes around values can be omitted if the value is a simple word.  "
+"Also, some directives may use parameters without values, for example:"
+msgstr ""
+"Die Anführungszeichen um die Werte können weggelassen werden, "
+"wenn der Wert ein einfaches Wort ist. Einige Anweisungen verwenden "
+"auch Parameter ohne Wert, zum Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!tag foo]]\n"
+msgstr "\t\\[[!tag foo]]\n"
+
+#. type: Plain text
+msgid ""
+"A directive does not need to all be on one line, it can be wrapped to "
+"multiple lines if you like:"
+msgstr ""
+"Eine Anweisung muss nicht ganz in einer einzelnen Zeile stehen, "
+"sie kann auch auf mehrere Zeilen verteilt werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+msgstr ""
+"\t\\[[!anweisung foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+
+#. type: Plain text
+msgid ""
+"Also, multiple lines of *quoted* text can be used for a value.  To allow "
+"quote marks inside the quoted text, delimit the block of text with "
+"triple-quotes:"
+msgstr ""
+"Außerdem können mehrere Zeilen Text *in Anführungszeichen* für einen "
+"Wert verwendet werden. Um Anführungszeichen innerhalb des Werts zu "
+"ermöglichen, trenne den Textblock durch dreifache Anführungszeichen ab:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive text=\"\"\"\n"
+msgstr "\t\\[[!anweisung text=\"\"\"\n"
+
+#. type: Bullet: '	1. '
+msgid "\"foo\""
+msgstr "\"foo\""
+
+#. type: Bullet: '	2. '
+msgid "\"bar\""
+msgstr "\"bar\""
+
+#. type: Bullet: '	3. '
+msgid "\"baz\""
+msgstr "\"baz\""
+
+#. type: Plain text
+msgid ""
+"ikiwiki also has an older syntax for directives, which requires a space in "
+"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This "
+"syntax has several disadvantages: it requires a space after directives with "
+"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
+"[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed "
+"syntax shown above as default.  However, ikiwiki still supports wikis using "
+"the older syntax, if the `prefix_directives` option is disabled."
+msgstr ""
+"Es gibt in ikiwiki auch eine ältere Syntax für Anweisungen, die ein "
+"Leerzeichen in erfordert, um sie von [[Wiki-Links|ikiwiki/wikilink]] zu "
+"unterscheiden. Diese Syntax hat mehrere Nachteile: Sie erfordert ein "
+"Leerzeichen nach Anweisungen ohne Parameter (so wie "
+"`\\[[pagecount ]]`), and sie verbietet Leerzeichen in "
+"[[Wiki-Links|ikiwiki/wikilink]]. Die oben gezeigte Syntax mit `!`-Präfix "
+"ist nun der Standard in ikiwiki. Die alte Syntax wird allerdings auch "
+"noch unterstützt, wenn die Option `prefix_directives` deaktiviert wird."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid "Here is a list of currently available directives in this wiki:"
+msgstr ""
+"Hier ist eine Liste der aktuell verfügbaren Anweisungen in diesem Wiki:"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!listdirectives ]]\n"
+msgstr "[[!listdirectives ]]\n"
+
+
diff --git a/po/underlays/basewiki/ikiwiki/formatting.de.po b/po/underlays/basewiki/ikiwiki/formatting.de.po
new file mode 100644
index 000000000..04b604289
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/formatting.de.po
@@ -0,0 +1,299 @@
+# German translation of basewiki/ikiwiki/formatting page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:35+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
+msgstr "[[!meta title=\"Wiki-Seiten formatieren\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Text on this wiki is, by default, written in a form very close to how you "
+"might write text for an email message. This style of text formatting is "
+"called [[MarkDown]], and it works like this:"
+msgstr ""
+"Text wird in diesem Wiki standardmäßig in einer Form geschrieben, die "
+"sehr stark dem ähnelt, wie man eine E-Mail schreibt. Dieser "
+"Formatierungs-Stil wird [[MarkDown]] genannt und funktioniert folgendermaßen:"
+
+#. type: Plain text
+msgid "Leave blank lines between paragraphs."
+msgstr "Lasse Leerzeilen zwischen Absätzen."
+
+#. type: Plain text
+msgid ""
+"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
+"placing it in single or double asterisks."
+msgstr ""
+"Man kann Text *\\*hervorheben\\** oder **\\*\\*stark hervorheben\\*\\***, "
+"indem man ihn zwischen einfache oder doppelte Sternchen setzt."
+
+#. type: Plain text
+msgid "To create a list, start each line with an asterisk:"
+msgstr "Um eine Liste zu erstellen, beginne jede Zeile mit einem Sternchen:"
+
+#. type: Bullet: '* '
+msgid "\"* this is my list\""
+msgstr "\"* Dies ist meine Liste\""
+
+#. type: Bullet: '* '
+msgid "\"* another item\""
+msgstr "\"* Noch ein Eintrag.\""
+
+#. type: Plain text
+msgid ""
+"To make a numbered list, start each line with a number (any number will do) "
+"followed by a period:"
+msgstr ""
+"Um eine nummerierte Liste zu erhalten, beginne jede Zeile mit einer Zahl "
+"(welche ist egal), auf die ein Punkt folgt:"
+
+#. type: Bullet: '1. '
+msgid "\"1. first line\""
+msgstr "\"1. Erste Zeile\""
+
+#. type: Bullet: '2. '
+msgid "\"2. second line\""
+msgstr "\"2. Zweite Zeile\""
+
+#. type: Bullet: '2. '
+msgid "\"2. third line\""
+msgstr "\"2. Dritte Zeile\""
+
+#. type: Plain text
+msgid ""
+"To create a header, start a line with one or more `#` characters followed by "
+"a space and the header text. The number of `#` characters controls the size "
+"of the header:"
+msgstr ""
+"Um eine Überschrift zu erstellen, beginne eine Zeile mit einem oder mehreren "
+"`#`-Zeichen gefolgt von einem Leerzeichen und dem Text der Überschrift. "
+"Die Anzahl der `#` steuert die Größe der Überschriften:"
+
+#. type: Title #
+#, no-wrap
+msgid "# h1"
+msgstr "# h1 "
+
+#. type: Title ##
+#, no-wrap
+msgid "## h2"
+msgstr "## h2"
+
+#. type: Title ###
+#, no-wrap
+msgid "### h3"
+msgstr "### h3"
+
+#. type: Title ####
+#, no-wrap
+msgid "#### h4"
+msgstr "#### h4"
+
+#. type: Title #####
+#, no-wrap
+msgid "##### h5"
+msgstr "##### h5"
+
+#. type: Title ######
+#, no-wrap
+msgid "###### h6"
+msgstr "###### h6"
+
+#. type: Plain text
+msgid ""
+"To create a horizontal rule, just write three or more dashes or stars on "
+"their own line:"
+msgstr ""
+"Um eine horizontale Linie zu erzeugen, schreibe einfach drei oder mehr "
+"Bindestriche oder Sternchen allein in eine Zeile:"
+
+#. type: Plain text
+#, no-wrap
+msgid "To quote someone, prefix the quote with \">\":\n"
+msgstr "Um jemanden zu zitieren, stelle dem Zitat `>` voran:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> To be or not to be,\n"
+"> that is the question.\n"
+msgstr ""
+"> Sein oder nicht sein,\n"
+"> das ist die Frage.\n"
+
+#. type: Plain text
+msgid "To write a code block, indent each line with a tab or 4 spaces:"
+msgstr ""
+"Um einen Block mit Programmcode zu schreiben, rücke jede Zeile mit "
+"einem Tabulatorzeichen oder 4 Leerzeichen ein:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t10 PRINT \"Hello, world!\"\n"
+"\t20 GOTO 10\n"
+msgstr ""
+"\t10 PRINT \"Hallo, Welt!\"\n"
+"\t20 GOTO 10\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"To link to an url or email address, you can just put the\n"
+"url in angle brackets: <<http://ikiwiki.info>>, or you can use the\n"
+"form \\[link text\\]\\(url\\)\n"
+msgstr ""
+"Um eine URL oder E-Mail-Adresse zu verlinken, kann man die\n"
+"URL einfach ein spitze Klammern schreiben: <<http://ikiwiki.info>>; "
+"man kann auch die Form \\[Link-Text\\]\\(URL)\) verwenden.\n"
+
+#. type: Plain text
+msgid ""
+"In addition to basic html formatting using [[MarkDown]], this wiki lets you "
+"use the following additional features:"
+msgstr ""
+"Zusätzlich zu der einfachen HTML-Formatierung mit [[MarkDown]] können "
+"in diesem Wiki die folgenden zusätzlichen Funktionen verwenden werden:"
+
+#. type: Bullet: '* '
+msgid ""
+"To link to another page on the wiki, place the page's name inside double "
+"square brackets. So you would use `\\[[WikiLink]]` to link to [[WikiLink]]."
+msgstr ""
+"Um eine andere Seite des Wikis zu verlinken, schreibe den Namen dieser "
+"Seite in doppelte eckige Klammern. Zum Beispiel kann man mit "
+"`\\[[WikiLink]]` auf [[WikiLink]] verweisen."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Insert [[smileys]] and some other useful symbols. :-)"
+msgstr "[[Smileys|smileys]] und einige andere nützliche Symbole einfügen. :-)"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Use [[shortcuts]] to link to common resources."
+msgstr ""
+"[[Abkürzungen|shortcuts]] verwenden, um auf gängige Quellen zu verweisen."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid ""
+"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
+"text."
+msgstr ""
+"[[Vorlagen|templates]] erstellen und ausfüllen für wiederholte Blöcke "
+"von parametrisiertem Wiki-Text."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* Insert various [[directives|directive]] onto a page to perform useful\n"
+"  actions.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" "
+"then=\"\"\"\n"
+msgstr ""
+"* Unterschiedliche [[Anweisungen|directives]] in eine Seite einfügen,\n"
+"  die nützliche Aktionen durchführen.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" "
+"then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  For example, you can:\n"
+msgstr "  Zum Beispiel kann man:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Add a table of contents to a page:"
+msgstr "Ein Inhaltsverzeichnis zu einer Seite hinzufügen:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc]]\n"
+msgstr "\t\\[[!toc]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Change the title of a page:"
+msgstr "Den Titel einer Seite verändern:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"full page title\"]]\n"
+msgstr "\t\\[[!meta title=\"Vollständiger Titel der Seite\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+
+#. type: Bullet: '  * '
+msgid "Create a blog by inlining a set of pages:"
+msgstr "Einen Blog durch Einbetten mehrerer Seiten erstellen:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
+msgstr "\t\\[[!inline pages=\"blog/*\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Full list of [[directives|directive]] enabled for this wiki:\n"
+msgstr ""
+"  Eine vollständige Liste der in diesem Wiki aktivierten "
+"[[Anweisungen|directive]]:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  [[!listdirectives ]]\n"
+msgstr "  [[!listdirectives ]]\n"
+
+
diff --git a/po/underlays/basewiki/ikiwiki/markdown.de.po b/po/underlays/basewiki/ikiwiki/markdown.de.po
new file mode 100644
index 000000000..a42c41439
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/markdown.de.po
@@ -0,0 +1,52 @@
+# German translation of basewiki/ikiwiki/markdown page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:36+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[Markdown](http://daringfireball.net/projects/markdown/)  is a minimal "
+"markup language that resembles plain text as used in email messages. It is "
+"the markup language used by this wiki by default."
+msgstr ""
+"[Markdown](http://daringfireball.net/projects/markdown/) ist eine minimale "
+"Sprache für Hervorhebungen, die sich an einfachem Text orientiert, wie er "
+"in "
+"E-Mail-Nachrichten verwendet wird. Diese Hervorhebungssprache wird "
+"standardmäßig in diesem Wiki verwendet."
+
+#. type: Plain text
+msgid ""
+"For documentation about the markdown syntax, see [[formatting]] and "
+"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
+msgstr ""
+"Für die Dokumentation der Markdown-Syntax siehe "
+"[[Formatierung|formatting]] "
+"und [Markdown: Syntax](http://daringfireball.net/projects/markdown/syntax)."
+
+#. type: Plain text
+msgid ""
+"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part "
+"of the markdown syntax, and are the only bit of markup that this wiki "
+"handles internally."
+msgstr ""
+"Beachte dabei, dass [[WikiLinks|WikiLink]] und [[Anweisungen|directive]] "
+"nicht Teil der Markdown-Syntax sind: Sie sind die einzigen "
+"Formatierungsanweisungen, die dieses Wiki intern verarbeitet."
+
+
diff --git a/po/underlays/basewiki/ikiwiki/openid.de.po b/po/underlays/basewiki/ikiwiki/openid.de.po
new file mode 100644
index 000000000..f278e64fc
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/openid.de.po
@@ -0,0 +1,115 @@
+# German translation of basewiki/ikiwiki/openid page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-12 22:29+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"OpenID\"]]\n"
+msgstr "[[!meta title=\"OpenID\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(openid)\"\n"
+"     then=\"This wiki has OpenID **enabled**.\"\n"
+"     else=\"This wiki has OpenID **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(openid)\"\n"
+"     then=\"In diesem Wiki ist OpenID **aktiviert**.\"\n"
+"     else=\"In diesem Wiki ist OpenID **deaktiviert**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[OpenID](http://openid.net) is a decentralized authentication mechanism that "
+"allows you to have one login that you can use on a growing number of "
+"websites."
+msgstr ""
+"[OpenID](http://openid.net) ist ein Mechanismus zur dezentralen "
+"Authentifizierung, der es erlaubt, sich mit einem einzigen Benutzerkonto bei "
+"einer wachsenden Anzahl von Webseiten anzumelden."
+
+#. type: Plain text
+msgid "To sign up for an OpenID, visit one of the following identity providers:"
+msgstr ""
+"Eine OpenID kann man bei einem der folgenden Identitäts-Anbieter erhalten:"
+
+#. type: Bullet: '* '
+msgid "[MyOpenID](https://www.myopenid.com/)"
+msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[GetOpenID](https://getopenid.com/)"
+msgstr "[GetOpenID](https://getopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#. type: Bullet: '* '
+msgid "[TrustBearer](https://openid.trustbearer.com/)"
+msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#. type: Bullet: '* '
+msgid ""
+"or any of the [many others out "
+"there](http://openiddirectory.com/openid-providers-c-1.html)"
+msgstr ""
+"oder einem der [vielen anderen](http://openiddirectory."
+"com/openid-providers-c-1.html)."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Your OpenID is the URL that you are given when you sign up.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgstr ""
+"Eine OpenID ist eine URL, die man bei der Anmeldung von seinem Anbieter "
+"erhält.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"To sign in to this wiki using OpenID, just enter it in the OpenID field in "
+"the signin form. You do not need to give this wiki a password or go through "
+"any registration process when using OpenID."
+msgstr ""
+"In diesem Wiki kann man sich per OpenID anmelden, indem man einfach seine "
+"OpenID im entsprechenden Feld des Anmeldeformulars eingibt. Man muss in "
+"diesem Wiki kein Passwort setzen und auch keinen Registrierungsprozess "
+"durchlaufen, wenn man OpenID verwendet."
+
+#. type: Plain text
+msgid ""
+"It's also possible to make a page in the wiki usable as an OpenID url, by "
+"delegating it to an openid server. Here's an example of how to do that:"
+msgstr ""
+"Außerdem ist es möglich, eine Seite dieses Wikis als OpenID-URL verwendbar zu "
+"machen, indem sie an einen OpenID-Server weitergereicht wird. Hier ist ein "
+"Beispiel, wie dies gemacht wird:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t       server=\"http://www.myopenid.com/server\"]]\n"
+msgstr ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t       server=\"http://www.myopenid.com/server\"]]\n"
+
+
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.de.po b/po/underlays/basewiki/ikiwiki/pagespec.de.po
new file mode 100644
index 000000000..ab4d62da3
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec.de.po
@@ -0,0 +1,258 @@
+# German translation of basewiki/ikiwiki/pagespec page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:39+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To select a set of pages, such as pages that are locked, pages whose commit "
+"emails you want subscribe to, or pages to combine into a blog, the wiki uses "
+"a PageSpec. This is an expression that matches a set of pages."
+msgstr ""
+"Um eine Menge von Seiten auszuwählen (etwa Seiten, die gesperrt werden sollen, "
+"deren Einrechungs-Mails man abonnieren will, oder die man zu einem Blog "
+"kombinieren will), verwendet das Wiki eine PageSpec. Dies ist ein Ausdruck, "
+"der auf bestimmte Seiten passt."
+
+#. type: Plain text
+msgid ""
+"The simplest PageSpec is a simple list of pages. For example, this matches "
+"any of the three listed pages:"
+msgstr ""
+"Die einfachste PageSpec ist eine einfache Liste von Seiten. Zum Beispiel passt "
+"dies "
+"auf jede der drei aufgezählten Seiten:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tfoo or bar or baz\n"
+msgstr "\tfoo or bar or baz\n"
+
+#. type: Plain text
+msgid ""
+"More often you will want to match any pages that have a particular thing in "
+"their name. You can do this using a glob pattern. \"`*`\" stands for any "
+"part of a page name, and \"`?`\" for any single letter of a page name. So "
+"this matches all pages about music, and any [[SubPage]]s of the SandBox, but "
+"does not match the SandBox itself:"
+msgstr ""
+"Häufiger wird es vorkommen, dass man Seiten erfassen will, deren Name etwas "
+"bestimmtes enthält. Man kann dies mit einem Muster tun: \"`*`\" steht für "
+"einen beliebigen Teil eines Seitennamens und \"`?`\" steht für einen beliebigen "
+"Buchstaben eines Seitennamens. Also passt dies alle Seiten über Musik, und alle "
+"[[Unterseiten|SubPage]] des Sandkastens, aber nicht auf den Sandkasten selbst:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t*music* or SandBox/*\n"
+msgstr "\t*music* or SandBox/*\n"
+
+#. type: Plain text
+msgid ""
+"You can also prefix an item with \"`!`\" to skip pages that match it. So to "
+"match all pages except for Discussion pages and the SandBox:"
+msgstr ""
+"Man kann einem Eintrag ein \"`!`\" voranstellen, um die betreffenden Seiten "
+"auszuschließen. Auf diese Weise können alle Seiten außer Diskussionsseiten und "
+"Sandkasten erfasst werden:"
+
+#. type: Bullet: '	* '
+msgid "and !SandBox and !*/Discussion"
+msgstr "and !SandBox and !*/Discussion"
+
+#. type: Plain text
+msgid ""
+"Some more elaborate limits can be added to what matches using these "
+"functions:"
+msgstr ""
+"Einige weitergehende Einschränkungen können hinzugefügt werden, indem die "
+"folgenden Funktionen verwendet werden:"
+
+#. type: Bullet: '* '
+msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+msgstr ""
+"\"`link(page)`\" - passt nur auf Seiten, die einen Link auf die angegebene Seite "
+"(oder das angegebene Muster) enthalten"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
+"(or tags matched by a glob)"
+msgstr ""
+"\"`tagged(tag)`\" - passt nur auf Seiten, die mit dem angegebenen Tag versehen "
+"sind oder auf diesen verweisen (auch hier kann ein Muster verwendet werden)"
+
+#. type: Bullet: '* '
+msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+msgstr ""
+"\"`backlink(page)`\" - passt nur auf Seiten, auf die von der angegebenen Seite "
+"verwiesen wird"
+
+#. type: Bullet: '* '
+msgid "\"`creation_month(month)`\" - matches only pages created on the given month"
+msgstr ""
+"\"`creation_month(month)`\" - passt nur auf Seiten, die im angegebenen Monat "
+"erstellt wurden"
+
+#. type: Bullet: '* '
+msgid "\"`creation_day(mday)`\" - or day of the month"
+msgstr "\"`creation_day(mday)`\" - genauso für einen Tag im Monat"
+
+#. type: Bullet: '* '
+msgid "\"`creation_year(year)`\" - or year"
+msgstr "\"`creation_year(year)`\" - der ein Jahr"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_after(page)`\" - matches only pages created after the given page "
+"was created"
+msgstr ""
+"\"`created_after(page)`\" - passt nur auf Seiten, die nach der angegebenen Seite "
+"angelegt wurden"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_before(page)`\" - matches only pages created before the given "
+"page was created"
+msgstr ""
+"\"`created_before(page)`\" - passt nur auf Seiten, die vor der angegebenen Seite "
+"angelegt wurden."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
+"the glob by itself is actually a shorthand for this function."
+msgstr ""
+"\"`glob(someglob)`\" - passt nur auf Seiten, auf die das angegebene Muster passt."
+" "
+"Das Muster direkt anzugeben ist eine Abkürzung für diese Funktion."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+"that globs do not usually match."
+msgstr ""
+"\"`internal(glob)`\" - wie `glob()`, aber es werden auch intern verwendete "
+"Seiten "
+"erfasst, auf die normale Muster nicht passen."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", "
+"\"`license(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+"metadata, matching the specified glob."
+msgstr ""
+"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", "
+"\"`license(glob)`\", \"`copyright(glob)`\" - passt auf Seiten, deren Metadaten "
+"auf die angegebenen Muster passen."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`user(username)`\" - tests whether a modification is being made by a user "
+"with the specified username. If openid is enabled, an openid can also be put "
+"here. Glob patterns can be used in the username. For example, to match all "
+"openid users, use `user(*://*)`"
+msgstr ""
+"\"`user(username)`\" - prüft ob eine Änderung von einem Benutzer mit dem "
+"angegebenen Namen gemacht wird. Wenn OpenID aktiviert ist, kann auch eine "
+"OpenID angegeben werden. Muster können im Benutzernamen verwendet werden. "
+"zum Beispiel können alle OpenID-Nutzer mit `user(*://*)` erfasst werden."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`admin()`\" - tests whether a modification is being made by one of the "
+"wiki admins."
+msgstr ""
+"\"`admin()`\" - prüft ob eine Änderung durch einen der Wiki-Administratoren "
+"gemacht wird."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ip(address)`\" - tests whether a modification is being made from the "
+"specified IP address."
+msgstr ""
+"\"`ip(address)`\" - prüft ob eine Änderung von der angegebenen IP-Adresse aus "
+"gemacht wird."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
+"page matching the specified glob"
+msgstr ""
+"\"`postcomment(glob)`\" - passt nur, wenn ein Kommentar zu einer durch das "
+"Muster angegebenen Seite gemacht wird"
+
+#. type: Plain text
+msgid ""
+"For example, to match all pages in a blog that link to the page about music "
+"and were written in 2005:"
+msgstr ""
+"Zum Beispiel können alle Seiten eines Blogs ausgewählt werden, die einen Link "
+"zu einer Seite über Musik enthalten und 2005 geschrieben wurden:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and link(music) and creation_year(2005)\n"
+msgstr "\tblog/* and link(music) and creation_year(2005)\n"
+
+#. type: Plain text
+msgid ""
+"Note the use of \"and\" in the above example, that means that only pages "
+"that match each of the three expressions match the whole. Use \"and\" when "
+"you want to combine expression like that; \"or\" when it's enough for a page "
+"to match one expression. Note that it doesn't make sense to say \"index and "
+"SandBox\", since no page can match both expressions."
+msgstr ""
+"Beachte die Verwendung von `and` im obigen Beispiel: Dies bewirkt, dass "
+"nur die Seiten auf den gesamten Ausdruck passen, die auf alle drei "
+"Teilausdrücke passen. Verwende `and` um Ausdrücke so zu kombinieren "
+"und `or` wenn eine Seite nur auf einen der Ausdrücke passen soll. Beachte "
+"dass es sinnlos ist, `index and SandBox` zu sagen, da keine Seite auf beide "
+"Ausdrücke passen kann."
+
+#. type: Plain text
+msgid ""
+"More complex expressions can also be created, by using parentheses for "
+"grouping. For example, to match pages in a blog that are tagged with either "
+"of two tags, use:"
+msgstr ""
+"Es können auch komplexere Ausdrücke erstellt werden, indem Klammern "
+"zur Gruppierung verwendet werden. Zum Beispiel passt der folgende "
+"Ausdruck auf Blog-Seiten, die mit einem der beiden angegebenen Tags "
+"versehen sind:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and (tagged(foo) or tagged(bar))\n"
+msgstr "\tblog/* and (tagged(foo) or tagged(bar))\n"
+
+#. type: Plain text
+msgid ""
+"Note that page names in PageSpecs are matched against the absolute filenames "
+"of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will "
+"not match a page named \"a/foo\" or \"a/b/foo\". To match relative to the "
+"directory of the page containing the pagespec, you can use \"./\". For "
+"example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
+msgstr ""
+"Beachte, dass Seitennamen in PageSpecs auf den absoluten Dateinamen "
+"der Seiten im Wiki passen müssen: Die PageSpec `foo` auf der Seite `a/b` "
+"wird weder auf `a/foo` noch auf `a/b/foo` passen. Um relative Pfade zum "
+"Verzeichnis der Seite, die die PageSpec enthält, zu verwenden, kannst du "
+"`./` verwenden. Zum Beispiel passt `./foo` auf der Seite `a/b` auf `a/foo`."
+
+
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
new file mode 100644
index 000000000..690e41636
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
@@ -0,0 +1,122 @@
+# German translation of basewiki/ikiwiki/pagespec/attachment page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 15:17+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
+"[[!meta title=\"Anhänge\"]]\n"
+"[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(attachment)\"\n"
+"     then=\"This wiki has attachments **enabled**.\"\n"
+"     else=\"This wiki has attachments **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(attachment)\"\n"
+"     then=\"In diesem Wiki sind Anhänge **aktiviert**.\"\n"
+"     else=\"In diesem Wiki sind Anhänge **deaktiviert**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If attachments are enabled, the wiki admin can control what types of "
+"attachments will be accepted, via the `allowed_attachments` configuration "
+"setting."
+msgstr ""
+"Wenn Anhänge aktiviert sind, kann der Administrator des Wikis bestimmen, "
+"welche Arten von Anhängen akzeptiert werden, indem er die Einstellung "
+"`allowed_attachments` verändert."
+
+#. type: Plain text
+msgid ""
+"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
+"files to be uploaded by joey into a specific directory, and check all "
+"attachments for viruses, something like this could be used:"
+msgstr ""
+"Zum Beispiel können beliebige Dateien auf 50 Kilobyte beschränkt, "
+"aber größere mp3-Dateien von joey in einem bestimmten Verzeichnis erlaubt, "
+"und alle Anhänge nach Viren durchsucht werden, indem etwas wie "
+"das Folgende verwendet wird:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) "
+"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgstr ""
+"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) "
+"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+
+#. type: Plain text
+msgid ""
+"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
+"additional tests:"
+msgstr ""
+"Die reguläre [[ikiwiki/PageSpec]]-Syntax ist um die folgenden zusätzlichen "
+"Tests erweitert:"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`maxsize(size)`\" - tests whether the attachment is no larger than the "
+"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", "
+"\"gb\" etc can be used to specify the units."
+msgstr ""
+"\"`maxsize(size)`\" - prüft ob der Anhang nicht größer ist als angegeben. "
+"Die Größe wird standardmäßig in Bytes angegeben, aber `kb`, `mb`, "
+"`gb` und so weiter kann verwendet werden, um die Einheit anzugeben."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`minsize(size)`\" - tests whether the attachment is no smaller than the "
+"specified size."
+msgstr ""
+"\"`minsize(size)`\" - prüft ob der Anhang nicht kleiner ist als angegeben."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as "
+"a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other "
+"enabled page format)."
+msgstr ""
+"\"`ispage()`\" - prüft ob der Anhang von ikiwiki als Wiki-Seite behandelt "
+"wird. Dies ist der Fall, wenn er die Endung `.mdwn` oder die eines anderen "
+"aktivierten Seitenformats hat."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
+"  use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n"
+"  as attachments, use `ispage()`.\n"
+msgstr ""
+"  Wenn man also verhindern will, dass Wiki-Seiten als Anhang hochgeladen\n"
+"  werden, kann `!ispage()` verwendet werden; wenn nur Wiki-Seiten\n"
+"  hochgeladen werden können sollen, geht dies mit `ispage()`.\n"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can "
+"include a glob in the type, for example `mimetype(image/*)`."
+msgstr ""
+"\"`mimetype(foo/bar)`\" - prüft den MIME-Typ des Anhangs. Man kann ein "
+"Muster für den Typen verwenden, zum Beispiel `mimetype(image/*)`."
+
+#. type: Bullet: '* '
+msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
+msgstr "\"`virusfree()`\" - prüft den Anhang mit einem Virenscanner."
+
+
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.de.po b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
new file mode 100644
index 000000000..056552a4f
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
@@ -0,0 +1,70 @@
+# German translation of basewiki/ikiwiki/pagespec/po page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:55+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(po)\"\n"
+"     then=\"This wiki has po support **enabled**.\"\n"
+"     else=\"This wiki has po support **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(po)\"\n"
+"     then=\"In diesem Wiki ist die po-Unterstützung **aktiviert**.\"\n"
+"     else=\"In diesem Wiki ist die po-Unterstützung **deaktiviert**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular "
+"[[ikiwiki/PageSpec]] syntax is expanded with the following additional tests "
+"that can be used to improve user navigation in a multi-lingual wiki:"
+msgstr ""
+"Wenn die [[!iki plugins/po desc=po]]-Erweiterung aktiviert ist, ist die "
+"reguläre "
+"[[ikiwiki/PageSpec]]-Syntax um die folgenden zusätzlichen Tests erweitert, "
+"die zur Verbesserung der Benutzernavigation in mehrsprachigen Wikis "
+"verwendet werden kann:"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`lang(LL)`\" - tests whether a page is written in the language specified "
+"as a ISO639-1 (two-letter) language code."
+msgstr ""
+"\"`lang(LL)`\" - prüft ob eine Seite in der angegebenen Sprache geschrieben "
+"ist. "
+"Die Sprache wird als (zweibuchstabiger) Sprachcode nach ISO639-1 angegeben."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`currentlang()`\" - tests whether a page is written in the same language "
+"as the current page."
+msgstr ""
+"\"`currentlang()`\" - prüft, ob eine Seite in der gleichen Sprache "
+"geschrieben ist wie "
+"die aktuelle Seite."
+
+#. type: Plain text
+msgid ""
+"Note that every non-po page is considered to be written in "
+"`po_master_language`, as specified in `ikiwiki.setup`."
+msgstr ""
+"Beachte, dass als Sprache jeder nicht-po-Seite `po_master_language` "
+" angenommen wird, wie in `ikiwiki.setup` angegeben."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po b/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po
new file mode 100644
index 000000000..7ca179a6a
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po
@@ -0,0 +1,48 @@
+# German translation of basewiki/ikiwiki/pagespec/sorting page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 15:19+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"Some [[directives|ikiwiki/directive]] that use "
+"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching "
+"pages are shown in. The following sort orders can be specified."
+msgstr ""
+"[[!meta title=\"Sortierung\"]]\n"
+"Bei einigen der [[Anweisungen|ikiwiki/directive]], die [[PageSpecs|ikiwiki/pagespec]] verwenden, kann eine Reihenfolge angegeben werden, in der die ausgewählten Seiten angezeigt werden. Die folgenden Sortierreihenfolgen können angegeben werden:"
+
+#. type: Bullet: '* '
+msgid "`age` - List pages from the most recently created to the oldest."
+msgstr "`age` - Zeige die Seiten von der zuletzt angelegten zur ältesten."
+
+#. type: Bullet: '* '
+msgid "`mtime` - List pages with the most recently modified first."
+msgstr "`mtime` - Zeige die Seiten mit der zuletzt veränderten zuerst."
+
+#. type: Bullet: '* '
+msgid "`title` - Order by title."
+msgstr "`title` - Sortiere nach Titel."
+
+#. type: Bullet: '* '
+msgid ""
+"`title_natural` - Only available if [[!cpan Sort::Naturally]] is "
+"installed. Orders by title, but numbers in the title are treated as such, "
+"(\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
+msgstr ""
+"`title_natural` - Nur verfügbar, wenn [[!cpan Sort::Naturally]] "
+"installiert ist. "
+"Sortiert nach Titel, aber Zahlen im Titel werden als solche behandelt"
+"(\"1 2 9 10 20\" statt \"1 10 2 20 9\")."
+
+
diff --git a/po/underlays/basewiki/ikiwiki/searching.de.po b/po/underlays/basewiki/ikiwiki/searching.de.po
new file mode 100644
index 000000000..211117995
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/searching.de.po
@@ -0,0 +1,92 @@
+# German translation of basewiki/ikiwiki/searching page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 15:14+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
+"[[!meta robots=\"noindex, follow\"]]\n"
+"[[!meta title=\"Suchen\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(search)\"\n"
+"then=\"This wiki has searching **enabled**.\"\n"
+"else=\"This wiki has searching **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(search)\"\n"
+"then=\"In diesem Wiki ist Suchen **aktiviert**.\"\n"
+"else=\"In diesem Wiki ist Suchen **deaktiviert**.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If searching is enabled, you can enter search terms in the search field, as "
+"you'd expect. There are a few special things you can do to construct more "
+"powerful searches."
+msgstr ""
+"Wenn Suchen aktiviert ist, kann man wie erwartet Suchausdrücke in das "
+"Suchfeld eintragen. Es gibt einige spezielle Ausdrücke, um mächtigere "
+"Suchen zu erstellen."
+
+#. type: Bullet: '* '
+msgid "To match a phrase, enclose it in double quotes."
+msgstr ""
+"Um nach einer Phrase aus mehreren Wörtern zu suchen, schreibe sie in "
+"Anführungszeichen."
+
+#. type: Bullet: '* '
+msgid "`AND` can be used to search for documents containing two expressions."
+msgstr ""
+"`AND` kann verwendet werden, um nach Dokumenten mit zwei Ausdrücken zu "
+"suchen."
+
+#. type: Bullet: '* '
+msgid ""
+"`OR` can be used to search for documents containing either one of two "
+"expressions."
+msgstr ""
+"`OR` kann verwendet werden, um nach Dokumenten mit einem der beiden "
+"Ausdrücke zu suchen."
+
+#. type: Bullet: '* '
+msgid ""
+"Parentheses can be used to build up complicated search expressions. For "
+"example, \"(foo AND bar) OR (me AND you)\""
+msgstr ""
+"Klammern können verwendet werden, um komplexere Suchausdrücke aufzubauen. "
+"Zum Beispiel `(foo AND bar) OR (ich AND du)`."
+
+#. type: Bullet: '* '
+msgid ""
+"Prefix a search term with \"-\" to avoid it from appearing in the results.  "
+"For example, \"-discussion\" will omit \"discussion\"."
+msgstr ""
+"Stelle einem Suchausdruck `-` voran, damit er nicht in den Ergebnissen "
+"auftaucht. "
+"Zum Beispiel wird `-Diskussion`alle Seiten mit \"Diskussion\" ausschließen."
+
+#. type: Bullet: '* '
+msgid "To search for a page with a given title, use \"title:foo\"."
+msgstr ""
+"Um nach einer Seite mit einem bestimmten Titel zu suchen, verwende "
+"`title:foo`."
+
+#. type: Bullet: '* '
+msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"."
+msgstr ""
+"Um nach Seiten mit einem Link auf \"bar\" zu suchen, verwende `link:bar`."
+
+
diff --git a/po/underlays/basewiki/ikiwiki/subpage.de.po b/po/underlays/basewiki/ikiwiki/subpage.de.po
new file mode 100644
index 000000000..3594ab445
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage.de.po
@@ -0,0 +1,54 @@
+# German translation of basewiki/ikiwiki/subpage page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 15:19+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
+"[[!meta title=\"Unterseiten\"]]\n"
+"[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"ikiwiki supports placing pages in a directory hierarchy. For example, this "
+"page, [[SubPage]] has some related pages placed under it, like "
+"[[SubPage/LinkingRules]]. This is a useful way to add some order to your "
+"wiki rather than just having a great big directory full of pages."
+msgstr ""
+"In ikiwiki werden Seiten in einem Verzeichnisbaum angeordnet. Zum Beispiel "
+"gibt es unterhalb dieser Seite, [[SubPage]], einige verwandte Seiten, etwa "
+"[[SubPage/LinkingRules]]. Dies ist eine nützliche Möglichkeit, Ordnung in "
+"ein Wiki zu bringen und nicht nur ein riesiges Verzeichnis voller Seiten zu "
+"haben."
+
+#. type: Plain text
+msgid ""
+"To add a SubPage, just make a subdirectory and put pages in it. For example, "
+"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
+"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"nested as deeply as you'd like."
+msgstr ""
+"Um eine Unterseite hinzuzufügen, legt man einfach ein Unterverzeichnis an "
+"und erstellt darin Seiten. Zum Beispiel ist diese Seite `SubPage.mdwn` in "
+"der Quelle dieses Wikis und es existiert auch ein Unterverzeichnis "
+"`SubPage`, das `SubPage/LinkingRules.mdwn` enthält. Unterseiten können "
+"beliebig tief verschachtelt werden."
+
+#. type: Plain text
+msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
+msgstr ""
+"Wie Links auf Unterseiten gesetzt werden, wird in [[LinkingRules]] erklärt."
+
+
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po
new file mode 100644
index 000000000..5702c5fcd
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po
@@ -0,0 +1,109 @@
+# German translation of basewiki/ikiwiki/subpage/linkingrules page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 15:21+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
+"[[!meta title=\"Regeln für Links\"]]\n"
+"[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To link to or from a [[SubPage]], you can normally use a regular "
+"[[WikiLink]] that does not contain the name of the parent directory of the "
+"[[SubPage]]. Ikiwiki descends the directory hierarchy looking for a page "
+"that matches your link."
+msgstr ""
+"Um einen Link von oder zu einer [[Unterseite|SubPage]] anzulegen, kann man "
+"normalerweise einfache WikiLinks verwenden, ohne dass diese den Namen des "
+"Verzeichnisses enthalten, in dem die [[Unterseite|SubPage]] liegt. "
+"Ikiwiki läuft dann die Verzeichnishierarchie ab und sucht nach einer Seite, "
+"die zu dem angegebenen Link passt."
+
+#. type: Plain text
+msgid ""
+"For example, if FooBar/SubPage links to \"OtherPage\", ikiwiki will first "
+"prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next to "
+"FooBar/OtherPage and finally to OtherPage in the root of the wiki."
+msgstr ""
+"Wenn zum Beispiel `FooBar/UnterSeite` einen Link auf `AndereSeite` enthält, "
+"wird ikiwiki bevorzugt auf `FooBar/UnterSeite/AndereSeite` verweisen, wenn "
+"diese existiert, dann auf `FooBar/AndereSeite` und schließlich auf "
+"`AndereSeite` im Wurzelverzeichnis des Wikis."
+
+#. type: Plain text
+msgid ""
+"Note that this means that if a link on FooBar/SomePage to \"OtherPage\" "
+"currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage "
+"is created, the link will _change_ to point to FooBar/OtherPage. On the "
+"other hand, a link from BazBar to \"OtherPage\" would be unchanged by this "
+"creation of a [[SubPage]] of FooBar."
+msgstr ""
+"Insbesondere bedeutet dies, dass wenn ein Link auf `FooBar/EineSeite` auf "
+"`AndereSeite` momentan auf `AndereSeite` im Wurzelverzeichnis des Wikis "
+"verweist, und `FooBar/AndereSeite` erstellt wird, dann _ändert_ sich das "
+"Ziel des Links auf `FooBar/AndereSeite`. Andererseits würde ein Link von "
+"`BazBar` auf `AndereSeite` durch das Anlegen einer [[Unterseite|SubPage]] "
+"von `FooBar` unverändert bleiben."
+
+#. type: Plain text
+msgid ""
+"You can also specify a link that contains a directory name, like "
+"\"FooBar/OtherPage\" to more exactly specify what page to link to. This is "
+"the only way to link to an unrelated [[SubPage]]."
+msgstr ""
+"Man kann auch einen Link mit Verzeichnisnamen angeben, etwa "
+"`FooBar/AndereSeite`, um genauer anzugeben auf welche Seite verwiesen werden "
+"soll. Nur so kann auf eine [[Unterseite|SubPage]] einer anderen Seite "
+"verwiesen werden."
+
+#. type: Plain text
+msgid ""
+"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", "
+"or from BazBar/SubPage to \"FooBar/SubPage\"."
+msgstr ""
+"Man kann dies zum Beispiel dazu verwenden, um einen Link von `BazBar` auf "
+"`FooBar/UnterSeite` oder von `BazBar/UnterSeite` auf `FooBar/UnterSeite` "
+"anzulegen."
+
+#. type: Plain text
+msgid ""
+"You can also use \"/\" at the start of a link, to specify exactly which page "
+"to link to, when there are multiple pages with similar names and the link "
+"goes to the wrong page by default. For example, linking from "
+"\"FooBar/SubPage\" to \"/OtherPage\" will link to the \"OtherPage\" in the "
+"root of the wiki, even if there is a \"FooBar/OtherPage\"."
+msgstr ""
+"Man kann auch `/` am Anfang des Links verwenden, um die Zielseite genau zu "
+"spezifizieren, wenn es mehrere Seiten mit ähnlichen Namen gibt und der Link "
+"standardmäßig zur falschen geht. Zum Beispiel zeigt der Link `/AndereSeite` "
+"auf der Seite `FooBar/UnterSeite` auf `AndereSeite` im Wurzelverzeichnis des "
+"Wikis, selbst wenn es eine `FooBar/AndereSeite` gibt."
+
+#. type: Plain text
+msgid ""
+"Also, if the wiki is configured with a userdir, you can link to pages within "
+"the userdir without specifying a path to them. This is to allow for easy "
+"linking to a user's page in the userdir, to sign a comment. These links are "
+"checked for last of all."
+msgstr ""
+"Wenn das Wiki mit einem `userdir` konfiguriert ist, kann man außerdem "
+"die Seiten im Benutzerverzeichnis direkt verlinken, ohne einen Pfad "
+"anzugeben. Dadurch können leichter Links auf die Seite eines Benutzers "
+"gesetzt werden, etwa beim Signieren eines Kommentars. Diese Links "
+"werden als letzte von allen in Betracht gezogen."
+
+
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.de.po b/po/underlays/basewiki/ikiwiki/wikilink.de.po
new file mode 100644
index 000000000..7bd9130e3
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/wikilink.de.po
@@ -0,0 +1,111 @@
+# German translation of basewiki/ikiwiki/wikilink page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:41+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"WikiLinks provide easy linking between pages of the wiki. To create a "
+"[[WikiLink]], just put the name of the page to link to in double brackets.  "
+"For example `\\[[WikiLink]]`."
+msgstr ""
+"WikiLinks ermöglichen es, auf einfache Weise Links zwischen Seiten im Wiki "
+"zu setzen. "
+"Um einen [[WikiLink]] zu erstellen, setze einfach den Namen der Zielseite in "
+"doppelte eckige Klammern, zum Beispiel `\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"If you ever need to write something like `\\[[WikiLink]]` without creating a "
+"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
+msgstr ""
+"Wenn man irgendwann einmal etwas wie `\\[[WikiLink]]` schreiben will, "
+"ohne einen WikiLink zu erzeugen, stellt man einfach ein `\\` voran, wie in "
+"`\\\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"There are some special [[SubPage/LinkingRules]] that come into play when "
+"linking between [[SubPages|SubPage]]."
+msgstr ""
+"Es gibt einige spezielle [[Regeln für Links|SubPage/LinkingRules]], die beim "
+"setzen von Links zwischen [[Unterseiten|SubPage]] ins Spiel kommen."
+
+#. type: Plain text
+msgid ""
+"Also, if the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Wenn das Ziel eines WikiLinks nach einem Bild aussieht, wird dieses "
+"innerhalb der Seite angezeigt."
+
+#. type: Plain text
+msgid ""
+"WikiLinks are matched with page names in a case-insensitive manner, so you "
+"don't need to worry about getting the case the same, and can capitalise "
+"links at the start of a sentence, and so on."
+msgstr ""
+"WikiLinks werden unabhängig von der Groß- und Kleinschreibung gefunden, "
+"man braucht sich also keine Gedanken über identische Schreibweise zu machen "
+"und kann zum Beispiel das erste Wort eines Satzes groß schreiben."
+
+#. type: Plain text
+msgid ""
+"It's also possible to write a WikiLink that uses something other than the "
+"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
+"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
+msgstr ""
+"Es ist auch möglich einen WikiLink zu schreiben, der etwas anderes als den "
+"Seitennamen als Text für den Link verwendet. Zum Beispiel verweist "
+"`\\[[foo_bar|SandBox]]` auf die Sandkasten-Seite, aber der Link erscheint "
+"als [[foo_bar|SandBox]]."
+
+#. type: Plain text
+msgid ""
+"To link to an anchor inside a page, you can use something like "
+"`\\[[WikiLink#foo]]` ."
+msgstr ""
+"Um auf ein Ziel innerhalb einer Seite zu verweisen, kann man etwas wie "
+"`\\[[WikiLink#foo]]` verwenden."
+
+#. type: Title ##
+#, no-wrap
+msgid "Directives and WikiLinks"
+msgstr "Anweisungen und WikiLinks"
+
+#. type: Plain text
+msgid ""
+"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+"used spaces to distinguish between directives and wikilinks; as a result, "
+"with that syntax in use, you cannot use spaces in WikiLinks, and must "
+"replace spaces with underscores.  The newer syntax, enabled with the "
+"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+"with `!`, and thus does not prevent links with spaces.  Future versions of "
+"ikiwiki will turn this option on by default."
+msgstr ""
+"Es gibt in ikiwiki zwei Syntaxen für [[Anweisungen|directive]]. Die ältere "
+"Syntax verwendete Leerzeichen, um zwischen Anweisungen und WikiLinks "
+"zu unterscheiden; mit dem Ergebnis, dass bei Verwendung dieser Syntax "
+"keine Leerzeichen in WikiLinks verwendet werden können und durch "
+"Unterstriche ersetzt werden müssen. Die neuere Syntax, aktiviert durch "
+"die Option `prefix_directives` in einer ikiwiki-Setup-Datei, stellt "
+"Anweisungen `!` voran und ermöglicht so Links mit Leerzeichen. "
+"Zukünftige Versionen von ikiwiki werden diese Option standardmäßig "
+"aktivieren."
+
+
diff --git a/po/underlays/basewiki/index.de.po b/po/underlays/basewiki/index.de.po
new file mode 100644
index 000000000..037412d55
--- /dev/null
+++ b/po/underlays/basewiki/index.de.po
@@ -0,0 +1,29 @@
+# German translation of basewiki/index page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-12 09:40+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid "Welcome to your new wiki."
+msgstr "Willkommen in Ihrem neuen Wiki."
+
+#. type: Plain text
+msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
+msgstr ""
+"Alle Wikis sollten einen [[Sandkasten|SandBox]] haben, also hat dieses "
+"auch einen."
+
+#. type: Plain text
+msgid "This wiki is powered by [[ikiwiki]]."
+msgstr "Dieses Wiki wird mit [[ikiwiki]] betrieben."
+
diff --git a/po/underlays/basewiki/recentchanges.de.po b/po/underlays/basewiki/recentchanges.de.po
new file mode 100644
index 000000000..f1e75acd9
--- /dev/null
+++ b/po/underlays/basewiki/recentchanges.de.po
@@ -0,0 +1,38 @@
+# German translation of basewiki/recentchanges page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-12 09:41+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"RecentChanges\"]]\n"
+msgstr "[[!meta title=\"Letzte Änderungen\"]]\n"
+
+#. type: Plain text
+msgid "Recent changes to this wiki:"
+msgstr "Die letzten Änderungen an diesem Wiki:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
+msgstr ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
+
diff --git a/po/underlays/basewiki/sandbox.de.po b/po/underlays/basewiki/sandbox.de.po
new file mode 100644
index 000000000..0e8d354f8
--- /dev/null
+++ b/po/underlays/basewiki/sandbox.de.po
@@ -0,0 +1,91 @@
+# German translation of basewiki/sandbox page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 15:14+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, fuzzy
+msgid "This is the SandBox, a page anyone can edit to learn how to use the wiki."
+msgstr ""
+"[[!meta title=\"Sandkasten\"]]\n"
+"Dies ist der Sandkasten: Eine Seite die jeder bearbeiten kann, um zu lernen wie man das Wiki benutzt."
+
+#. type: Plain text
+msgid "Here's a paragraph."
+msgstr "Dies ist ein Absatz."
+
+#. type: Plain text
+msgid "Here's another one with *emphasised* text."
+msgstr "Dies ist noch ein Absatz mit *hervorgehobenem* Text."
+
+#. type: Title #
+#, no-wrap
+msgid "Header"
+msgstr "Überschrift"
+
+#. type: Title ##
+#, no-wrap
+msgid "Subheader"
+msgstr "Unterüberschrift"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> This is a blockquote.\n"
+">\n"
+"> This is the first level of quoting.\n"
+">\n"
+"> > This is nested blockquote.\n"
+">\n"
+"> Back to the first level.\n"
+msgstr ""
+"> Dies ist ein zitierter Absatz.\n"
+">\n"
+"> Dies ist die erste Zitatebene.\n"
+">\n"
+"> > Dies ist ein verschachteltes Zitat.\n"
+">\n"
+"> Zurück zur ersten Ebene.\n"
+
+#. type: Plain text
+msgid "Numbered list"
+msgstr "Nummerierte Aufzählung"
+
+#. type: Bullet: '1. '
+msgid "First item."
+msgstr "Erster Eintrag"
+
+#. type: Bullet: '1. '
+msgid "Another."
+msgstr "Noch einer."
+
+#. type: Bullet: '1. '
+msgid "And another.."
+msgstr "Und noch einer ..."
+
+#. type: Plain text
+msgid "Bulleted list"
+msgstr "Einfache Aufzählung"
+
+#. type: Bullet: '* '
+msgid "*item*"
+msgstr "*Eintrag*"
+
+#. type: Bullet: '* '
+msgid "item"
+msgstr "Eintrag"
+
+#. type: Plain text
+msgid "[[ikiwiki/WikiLink]]"
+msgstr "[[ikiwiki/WikiLink]]"
+
diff --git a/po/underlays/basewiki/shortcuts.de.po b/po/underlays/basewiki/shortcuts.de.po
new file mode 100644
index 000000000..36be14729
--- /dev/null
+++ b/po/underlays/basewiki/shortcuts.de.po
@@ -0,0 +1,287 @@
+# German translation of basewiki/shortcuts page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 15:14+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(shortcut)\"\n"
+"     then=\"This wiki has shortcuts **enabled**.\"\n"
+"     else=\"This wiki has shortcuts **disabled**.\"]]\n"
+msgstr ""
+"[[!meta title=\"Abkürzungen\"]]\n"
+"[[!if test=\"enabled(shortcut)\"\n"
+"     then=\"In diesem Wiki sind Abkürzungen **aktiviert**.\"\n"
+"     else=\"In diesem Wiki sind Abkürzungen **deaktiviert**.\"]]\n"
+
+#. type: Plain text
+msgid "Some examples of using shortcuts include:"
+msgstr "Abkürzungen können unter anderem so benutzt werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n"
+msgstr ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tBetrachte die \\[[!cia ikiwiki desc=\"CIA-Seite für %s\"]].\n"
+
+#. type: Plain text
+msgid "This page controls what shortcut links the wiki supports."
+msgstr "Diese Seite bestimmt, welche Abkürzungen das Wiki unterstützt."
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgstr "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug "
+"#%s\"]]"
+msgstr ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug "
+"#%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" "
+"desc=\"debian-%s@lists.debian.org\"]]"
+msgstr ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" "
+"desc=\"debian-%s@lists.debian.org\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgstr "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debrt "
+"url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]"
+msgstr ""
+"[[!shortcut name=debrt "
+"url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+"  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or "
+"`\\[[!debss package/version]]`.  See http://snapshot.debian.net for "
+"details.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug "
+"url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" "
+"desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist "
+"url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" "
+"desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug "
+"url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug "
+"#%s\"]]\n"
+"* [[!shortcut name=linuxbug "
+"url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug "
+"#%s\"]]\n"
+"* [[!shortcut name=mozbug "
+"url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug "
+"#%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" "
+"desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" "
+"desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan "
+"url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan "
+"url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC "
+"%s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki "
+"url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki "
+"url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict "
+"url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg "
+"url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc "
+"url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois "
+"url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve "
+"url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt "
+"url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN "
+"RT#%s\"]]\n"
+"* [[!shortcut name=novellbug "
+"url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
+msgstr ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+"  * Verwendung: `\\[[!debss Paket]]`, `\\[[!debss Paket#Version]]`, or "
+"`\\[[!debss Paket/Version]]`.  Details unter http://snapshot.debian.net.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug "
+"url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" "
+"desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist "
+"url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" "
+"desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug "
+"url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug "
+"#%s\"]]\n"
+"* [[!shortcut name=linuxbug "
+"url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug "
+"#%s\"]]\n"
+"* [[!shortcut name=mozbug "
+"url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug "
+"#%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" "
+"desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" "
+"desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan "
+"url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan "
+"url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC "
+"%s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki "
+"url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki "
+"url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict "
+"url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg "
+"url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc "
+"url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois "
+"url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve "
+"url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt "
+"url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN "
+"RT#%s\"]]\n"
+"* [[!shortcut name=novellbug "
+"url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
+"\"%s\" is replaced with the text passed to the named shortcut, after "
+"[[!wikipedia url_encoding]] it, and '%S' is replaced with the raw, "
+"non-encoded text. The optional `desc` parameter controls the description of "
+"the link."
+msgstr ""
+"Um eine neue Abkürzung hinzuzufügen, verwende die "
+"shortcut-[[Anweisung|ikiwiki/directive]]. "
+"In der URL wird `%s` durch den der Abkürzung übergebenen Text in "
+"URL-Kodierung ersetzt. Außerdem wird `%S` durch den unveränderten Text ersetzt. "
+"Der optionale Parameter  `desc` steuert die Beschriftung der Verknüpfung."
+
+#. type: Plain text
+msgid ""
+"Remember that the `name` you give the shortcut will become a new "
+"[[ikiwiki/directive]].  Avoid using a `name` that conflicts with an existing "
+"directive.  These directives also accept a `desc` parameter that will "
+"override the one provided at definition time."
+msgstr ""
+"Denke daran, dass der angegebene `name` eine neue "
+"[[Anweisung|ikiwiki/directive]] wird.  Deshalb sollte man es vermeiden, "
+"einen Namen zu verwenden, der mit einer bestehenden "
+"[[Anweisung|ikiwiki/directive]] in Konflikt steht. Diese Anweisungen akzeptieren "
+"einen optionalen Parameter `desc`, der statt des Werts aus der Definition "
+"verwendet wird."
+
+#. type: Plain text
+msgid ""
+"If you come up with a shortcut that you think others might find useful, "
+"consider contributing it to the [shortcuts page on the ikiwiki "
+"wiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki "
+"will include your shortcut in the standard underlay."
+msgstr ""
+"Wenn Sie eine Idee für eine Abkürzung haben, die auch andere nützlich "
+"finden könnten, können Sie diese auf der [Abkürzungs-Seite des "
+"ikiwiki-Wiki](http://ikiwiki.info/shortcuts/) eintragen, damit künftige "
+"Versionen von ikiwiki diese Abkürzung standardmäßig zur Verfügung stellen."
+
+
diff --git a/po/underlays/basewiki/templates.de.po b/po/underlays/basewiki/templates.de.po
new file mode 100644
index 000000000..1bc6c7513
--- /dev/null
+++ b/po/underlays/basewiki/templates.de.po
@@ -0,0 +1,256 @@
+# German translation of basewiki/templates page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 15:15+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"This wiki has templates **enabled**.\"\n"
+"else=\"This wiki has templates **disabled**.\"\n"
+"]]\n"
+msgstr ""
+"[[!meta title=\"Vorlagen\"]]\n"
+"[[!if test=\"enabled(template)\"\n"
+"then=\"In diesem Wiki sind Vorlagen **aktiviert**.\"\n"
+"else=\"In diesem Wiki sind Vorlagen **deaktiviert**.\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid ""
+"Templates are files that can be filled out and inserted into pages in the "
+"wiki."
+msgstr ""
+"Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden "
+"können."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid "These templates are available for inclusion onto other pages in this wiki:"
+msgstr ""
+"Diese Vorlagen sind verfügbar und können in andere Seiten dieses "
+"Wikis eingebettet werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+msgstr ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "Using a template"
+msgstr "Verwenden einer Vorlage"
+
+#. type: Plain text
+msgid "Using a template works like this:"
+msgstr "Eine Vorlage kann folgendermaßen verwendet werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
+"note.\"\"\"]]\n"
+msgstr ""
+"\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine "
+"Notiz eingefügt werden soll.\"\"\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This fills out the [[note]] template, filling in the `text` field with the "
+"specified value, and inserts the result into the page."
+msgstr ""
+"Dies verwendet die Vorlage [[note]], wobei das `text`-Feld mit dem "
+"angegebenen Wert gefüllt wird, und fügt das Ergebnis in die Seite ein."
+
+#. type: Plain text
+msgid ""
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
+msgstr ""
+"Ein Wert kann im allgemeinen beliebige Formatierungsanweisungen enthalten, "
+"die im Wiki außerhalb der Vorlage zulässig sind. Durch die Verwendung dreier "
+"Anführungszeichen können sogar Anführungszeichen enthalten sein. In Kombination "
+"mit mehrzeiligen Werten in Anführungszeichen können so große Mengen an "
+"zu formatierendem Text in die Vorlage eingefügt werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 "
+"notes=\"\"\"\n"
+msgstr ""
+"        \\[[!template id=foo name=\"Anna\" color=\"grün\" age=8 "
+"notes=\"\"\"\n"
+
+#. type: Bullet: '        * '
+msgid "\\[[Charley]]'s sister."
+msgstr "\\[[Thomas]] Schwester."
+
+#. type: Bullet: '        * '
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr "\"Ich will ein Astronaut werden, wenn ich erwachsen bin.\""
+
+#. type: Bullet: '        * '
+msgid "Really 8 and a half."
+msgstr "Wirklich achteinhalb."
+
+#. type: Title ##
+#, no-wrap
+msgid "Creating a template"
+msgstr "Erstellen einer Vorlage"
+
+#. type: Plain text
+msgid ""
+"To create a template, simply add a template directive to a page, and the "
+"page will provide a link that can be used to create the template. The "
+"template is a regular wiki page, located in the `templates/` subdirectory "
+"inside the source directory of the wiki."
+msgstr ""
+"Um eine Vorlage zu erstellen, füge einfach die Anweisung  `template` zu "
+"einer Seite hinzu. Diese Seite bietet dann einen Link zur Erstellung der "
+"Vorlage an. Die Vorlage ist eine normale Wiki-Seite, die im Unterverzeichnis "
+"`templates/` des Wiki-Quellverzeichnisses liegt."
+
+#. type: Plain text
+msgid ""
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
+msgstr ""
+"Die Vorlage verwendet die Syntax des Perl-Moduls [[!cpan HTML::Template]], "
+"das die Umsetzung auch komplexer Vorhaben ermöglicht. In seiner Dokumentation "
+"ist die vollständige Syntax beschrieben, zur Verwendung muss man aber nur "
+"das Folgende wirklich wissen:"
+
+#. type: Bullet: '* '
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr ""
+"Jeder Parameter, der der template-Anweisung übergeben wird, erzeugt eine "
+"Variable, die in der Vorlage verwendet werden kann. Es gibt auch einige "
+"vordefinierte Variablen wie PAGE und BASENAME."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
+msgstr ""
+"Um den Wert einer Variable einzufügen, verwende `<TMPL_VAR Variable>`. "
+"Wiki-Formatierung im Wert wird zuvor zu HTML konvertiert werden."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
+msgstr ""
+"Um den unformatierten Wert einer Variable einzufügen, der die unveränderten "
+"Wiki-Formatierungsanweisungen enthält, verwende `<TMPL_VAR raw_Variable>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"NAME=\"variable\">text</TMPL_IF>`."
+msgstr ""
+"Wenn ein Textblock nur dann angezeigt werden soll, wenn eine Variable gesetzt "
+"ist, "
+"verwende `<TMPL_IF NAME=\"Variable\">Text</TMPL_IF>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+"Um einen Textblock anzuzeigen, wenn eine Variable gesetzt ist, und einen "
+"anderen, wenn sie es nicht ist, verwende `<TMPL_IF "
+"NAME=\"Variable\">Text<TMPL_ELSE>anderer Text</TMPL_IF>`."
+
+#. type: Plain text
+msgid "Here's a sample template:"
+msgstr "Hier ist eine Beispiel-Vorlage:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        <span class=\"infobox\">\n"
+"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Age: <TMPL_VAR age><br />\n"
+"        <TMPL_IF NAME=\"color\">\n"
+"        Favorite color: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF NAME=\"notes\">\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+msgstr ""
+"   <span class=\"infobox\">\n"
+"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Alter: <TMPL_VAR age><br />\n"
+"        <TMPL_IF NAME=\"color\">\n"
+"        Lieblingsfarbe: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        Keine Lieblingsfarbe.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF NAME=\"notes\">\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+
+#. type: Plain text
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
+msgstr ""
+"Die ausgefüllte Vorlage wird genauso formatiert wie der Rest der Seite, die "
+"sie enthält, man kann also WikiLinks und alle anderen Arten von "
+"Wiki-Formatierung in der Vorlage verwenden. Zu beachten ist aber, dass "
+"solche WikiLinks nicht als Rückwärts-Links zu der Seite auftauchen, die "
+"die Vorlage verwendet."
+
+#. type: Plain text
+msgid ""
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
+"ensures that if the name contains something that might be mistaken for wiki "
+"markup, it's not converted to html before being processed as a "
+"[[ikiwiki/WikiLink]]."
+msgstr ""
+"Beachte auch die Verwendung von `raw_name` innerhalb des Generators für "
+"den [[ikiwiki/WikiLink]]. Dies stellt sicher, dass der Name nicht nach HTML "
+"konvertiert wird, selbst wenn er etwas enthält, was für eine "
+"Wiki-Formatierungsanweisung gehalten werden könnte, bevor er als "
+"[[ikiwiki/WikiLink]] verarbeitet wird."
+
+
diff --git a/po/underlays/basewiki/templates/note.de.po b/po/underlays/basewiki/templates/note.de.po
new file mode 100644
index 000000000..2aa5aa9d6
--- /dev/null
+++ b/po/underlays/basewiki/templates/note.de.po
@@ -0,0 +1,42 @@
+# German translation of basewiki/templates/note page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-12 20:04+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Use this template to insert a note into a page. The note will be styled to\n"
+"float to the right of other text on the page. This template has one\n"
+"parameter:\n"
+"<ul>\n"
+"<li>`text` - the text to display in the note\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
+msgstr ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Verwende diese Vorlage, um eine Notiz in eine Seite einzufügen. Die Notiz\n"
+"wird rechts vom restlichen Text der Seite schwebend angezeigt werden.\n"
+"Diese Vorlage hat einen Parameter:"
+"<ul>\n"
+"<li>`text` - der Text, der in der Notiz angezeigt werden soll.\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
+
diff --git a/po/underlays/basewiki/templates/popup.de.po b/po/underlays/basewiki/templates/popup.de.po
new file mode 100644
index 000000000..37ba31ff8
--- /dev/null
+++ b/po/underlays/basewiki/templates/popup.de.po
@@ -0,0 +1,59 @@
+# German translation of basewiki/templates/popup page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-12 20:08+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Use this template to create a popup window that is displayed when the "
+"mouse\n"
+"is over part of the page. This template has two parameters:\n"
+"<ul>\n"
+"<li>`mouseover` - This is the text or other content that triggers the\n"
+"popup.\n"
+"<li>`popup` - This should be the content of the popup window. It can be\n"
+"anything, even images or a whole little wiki page, but should not be too\n"
+"large for good usability.\n"
+"</ul>\n"
+"Note that browsers that do not support the CSS will display the popup\n"
+"inline in the page, inside square brackets.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR "
+"popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
+msgstr ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Verwende diese Vorlage, um ein Popup-Fenster anzuzeigen, wenn sich die "
+"Maus\n"
+"über diesem Teil der Seite befindet. Dies Vorlage hat zwei Parameter:\n"
+"<ul>\n"
+"<li>`mouseover` - Dies ist der Text oder andere Inhalt, der das "
+"Popup-Fenster\n"
+"auslöst.\n"
+"<li>`popup` - Dies ist der Inhalt des Popup-Fensters. Er kann beliebig "
+"sein,\n"
+"sogar Bilder oder eine ganze kleine Wiki-Seite. Im Interesse guter "
+"Benutzbarkeit\n"
+"sollte er aber nicht zu groß sein."
+"</ul>\n"
+"Beachte, dass Browser, die CSS nicht unterstützen, das Popup innerhalb\n"
+"der Seite anzeigen, eingerahmt durch eckige Klammern.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR "
+"popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
+
diff --git a/po/underlays/directives/ikiwiki/directive/aggregate.de.po b/po/underlays/directives/ikiwiki/directive/aggregate.de.po
new file mode 100644
index 000000000..518190ade
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/aggregate.de.po
@@ -0,0 +1,189 @@
+# German translation of directives/ikiwiki/directive/aggregate page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:56+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `aggregate` directive is supplied by the [[!iki plugins/aggregate "
+"desc=aggregate]] plugin.  This plugin requires extra setup, specifically, a "
+"cron job. See the plugin's documentation for details."
+msgstr ""
+"Die `aggregate`-Anweisung wird durch die [[!iki plugins/aggregate "
+"desc=aggregate]]-Erweiterung zur Verfügung gestellt. Diese Erweiterung erfordert "
+"zusätzliche Konfiguration, insbesondere einen cron-Job. Für Details siehe die "
+"Dokumentation der Erweiterung."
+
+#. type: Plain text
+msgid ""
+"This directive allows content from other feeds to be aggregated into the "
+"wiki.  Aggregate a feed as follows:"
+msgstr ""
+"Diese Anweisung erlaubt es, Inhalt von anderen Feeds in diesem Wiki "
+"gesammelt zur Verfügung zu stellen. Dies funktioniert wie folgt:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!aggregate name=\"example blog\" dir=\"example\"\n"
+"\tfeedurl=\"http://example.com/index.rss\"\n"
+"\turl=\"http://example.com/\" updateinterval=\"15\"]]\n"
+msgstr ""
+"\t\\[[!aggregate name=\"Beispiel-Blog\" dir=\"beispiel\"\n"
+"\tfeedurl=\"http://beispiel.de/index.rss\"\n"
+"\turl=\"http://beispiel.de/\" updateinterval=\"15\"]]\n"
+
+#. type: Plain text
+msgid ""
+"That example aggregates posts from the specified RSS feed, updating no more "
+"frequently than once every 15 minutes (though possibly less frequently, if "
+"the cron job runs less frequently than that), and puts a page per post under "
+"the example/ directory in the wiki."
+msgstr ""
+"In diesem Beispiel werden Beiträge aus dem angegebenen RSS-Feed "
+"eingesammelt, und zwar nicht öfter als alle 15 Minuten (möglicherweise "
+"aber seltener, wenn der cron-Job seltener läuft), und dann als eine Seite "
+"pro Beitrag im Verzeichnis `beispiel/` des Wikis gespeichert."
+
+#. type: Plain text
+msgid ""
+"You can then use ikiwiki's [[inline]] directive to create a blog of one or "
+"more aggregated feeds. For example:"
+msgstr ""
+"Man kann dann ikiwikis [[inline]]-Anweisun nutzen, um einen Blog aus "
+"einem oder mehreren eingesammelten Feeds zu erstellen. Zum Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"internal(example/*)\"]]\n"
+msgstr "\t\\[[!inline pages=\"internal(beispiel/*)\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Note the use of `internal()` in the [[ikiwiki/PageSpec]] to match aggregated "
+"pages. By default, aggregated pages are internal pages, which prevents them "
+"from showing up directly in the wiki, and so this special [[PageSpec]] is "
+"needed to match them."
+msgstr ""
+"Dabei ist es wichtig, `internal()` in der [[ikiwiki/PageSpec]] zur Erfassung der "
+"eingesammelten Seiten zu verwenden. Diese werden standardmäßig als interne "
+"Seiten gespeichert: Dies verhindert, dass sie direkt im Wiki auftauchen. Deshalb "
+"ist diese spezielle [[ikiwiki/PageSpec]] nötig, um sie zu erfassen."
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Verwendung"
+
+#. type: Plain text
+msgid ""
+"Here are descriptions of all the supported parameters to the `aggregate` "
+"directive:"
+msgstr ""
+"Hier die Beschreibung aller unterstützter Parameter der "
+"`aggregate`-Anweisung:"
+
+#. type: Bullet: '* '
+msgid "`name` - A name for the feed. Each feed must have a unique name.  Required."
+msgstr ""
+"`name` - Ein Name für den Feed. Jeder Feed muss einen nur einmal vergebenen "
+"Namen haben. Erforderlich."
+
+#. type: Bullet: '* '
+msgid ""
+"`url` - The url to the web page for the feed that's being aggregated.  "
+"Required."
+msgstr ""
+"`url` - Die URL mit der Webseite des Feeds, der eingesammelt werden soll. "
+"Erforderlich."
+
+#. type: Bullet: '* '
+msgid ""
+"`dir` - The directory in the wiki where pages should be saved. Optional, if "
+"not specified, the directory is based on the name of the feed."
+msgstr ""
+"`dir` - Das Verzeichnis im Wiki, in dem die Seiten gespeichert werden sollen. "
+"Optional, wenn nicht angegeben, wird der Verzeichnisname vom Namen des Feeds "
+"abgeleitet."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedurl` - The url to the feed. Optional, if it's not specified ikiwiki "
+"will look for feeds on the `url`. RSS and atom feeds are supported."
+msgstr ""
+"`feedurl` - Die URL des Feeds. Optional, wenn nicht angegeben, sucht ikiwiki in "
+"unter der `url` nach feeds. Unterstützt werden RSS- und Atom-Feeds."
+
+#. type: Bullet: '* '
+msgid ""
+"`updateinterval` - How often to check for new posts, in minutes. Default is "
+"15 minutes."
+msgstr ""
+"`updateinterval` - Wie oft nach neuen Beiträgen geschaut werden soll. "
+"Voreingestellt sind 15 Minuten."
+
+#. type: Bullet: '* '
+msgid ""
+"`expireage` - Expire old items from this feed if they are older than a "
+"specified number of days. Default is to never expire on age."
+msgstr ""
+"`expireage` - Entferne alte Einträge aus diesem Feed, wenn sie älter sind als "
+"die angegebene Anzahl von Tagen. Voreingestellt ist, niemals Einträge aufgrund "
+"ihres Alters zu entfernen."
+
+#. type: Bullet: '* '
+msgid ""
+"`expirecount` - Expire old items from this feed if there are more than the "
+"specified number total. Oldest items will be expired first. Default is to "
+"never expire on count."
+msgstr ""
+"`expirecount` - Entferne alte Einträge aus diesem Feed, wenn es insgesamt mehr "
+"als die angegebene Anzahl von Beiträgen gibt. Die ältesten Einträge werden "
+"zuerst entfernt. Voreingestellt ist, niemals Einträge aufgrund der Anzahl zu "
+"entfernen."
+
+#. type: Bullet: '* '
+msgid ""
+"`tag` - A tag to tag each post from the feed with. A good tag to use is the "
+"name of the feed. Can be repeated multiple times. The [[tag]] plugin must be "
+"enabled for this to work."
+msgstr ""
+"`tag` - Ein Tag, mit dem alle Beiträge dieses Feeds versehen werden. Gut eignet "
+"sich der Name des Feeds. Kann mehrmals angegeben werden. Die [[tag]]-Erweiterung "
+"muss "
+"aktiviert sein, damit dies funktioniert."
+
+#. type: Bullet: '* '
+msgid ""
+"`template` - Template to use for creating the aggregated pages. Defaults to "
+"aggregatepost."
+msgstr ""
+"`template` - Vorlage, die bei der Erstellung der eingesammelten Seiten verwendet "
+"wird. Voreingestellt ist `aggregatepost`."
+
+#. type: Plain text
+msgid ""
+"Note that even if you are using subversion or another revision control "
+"system, pages created by aggregation will *not* be checked into revision "
+"control."
+msgstr ""
+"Dabei ist zu beachten, dass die beim Einsammeln erstellten Seiten nicht in der "
+"Versionsverwaltung registriert werden, selbst wenn subversion oder ein "
+"anderes solches System verwendet wird."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po b/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po
new file mode 100644
index 000000000..ff258a562
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po
@@ -0,0 +1,57 @@
+# German translation of directives/ikiwiki/directive/brokenlinks page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:57+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `brokenlinks` directive is supplied by the [[!iki plugins/brokenlinks "
+"desc=brokenlinks]] plugin."
+msgstr ""
+"Die `brokenlinks`-Anweisung wird durch die [[!iki plugins/brokenlinks "
+"desc=brokenlinks]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive generates a list of broken links on pages in the wiki. This "
+"is a useful way to find pages that still need to be written, or links that "
+"are written wrong."
+msgstr ""
+"Diese Anweisung erzeugt eine Liste aller defekter Links im Wiki. Dies ist "
+"ein nützlicher Weg zu erfahren, welche Seiten noch geschrieben werden "
+"müssen und welche Links Fehler enthalten."
+
+#. type: Plain text
+msgid ""
+"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying "
+"the pages to search for broken links, default is search them all."
+msgstr ""
+"Der optionale Parameter `pages` kann eine [[ikiwiki/PageSpec]] enthalten, "
+"die angibt welche Seiten nach defekten Links durchsucht werden sollen. "
+"Standardmäßig werden alle durchsucht."
+
+#. type: Plain text
+msgid "Example:"
+msgstr "Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n"
+msgstr "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.de.po b/po/underlays/directives/ikiwiki/directive/calendar.de.po
new file mode 100644
index 000000000..5c6868e18
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/calendar.de.po
@@ -0,0 +1,183 @@
+# German translation of directives/ikiwiki/directive/calendar page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:57+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `calendar` directive is supplied by the [[!iki plugins/calendar "
+"desc=calendar]] plugin."
+msgstr ""
+"Die `calendar`-Anweisung wird durch die [[!iki plugins/calendar "
+"desc=calendar]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive displays a calendar, similar to the typical calendars shown "
+"on some blogs."
+msgstr ""
+"Diese Anweisung zeigt einen Kalender, ähnlich denen, die auf manchen Blogs "
+"angezeigt werden."
+
+#. type: Title #
+#, no-wrap
+msgid "examples"
+msgstr "Beispiele"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!calendar ]]\n"
+msgstr "\t\\[[!calendar ]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n"
+msgstr "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and "
+"!*/Discussion\"]]\n"
+msgstr ""
+"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and "
+"!*/Discussion\"]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "setup"
+msgstr "Einrichtung"
+
+#. type: Plain text
+msgid ""
+"The calendar is essentially a fancy front end to archives of previous pages, "
+"usually used for blogs. It can produce a calendar for a given month, or a "
+"list of months for a given year. The month format calendar simply links to "
+"any page posted on each day of the month. The year format calendar links to "
+"archive pages, with names like `archives/2007` (for all of 2007)  and "
+"`archives/2007/01` (for January, 2007)."
+msgstr ""
+"Der Kalender ist im Wesentlichen eine schicke Schnittstelle zu einem Archiv mit "
+"früheren Seiten und wird normalerweise für Blogs verwendet. Er kann einen "
+"Kalender für einen angegebenen Monat erzeugen, oder eine Liste der Monate eines "
+"angegebenen Jahres. Der Kalender im Jahresformat enthält einfach Links zu den "
+"Archivseiten mit Namen wie `archiv/2007` (für ganz 2007) und `archiv/2007/01` "
+"(für Januar 2007)."
+
+#. type: Plain text
+msgid ""
+"While you can insert calendar directives anywhere on your wiki, including in "
+"the sidebar, you'll also need to create these archive pages. They typically "
+"use this directive to display a calendar, and also use [[inline]] to display "
+"or list pages created in the given time frame."
+msgstr ""
+"Während `calendar`-Anweisungen überall im Wiki verwendet werden können, auch in "
+"der Sidebar, muss man auch die Archiv-Seiten anlegen. Dort wird typischerweise "
+"diese Anweisung verwendet, um einen Kalender anzuzeigen, und außerdem die Seiten "
+"aus dem entsprechenden Zeitraum über [[inline]] eingebunden."
+
+#. type: Plain text
+msgid ""
+"The `ikiwiki-calendar` command can be used to automatically generate the "
+"archive pages. It also refreshes the wiki, updating the calendars to "
+"highlight the current day. This command is typically run at midnight from "
+"cron. An example crontab:"
+msgstr ""
+"Der `ikiwiki-calendar`-Befehl kann verwendet werden, um die Archivseiten "
+"automatisch zu erzeugen. Es aktualisiert auch das Wiki und hebt in den Kalendern "
+"den aktuellen Tag hervor. Dieser Befehl wird typischerweise um Mitternacht von "
+"cron ausgeführt, beispielsweise durch folgenden crontab-Eintrag:"
+
+#. type: Plain text
+msgid "An example crontab:"
+msgstr "Ein Beispiel-Eintrag in crontab:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n"
+msgstr ""
+"\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Verwendung"
+
+#. type: Bullet: '* '
+msgid ""
+"`type` - Used to specify the type of calendar wanted. Can be one of "
+"\"month\" or \"year\". The default is a month view calendar."
+msgstr ""
+"`type` - Hiermit wird die Art des zu erzeugenden Kalenders angegeben. Kann "
+"entweder \"month\" oder \"year\" sein. Vorgeingestellt ist die Monatsansicht."
+
+#. type: Bullet: '* '
+msgid ""
+"`pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the "
+"month calendar. Defaults to \"*\"."
+msgstr ""
+"`pages` - Gibt die [[ikiwiki/PageSpec]] der Seiten an, auf die aus dem "
+"Monatskalender verwiesen werden soll. Voreingestellt ist \"*\"."
+
+#. type: Bullet: '* '
+msgid ""
+"`archivebase` - Configures the base of the archives hierarchy. The default "
+"is \"archives\". Note that this default can also be overridden for the whole "
+"wiki by setting `archivebase` in ikiwiki's setup file."
+msgstr ""
+"`archivebase` - Konfiguriert die Basis der Archiv-Hierarchie. Voreingestellt ist "
+"\"archives\". Dies kann auch für das gesamte Wiki geändert werden, indem "
+"`archivebase` in der Setup-Datei von ikiwiki gesetzt wird."
+
+#. type: Bullet: '* '
+msgid ""
+"`year` - The year for which the calendar is requested. Defaults to the "
+"current year."
+msgstr ""
+"`year` - Das Jahr, für das der Kalender angezeigt werden soll. Voreingestellt ist "
+"das aktuelle Jahr."
+
+#. type: Bullet: '* '
+msgid ""
+"`month` - The numeric month for which the calendar is requested, in the "
+"range 1..12. Used only for the month view calendar, and defaults to the "
+"current month."
+msgstr ""
+"`month` - Der Monat, für den der Kalender angezeigt werden soll, als Zahl von 1 "
+"bis 12. Wird nur für Monatskalender verwendet. Voreingestellt ist der aktuelle "
+"Monat."
+
+#. type: Bullet: '* '
+msgid ""
+"`week_start_day` - A number, in the range 0..6, which represents the day of "
+"the week that the month calendar starts with. 0 is Sunday, 1 is Monday, and "
+"so on. Defaults to 0, which is Sunday."
+msgstr ""
+"`week_start_day` - Eine Zahl aus dem Bereich 0 bis 6, die den Wochentag angibt, "
+"mit dem ein Monatskalender anfängt. 0 ist Sonntag, 1 ist Montag, und so weiter. "
+"Voreingestellt ist 0, also Sonntag."
+
+#. type: Bullet: '* '
+msgid ""
+"`months_per_row` - In the annual calendar, number of months to place in each "
+"row. Defaults to 3."
+msgstr ""
+"`months_per_row` - Anzahl der Monate, die in einem Jahreskalender in einer Zeile "
+"platziert werden. Voreingestellt ist 3."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/color.de.po b/po/underlays/directives/ikiwiki/directive/color.de.po
new file mode 100644
index 000000000..1cc36f8ee
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/color.de.po
@@ -0,0 +1,97 @@
+# German translation of directives/ikiwiki/directive/color page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:58+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `color` directive is supplied by the [[!iki plugins/color desc=color]] "
+"plugin."
+msgstr ""
+"Die `color`-Anweisung wird durch die [[!iki plugins/color "
+"desc=color]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive can be used to color a piece of text on a page.  It can be "
+"used to set the foreground and/or background color of the text."
+msgstr ""
+"Diese Anweisung kann verwendet werden, um ein Stück Text auf einer Seite zu "
+"färben. Sie kann die Schrift- und/oder Hintergrundfarbe verändern."
+
+#. type: Plain text
+msgid ""
+"You can use a color name (e.g. `white`) or HTML code (e.g. `#ffffff`)  to "
+"define colors."
+msgstr ""
+"Man kann einen Farbnamen (z.B. `white`) oder HTML-Code (z.B. `#ffffff`) "
+"verwenden, um eine Farbe zu definieren."
+
+#. type: Title ##
+#, no-wrap
+msgid "examples"
+msgstr "Beispiele"
+
+#. type: Plain text
+msgid ""
+"Here the foreground color is defined as a word, while the background color "
+"is defined as a HTML color code:"
+msgstr ""
+"Hier wird die Schriftfarbe durch ein Wort und die Hintergrundfarbe durch eine "
+"HTML-Farbe definiert:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!color foreground=white background=#ff0000 text=\"White text on red "
+"background\"]]\n"
+msgstr ""
+"\t\\[[!color foreground=white background=#ff0000 text=\"Weißer Text auf rotem "
+"Hintergrund\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The background color is missing, so the text is displayed on default "
+"background:"
+msgstr ""
+"Die Hintergrundfarbe fehlt, also wird der Text auf dem Standardhintergrund "
+"dargestellt:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!color foreground=white text=\"White text on default color "
+"background\"]]\n"
+msgstr ""
+"\t\\[[!color foreground=white text=\"Weißer Text auf Hintergrund in "
+"Standardfarbe\"]]\n"
+
+#. type: Plain text
+msgid "The foreground is missing, so the text has the default foreground color:"
+msgstr "Die Schriftfarbe fehlt, also wird hierfür die Standardfarbe verwendet:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!color background=#ff0000 text=\"Default color text on red "
+"background\"]]\n"
+msgstr ""
+"\t\\[[!color background=#ff0000 text=\"Schrift in Standardfarbe auf rotem "
+"Hintergrund\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/comment.de.po b/po/underlays/directives/ikiwiki/directive/comment.de.po
new file mode 100644
index 000000000..70d0d7d50
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/comment.de.po
@@ -0,0 +1,133 @@
+# German translation of directives/ikiwiki/directive/comment page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:58+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `comment` directive is supplied by the [[!iki plugins/comments "
+"desc=comments]] plugin, and is used to add a comment to a page. Typically, "
+"the directive is the only thing on a comment page, and is filled out by the "
+"comment plugin when a user posts a comment."
+msgstr ""
+"Die `comment`-Anweisung wird durch die [[!iki plugins/comments "
+"desc=comments]]-Erweiterung bereitgestellt, und wird zum Hinzufügen von "
+"Kommentaren zu einer Seite verwendet. Typischerweise ist diese Anweisung "
+"das Einzige auf einer Kommentarseite, und wird von der comment-Erweiterung "
+"ausgefüllt, wenn ein Benutzer einen Kommentar veröffentlicht."
+
+#. type: Plain text
+msgid "Example:"
+msgstr "Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!comment format=mdwn\n"
+"\tusername=\"foo\"\n"
+"\tsubject=\"Bar\"\n"
+"\tdate=\"2009-06-02T19:05:01Z\"\n"
+"\tcontent=\"\"\"\n"
+msgstr ""
+"\t\\[[!comment format=mdwn\n"
+"\tusername=\"foo\"\n"
+"\tsubject=\"Bar\"\n"
+"\tdate=\"2009-06-02T19:05:01Z\"\n"
+"\tcontent=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tBlah blah.\n"
+"\t\"\"\"\n"
+msgstr ""
+"\tBla bla.\n"
+"\t\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t]]\n"
+msgstr "\t]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Verwendung"
+
+#. type: Plain text
+msgid ""
+"The only required parameter is `content`, the others just add or override "
+"metadata of the comment."
+msgstr ""
+"Der einzige erforderliche Parameter ist `content`, die übrigen fügen nur "
+"Metadaten zu dem Kommentar hinzu oder ändern diese."
+
+#. type: Bullet: '* '
+msgid ""
+"`content` - Text to display for the comment.  Note that "
+"[[directives|ikiwiki/directive]] may not be allowed, depending on the "
+"configuration of the comment plugin."
+msgstr ""
+"`content` - Text, der in diesem Kommentar angezeigt werden soll. "
+"[[Anweisungen|ikiwiki/directive]] sind hier unter Umständen nicht erlaubt, "
+"abhängig von der Konfiguration der comment-Erweiterung."
+
+#. type: Bullet: '* '
+msgid "`format` - Specifies the markup used for the content."
+msgstr ""
+"`format` - Gibt die Formatierungssprache an, die für den Inhalt verwendet "
+"wird."
+
+#. type: Bullet: '* '
+msgid "`subject` - Subject for the comment."
+msgstr "`subject` - Betreff des Kommentars."
+
+#. type: Bullet: '* '
+msgid ""
+"`date` - Date the comment was posted. Can be entered in nearly any format, "
+"since it's parsed by [[!cpan TimeDate]]"
+msgstr ""
+"`date` - Datum, an dem der Kommentar veröffentlicht wurde. Kann in beinahe "
+"beliebigem Format angegeben werden, da es von [[!cpan TimeDate]] "
+"ausgewertet wird."
+
+#. type: Bullet: '* '
+msgid ""
+"`username` - Used to record the username (or OpenID)  of a logged in "
+"commenter."
+msgstr ""
+"`username` - Hier wird der Benutzername (oder die OpenID) eines "
+"angemeldeten Kommentators gespeichert."
+
+#. type: Bullet: '* '
+msgid ""
+"`ip` - Can be used to record the IP address of a commenter, if they posted "
+"anonymously."
+msgstr ""
+"`ip` - Hier kann die IP-Adresse eines Kommentators gespeichert werden, wenn "
+"der Kommentar anonym abgegeben wurde."
+
+#. type: Bullet: '* '
+msgid ""
+"`claimedauthor` - Records the name that the user entered, if anonymous "
+"commenters are allowed to enter their (unverified)  name."
+msgstr ""
+"`claimedauthor` - Speichert den Namen, den der Benutzer angegeben hat, wenn "
+"anonyme Kommentatoren ihren (nicht verifizierten) Namen angeben dürfen."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/copy.de.po b/po/underlays/directives/ikiwiki/directive/copy.de.po
new file mode 100644
index 000000000..33f902da8
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/copy.de.po
@@ -0,0 +1,25 @@
+# German translation of directives/ikiwiki/directive/copy page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-12 22:05+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
diff --git a/po/underlays/directives/ikiwiki/directive/cut.de.po b/po/underlays/directives/ikiwiki/directive/cut.de.po
new file mode 100644
index 000000000..33f902da8
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/cut.de.po
@@ -0,0 +1,25 @@
+# German translation of directives/ikiwiki/directive/copy page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-12 22:05+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
diff --git a/po/underlays/directives/ikiwiki/directive/cutpaste.de.po b/po/underlays/directives/ikiwiki/directive/cutpaste.de.po
new file mode 100644
index 000000000..ff3503ed5
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/cutpaste.de.po
@@ -0,0 +1,153 @@
+# German translation of directives/ikiwiki/directive/cutpaste page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:59+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `copy`, `cut` and `paste` directives are supplied by the [[!iki "
+"plugins/cutpaste desc=cutpaste]] plugin."
+msgstr ""
+"Die `copy`- `cut`- und `paste`-Anweisungen werden durch die [[!iki "
+"plugins/cutpaste desc=cutpaste]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid "With these directives you can store and recall pieces of text in a page:"
+msgstr ""
+"Mit diesen Anweisungen kann man Textabschnitte innerhalb einer Seite "
+"speichern und wieder abrufen:"
+
+#. type: Bullet: ' * '
+msgid ""
+"`\\[[!cut id=name text=\"text\"]]` memorizes the text allowing to recall it "
+"using the given ID.  The text being cut is not included in the output."
+msgstr ""
+"`\\[[!cut id=name text=\"text\"]]` merkt sich den Text und erlaubt es, ihn "
+"über die angegebene id wieder abzurufen. Der Text taucht an dieser Stelle "
+"nicht in der Ausgabe auf."
+
+#. type: Bullet: ' * '
+msgid ""
+"`\\[[!copy id=name text=\"text\"]]` memorizes the text allowing to recall it "
+"using the given ID.  The text being cut *is* included in the output."
+msgstr ""
+"`\\[[!copy id=name text=\"text\"]]` merkt sich den Text und erlaubt es, ihn "
+"über die angegebene id wieder abzurufen. Der Text *wird* an dieser Stelle "
+"ausgegeben."
+
+#. type: Bullet: ' * '
+msgid "`\\[[!paste id=name]]` is replaced by the previously memorized text."
+msgstr "`\\[[!paste id=name]]` wird durch den zuvor gemerkten Text ersetzt."
+
+#. type: Plain text
+msgid ""
+"The text being cut, copied and pasted can freely include wiki markup, "
+"including more calls to cut, copy and paste."
+msgstr ""
+"Der ausgeschnittene, kopierte und eingefügte Text kann beliebige "
+"Wiki-Formatierungsanweisungen enthalten, inklusive weiterer Aufrufe von "
+"`cut`, `copy` und `paste`."
+
+#. type: Plain text
+msgid ""
+"You do not need to memorize the text before using it: a cut directive can "
+"follow the paste directive that uses its text.  In fact, this is quite "
+"useful to postpone big blocks of text like long annotations and have a more "
+"natural flow.  For example:"
+msgstr ""
+"Man muss sich einen Text nicht vor seiner Verwendung merken: Eine "
+"`cut`-Anweisung kann auch erst nach der `paste`-Anweisung kommen, die ihren "
+"Text verwendet. Dies ist ein durchaus nützlich, um größere Blöcke von Text "
+"wie lange Anmerkungen erst später anzugeben und so für einen natürlicheren "
+"Textfluss zu sorgen. Zum Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!toggleable id=\"cut\" text=\"[[!paste id=cutlongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"copy\" text=\"[[!paste id=copylongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"paste\" text=\"[[!paste id=pastelongdesc]]\"]]\n"
+msgstr ""
+"\t\\[[!toggleable id=\"cut\" text=\"[[!paste id=beschreibungcut]]\"]]\n"
+"\t\\[[!toggleable id=\"copy\" text=\"[[!paste id=beschreibungcopy]]\"]]\n"
+"\t\\[[!toggleable id=\"paste\" text=\"[[!paste id=beschreibungpaste]]\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t[...some time later...]\n"
+msgstr "\t[&hellip; und später &hellip;]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!cut id=cutlongdesc text=\"\"\"\n"
+msgstr "\t\\[[!cut id=beschreibungcut text=\"\"\"\n"
+
+#. type: Plain text
+#:
+#, no-wrap
+msgid "\t   blah blah blah\n"
+msgstr "\t   bla bla bla\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!cut id=copylongdesc text=\"\"\"\n"
+msgstr "\t\\[[!cut id=beschreibungcopy text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!cut id=pastelongdesc text=\"\"\"\n"
+msgstr "\t\\[[!cut id=beschreibungpaste text=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"This can potentially be used to create loops, but ikiwiki is clever and "
+"breaks them."
+msgstr ""
+"Auf diese Weise können möglicherweise Schleifen erzeugt werden, aber ikiwiki "
+"ist schlau und bricht diese auf."
+
+#. type: Plain text
+msgid ""
+"Since you can paste without using double quotes, copy and paste can be used "
+"to nest directives that require multiline parameters inside each other:"
+msgstr ""
+"Da man `paste` ohne Anführungszeichen verwenden kann, können mit `copy` und "
+"`paste` Anweisungen ineinander geschachtelt werden, die mehrzeilige Parameter "
+"benötigen:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toggleable id=foo text=\"\"\"\n"
+msgstr "\t\\[[!toggleable id=foo text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t  [[!toggleable id=bar text=\"[[!paste id=baz]]\"]]\n"
+msgstr "\t  [[!toggleable id=bar text=\"[[!paste id=baz]]\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!cut id=baz text=\"\"\"\n"
+msgstr "\t\\[[!cut id=baz text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tmultiline parameter!\n"
+msgstr "\tmehrzeiliger Parameter!\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/date.de.po b/po/underlays/directives/ikiwiki/directive/date.de.po
new file mode 100644
index 000000000..7baa1b3a4
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/date.de.po
@@ -0,0 +1,64 @@
+# German translation of directives/ikiwiki/directive/date page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:59+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `date` directive is supplied by the [[!iki plugins/date desc=date]] "
+"plugin."
+msgstr ""
+"Die `date`-Anweisung wird durch die [[!iki plugins/date desc=date]]-Erweiterung "
+"bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive can be used to display a date on a page, using the same "
+"display method that is used to display the modification date in the page "
+"footer, and other dates in the wiki. This can be useful for consistency of "
+"display, or if you want to embed parseable dates into the page source."
+msgstr ""
+"Diese Anweisung kann verwendet werden, um ein Datum auf einer Seite anzuzeigen, "
+"und verwendet dieselbe Methode, die auch zur Anzeige des Datums der letzten "
+"Änderung im Seitenfuß und anderer Daten im Wiki verwendet wird. Dies ist "
+"nützlich für die Konsistenz der Ausgabe, oder wenn der Seitenquelltext ein "
+"maschinenlesbares Datum enthalten soll."
+
+#. type: Plain text
+msgid ""
+"Like the dates used by the [[meta]] directive, the date can be entered in "
+"nearly any format, since it's parsed by [[!cpan TimeDate]]."
+msgstr ""
+"Wie auch in der [[meta]]-Anweisung kann das Datum in nahezu beliebigem Format "
+"angegeben werden, da es durch [[!cpan TimeDate]] interpretiert wird."
+
+#. type: Plain text
+msgid ""
+"For example, an update to a page with an embedded date stamp could look "
+"like:"
+msgstr ""
+"Zum Beispiel könnte eine Seite mit eingebettetem Zeitstempel folgendermaßen "
+"aussehen:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tUpdated \\[[!date \"Wed, 25 Nov 2009 01:11:55 -0500\"]]: mumble mumble\n"
+msgstr ""
+"\tAktualisiert \\[[!date \"Wed, 25 Nov 2009 01:11:55 -0500\"]]: murmel murmel\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/edittemplate.de.po b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po
new file mode 100644
index 000000000..f47140c09
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po
@@ -0,0 +1,99 @@
+# German translation of directives/ikiwiki/directive/edittemplate page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 13:59+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate "
+"desc=edittemplate]] plugin."
+msgstr ""
+"Die `edittemplate`-Anweisung wird durch die [[!iki plugins/edittemplate "
+"desc=edittemplate]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows registering template pages, that provide default "
+"content for new pages created using the web frontend. To register a "
+"template, insert a [[ikiwiki/directive/template]] directive on some other "
+"page."
+msgstr ""
+"Diese Anweisung erlaubt es, Vorlagen-Seiten zu registrieren, die einen "
+"Standardinhalt für neue Seiten bereitstellen, die über das Webfrontend "
+"angelegt werden. Um eine Vorlage zu registrieren, fügt man eine "
+"[[ikiwiki/directive/template]]-Anweisung auf einer anderen Seite ein."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!edittemplate template=\"bugtemplate\" match=\"bugs/*\"]]\n"
+msgstr "\t\\[[!edittemplate template=\"bugtemplate\" match=\"bugs/*\"]]\n"
+
+#. type: Plain text
+msgid ""
+"In the above example, the page named \"bugtemplate\" is registered as a "
+"template to be used when any page named \"bugs/*\" is created. To avoid the "
+"directive displaying a note about the template being registered, add "
+"\"silent=yes\"."
+msgstr ""
+"Im obigen Beispiel wird die Seite mit Namen \"bugtemplate\" für alle Seiten "
+"als Vorlage registriert, die mit Namen \"bugs/*\" angelegt werden. Um den "
+"Hinweis über die Registrierung der Vorlage zu unterdrücken, kann man "
+"`silent=yes` hinzufügen."
+
+#. type: Plain text
+msgid ""
+"Often the template page contains a simple skeleton for a particular type of "
+"page. For the bug report pages in the above example, it might look something "
+"like:"
+msgstr ""
+"Oft enthält eine Vorlagen-Seite ein einfaches Skelett für einen bestimmten "
+"Seitentyp. Für die Fehlerberichte aus dem obigen Beispiel könnte sie "
+"folgendermaßen aussehen:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tPackage: \n"
+"\tVersion: \n"
+"\tReproducible: y/n\n"
+"\tDetails:\n"
+msgstr ""
+"\tPaket: \n"
+"\tVersion: \n"
+"\tReproduzierbar: ja/nein\n"
+"\tDetails:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"The template page can also contain [[!cpan HTML::Template]] directives,\n"
+"similar to other ikiwiki [[templates]]. Currently only one variable is\n"
+"set: `<TMPL_VAR name>` is replaced with the name of the page being\n"
+"created.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"It's generally not a good idea to put the `edittemplate` directive in the "
+"template page itself, since the directive would then be included as part of "
+"the template on new pages, which would then in turn be registered as "
+"templates. If multiple pages are registered as templates for a new page, an "
+"arbitrary one is chosen, so that could get confusing."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/format.de.po b/po/underlays/directives/ikiwiki/directive/format.de.po
new file mode 100644
index 000000000..2db9e5af6
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/format.de.po
@@ -0,0 +1,93 @@
+# German translation of directives/ikiwiki/directive/format page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:00+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `format` directive is supplied by the [[!iki plugins/format "
+"desc=format]] plugin."
+msgstr ""
+"Die `format`-Anweisung wird durch die [[!iki plugins/format "
+"desc=format]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"The directive allows formatting a chunk of text using any available page "
+"format. It takes two parameters. First is the type of format to use, ie the "
+"extension that would be used for a standalone file of this type.  Second is "
+"the text to format."
+msgstr ""
+"Die Anweisung erlaubt es, einen Textabschnitt mit einem beliebigen "
+"Seitenformat zu formatieren. Sie hat zwei Parameter. Der erste ist das zu "
+"verwendende Seitenformat &ndash; also die Erweiterung, die für eine "
+"eigenständige Seite dieses Typs verwendet würde. Der zweite ist der zu "
+"formatierende Text."
+
+#. type: Plain text
+msgid ""
+"For example, this will embed an otl outline inside a page using mdwn or some "
+"other format:"
+msgstr ""
+"Zum Beispiel bettet dies eine otl-Gliederung in eine Seite ein, die mdwn "
+"oder ein anderes Format verwendet:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!format otl \"\"\"\n"
+msgstr "\t\\[[!format otl \"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tfoo\n"
+"\t\t1\n"
+"\t\t2\n"
+"\tbar\n"
+"\t\t3\n"
+"\t\t4\n"
+msgstr ""
+"\tfoo\n"
+"\t\t1\n"
+"\t\t2\n"
+"\tbar\n"
+"\t\t3\n"
+"\t\t4\n"
+
+#. type: Plain text
+msgid ""
+"Note that if the highlight plugin is enabled, this directive can also be "
+"used to display syntax highlighted code. Many languages and formats are "
+"supported. For example:"
+msgstr ""
+"Wenn die highlight-Erweiterung installiert ist, kann diese Anweisung auch "
+"zur "
+"Anzeige von Programmcode mit Syntaxhervorhebung verwendet werden. Viele "
+"Sprachen und Formate werden unterstützt. Zum Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!format perl \"\"\"\n"
+msgstr "\t\\[[!format perl \"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tprint \"hello, world\\n\";\n"
+msgstr "\tprint \"hello, world\\n\";\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/fortune.de.po b/po/underlays/directives/ikiwiki/directive/fortune.de.po
new file mode 100644
index 000000000..89cdf84aa
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/fortune.de.po
@@ -0,0 +1,42 @@
+# German translation of directives/ikiwiki/directive/fortune page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:00+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `fortune` directive is supplied by the [[!iki plugins/fortune "
+"desc=fortune]] plugin."
+msgstr ""
+"Die `fortune`-Anweisung wird durch die [[!iki plugins/fortune "
+"desc=fortune]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This just uses the `fortune` program to insert a fortune cookie into the "
+"page.  Usage:"
+msgstr ""
+"Sie verwendet einfach das Programm `fortune`, um einen Spruch (engl. "
+"*fortune cookie*) in die Seite einzubinden. Verwendung:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!fortune ]]\n"
+msgstr "\t\\[[!fortune ]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/graph.de.po b/po/underlays/directives/ikiwiki/directive/graph.de.po
new file mode 100644
index 000000000..4f9d6a346
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/graph.de.po
@@ -0,0 +1,88 @@
+# German translation of directives/ikiwiki/directive/graph page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:01+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `graph` directive is supplied by the [[!iki plugins/graphviz "
+"desc=graphviz]] plugin."
+msgstr ""
+"Die `graph`-Anweisung wird durch die [[!iki plugins/graphviz "
+"desc=graphviz]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows embedding [graphviz](http://www.graphviz.org/) graphs "
+"in a page.  Example usage:"
+msgstr ""
+"Diese Anweisung erlaubt es, von [graphviz](http://www.graphviz.org/) "
+"erzeugte Graphen in eine Seite einzubinden. Verwendungsbeispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!graph src=\"a -> b -> c; a -> c;\"]]\n"
+msgstr "\t\\[[!graph src=\"a -> b -> c; a -> c;\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Note that graphs will only show up in previews if your browser has "
+"[[!wikipedia data: URI]] support, or if the same graph already exists on "
+"that page."
+msgstr ""
+"Zu beachten ist, dass der Graph nur dann in der Vorschau auftaucht, wenn der "
+"verwendete Browser [[!wikipedia data: URI]] unterstützt, oder wenn derselbe "
+"Graph bereits auf der Seite existiert."
+
+#. type: Plain text
+msgid "The `graph` directive supports the following parameters:"
+msgstr "Die `graph`-Anweisung unterstützt die folgenden Parameter:"
+
+#. type: Bullet: '- '
+msgid "`src` - The graphviz source to render."
+msgstr "`src` - Der graphviz-Quelltext des zu erzeugenden Graphen."
+
+#. type: Bullet: '- '
+msgid ""
+"`type` - The type of graph to render: `graph` or `digraph`.  Defaults to "
+"`digraph`."
+msgstr ""
+"`type` - Die Art des zu erzeugenden Graphen: `graph` oder `digraph`. "
+"Voreingestellt ist `digraph`."
+
+#. type: Bullet: '- '
+msgid ""
+"`prog` - The graphviz program to render with: `dot`, `neato`, `fdp`, "
+"`twopi`, or `circo`.  Defaults to `dot`."
+msgstr ""
+"`prog` - Das graphviz-Programm, mit dem der Graph erzeugt werden soll: "
+"`dot`, `neato`, `fdp`, "
+"`twopi` oder `circo`.  Voreingestellt ist `dot`."
+
+#. type: Bullet: '- '
+msgid ""
+"`height`, `width` - Limit the size of the graph to a given height and width, "
+"in inches. You must specify both to limit the size; otherwise, graphviz will "
+"choose a size, without any limit."
+msgstr ""
+"`height`, `width` - Begrenzt die Größe des erzeugten Graphen durch die in "
+"Inch angegebene Höhe und Breite. Es müssen beide angegeben werden, um die "
+"Größe zu beschränken, graphviz sucht sich sonst selbst eine Größe aus, ohne "
+"jede Beschränkung."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/haiku.de.po b/po/underlays/directives/ikiwiki/directive/haiku.de.po
new file mode 100644
index 000000000..7923a1395
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/haiku.de.po
@@ -0,0 +1,60 @@
+# German translation of directives/ikiwiki/directive/haiku page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:01+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `haiku` directive is supplied by the [[!iki plugins/haiku desc=haiku]] "
+"plugin."
+msgstr ""
+"Die `haiku`-Anweisung wird durch die [[!iki plugins/haiku "
+"desc=haiku]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows inserting a randomly generated haiku into a wiki "
+"page.  Just type:"
+msgstr ""
+"Diese Anweisung erlaubt es, ein zufällig erzeugtes Haiku in eine Wiki-Seite "
+"einzufügen. Dafür genügt:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!haiku hint=\"argument\"]]\n"
+msgstr "\t\\[[!haiku hint=\"argument\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!haiku hint=\"argument test\"]]\n"
+msgstr "[[!haiku hint=\"argument test\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The hint parameter can be omitted, it only provides the generator a hint of "
+"what to write the haiku about. If no hint is given, it might base it on the "
+"page name. Since the vocabulary it knows is very small, many hints won't "
+"affect the result at all."
+msgstr ""
+"Der `hint`-Parameter kann weggelassen werden, er gibt dem Generator nur "
+"einen Hinweis, worüber er das Haiku schreiben soll. Wenn kein solcher "
+"Hinweis gegeben wird, könnte er den Seitennamen verwenden. Da das ihm "
+"bekannte Vokabular sehr klein ist, werden viele Hinweise das Ergebnis in "
+"keiner Weise beeinflussen."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/if.de.po b/po/underlays/directives/ikiwiki/directive/if.de.po
new file mode 100644
index 000000000..e28e45936
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/if.de.po
@@ -0,0 +1,145 @@
+# German translation of directives/ikiwiki/directive/if page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:02+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `if` directive is supplied by the [[!iki plugins/conditional "
+"desc=conditional]] plugin."
+msgstr ""
+"Die `if`-Anweisung wird durch die [[!iki plugins/conditional "
+"desc=conditional]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"With this directive, you can make text be conditionally displayed on a "
+"page.  For example:"
+msgstr ""
+"Mit dieser Anweisung kann die Anzeige von Text an bestimmte Bedingungen "
+"geknüpft werden. Zum Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!if test=\"enabled(smiley)\"\n"
+"\t      then=\"The smiley plugin is enabled :-)\"\n"
+"\t      else=\"No smiley plugin here..\"]]\n"
+msgstr ""
+"\t\\[[!if test=\"enabled(smiley)\"\n"
+"\t      then=\"Die smiley-Erweiterung ist aktiviert :-)\"\n"
+"\t      else=\"Hier gibt es keine smiley-Erweiterung &hellip;\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If the specified `test` succeeds, the `then` text will be displayed, "
+"otherwise the `else` text will be displayed. The `else` part is optional."
+msgstr ""
+"Wenn der angegebene `test` erfolgreich ist, wird der `then`-Text angezeigt, "
+"sonst der `else`-Text. Der `else`-Teil ist optional."
+
+#. type: Plain text
+msgid ""
+"The `then` and `else` values can include any markup that would be allowed in "
+"the wiki page outside the template. Triple-quoting the values even allows "
+"quotes to be included."
+msgstr ""
+"Die Werte für `then` und `else` können beliebige Formatierungsanweisungen "
+"enthalten, die außerhalb der Anweisung erlaubt wären. Werten die Werte durch "
+"dreifache Anführungszeichen abgetrennt, können sie sogar Anführungszeichen "
+"enthalten."
+
+#. type: Plain text
+msgid ""
+"The `test` is a [[ikiwiki/PageSpec]]; if it matches any page in the wiki "
+"then it succeeds. So you can do things like testing for the existence of a "
+"page or pages, testing to see if any pages were created in a given month, "
+"and so on."
+msgstr ""
+"Der `test` ist eine [[ikiwiki/PageSpec]]; wenn sie auf irgendeine Seite im "
+"Wiki passt, hat der Test Erfolg. Dadurch kann man die Existenz einer oder "
+"mehrerer Seiten überprüfen, überprüfen ob in einem bestimmten Monat Seiten "
+"angelegt wurden, und so weiter."
+
+#. type: Plain text
+msgid ""
+"If you want the [[ikiwiki/PageSpec]] to only match against the page that "
+"contains the conditional, rather than matching against all pages in the "
+"wiki, set the \"all\" parameter to \"no\"."
+msgstr ""
+"Wenn die [[ikiwiki/PageSpec]] nur auf die aktuelle Seite angewendet werden "
+"soll, die die Bedingung enthält (und nicht auf alle Seiten im Wiki), kann "
+"der optionale `all`-Parameter auf `no` gesetzt werden."
+
+#. type: Plain text
+msgid ""
+"In an `if` directive, the regular [[ikiwiki/PageSpec]] syntax is expanded "
+"with the following additional tests:"
+msgstr ""
+"In einer `if`-Anweisung sind neben der regulären [[ikiwiki/PageSpec]]-Syntax "
+"die folgenden zusätzlichen Test verfügbar:"
+
+#. type: Bullet: '* '
+msgid "enabled(plugin)"
+msgstr "enabled(plugin)"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Tests whether the specified plugin is enabled.\n"
+msgstr "  Prüft, ob die angegebene Erweiterung aktiviert ist.\n"
+
+#. type: Bullet: '* '
+msgid "sourcepage(glob)"
+msgstr "sourcepage(glob)"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Tests whether the glob matches the name of the page that contains the\n"
+"  conditional.\n"
+msgstr ""
+"  Prüft, ob das angegebene Muster auf den Namen der Seite passt, die die\n"
+"  Bedingung enthält.\n"
+
+#. type: Bullet: '* '
+msgid "destpage(glob)"
+msgstr "destpage(glob)"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Tests whether the glob matches the name of the page that is being built.\n"
+"  That might be different than the name of the page that contains the\n"
+"  conditional, if it's being inlined into another page.\n"
+msgstr ""
+"  Prüft, ob das Muster auf den namen der Seite passt, die gerade erzeugt\n"
+"  wird. Dies kann ein anderer Name sein als der der Seite, die die "
+"Bedingung\n"
+"  enthält, wenn diese über [[inline]] in eine andere Seite eingebunden wird."
+"\n"
+
+#. type: Bullet: '* '
+msgid "included()"
+msgstr "included()"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Tests whether the page is being included onto another page.\n"
+msgstr "  Prüft, ob die Seite gerade in eine andere eingebunden wird.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/img.de.po b/po/underlays/directives/ikiwiki/directive/img.de.po
new file mode 100644
index 000000000..f28a1597b
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/img.de.po
@@ -0,0 +1,115 @@
+# German translation of directives/ikiwiki/directive/img page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:02+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid "The `img` directive is supplied by the [[!iki plugins/img desc=img]] plugin."
+msgstr ""
+"Die `img`-Anweisung wird durch die [[!iki plugins/img desc=img]]-Erweiterung "
+"bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This is an image handling directive.  While ikiwiki supports inlining "
+"full-size images by making a [[ikiwiki/WikiLink]] that points to the image, "
+"using this directive you can easily scale down an image for inclusion onto a "
+"page, providing a link to a full-size version."
+msgstr ""
+"Diese Anweisung verarbeitet Bilder. Während ikiwiki das Einbinden von Bildern in "
+"voller Größe durch einen [[ikiwiki/WikiLink]] auf das Bild unterstützt, kann man "
+"mit dieser Anweisung ein Bild einfach herunterskalieren, um es in eine Seite "
+"einzubinden, und einen Link auf das Bild in Originalgröße setzen."
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Verwendung"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!img image1.jpg size=\"200x200\" alt=\"clouds\"]]\n"
+msgstr "\t\\[[!img image1.jpeg size=\"200x200\" alt=\"Wolken\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The image file will be searched for using the same rules as used to find the "
+"file pointed to by a [[ikiwiki/WikiLink]]."
+msgstr ""
+"Diese Bilddatei wird nach den gleichen Regeln gesucht wie das Ziel eines "
+"[[ikiwiki/WikiLink]]."
+
+#. type: Plain text
+msgid ""
+"The `size` parameter is optional, defaulting to full size. Note that the "
+"original image's aspect ratio is always preserved, even if this means making "
+"the image smaller than the specified size. You can also specify only the "
+"width or the height, and the other value will be calculated based on it: "
+"\"200x\", \"x200\""
+msgstr ""
+"Der Parameter `size` ist optional, voreingestellt ist die volle Größe. Das "
+"Seitenverhältnis des Originalbildes wird immer bewahrt, auch wenn das Bild "
+"dadurch kleiner wird als angegeben. Man kann auch nur die Breite oder nur die "
+"Höhe angeben, dann wird der jeweils andere Wert automatisch berechnet: `200x`, "
+"`x200`."
+
+#. type: Plain text
+msgid ""
+"You can also pass `alt`, `title`, `class`, `align` and `id` parameters.  "
+"These are passed through unchanged to the html img tag. If you include a "
+"`caption` parameter, the caption will be displayed centered beneath the "
+"image."
+msgstr ""
+"Man kann auch die Parameter `alt`, `title`, `class`, `align` und `id` übergeben. "
+"Diese werden an den img-Tag im erzeugten HTML-Code weitergereicht. Wird der "
+"Parameter `caption` angegeben, wird sein Wert unter dem Bild zentriert angezeigt."
+
+#. type: Plain text
+msgid ""
+"The `link` parameter is used to control whether the scaled image links to "
+"the full size version. By default it does; set \"link=somepage\" to link to "
+"another page instead, or \"link=no\" to disable the link, or "
+"\"link=http://url\" to link to a given url."
+msgstr ""
+"Der Parameter `link` steuert, ob herunterskalierte Bilder mit dem Originalbild "
+"verlinkt werden. In der Voreinstellung ist dies der Fall; mit `link=AndereSeite` "
+"zeigt der Link auf eine andere Seite, mit `link=no` wird der Link deaktiviert, "
+"mit `link=http://url` zeigt er auf die angegebene URL."
+
+#. type: Plain text
+msgid ""
+"You can also set default values that will be applied to all later images on "
+"the page, unless overridden. Useful when including many images on a page."
+msgstr ""
+"Man kann auch die Voreinstellung für die weiter unten auf der Seite eingebundenen "
+"Bilder verändern. Dies ist nützlich, wenn es auf einer Seite viele Bilder gibt."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!img defaults size=200x200 alt=\"wedding photo\"]]\n"
+"\t\\[[!img photo1.jpg]]\n"
+"\t\\[[!img photo2.jpg]]\n"
+"\t\\[[!img photo3.jpg size=200x600]]\n"
+msgstr ""
+"\t\\[[!img defaults size=200x200 alt=\"Hochzeitsfoto\"]]\n"
+"\t\\[[!img photo1.jpg]]\n"
+"\t\\[[!img photo2.jpg]]\n"
+"\t\\[[!img photo3.jpg size=200x600]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/inline.de.po b/po/underlays/directives/ikiwiki/directive/inline.de.po
new file mode 100644
index 000000000..17e5c19d2
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/inline.de.po
@@ -0,0 +1,385 @@
+# German translation of directives/ikiwiki/directive/inline page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:02+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `inline` directive is supplied by the [[!iki plugins/inline "
+"desc=inline]] plugin."
+msgstr ""
+"Die `inline`-Anweisung wird durch die [[!iki plugins/inline "
+"desc=inline]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This is a directive that allows including one wiki page inside another.  The "
+"most common use of inlining is generating blogs and RSS or Atom feeds."
+msgstr ""
+"Diese Anweisung erlaubt das Einbinden einer Wiki-Seite in eine andere. Die "
+"häufigste Verwendung ist das Erzeugen von Blogs und RSS- oder Atom-Feeds."
+
+#. type: Plain text
+msgid "Example:"
+msgstr "Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" "
+"rootpage=\"blog\"]]\n"
+msgstr ""
+"\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" "
+"rootpage=\"blog\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Any pages that match the specified [[PageSpec]] (in the example, any "
+"[[SubPage]] of \"blog\") will be part of the blog, and the newest 10 of them "
+"will appear in the page. Note that if files that are not pages match the "
+"[[PageSpec]], they will be included in the feed using RSS enclosures, which "
+"is useful for podcasting."
+msgstr ""
+"Es wird jede Seite Teil des Blogs, die auf die angegebene [[PageSpec]] passt "
+"(im Beispiel jede [[Unterseite|subpage]] von \"blog\"), und die zehn neusten "
+"davon erscheinen auf der Seite. Übrigens werden Dateien, die keine Seiten sind "
+"und auf die [[PageSpec]] passen, als RSS-Einbettungen Teil des Feeds: Dies ist "
+"nützlich für Podcasts."
+
+#. type: Plain text
+msgid ""
+"The optional `rootpage` parameter tells the wiki that new posts to this blog "
+"should default to being [[SubPages|SubPage]] of \"blog\", and enables a form "
+"at the top of the blog that can be used to add new items."
+msgstr ""
+"Der optionale Parameter `rootpage` teilt dem Wiki mit, dass neue Einträge in "
+"diesem Blog [[Unterseiten|subpage]] von \"blog\" sein sollen; in diesem Fall "
+"wird ein Formular zum Hinzufügen neuer Beiträge am Anfang der Seite angezeigt."
+
+#. type: Plain text
+msgid ""
+"If you want your blog to have an archive page listing every post ever made "
+"to it, you can accomplish that like this:"
+msgstr ""
+"Wenn es zu einem Blog eine Archivseite mit allen bisherigen Einträgen geben "
+"soll, kann dies wie folgt erreicht werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n"
+msgstr "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n"
+
+#. type: Plain text
+msgid ""
+"You can even create an automatically generated list of all the pages on the "
+"wiki, with the most recently added at the top, like this:"
+msgstr ""
+"Mit dem folgenden Code kann man sogar eine automatisch erzeugte Liste mit "
+"allen Seiten des Wikis erstellen (die neuesten erscheinen oben):"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n"
+msgstr "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If you want to be able to add pages to a given blog feed by tagging them, "
+"you can do that too. To tag a page, just make it link to a page or pages "
+"that represent its tags. Then use the special `link()` [[PageSpec]] to match "
+"all pages that have a given tag:"
+msgstr ""
+"Es ist auch möglich, dass Seiten durch das Hinzufügen eines Tags Teil des "
+"Blogs werden. Hierzu kann auf der betreffenden Seite einfach ein Link auf die "
+"Seite (oder die Seiten) erstellt, die die Tags repräsentieren. Dann kann die "
+"spezielle `link()`-[[PageSpec]] verwendet werden, um alle Seiten mit einem "
+"gegebenen Tag zu erfassen:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"link(life)\"]]\n"
+msgstr "\t\\[[!inline pages=\"link(life)\"]]\n"
+
+#. type: Plain text
+msgid "Or include some tags and exclude others:"
+msgstr ""
+"Es ist auch möglich, bestimmte Tags inzuschließen, während andere "
+"ausgeschlossen werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n"
+msgstr "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Verwendung"
+
+#. type: Plain text
+msgid ""
+"There are many parameters you can use with the `inline` directive. These are "
+"the commonly used ones:"
+msgstr ""
+"Es gibt viele Parameter, die man mit der `inline`-Anweisung verwenden kann. "
+"Dies sind die am häufigsten benutzten:"
+
+#. type: Bullet: '* '
+msgid "`pages` - A [[PageSpec]] of the pages to inline."
+msgstr "`pages` - Eine [[PageSpec]] der einzubindenden Seiten."
+
+#. type: Bullet: '* '
+msgid ""
+"`show` - Specify the maximum number of matching pages to inline.  Default is "
+"10, unless archiving, when the default is to show all.  Set to 0 to show all "
+"matching pages."
+msgstr ""
+"`show` - Gibt die maximale Anzahl von Seiten an, die eingebunden werden sollen."
+" Voreingestellt sind 10, außer wenn archiviert wird, dass sind es alle. Ist "
+"der Wert 0, werden alle passenden Seiten angezeigt."
+
+#. type: Bullet: '* '
+msgid ""
+"`archive` - If set to \"yes\", only list page titles and some metadata, not "
+"full contents."
+msgstr ""
+"`archive` - Hat dieser Parameter den Wert `yes`, werden nur der Titel und "
+"einige Metadaten angezeigt, aber nicht der komplette Inhalt."
+
+#. type: Bullet: '* '
+msgid ""
+"`description` - Sets the description of the rss feed if one is generated.  "
+"Defaults to the name of the wiki."
+msgstr ""
+"`description` - Setzt die Beschreibung des RSS-Feeds, wenn einer erzeugt wird. "
+"Voreingestellt ist der Name des Wikis."
+
+#. type: Bullet: '* '
+msgid ""
+"`skip` - Specify a number of pages to skip displaying. Can be useful to "
+"produce a feed that only shows archived pages."
+msgstr ""
+"`skip` - Gibt die Anzahl von Seiten an, die bei der Anzeige übersprungen "
+"werden. Dies kann nützlich sein, um einen Feed zu erstellen, der nur "
+"archivierte Seiten enthält."
+
+#. type: Bullet: '* '
+msgid "`postform` - Set to \"yes\" to enable a form to post new pages to a blog."
+msgstr ""
+"`postform` - Bei dem Wert `yes`, wird ein Formular zum Erstellen neuer "
+"Einträge in dem Blog angezeigt."
+
+#. type: Bullet: '* '
+msgid "`postformtext` - Set to specify text that is displayed in a postform."
+msgstr "`postformtext` - Gibt an, welcher Text im 'postform' angezeigt wird."
+
+#. type: Bullet: '* '
+msgid ""
+"`rootpage` - Enables the postform, and allows controling where newly posted "
+"pages should go, by specifiying the page that they should be a [[SubPage]] "
+"of."
+msgstr ""
+"`rootpage` - Aktiviert `postform` und erlaubt gleichzeitig die Kontrolle "
+"darüber, wo neu erstellte Seiten landen sollen, indem eine Seite angegeben "
+"wird, deren [[Unterseite|subpage]] die neuen Seiten werden sollen."
+
+#. type: Plain text
+msgid "Here are some less often needed parameters:"
+msgstr "Hier sind einige weniger häufig benötigte Parameter:"
+
+#. type: Bullet: '* '
+msgid ""
+"`actions` - If set to \"yes\" add links to the bottom of the inlined pages "
+"for editing and discussion (if they would be shown at the top of the page "
+"itself)."
+msgstr ""
+"`actions` - Wenn `yes`, füge Links zum Bearbeiten und zur Diskussion am "
+"unteren Ende jeder eingebundenen Seite ein (wenn sie im Kopf der jeweiligen "
+"Seite angezeigt werden würden)."
+
+#. type: Bullet: '* '
+msgid ""
+"`rss` - controls generation of an rss feed. If the wiki is configured to "
+"generate rss feeds by default, set to \"no\" to disable. If the wiki is "
+"configured to `allowrss`, set to \"yes\" to enable."
+msgstr ""
+"`rss` - Steuert die Erzeugung eines RSS-Feeds. Wenn das Wiki so konfiguriert "
+"ist, dass es standardmäßig RSS-Feeds erzeugt, kann dies durch den Wert `no` "
+"verhindert werden. Wenn das Wiki RSS erlaubt (`allowrss` in der "
+"Konfigurationsdatei), dann kann der RSS-Feed mit `yes` aktiviert werden."
+
+#. type: Bullet: '* '
+msgid ""
+"`atom` - controls generation of an atom feed. If the wiki is configured to "
+"generate atom feeds by default, set to \"no\" to disable. If the wiki is "
+"configured to `allowatom`, set to \"yes\" to enable."
+msgstr ""
+"`atom` - Steuert die Erzeugung eines Atom-Feeds. Wenn das Wiki so konfiguriert "
+"ist, dass es standardmäßig Atom-Feeds erzeugt, kann dies durch den Wert `no` "
+"verhindert werden. Wenn das Wiki Atom erlaubt (`allowatom` in der "
+"Konfigurationsdatei), dann kann der Atom-Feed mit `yes` aktiviert werden."
+
+#. type: Bullet: '* '
+msgid ""
+"`feeds` - controls generation of all types of feeds. Set to \"no\" to "
+"disable generating any feeds."
+msgstr ""
+"`feeds` - Steuert die Erzeugung aller Feed-Typen. Ein Wert von `no` "
+"unterdrückt alle Feeds."
+
+#. type: Bullet: '* '
+msgid ""
+"`emptyfeeds` - Set to \"no\" to disable generation of empty feeds.  Has no "
+"effect if `rootpage` or `postform` is set."
+msgstr ""
+"`emptyfeeds` - Bei  `no` werden keine leeren Feeds erzeugt. Dies hat keine "
+"Auswirkung, wenn `rootpage` oder `postform` aktiv sind."
+
+#. type: Bullet: '* '
+msgid ""
+"`template` - Specifies the template to fill out to display each inlined "
+"page. By default the `inlinepage` template is used, while the `archivepage` "
+"template is used for archives. Set this parameter to use some other, custom "
+"template, such as the `titlepage` template that only shows post titles or "
+"the `microblog` template, optimised for microblogging. Note that you should "
+"still set `archive=yes` if your custom template does not include the page "
+"content."
+msgstr ""
+"`template` - Gibt die Vorlage an, die für die Anzeige der einzelnen "
+"eingebundenen Seiten verwendet wird. Voreingestellt ist die "
+"`inlinepage`-Vorlage, für Archive wird `archivepage` verwendet. Es können auch "
+"andere, angepasste Vorlagen verwendet werden, etwa `titlepage` (zeigt nur die "
+"Titel der Blog-Einträge) oder `microblog` (optimiert für Microblogging). Wenn "
+"die angepasste Vorlage den Seiteninhalt nicht einbindet, kann zusätzlich "
+"`archive=yes` gesetzt werden."
+
+#. type: Bullet: '* '
+msgid ""
+"`raw` - Rather than the default behavior of creating a blog, if raw is set "
+"to \"yes\", the page will be included raw, without additional markup around "
+"it, as if it were a literal part of the source of the inlining page."
+msgstr ""
+"`raw` - Statt des voreingestellten Verhaltens, einen Blog zu erzeugen, wird "
+"bei `raw=yes` die Seite ohne zusätzliches Drumherum eingebunden, als ob sie "
+"ein Teil des Quelltextes der einbindenden Seite wäre."
+
+#. type: Bullet: '* '
+msgid ""
+"`sort` - Controls how inlined pages are [[sorted|pagespec/sorting]].  The "
+"default is to sort the newest created pages first."
+msgstr ""
+"`sort` - Steuert wie die eingebundenen Seiten [[sortiert|pagespec/sorting]] "
+"werden. In der Voreinstellung kommen die zuletzt angelegten Seiten zuerst."
+
+#. type: Bullet: '* '
+msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed."
+msgstr "`reverse` - Bei `yes` wird die Sortierung umgekehrt."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedshow` - Specify the maximum number of matching pages to include in the "
+"rss/atom feeds. The default is the same as the `show` value above."
+msgstr ""
+"`feedshow` - Gibt an, wie viele Seiten höchstens in den RSS- und Atom-Feeds "
+"eingebunden werden. Voreingestellt ist der Wert von `show`."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedonly` - Only generate the feed, do not display the pages inline on the "
+"page."
+msgstr ""
+"`feedonly` - Erzeuge nur den Feed, zeige die Seiten nicht eingebettet auf der "
+"Seite an."
+
+#. type: Bullet: '* '
+msgid ""
+"`quick` - Build archives in quick mode, without reading page contents for "
+"metadata. This also turns off generation of any feeds."
+msgstr ""
+"`quick` - Erzeuge Archive im Schnelldurchlauf, ohne im Seiteninhalt nach "
+"Metadaten zu suchen. Dies deaktiviert auch das Erzeugen von Feeds."
+
+#. type: Bullet: '* '
+msgid ""
+"`timeformat` - Use this to specify how to display the time or date for pages "
+"in the blog. The format string is passed to the strftime(3) function."
+msgstr ""
+"`timeformat` - Hiermit kann gesteuert werden, wie die Zeit oder das Datum der "
+"Blogeinträge dargestellt wird. Der Wert wird an die Funktion strftime(3) "
+"weitergereicht."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom "
+"feeds. The default is the same as the `pages` value above, and only pages "
+"matched by that value are included, but some of those can be excluded by "
+"specifying a tighter [[PageSpec]] here."
+msgstr ""
+"`feedpages` - Eine [[PageSpec]] mit Seiten, die im RSS- bzw. Atom-Feed "
+"auftachen sollen. Voreingestellt ist der Wert von `pages`, und nur Seiten die "
+"darauf passen werden eingebunden, aber einige davon können ausgeschlossen "
+"werden, indem hier eine striktere [[PageSpec]] angegeben wird."
+
+#. type: Bullet: '* '
+msgid ""
+"`guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`), "
+"the Atom feed will have this as its `<id>`. The default is to use the URL of "
+"the page containing the `inline` directive."
+msgstr ""
+"`guid` - Wenn hier eine URI angegeben wird (möglicherweise eine UUID mit "
+"Präfix `urn:uuid:`), dann hat der Atom-Feed diese als seine `<id>`. "
+"Voreingestellt ist der Name der Seite, die die inline-Anweisung enthält."
+
+#. type: Bullet: '* '
+msgid ""
+"`feedfile` - Can be used to change the name of the file generated for the "
+"feed. This is particularly useful if a page contains multiple feeds.  For "
+"example, set \"feedfile=feed\" to cause it to generate `page/feed.atom` "
+"and/or `page/feed.rss`. This option is not supported if the wiki is "
+"configured not to use `usedirs`."
+msgstr ""
+"`feedfile` - Hiermit kann der Name der Datei verändert werden, die für den "
+"Feed erzeugt wird. Dies ist insbesondere dann nützlich, wenn eine Seite "
+"mehrere Feeds enthält. Zum Beispiel kann man `feedfile=feed` setzen, um "
+"`page/feed.atom` und/oder `page/feed.rss` zu erzeugen. Diese Option ist nicht "
+"verfügbar, wenn das Wiki die Option `usedirs` nicht verwendet."
+
+#. type: Bullet: '* '
+msgid ""
+"`pagenames` - If given instead of `pages`, this is interpreted as a "
+"space-separated list of links to pages (with the same "
+"[[SubPage/LinkingRules]] as in a [[ikiwiki/WikiLink]]), and they are inlined "
+"in exactly the order given: the `sort` and `pages` parameters cannot be used "
+"in conjunction with this one."
+msgstr ""
+"`pagenames` - Kann anstelle von `pages` angegeben werden und wird als "
+"Leerzeichen-separierte Liste von Links zu Seiten interpretiert (mit den "
+"gleichen [[Verlinkungsregeln|SubPage/LinkingRules]] wie in einem "
+"[[ikiwiki/WikiLink]]), und werden dann genau in der angegebenen Reihenfolge "
+"eingebunden. Die Parameter `sort` und `pages` können nicht in Kombination mit "
+"diesem verwendet werden."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"A related directive is the [[ikiwiki/directive/edittemplate]] directive, "
+"which allows default text for a new page to be specified."
+msgstr ""
+"Eine verwandte Anweisung ist die [[ikiwiki/directive/edittemplate]]-Anweisung, "
+"mit der für eine neue Seite ein voreingestellter Text angegeben werden kann."
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/linkmap.de.po b/po/underlays/directives/ikiwiki/directive/linkmap.de.po
new file mode 100644
index 000000000..1695ca659
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/linkmap.de.po
@@ -0,0 +1,99 @@
+# German translation of directives/ikiwiki/directive/linkmap page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:03+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `linkmap` directive is supplied by the [[!iki plugins/linkmap "
+"desc=linkmap]] plugin."
+msgstr ""
+"Die `linkmap`-Anweisung wird durch die [[!iki plugins/linkmap "
+"desc=linkmap]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive uses [graphviz](http://www.graphviz.org/) to generate a graph "
+"showing the links between a set of pages in the wiki. Example usage:"
+msgstr ""
+"Diese Anweisung verwendet [graphviz](http://www.graphviz.org/), um einen "
+"Graph mit den Links zwischen den Seiten im Wiki zu erstellen. Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n"
+msgstr "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Only links between mapped pages will be shown; links pointing to or from "
+"unmapped pages will be omitted. If the pages to include are not specified, "
+"the links between all pages (and other files) in the wiki are mapped."
+msgstr ""
+"Nur Links zwischen den angegebenen Seiten werden angezeigt; Links die auf "
+"andere Seiten zeigen werden ausgelassen. Wenn die einzuschließenden Seiten "
+"nicht angegeben werden, werden Links zwischen allen Seiten (und anderen "
+"Dateien) im Wiki angezeigt."
+
+#. type: Plain text
+msgid ""
+"Here are descriptions of all the supported parameters to the `linkmap` "
+"directive:"
+msgstr ""
+"Hier die Beschreibung aller unterstützter Parameter der `linkmap`-Anweisung:"
+
+#. type: Bullet: '* '
+msgid "`pages` - A [[ikiwiki/PageSpec]] of the pages to map."
+msgstr "`pages` - Eine [[ikiwiki/PageSpec]] der darzustellenden Seiten."
+
+#. type: Bullet: '* '
+msgid ""
+"`height`, `width` - Limit the size of the map to a given height and width, "
+"in inches. Both must be specified for the limiting to take effect, otherwise "
+"the map's size is not limited."
+msgstr ""
+"`height`, `width` - Begrenzt die Größe der erzeugten Graphik auf die (in "
+"Inch) angegebene Breite und Höne. Beide müssen angegeben werden, damit die "
+"Beschränkung wirksam wird."
+
+#. type: Bullet: '* '
+msgid ""
+"`connected` - Controls whether to include pages on the map that link to no "
+"other pages (connected=no, the default), or to only show pages that link to "
+"others (connected=yes)."
+msgstr ""
+"`connected` - Steuert ob auch Seiten dargestellt werden, die keinen Link zu "
+"anderen Seiten enthalten (`connected=no`, die Voreinstellung), oder ob nur "
+"Seiten angezeigt werden, die auf andere verlinken (`connected=yes`)."
+
+#. type: Plain text
+msgid ""
+"For best results, only a small set of pages should be mapped, since "
+"otherwise the map can become very large, unwieldy, and complicated.  If too "
+"many pages are included, the map may get so large that graphviz cannot "
+"render it. Using the `connected` parameter is a good way to prune out pages "
+"that clutter the map."
+msgstr ""
+"Um die besten Ergebnisse zu erzielen, sollte nur eine kleine Teilmenge der "
+"Seiten angegeben werden, da die erzeugte Karte sonst groß, unhandlich und "
+"kompliziert wird. Wenn zu viele Seiten angegeben werden, kann die Karte zu "
+"kompliziert werden, als dass graphviz sie noch rendern könnte. Der Parameter "
+"`connected` ist ein guter Weg Seiten loszuwerden, die die Karte "
+"unübersichtlich machen."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/listdirectives.de.po b/po/underlays/directives/ikiwiki/directive/listdirectives.de.po
new file mode 100644
index 000000000..18d0a6da0
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/listdirectives.de.po
@@ -0,0 +1,72 @@
+# German translation of directives/ikiwiki/directive/listdirectives page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:03+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `listdirectives` directive is supplied by the [[!iki "
+"plugins/listdirectives desc=listdirectives]] plugin."
+msgstr ""
+"Die `listdirectives`-Anweisung wird durch die [[!iki "
+"plugins/listdirectives desc=listdirectives]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive generates a list of available "
+"[[directives|ikiwiki/directive]]."
+msgstr ""
+"Diese Anweisung erzeugt eine Liste der verfügbaren "
+"[[Anweisungen|ikiwiki/directives]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!listdirectives]]\n"
+msgstr "\t\\[[!listdirectives]]\n"
+
+#. type: Plain text
+msgid ""
+"There is one optional keyword argument, `generated`.  Normally the "
+"`listdirectives` directive will list all built in directives and directives "
+"directly registered by plugins.  With this keyword, `listdirectives` will "
+"also list directives generated later.  For example, all [[shortcuts]] are "
+"directives generated in turn by the `shortcut` directive.  They will only be "
+"listed if the `generated` argument is supplied."
+msgstr ""
+"Es gibt nur ein optionales Argument, `generated`. Normalerweise zeigt die "
+"`listdirectives`-Anweisung alle eingebauten und alle durch eine Erweiterung "
+"registrierten Anweisungen an. Mit diesem Schlüsselwort zeigt "
+"`listdirectives` auch Anweisungen an, die erst später erzeugt wurden. Zum "
+"Beispiel werden alle [[Abkürzungen|shortcuts]] durch die "
+"`shortcut`-Anweisung erzeugt und werden nur aufgelistet, wenn das Argument "
+"`generated` angegeben wird."
+
+#. type: Plain text
+#, no-wrap
+msgid "    \\[[!listdirectives generated]]\n"
+msgstr "    \\[[!listdirectives generated]]\n"
+
+#. type: Plain text
+msgid ""
+"This extended list is often quite long, and often contains many undocumented "
+"directives."
+msgstr ""
+"Diese erweiterte Liste ist oft ziemlich lang und enthält oft viele "
+"undokumentierte Anweisungen."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/map.de.po b/po/underlays/directives/ikiwiki/directive/map.de.po
new file mode 100644
index 000000000..303624b2c
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/map.de.po
@@ -0,0 +1,77 @@
+# German translation of directives/ikiwiki/directive/map page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:03+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid "The `map` directive is supplied by the [[!iki plugins/map desc=map]] plugin."
+msgstr ""
+"Die `map`-Anweisung wird durch die [[!iki plugins/map desc=map]]-Erweiterung "
+"bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive generates a hierarchical page map for the wiki. Example "
+"usage:"
+msgstr ""
+"Diese Anweisung erzeugt eine hierarchische Liste der Seiten im Wiki. Beispiel für "
+"die Verwendung:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\"]]\n"
+msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If the pages to include are not specified, all pages (and other files) in "
+"the wiki are mapped."
+msgstr ""
+"Wenn die anzuzeigenden Seiten nicht angegeben werden, kommen alle Seiten (und "
+"andere Dateien) in die Liste."
+
+#. type: Plain text
+msgid ""
+"By default, the names of pages are shown in the map. The `show` parameter "
+"can be used to show the titles or descriptions of pages instead (as set by "
+"the [[meta]] directive). For example:"
+msgstr ""
+"In der Voreinstellung werden in der Liste die Namen der Seiten angezeigt. Mit dem "
+"Parameter `show` können stattdessen der Titel (`title`) oder die Beschreibung "
+"(`description`) verwendet werden, die mit der [[meta]]-Anweisung gesetzt wurden. "
+"Zum Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
+msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n"
+msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n"
+
+#. type: Plain text
+msgid ""
+"Hint: To limit the map to displaying pages less than a certain level deep, "
+"use a [[ikiwiki/PageSpec]] like this: `pages=\"* and !*/*/*\"`"
+msgstr ""
+"Tipp: Um nur Seiten bis zu einer bestimmten Ebene anzuzeigen, kann eine "
+"[[ikiwiki/PageSpec]] wie `pages=\"* and !*/*/*\"` verwendet werden."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/meta.de.po b/po/underlays/directives/ikiwiki/directive/meta.de.po
new file mode 100644
index 000000000..aab5fd806
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/meta.de.po
@@ -0,0 +1,455 @@
+# German translation of directives/ikiwiki/directive/meta page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:04+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `meta` directive is supplied by the [[!iki plugins/meta desc=meta]] "
+"plugin."
+msgstr ""
+"Die `meta`-Anweisung wird durch die [[!iki plugins/meta desc=meta]]-Erweiterung "
+"bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows inserting arbitrary metadata into the source of a "
+"page.  Enter the metadata as follows:"
+msgstr ""
+"Diese Anweisung erlaubt es, beliebige Metadaten in den Quelltext einer Seite "
+"einzufügen. Dies geschieht wie folgt:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!meta field=\"value\"]]\n"
+"\t\\[[!meta field=\"value\" param=\"value\" param=\"value\"]]\n"
+msgstr ""
+"\t\\[[!meta field=\"value\"]]\n"
+"\t\\[[!meta field=\"value\" param=\"value\" param=\"value\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The first form sets a given field to a given value, while the second form "
+"also specifies some additional sub-parameters."
+msgstr ""
+"In der ersten Form wird das angegebene Feld auf den angegebenen Wert gesetzt. In "
+"der zweiten Form werden zusätzlich einige Unter-Parameter angegeben."
+
+#. type: Plain text
+msgid ""
+"The field values are treated as HTML entity-escaped text, so you can include "
+"a quote in the text by writing `&quot;` and so on."
+msgstr ""
+"Die Feldwerte können HTML-Entities enthalten, zum Beispiel kann durch `&quot;` "
+"ein Anführungszeichen eingefügt werden."
+
+#. type: Plain text
+msgid "Supported fields:"
+msgstr "Unterstützte Felder:"
+
+#. type: Bullet: '* '
+msgid "title"
+msgstr "`title` "
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Overrides the title of the page, which is generally the same as the\n"
+"  page name.\n"
+msgstr ""
+"  Überschreibt den Titel der Seite, der normalerweise dem Namen\n"
+"  der Seite entspricht."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Note that if the title is overridden, a \"title_overridden\" variable "
+"will\n"
+"  be set to a true value in the template; this can be used to format "
+"things\n"
+"  differently in this case.\n"
+msgstr ""
+"  Wenn der Titel so überschrieben wird, wird die Template-Variable\n"
+"  `title_overridden` auf wahr gesetzt. Eine Vorlage kann in diesem\n"
+"  Fall eine andere Darstellung wählen.\n"
+
+#. type: Bullet: '* '
+msgid "license"
+msgstr "`license`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a license for the page, for example, \"GPL\". Can contain\n"
+"  WikiLinks and arbitrary markup.\n"
+msgstr ""
+"  Gibt eine Lizenz für die Seite an, etwa `GPL`. Kann WikiLinks und\n"
+"  beliebige Formatierungsanweisungen enhalten.\n"
+
+#. type: Bullet: '* '
+msgid "copyright"
+msgstr "`copyright`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies the copyright of the page, for example, \"Copyright 2007 by\n"
+"  Joey Hess\". Can contain WikiLinks and arbitrary markup.\n"
+msgstr ""
+"  Gibt die Urheberrechte der Seite an, zum Beispiel `Copyright 2007\n"
+"  by Joey Hess`. Kann WikiLinks und beliebige\n"
+"  Formatierungsanweisungen enhalten.\n"
+
+#. type: Bullet: '* '
+msgid "author"
+msgstr "`author`"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Specifies the author of a page.\n"
+msgstr "  Gibt den Autor der Seite an.\n"
+
+#. type: Bullet: '* '
+msgid "authorurl"
+msgstr "`authorurl`"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Specifies an url for the author of a page.\n"
+msgstr "  Gibt eine URL für den Autor der Seite an.\n"
+
+#. type: Bullet: '* '
+msgid "description"
+msgstr "`description`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a short description for the page. This will be put in\n"
+"  the html header, and can also be displayed by eg, the [[map]] directive.\n"
+msgstr ""
+"  Gibt eine kurze Beschreibung der Seite an. Diese wird im\n"
+"  HTML-Header angegeben und kann zum Beispiel auch durch die\n"
+"  [[map]]-Anweisung ausgegeben werden.\n"
+
+#. type: Bullet: '* '
+msgid "permalink"
+msgstr "`permalink`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a permanent link to the page, if different than the page\n"
+"  generated by ikiwiki.\n"
+msgstr ""
+"  Gibt einen dauerhaften Link zu der Seite an, wenn dieser anders ist\n"
+"  als die von ikiwiki generierte Seite.\n"
+
+#. type: Bullet: '* '
+msgid "date"
+msgstr "`date`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies the creation date of the page. The date can be entered in\n"
+"  nearly any format, since it's parsed by [[!cpan TimeDate]].\n"
+msgstr ""
+"  Gibt das Erstellungsdatum der Seite an. Das Datum kann in\n"
+"  nahezu beliebigem Format angegeben werden, da es durch\n"
+"  [[!cpan TimeDate]] interpretiert wird.\n"
+
+#. type: Bullet: '* '
+msgid "stylesheet"
+msgstr "`stylesheet`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Adds a stylesheet to a page. The stylesheet is treated as a wiki link to\n"
+"  a `.css` file in the wiki, so it cannot be used to add links to external\n"
+"  stylesheets. Example:\n"
+msgstr ""
+"  Fügt ein Stylesheet zu der Seite hinzu. Der angegebene Name wird als\n"
+"  WikiLink zu einer `.css`-Datei im Wiki behandelt, es können also keine\n"
+"  externen Stylesheets eingebunden werden. Beispiel:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n"
+"\ttitle=\"somestyle\"]]\n"
+msgstr ""
+"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n"
+"\ttitle=\"somestyle\"]]\n"
+
+#. type: Bullet: '* '
+msgid "openid"
+msgstr "`openid`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Adds html &lt;link&gt; tags to perform OpenID delegation to an external\n"
+"  OpenID server. This lets you use an ikiwiki page as your OpenID.\n"
+msgstr ""
+"  Fügt die nötigen &lt;link&gt;-Tags für die Weiterleitung an einen externen\n"
+"  OpenID-Server ein. Dadurch kann eine ikiwiki-Seite als OpenID\n"
+"  verwendet werden.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  By default this will delegate for both `openid` and `openid2`. To only\n"
+"  delegate for one, add a parameter such as `delegate=openid`.\n"
+msgstr ""
+"  Standardmäßig werden sowohl `openid` als auch `openid2`\n"
+"  weitergeleitet. Um nur eines davon weiterzuleiten, kann ein\n"
+"  Parameter wie `delegate=openid` verwendet werden.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  An optional `xrds-location`\n"
+"  parameter lets you specify the location of any [eXtensible Resource\n"
+"  DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).\n"
+msgstr ""
+"  Der optionale Parameter `xrds-location` erlaubt es, den Ort eines\n"
+"  [eXtensible Resource\n"
+"  DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml)\n"
+"  anzugeben.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Example:\n"
+msgstr "  Beispiel:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\\\[[!meta openid=\"http://joeyh.myopenid.com/\"\n"
+"\tserver=\"http://www.myopenid.com/server\"\n"
+"\txrds-location=\"http://www.myopenid.com/xrds?username=joeyh.myopenid.com\"\"]]\n"
+msgstr ""
+"\t\\\\[[!meta openid=\"http://joeyh.myopenid.com/\"\n"
+"\tserver=\"http://www.myopenid.com/server\"\n"
+"\txrds-location=\"http://www.myopenid.com/xrds?username=joeyh.myopenid.com\"\"]]\n"
+
+#. type: Bullet: '* '
+msgid "link"
+msgstr "`link`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a link to another page. This can be used as a way to make the\n"
+"  wiki treat one page as linking to another without displaying a "
+"user-visible\n"
+"  [[ikiwiki/WikiLink]]:\n"
+msgstr ""
+"  Gibt einen Link zu einer anderen Seite an. Auf diese Weise kann das Wiki\n"
+"  dazu gebracht werden, eine Seite so zu behandeln, als ob sie einen Link\n"
+"  auf eine andere enthält, ohne dass die Benutzer einen [[ikiwiki/WikiLink]]\n"
+"  zu Gesicht bekommen:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "       \\[[!meta link=otherpage]]\n"
+msgstr "       \\[[!meta link=andereseite]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  It can also be used to insert a html &lt;link&gt; tag. For example:\n"
+msgstr ""
+"  Es kann auch ein HTML &lt;link&gt;-Tag eingefügt werden, zum\n"
+"  Beispiel:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"       \\[[!meta link=\"http://joeyh.myopenid.com/\" "
+"rel=\"openid.delegate\"]]\n"
+msgstr ""
+"       \\[[!meta link=\"http://joeyh.myopenid.com/\" "
+"rel=\"openid.delegate\"]]\n"
+
+#. type: Plain text
+#:
+#, no-wrap
+msgid ""
+"  However, this latter syntax won't be allowed if the \n"
+"  [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled, since "
+"it can be used to\n"
+"  insert unsafe content.\n"
+msgstr ""
+"  Allerdings ist diese zweite Syntax nicht erlaubt, wenn die\n"
+"  [[!iki plugins/htmlscrubber desc=htmlscrubber]]-Erweiterung aktiviert ist,\n"
+"  weil auf diese Weise unsichere Inhalte eingefügt werden können.\n"
+
+#. type: Bullet: '* '
+msgid "redir"
+msgstr "`redir`"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Causes the page to redirect to another page in the wiki.\n"
+msgstr "  Lässt die Seite auf eine andere Seite im Wiki weiterleiten.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  \t\\[[!meta redir=otherpage]]\n"
+msgstr "  \t\\[[!meta redir=andereseite]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Optionally, a delay (in seconds) can be specified. The default is to\n"
+"  redirect without delay.\n"
+msgstr ""
+"  Es kann optional eine Verzögerung (`delay=seconds`) angegeben\n"
+"  werden. Voreingestellt ist, ohne Verzögerung weiterzuleiten.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  It can also be used to redirect to an external url. For example:\n"
+msgstr ""
+"  Es kann auch auf eine externe URL weitergeleitet werden. Zum\n"
+"  Beispiel:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  \t\\[[!meta redir=\"http://example.com/\"]]\n"
+msgstr "  \t\\[[!meta redir=\"http://beispiel.de/\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  For both cases, an anchor to jump to inside the destination page may also "
+"be\n"
+"  specified using the common `#ANCHOR` syntax.\n"
+msgstr ""
+"  In beiden Fällen kann ein anzuspringender Anker auf der Zielseite\n"
+"  angegeben werden, indem die übliche `#ANKER`-Syntax verwendet wird.\n "
+
+#. type: Bullet: '* '
+msgid "robots"
+msgstr "`robots`"
+
+#. type: Plain text
+#, no-wrap
+msgid "  Causes the robots meta tag to be written:\n"
+msgstr "  Schreibt den robots-Meta-Tag:\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "        \\[[!meta robots=\"index, nofollow\"]]\n"
+msgstr "        \\[[!meta robots=\"index, nofollow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Valid values for the attribute are: \"index\", \"noindex\", \"follow\", "
+"and\n"
+"  \"nofollow\". Multiple comma-separated values are allowed, but obviously "
+"only\n"
+"  some combinations make sense. If there is no robots meta tag, \"index,\n"
+"  follow\" is used as the default.\n"
+msgstr ""
+"  Zulässige Werte sind `index`, `noindex`, `follow` und `nofollow`. Es\n"
+"  können mehrere Werte durch Kommas getrennt angegeben werden, aber\n"
+"  offensichtlich ergeben nur einige Kombinationen Sinn. Wenn der\n"
+"  robots-Meta-Tag nicht explizit angegeben wird, wird als Voreinstellung\n"
+"  \"index,follow\" angenommen.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "  The value is escaped, but its contents are not otherwise checked.\n"
+msgstr "  Der Wert wird nicht auf Zulässigkeit geprüft.\n"
+
+#. type: Bullet: '* '
+msgid "guid"
+msgstr "`guid`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a globally unique ID for a page. This guid should be a URI\n"
+"  (in particular, it can be `urn:uuid:` followed by a UUID, as per\n"
+"  [[!rfc 4122]]), and it will be used to identify the page's entry in RSS\n"
+"  and Atom feeds. If not given, the default is to use the page's URL as "
+"its\n"
+"  guid.\n"
+msgstr ""
+"  Gibt eine global einmalige ID für die Seite an. Diese guid sollte eine\n"
+"  URI sein (insbesondere kann sie nach [[!rfc 4122]] `urn:uuid:`\n"
+"  gefolgt von einer UUID sein). Sie wird verwendet, um den Eintrag der\n"
+"  Seite in RSS- und Atom-Feeds zu identifizieren. Wird keine guid\n"
+"  angegeben, wird an dieser Stelle die URL der Seite verwendet.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  This is mostly useful when a page has moved, to keep the guids for\n"
+"  pages unchanged and avoid_flooding_aggregators\n"
+"  (see [[!iki tips/howto_avoid_flooding_aggregators]]).\n"
+msgstr ""
+"  Diese Angabe ist in erster Linie dann nützlich, wenn eine Seite\n"
+"  verschoben wurde: Indem die guids unverändert gelassen werden,\n"
+"  kann das Fluten von Aggregatoren vermieden werden (siehe\n"
+"  [[!iki tips/howto_avoid_flooding_aggregators]]).\n"
+
+#. type: Bullet: '* '
+msgid "updated"
+msgstr "`updated`"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Specifies a fake modification time for a page, to be output into RSS and\n"
+"  Atom feeds. This is useful to avoid flooding aggregators that sort by\n"
+"  modification time, like Planet: for instance, when editing an old blog "
+"post\n"
+"  to add tags, you could set `updated` to be one second later than the "
+"original\n"
+"  value. The date/time can be given in any format that\n"
+"  [[!cpan TimeDate]] can understand, just like the `date` field.\n"
+msgstr ""
+"  Gibt eine gefälschte Änderungszeit für die Seite an, die dann von RSS-\n"
+"  und Atom-Feeds ausgegeben wird. Dies ist nützlich, um Aggregatoren\n"
+"  nicht zu fluten, die nach Änderungszeit sortieren, wie etwa Planet:\n"
+"  Wenn man zum Beispiel einen alten Blog-Eintrag bearbeitet (etwa um\n"
+"  Tags hinzuzufügen), kann man `updated` auf eine Sekunde später als\n"
+"  den ursprünglichen Wert setzen. Das Datum mit Uhrzeit kann in jedem\n"
+"  Format angegeben werden, das von [[!cpan TimeDate]] verstanden\n"
+"  wird, genauso wie im Feld `date`.\n"
+
+#. type: Plain text
+msgid ""
+"If the field is not one of the above predefined fields, the metadata will be "
+"written to the generated html page as a &lt;meta&gt; header. However, this "
+"won't be allowed if the [[!iki plugins/htmlscrubber desc=htmlscrubber]] "
+"plugin is enabled, since it can be used to insert unsafe content."
+msgstr ""
+"Wenn das Feld nicht eines der oben vordefinierten ist, werden die Metadaten als "
+"&lt;meta&gt;-Header in die generierte Seite geschrieben. Dies ist allerdings "
+"nicht erlaubt, wenn die [[!iki plugins/htmlscrubber "
+"desc=htmlscrubber]]-Erweiterung aktiv ist, da auf diese Weise unsichere Inhalte "
+"eingefügt werden können."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/more.de.po b/po/underlays/directives/ikiwiki/directive/more.de.po
new file mode 100644
index 000000000..bffb3a247
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/more.de.po
@@ -0,0 +1,63 @@
+# German translation of directives/ikiwiki/directive/more page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:04+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `more` directive is supplied by the [[!iki plugins/more desc=more]] "
+"plugin."
+msgstr ""
+"Die `more`-Anweisung wird durch die [[!iki plugins/more desc=more]]-Erweiterung "
+"bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive provides a way to have a \"more\" link on a post in a blog, "
+"that leads to the full version of the page. Use it like this:"
+msgstr ""
+"Diese Anweise stellt eine Möglichkeit zur Verfügung, einen \"mehr\"-Link in "
+"einem Blogeintrag anzuzeigen, der zur kompletten Version der Seite führt. "
+"Benutzt wird sie folgendermaßen:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!more linktext=\"click for more\" text=\"\"\"\n"
+msgstr "\t\\[[!more linktext=\"mehr &hellip;\" text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tThis is the rest of my post. Not intended for people catching up on\n"
+"\ttheir blogs at 30,000 feet. Because I like to make things\n"
+"\tdifficult.\n"
+msgstr ""
+"\tDies ist der Rest meines Blog-Eintrags. Er ist nicht für Leute\n"
+"\tgedacht, die auf 10000m Blogs lesen, weil ich es gerne kompliziert\n"
+"\tmache.\n"
+
+#. type: Plain text
+msgid "If the `linktext` parameter is omitted it defaults to just \"more\"."
+msgstr ""
+"Wenn der Parameter `linktext` weggelassen wird, wird einfach \"more\" angezeigt."
+
+#. type: Plain text
+msgid "Note that you can accomplish something similar using a [[toggle]] instead."
+msgstr "Etwas ähnliches kann auch mit einem [[toggle]] erreicht werden."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/orphans.de.po b/po/underlays/directives/ikiwiki/directive/orphans.de.po
new file mode 100644
index 000000000..45ba378db
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/orphans.de.po
@@ -0,0 +1,60 @@
+# German translation of directives/ikiwiki/directive/orphans page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:04+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `orphans` directive is supplied by the [[!iki plugins/orphans "
+"desc=orphans]] plugin."
+msgstr ""
+"Die `orphans`-Anweisung wird durch die [[!iki plugins/orphans "
+"desc=orphans]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive generates a list of possibly orphaned pages -- pages that no "
+"other page links to. Example:"
+msgstr ""
+"Diese Anweisung erzeugt eine Liste von möglicherweise verwaisten Seiten "
+"&ndash; Seiten auf die von keiner anderen aus verlinkt wird. Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!orphans pages=\"* and !blog/*\"]]\n"
+msgstr "\t\\[[!orphans pages=\"* and !blog/*\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying "
+"the pages to check for orphans, default is search them all."
+msgstr ""
+"Im optionalen Parameter `pages` kann durch eine [[ikiwiki/PageSpec]] "
+"angegeben werden, welche Seiten auf Verwaistheit überprüft werden. In der "
+"Voreinstellung werden alle geprüft."
+
+#. type: Plain text
+msgid ""
+"Note that it takes backlinks into account, but does not count inlining a "
+"page as linking to it, so will generally count many blog-type pages as "
+"orphans."
+msgstr ""
+"Dabei werden backlinks berücksichtigt, nicht aber Einbetten mit [[inline]]. "
+"Viele blogartige Seiten werden also als Waisen eingestuft werden."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/pagecount.de.po b/po/underlays/directives/ikiwiki/directive/pagecount.de.po
new file mode 100644
index 000000000..63aa98db5
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/pagecount.de.po
@@ -0,0 +1,48 @@
+# German translation of directives/ikiwiki/directive/pagecount page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:05+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `pagecount` directive is supplied by the [[!iki plugins/pagecount "
+"desc=pagecount]] plugin."
+msgstr ""
+"Die `pagecount`-Anweisung wird durch die [[!iki plugins/pagecount "
+"desc=pagecount]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid "This directive counts pages currently in the wiki. Example:"
+msgstr ""
+"Diese Anweisung zählt die Seiten, die es gerade im Wiki gibt. Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagecount pages=\"*\"]]\n"
+msgstr "\t\\[[!pagecount pages=\"*\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying "
+"the pages to count, default is to count them all."
+msgstr ""
+"Im optionalen Parameter `pages` kann mit einer [[ikiwiki/PageSpec]] "
+"angegeben werden, welche Seiten gezählt werden sollen, ein der "
+"Voreinstellung werden alle gezählt."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.de.po b/po/underlays/directives/ikiwiki/directive/pagestats.de.po
new file mode 100644
index 000000000..427f273ed
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/pagestats.de.po
@@ -0,0 +1,99 @@
+# German translation of directives/ikiwiki/directive/pagestats page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:05+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `pagestats` directive is supplied by the [[!iki plugins/pagestats "
+"desc=pagestats]] plugin."
+msgstr ""
+"Die `pagestats`-Anweisung wird durch die [[!iki plugins/pagestats "
+"desc=pagestats]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive can generate stats about how pages link to each other. It can "
+"produce either a tag cloud, or a table counting the number of links to each "
+"page."
+msgstr ""
+"Diese Anweisung kann Statistiken darüber erzeugen, wie Seiten aufeinander "
+"verlinken. Sie kann entweder eine Tag-Wolke erzeugen oder eine Tabelle mit "
+"den Häufigkeiten, wie oft auf die einzelnen Seiten verwiesen wurde."
+
+#. type: Plain text
+msgid "Here's how to use it to create a [[tag]] cloud:"
+msgstr "So kann eine [[tag]]-Wolke erzeugt werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+
+#. type: Plain text
+msgid "And here's how to create a table of all the pages on the wiki:"
+msgstr "Und so kann eine Tabelle mit allen Seiten im Wiki erzeugt werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagestats style=\"table\"]]\n"
+msgstr "\t\\[[!pagestats style=\"table\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The optional `among` parameter limits the pages whose outgoing links are "
+"considered. For instance, to display a cloud of tags used on blog entries, "
+"while ignoring other pages that use those tags, you could use:"
+msgstr ""
+"Der optionale Parameter `among` beschränkt die Seiten, deren ausgehende "
+"Links berücksichtigt werden. Zum Beispiel kann folgendermaßen eine Tag-Wolke "
+"erzeugt werden, die nur Vorkommen in Blogeinträgen berücksichtigt:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n"
+
+#. type: Plain text
+msgid "Or to display a cloud of tags related to Linux, you could use:"
+msgstr "Oder um eine Wolke mit Tags anzuzeigen, die mit Linux verwandt sind:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!pagestats pages=\"tags/* and not tags/linux\" "
+"among=\"tagged(linux)\"]]\n"
+msgstr ""
+"\t\\[[!pagestats pages=\"tags/* and not tags/linux\" "
+"among=\"tagged(linux)\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The optional `show` parameter limits display to the specified number of "
+"pages. For instance, to show a table of the top ten pages with the most "
+"links:"
+msgstr ""
+"Der optionale Parameter `show` zeigt nur die angegebene Anzahl von Seiten an."
+" Zum Beispiel kann man eine Tabelle mit den zehn häufigsten Links anzeigen:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
+msgstr "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po
new file mode 100644
index 000000000..8fddac168
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po
@@ -0,0 +1,64 @@
+# German translation of directives/ikiwiki/directive/pagetemplate page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:05+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate "
+"desc=pagetemplate]] plugin."
+msgstr ""
+"Die `pagetemplate`-Anweisung wird durch die [[!iki plugins/pagetemplate "
+"desc=pagetemplate]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows a page to be displayed using a different template than "
+"the default `page.tmpl` template."
+msgstr ""
+"Diese Anweisung erlaubt es, für eine Seite eine andere als die "
+"voreingestellte Vorlage `page.tmpl` zu verwenden."
+
+#. type: Plain text
+msgid ""
+"The page text is inserted into the template, so the template controls the "
+"overall look and feel of the wiki page. This is in contrast to the "
+"[[ikiwiki/directive/template]] directive, which allows inserting templates "
+"_into_ the body of a page."
+msgstr ""
+"Der Seiteninhalt wird in die Vorlage eingefügt, die Vorlage steuert also das "
+"allgemeine Erscheinungsbild der Seite. Im Gegensatz dazu erlaubt die "
+"[[ikiwiki/directive/template]]-Anweisung, Vorlagen _in_ den Text einer Seite "
+"einzufügen."
+
+#. type: Plain text
+msgid ""
+"This directive can only reference templates that are already installed by "
+"the system administrator, typically into the `/usr/share/ikiwiki/templates` "
+"directory. Example:"
+msgstr ""
+"Diese Anweisung kann nur auf Vorlagen zurückgreifen, die bereits durch den "
+"Systemadministrator installiert wurden, typischerweise im Verzeichnis "
+"`/usr/share/ikiwiki/templates`. Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n"
+msgstr "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/paste.de.po b/po/underlays/directives/ikiwiki/directive/paste.de.po
new file mode 100644
index 000000000..48a08bf29
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/paste.de.po
@@ -0,0 +1,25 @@
+# German translation of directives/ikiwiki/directive/paste page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-13 23:32+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
diff --git a/po/underlays/directives/ikiwiki/directive/ping.de.po b/po/underlays/directives/ikiwiki/directive/ping.de.po
new file mode 100644
index 000000000..364813bb5
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/ping.de.po
@@ -0,0 +1,69 @@
+# German translation of directives/ikiwiki/directive/ping page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:06+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `ping` directive is supplied by the [[!iki plugins/pinger desc=pinger]] "
+"plugin."
+msgstr ""
+"Die `ping`-Anweisung wird durch die [[!iki plugins/pinger "
+"desc=pinger]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows ikiwiki to be configured to hit a URL each time it "
+"updates the wiki. One way to use this is in conjunction with the [[!iki "
+"plugins/pingee desc=pingee]] plugin to set up a loosely coupled mirror "
+"network, or a branched version of a wiki. By pinging the mirror or branch "
+"each time the main wiki changes, it can be kept up-to-date."
+msgstr ""
+"Diese Anweisung erlaubt es ikiwiki so zu konfigurieren, dass eine bestimmte "
+"URL jedes mal aufgerufen wird, wenn das Wiki aktualisiert wird. Dies kann "
+"in Kombination mit der [[!iki plugins/pingee desc=pingee]]-Erweiterung dazu "
+"verwendet werden, ein eng gekoppeltes Netzwerk mit gespiegelten oder "
+"abgeleiteten Wikis einzurichten. Durch das Anpingen kann bei jeder Änderung "
+"der Spiegel oder das abgeleitete Wiki aktuell gehalten werden."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        \\[[!ping from=\"http://mywiki.com/\"\n"
+"        to=\"http://otherwiki.com/ikiwiki.cgi?do=ping\"]]\n"
+msgstr ""
+"        \\[[!ping from=\"http://mywiki.com/\"\n"
+"        to=\"http://otherwiki.com/ikiwiki.cgi?do=ping\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The \"from\" parameter must be identical to the url of the wiki that is "
+"doing the pinging. This is used to prevent ping loops."
+msgstr ""
+"Der Parameter `from` muss identisch zur URL des Wikis sein, dass den Ping "
+"durchführt. Dies wird verwendet, um Schleifen zu verhindern."
+
+#. type: Plain text
+msgid ""
+"The \"to\" parameter is the url to ping. The example shows how to ping "
+"another ikiwiki instance."
+msgstr ""
+"Der Parameter `to` ist die URL, die aufgerufen werden soll. Das Beispiel "
+"zeigt, wie eine andere ikiwiki-Instanz angepingt werden kann."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/poll.de.po b/po/underlays/directives/ikiwiki/directive/poll.de.po
new file mode 100644
index 000000000..1a4e6b5c4
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/poll.de.po
@@ -0,0 +1,87 @@
+# German translation of directives/ikiwiki/directive/poll page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:06+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `poll` directive is supplied by the [[!iki plugins/poll desc=poll]] "
+"plugin."
+msgstr ""
+"Die `poll`-Anweisung wird durch die [[!iki plugins/poll desc=poll]]-Erweiterung "
+"bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows you to create online polls in the wiki. Here's an "
+"example use:"
+msgstr ""
+"Diese Anweisung erlaubt es, Online-Umfragen im Wiki durchzuführen. Zum Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!poll 0 \"red\" 0 \"green\" 0 \"blue\"]]\n"
+msgstr "\t\\[[!poll 0 \"red\" 0 \"green\" 0 \"blue\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The numbers indicate how many users voted for that choice. When a user votes "
+"for a choice in the poll, the page is modified and the number incremented."
+msgstr ""
+"Die Zahlen geben an, wie viele Benutzer für diese Möglichkeit gestimmt haben. "
+"Wenn ein Benutzer seine Stimme abgibt, wird die Seite modifiziert und die "
+"entsprechende Zahl hochgezählt."
+
+#. type: Plain text
+msgid ""
+"While some basic precautions are taken to prevent users from accidentially "
+"voting twice, this sort of poll should not be counted on to be very "
+"accurate; all the usual concerns about web based polling apply. Unless the "
+"page that the poll is in is locked, users can even edit the page and change "
+"the numbers!"
+msgstr ""
+"Obwohl einige einfache Vorsichtsmaßnahmen getroffen wurden, damit Benutzer nicht "
+"ausversehen mehrmals abstimmen, sollte diese Art Umfrage nicht als besonders "
+"verlässlich angesehen werden; alle üblichen Bedenken bezüglich webbasierten "
+"Abstimmungen treffen zu. Wenn die Seite mit der Abstimmung nicht zum Bearbeiten "
+"gesperrt ist, können Benutzer sogar direkt die Zahlen verändern!"
+
+#. type: Plain text
+msgid "Parameters:"
+msgstr "Parameter:"
+
+#. type: Bullet: '* '
+msgid ""
+"`open` - Whether voting is still open. Set to \"no\" to close the poll to "
+"voting."
+msgstr ""
+"`open` - Ob die Abstimmung noch offen ist. Beim Wert `no` werden keine weiteren "
+"Stimmen angenommen."
+
+#. type: Bullet: '* '
+msgid "`total` - Show total number of votes at bottom of poll. Default is \"yes\"."
+msgstr ""
+"`total` - Zeige die bisherige Anzahl der Stimmen unterhalb des "
+"Abstimmungsformulars an. Voreingestellt ist `yes`."
+
+#. type: Bullet: '* '
+msgid "`percent` - Whether to display percents. Default is \"yes\"."
+msgstr ""
+"`percent` - Ob Prozentzahlen angezeigt werden sollen. Voreingestellt ist `yes`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/polygen.de.po b/po/underlays/directives/ikiwiki/directive/polygen.de.po
new file mode 100644
index 000000000..8b7f46557
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/polygen.de.po
@@ -0,0 +1,50 @@
+# German translation of directives/ikiwiki/directive/polygen page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:06+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `polygen` directive is supplied by the [[!iki plugins/polygen "
+"desc=polygen]] plugin."
+msgstr ""
+"Die `polygen`-Anweisung wird durch die [[!iki plugins/polygen "
+"desc=polygen]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows inserting text generated by polygen into a wiki page.  "
+"For example:"
+msgstr ""
+"Diese Anweisung erlaubt es, durch *polygen* erzeugten Text in eine "
+"Wiki-Seite einzubinden. Zum Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!polygen grammar=\"genius\"]]\n"
+msgstr "\t\\[[!polygen grammar=\"genius\"]]\n"
+
+#. type: Plain text
+msgid ""
+"It's also possible to specify a starting nonterminal for the grammar by "
+"including `symbol=\"text\"` in the directive."
+msgstr ""
+"Es ist auch möglich, ein Start-Nichtterminal für die Grammatik anzugeben, "
+"indem `symbol=\"text\"` mit in der Anweisung angegeben wird."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/postsparkline.de.po b/po/underlays/directives/ikiwiki/directive/postsparkline.de.po
new file mode 100644
index 000000000..140774bcc
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/postsparkline.de.po
@@ -0,0 +1,149 @@
+# German translation of directives/ikiwiki/directive/postsparkline page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:07+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `postsparkline` directive is supplied by the [[!iki "
+"plugins/postsparkline desc=postsparkline]] plugin."
+msgstr ""
+"Die `postsparkline`-Anweisung wird durch die [[!iki "
+"plugins/postsparkline desc=postsparkline]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive uses the [[!iki plugins/sparkline desc=sparkline]] plugin to "
+"create a [[sparkline]] of statistics about a set of pages, such as posts to "
+"a blog."
+msgstr ""
+"Diese Anweisung verwendet die [[!iki plugins/sparkline "
+"desc=sparkline]]-Erweiterung, um eine [[sparkline]] mit Statistiken über "
+"bestimmte Seiten anzuzeigen, etwa über Einträge in einem Blog."
+
+#. type: Title #
+#, no-wrap
+msgid "examples"
+msgstr "Beispiele"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tPost interval: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=100\n"
+"\tformula=interval style=bar barwidth=2 barspacing=1 height=13]]\n"
+msgstr ""
+"\tIntervall der Einträge: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=100\n"
+"\tformula=interval style=bar barwidth=2 barspacing=1 height=13]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tPosts per month this year: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=12\n"
+"\tformula=permonth style=bar barwidth=2 barspacing=1 height=13]]\n"
+msgstr ""
+"\tEinträge pro Monat in diesem Jahr: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=12\n"
+"\tformula=permonth style=bar barwidth=2 barspacing=1 height=13]]\n"
+
+#. type: Title #
+#, no-wrap
+msgid "usage"
+msgstr "Verwendung"
+
+#. type: Plain text
+msgid ""
+"All options aside from the `pages`, `max`, `formula`, `time`, and `color` "
+"options are the same as in [[sparkline]] directive."
+msgstr ""
+"Alle Parameter außer `pages`, `max`, `formula`, `time` und `color` sind die "
+"gleichen wie in der [[sparkline]]-Anweisung."
+
+#. type: Plain text
+msgid ""
+"You don't need to specify any data points (though you can if you want to).  "
+"Instead, data points are automatically generated based on the creation times "
+"of pages matched by the specified `pages` [[ikiwiki/PageSpec]]. A maximum of "
+"`max` data points will be generated."
+msgstr ""
+"Es müssen keine Datenpunkte angegeben werden (auch wenn dies möglich ist). "
+"Stattdessen werden die Datenpunkte ausgehend vom Erstellungsdatum der durch "
+"`pages` angegebenen Seiten (eine [[ikiwiki/PageSpec]]) automatisch generiert."
+" Es werden höchstens `max` Datenpunkte erzeugt."
+
+#. type: Plain text
+msgid ""
+"The `formula` parameter controls the formula used to generate data points.  "
+"Available formulae:"
+msgstr ""
+"Der Parameter `formula` steuert die Formel, mit der die Datenpunkte erzeugt "
+"werden. Verfügbare Formeln:"
+
+#. type: Bullet: '* '
+msgid ""
+"`interval` - The height of each point represents how long it has been since "
+"the previous post."
+msgstr ""
+"`interval` - Die Höhe jedes Punkts steht für den zeitlichen Abstand zum "
+"vorherigen Eintrag."
+
+#. type: Bullet: '* '
+msgid ""
+"`perday` - Each point represents a day; the height represents how many posts "
+"were made that day."
+msgstr ""
+"`perday` - Jeder Punkt entspricht einem Tag; die Höhe stellt die Anzahl der "
+"an diesem Tag gemachten Einträge dar."
+
+#. type: Bullet: '* '
+msgid ""
+"`permonth` - Each point represents a month; the height represents how many "
+"posts were made that month."
+msgstr ""
+"`permonth` - Jeder Punkt entspricht einem Monat; die Höhe stellt die Anzahl "
+"der in diesem Monat gemachten Einträge dar."
+
+#. type: Bullet: '* '
+msgid ""
+"`peryear` - Each point represents a year; the height represents how many "
+"posts were made that year."
+msgstr ""
+"`peryear` -  Jeder Punkt entspricht einem Jahr; die Höhe stellt die Anzahl "
+"der in diesem Jahr gemachten Einträge dar."
+
+#. type: Plain text
+msgid ""
+"The `time` parameter has a default value of \"ctime\", since formulae use "
+"the creation times of pages by default. If you instead want them to use the "
+"modification times of pages, set it to \"mtime\"."
+msgstr ""
+"Der Parameter `time` hat standardmäßig den Wert `ctime` und es werden die "
+"Erstellungszeiten der Seiten verwendet. Sollen stattdessen die "
+"Änderungszeiten verwendet werden, kann `mtime` angegeben werden."
+
+#. type: Plain text
+msgid ""
+"To change the color used to draw the sparkline, use the `color` parameter.  "
+"For example, \"color=red\"."
+msgstr ""
+"Die Farbe der sparkline kann mit dem Parameter `color` verändert werden, "
+"etwa durch `color=red`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/progress.de.po b/po/underlays/directives/ikiwiki/directive/progress.de.po
new file mode 100644
index 000000000..72ad7a134
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/progress.de.po
@@ -0,0 +1,68 @@
+# German translation of directives/ikiwiki/directive/progress page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:07+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `progress` directive is supplied by the [[!iki plugins/progress "
+"desc=progress]] plugin."
+msgstr ""
+"Die `progress`-Anweisung wird durch die [[!iki plugins/progress "
+"desc=progress]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid "This directive generates a progress bar."
+msgstr "Diese Anweisung erzeugt einen Fortschrittsbalken."
+
+#. type: Plain text
+msgid ""
+"There are two possible parameter sets.  The first is a single parameter "
+"\"percent\" which holds a percentage figure of how complete the progress bar "
+"is."
+msgstr ""
+"Es gibt zwei mögliche Parameter-Mengen. Die erste besteht aus dem einzelnen "
+"Parameter `percent`, der die Prozentzahl enthält, wie vollständig der "
+"Fortschrittsbalken ist."
+
+#. type: Plain text
+msgid ""
+"The second possible set of parameters is a pair of [[ikiwiki/PageSpec]]s, "
+"`totalpages` and `donepages`. The directive counts the number of pages in "
+"each pagespec and shows the percentage of the total pages that are done."
+msgstr ""
+"Die zweite mögliche Parameter-Menge ist ein Paar von [[ikiwiki/PageSpec]]s, "
+"`totalpages` und `donepages`. Die Anweisung zählt dann jeweils die passenden "
+"Seiten und zeigt an, welcher Anteil der Seiten fertig ist."
+
+#. type: Plain text
+msgid "For example, to show what percentage of pages have discussion pages:"
+msgstr ""
+"Zum Beispiel kann man anzeigen, welcher Anteil der Seiten eine "
+"Diskussionsseite haben:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!progress totalpages=\"* and !*/Discussion\" "
+"donepages=\"*/Discussion\"]]\n"
+msgstr ""
+"\t\\[[!progress totalpages=\"* and !*/Discussion\" "
+"donepages=\"*/Discussion\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/shortcut.de.po b/po/underlays/directives/ikiwiki/directive/shortcut.de.po
new file mode 100644
index 000000000..7d5616b3f
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/shortcut.de.po
@@ -0,0 +1,46 @@
+# German translation of directives/ikiwiki/directive/shortcut page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:07+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `shortcut` directive is supplied by the [[!iki plugins/shortcut "
+"desc=shortcut]] plugin."
+msgstr ""
+"Die `shortcut`-Anweisung wird durch die [[!iki plugins/shortcut "
+"desc=shortcut]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows external links to commonly linked to sites to be made "
+"more easily using shortcuts."
+msgstr ""
+"Diese Anweisung erlaubt es, Links auf häufig verwendete externe Seiten "
+"einfacher zu setzen."
+
+#. type: Plain text
+msgid ""
+"The available shortcuts are defined on the [[shortcuts]] page in the "
+"wiki. The `shortcut` directive can only be used on that page."
+msgstr ""
+"Die verfügbaren Abkürzungen werden im Wiki auf der Seite [[shortcuts]] "
+"definiert. Die `shortcut`-Anweisung kann nur auf dieser Seite verwendet "
+"werden."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/sparkline.de.po b/po/underlays/directives/ikiwiki/directive/sparkline.de.po
new file mode 100644
index 000000000..f1a5ac44a
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/sparkline.de.po
@@ -0,0 +1,178 @@
+# German translation of directives/ikiwiki/directive/sparkline page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:08+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `sparkline` directive is supplied by the [[!iki plugins/sparkline "
+"desc=sparkline]] plugin."
+msgstr ""
+"Die `sparkline`-Anweisung wird durch die [[!iki plugins/sparkline "
+"desc=sparkline]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows for embedding sparklines into wiki pages. A sparkline "
+"is a small word-size graphic chart, that is designed to be displayed "
+"alongside text."
+msgstr ""
+"Diese Anweisung erlaubt es, sparklines in Wiki-Seiten einzubetten. Eine "
+"sparkline ist eine kleine Graphik, die so groß wie ein Wort ist und sich "
+"deshalb zur Anzeige neben Text eignet."
+
+#. type: Title #
+#, no-wrap
+msgid "examples"
+msgstr "Beispiele"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!sparkline 1 3 5 -3 10 0 width=40 height=16\n"
+"\tfeaturepoint=\"4,-3,red,3\" featurepoint=\"5,10,green,3\"]]\n"
+msgstr ""
+"\t\\[[!sparkline 1 3 5 -3 10 0 width=40 height=16\n"
+"\tfeaturepoint=\"4,-3,red,3\" featurepoint=\"5,10,green,3\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This creates a simple line graph, graphing several points.  It will be drawn "
+"40 pixels wide and 16 pixels high. The high point in the line has a green "
+"marker, and the low point has a red marker."
+msgstr ""
+"Dies erzeugt eine einfache Liniengrafik, die aus mehreren Punkten besteht. "
+"Sie wird mit 40 Pixel Breite und 16 Pixel Höhe erzeugt. Der hohe Punkt auf "
+"der Linie hat eine grüne Markierung, der niedrige eine rote."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar "
+"barwidth=2\n"
+"\tbarspacing=1 height=13]]\n"
+msgstr ""
+"\t\\[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar "
+"barwidth=2\n"
+"\tbarspacing=1 height=13]]\n"
+
+#. type: Plain text
+msgid ""
+"This more complex example generates a bar graph.  The bars are 2 pixels "
+"wide, and separated by one pixel, and the graph is 13 pixels tall. Width is "
+"determined automatically for bar graphs. The points with negative values are "
+"colored red, instead of the default black."
+msgstr ""
+"Dies ist ein komplexeres Beispiel, das eine Balkengrafik erzeugt. Die Balken "
+"sind 2 Pixel breit und werden durch ein Pixel getrennt; die Grafik ist 14 "
+"Pixel hoch. Die Breite für Balkengrafiken automatisch bestimmt. Punkte mit "
+"negativen Werten haben abweichend vom voreingestellten Schwarz die Farbe rot."
+
+#. type: Title #
+#, no-wrap
+msgid "usage"
+msgstr "Verwendung"
+
+#. type: Plain text
+msgid ""
+"The form for the data points is \"x,y\", or just \"y\" if the x values don't "
+"matter. Bar graphs can also add \"(color)\" to specify a color for that bar."
+msgstr ""
+"Die Form für Datenpunkte ist `x,y`, oder einfach nur `y`, wenn die x-Werte "
+"unerheblich sind. Balkengrafiken können auch `(color)` hinzufügen, um eine "
+"Farbe für den Balken anzugeben."
+
+#. type: Plain text
+msgid ""
+"The following named parameters are recognised. Most of these are the same as "
+"those used by the underlying sparkline library, which is documented in more "
+"detail in [its wiki](http://sparkline.wikispaces.com/usage)."
+msgstr ""
+"Die folgenden benannten Parameter werden erkannt. Die meisten entsprechen "
+"denen der zugrundeliegenden sparkline-Bibliothek, die [in ihrem "
+"Wiki](http://sparkline.wikispaces.com/usage) genauer beschrieben wird."
+
+#. type: Bullet: '* '
+msgid "`style` - Either \"line\" (the default) or \"bar\"."
+msgstr "`style` - Entweder `line` (die Voreinstellung) oder `bar`."
+
+#. type: Bullet: '* '
+msgid "`width` - Width of the graph in pixels. Only needed for line graphs."
+msgstr ""
+"`width` - Die Breite der Grafik in Pixeln. Wird nur für Linien-Grafiken "
+"benötigt."
+
+#. type: Bullet: '* '
+msgid "`height` - Height of the graph in pixels. Defaults to 16."
+msgstr "`height` - Höhe des Grafen in Pixeln. Voreingestellt sind 16."
+
+#. type: Bullet: '* '
+msgid "`barwidth` - Width of bars in a bar graph. Default is 1 pixel."
+msgstr ""
+"`barwidth` - Breite der Balken in einer Balkengrafik. Voreingestellt ist 1 "
+"Pixel."
+
+#. type: Bullet: '* '
+msgid ""
+"`barspacing` - Spacing between bars in a bar graph, in pixels. Default is 1 "
+"pixel."
+msgstr ""
+"`barspacing` - Abstand zwischen den Balken einer Balkengrafik in Pixeln. "
+"Voreingestellt ist 1 Pixel."
+
+#. type: Bullet: '* '
+msgid ""
+"`ymin`, `ymax` - Minimum and maximum values for the Y axis. This is normally "
+"calculated automatically, but can be explicitly specified to get the same "
+"values for multiple related graphs."
+msgstr ""
+"`ymin`, `ymax` - Minimaler und maximaler Wert für die y-Achse. Dies wird "
+"normalerweise automatisch berechnet, kann aber auch explizit angegeben "
+"werden, um mehrere verwandte Grafiken zu erhalten."
+
+#. type: Bullet: '* '
+msgid ""
+"`featurepoint` - Adds a circular marker to a line graph, with optional "
+"text. This can be used to label significant points."
+msgstr ""
+"`featurepoint` - Fügt eine kreisförmige Markierung zu einer Liniengrafik "
+"hinzu, mit optionalem Text. So können bedeutsame Punkte beschriftet werden."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  The value is a comma-delimited list of parameters specifying the feature\n"
+"  point: X value, Y value, color name, circle diameter, text (optional),\n"
+"  and text location (optional). Example: `featurepoint=\"3,5,blue,3\"`\n"
+msgstr ""
+"  Der Wert ist eine Komma-separierte Liste von Parametern, die den\n"
+"  hervorzuhebenden Punkt angeben: x-Wert, y-Wert, Farbname,\n"
+"  Kreisdurchmesser, Text (optional) und Platzierung des Textes (optional).\n"
+"  Beispiel: `featurepoint=\"3,5,blue,3\"`\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  Available values for the text location are: \"top\", \"right\", "
+"\"bottom\", and\n"
+"  \"left\".\n"
+msgstr ""
+"  Verfügbare Werte für die Platzierung des Textes sind `top`,\n"
+"  `right`, `bottom` und `left`.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/table.de.po b/po/underlays/directives/ikiwiki/directive/table.de.po
new file mode 100644
index 000000000..414bfc68c
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/table.de.po
@@ -0,0 +1,147 @@
+# German translation of directives/ikiwiki/directive/table page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:08+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `table` directive is supplied by the [[!iki plugins/table desc=table]] "
+"plugin."
+msgstr ""
+"Die `table`-Anweisung wird durch die [[!iki plugins/table "
+"desc=table]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive can build HTML tables from data in CSV (comma-separated "
+"values)  or DSV (delimiter-separated values) format."
+msgstr ""
+"Diese Anweisung kann HTML-Tabellen aus Daten im CSV-Format (Komma-separierte "
+"Werte) oder DSV-Format (Trennzeichen-separierte Werte) erzeugen."
+
+#. type: Title ##
+#, no-wrap
+msgid "examples"
+msgstr "Beispiele"
+
+#. type: Plain text
+#:
+#, no-wrap
+msgid "\t\\[[!table data=\"\"\"\n"
+msgstr "\t\\[[!table data=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tCustomer|Amount\n"
+"\tFulanito|134,34\n"
+"\tMenganito|234,56\n"
+"\tMenganito|234,56\n"
+msgstr ""
+"\tKunde|Betrag\n"
+"\tFulanito|134,34\n"
+"\tMenganito|234,56\n"
+"\tMenganito|234,56\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!table class=\"book_record\" format=csv "
+"file=\"data/books/record1\"]]\n"
+msgstr ""
+"\t\\[[!table class=\"book_record\" format=csv "
+"file=\"data/books/record1\"]]\n"
+
+#. type: Plain text
+msgid "In this second example the `record1` page should be similar to:"
+msgstr ""
+"Im zweiten Beispiel sollte die `record1`-Seite ähnlich wie das Folgende "
+"aussehen:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\"Title\",\"Perl Best Practices\"\n"
+"\t\"Author\",\"Damian Conway\"\n"
+"\t\"Publisher\",\"O’Reilly\"\n"
+msgstr ""
+"\t\"Title\",\"Perl Best Practices\"\n"
+"\t\"Author\",\"Damian Conway\"\n"
+"\t\"Publisher\",\"O’Reilly\"\n"
+
+#. type: Plain text
+msgid ""
+"To make a cell span multiple columns, follow it with one or more empty "
+"cells. For example:"
+msgstr ""
+"Um eine Zelle zu erhalten, die über mehrere Spalten geht, kann man die "
+"folgenden Zellen leer lassen. Zum Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tleft||right|\n"
+"\ta|b|c|d\n"
+"\tthis cell spans 4 columns|||\n"
+msgstr ""
+"\tlinks||rechts|\n"
+"\ta|b|c|d\n"
+"\tdiese Zelle geht über 4 Spalten|||\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "usage"
+msgstr "Verwendung"
+
+#. type: Bullet: '* '
+msgid "`data` - Values for the table."
+msgstr "`data` - Werte für die Tabelle."
+
+#. type: Bullet: '* '
+msgid "`file` - A file in the wiki containing the data."
+msgstr "`file` - Eine Datei im Wiki, die die Daten enthält."
+
+#. type: Bullet: '* '
+msgid ""
+"`format` - The format of the data, either \"csv\", \"dsv\", or \"auto\" (the "
+"default)."
+msgstr ""
+"`format` - Das Format der Daten, entweder `csv`, `dsv` oder `auto` "
+"(letzteres ist voreingestellt)."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* `delimiter` - The character used to separate fields. By default,\n"
+"   DSV format uses a pipe (`|`), and CSV uses a comma (`,`).\n"
+"* `class` - A CSS class for the table html element.\n"
+"* `header` - By default, or if set to \"row\", the first data line is used\n"
+"  as the table header. Set it to \"no\" to make a table without a header, "
+"or\n"
+"  \"column\" to make the first column be the header.\n"
+msgstr ""
+"* `delimiter` - Das Zeichen, durch das die Zellen getrennt werden.\n"
+"  Im DSV-Format ist der senkrechte Strich (`|`) voreingestellt, im\n"
+"  CSV-Format das Komma (`,`).\n"
+"* `class` - Eine CSS-Klasse für das HTML-Element &lt;table&gt;.\n"
+"* `header` - In der Voreinstellung, oder wenn `row` angegeben wird,\n"
+"  wird die erste Zeile der Daten als Tabellenüberschrift verwendet.\n"
+"  Mit `no` wird eine Tabelle ohne Überschrift erzeugt, mit `column`\n"
+"  wird die erste Spalte als Überschrift verwendet.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/tag.de.po b/po/underlays/directives/ikiwiki/directive/tag.de.po
new file mode 100644
index 000000000..226900b59
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/tag.de.po
@@ -0,0 +1,112 @@
+# German translation of directives/ikiwiki/directive/tag page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:08+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `tag` and `taglink` directives are supplied by the [[!iki plugins/tag "
+"desc=tag]] plugin."
+msgstr ""
+"Die `tag`- und `taglink`-Anweisungen werden durch die [[!iki plugins/tag "
+"desc=tag]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid "These directives allow tagging pages. List tags as follows:"
+msgstr ""
+"Diese Anweisungen erlauben es, Seiten mit einer Markierung (englisch *tag*) "
+"zu versehen. Diese werden wie folgt angegeben:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!tag tech life linux]]\n"
+msgstr "\t\\[[!tag tech life linux]]\n"
+
+#. type: Plain text
+msgid ""
+"The tags work the same as if you had put a (hidden) [[ikiwiki/WikiLink]] on "
+"the page for each tag, so you can use a [[ikiwiki/PageSpec]] match all pages "
+"that are tagged with a given tag, for example. The tags will also show up on "
+"blog entries and at the bottom of the tagged pages, as well as in RSS and "
+"Atom feeds."
+msgstr ""
+"Die Markierungen verhalten sich genauso, wie wenn ein (versteckter) "
+"[[ikiwiki/WikiLink]] für jede Markierung vorhanden wäre. Man kann also zum "
+"Beispiel eine [[ikiwiki/PageSpec]] verwenden, um alle Seiten zu erfassen, "
+"die eine bestimmte Markierung tragen. In Blogeinträgen werden die "
+"Markierungen auch am Ende der markierten Seiten und in RSS- und Atom-Feeds "
+"angezeigt."
+
+#. type: Plain text
+msgid ""
+"If you want a visible [[ikiwiki/WikiLink]] along with the tag, use taglink "
+"instead:"
+msgstr ""
+"Wenn gleichzeitig mit dem Tag ein sichtbarer [[ikiwiki/WikiLink]] erzeugt "
+"werden soll, kann stattdessen `taglink` verwendet werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!taglink foo]]\n"
+"\t\\[[!taglink tagged_as_foo|foo]]\n"
+msgstr ""
+"\t\\[[!taglink foo]]\n"
+"\t\\[[!taglink markiert_als_foo|foo]]\n"
+
+#. type: Plain text
+msgid ""
+"Note that if the wiki is configured to use a tagbase, then the tags will be "
+"located under a base directory, such as \"tags/\". This is a useful way to "
+"avoid having to write the full path to tags, if you want to keep them "
+"grouped together out of the way."
+msgstr ""
+"Wenn im Wiki eine zu verwendende `tagbase` konfiguriert ist, tauchen die "
+"Markierungen unterhalb dieses Verzeichnisses auf, etwa unter \"tags/\". Auf "
+"diese Weise muss man nicht den kompletten Pfad zu den Markierungen angeben, "
+"wenn man sie gruppieren und getrennt von den restlichen Seiten halten will."
+
+#. type: Plain text
+msgid ""
+"Bear in mind that specifying a tagbase means you will need to incorporate it "
+"into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is "
+"`tag`, you would match pages tagged \"foo\" with `link(tag/foo)`."
+msgstr ""
+"In der `link()`-[[ikiwiki/PageSpec]] muss diese `tagbase` allerdings "
+"angegeben werden. Wenn zum Beispiel `tag` als `tagbase` verwendet wird, "
+"können die mit \"foo\" markierten Seiten durch `link(tag/foo)` ausgewählt "
+"werden."
+
+#. type: Plain text
+msgid ""
+"If you want to override the tagbase for a particular tag, you can use "
+"something like this:"
+msgstr ""
+"Wenn für eine einzelne Markierung eine abweichende `tagbase` verwendet "
+"werden soll, kann etwas wie das Folgende verwendet werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!tag ./foo]]\n"
+"\t\\[[!taglink /foo]]\n"
+msgstr ""
+"\t\\[[!tag ./foo]]\n"
+"\t\\[[!taglink /foo]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/taglink.de.po b/po/underlays/directives/ikiwiki/directive/taglink.de.po
new file mode 100644
index 000000000..769347eeb
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/taglink.de.po
@@ -0,0 +1,25 @@
+# German translation of directives/ikiwiki/directive/taglink page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 11:31+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/tag]]\n"
+msgstr "[[!meta redir=/ikiwiki/directive/tag]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
diff --git a/po/underlays/directives/ikiwiki/directive/template.de.po b/po/underlays/directives/ikiwiki/directive/template.de.po
new file mode 100644
index 000000000..a153cfc94
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/template.de.po
@@ -0,0 +1,71 @@
+# German translation of directives/ikiwiki/directive/template page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:09+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `template` directive is supplied by the [[!iki plugins/template "
+"desc=template]] plugin."
+msgstr ""
+"Die `template`-Anweisung wird durch die [[!iki plugins/template "
+"desc=template]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"[[Templates]] are files that can be filled out and inserted into pages in "
+"the wiki, by using the template directive. The directive has an `id` "
+"parameter that identifies the template to use. The remaining parameters are "
+"used to fill out the template."
+msgstr ""
+"[[Vorlagen|templates]] sind Dateien, die ausgefüllt und in Wiki-Seiten "
+"eingefügt werden können, indem die template-Anweisung verwendet wird. Die "
+"Anweisung hat einen `id`-Parameter, der die zu verwendende Vorlage "
+"identifiziert. Die restlichen Parameter werden verwendet, um die Vorlage "
+"auszufüllen."
+
+#. type: Plain text
+msgid "Example:"
+msgstr "Beispiel:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
+"note.\"\"\"]]\n"
+msgstr ""
+"\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine Notiz "
+"eingefügt werden soll.\"\"\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This fills out the `note` template, filling in the `text` field with the "
+"specified value, and inserts the result into the page."
+msgstr ""
+"Dies füllt die Vorlage `note` aus, wobei das Feld `text` mit dem angegebenen "
+"Wert gefüllt wird, und fügt das Ergebnis in die Seite ein."
+
+#. type: Plain text
+msgid ""
+"For a list of available templates, and details about how to create more, see "
+"the [[templates]] page."
+msgstr ""
+"Auf der [[Vorlagen|templates]]-Seite gibt es eine Liste der verfügbaren "
+"Vorlagen und auch eine Anleitung, wie weitere angelegt werden können."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/testpagespec.de.po b/po/underlays/directives/ikiwiki/directive/testpagespec.de.po
new file mode 100644
index 000000000..22da164e3
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/testpagespec.de.po
@@ -0,0 +1,84 @@
+# German translation of directives/ikiwiki/directive/testpagespec page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:09+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `testpagespec` directive is supplied by the [[!iki plugins/testpagespec "
+"desc=testpagespec]] plugin."
+msgstr ""
+"Die `testpagespec`-Anweisung wird durch die [[!iki plugins/testpagespec "
+"desc=testpagespec]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"This directive allows testing a [[ikiwiki/PageSpec]] to see if it matches a "
+"page, and to see the part that matches, or causes the match to fail."
+msgstr ""
+"Mit dieser Anweisung kann geprüft werden, ob eine [[ikiwiki/PageSpec]] auf eine "
+"Seite passt. Sie zeigt außerdem an, welcher Teil das Passen oder Nicht-Passen "
+"verursacht."
+
+#. type: Plain text
+msgid "Example uses:"
+msgstr "Beispiele zur Verwendung:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!testpagespec pagespec=\"foopage and barpage\" match=\"foopage\"]]\n"
+msgstr ""
+"\t\\[[!testpagespec pagespec=\"foopage and barpage\" match=\"foopage\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This will print out something like \"no match: barpage does not match "
+"foopage\", highlighting which part of the [[ikiwiki/PageSpec]] is causing "
+"the match to fail."
+msgstr ""
+"Dies wird etwas wie \"no match: barpage does not match foopage\" anzeigen und "
+"damit darauf hinweisen, welcher Teil der [[ikiwiki/PageSpec]] ein Passen "
+"verhindert."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!testpagespec pagespec=\"foopage or !bar*\" match=\"barpage\"]]\n"
+msgstr "\t\\[[!testpagespec pagespec=\"foopage or !bar*\" match=\"barpage\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This will print out something like \"no match: bar* matches barpage\", since "
+"the part of the [[ikiwiki/PageSpec]] that fails is this negated match."
+msgstr ""
+"Dies wird etwas wie \"no match: bar* matches barpage\" anzeigen, weil der Teil "
+"der das Passen verhindert negiert ist."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!testpagespec pagespec=\"foopage or barpage\" match=\"barpage\"]]\n"
+msgstr "\t\\[[!testpagespec pagespec=\"foopage or barpage\" match=\"barpage\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This will print out something like \"match: barpage matches barpage\", "
+"indicating the part of the [[ikiwiki/PageSpec]] that caused it to match."
+msgstr ""
+"Dies wird etwas wie \"match: barpage matches barpage\" anzeigen und damit "
+"angeben, welcher Teil der [[ikiwiki/PageSpec]] passt."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/teximg.de.po b/po/underlays/directives/ikiwiki/directive/teximg.de.po
new file mode 100644
index 000000000..f0553e7c9
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/teximg.de.po
@@ -0,0 +1,84 @@
+# German translation of directives/ikiwiki/directive/teximg page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:09+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `teximg` directive is supplied by the [[!iki plugins/teximg "
+"desc=teximg]] plugin."
+msgstr ""
+"Die `teximg`-Anweisung wird durch die [[!iki plugins/teximg "
+"desc=teximg]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid "This directive renders LaTeX formulas into images."
+msgstr "Diese Anweisung wandelt LaTeX-Formeln in Bilder um."
+
+#. type: Title ##
+#, no-wrap
+msgid "examples"
+msgstr "Beispiele"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\"]]\n"
+"\t\\[[!teximg code=\"E = - \\frac{Z^2 \\cdot  \\mu \\cdot e^4}{32\\pi^2 "
+"\\epsilon_0^2 \\hbar^2 n^2}\" ]]\n"
+msgstr ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\"]]\n"
+"\t\\[[!teximg code=\"E = - \\frac{Z^2 \\cdot  \\mu \\cdot e^4}{32\\pi^2 "
+"\\epsilon_0^2 \\hbar^2 n^2}\" ]]\n"
+
+#. type: Plain text
+msgid "To scale the image, use height=x:"
+msgstr ""
+"Um die Größe des Bilds zu verändern, kann `height=y` angegeben werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"17\"]]\n"
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"8\"]]\n"
+msgstr ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"17\"]]\n"
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"8\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If no height is chosen the default height 12 is used. Valid heights are: 8, "
+"9, 10, 11, 12, 14, 17, 20. If another height is entered, the closest "
+"available height is used."
+msgstr ""
+"Wenn keine Höhe angegeben wird, wird 12 verwendet. Zulässige Höhen sind 8, "
+"9, 10, 11, 12, 14, 17 und 20. Wird eine andere Höhe angegeben, wird "
+"stattdessen die nächste zulässige verwendet."
+
+#. type: Plain text
+msgid "To add an alt text to the image, use alt=\"text\":"
+msgstr ""
+"Um einen `alt`-Text zu dem Bild hinzuzufügen, kann `alt=\"Text\"` verwendet "
+"werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!teximg code=\"\\frac{1}{2}\" alt=\"1/2\"]]\n"
+msgstr "\t\\[[!teximg code=\"\\frac{1}{2}\" alt=\"1/2\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/toc.de.po b/po/underlays/directives/ikiwiki/directive/toc.de.po
new file mode 100644
index 000000000..c2ddda74c
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/toc.de.po
@@ -0,0 +1,85 @@
+# German translation of directives/ikiwiki/directive/toc page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:10+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid "The `toc` directive is supplied by the [[!iki plugins/toc desc=toc]] plugin."
+msgstr ""
+"Die `toc`-Anweisung wird durch die [[!iki plugins/toc desc=toc]]-Erweiterung "
+"bereitgestellt."
+
+#. type: Plain text
+msgid "Add a table of contents to a page:"
+msgstr "Sie fügt ein Inhaltsverzeichnis in eine Seite ein:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc ]]\n"
+msgstr "\t\\[[!toc ]]\n"
+
+#. type: Plain text
+msgid ""
+"The table of contents will be automatically generated based on the headers "
+"of the page. By default only the largest headers present on the page will be "
+"shown; to control how many levels of headers are shown, use the `levels` "
+"parameter:"
+msgstr ""
+"Das Inhaltsverzeichnis wird automatisch ausgehend von den Überschriften der Seite "
+"erzeugt. In der Voreinstellung werden nur die größten Überschriften der Seite "
+"angezeigt; mit dem Parameter `levels` kann aber die Anzahl der angezeigten "
+"Überschriftsebenen gesteuert werden:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc levels=2]]\n"
+msgstr "\t\\[[!toc levels=2]]\n"
+
+#. type: Plain text
+msgid ""
+"The toc directive will take the level of the first header as the topmost "
+"level, even if there are higher levels seen later in the file."
+msgstr ""
+"Die `toc`-Anweisung verwendet die Ebene der ersten Überschrift als die oberste, "
+"selbst wenn es weiter unten in der Datei höhere Überschriften gibt."
+
+#. type: Plain text
+msgid ""
+"To create a table of contents that only shows headers starting with a given "
+"level, use the `startlevel` parameter. For example, to show only h2 and "
+"smaller headers:"
+msgstr ""
+"Um in einem Inhaltsverzeichnis nur die Überschriften beginnend mit einer "
+"bestimmten Ebene anzuzeigen, kann der `startlevel`-Parameter verwendet werden. "
+"Zum Beispiel, um nur &lt;h2&gt;- und kleinere Überschriften anzuzeigen:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc startlevel=2]]\n"
+msgstr "\t\\[[!toc startlevel=2]]\n"
+
+#. type: Plain text
+msgid ""
+"The table of contents will be created as an ordered list. If you want an "
+"unordered list instead, you can change the list-style in your local style "
+"sheet."
+msgstr ""
+"Das Inhaltsverzeichnis wird als nummerierte Liste erzeugt. Um eine ungeordnete "
+"Liste zu erhalten, kann `list-style` im lokalen Stylesheet verändert werden."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/toggle.de.po b/po/underlays/directives/ikiwiki/directive/toggle.de.po
new file mode 100644
index 000000000..6c316c5e4
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/toggle.de.po
@@ -0,0 +1,113 @@
+# German translation of directives/ikiwiki/directive/toggle page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:10+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `toggle` and `toggleable` directives are supplied by the [[!iki "
+"plugins/toggle desc=toggle]] plugin."
+msgstr ""
+"Die `toggle`- und `toggleable`-Anweisungen werden durch die [[!iki "
+"plugins/toggle desc=toggle]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid ""
+"With these directives you can create links on pages that, when clicked, "
+"toggle display of other parts of the page."
+msgstr ""
+"Mit diesen Anweisungen kann man auf Seiten Links erstellen, die beim "
+"Anklicken andere Teile der Seite anzeigen."
+
+#. type: Plain text
+msgid ""
+"It uses javascript to accomplish this; browsers without javascript will "
+"always see the full page content."
+msgstr ""
+"Um dies zu erreichen, wird Javascript verwendet; Browser ohne Javascript "
+"sehen immer den kompletten Inhalt."
+
+#. type: Plain text
+msgid "Example use:"
+msgstr "Beispiel für die Benutzung:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toggle id=\"ipsum\" text=\"show\"]]\n"
+msgstr "\t\\[[!toggle id=\"ipsum\" text=\"anzeigen\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toggleable id=\"ipsum\" text=\"\"\"\n"
+msgstr "\t\\[[!toggleable id=\"ipsum\" text=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\n"
+"\teiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim\n"
+"\tad minim veniam, quis nostrud exercitation ullamco laboris nisi ut\n"
+"\taliquip ex ea commodo consequat.\n"
+msgstr ""
+"\tLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\n"
+"\teiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim\n"
+"\tad minim veniam, quis nostrud exercitation ullamco laboris nisi ut\n"
+"\taliquip ex ea commodo consequat.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t[[!toggle id=\"ipsum\" text=\"hide\"]]\n"
+msgstr "\t[[!toggle id=\"ipsum\" text=\"verbergen\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Note that you can include wiki markup in the toggleable text, including even "
+"additional toggles, as shown in the above example."
+msgstr ""
+"In dem umschaltbaren Text können beliebige Wiki-Formatierungen verwendet "
+"werden, sogar wie im obigen Beispiel weitere `toggle`-Anweisungen."
+
+#. type: Plain text
+msgid ""
+"Also, the toggle and the togglable definitions do not need to be next to "
+"each other, but can be located anywhere on the page. There can also be "
+"mutiple toggles that all toggle a single togglable."
+msgstr ""
+"Außerdem müssen die Definitionen von `toggle` und `toggleable` nicht "
+"nebeneinander stehen, sondern können beliebig über die Seite verteilt werden."
+" Es kann auch mehrere `toggle` geben, die das gleiche `toggleable` "
+"umschalten."
+
+#. type: Plain text
+msgid ""
+"The id has a default value of \"default\", so can be omitted in simple "
+"cases."
+msgstr ""
+"Als `id` ist \"default\" voreingestellt, sodass diese Angabe in einfachen "
+"Fällen weggelassen werden kann."
+
+#. type: Plain text
+msgid ""
+"If you'd like a toggleable to be displayed by default, and toggle to hidden, "
+"then pass a parameter \"open=yes\" when setting up the toggleable."
+msgstr ""
+"Wenn ein `toggleable` zu Beginn angezeigt werden soll (um es dann verbergen "
+"zu können), kann bei seiner Einrichtung der Parameter `open=yes` angegeben "
+"werden."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/directives/ikiwiki/directive/toggleable.de.po b/po/underlays/directives/ikiwiki/directive/toggleable.de.po
new file mode 100644
index 000000000..db99bdb5a
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/toggleable.de.po
@@ -0,0 +1,25 @@
+# German translation of directives/ikiwiki/directive/toggleable page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 11:52+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/toggle]]\n"
+msgstr "[[!meta redir=/ikiwiki/directive/toggle]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
diff --git a/po/underlays/directives/ikiwiki/directive/version.de.po b/po/underlays/directives/ikiwiki/directive/version.de.po
new file mode 100644
index 000000000..eca114e4c
--- /dev/null
+++ b/po/underlays/directives/ikiwiki/directive/version.de.po
@@ -0,0 +1,50 @@
+# German translation of directives/ikiwiki/directive/version page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-14 14:11+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"The `version` directive is supplied by the [[!iki plugins/version "
+"desc=version]] plugin."
+msgstr ""
+"Die `version`-Anweisung wird durch die [[!iki plugins/version "
+"desc=version]]-Erweiterung bereitgestellt."
+
+#. type: Plain text
+msgid "This directive allows inserting the version of ikiwiki onto a page."
+msgstr "Diese Anweisung fügt die Version von ikiwiki in eine Seite ein."
+
+#. type: Plain text
+msgid ""
+"Whenever ikiwiki is upgraded to a new version, the page will be rebuilt, "
+"updating the version number."
+msgstr ""
+"Immer wenn ikiwiki auf eine neue Version aktualisiert wird, wird diese "
+"Seite erneuert, um die Versionsnummer zu aktualisieren."
+
+#. type: Plain text
+msgid "Use is simple:"
+msgstr "Die Verwendung ist einfach:"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!version ]]\n"
+msgstr "\t\\[[!version ]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+
diff --git a/po/underlays/smiley/smileys.de.po b/po/underlays/smiley/smileys.de.po
new file mode 100644
index 000000000..3da3037f9
--- /dev/null
+++ b/po/underlays/smiley/smileys.de.po
@@ -0,0 +1,211 @@
+# German translation of smiley/smileys page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"PO-Revision-Date: 2010-03-12 20:57+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+msgid ""
+"This page is used to control what smileys are supported by the wiki.  Just "
+"write the text of a smiley to display it."
+msgstr ""
+"Diese Seite steuert, welche Smileys von ikiwiki unterstützt werden. "
+"Schreibe einfach den Text eines Smileys in den Text, um es anzuzeigen."
+
+#. type: Bullet: '* '
+msgid "\\\\:)\t[[smileys/smile.png]]"
+msgstr "\\\\:)\t[[smileys/smile.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-)\t[[smileys/smile.png]]"
+msgstr "\\\\:-)\t[[smileys/smile.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:D\t[[smileys/biggrin.png]]"
+msgstr "\\\\:D\t[[smileys/biggrin.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-D\t[[smileys/biggrin.png]]"
+msgstr "\\\\:-D\t[[smileys/biggrin.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\B)\t[[smileys/smile2.png]]"
+msgstr "\\\\B)\t[[smileys/smile2.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\B-)\t[[smileys/smile2.png]]"
+msgstr "\\\\B-)\t[[smileys/smile2.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:))\t[[smileys/smile3.png]]"
+msgstr "\\\\:))\t[[smileys/smile3.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-))\t[[smileys/smile3.png]]"
+msgstr "\\\\:-))\t[[smileys/smile3.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\;)\t[[smileys/smile4.png]]"
+msgstr "\\\\;)\t[[smileys/smile4.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\;-)\t[[smileys/smile4.png]]"
+msgstr "\\\\;-)\t[[smileys/smile4.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:\\\t[[smileys/ohwell.png]]"
+msgstr "\\\\:\\\t[[smileys/ohwell.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-\\\t[[smileys/ohwell.png]]"
+msgstr "\\\\:-\\\t[[smileys/ohwell.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:/\t[[smileys/ohwell.png]]"
+msgstr "\\\\:/\t[[smileys/ohwell.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-/\t[[smileys/ohwell.png]]"
+msgstr "\\\\:-/\t[[smileys/ohwell.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:|\t[[smileys/neutral.png]]"
+msgstr "\\\\:|\t[[smileys/neutral.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-|\t[[smileys/neutral.png]]"
+msgstr "\\\\:-|\t[[smileys/neutral.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\>:>\t[[smileys/devil.png]]"
+msgstr "\\\\>:>\t[[smileys/devil.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\X-(\t[[smileys/angry.png]]"
+msgstr "\\\\X-(\t[[smileys/angry.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\<:(\t[[smileys/frown.png]]"
+msgstr "\\\\<:(\t[[smileys/frown.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:(\t[[smileys/sad.png]]"
+msgstr "\\\\:(\t[[smileys/sad.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-(\t[[smileys/sad.png]]"
+msgstr "\\\\:-(\t[[smileys/sad.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-?\t[[smileys/tongue.png]]"
+msgstr "\\\\:-?\t[[smileys/tongue.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:-P\t[[smileys/tongue.png]]"
+msgstr "\\\\:-P\t[[smileys/tongue.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\:o\t[[smileys/redface.png]]"
+msgstr "\\\\:o\t[[smileys/redface.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\|)\t[[smileys/tired.png]]"
+msgstr "\\\\|)\t[[smileys/tired.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\|-)\t[[smileys/tired.png]]"
+msgstr "\\\\|-)\t[[smileys/tired.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{OK}\t[[smileys/thumbs-up.png]]"
+msgstr "\\\\{OK}\t[[smileys/thumbs-up.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{X}\t[[smileys/icon-error.png]]"
+msgstr "\\\\{X}\t[[smileys/icon-error.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{i}\t[[smileys/icon-info.png]]"
+msgstr "\\\\{i}\t[[smileys/icon-info.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\(./)\t[[smileys/checkmark.png]]"
+msgstr "\\\\(./)\t[[smileys/checkmark.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\(!)\t[[smileys/idea.png]]"
+msgstr "\\\\(!)\t[[smileys/idea.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\[!]\t[[smileys/attention.png]]"
+msgstr "\\\\[!]\t[[smileys/attention.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\/!\\\t[[smileys/alert.png]]"
+msgstr "\\\\/!\\\t[[smileys/alert.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\(?)\t[[smileys/question.png]]"
+msgstr "\\\\(?)\t[[smileys/question.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{x}\t[[smileys/star_on.png]]"
+msgstr "\\\\{x}\t[[smileys/star_on.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{*}\t[[smileys/star_on.png]]"
+msgstr "\\\\{*}\t[[smileys/star_on.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{o}\t[[smileys/star_off.png]]"
+msgstr "\\\\{o}\t[[smileys/star_off.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{1}\t[[smileys/prio1.png]]"
+msgstr "\\\\{1}\t[[smileys/prio1.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{2}\t[[smileys/prio2.png]]"
+msgstr "\\\\{2}\t[[smileys/prio2.png]]"
+
+#. type: Bullet: '* '
+msgid "\\\\{3}\t[[smileys/prio3.png]]"
+msgstr "\\\\{3}\t[[smileys/prio3.png]]"
+
+#. type: Plain text
+msgid "For example: {x} B) {x}"
+msgstr "Zum Beispiel: {x} B) {x}"
+
+#. type: Plain text
+msgid ""
+"To change the supported smileys, just edit the lists on this page.  Note "
+"that the format is important; each list item should start with the text that "
+"is turned into the smiley, escaped so that users can see what produces it, "
+"followed by a [[ikiwiki/WikiLink]] to the image to display."
+msgstr ""
+"Um die unterstützten Simleys zu verändern, bearbeite einfach diese Seite. "
+"Beachte dass das Format wichtig ist: Jeder Eintrag in der Liste sollte mit "
+"dem Text zum Anzeige des Smileys beginnen (geschützt sodass Benutzer "
+"sehen können, wodurch ein Smiley erzeugt wird), gefolgt von einem "
+"[[ikiwiki/WikiLink]] auf das anzuzeigende Bild."
+
+#. type: Plain text
+msgid ""
+"/!\\ Bear in mind that the link to the image needs to be written in a way "
+"that will work if it's copied to other pages on the wiki. So be sure to "
+"include the smileys directory in the path to the file."
+msgstr ""
+"/!\\ Denke daran, dass der Link auf das Bild so geschrieben sein muss, dass "
+"er auch dann funktioniert, wenn er in andere Teile des Wikis kopiert wird. "
+"Stelle also sicher, dass das Verzeichnis der Smiley-Datei mit angegeben wird."
+
+
-- 
cgit v1.2.3


From a79c52337c1d42f18492caf0ba3da970874210c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 13:44:01 -0400
Subject: fix missing close quote on all the Content-Transfer-Encoding in the
 German po files

---
 po/underlays/basewiki/ikiwiki.de.po                            | 2 +-
 po/underlays/basewiki/ikiwiki/directive.de.po                  | 2 +-
 po/underlays/basewiki/ikiwiki/formatting.de.po                 | 2 +-
 po/underlays/basewiki/ikiwiki/markdown.de.po                   | 2 +-
 po/underlays/basewiki/ikiwiki/openid.de.po                     | 2 +-
 po/underlays/basewiki/ikiwiki/pagespec.de.po                   | 2 +-
 po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po        | 2 +-
 po/underlays/basewiki/ikiwiki/pagespec/po.de.po                | 2 +-
 po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po           | 2 +-
 po/underlays/basewiki/ikiwiki/searching.de.po                  | 2 +-
 po/underlays/basewiki/ikiwiki/subpage.de.po                    | 2 +-
 po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po       | 2 +-
 po/underlays/basewiki/ikiwiki/wikilink.de.po                   | 2 +-
 po/underlays/basewiki/index.de.po                              | 2 +-
 po/underlays/basewiki/recentchanges.de.po                      | 2 +-
 po/underlays/basewiki/sandbox.de.po                            | 2 +-
 po/underlays/basewiki/shortcuts.de.po                          | 2 +-
 po/underlays/basewiki/templates.de.po                          | 2 +-
 po/underlays/basewiki/templates/note.de.po                     | 2 +-
 po/underlays/basewiki/templates/popup.de.po                    | 2 +-
 po/underlays/directives/ikiwiki/directive/aggregate.de.po      | 2 +-
 po/underlays/directives/ikiwiki/directive/brokenlinks.de.po    | 2 +-
 po/underlays/directives/ikiwiki/directive/calendar.de.po       | 2 +-
 po/underlays/directives/ikiwiki/directive/color.de.po          | 2 +-
 po/underlays/directives/ikiwiki/directive/comment.de.po        | 2 +-
 po/underlays/directives/ikiwiki/directive/copy.de.po           | 2 +-
 po/underlays/directives/ikiwiki/directive/cut.de.po            | 2 +-
 po/underlays/directives/ikiwiki/directive/cutpaste.de.po       | 2 +-
 po/underlays/directives/ikiwiki/directive/date.de.po           | 2 +-
 po/underlays/directives/ikiwiki/directive/edittemplate.de.po   | 2 +-
 po/underlays/directives/ikiwiki/directive/format.de.po         | 2 +-
 po/underlays/directives/ikiwiki/directive/fortune.de.po        | 2 +-
 po/underlays/directives/ikiwiki/directive/graph.de.po          | 2 +-
 po/underlays/directives/ikiwiki/directive/haiku.de.po          | 2 +-
 po/underlays/directives/ikiwiki/directive/if.de.po             | 2 +-
 po/underlays/directives/ikiwiki/directive/img.de.po            | 2 +-
 po/underlays/directives/ikiwiki/directive/inline.de.po         | 2 +-
 po/underlays/directives/ikiwiki/directive/linkmap.de.po        | 2 +-
 po/underlays/directives/ikiwiki/directive/listdirectives.de.po | 2 +-
 po/underlays/directives/ikiwiki/directive/map.de.po            | 2 +-
 po/underlays/directives/ikiwiki/directive/meta.de.po           | 2 +-
 po/underlays/directives/ikiwiki/directive/more.de.po           | 2 +-
 po/underlays/directives/ikiwiki/directive/orphans.de.po        | 2 +-
 po/underlays/directives/ikiwiki/directive/pagecount.de.po      | 2 +-
 po/underlays/directives/ikiwiki/directive/pagestats.de.po      | 2 +-
 po/underlays/directives/ikiwiki/directive/pagetemplate.de.po   | 2 +-
 po/underlays/directives/ikiwiki/directive/paste.de.po          | 2 +-
 po/underlays/directives/ikiwiki/directive/ping.de.po           | 2 +-
 po/underlays/directives/ikiwiki/directive/poll.de.po           | 2 +-
 po/underlays/directives/ikiwiki/directive/polygen.de.po        | 2 +-
 po/underlays/directives/ikiwiki/directive/postsparkline.de.po  | 2 +-
 po/underlays/directives/ikiwiki/directive/progress.de.po       | 2 +-
 po/underlays/directives/ikiwiki/directive/shortcut.de.po       | 2 +-
 po/underlays/directives/ikiwiki/directive/sparkline.de.po      | 2 +-
 po/underlays/directives/ikiwiki/directive/table.de.po          | 2 +-
 po/underlays/directives/ikiwiki/directive/tag.de.po            | 2 +-
 po/underlays/directives/ikiwiki/directive/taglink.de.po        | 2 +-
 po/underlays/directives/ikiwiki/directive/template.de.po       | 2 +-
 po/underlays/directives/ikiwiki/directive/testpagespec.de.po   | 2 +-
 po/underlays/directives/ikiwiki/directive/teximg.de.po         | 2 +-
 po/underlays/directives/ikiwiki/directive/toc.de.po            | 2 +-
 po/underlays/directives/ikiwiki/directive/toggle.de.po         | 2 +-
 po/underlays/directives/ikiwiki/directive/toggleable.de.po     | 2 +-
 po/underlays/directives/ikiwiki/directive/version.de.po        | 2 +-
 po/underlays/smiley/smileys.de.po                              | 2 +-
 65 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/po/underlays/basewiki/ikiwiki.de.po b/po/underlays/basewiki/ikiwiki.de.po
index 1420df3e6..1eb8429f3 100644
--- a/po/underlays/basewiki/ikiwiki.de.po
+++ b/po/underlays/basewiki/ikiwiki.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/directive.de.po b/po/underlays/basewiki/ikiwiki/directive.de.po
index b8a610c83..d969f8102 100644
--- a/po/underlays/basewiki/ikiwiki/directive.de.po
+++ b/po/underlays/basewiki/ikiwiki/directive.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/formatting.de.po b/po/underlays/basewiki/ikiwiki/formatting.de.po
index 04b604289..d4955eeb8 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.de.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/markdown.de.po b/po/underlays/basewiki/ikiwiki/markdown.de.po
index a42c41439..1d1d84980 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.de.po
+++ b/po/underlays/basewiki/ikiwiki/markdown.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/openid.de.po b/po/underlays/basewiki/ikiwiki/openid.de.po
index f278e64fc..27c74679a 100644
--- a/po/underlays/basewiki/ikiwiki/openid.de.po
+++ b/po/underlays/basewiki/ikiwiki/openid.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.de.po b/po/underlays/basewiki/ikiwiki/pagespec.de.po
index ab4d62da3..401b4f4b7 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
index 690e41636..1a20a5f0e 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.de.po b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
index 056552a4f..785b16ffa 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po b/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po
index 7ca179a6a..dbc6dbb95 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/searching.de.po b/po/underlays/basewiki/ikiwiki/searching.de.po
index 211117995..ca50e05d4 100644
--- a/po/underlays/basewiki/ikiwiki/searching.de.po
+++ b/po/underlays/basewiki/ikiwiki/searching.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/subpage.de.po b/po/underlays/basewiki/ikiwiki/subpage.de.po
index 3594ab445..184144ca0 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.de.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po
index 5702c5fcd..08ffd8cbf 100644
--- a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.de.po b/po/underlays/basewiki/ikiwiki/wikilink.de.po
index 7bd9130e3..ccdd20303 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.de.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/index.de.po b/po/underlays/basewiki/index.de.po
index 037412d55..c2dcdd341 100644
--- a/po/underlays/basewiki/index.de.po
+++ b/po/underlays/basewiki/index.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/recentchanges.de.po b/po/underlays/basewiki/recentchanges.de.po
index f1e75acd9..88ff46fca 100644
--- a/po/underlays/basewiki/recentchanges.de.po
+++ b/po/underlays/basewiki/recentchanges.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/sandbox.de.po b/po/underlays/basewiki/sandbox.de.po
index 0e8d354f8..bb1b837c6 100644
--- a/po/underlays/basewiki/sandbox.de.po
+++ b/po/underlays/basewiki/sandbox.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/shortcuts.de.po b/po/underlays/basewiki/shortcuts.de.po
index 36be14729..abfa26bdc 100644
--- a/po/underlays/basewiki/shortcuts.de.po
+++ b/po/underlays/basewiki/shortcuts.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/templates.de.po b/po/underlays/basewiki/templates.de.po
index 1bc6c7513..beb92b49f 100644
--- a/po/underlays/basewiki/templates.de.po
+++ b/po/underlays/basewiki/templates.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/templates/note.de.po b/po/underlays/basewiki/templates/note.de.po
index 2aa5aa9d6..c408d11a0 100644
--- a/po/underlays/basewiki/templates/note.de.po
+++ b/po/underlays/basewiki/templates/note.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/templates/popup.de.po b/po/underlays/basewiki/templates/popup.de.po
index 37ba31ff8..c75b79d94 100644
--- a/po/underlays/basewiki/templates/popup.de.po
+++ b/po/underlays/basewiki/templates/popup.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/aggregate.de.po b/po/underlays/directives/ikiwiki/directive/aggregate.de.po
index 518190ade..07803ffb9 100644
--- a/po/underlays/directives/ikiwiki/directive/aggregate.de.po
+++ b/po/underlays/directives/ikiwiki/directive/aggregate.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po b/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po
index ff258a562..773eb95ae 100644
--- a/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po
+++ b/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.de.po b/po/underlays/directives/ikiwiki/directive/calendar.de.po
index 5c6868e18..56a8c7e7e 100644
--- a/po/underlays/directives/ikiwiki/directive/calendar.de.po
+++ b/po/underlays/directives/ikiwiki/directive/calendar.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/color.de.po b/po/underlays/directives/ikiwiki/directive/color.de.po
index 1cc36f8ee..48cd5736f 100644
--- a/po/underlays/directives/ikiwiki/directive/color.de.po
+++ b/po/underlays/directives/ikiwiki/directive/color.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/comment.de.po b/po/underlays/directives/ikiwiki/directive/comment.de.po
index 70d0d7d50..fed27cf75 100644
--- a/po/underlays/directives/ikiwiki/directive/comment.de.po
+++ b/po/underlays/directives/ikiwiki/directive/comment.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/copy.de.po b/po/underlays/directives/ikiwiki/directive/copy.de.po
index 33f902da8..54f7caef0 100644
--- a/po/underlays/directives/ikiwiki/directive/copy.de.po
+++ b/po/underlays/directives/ikiwiki/directive/copy.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/cut.de.po b/po/underlays/directives/ikiwiki/directive/cut.de.po
index 33f902da8..54f7caef0 100644
--- a/po/underlays/directives/ikiwiki/directive/cut.de.po
+++ b/po/underlays/directives/ikiwiki/directive/cut.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/cutpaste.de.po b/po/underlays/directives/ikiwiki/directive/cutpaste.de.po
index ff3503ed5..b99826e82 100644
--- a/po/underlays/directives/ikiwiki/directive/cutpaste.de.po
+++ b/po/underlays/directives/ikiwiki/directive/cutpaste.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/date.de.po b/po/underlays/directives/ikiwiki/directive/date.de.po
index 7baa1b3a4..517af753c 100644
--- a/po/underlays/directives/ikiwiki/directive/date.de.po
+++ b/po/underlays/directives/ikiwiki/directive/date.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/edittemplate.de.po b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po
index f47140c09..d2ca0c29f 100644
--- a/po/underlays/directives/ikiwiki/directive/edittemplate.de.po
+++ b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/format.de.po b/po/underlays/directives/ikiwiki/directive/format.de.po
index 2db9e5af6..499816ac4 100644
--- a/po/underlays/directives/ikiwiki/directive/format.de.po
+++ b/po/underlays/directives/ikiwiki/directive/format.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/fortune.de.po b/po/underlays/directives/ikiwiki/directive/fortune.de.po
index 89cdf84aa..1e63609dc 100644
--- a/po/underlays/directives/ikiwiki/directive/fortune.de.po
+++ b/po/underlays/directives/ikiwiki/directive/fortune.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/graph.de.po b/po/underlays/directives/ikiwiki/directive/graph.de.po
index 4f9d6a346..0d62a55dc 100644
--- a/po/underlays/directives/ikiwiki/directive/graph.de.po
+++ b/po/underlays/directives/ikiwiki/directive/graph.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/haiku.de.po b/po/underlays/directives/ikiwiki/directive/haiku.de.po
index 7923a1395..779621673 100644
--- a/po/underlays/directives/ikiwiki/directive/haiku.de.po
+++ b/po/underlays/directives/ikiwiki/directive/haiku.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/if.de.po b/po/underlays/directives/ikiwiki/directive/if.de.po
index e28e45936..337a84bd6 100644
--- a/po/underlays/directives/ikiwiki/directive/if.de.po
+++ b/po/underlays/directives/ikiwiki/directive/if.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/img.de.po b/po/underlays/directives/ikiwiki/directive/img.de.po
index f28a1597b..9ebdae5bc 100644
--- a/po/underlays/directives/ikiwiki/directive/img.de.po
+++ b/po/underlays/directives/ikiwiki/directive/img.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/inline.de.po b/po/underlays/directives/ikiwiki/directive/inline.de.po
index 17e5c19d2..429ea59a3 100644
--- a/po/underlays/directives/ikiwiki/directive/inline.de.po
+++ b/po/underlays/directives/ikiwiki/directive/inline.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/linkmap.de.po b/po/underlays/directives/ikiwiki/directive/linkmap.de.po
index 1695ca659..e06368e6e 100644
--- a/po/underlays/directives/ikiwiki/directive/linkmap.de.po
+++ b/po/underlays/directives/ikiwiki/directive/linkmap.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/listdirectives.de.po b/po/underlays/directives/ikiwiki/directive/listdirectives.de.po
index 18d0a6da0..2c9205880 100644
--- a/po/underlays/directives/ikiwiki/directive/listdirectives.de.po
+++ b/po/underlays/directives/ikiwiki/directive/listdirectives.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/map.de.po b/po/underlays/directives/ikiwiki/directive/map.de.po
index 303624b2c..f09598232 100644
--- a/po/underlays/directives/ikiwiki/directive/map.de.po
+++ b/po/underlays/directives/ikiwiki/directive/map.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/meta.de.po b/po/underlays/directives/ikiwiki/directive/meta.de.po
index aab5fd806..47415c306 100644
--- a/po/underlays/directives/ikiwiki/directive/meta.de.po
+++ b/po/underlays/directives/ikiwiki/directive/meta.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/more.de.po b/po/underlays/directives/ikiwiki/directive/more.de.po
index bffb3a247..65615049b 100644
--- a/po/underlays/directives/ikiwiki/directive/more.de.po
+++ b/po/underlays/directives/ikiwiki/directive/more.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/orphans.de.po b/po/underlays/directives/ikiwiki/directive/orphans.de.po
index 45ba378db..aeaebdf61 100644
--- a/po/underlays/directives/ikiwiki/directive/orphans.de.po
+++ b/po/underlays/directives/ikiwiki/directive/orphans.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/pagecount.de.po b/po/underlays/directives/ikiwiki/directive/pagecount.de.po
index 63aa98db5..5f2db30df 100644
--- a/po/underlays/directives/ikiwiki/directive/pagecount.de.po
+++ b/po/underlays/directives/ikiwiki/directive/pagecount.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.de.po b/po/underlays/directives/ikiwiki/directive/pagestats.de.po
index 427f273ed..86ce00d9b 100644
--- a/po/underlays/directives/ikiwiki/directive/pagestats.de.po
+++ b/po/underlays/directives/ikiwiki/directive/pagestats.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po
index 8fddac168..71ea68e81 100644
--- a/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po
+++ b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/paste.de.po b/po/underlays/directives/ikiwiki/directive/paste.de.po
index 48a08bf29..390d6e9ec 100644
--- a/po/underlays/directives/ikiwiki/directive/paste.de.po
+++ b/po/underlays/directives/ikiwiki/directive/paste.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/ping.de.po b/po/underlays/directives/ikiwiki/directive/ping.de.po
index 364813bb5..9276d6902 100644
--- a/po/underlays/directives/ikiwiki/directive/ping.de.po
+++ b/po/underlays/directives/ikiwiki/directive/ping.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/poll.de.po b/po/underlays/directives/ikiwiki/directive/poll.de.po
index 1a4e6b5c4..680bc1887 100644
--- a/po/underlays/directives/ikiwiki/directive/poll.de.po
+++ b/po/underlays/directives/ikiwiki/directive/poll.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/polygen.de.po b/po/underlays/directives/ikiwiki/directive/polygen.de.po
index 8b7f46557..8acb98379 100644
--- a/po/underlays/directives/ikiwiki/directive/polygen.de.po
+++ b/po/underlays/directives/ikiwiki/directive/polygen.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/postsparkline.de.po b/po/underlays/directives/ikiwiki/directive/postsparkline.de.po
index 140774bcc..e857d10fc 100644
--- a/po/underlays/directives/ikiwiki/directive/postsparkline.de.po
+++ b/po/underlays/directives/ikiwiki/directive/postsparkline.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/progress.de.po b/po/underlays/directives/ikiwiki/directive/progress.de.po
index 72ad7a134..5f10f9942 100644
--- a/po/underlays/directives/ikiwiki/directive/progress.de.po
+++ b/po/underlays/directives/ikiwiki/directive/progress.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/shortcut.de.po b/po/underlays/directives/ikiwiki/directive/shortcut.de.po
index 7d5616b3f..50ffebc21 100644
--- a/po/underlays/directives/ikiwiki/directive/shortcut.de.po
+++ b/po/underlays/directives/ikiwiki/directive/shortcut.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/sparkline.de.po b/po/underlays/directives/ikiwiki/directive/sparkline.de.po
index f1a5ac44a..3223b8811 100644
--- a/po/underlays/directives/ikiwiki/directive/sparkline.de.po
+++ b/po/underlays/directives/ikiwiki/directive/sparkline.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/table.de.po b/po/underlays/directives/ikiwiki/directive/table.de.po
index 414bfc68c..6aaeef79f 100644
--- a/po/underlays/directives/ikiwiki/directive/table.de.po
+++ b/po/underlays/directives/ikiwiki/directive/table.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/tag.de.po b/po/underlays/directives/ikiwiki/directive/tag.de.po
index 226900b59..b33c3bcb0 100644
--- a/po/underlays/directives/ikiwiki/directive/tag.de.po
+++ b/po/underlays/directives/ikiwiki/directive/tag.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/taglink.de.po b/po/underlays/directives/ikiwiki/directive/taglink.de.po
index 769347eeb..4ae84ecdb 100644
--- a/po/underlays/directives/ikiwiki/directive/taglink.de.po
+++ b/po/underlays/directives/ikiwiki/directive/taglink.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/template.de.po b/po/underlays/directives/ikiwiki/directive/template.de.po
index a153cfc94..faa2be614 100644
--- a/po/underlays/directives/ikiwiki/directive/template.de.po
+++ b/po/underlays/directives/ikiwiki/directive/template.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/testpagespec.de.po b/po/underlays/directives/ikiwiki/directive/testpagespec.de.po
index 22da164e3..f936d7ec3 100644
--- a/po/underlays/directives/ikiwiki/directive/testpagespec.de.po
+++ b/po/underlays/directives/ikiwiki/directive/testpagespec.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/teximg.de.po b/po/underlays/directives/ikiwiki/directive/teximg.de.po
index f0553e7c9..fc2ffab47 100644
--- a/po/underlays/directives/ikiwiki/directive/teximg.de.po
+++ b/po/underlays/directives/ikiwiki/directive/teximg.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/toc.de.po b/po/underlays/directives/ikiwiki/directive/toc.de.po
index c2ddda74c..55906e0d0 100644
--- a/po/underlays/directives/ikiwiki/directive/toc.de.po
+++ b/po/underlays/directives/ikiwiki/directive/toc.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/toggle.de.po b/po/underlays/directives/ikiwiki/directive/toggle.de.po
index 6c316c5e4..5cb83aa8b 100644
--- a/po/underlays/directives/ikiwiki/directive/toggle.de.po
+++ b/po/underlays/directives/ikiwiki/directive/toggle.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/toggleable.de.po b/po/underlays/directives/ikiwiki/directive/toggleable.de.po
index db99bdb5a..03fe46ff3 100644
--- a/po/underlays/directives/ikiwiki/directive/toggleable.de.po
+++ b/po/underlays/directives/ikiwiki/directive/toggleable.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/version.de.po b/po/underlays/directives/ikiwiki/directive/version.de.po
index eca114e4c..7080a1a43 100644
--- a/po/underlays/directives/ikiwiki/directive/version.de.po
+++ b/po/underlays/directives/ikiwiki/directive/version.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
diff --git a/po/underlays/smiley/smileys.de.po b/po/underlays/smiley/smileys.de.po
index 3da3037f9..35ae5b9ed 100644
--- a/po/underlays/smiley/smileys.de.po
+++ b/po/underlays/smiley/smileys.de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
-- 
cgit v1.2.3


From 823ec815d4fc9625d6fa3553ad03e9f2ff737659 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 14:58:13 -0400
Subject: Add a include setting, which can be used to make ikiwiki process wiki
 source files, such as .htaccess, that would normally be skipped for security
 or other reasons. Closes: #447267 (Thanks to Aaron Wilson for the original
 patch.)

---
 IkiWiki.pm                          | 13 +++++++++++++
 debian/changelog                    |  4 ++++
 doc/tips/htaccess_file.mdwn         | 30 ++++++++++++++++++++++++++++++
 doc/todo/enable-htaccess-files.mdwn |  5 +++++
 doc/usage.mdwn                      |  6 ++++++
 ikiwiki.in                          |  3 +++
 6 files changed, 61 insertions(+)
 create mode 100644 doc/tips/htaccess_file.mdwn

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 251ed8cc8..ee94ce659 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -334,6 +334,15 @@ sub getsetup () {
 		safe => 0, # paranoia
 		rebuild => 0,
 	},
+	include => {
+		type => "string",
+		default => undef,
+		example => '^\.htaccess$',
+		description => "regexp of normally ignored source files to include",
+		advanced => 1,
+		safe => 0, # regexp
+		rebuild => 1,
+	},
 	exclude => {
 		type => "string",
 		default => undef,
@@ -1820,6 +1829,10 @@ sub file_pruned ($;$) {
 		$file =~ s#^\Q$base\E/+##;
 	}
 
+	if (defined $config{include} && length $config{include}) {
+		return 0 if $file =~ m/$config{include}/;
+	}
+
 	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
 	return $file =~ m/$regexp/;
 }
diff --git a/debian/changelog b/debian/changelog
index 92afe661f..e5347e2a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low
     as used by yahoo and google urls.
   * Add complete German basewiki and directives translation done by
     Sebastian Kuhnert.
+  * Add a include setting, which can be used to make ikiwiki process
+    wiki source files, such as .htaccess, that would normally be skipped
+    for security or other reasons. Closes: #447267
+    (Thanks to Aaron Wilson for the original patch.)
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn
new file mode 100644
index 000000000..5266eba41
--- /dev/null
+++ b/doc/tips/htaccess_file.mdwn
@@ -0,0 +1,30 @@
+If you try to include a `.htaccess` file in your wiki's source, in order to
+configure the web server, you'll find that ikiwiki excludes it from
+processing. In fact, ikiwiki excludes any file starting with a dot, as well
+as a lot of other files, for good security reasons.
+
+You can tell ikiwiki not to exclude the .htaccess file by adding this to
+your setup file:
+
+	include => '^\.htaccess$',
+
+Caution! Before you do that, please think for a minute about who can edit
+your wiki. Are attachment uploads enabled? Can users commit changes
+directly to the version control system? Do you trust everyone who can
+make a change to not do Bad Things with the htaccess file? Do you trust
+everyone who *might* be able to make a change in the future? Note that a
+determined attacker who can write to the htaccess file can probably get a
+shell on your web server.
+
+If any of these questions have given you pause, I suggest you find a
+different way to configure the web server. One way is to not put the
+`.htaccess` file under ikiwiki's control, and just manually install it
+in the destdir.
+
+[Apache's documentation](http://httpd.apache.org/docs/1.3/howto/htaccess.html)
+says
+> In general, you should never use .htaccess files unless you don't have
+> access to the main server configuration file.
+This is good advice -- if you can edit apache's main configuration files,
+then you should not use a htaccess file.
+--[[Joey]]
diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index 412cb5eba..c895db75d 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -61,3 +61,8 @@ It should be off by default of course. --Max
 +1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]]
 
 > I've described a workaround for one use case at the [[plugins/rsync]] [[plugins/rsync/discussion]] page. --[[schmonz]]
+
+---
+
+[[done]], you can use the `include` setting to override the default
+excludes now. Please use extreme caution when doing so. --[[Joey]] 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index a105d7e59..f735170f0 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -234,6 +234,12 @@ also be configured using a setup file.
   Specifies a rexexp of source files to exclude from processing.
   May be specified multiple times to add to exclude list.
 
+* --include regexp
+
+  Specifies a rexexp of source files, that would normally be excluded,
+  but that you wish to include in processing.
+  May be specified multiple times to add to include list.
+
 * --adminuser name
 
   Specifies a username of a user (or, if openid is enabled, an openid) 
diff --git a/ikiwiki.in b/ikiwiki.in
index ae1251ff6..da5555629 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -65,6 +65,9 @@ sub getconfig () {
 			"exclude=s@" => sub {
 				push @{$config{wiki_file_prune_regexps}}, $_[1];
 			},
+			"include=s@" => sub {
+				$config{include}=defined $config{include} && length $config{include} ? "$config{include}|$_[1]" : $_[1];
+			},
 			"adminuser=s@" => sub {
 				push @{$config{adminuser}}, $_[1]
 			},
-- 
cgit v1.2.3


From a5ee40104481ba06eaaf277ed2f6c363dd326608 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:08:41 -0400
Subject: note that the patch on this page is complely broken, and allows any
 file starting with a dot to be included

If you applied that patch to your site, you should remove it right away!
---
 doc/todo/enable-htaccess-files.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index c895db75d..c08502bdd 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -12,6 +12,13 @@
                     qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//],
            wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]#]+)(?:#([^\s\]]+))?\]\]/,
 
+> Note that the above patch is **completely broken**. 
+> It removes the crucial excludes of all files starting with a dot.
+> The negative regexps for htaccess have no effect, so the whole
+> thing only "works" because it allows *any* file starting with a dot.
+> If you applied this patch to your ikiwiki, you opened a huge security
+> hole. --[[Joey]] 
+
 [[!tag patch patch/core]]
 
 This lets the site administrator have a `.htaccess` file in their underlay
-- 
cgit v1.2.3


From 223b8efab0a55075bd53d03fe3cb2df07f13d9c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:12:59 -0400
Subject: update

---
 doc/todo/enable-htaccess-files.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index c08502bdd..3b9721d50 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -64,6 +64,11 @@ It should be off by default of course. --Max
 ---
 +1 I want `.htaccess` so I can rewrite some old Wordpress URLs to make feeds work again. --[[hendry]]
 
+> Unless you cannot modify apache's configuration, you do not need htaccess
+> to do that. Apache's documentation recommends against using htaccess
+> unless you're a user who cannot modify the main server configuration.
+> --[[Joey]] 
+
 ---
 +1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]]
 
-- 
cgit v1.2.3


From a5ded6437dc8170fafe170b758c54a44912cb7a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:21:42 -0400
Subject: slight optimisation to file_pruned

Precompile the regexp, rather than rebuilding on every call.
---
 IkiWiki.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ee94ce659..1c2ddbd91 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1819,6 +1819,7 @@ sub deptype (@) {
 	return $deptype;
 }
 
+my $file_prune_regexp;
 sub file_pruned ($;$) {
 	my $file=shift;
 	if (@_) {
@@ -1833,8 +1834,11 @@ sub file_pruned ($;$) {
 		return 0 if $file =~ m/$config{include}/;
 	}
 
-	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
-	return $file =~ m/$regexp/;
+	if (! defined $file_prune_regexp) {
+		$file_prune_regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
+		$file_prune_regexp=qr/$file_prune_regexp/;
+	}
+	return $file =~ m/$file_prune_regexp/;
 }
 
 sub define_gettext () {
-- 
cgit v1.2.3


From 87a36bbb467c22ebb68a6e9999f0ded2b017e5df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:22:45 -0400
Subject: update

---
 t/file_pruned.t | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/t/file_pruned.t b/t/file_pruned.t
index 00542d580..f9c1c257e 100755
--- a/t/file_pruned.t
+++ b/t/file_pruned.t
@@ -1,12 +1,13 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 26;
+use Test::More tests => 27;
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 
+ok(IkiWiki::file_pruned("src/.htaccess", "src"));
 ok(IkiWiki::file_pruned("src/.ikiwiki/", "src"));
 ok(IkiWiki::file_pruned("src/.ikiwiki/index", "src"));
 ok(IkiWiki::file_pruned("src/CVS/foo", "src"));
-- 
cgit v1.2.3


From ceadd862930411fed21eab16c428227fdcdc10ba Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:26:24 -0400
Subject: update

---
 doc/tips/htaccess_file.mdwn | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn
index 5266eba41..7b4b0901a 100644
--- a/doc/tips/htaccess_file.mdwn
+++ b/doc/tips/htaccess_file.mdwn
@@ -22,9 +22,7 @@ different way to configure the web server. One way is to not put the
 in the destdir.
 
 [Apache's documentation](http://httpd.apache.org/docs/1.3/howto/htaccess.html)
-says
+says:
 > In general, you should never use .htaccess files unless you don't have
 > access to the main server configuration file.
-This is good advice -- if you can edit apache's main configuration files,
-then you should not use a htaccess file.
 --[[Joey]]
-- 
cgit v1.2.3


From d958e96b01ca459055b2c34f140f7c6ec7168f92 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:28:50 -0400
Subject: update

---
 doc/tips/htaccess_file.mdwn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn
index 7b4b0901a..0c1b0f2f7 100644
--- a/doc/tips/htaccess_file.mdwn
+++ b/doc/tips/htaccess_file.mdwn
@@ -19,10 +19,9 @@ shell on your web server.
 If any of these questions have given you pause, I suggest you find a
 different way to configure the web server. One way is to not put the
 `.htaccess` file under ikiwiki's control, and just manually install it
-in the destdir.
+in the destdir. --[[Joey]]
 
 [Apache's documentation](http://httpd.apache.org/docs/1.3/howto/htaccess.html)
 says:
 > In general, you should never use .htaccess files unless you don't have
 > access to the main server configuration file.
---[[Joey]]
-- 
cgit v1.2.3


From aa36cd66baeca85ca4bca1c35c43b7a01c8a5cf7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:30:18 -0400
Subject: update

---
 doc/tips/htaccess_file.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn
index 0c1b0f2f7..6964cf24e 100644
--- a/doc/tips/htaccess_file.mdwn
+++ b/doc/tips/htaccess_file.mdwn
@@ -21,7 +21,7 @@ different way to configure the web server. One way is to not put the
 `.htaccess` file under ikiwiki's control, and just manually install it
 in the destdir. --[[Joey]]
 
-[Apache's documentation](http://httpd.apache.org/docs/1.3/howto/htaccess.html)
+[Apache's documentation](http://httpd.apache.org/docs/2.2/howto/htaccess.html)
 says:
 > In general, you should never use .htaccess files unless you don't have
 > access to the main server configuration file.
-- 
cgit v1.2.3


From 4cff2b62332fc4e62ae64937567f84658055bce3 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Mon, 15 Mar 2010 08:55:37 +0000
Subject: No more Discussion Pages of Discussion Pages of...

---
 doc/users/tschwinge.mdwn | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 20d8d16a8..414612aff 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -99,12 +99,6 @@ page that uses \[[!meta redir]].
 
 ## [[bugs/Broken Parentlinks]]
 
-## Discussion Pages of Discussion Pages of...
-
-Is it useful to have Discussion pages of Discussion pages (etc.)?  -- On
-<http://www.gnu.org/software/hurd/hurd/building/cross-compiling/discussion.html>,
-this possibility is offered.
-
 ## Modifying [[plugins/inline]] for showing only an *appetizer*
 
 Currently ikiwiki's inline plugin will either show the full page or nothing of
-- 
cgit v1.2.3


From c4e46dfeba11aee2feec7475970cfdb7591c1943 Mon Sep 17 00:00:00 2001
From: moy <moy@web>
Date: Tue, 16 Mar 2010 08:57:27 +0000
Subject: Removed pop

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1a1b128e6..aef928d8e 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -77,4 +77,4 @@ bar
 Hmm, can I dig it?
 
 Test
-pop
+
-- 
cgit v1.2.3


From 0f433ed01c58978ba6d7845d5aaebb1ec8cefc9e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 17 Mar 2010 00:42:38 +0000
Subject: link to highlight

---
 doc/plugins/contrib/highlightcode.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/contrib/highlightcode.mdwn b/doc/plugins/contrib/highlightcode.mdwn
index 8abb76583..f1df204bb 100644
--- a/doc/plugins/contrib/highlightcode.mdwn
+++ b/doc/plugins/contrib/highlightcode.mdwn
@@ -1,6 +1,8 @@
 [[!template id=plugin name=highlightcode author="[[sabr]]"]]
 [[!tag type/format]]
 
+(An alternative to this plugin, [[plugins/highlight]], is now provided with IkiWiki. --[[smcv]])
+
 A small plugin to allow Ikiwiki to display source files complete with syntax highlighting. Files with recognized extensions (i.e. my-file.cpp) are be rendered just like any other Ikiwiki page. You can even edit your source files with Ikiwiki's editor.
 
 It uses the Syntax::Highlight::Engine::Kate Perl module to do the highlighting.
-- 
cgit v1.2.3


From 4054f8d8ce0802b43e1c2c6f9cb71badbbcaf919 Mon Sep 17 00:00:00 2001
From: kierun <kierun@web>
Date: Wed, 17 Mar 2010 09:14:46 +0000
Subject:

---
 doc/todo/ACL.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index d40701d60..57979385d 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -76,3 +76,12 @@ Any idea when this is going to be finished?  If you want, I am happy to beta tes
 > Example of use to only allow two users to edit the tipjar page:
 >	locked_pages => 'tipjar and !(user(joey) or user(bob))',
 > --[[Joey]] 
+
+> > Thank you for the hint but I am being still confused (read: dense)...  What I am trying to do is this:
+
+> >  * No anonymous access.
+> >  * Logged in users can edit and create pages.
+> >  * Users can set who can edit their pages. 
+> >  * Some pages are only viewable by admins. 
+
+> > Is it possible?  If so how?...
-- 
cgit v1.2.3


From cbc5fcff6182e620578fff619ae021eb5b30024c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Mar 2010 23:21:35 -0400
Subject: set exclude example to match *.private and improve its description

---
 IkiWiki.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1c2ddbd91..a782e463a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -338,7 +338,7 @@ sub getsetup () {
 		type => "string",
 		default => undef,
 		example => '^\.htaccess$',
-		description => "regexp of normally ignored source files to include",
+		description => "regexp of normally excluded files to include",
 		advanced => 1,
 		safe => 0, # regexp
 		rebuild => 1,
@@ -346,8 +346,8 @@ sub getsetup () {
 	exclude => {
 		type => "string",
 		default => undef,
-		example => '\.wav$',
-		description => "regexp of source files to ignore",
+		example => '^*\.private$',
+		description => "regexp of files that should be skipped",
 		advanced => 1,
 		safe => 0, # regexp
 		rebuild => 1,
-- 
cgit v1.2.3


From 60b71996da47b4ce8e065443de362e9dbca47ce9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Mar 2010 23:24:31 -0400
Subject: add Makefile to exclude example

---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a782e463a..a618836cf 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -346,7 +346,7 @@ sub getsetup () {
 	exclude => {
 		type => "string",
 		default => undef,
-		example => '^*\.private$',
+		example => '^(*\.private|Makefile)$',
 		description => "regexp of files that should be skipped",
 		advanced => 1,
 		safe => 0, # regexp
-- 
cgit v1.2.3


From a78212be3364887b5ff9f9902cfb65eb211b269b Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Thu, 18 Mar 2010 07:21:09 +0000
Subject:

---
 .../post-update_hook_can__39__t_be_compiled_with_tcc.mdwn  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn

diff --git a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
new file mode 100644
index 000000000..1594036dc
--- /dev/null
+++ b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
@@ -0,0 +1,14 @@
+Thinking that any c compiler would do the job, I tried to use tcc with ikiwiki, as explicitely allowed by the Debian package dependencies.
+
+I installed `tcc` and `libc6-dev` (for `libcrt1`). The wrapper compilation was OK, but the wrapper fails to run correctly and dies with
+
+    usage: ikiwiki [options] source dest
+       ikiwiki --setup configfile
+
+Everything works fine with gcc.
+
+versions: Debian etch+backports
+
+
+
+
-- 
cgit v1.2.3


From 7b7d1cfcb75451bf9f8fc7efb3814c47deef0059 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Thu, 18 Mar 2010 07:56:15 +0000
Subject: distro confusion

---
 doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
index 1594036dc..4226c026a 100644
--- a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
+++ b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
@@ -7,7 +7,7 @@ I installed `tcc` and `libc6-dev` (for `libcrt1`). The wrapper compilation was O
 
 Everything works fine with gcc.
 
-versions: Debian etch+backports
+versions: Debian lenny + backports
 
 
 
-- 
cgit v1.2.3


From 73c2551dd482b29e65b697376708a25ad8e85fbb Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Thu, 18 Mar 2010 12:03:34 +0000
Subject:

---
 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
new file mode 100644
index 000000000..9f3f0cddd
--- /dev/null
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -0,0 +1,9 @@
+Hi all!
+I really like ikiwiki and i tested it on my local machine but i have one question that i can't answer reading documentation (my fault of course)...
+I have an account and some space on a free hosting service.
+Now, i want to put my ikiwiki on this remote web space so that i can browse it from wherever i want.
+I have my source dir and my git dir on my local machine.
+How can i upload my ikiwiki on the remote host and manage it via git as i can do when i test it locally?
+Where is specified? Where can i find documentation about it?
+
+Thanks in advance! 
-- 
cgit v1.2.3


From a02a06cb9dc0a82dd4028c9f4b506dcf899c9a41 Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Thu, 18 Mar 2010 12:05:33 +0000
Subject:

---
 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 9f3f0cddd..862694d4b 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -6,4 +6,6 @@ I have my source dir and my git dir on my local machine.
 How can i upload my ikiwiki on the remote host and manage it via git as i can do when i test it locally?
 Where is specified? Where can i find documentation about it?
 
-Thanks in advance! 
+Thanks in advance!
+
+Pab
-- 
cgit v1.2.3


From ea07442e7ac6ef80cd98625b32f66bafc6af26b5 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Thu, 18 Mar 2010 15:21:38 +0000
Subject: comment

---
 doc/todo/ACL.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index 57979385d..c1f5d86f0 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -21,6 +21,11 @@ something, that I think is very valuable.
 >>>> Which would rule out openid, or other fun forms of auth. And routing all access
 >>>> through the CGI sort of defeats the purpose of ikiwiki. --[[Ethan]]
 
+>>>>> I think what Joey is suggesting is to use apache ACLs in conjunction
+>>>>> with basic HTTP auth to control read access, and ikiwiki can use the
+>>>>> information via the httpauth plugin for other ACLs (write, admin). But
+>>>>> yes, that would rule out non-httpauth mechanisms. -- [[Jon]]
+
 Also see [[!debbug 443346]].
 
 > Just a few quick thoughts about this:
-- 
cgit v1.2.3


From 760c315589dc0e3fa0ba5380113f4e86a989a7d9 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Thu, 18 Mar 2010 15:23:18 +0000
Subject: comment

---
 doc/todo/ACL.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index c1f5d86f0..cac6c9f18 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -90,3 +90,6 @@ Any idea when this is going to be finished?  If you want, I am happy to beta tes
 > >  * Some pages are only viewable by admins. 
 
 > > Is it possible?  If so how?...
+
+>>> I don't believe this is currently possible. What is missing is the concept
+>>> of page 'ownership'. -- [[Jon]]
-- 
cgit v1.2.3


From fed7383903c402d68ff2fc2d3734c55b35d520a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Mar 2010 13:37:35 -0400
Subject: update

---
 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 862694d4b..0b370473e 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -9,3 +9,18 @@ Where is specified? Where can i find documentation about it?
 Thanks in advance!
 
 Pab
+
+> There are several ways to accomplish this, depending on what you really
+> want to do.
+> 
+> If your goal is to continue generating the site locally, but then
+> transfer it to the remote host for serving, you could use the 
+> [[plugins/rsync]] plugin.
+> 
+> If your goal is to install and run the ikiwiki software on the remote host,
+> then you would follow a similar path to the ones described in these tips:
+> [[tips/nearlyfreespeech]] [[tips/DreamHost]]. Or even [[install]] ikiwiki
+> from a regular package if you have that kind of access. Then you could
+> push changes from your local git to git on the remote host to update the
+> wiki. [[tips/Laptop_wiki_with_git]] explains one way to do that.
+> --[[Joey]] 
-- 
cgit v1.2.3


From b4ab74e722aaca406922fe614d9e6541dd87c3bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Mar 2010 17:35:59 -0400
Subject: C warning cleanup

---
 IkiWiki/Wrapper.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 5427a5c80..830b04877 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -76,8 +76,8 @@ EOF
 	{
 		int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
 		if (fd != -1 && flock(fd, LOCK_EX) == 0) {
-			char *fd_s;
-			asprintf(&fd_s, "%i", fd);
+			char *fd_s=malloc(8);
+			sprintf(fd_s, "%i", fd);
 			setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
 		}
 	}
@@ -105,7 +105,7 @@ extern char **environ;
 char *newenviron[$#envsave+6];
 int i=0;
 
-addenv(char *var, char *val) {
+void addenv(char *var, char *val) {
 	char *s=malloc(strlen(var)+1+strlen(val)+1);
 	if (!s)
 		perror("malloc");
-- 
cgit v1.2.3


From dddd6aa99055d8505f73e39b12f049633d9cb4c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Mar 2010 17:44:46 -0400
Subject: Allow wrappers to be built using tcc.

---
 IkiWiki/Wrapper.pm                                            | 10 +++++++---
 debian/changelog                                              |  1 +
 .../post-update_hook_can__39__t_be_compiled_with_tcc.mdwn     | 11 ++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 830b04877..f175b4a0b 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -101,7 +101,6 @@ EOF
 #include <string.h>
 #include <sys/file.h>
 
-extern char **environ;
 char *newenviron[$#envsave+6];
 int i=0;
 
@@ -121,8 +120,13 @@ $check_commit_hook
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
-	newenviron[i]=NULL;
-	environ=newenviron;
+
+	if (clearenv() != 0) {
+		perror("clearenv");
+		exit(1);
+	}
+	for (; i>0; i--)
+		putenv(newenviron[i-1]);
 
 	if (setregid(getegid(), -1) != 0 &&
 	    setregid(getegid(), -1) != 0) {
diff --git a/debian/changelog b/debian/changelog
index e5347e2a1..73f6fcff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low
     wiki source files, such as .htaccess, that would normally be skipped
     for security or other reasons. Closes: #447267
     (Thanks to Aaron Wilson for the original patch.)
+  * Allow wrappers to be built using tcc.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
index 4226c026a..a8fb19888 100644
--- a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
+++ b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
@@ -9,6 +9,11 @@ Everything works fine with gcc.
 
 versions: Debian lenny + backports
 
-
-
-
+> Seems that tcc does not respect changing where `environ` points as a way
+> to change the environment seen after `exec`
+> 
+> Given that the man page for `clearenv` suggests using `environ=NULL`
+> if `clearenv` is not available, I would be lerry or using tcc to compile
+> stuff, since that could easily lead to a security compromise of code that
+> expects that to work. However, I have fixed ikiwiki to use `clearenv`.
+> --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 9a6a28512025c91b7518d8c9b69678e124c44128 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 18 Mar 2010 22:33:18 +0000
Subject: corrected the update-the-laptop-from-the-server section

---
 doc/tips/laptop_wiki_with_git.mdwn | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index 85e26c729..857083325 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -68,5 +68,12 @@ used by the ikiwiki CGI, and another which you can use for updating via
 git).
 
 When you want to update the server from the laptop, do a `git push` from
-within the laptop's bare repository, and likewise do a `git pull` to update
-the laptop from the server.
+within the laptop's bare repository.
+
+To update the laptop from the server, add a section for the laptop to the config file of the server's bare repository:
+
+	[remote "laptop"]
+        	fetch = +refs/*:refs/*
+        	url = me@laptop:/path/to/bare/repository
+
+Then do a `git push laptop` from within the server's bare repository.
-- 
cgit v1.2.3


From deb3cd8c490f1a6b615366beaa1b5d736f825c59 Mon Sep 17 00:00:00 2001
From: haho <haho@web>
Date: Thu, 18 Mar 2010 23:39:42 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index aef928d8e..8a6780741 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -77,4 +77,5 @@ bar
 Hmm, can I dig it?
 
 Test
+test2
 
-- 
cgit v1.2.3


From fe86a91ffe4e26d59e1e64ae8a00285d1bf09d4a Mon Sep 17 00:00:00 2001
From: haho <haho@web>
Date: Thu, 18 Mar 2010 23:43:04 +0000
Subject:

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8a6780741..8cba8973f 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -3,7 +3,7 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 
 # Header
 
-## Subheader
+## Subheader2
 
 > This is a blockquote.
 >
-- 
cgit v1.2.3


From 4f4e09f925344940876c2e62de1e89e55ea1650e Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Fri, 19 Mar 2010 00:56:27 +0000
Subject:

---
 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 0b370473e..036fe0d44 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -24,3 +24,9 @@ Pab
 > push changes from your local git to git on the remote host to update the
 > wiki. [[tips/Laptop_wiki_with_git]] explains one way to do that.
 > --[[Joey]] 
+
+Thanks a lot for your answer.
+rsync plugin would be perfect but... how would i manage blog post?
+I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me?
+
+Pab
-- 
cgit v1.2.3


From f54b5f583dfcb1f908b33d1687782ce8a2bfb30d Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Fri, 19 Mar 2010 00:57:03 +0000
Subject:

---
 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 036fe0d44..5dcd01619 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -27,6 +27,4 @@ Pab
 
 Thanks a lot for your answer.
 rsync plugin would be perfect but... how would i manage blog post?
-I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me?
-
-Pab
+I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab
-- 
cgit v1.2.3


From 2c310f8349182ca155a8cad1d8454f9937e87527 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 19 Mar 2010 01:09:44 +0000
Subject: comment about comments

---
 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 5dcd01619..473b06b39 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -28,3 +28,5 @@ Pab
 Thanks a lot for your answer.
 rsync plugin would be perfect but... how would i manage blog post?
 I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab
+
+> If you want to allow people to make comments on your blog, no, the rsync plugin will not help, since it will upload a completely static site where nobody can make comments.  Comments require a full IkiWiki setup with CGI enabled, so that people add content (comments) from the web. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From eef4768d2d277925b42de8efda576b00cf64bee8 Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Fri, 19 Mar 2010 07:57:40 +0000
Subject:

---
 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 473b06b39..1c0f8f561 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -30,3 +30,6 @@ rsync plugin would be perfect but... how would i manage blog post?
 I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab
 
 > If you want to allow people to make comments on your blog, no, the rsync plugin will not help, since it will upload a completely static site where nobody can make comments.  Comments require a full IkiWiki setup with CGI enabled, so that people add content (comments) from the web. --[[KathrynAndersen]]
+
+Ok, i understand, thanks.
+Is there any hosting service that permits to have a full installation of iwkiwiki or i am forced to get a vps or to mantain a personal server for that? --Pab
-- 
cgit v1.2.3


From 96a54b35fe2cdcdc1450b5d38c80e7b27b428c14 Mon Sep 17 00:00:00 2001
From: kierun <kierun@web>
Date: Fri, 19 Mar 2010 15:45:26 +0000
Subject:

---
 doc/todo/ACL.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index cac6c9f18..dd9793233 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -93,3 +93,6 @@ Any idea when this is going to be finished?  If you want, I am happy to beta tes
 
 >>> I don't believe this is currently possible. What is missing is the concept
 >>> of page 'ownership'. -- [[Jon]]
+
+>>>> GAH! That is really a shame... Any chance of adding that?  No, I do not really expect it to be added, after all my requirements are pushing the boundary of what a wikiwiki
+ should be.  Nonetheless, thanks for your help! 
-- 
cgit v1.2.3


From cbf269eee29a66e1350e5553f38eee5b4683be8a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 13:10:17 -0400
Subject: audited use POSIX

The POSIX perl module exports a huge number of functions by default, so
make sure all imports are qualified. (And remove one that was not
necessary.)
---
 IkiWiki.pm                     | 2 +-
 IkiWiki/Plugin/calendar.pm     | 2 +-
 IkiWiki/Plugin/relativedate.pm | 2 +-
 IkiWiki/Plugin/wmd.pm          | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a618836cf..6e333504e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -7,7 +7,7 @@ use strict;
 use Encode;
 use HTML::Entities;
 use URI::Escape q{uri_escape_utf8};
-use POSIX;
+use POSIX ();
 use Storable;
 use open qw{:utf8 :std};
 
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index aaee2c610..ff84bc440 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -22,7 +22,7 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Time::Local;
-use POSIX;
+use POSIX ();
 
 my $time=time;
 my @now=localtime($time);
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 06df2efd5..7f006af83 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -5,7 +5,7 @@ use warnings;
 no warnings 'redefine';
 use strict;
 use IkiWiki 3.00;
-use POSIX;
+use POSIX ();
 use Encode;
 
 sub import {
diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 5361d2914..99b136281 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -4,7 +4,6 @@ package IkiWiki::Plugin::wmd;
 use warnings;
 use strict;
 use IkiWiki 3.00;
-use POSIX;
 use Encode;
 
 sub import {
-- 
cgit v1.2.3


From af83b4c5f576633c03c157a67994af6bfaff617a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 13:40:02 -0400
Subject: Revert "corrected the update-the-laptop-from-the-server section"

No, we don't normally push from servers to laptops. Because
most laptops do not have publicly accessible IP addresses,
for one thing. Also because there's really no reason to ssh to
the server from your laptop in order to update the laptop when you
can just pull.
---
 doc/tips/laptop_wiki_with_git.mdwn | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index 857083325..85e26c729 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -68,12 +68,5 @@ used by the ikiwiki CGI, and another which you can use for updating via
 git).
 
 When you want to update the server from the laptop, do a `git push` from
-within the laptop's bare repository.
-
-To update the laptop from the server, add a section for the laptop to the config file of the server's bare repository:
-
-	[remote "laptop"]
-        	fetch = +refs/*:refs/*
-        	url = me@laptop:/path/to/bare/repository
-
-Then do a `git push laptop` from within the server's bare repository.
+within the laptop's bare repository, and likewise do a `git pull` to update
+the laptop from the server.
-- 
cgit v1.2.3


From 6dc6fe2f9bc6bcd532291c703a637d24dfe58956 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 13:45:43 -0400
Subject: fix apparently confusing wording

---
 doc/tips/laptop_wiki_with_git.mdwn | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index 85e26c729..cfa565d1a 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -67,6 +67,5 @@ as many times as you want (thus being able to have a repository which is
 used by the ikiwiki CGI, and another which you can use for updating via
 git).
 
-When you want to update the server from the laptop, do a `git push` from
-within the laptop's bare repository, and likewise do a `git pull` to update
-the laptop from the server.
+Use standard git commands, run in the laptop's bare git repository
+to handle pulling from and pushing to the server.
-- 
cgit v1.2.3


From b1dade8d960ce7ccb549e5652d35a8e9dbccf5c6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 14:52:17 -0400
Subject: allow multiple setup file types, and support safe parsing

Finally removed the last hardcoding of IkiWiki::Setup::Standard.
Take the first "IkiWiki::Setup::*" in the setup file to define the
setuptype, and remember that type to use in dumping later. (But it can be
overridden using --set, etc.)

Also, support setup file types that are not evaled.
---
 IkiWiki.pm                |  7 +++++++
 IkiWiki/Setup.pm          | 40 +++++++++++++++++++++++++++++-----------
 IkiWiki/Setup/Standard.pm |  4 +++-
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6e333504e..241fb45b7 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -467,6 +467,13 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
+	setuptype => {
+		type => "internal",
+		default => "IkiWiki::Setup::Standard",
+		description => "perl class to use to dump setup file",
+		safe => 0,
+		rebuild => 0,
+	},
 	allow_symlinks_before_srcdir => {
 		type => "boolean",
 		default => 0,
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index a3fd5ce66..3accf3591 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -1,6 +1,8 @@
 #!/usr/bin/perl
-# Ikiwiki setup files are perl files that 'use IkiWiki::Setup::foo',
-# passing it some sort of configuration data.
+# Ikiwiki setup files can be perl files that 'use IkiWiki::Setup::foo',
+# passing it some sort of configuration data. Or, they can contain
+# the module name at the top, without the 'use', and the whole file is
+# then fed into that module.
 
 package IkiWiki::Setup;
 
@@ -10,24 +12,39 @@ use IkiWiki;
 use open qw{:utf8 :std};
 use File::Spec;
 
-sub load ($) {
+sub load ($;$) {
 	my $setup=IkiWiki::possibly_foolish_untaint(shift);
+	my $safemode=shift;
+
 	$config{setupfile}=File::Spec->rel2abs($setup);
 
 	#translators: The first parameter is a filename, and the second
 	#translators: is a (probably not translated) error message.
 	open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
-	my $code;
+	my $content;
 	{
 		local $/=undef;
-		$code=<IN> || error("$setup: $!");
+		$content=<IN> || error("$setup: $!");
 	}
-	
-	($code)=$code=~/(.*)/s;
 	close IN;
 
-	eval $code;
-	error("$setup: ".$@) if $@;
+	if ($content=~/(use\s+)?(IkiWiki::Setup::\w+)/) {
+		$config{setuptype}=$2;
+		if ($1) {
+			error sprintf(gettext("cannot load %s in safe mode"), $setup)
+				if $safemode;
+			eval IkiWiki::possibly_foolish_untaint($content);
+			error("$setup: ".$@) if $@;
+		}
+		else {
+			eval qq{require $config{setuptype}};
+			error $@ if $@;
+			$config{setuptype}->loaddump(IkiWiki::possibly_foolish_untaint($content));
+		}
+	}
+	else {
+		error sprintf(gettext("failed to parse %s"), $setup);
+	}
 }
 
 sub merge ($) {
@@ -133,8 +150,9 @@ sub getsetup () {
 sub dump ($) {
 	my $file=IkiWiki::possibly_foolish_untaint(shift);
 	
-	require IkiWiki::Setup::Standard;
-	my @dump=IkiWiki::Setup::Standard::gendump("Setup file for ikiwiki.");
+	eval qq{require $config{setuptype}};
+	error $@ if $@;
+	my @dump=$config{setuptype}->gendump("Setup file for ikiwiki.");
 
 	open (OUT, ">", $file) || die "$file: $!";
 	print OUT "$_\n" foreach @dump;
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index f7a322317..4022ff03c 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -82,8 +82,10 @@ sub dumpvalues ($@) {
 	return @ret;
 }
 
-sub gendump ($) {
+sub gendump ($$) {
+	my $class=shift;
 	my $description=shift;
+
 	my %setup=(%config);
 	my @ret;
 	
-- 
cgit v1.2.3


From 8a5084bc62d8f59320efc43fcd5e36bcc668374d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 15:09:08 -0400
Subject: whitespace

---
 IkiWiki/Plugin/darcs.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 1c9538e83..bc8394b90 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -51,7 +51,7 @@ sub darcs_info ($$$) {
 	return $_;
 }
 
-sub file_in_vc($$) {
+sub file_in_vc ($$) {
 	my $repodir = shift;
 	my $file = shift;
 
@@ -69,7 +69,7 @@ sub file_in_vc($$) {
 	return $found;
 }
 
-sub darcs_rev($) {
+sub darcs_rev ($) {
 	my $file = shift; # Relative to the repodir.
 	my $repodir = $config{srcdir};
 
@@ -78,7 +78,7 @@ sub darcs_rev($) {
 	return defined $hash ? $hash : "";
 }
 
-sub checkconfig() {
+sub checkconfig () {
 	if (defined $config{darcs_wrapper} && length $config{darcs_wrapper}) {
 		push @{$config{wrappers}}, {
 			wrapper => $config{darcs_wrapper},
@@ -87,7 +87,7 @@ sub checkconfig() {
 	}
 }
 
-sub getsetup() {
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # rcs plugin
@@ -238,7 +238,7 @@ sub rcs_commit ($$$;$$) {
 	}
 }
 
-sub rcs_commit_staged($$$) {
+sub rcs_commit_staged ($$$) {
 	my ($message, $user, $ipaddr) = @_;
 
 	my $author;
-- 
cgit v1.2.3


From 522daa7ea8111482701ce222800096edaf8eb2d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 15:27:15 -0400
Subject: factored out generic commented line dumping

---
 IkiWiki/Setup.pm          | 94 +++++++++++++++++++++++++++++++++++++++--------
 IkiWiki/Setup/Standard.pm | 94 +++++++++--------------------------------------
 2 files changed, 96 insertions(+), 92 deletions(-)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 3accf3591..369ff44d0 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -13,28 +13,28 @@ use open qw{:utf8 :std};
 use File::Spec;
 
 sub load ($;$) {
-	my $setup=IkiWiki::possibly_foolish_untaint(shift);
+	my $file=IkiWiki::possibly_foolish_untaint(shift);
 	my $safemode=shift;
 
-	$config{setupfile}=File::Spec->rel2abs($setup);
+	$config{setupfile}=File::Spec->rel2abs($file);
 
 	#translators: The first parameter is a filename, and the second
 	#translators: is a (probably not translated) error message.
-	open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
+	open (IN, $file) || error(sprintf(gettext("cannot read %s: %s"), $file, $!));
 	my $content;
 	{
 		local $/=undef;
-		$content=<IN> || error("$setup: $!");
+		$content=<IN> || error("$file: $!");
 	}
 	close IN;
 
 	if ($content=~/(use\s+)?(IkiWiki::Setup::\w+)/) {
 		$config{setuptype}=$2;
 		if ($1) {
-			error sprintf(gettext("cannot load %s in safe mode"), $setup)
+			error sprintf(gettext("cannot load %s in safe mode"), $file)
 				if $safemode;
 			eval IkiWiki::possibly_foolish_untaint($content);
-			error("$setup: ".$@) if $@;
+			error("$file: ".$@) if $@;
 		}
 		else {
 			eval qq{require $config{setuptype}};
@@ -43,10 +43,22 @@ sub load ($;$) {
 		}
 	}
 	else {
-		error sprintf(gettext("failed to parse %s"), $setup);
+		error sprintf(gettext("failed to parse %s"), $file);
 	}
 }
 
+sub dump ($) {
+	my $file=IkiWiki::possibly_foolish_untaint(shift);
+	
+	eval qq{require $config{setuptype}};
+	error $@ if $@;
+	my @dump=$config{setuptype}->gendump("Setup file for ikiwiki.");
+
+	open (OUT, ">", $file) || die "$file: $!";
+	print OUT "$_\n" foreach @dump;
+	close OUT;
+}
+
 sub merge ($) {
 	# Merge setup into existing config and untaint.
 	my %setup=%{shift()};
@@ -147,16 +159,68 @@ sub getsetup () {
 		} keys %sections;
 }
 
-sub dump ($) {
-	my $file=IkiWiki::possibly_foolish_untaint(shift);
+sub commented_dump ($) {
+	my $dumpline=shift;
+
+	my %setup=(%config);
+	my @ret;
 	
-	eval qq{require $config{setuptype}};
-	error $@ if $@;
-	my @dump=$config{setuptype}->gendump("Setup file for ikiwiki.");
+	# disable logging to syslog while dumping
+	$config{syslog}=undef;
+
+	eval q{use Text::Wrap};
+	die $@ if $@;
+
+	my %section_plugins;
+	push @ret, commented_dumpvalues($dumpline, \%setup, IkiWiki::getsetup());
+	foreach my $pair (IkiWiki::Setup::getsetup()) {
+		my $plugin=$pair->[0];
+		my $setup=$pair->[1];
+		my %s=@{$setup};
+		my $section=$s{plugin}->{section};
+		push @{$section_plugins{$section}}, $plugin;
+		if (@{$section_plugins{$section}} == 1) {
+			push @ret, "", "\t".("#" x 70), "\t# $section plugins",
+				sub {
+					wrap("\t#   (", "\t#    ",
+						join(", ", @{$section_plugins{$section}})).")"
+				},
+				"\t".("#" x 70);
+		}
 
-	open (OUT, ">", $file) || die "$file: $!";
-	print OUT "$_\n" foreach @dump;
-	close OUT;
+		my @values=commented_dumpvalues($dumpline, \%setup, @{$setup});
+		if (@values) {
+			push @ret, "", "\t# $plugin plugin", @values;
+		}
+	}
+
+	return map { ref $_ ? $_->() : $_ } @ret;
+}
+
+sub commented_dumpvalues ($$@) {
+	my $dumpline=shift;
+	my $setup=shift;
+	my @ret;
+	while (@_) {
+		my $key=shift;
+		my %info=%{shift()};
+
+		next if $key eq "plugin" || $info{type} eq "internal";
+		
+		push @ret, "\t# ".$info{description} if exists $info{description};
+		
+		if (exists $setup->{$key} && defined $setup->{$key}) {
+			push @ret, $dumpline->($key, $setup->{$key}, $info{type}, "");
+			delete $setup->{$key};
+		}
+		elsif (exists $info{example}) {
+			push @ret, $dumpline->($key, $info{example}, $info{type}, "#");
+		}
+		else {
+			push @ret, $dumpline->($key, "", $info{type}, "#");
+		}
+	}
+	return @ret;
 }
 
 1
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 4022ff03c..9c177e497 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 # Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff,
-# plus an array of wrappers to set up.
+# Parameters to import should be all the standard ikiwiki config stuff.
 
 package IkiWiki::Setup::Standard;
 
@@ -13,6 +12,22 @@ sub import {
 	IkiWiki::Setup::merge($_[1]);
 }
 
+sub gendump ($$) {
+	my $class=shift;
+	my $description=shift;
+
+	"#!/usr/bin/perl",
+	"# $description",
+	"#",
+	"# 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.",
+	"use IkiWiki::Setup::Standard {",
+	IkiWiki::Setup::commented_dump(\&dumpline),
+	"}";
+}
+
 sub dumpline ($$$$) {
 	my $key=shift;
 	my $value=shift;
@@ -57,79 +72,4 @@ sub dumpline ($$$$) {
 	return "\t$prefix$key => $dumpedvalue,";
 }
 
-sub dumpvalues ($@) {
-	my $setup=shift;
-	my @ret;
-	while (@_) {
-		my $key=shift;
-		my %info=%{shift()};
-
-		next if $key eq "plugin" || $info{type} eq "internal";
-		
-		push @ret, "\t# ".$info{description} if exists $info{description};
-		
-		if (exists $setup->{$key} && defined $setup->{$key}) {
-			push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
-			delete $setup->{$key};
-		}
-		elsif (exists $info{example}) {
-			push @ret, dumpline($key, $info{example}, $info{type}, "#");
-		}
-		else {
-			push @ret, dumpline($key, "", $info{type}, "#");
-		}
-	}
-	return @ret;
-}
-
-sub gendump ($$) {
-	my $class=shift;
-	my $description=shift;
-
-	my %setup=(%config);
-	my @ret;
-	
-	# disable logging to syslog while dumping
-	$config{syslog}=undef;
-
-	eval q{use Text::Wrap};
-	die $@ if $@;
-
-	my %section_plugins;
-	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
-	foreach my $pair (IkiWiki::Setup::getsetup()) {
-		my $plugin=$pair->[0];
-		my $setup=$pair->[1];
-		my %s=@{$setup};
-		my $section=$s{plugin}->{section};
-		push @{$section_plugins{$section}}, $plugin;
-		if (@{$section_plugins{$section}} == 1) {
-			push @ret, "", "\t".("#" x 70), "\t# $section plugins",
-				sub {
-					wrap("\t#   (", "\t#    ",
-						join(", ", @{$section_plugins{$section}})).")"
-				},
-				"\t".("#" x 70);
-		}
-
-		my @values=dumpvalues(\%setup, @{$setup});
-		if (@values) {
-			push @ret, "", "\t# $plugin plugin", @values;
-		}
-	}
-
-	unshift @ret,
-		"#!/usr/bin/perl",
-		"# $description",
-		"#",
-		"# 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.",
-		"use IkiWiki::Setup::Standard {";
-	push @ret, "}";
-
-	return map { ref $_ ? $_->() : $_ } @ret;
-}
-
 1
-- 
cgit v1.2.3


From bbe1f2e493f009b49aba6ab83304f9484e37c61d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 15:35:21 -0400
Subject: move generic comment into IkiWiki::Setup

---
 IkiWiki/Setup.pm          |  9 ++++++++-
 IkiWiki/Setup/Standard.pm | 11 +++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 369ff44d0..45f263bc8 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -52,7 +52,14 @@ sub dump ($) {
 	
 	eval qq{require $config{setuptype}};
 	error $@ if $@;
-	my @dump=$config{setuptype}->gendump("Setup file for ikiwiki.");
+	my @dump=$config{setuptype}->gendump(
+		"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.",
+	);
 
 	open (OUT, ">", $file) || die "$file: $!";
 	print OUT "$_\n" foreach @dump;
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9c177e497..92e97c4b4 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -12,20 +12,15 @@ sub import {
 	IkiWiki::Setup::merge($_[1]);
 }
 
-sub gendump ($$) {
+sub gendump ($@) {
 	my $class=shift;
-	my $description=shift;
 
 	"#!/usr/bin/perl",
-	"# $description",
 	"#",
-	"# 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.",
+	(map { "# $_" } @_),
 	"use IkiWiki::Setup::Standard {",
 	IkiWiki::Setup::commented_dump(\&dumpline),
-	"}";
+	"}"
 }
 
 sub dumpline ($$$$) {
-- 
cgit v1.2.3


From 10f8a2c85841d5884ccee096145498af96f06f05 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 15:36:33 -0400
Subject: improve comments

---
 IkiWiki/Setup/Standard.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 92e97c4b4..33b578e12 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,6 +1,4 @@
 #!/usr/bin/perl
-# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff.
 
 package IkiWiki::Setup::Standard;
 
@@ -8,6 +6,7 @@ use warnings;
 use strict;
 use IkiWiki;
 
+# Parameters to import should be all the standard ikiwiki config, in a hash.
 sub import {
 	IkiWiki::Setup::merge($_[1]);
 }
-- 
cgit v1.2.3


From 19a794b4829c548a7f5b9dc22e22c24d7f28bad8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 15:44:28 -0400
Subject: parameterized indent

---
 IkiWiki/Setup.pm          | 20 +++++++++++---------
 IkiWiki/Setup/Standard.pm |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 45f263bc8..a71a12d9d 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -166,8 +166,9 @@ sub getsetup () {
 		} keys %sections;
 }
 
-sub commented_dump ($) {
+sub commented_dump ($$) {
 	my $dumpline=shift;
+	my $indent=shift;
 
 	my %setup=(%config);
 	my @ret;
@@ -179,7 +180,7 @@ sub commented_dump ($) {
 	die $@ if $@;
 
 	my %section_plugins;
-	push @ret, commented_dumpvalues($dumpline, \%setup, IkiWiki::getsetup());
+	push @ret, commented_dumpvalues($dumpline, $indent, \%setup, IkiWiki::getsetup());
 	foreach my $pair (IkiWiki::Setup::getsetup()) {
 		my $plugin=$pair->[0];
 		my $setup=$pair->[1];
@@ -187,25 +188,26 @@ sub commented_dump ($) {
 		my $section=$s{plugin}->{section};
 		push @{$section_plugins{$section}}, $plugin;
 		if (@{$section_plugins{$section}} == 1) {
-			push @ret, "", "\t".("#" x 70), "\t# $section plugins",
+			push @ret, "", $indent.("#" x 70), "$indent# $section plugins",
 				sub {
-					wrap("\t#   (", "\t#    ",
+					wrap("$indent#   (", "$indent#    ",
 						join(", ", @{$section_plugins{$section}})).")"
 				},
-				"\t".("#" x 70);
+				$indent.("#" x 70);
 		}
 
-		my @values=commented_dumpvalues($dumpline, \%setup, @{$setup});
+		my @values=commented_dumpvalues($dumpline, $indent, \%setup, @{$setup});
 		if (@values) {
-			push @ret, "", "\t# $plugin plugin", @values;
+			push @ret, "", "$indent# $plugin plugin", @values;
 		}
 	}
 
 	return map { ref $_ ? $_->() : $_ } @ret;
 }
 
-sub commented_dumpvalues ($$@) {
+sub commented_dumpvalues ($$$@) {
 	my $dumpline=shift;
+	my $indent=shift;
 	my $setup=shift;
 	my @ret;
 	while (@_) {
@@ -214,7 +216,7 @@ sub commented_dumpvalues ($$@) {
 
 		next if $key eq "plugin" || $info{type} eq "internal";
 		
-		push @ret, "\t# ".$info{description} if exists $info{description};
+		push @ret, "$indent# ".$info{description} if exists $info{description};
 		
 		if (exists $setup->{$key} && defined $setup->{$key}) {
 			push @ret, $dumpline->($key, $setup->{$key}, $info{type}, "");
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 33b578e12..c85069304 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -18,7 +18,7 @@ sub gendump ($@) {
 	"#",
 	(map { "# $_" } @_),
 	"use IkiWiki::Setup::Standard {",
-	IkiWiki::Setup::commented_dump(\&dumpline),
+	IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
 	"}"
 }
 
-- 
cgit v1.2.3


From bba513a3e52170dc06b545a44f2d859ae4b757b5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 15:50:59 -0400
Subject: Add support for setup files written in YAML.

Not the default. (Yet?)
---
 IkiWiki/Setup/Yaml.pm | 43 +++++++++++++++++++++++++++++++++++++++++++
 debian/changelog      |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 IkiWiki/Setup/Yaml.pm

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
new file mode 100644
index 000000000..ba9192faf
--- /dev/null
+++ b/IkiWiki/Setup/Yaml.pm
@@ -0,0 +1,43 @@
+#!/usr/bin/perl
+
+package IkiWiki::Setup::Yaml;
+
+use warnings;
+use strict;
+use IkiWiki;
+use YAML;
+
+sub loaddump ($$) {
+	my $class=shift;
+	my $content=shift;
+
+	IkiWiki::Setup::merge(Load($content));
+}
+
+sub gendump ($@) {
+	my $class=shift;
+
+	"# IkiWiki::Setup::Yaml - YAML formatted setup file",
+	"#",
+	(map { "# $_" } @_),
+	"#",
+	IkiWiki::Setup::commented_dump(\&dumpline, "")
+}
+
+
+sub dumpline ($$$$) {
+	my $key=shift;
+	my $value=shift;
+	my $type=shift;
+	my $prefix=shift;
+	
+	$YAML::UseHeader=0;
+	my $dump=Dump({$key => $value});
+	chomp $dump;
+	if (length $prefix) {
+		$dump=join("", map { $prefix.$_ } split(/\n/, $dump));
+	}
+	return $dump;
+}
+
+1
diff --git a/debian/changelog b/debian/changelog
index 73f6fcff8..e020b380f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low
     for security or other reasons. Closes: #447267
     (Thanks to Aaron Wilson for the original patch.)
   * Allow wrappers to be built using tcc.
+  * Add support for setup files written in YAML.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
-- 
cgit v1.2.3


From 07bb08d0944a0282d6ed332deeefe347bc88139c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 15:55:10 -0400
Subject: shorten setuptype

---
 IkiWiki.pm       |  2 +-
 IkiWiki/Setup.pm | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 241fb45b7..022bfe3bd 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -469,7 +469,7 @@ sub getsetup () {
 	},
 	setuptype => {
 		type => "internal",
-		default => "IkiWiki::Setup::Standard",
+		default => "Standard",
 		description => "perl class to use to dump setup file",
 		safe => 0,
 		rebuild => 0,
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index a71a12d9d..2cf01ea68 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -28,7 +28,7 @@ sub load ($;$) {
 	}
 	close IN;
 
-	if ($content=~/(use\s+)?(IkiWiki::Setup::\w+)/) {
+	if ($content=~/(use\s+)?IkiWiki::Setup::(\w+)/) {
 		$config{setuptype}=$2;
 		if ($1) {
 			error sprintf(gettext("cannot load %s in safe mode"), $file)
@@ -37,9 +37,9 @@ sub load ($;$) {
 			error("$file: ".$@) if $@;
 		}
 		else {
-			eval qq{require $config{setuptype}};
+			eval qq{require IkiWiki::Setup::$config{setuptype}};
 			error $@ if $@;
-			$config{setuptype}->loaddump(IkiWiki::possibly_foolish_untaint($content));
+			"IkiWiki::Setup::$config{setuptype}"->loaddump(IkiWiki::possibly_foolish_untaint($content));
 		}
 	}
 	else {
@@ -50,9 +50,9 @@ sub load ($;$) {
 sub dump ($) {
 	my $file=IkiWiki::possibly_foolish_untaint(shift);
 	
-	eval qq{require $config{setuptype}};
+	eval qq{require IkiWiki::Setup::$config{setuptype}};
 	error $@ if $@;
-	my @dump=$config{setuptype}->gendump(
+	my @dump="IkiWiki::Setup::$config{setuptype}"->gendump(
 		"Setup file for ikiwiki.",
 		"",
 		"Passing this to ikiwiki --setup will make ikiwiki generate",
-- 
cgit v1.2.3


From 3b08789e6fb5809dd9b8f51f5c5e7df1d78e6930 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 16:09:07 -0400
Subject: load YAML on demand

so as not to break test suite if YAML is not avilable
---
 IkiWiki/Setup/Yaml.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index ba9192faf..c7ff1988e 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -5,17 +5,21 @@ package IkiWiki::Setup::Yaml;
 use warnings;
 use strict;
 use IkiWiki;
-use YAML;
 
 sub loaddump ($$) {
 	my $class=shift;
 	my $content=shift;
 
+	eval q{use YAML};
+	die $@ if $@;
 	IkiWiki::Setup::merge(Load($content));
 }
 
 sub gendump ($@) {
 	my $class=shift;
+	
+	eval q{use YAML};
+	die $@ if $@;
 
 	"# IkiWiki::Setup::Yaml - YAML formatted setup file",
 	"#",
-- 
cgit v1.2.3


From dc128dd829bfd08dba5d6929956d9064e7d37b81 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 17:54:58 -0400
Subject: fix newlines in commented defaults

---
 IkiWiki/Setup/Yaml.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index c7ff1988e..0fc273675 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -39,7 +39,7 @@ sub dumpline ($$$$) {
 	my $dump=Dump({$key => $value});
 	chomp $dump;
 	if (length $prefix) {
-		$dump=join("", map { $prefix.$_ } split(/\n/, $dump));
+		$dump=join("\n", map { $prefix.$_ } split(/\n/, $dump));
 	}
 	return $dump;
 }
-- 
cgit v1.2.3


From 9fb3409613d32e447ababb99bc963867b80340e9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 17:58:40 -0400
Subject: new tip

---
 doc/tips/yaml_setup_files.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/tips/yaml_setup_files.mdwn

diff --git a/doc/tips/yaml_setup_files.mdwn b/doc/tips/yaml_setup_files.mdwn
new file mode 100644
index 000000000..4ae0de4aa
--- /dev/null
+++ b/doc/tips/yaml_setup_files.mdwn
@@ -0,0 +1,10 @@
+Here's how to convert your existing standard format ikiwiki setup file into
+the new YAML format recently added to ikiwiki.
+
+1. First, make sure you have the [[!cpan YAML]] perl module installed.
+   (Run: `apt-get install libyaml-perl`)
+2. Run: `ikiwiki -setup my.setup -dumpsetup my.setup --set setuptype=Yaml`
+
+The format of the YAML setup file should be fairly self-explanatory.
+
+--[[Joey]]
-- 
cgit v1.2.3


From aea5bf9b40f6676e93f987c28d9f2aa23608f5da Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Mar 2010 14:51:47 -0400
Subject: reset setuptype to standard after an automator setup file is loaded

so a standard file is generated (by default)
---
 IkiWiki/Setup/Automator.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 9da594e99..9f694e18e 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -39,6 +39,7 @@ sub sanitize_wikiname ($) {
 sub import (@) {
 	my $this=shift;
 	IkiWiki::Setup::merge({@_});
+	$config{setuptype}='Standard';
 
 	if (! $config{force_overwrite}) {
 		# Avoid overwriting any existing files.
-- 
cgit v1.2.3


From 85778f59fd0d84410f6e4191802e634b0f3c8935 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Mar 2010 14:52:21 -0400
Subject: check for 'require' instead of 'use'

---
 IkiWiki/Setup.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 2cf01ea68..06102058b 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -28,7 +28,7 @@ sub load ($;$) {
 	}
 	close IN;
 
-	if ($content=~/(use\s+)?IkiWiki::Setup::(\w+)/) {
+	if ($content=~/((?:use|require)\s+)?IkiWiki::Setup::(\w+)/) {
 		$config{setuptype}=$2;
 		if ($1) {
 			error sprintf(gettext("cannot load %s in safe mode"), $file)
-- 
cgit v1.2.3


From 440e18bc15389780833fc8b9c04116a97eeaeaa2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Mar 2010 14:59:21 -0400
Subject: reset setuptype first, actually

so setup file can override default
---
 IkiWiki/Setup/Automator.pm | 2 +-
 debian/changelog           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 9f694e18e..e9a572450 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -38,8 +38,8 @@ sub sanitize_wikiname ($) {
 
 sub import (@) {
 	my $this=shift;
-	IkiWiki::Setup::merge({@_});
 	$config{setuptype}='Standard';
+	IkiWiki::Setup::merge({@_});
 
 	if (! $config{force_overwrite}) {
 		# Avoid overwriting any existing files.
diff --git a/debian/changelog b/debian/changelog
index e020b380f..4d0639a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100313) UNRELEASED; urgency=low
+ikiwiki (3.20100320) UNRELEASED; urgency=low
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.
-- 
cgit v1.2.3


From cc9621a6811dde5e1d28eb152133bcd448a125d8 Mon Sep 17 00:00:00 2001
From: "http://jcftang.myopenid.com/" <http://jcftang.myopenid.com/@web>
Date: Mon, 22 Mar 2010 20:57:27 +0000
Subject: sadly we moved to using drupal for most of our site

---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 8e567ec0d..b40fd461d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -40,7 +40,6 @@ Projects & Organizations
 * [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de)
 * [monkeysphere](http://web.monkeysphere.info/)
 * [The Walden Effect](http://www.waldeneffect.org/)
-* The support pages for [Trinity Centre for High Performance Computing](http://www.tchpc.tcd.ie/support/)
 * [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/)
 * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
-- 
cgit v1.2.3


From e74a85c671cf9fe1e445ad183d66e059beaec2f9 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 22 Mar 2010 23:01:00 +0000
Subject: rename
 forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
 to forum/utf8_warnings_for___34____92__xAB__34__.mdwn

---
 ...__44_____60____36__in__62___chunk_1.__39__.mdwn | 47 ----------------------
 .../utf8_warnings_for___34____92__xAB__34__.mdwn   | 47 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
 create mode 100644 doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn

diff --git a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
deleted file mode 100644
index 72f2d38e0..000000000
--- a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
+++ /dev/null
@@ -1,47 +0,0 @@
-# getting Warnings about UTF8-Chars.
-
-I'm  getting multiple warnings:
-
-      utf8 "\xAB" does not map to Unicode at /usr/share/perl5/IkiWiki.pm line 774, <$in> chunk 1.
-
-
-I'm assuming this is once per File, but even in verbose mode, it doesn't tell me which file is a problem.
-It first reads all the files, and afterwards when parsing/compiling them, it outputs the warning, so I can't
-deduce the offending files.
-
-Is there a way to have ikiwiki output the position, where it encounters the character?
-
-Probably all this has to do with locale-settings, and usage of mixed locales in a distributed setup ...
-I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalzer]]
-
---------
-
-**Update** : So I took the chance to insert debug into ikiwiki.pm:
-
-     root@novalis:/usr/share/perl5# diff -p /tmp/IkiWiki.orig.pm IkiWiki.pm 
-     *** /tmp/IkiWiki.orig.pm        Sun Feb 14 15:16:08 2010
-     --- IkiWiki.pm  Sun Feb 14 15:16:28 2010
-     *************** sub readfile ($;$$) {
-     *** 768,773 ****
-     --- 768,774 ----
-             }
-       
-             local $/=undef;
-     +       debug("opening File: $file:");
-             open (my $in, "<", $file) || error("failed to read $file: $!");
-             binmode($in) if ($binary);
-             return \*$in if $wantfd;
-
-
-But what I see now is not quite helpful, as it seems, STDERR and DEBUG are asyncronous, so they mix up in a way, that I can't really see, whats the problem ...  Maybe I'm better off for troubleshooting, to insert an printf to strerr to have it in the same stream.. --[[jwalzer]]
-
-
-----
-
-**Update:** The "print STDERR $file;"-Trick did it .. I was able to find a mdwn-file, that (was generated by a script of me) had \0xAB in it.
-
-Nevertheless I still wonder if this should be a problem. This character happend to be in an *\[\[meta title='$CHAR'\]\]-tag* and an *\[$CHAR\]http://foo)-Link*
-
-Should this throw an warning? Maybe this warning could be catched an reported inclusively the containing filename? maybe even with an override, if one knows that it is correct that way? --[[jwalzer]]
-
-[[!tag solved]]
diff --git a/doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn b/doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn
new file mode 100644
index 000000000..72f2d38e0
--- /dev/null
+++ b/doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn
@@ -0,0 +1,47 @@
+# getting Warnings about UTF8-Chars.
+
+I'm  getting multiple warnings:
+
+      utf8 "\xAB" does not map to Unicode at /usr/share/perl5/IkiWiki.pm line 774, <$in> chunk 1.
+
+
+I'm assuming this is once per File, but even in verbose mode, it doesn't tell me which file is a problem.
+It first reads all the files, and afterwards when parsing/compiling them, it outputs the warning, so I can't
+deduce the offending files.
+
+Is there a way to have ikiwiki output the position, where it encounters the character?
+
+Probably all this has to do with locale-settings, and usage of mixed locales in a distributed setup ...
+I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalzer]]
+
+--------
+
+**Update** : So I took the chance to insert debug into ikiwiki.pm:
+
+     root@novalis:/usr/share/perl5# diff -p /tmp/IkiWiki.orig.pm IkiWiki.pm 
+     *** /tmp/IkiWiki.orig.pm        Sun Feb 14 15:16:08 2010
+     --- IkiWiki.pm  Sun Feb 14 15:16:28 2010
+     *************** sub readfile ($;$$) {
+     *** 768,773 ****
+     --- 768,774 ----
+             }
+       
+             local $/=undef;
+     +       debug("opening File: $file:");
+             open (my $in, "<", $file) || error("failed to read $file: $!");
+             binmode($in) if ($binary);
+             return \*$in if $wantfd;
+
+
+But what I see now is not quite helpful, as it seems, STDERR and DEBUG are asyncronous, so they mix up in a way, that I can't really see, whats the problem ...  Maybe I'm better off for troubleshooting, to insert an printf to strerr to have it in the same stream.. --[[jwalzer]]
+
+
+----
+
+**Update:** The "print STDERR $file;"-Trick did it .. I was able to find a mdwn-file, that (was generated by a script of me) had \0xAB in it.
+
+Nevertheless I still wonder if this should be a problem. This character happend to be in an *\[\[meta title='$CHAR'\]\]-tag* and an *\[$CHAR\]http://foo)-Link*
+
+Should this throw an warning? Maybe this warning could be catched an reported inclusively the containing filename? maybe even with an override, if one knows that it is correct that way? --[[jwalzer]]
+
+[[!tag solved]]
-- 
cgit v1.2.3


From e67a9382f67e745af3be7d367fe7a0d36c1777e6 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 24 Mar 2010 00:29:10 +0000
Subject: Allow hooks to add sorting functions to pagespec_match_list

---
 IkiWiki.pm                        |  6 +++++-
 doc/ikiwiki/pagespec/sorting.mdwn |  2 ++
 doc/plugins/write.mdwn            | 15 +++++++++++++++
 t/pagespec_match_list.t           |  6 +++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 022bfe3bd..1a4dc47dd 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2035,7 +2035,11 @@ sub pagespec_match_list ($$;@) {
 
 	if (defined $params{sort}) {
 		my $f;
-		if ($params{sort} eq 'title') {
+
+		if (exists $hooks{sort}{$params{sort}}{call}) {
+			$f = sub { $hooks{sort}{$params{sort}}{call}($a, $b) };
+		}
+		elsif ($params{sort} eq 'title') {
 			$f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) };
 		}
 		elsif ($params{sort} eq 'title_natural') {
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 697818a2a..9007c23bf 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -10,4 +10,6 @@ orders can be specified.
   installed. Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
 
+Plugins can add additional sort orders.
+
 [[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 96a2aa16d..bfa6617bd 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -588,6 +588,21 @@ describes the plugin as a whole. For example:
 This hook is used to inject C code (which it returns) into the `main`
 function of the ikiwiki wrapper when it is being generated.
 
+### sort
+
+	hook(type => "sort", id => "foo", call => \&sort_by_foo);
+
+This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
+an existing one. The callback is given two page names as arguments, and
+returns negative, zero or positive if the first page should come before,
+close to (i.e. undefined order), or after the second page.
+
+For instance, the built-in `title` sort order could be reimplemented as
+
+	sub sort_by_title {
+		pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
+	}
+
 ## Exported variables
 
 Several variables are exported to your plugin when you `use IkiWiki;`
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index dd5dcc5b0..b34ee769f 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 88;
+use Test::More tests => 89;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -9,6 +9,8 @@ BEGIN { use_ok("IkiWiki"); }
 $config{srcdir}=$config{destdir}="/dev/null";
 IkiWiki::checkconfig();
 
+hook(type => "sort", id => "path", call => sub { $_[0] cmp $_[1] });
+
 %pagesources=(
 	foo => "foo.mdwn",
 	foo2 => "foo2.mdwn",
@@ -34,6 +36,8 @@ is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50)],
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
                          filter => sub { $_[0] =~ /3/}) ],
 	["post/1", "post/2"]);
+is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)],
+	["bar", "foo"]);
 my $r=eval { pagespec_match_list("foo", "beep") };
 ok(eval { pagespec_match_list("foo", "beep") } == 0);
 ok(! $@, "does not fail with error when unable to match anything");
-- 
cgit v1.2.3


From 4fd05df4d4cd64905c13ceb4c9d8821f4f26d0bc Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 03:04:16 +0000
Subject: cross-reference

---
 ...ap_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
index de178d415..d12414d55 100644
--- a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
+++ b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
@@ -16,3 +16,5 @@ The [[ikiwiki/directive/map]] directive sort by pagename. That looks kind of odd
 >> 2. I cannot get inline to create a list when the htmltidy plugin is switched on. I have a template which is enclosed in an li tag, and i put the ul tag around the inline manually, but htmltidy breaks this. --martin
 
 >>>> You might want to check if the [[plugins/contrib/report]] plugin solves your problem.  It can sort by title, among other things. --[[KathrynAndersen]]
+
+>> See also: [[todo/sort_parameter_for_map_plugin_and_directive]] --[[smcv]]
-- 
cgit v1.2.3


From 0618f099dab8bd4f7f47e2695db01eabe49e3316 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 24 Mar 2010 00:59:01 +0000
Subject: Have the meta plugin add a meta_title sort order

---
 IkiWiki/Plugin/meta.pm            | 15 +++++++++++++++
 doc/ikiwiki/pagespec/sorting.mdwn |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 5f046cb2a..bf8159814 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -13,6 +13,7 @@ sub import {
 	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
 	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
+	hook(type => "sort", id => "meta_title", call => \&sort_meta_title);
 }
 
 sub getsetup () {
@@ -282,6 +283,20 @@ sub pagetemplate (@) {
 	}
 }
 
+sub title {
+	my $title = $pagestate{$_[0]}{meta}{title};
+
+	if (defined $title) {
+		return $title;
+	}
+
+	return pagetitle(IkiWiki::basename($_[0]));
+}
+
+sub sort_meta_title {
+	return title($_[0]) cmp title($_[1]);
+}
+
 sub match {
 	my $field=shift;
 	my $page=shift;
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 9007c23bf..3a9fef9b6 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -9,7 +9,12 @@ orders can be specified.
 * `title_natural` - Only available if [[!cpan Sort::Naturally]] is
   installed. Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+[[!if test="enabled(meta)" then="""
+* `meta_title` - Order by the full title set by the `\[[!meta title="foo"]]`
+  [[ikiwiki/directive]].
+"""]]
 
-Plugins can add additional sort orders.
+Plugins can add additional sort orders, so more might be available on this
+wiki.
 
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From b0ae19872d443860aeaab7069255e3a68a520887 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 24 Mar 2010 03:18:24 +0000
Subject: Add an optional "sort" argument to meta titles, defaulting to the
 title

This allows correct sorting of titles, names, etc., with:

    [[!meta title="David Bowie" sort="Bowie, David"]]
    [[!meta title="The Beatles" sort="Beatles, The"]]
---
 IkiWiki/Plugin/meta.pm            | 16 +++++++++++-----
 doc/ikiwiki/directive/meta.mdwn   |  7 +++++++
 doc/ikiwiki/pagespec/sorting.mdwn |  7 ++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index bf8159814..a470041c9 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -90,6 +90,12 @@ sub preprocess (@) {
 	# Metadata collection that needs to happen during the scan pass.
 	if ($key eq 'title') {
 		$pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
+		if (exists $params{sort}) {
+			$pagestate{$page}{meta}{titlesort}=$params{sort};
+		}
+		else {
+			$pagestate{$page}{meta}{titlesort}=$value;
+		}
 		return "";
 	}
 	elsif ($key eq 'description') {
@@ -283,18 +289,18 @@ sub pagetemplate (@) {
 	}
 }
 
-sub title {
-	my $title = $pagestate{$_[0]}{meta}{title};
+sub titlesort {
+	my $key = $pagestate{$_[0]}{meta}{titlesort};
 
-	if (defined $title) {
-		return $title;
+	if (defined $key) {
+		return $key;
 	}
 
 	return pagetitle(IkiWiki::basename($_[0]));
 }
 
 sub sort_meta_title {
-	return title($_[0]) cmp title($_[1]);
+	return titlesort($_[0]) cmp titlesort($_[1]);
 }
 
 sub match {
diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index 557441c0b..8d2a5b1ad 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -23,6 +23,13 @@ Supported fields:
   be set to a true value in the template; this can be used to format things
   differently in this case.
 
+  An optional `sort` parameter will be used preferentially when
+  [[ikiwiki/pagespec/sorting]] by `meta_title`:
+
+	\[[!meta title="The Beatles" sort="Beatles, The"]]
+
+	\[[!meta title="David Bowie" sort="Bowie, David"]]
+
 * license
 
   Specifies a license for the page, for example, "GPL". Can contain
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 3a9fef9b6..61516bec5 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -5,13 +5,14 @@ orders can be specified.
 
 * `age` - List pages from the most recently created to the oldest.
 * `mtime` - List pages with the most recently modified first.
-* `title` - Order by title.
+* `title` - Order by title (page name).
 * `title_natural` - Only available if [[!cpan Sort::Naturally]] is
   installed. Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
 [[!if test="enabled(meta)" then="""
-* `meta_title` - Order by the full title set by the `\[[!meta title="foo"]]`
-  [[ikiwiki/directive]].
+* `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
+  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
+  full title was set.
 """]]
 
 Plugins can add additional sort orders, so more might be available on this
-- 
cgit v1.2.3


From 1c7d5eabd7c9e94498af7f89a005311a850d742c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 03:24:15 +0000
Subject: propsed branch

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 doc/todo/allow_plugins_to_add_sorting_methods.mdwn

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
new file mode 100644
index 000000000..3aa1d94a6
--- /dev/null
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -0,0 +1,47 @@
+[[!template id=gitbranch branch=smcv/sort-hooks author="[[Simon_McVittie|smcv]]"]]
+[[!tag patch]]
+
+The available [[ikiwiki/pagespec/sorting]] methods are currently hard-coded in
+IkiWiki.pm, making it difficult to add any extra sorting mechanisms. I've
+prepared a branch which adds 'sort' as a hook type and uses it to implement a
+new `meta_title` sort type.
+
+Someone could use this hook to make `\[[!inline sort=title]]` prefer the meta
+title over the page name, but for compatibility, I'm not going to (I do wonder
+whether it would be worth making sort=name an alias for the current sort=title,
+and changing the meaning of sort=title in 4.0, though).
+
+Gitweb:
+<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks>
+
+## Documentation extracted from the branch
+
+### sort hook (added to [[plugins/write]])
+
+       hook(type => "sort", id => "foo", call => \&sort_by_foo);
+
+This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
+an existing one. The callback is given two page names as arguments, and
+returns negative, zero or positive if the first page should come before,
+close to (i.e. undefined order), or after the second page.
+
+For instance, the built-in `title` sort order could be reimplemented as
+
+       sub sort_by_title {
+               pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
+       }
+
+### meta_title sort order (conditionally added to [[ikiwiki/pagespec/sorting]])
+
+* `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
+  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
+  full title was set.
+
+### meta title sort parameter (added to [[ikiwiki/directive/meta]])
+
+An optional `sort` parameter will be used preferentially when
+[[ikiwiki/pagespec/sorting]] by `meta_title`:
+
+       \[[!meta title="The Beatles" sort="Beatles, The"]]
+
+       \[[!meta title="David Bowie" sort="Bowie, David"]]
-- 
cgit v1.2.3


From 7fbddb032ee952c6d0b1ee290568ea4f42ef181f Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 03:27:11 +0000
Subject: link to an alternative approach that I decided against

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 3aa1d94a6..1533b6c44 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -14,6 +14,12 @@ and changing the meaning of sort=title in 4.0, though).
 Gitweb:
 <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks>
 
+I briefly tried to turn *all* the current sort types into hook functions, and
+have some of them pre-registered, but decided that probably wasn't a good idea.
+That earlier version of the branch is also available for comparison:
+
+<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks-excessive>
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 48c09d44637dd724d084b1d06e2277f11e80d489 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 03:30:06 +0000
Subject: note: old version untested

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 1533b6c44..99f256fbe 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -20,6 +20,11 @@ That earlier version of the branch is also available for comparison:
 
 <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks-excessive>
 
+(The older version is untested, and probably doesn't really work as-is - I
+misunderstood the details of how the built-in function `sort` works when using
+`$a` and `$b`. The newer version has been tested, and has a regression test for
+its core functionality.)
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 8108a7f4ba315bf93fd2f5acb233ae9cc6a33393 Mon Sep 17 00:00:00 2001
From: cian <cian@web>
Date: Wed, 24 Mar 2010 13:36:59 +0000
Subject:

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8cba8973f..c323153c8 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,6 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-
+[[Testing 1 2 3| test]]
 # Header
 
 ## Subheader2
-- 
cgit v1.2.3


From 9d4bedf760fbbbdba28986c01c3e429f67386217 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 17:11:17 +0000
Subject: relationship with [[plugins/contrib/report]]

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 99f256fbe..21800f4de 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -25,6 +25,21 @@ misunderstood the details of how the built-in function `sort` works when using
 `$a` and `$b`. The newer version has been tested, and has a regression test for
 its core functionality.)
 
+This hook *isn't* (yet) sufficient to implement [[plugins/contrib/report]]'s
+NIH'd sorting mechanisms:
+
+* `report` can sort by any [[plugins/contrib/field]], whereas this one has a
+  finite number of hooks: if the `field` plugin's functionality is desirable,
+  perhaps parameterized sort mechanisms similar to pagespec match functions
+  would be useful? Then the `field` plugin could register
+  `hook(type => "sort", id => "field")` and you could have
+  `\[[!inline ... sort="field(Mood)"]]` or something?
+
+* `report` can sort by multiple criteria, with independent direction-changing:
+  if this is desirable, perhaps `pagespec_match_list` could be enhanced to
+  interpret `sort="x -y z(w)"` as sorting by (pseudocode)
+  `{ $cmp_x->($a, $b) || (-$cmp_y->($a, $b)) || $cmp_z->($a, $b, "w") }`?
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 27f1e77bc6ff74f1760a4fdb9e174c77ea4698ea Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 17:26:46 +0000
Subject: thoughts

---
 ...an_alternative_approach_to_structured_data.mdwn | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index eb6ee4445..188e627f0 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -27,3 +27,27 @@ I have written additional plugins which integrate with the [[plugins/contrib/fie
 * [[plugins/contrib/ymlfront]] - looks for YAML-format data at the front of a page; this is just one possible back-end for the structured data
 
 --[[KathrynAndersen]]
+
+> I'm not an IkiWiki committer ([[Joey]] is the only one I think)
+> but I really like the look of this scheme. In particular,
+> having `getfield` interop with `field` without being *part of*
+> `field` makes me happy, since I'm not very keen on `getfield`'s
+> syntax (i.e. "ugh, yet another mini-markup-language without a
+> proper escaping mechanism"), but this way people can experiment
+> with different syntaxes while keeping `field` for the
+> behind-the-scenes bits.
+>
+> My [[plugins/contrib/album]] plugin could benefit from
+> integration with [[field]] for photos' captions and so on,
+> probably... I'll try to work on that at some point.
+>
+> [[plugins/contrib/report]] may be doing too much, though:
+> it seems to be an variation on `\[[inline archive="yes"]]`,
+> with an enhanced version of sorting, a mini version of
+> [[todo/wikitrails]], and some other misc. I suspect it could
+> usefully be divided up into discrete features? One good way
+> to do that might be to shuffle bits of its functionality into
+> the IkiWiki distribution and/or separate plugins, until there's
+> nothing left in `report` itself and it can just go away.
+>
+> --[[smcv]]
-- 
cgit v1.2.3


From 271449062a2a3fa897aff7f5bb40d6b5da06a1a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 14:30:38 -0400
Subject: use YAML::Any to allow faster versions to be used if available

---
 IkiWiki/Setup/Yaml.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 0fc273675..58cba4222 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -10,7 +10,7 @@ sub loaddump ($$) {
 	my $class=shift;
 	my $content=shift;
 
-	eval q{use YAML};
+	eval q{use YAML::Any};
 	die $@ if $@;
 	IkiWiki::Setup::merge(Load($content));
 }
@@ -18,7 +18,7 @@ sub loaddump ($$) {
 sub gendump ($@) {
 	my $class=shift;
 	
-	eval q{use YAML};
+	eval q{use YAML::Any};
 	die $@ if $@;
 
 	"# IkiWiki::Setup::Yaml - YAML formatted setup file",
-- 
cgit v1.2.3


From 4415686d0571a33d4ac7b887d1abdc019d398414 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 14:30:54 -0400
Subject: add YAML suggests

---
 Bundle/IkiWiki/Extras.pm | 1 +
 debian/control           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm
index 48bd127f1..5bbd7b8c6 100644
--- a/Bundle/IkiWiki/Extras.pm
+++ b/Bundle/IkiWiki/Extras.pm
@@ -35,6 +35,7 @@ Text::WikiCreole
 Term::ReadLine::Gnu
 HTML::Tree
 Sort::Naturally
+YAML
 
 =head1 AUTHOR
 
diff --git a/debian/control b/debian/control
index b20f4db55..24c2c96a5 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
   libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl,
   sparkline-php, texlive, dvipng, libtext-wikicreole-perl,
   libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
-  po4a (>= 0.35-1), gettext
+  po4a (>= 0.35-1), gettext, libyaml-perl
 Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
-- 
cgit v1.2.3


From c64c4b99626286ee08f67999a18c43c769e21e6a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 14:39:50 -0400
Subject: Add --set-yaml switch for setting more complex config file options.

---
 debian/changelog |  1 +
 doc/usage.mdwn   | 10 +++++++---
 ikiwiki.in       |  9 +++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d0639a58..e7499b6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20100320) UNRELEASED; urgency=low
     (Thanks to Aaron Wilson for the original patch.)
   * Allow wrappers to be built using tcc.
   * Add support for setup files written in YAML.
+  * Add --set-yaml switch for setting more complex config file options.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index f735170f0..db1e36a10 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -331,9 +331,13 @@ also be configured using a setup file.
 * --set var=value
   
   This allows setting an arbitrary configuration variable, the same as if it
-  were set via a setup file. Since most options can be configured
-  using command-line switches, you will rarely need to use this, but it can be
-  useful for the odd option that lacks a command-line switch.
+  were set via a setup file. Since most options commonly used options can be
+  configured using command-line switches, you will rarely need to use this.
+
+* --set-yaml var=value
+
+  This is like --set, but it allows setting configuration variables that
+  use complex data structures, by passing in a YAML document.
 
 # EXAMPLES
 
diff --git a/ikiwiki.in b/ikiwiki.in
index da5555629..7028bdb7d 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -96,6 +96,15 @@ sub getconfig () {
 				}
 				$config{$var}=$val;
 			},
+			"set-yaml=s" => sub {
+				my ($var, $val)=split('=', $_[1], 2);
+				if (! defined $var || ! defined $val) {
+					die gettext("usage: --set-yaml var=value"), "\n";
+				}
+				eval q{use YAML::Any};
+				die $@ if $@;
+				$config{$var}=Load($val);
+			},
 			"version" => sub {
 				print "ikiwiki version $IkiWiki::version\n";
 				exit;
-- 
cgit v1.2.3


From 3166479fe4b170bf6ffd3f06c1422f65f7bbfe7e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 14:53:32 -0400
Subject: fall back from YAML::Any to just YAML

for portabilty to old YAML in Debian stable that lacks the former.
---
 IkiWiki/Setup/Yaml.pm | 2 ++
 ikiwiki.in            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 58cba4222..8ad44eb4a 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -11,6 +11,7 @@ sub loaddump ($$) {
 	my $content=shift;
 
 	eval q{use YAML::Any};
+	eval q{use YAML} if $@;
 	die $@ if $@;
 	IkiWiki::Setup::merge(Load($content));
 }
@@ -19,6 +20,7 @@ sub gendump ($@) {
 	my $class=shift;
 	
 	eval q{use YAML::Any};
+	eval q{use YAML} if $@;
 	die $@ if $@;
 
 	"# IkiWiki::Setup::Yaml - YAML formatted setup file",
diff --git a/ikiwiki.in b/ikiwiki.in
index 7028bdb7d..a8343ed0f 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -102,6 +102,7 @@ sub getconfig () {
 					die gettext("usage: --set-yaml var=value"), "\n";
 				}
 				eval q{use YAML::Any};
+				eval q{use YAML} if $@;
 				die $@ if $@;
 				$config{$var}=Load($val);
 			},
-- 
cgit v1.2.3


From 601caffac038e334d59ed4cc312750f8f4f8df2b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 15:25:10 -0400
Subject: add newline to --set-yaml value

YAML is picky about the data ending with a newline, and this makes
it easier to accomplish that
---
 ikiwiki.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ikiwiki.in b/ikiwiki.in
index a8343ed0f..1758399ea 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -104,7 +104,7 @@ sub getconfig () {
 				eval q{use YAML::Any};
 				eval q{use YAML} if $@;
 				die $@ if $@;
-				$config{$var}=Load($val);
+				$config{$var}=Load($val."\n");
 			},
 			"version" => sub {
 				print "ikiwiki version $IkiWiki::version\n";
-- 
cgit v1.2.3


From a76206d4809364eaab288df45b126893887e46f4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 15:32:35 -0400
Subject: fix back-compat with old Net::OpenID

Debian stable's Net::OpenID does not support getting extension fields.
---
 IkiWiki/Plugin/openid.pm | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 9355cd85a..7b1a17831 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -116,23 +116,25 @@ sub validate ($$$;$) {
 
 	# Ask for client to provide a name and email, if possible.
 	# Try sreg and ax
-	$claimed_identity->set_extension_args(
-		'http://openid.net/extensions/sreg/1.1',
-		{
-			optional => 'email,fullname,nickname',
-		},
-	);
-	$claimed_identity->set_extension_args(
-		'http://openid.net/srv/ax/1.0',
-		{
-			mode => 'fetch_request',
-			'required' => 'email,fullname,nickname,firstname',
-			'type.email' => "http://schema.openid.net/contact/email",
-			'type.fullname' => "http://axschema.org/namePerson",
-			'type.nickname' => "http://axschema.org/namePerson/friendly",
-			'type.firstname' => "http://axschema.org/namePerson/first",
-		},
-	);
+	if ($claimed_identity->can("set_extension_args")) {
+		$claimed_identity->set_extension_args(
+			'http://openid.net/extensions/sreg/1.1',
+			{
+				optional => 'email,fullname,nickname',
+			},
+		);
+		$claimed_identity->set_extension_args(
+			'http://openid.net/srv/ax/1.0',
+			{
+				mode => 'fetch_request',
+				'required' => 'email,fullname,nickname,firstname',
+				'type.email' => "http://schema.openid.net/contact/email",
+				'type.fullname' => "http://axschema.org/namePerson",
+				'type.nickname' => "http://axschema.org/namePerson/friendly",
+				'type.firstname' => "http://axschema.org/namePerson/first",
+			},
+		);
+	}
 
 	my $check_url = $claimed_identity->check_url(
 		return_to => IkiWiki::cgiurl(do => "postsignin"),
@@ -161,10 +163,13 @@ sub auth ($$) {
 		elsif (my $vident = $csr->verified_identity) {
 			$session->param(name => $vident->url);
 
-			my @extensions=grep { defined } (
-				$vident->signed_extension_fields('http://openid.net/extensions/sreg/1.1'),
-				$vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
-			);
+			my @extensions;
+			if ($vident->can("signed_extension_fields")) {
+				@extensions=grep { defined } (
+					$vident->signed_extension_fields('http://openid.net/extensions/sreg/1.1'),
+					$vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
+				);
+			}
 			foreach my $ext (@extensions) {
 				foreach my $field (qw{value.email email}) {
 					if (exists $ext->{$field} &&
-- 
cgit v1.2.3


From eb06a0135511fc5b5422f07ca5344ce114402a61 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 16:12:35 -0400
Subject: use perl YAML for dumping

Only it understands $YAML::UseHeader
---
 IkiWiki/Setup/Yaml.pm | 8 ++++----
 debian/changelog      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 8ad44eb4a..8b876e297 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -19,10 +19,6 @@ sub loaddump ($$) {
 sub gendump ($@) {
 	my $class=shift;
 	
-	eval q{use YAML::Any};
-	eval q{use YAML} if $@;
-	die $@ if $@;
-
 	"# IkiWiki::Setup::Yaml - YAML formatted setup file",
 	"#",
 	(map { "# $_" } @_),
@@ -37,7 +33,11 @@ sub dumpline ($$$$) {
 	my $type=shift;
 	my $prefix=shift;
 	
+	eval q{use YAML::Old};
+	eval q{use YAML} if $@;
+	die $@ if $@;
 	$YAML::UseHeader=0;
+
 	my $dump=Dump({$key => $value});
 	chomp $dump;
 	if (length $prefix) {
diff --git a/debian/changelog b/debian/changelog
index e7499b6f2..12dd0dc02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100320) UNRELEASED; urgency=low
+ikiwiki (3.20100324) UNRELEASED; urgency=low
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.
-- 
cgit v1.2.3


From 021952969933388021001b259462406cbc94c2a6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 16:19:50 -0400
Subject: fix unicode with YAML::Syck

Syck-- it doesn't use unicode by default?! Hello, 2010 calling..
---
 IkiWiki/Setup/Yaml.pm | 1 +
 ikiwiki.in            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 8b876e297..904784728 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -13,6 +13,7 @@ sub loaddump ($$) {
 	eval q{use YAML::Any};
 	eval q{use YAML} if $@;
 	die $@ if $@;
+	$YAML::Syck::ImplicitUnicode=1;
 	IkiWiki::Setup::merge(Load($content));
 }
 
diff --git a/ikiwiki.in b/ikiwiki.in
index 1758399ea..b62962ad8 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -103,6 +103,7 @@ sub getconfig () {
 				}
 				eval q{use YAML::Any};
 				eval q{use YAML} if $@;
+				$YAML::Syck::ImplicitUnicode=1;
 				die $@ if $@;
 				$config{$var}=Load($val."\n");
 			},
-- 
cgit v1.2.3


From f38e61c53bfdde4c92e9d8cb5930420bfa95775a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 16:40:37 -0400
Subject: work around silly warning

---
 ikiwiki.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ikiwiki.in b/ikiwiki.in
index b62962ad8..38e4d3201 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -103,8 +103,8 @@ sub getconfig () {
 				}
 				eval q{use YAML::Any};
 				eval q{use YAML} if $@;
-				$YAML::Syck::ImplicitUnicode=1;
 				die $@ if $@;
+				eval q{$YAML::Syck::ImplicitUnicode=1};
 				$config{$var}=Load($val."\n");
 			},
 			"version" => sub {
-- 
cgit v1.2.3


From 3b08b19b4e36f82864c73ca035cfdec83b3a43aa Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 21:33:03 +0000
Subject: use `` to avoid markdown eating example pagespecs

---
 doc/plugins/moderatedcomments.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/moderatedcomments.mdwn b/doc/plugins/moderatedcomments.mdwn
index c29b0b052..f9466e833 100644
--- a/doc/plugins/moderatedcomments.mdwn
+++ b/doc/plugins/moderatedcomments.mdwn
@@ -8,5 +8,5 @@ By default, all comments made by anyone who is not an admin will be held
 for moderation. The `moderate_pagespec` setting can be used to specify a
 [[ikiwiki/PageSpec]] to match comments and users who should be moderated.
 For example, to avoid moderating comments from logged-in users, set
-`moderate_pagespec` to "!user(*)". Or to moderate everyone except for
-admins, set it to "!admin(*)".
+`moderate_pagespec` to "`!user(*)`". Or to moderate everyone except for
+admins, set it to "`!admin(*)`".
-- 
cgit v1.2.3


From 1a587504e949bf0584acdf7737597c8332467332 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 24 Mar 2010 22:48:47 +0000
Subject: what about a SortSpec rather than a sort-hook?

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 21800f4de..5bfe102ac 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -40,6 +40,8 @@ NIH'd sorting mechanisms:
   interpret `sort="x -y z(w)"` as sorting by (pseudocode)
   `{ $cmp_x->($a, $b) || (-$cmp_y->($a, $b)) || $cmp_z->($a, $b, "w") }`?
 
+>> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 60edd2dc3157f756f4f7a213ee15836fe7bbb769 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 24 Mar 2010 23:51:48 +0000
Subject: Allow sorting to be combined and/or reversed

---
 IkiWiki.pm                        | 84 ++++++++++++++++++++++++++++-----------
 doc/ikiwiki/pagespec/sorting.mdwn |  4 ++
 doc/plugins/write.mdwn            | 17 +++++++-
 t/pagespec_match_list.t           | 12 +++++-
 4 files changed, 91 insertions(+), 26 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1a4dc47dd..ce8fdd454 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2005,6 +2005,64 @@ sub pagespec_match ($$;@) {
 	return $sub->($page, @params);
 }
 
+sub get_sort_function {
+	my $method = $_[0];
+
+	if ($method =~ m/\s/) {
+		my @methods = map { get_sort_function($_) } split(' ', $method);
+
+		return sub {
+			foreach my $method (@methods) {
+				my $answer = $method->($_[0], $_[1]);
+				return $answer if $answer;
+			}
+
+			return 0;
+		};
+	}
+
+	my $sense = 1;
+
+	if ($method =~ s/^-//) {
+		$sense = -1;
+	}
+
+	my $token = $method;
+	my $parameter = undef;
+
+	if ($method =~ m/^(\w+)\((.*)\)$/) {
+		$token = $1;
+		$parameter = $2;
+	}
+
+	if (exists $hooks{sort}{$token}{call}) {
+		my $callback = $hooks{sort}{$token}{call};
+		return sub { $sense * $callback->($_[0], $_[1], $parameter) };
+	}
+
+	if ($method eq 'title') {
+		return sub { $sense * (pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]))) };
+	}
+
+	if ($method eq 'title_natural') {
+		eval q{use Sort::Naturally};
+		if ($@) {
+			error(gettext("Sort::Naturally needed for title_natural sort"));
+		}
+		return sub { $sense * Sort::Naturally::ncmp(pagetitle(basename($_[0])), pagetitle(basename($_[1]))) };
+	}
+
+	if ($method eq 'mtime') {
+		return sub { $sense * ($pagemtime{$_[1]} <=> $pagemtime{$_[0]}) };
+	}
+
+	if ($method eq 'age') {
+		return sub { $sense * ($pagectime{$_[1]} <=> $pagectime{$_[0]}) };
+	}
+
+	error sprintf(gettext("unknown sort type %s"), $method);
+}
+
 sub pagespec_match_list ($$;@) {
 	my $page=shift;
 	my $pagespec=shift;
@@ -2034,31 +2092,9 @@ sub pagespec_match_list ($$;@) {
 	}
 
 	if (defined $params{sort}) {
-		my $f;
+		my $f = get_sort_function($params{sort});
 
-		if (exists $hooks{sort}{$params{sort}}{call}) {
-			$f = sub { $hooks{sort}{$params{sort}}{call}($a, $b) };
-		}
-		elsif ($params{sort} eq 'title') {
-			$f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) };
-		}
-		elsif ($params{sort} eq 'title_natural') {
-			eval q{use Sort::Naturally};
-			if ($@) {
-				error(gettext("Sort::Naturally needed for title_natural sort"));
-			}
-			$f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) };
-                }
-		elsif ($params{sort} eq 'mtime') {
-			$f=sub { $pagemtime{$b} <=> $pagemtime{$a} };
-		}
-		elsif ($params{sort} eq 'age') {
-			$f=sub { $pagectime{$b} <=> $pagectime{$a} };
-		}
-		else {
-			error sprintf(gettext("unknown sort type %s"), $params{sort});
-		}
-		@candidates = sort { &$f } @candidates;
+		@candidates = sort { $f->($a, $b) } @candidates;
 	}
 
 	@candidates=reverse(@candidates) if $params{reverse};
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 61516bec5..f27972d4e 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -15,6 +15,10 @@ orders can be specified.
   full title was set.
 """]]
 
+In addition, you can combine several sort orders and/or reverse the order of
+sorting, with a string like `age -title` (which would sort by age, then by
+title in reverse order if two pages have the same age).
+
 Plugins can add additional sort orders, so more might be available on this
 wiki.
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index bfa6617bd..1010e76e4 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -593,7 +593,9 @@ function of the ikiwiki wrapper when it is being generated.
 	hook(type => "sort", id => "foo", call => \&sort_by_foo);
 
 This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
-an existing one. The callback is given two page names as arguments, and
+an existing one.
+
+The callback is given two page names followed by the parameter as arguments, and
 returns negative, zero or positive if the first page should come before,
 close to (i.e. undefined order), or after the second page.
 
@@ -603,6 +605,19 @@ For instance, the built-in `title` sort order could be reimplemented as
 		pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
 	}
 
+and to sort by an arbitrary `meta` value, you could use:
+
+	# usage: sort="meta(description)"
+	sub sort_by_meta {
+		my $param = $_[2];
+		error "sort=meta requires a parameter" unless defined $param;
+		my $left = $pagestate{$_[0]}{meta}{$param};
+		$left = "" unless defined $left;
+		my $right = $pagestate{$_[1]}{meta}{$param};
+		$right = "" unless defined $right;
+		return $left cmp $right;
+	}
+
 ## Exported variables
 
 Several variables are exported to your plugin when you `use IkiWiki;`
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index b34ee769f..309961f1c 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 89;
+use Test::More tests => 90;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -20,6 +20,13 @@ hook(type => "sort", id => "path", call => sub { $_[0] cmp $_[1] });
 	"post/2" => "post/2.mdwn",
 	"post/3" => "post/3.mdwn",
 );
+$IkiWiki::pagectime{foo} = 2;
+$IkiWiki::pagectime{foo2} = 2;
+$IkiWiki::pagectime{foo3} = 1;
+$IkiWiki::pagectime{bar} = 3;
+$IkiWiki::pagectime{"post/1"} = 6;
+$IkiWiki::pagectime{"post/2"} = 6;
+$IkiWiki::pagectime{"post/3"} = 6;
 $links{foo}=[qw{post/1 post/2}];
 $links{foo2}=[qw{bar}];
 $links{foo3}=[qw{bar}];
@@ -38,6 +45,9 @@ is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
 	["post/1", "post/2"]);
 is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)],
 	["bar", "foo"]);
+is_deeply([pagespec_match_list("foo", "foo* or bar*",
+		sort => "-age title")], # oldest first, break ties by title
+	["foo3", "foo", "foo2", "bar"]);
 my $r=eval { pagespec_match_list("foo", "beep") };
 ok(eval { pagespec_match_list("foo", "beep") } == 0);
 ok(! $@, "does not fail with error when unable to match anything");
-- 
cgit v1.2.3


From 81cd30690024db1fc0b300e3a09504f1c613be21 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 25 Mar 2010 00:05:58 +0000
Subject: an updated branch

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 29 +++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 5bfe102ac..419a73419 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -40,8 +40,13 @@ NIH'd sorting mechanisms:
   interpret `sort="x -y z(w)"` as sorting by (pseudocode)
   `{ $cmp_x->($a, $b) || (-$cmp_y->($a, $b)) || $cmp_z->($a, $b, "w") }`?
 
+> I've now added both of these features to the sort-hooks branch. --[[smcv]]
+
 >> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
 
+>>> I'd be inclined to think that's overkill, but it probably wouldn't be
+>>> all that hard to implement... Joey? Any thoughts? --s
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
@@ -49,7 +54,9 @@ NIH'd sorting mechanisms:
        hook(type => "sort", id => "foo", call => \&sort_by_foo);
 
 This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
-an existing one. The callback is given two page names as arguments, and
+an existing one.
+
+The callback is given two page names followed by the parameter as arguments, and
 returns negative, zero or positive if the first page should come before,
 close to (i.e. undefined order), or after the second page.
 
@@ -59,12 +66,32 @@ For instance, the built-in `title` sort order could be reimplemented as
                pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
        }
 
+and to sort by an arbitrary `meta` value, you could use:
+
+       # usage: sort="meta(description)"
+       sub sort_by_meta {
+               my $param = $_[2];
+               error "sort=meta requires a parameter" unless defined $param;
+               my $left = $pagestate{$_[0]}{meta}{$param};
+               $left = "" unless defined $left;
+               my $right = $pagestate{$_[1]}{meta}{$param};
+               $right = "" unless defined $right;
+               return $left cmp $right;
+       }
+
+
 ### meta_title sort order (conditionally added to [[ikiwiki/pagespec/sorting]])
 
 * `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
   full title was set.
 
+### Multiple sort orders (added to [[ikiwiki/pagespec/sorting]])
+
+In addition, you can combine several sort orders and/or reverse the order of
+sorting, with a string like `age -title` (which would sort by age, then by
+title in reverse order if two pages have the same age).
+
 ### meta title sort parameter (added to [[ikiwiki/directive/meta]])
 
 An optional `sort` parameter will be used preferentially when
-- 
cgit v1.2.3


From dc966032129e07b9a6002a97bc9e6b86c712b4d2 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 25 Mar 2010 03:35:14 +0000
Subject: bug and fix

---
 doc/bugs/filecheck_failing_to_find_files.mdwn | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 doc/bugs/filecheck_failing_to_find_files.mdwn

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
new file mode 100644
index 000000000..95ea5c763
--- /dev/null
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -0,0 +1,23 @@
+Using the attachment plugin, when filecheck was checking the mime-type of the attachment before allowing the attachment to be removed, it was returning with an error saying that the mime-type of the file was "unknown" (when the mime-type definitely was known!)
+
+It turns out that the filecheck plugin couldn't find the file, because it was merely using the $pagesources hash, rather than finding the absolute path of the file in question.
+
+The following patch fixes the problem:
+
+	diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
+	index 01d4909..1cec0cf 100644
+	--- a/IkiWiki/Plugin/filecheck.pm
+	+++ b/IkiWiki/Plugin/filecheck.pm
+	@@ -118,6 +118,10 @@ sub match_mimetype ($$;@) {
+	 	if (! defined $file) {
+	 		return IkiWiki::ErrorReason->new("no file specified");
+	 	}
+	+	if (! -e $file) {
+	+	    # get the absolute path of the file if you can't find it
+	+	    $file = IkiWiki::srcfile($file);
+	+	}
+	 
+	 	# Use ::magic to get the mime type, the idea is to only trust
+	 	# data obtained by examining the actual file contents.
+
+[[!tag patch]]
-- 
cgit v1.2.3


From c757cfa64f56fc17b2c3e4b2c36279f3fcf0f812 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 25 Mar 2010 03:38:14 +0000
Subject: I'm not sure if I'm supposed to tag this as patch, so I removed the
 tag.

---
 doc/bugs/filecheck_failing_to_find_files.mdwn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index 95ea5c763..49de3d435 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -19,5 +19,3 @@ The following patch fixes the problem:
 	 
 	 	# Use ::magic to get the mime type, the idea is to only trust
 	 	# data obtained by examining the actual file contents.
-
-[[!tag patch]]
-- 
cgit v1.2.3


From 1030d23a2ca1be2680a6fac8366f880a1d1760c6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Mar 2010 00:11:39 -0400
Subject: response

---
 doc/bugs/filecheck_failing_to_find_files.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index 49de3d435..e41793ee8 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -2,6 +2,9 @@ Using the attachment plugin, when filecheck was checking the mime-type of the at
 
 It turns out that the filecheck plugin couldn't find the file, because it was merely using the $pagesources hash, rather than finding the absolute path of the file in question.
 
+> I don't understand why the file was not in `%pagesources`. Do you?
+> --[[Joey]] 
+
 The following patch fixes the problem:
 
 	diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
-- 
cgit v1.2.3


From 46f8f72793e23b56d3deb1ed0ed6b1a0fbd56ad6 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 25 Mar 2010 04:43:16 +0000
Subject: response

---
 doc/bugs/filecheck_failing_to_find_files.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index e41793ee8..be6cdbb20 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -3,7 +3,12 @@ Using the attachment plugin, when filecheck was checking the mime-type of the at
 It turns out that the filecheck plugin couldn't find the file, because it was merely using the $pagesources hash, rather than finding the absolute path of the file in question.
 
 > I don't understand why the file was not in `%pagesources`. Do you?
-> --[[Joey]] 
+> --[[Joey]]
+
+>> The file *was* in `%pagesources`, but what returns from that is the filename relative to the `srcdir` directory; for example, `foo/bar.gif`.
+>> When File::MimeInfo::Magic::magic is given that, it can't find the file.
+>> But if it is given `/path/to/srcdir/foo/bar.gif` instead, then it *can* find the file, and returns the mime-type correctly.
+>> --[[KathrynAndersen]]
 
 The following patch fixes the problem:
 
-- 
cgit v1.2.3


From baa07e0b526fd23630f6cedcdc04960c99703722 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Mar 2010 14:23:16 -0400
Subject: remove a few leftover manual folding indicators

---
 IkiWiki/Plugin/filecheck.pm | 2 +-
 IkiWiki/Plugin/po.pm        | 2 +-
 IkiWiki/Plugin/tla.pm       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 01d490961..0501ba99c 100644
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -5,7 +5,7 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 
-my %units=( #{{{	# size in bytes
+my %units=(		# size in bytes
 	B		=> 1,
 	byte		=> 1,
 	KB		=> 2 ** 10,
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 2cbfb0a45..2250a7f9f 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -308,7 +308,7 @@ sub pagetemplate (@) {
 	if (ishomepage($page) && $template->query(name => "title")) {
 		$template->param(title => $config{wikiname});
 	}
-} # }}}
+}
 
 # Add the renamed page translations to the list of to-be-renamed pages.
 sub renamepages (@) {
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index 16d73b136..764da9b98 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -162,7 +162,7 @@ sub rcs_remove ($) {
 	error("rcs_remove not implemented for tla"); # TODO
 }
 
-sub rcs_rename ($$) { # {{{a
+sub rcs_rename ($$) {
 	my ($src, $dest) = @_;
 
 	error("rcs_rename not implemented for tla"); # TODO
-- 
cgit v1.2.3


From 3d671ea8c1df4534d8ffa59b235dd6ded99bb13f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Mar 2010 14:39:09 -0400
Subject: filecheck: Fix bug that prevented the pagespecs from matching when
 not called by attachment plugin.

---
 IkiWiki/Plugin/filecheck.pm                   | 16 ++++++++--------
 debian/changelog                              |  2 ++
 doc/bugs/filecheck_failing_to_find_files.mdwn |  5 +++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 0501ba99c..1549b82db 100644
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -75,9 +75,9 @@ sub match_maxsize ($$;@) {
 	}
 
 	my %params=@_;
-	my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page};
+	my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page});
 	if (! defined $file) {
-		return IkiWiki::ErrorReason->new("no file specified");
+		return IkiWiki::ErrorReason->new("file does not exist");
 	}
 
 	if (-s $file > $maxsize) {
@@ -96,9 +96,9 @@ sub match_minsize ($$;@) {
 	}
 
 	my %params=@_;
-	my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page};
+	my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page});
 	if (! defined $file) {
-		return IkiWiki::ErrorReason->new("no file specified");
+		return IkiWiki::ErrorReason->new("file does not exist");
 	}
 
 	if (-s $file < $minsize) {
@@ -114,9 +114,9 @@ sub match_mimetype ($$;@) {
 	my $wanted=shift;
 
 	my %params=@_;
-	my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page};
+	my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page});
 	if (! defined $file) {
-		return IkiWiki::ErrorReason->new("no file specified");
+		return IkiWiki::ErrorReason->new("file does not exist");
 	}
 
 	# Use ::magic to get the mime type, the idea is to only trust
@@ -147,9 +147,9 @@ sub match_virusfree ($$;@) {
 	my $wanted=shift;
 
 	my %params=@_;
-	my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page};
+	my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page});
 	if (! defined $file) {
-		return IkiWiki::ErrorReason->new("no file specified");
+		return IkiWiki::ErrorReason->new("file does not exist");
 	}
 
 	if (! exists $IkiWiki::config{virus_checker} ||
diff --git a/debian/changelog b/debian/changelog
index 12dd0dc02..7249cdfa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * Allow wrappers to be built using tcc.
   * Add support for setup files written in YAML.
   * Add --set-yaml switch for setting more complex config file options.
+  * filecheck: Fix bug that prevented the pagespecs from matching when
+    not called by attachment plugin.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index be6cdbb20..e896f2129 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -10,6 +10,11 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 >> But if it is given `/path/to/srcdir/foo/bar.gif` instead, then it *can* find the file, and returns the mime-type correctly.
 >> --[[KathrynAndersen]]
 
+>>> Ok, so it's not removal specific, can in fact be triggered by using
+>>> testpagespec (or really anything besides attachment, which passes
+>>> the filename parameter). Nor is it limited to mimetype, all the tests in 
+>>> filecheck have the problem. [[Fixed|done]] --[[Joey]] 
+
 The following patch fixes the problem:
 
 	diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
-- 
cgit v1.2.3


From b86276ffed7ee001b35cd610e5d56e5afb4088cf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 25 Mar 2010 23:31:53 +0000
Subject: Reimplement extensible sorting mechanisms, in the same way as
 pagespecs

---
 IkiWiki.pm              | 145 ++++++++++++++++++++++++++++--------------------
 IkiWiki/Plugin/meta.pm  |  11 ++--
 doc/plugins/write.mdwn  |  53 ++++++++----------
 t/pagespec_match_list.t |   6 +-
 4 files changed, 120 insertions(+), 95 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ce8fdd454..a89c14058 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -37,6 +37,7 @@ our $DEPEND_LINKS=4;
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
+memoize("cmpspec_translate");
 memoize("pagespec_translate");
 memoize("template_file");
 
@@ -1934,6 +1935,70 @@ sub add_link ($$) {
 		unless grep { $_ eq $link } @{$links{$page}};
 }
 
+sub cmpspec_translate ($) {
+	my $spec = shift;
+
+	my $code = "";
+	my @data;
+	while ($spec =~ m{
+		\s*
+		(-?)		# group 1: perhaps negated
+		\s*
+		(		# group 2: a word
+			\w+\([^\)]*\)	# command(params)
+			|
+			[^\s]+		# or anything else
+		)
+		\s*
+	}gx) {
+		my $negated = $1;
+		my $word = $2;
+		my $params = undef;
+
+		if ($word =~ m/^(\w+)\((.*)\)$/) {
+			# command with parameters
+			$params = $2;
+			$word = $1;
+		}
+		elsif ($word !~ m/^\w+$/) {
+			error(sprintf(gettext("invalid sort type %s"), $word));
+		}
+
+		if (length $code) {
+			$code .= " || ";
+		}
+
+		if ($negated) {
+			$code .= "-";
+		}
+
+		if (exists $IkiWiki::PageSpec::{"cmp_$word"}) {
+			if (exists $IkiWiki::PageSpec::{"check_cmp_$word"}) {
+				$IkiWiki::PageSpec::{"check_cmp_$word"}->($params);
+			}
+
+			if (defined $params) {
+				push @data, $params;
+				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, \$data[$#data])";
+			}
+			else {
+				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, undef)";
+			}
+		}
+		else {
+			error(sprintf(gettext("unknown sort type %s"), $word));
+		}
+	}
+
+	if (! length $code) {
+		# undefined sorting method... sort arbitrarily
+		return sub { 0 };
+	}
+
+	no warnings;
+	return eval 'sub { '.$code.' }';
+}
+
 sub pagespec_translate ($) {
 	my $spec=shift;
 
@@ -2005,64 +2070,6 @@ sub pagespec_match ($$;@) {
 	return $sub->($page, @params);
 }
 
-sub get_sort_function {
-	my $method = $_[0];
-
-	if ($method =~ m/\s/) {
-		my @methods = map { get_sort_function($_) } split(' ', $method);
-
-		return sub {
-			foreach my $method (@methods) {
-				my $answer = $method->($_[0], $_[1]);
-				return $answer if $answer;
-			}
-
-			return 0;
-		};
-	}
-
-	my $sense = 1;
-
-	if ($method =~ s/^-//) {
-		$sense = -1;
-	}
-
-	my $token = $method;
-	my $parameter = undef;
-
-	if ($method =~ m/^(\w+)\((.*)\)$/) {
-		$token = $1;
-		$parameter = $2;
-	}
-
-	if (exists $hooks{sort}{$token}{call}) {
-		my $callback = $hooks{sort}{$token}{call};
-		return sub { $sense * $callback->($_[0], $_[1], $parameter) };
-	}
-
-	if ($method eq 'title') {
-		return sub { $sense * (pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]))) };
-	}
-
-	if ($method eq 'title_natural') {
-		eval q{use Sort::Naturally};
-		if ($@) {
-			error(gettext("Sort::Naturally needed for title_natural sort"));
-		}
-		return sub { $sense * Sort::Naturally::ncmp(pagetitle(basename($_[0])), pagetitle(basename($_[1]))) };
-	}
-
-	if ($method eq 'mtime') {
-		return sub { $sense * ($pagemtime{$_[1]} <=> $pagemtime{$_[0]}) };
-	}
-
-	if ($method eq 'age') {
-		return sub { $sense * ($pagectime{$_[1]} <=> $pagectime{$_[0]}) };
-	}
-
-	error sprintf(gettext("unknown sort type %s"), $method);
-}
-
 sub pagespec_match_list ($$;@) {
 	my $page=shift;
 	my $pagespec=shift;
@@ -2092,7 +2099,7 @@ sub pagespec_match_list ($$;@) {
 	}
 
 	if (defined $params{sort}) {
-		my $f = get_sort_function($params{sort});
+		my $f = cmpspec_translate($params{sort});
 
 		@candidates = sort { $f->($a, $b) } @candidates;
 	}
@@ -2407,4 +2414,24 @@ sub match_ip ($$;@) {
 	}
 }
 
+sub cmp_title {
+	IkiWiki::pagetitle(IkiWiki::basename($_[0]))
+	cmp
+	IkiWiki::pagetitle(IkiWiki::basename($_[1]))
+}
+
+sub cmp_mtime { $IkiWiki::pagemtime{$_[1]} <=> $IkiWiki::pagemtime{$_[0]} }
+sub cmp_age { $IkiWiki::pagectime{$_[1]} <=> $IkiWiki::pagectime{$_[0]} }
+
+sub check_cmp_title_natural {
+	eval q{use Sort::Naturally};
+	if ($@) {
+		error(gettext("Sort::Naturally needed for title_natural sort"));
+	}
+}
+sub cmp_title_natural {
+	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
+		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
+}
+
 1
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index a470041c9..e8cc1e392 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -13,7 +13,6 @@ sub import {
 	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
 	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
-	hook(type => "sort", id => "meta_title", call => \&sort_meta_title);
 }
 
 sub getsetup () {
@@ -299,10 +298,6 @@ sub titlesort {
 	return pagetitle(IkiWiki::basename($_[0]));
 }
 
-sub sort_meta_title {
-	return titlesort($_[0]) cmp titlesort($_[1]);
-}
-
 sub match {
 	my $field=shift;
 	my $page=shift;
@@ -353,4 +348,10 @@ sub match_copyright ($$;@) {
 	IkiWiki::Plugin::meta::match("copyright", @_);
 }
 
+sub cmp_meta_title {
+	IkiWiki::Plugin::meta::titlesort($_[0])
+	cmp
+	IkiWiki::Plugin::meta::titlesort($_[1])
+}
+
 1
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 1010e76e4..de2b47015 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -588,36 +588,6 @@ describes the plugin as a whole. For example:
 This hook is used to inject C code (which it returns) into the `main`
 function of the ikiwiki wrapper when it is being generated.
 
-### sort
-
-	hook(type => "sort", id => "foo", call => \&sort_by_foo);
-
-This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
-an existing one.
-
-The callback is given two page names followed by the parameter as arguments, and
-returns negative, zero or positive if the first page should come before,
-close to (i.e. undefined order), or after the second page.
-
-For instance, the built-in `title` sort order could be reimplemented as
-
-	sub sort_by_title {
-		pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
-	}
-
-and to sort by an arbitrary `meta` value, you could use:
-
-	# usage: sort="meta(description)"
-	sub sort_by_meta {
-		my $param = $_[2];
-		error "sort=meta requires a parameter" unless defined $param;
-		my $left = $pagestate{$_[0]}{meta}{$param};
-		$left = "" unless defined $left;
-		my $right = $pagestate{$_[1]}{meta}{$param};
-		$right = "" unless defined $right;
-		return $left cmp $right;
-	}
-
 ## Exported variables
 
 Several variables are exported to your plugin when you `use IkiWiki;`
@@ -1140,6 +1110,29 @@ For example, "backlink(foo)" is influenced by the contents of page foo;
 they match; "created_before(foo)" is influenced by the metadata of foo;
 while "glob(*)" is not influenced by the contents of any page.
 
+### Sorting plugins
+
+Similarly, it's possible to write plugins that add new functions as
+[[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
+the IkiWiki::PageSpec package named `cmp_foo`, which will be used when sorting
+by `foo` or `foo(...)` is requested.
+
+The function will be passed three or more parameters. The first two are
+page names, and the third is `undef` if invoked as `foo`, or the parameter
+`"bar"` if invoked as `foo(bar)`. It may also be passed additional, named
+parameters.
+
+It should return the same thing as Perl's `cmp` and `<=>` operators: negative
+if the first argument is less than the second, positive if the first argument
+is greater, or zero if they are considered equal. It may also raise an
+error using `error`, for instance if it needs a parameter but one isn't
+provided.
+
+You can also define a function called `check_cmp_foo` in the same package.
+If you do, it will be called while preparing to sort by `foo` or `foo(bar)`,
+with argument `undef` or `"bar"` respectively; it may raise an error using
+`error`, if sorting like that isn't going to work.
+
 ### Setup plugins
 
 The ikiwiki setup file is loaded using a pluggable mechanism. If you look
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 309961f1c..743ae4637 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -9,7 +9,11 @@ BEGIN { use_ok("IkiWiki"); }
 $config{srcdir}=$config{destdir}="/dev/null";
 IkiWiki::checkconfig();
 
-hook(type => "sort", id => "path", call => sub { $_[0] cmp $_[1] });
+{
+	package IkiWiki::PageSpec;
+
+	sub cmp_path { $_[0] cmp $_[1] }
+}
 
 %pagesources=(
 	foo => "foo.mdwn",
-- 
cgit v1.2.3


From 959d5b197d842e494076034f89d7bca84e531a45 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 25 Mar 2010 23:39:45 +0000
Subject: an alternative way to do plugins, as rubykat suggested

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 37 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 419a73419..f37a0758e 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -44,10 +44,13 @@ NIH'd sorting mechanisms:
 
 >> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
 
->>> I'd be inclined to think that's overkill, but it probably wouldn't be
->>> all that hard to implement... Joey? Any thoughts? --s
+>>> [[!template id=gitbranch branch=smcv/sort-package author="[[Simon_McVittie|smcv]]"]]
+>>> I'd be inclined to think that's overkill, but it wasn't very hard to
+>>> implement, and in a way is more elegant. I set it up so sort mechanisms
+>>> share the `IkiWiki::PageSpec` package, but with a `cmp_` prefix. Gitweb:
+>>> <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-package>
 
-## Documentation extracted from the branch
+## Documentation from sort-hooks branch
 
 ### sort hook (added to [[plugins/write]])
 
@@ -100,3 +103,31 @@ An optional `sort` parameter will be used preferentially when
        \[[!meta title="The Beatles" sort="Beatles, The"]]
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
+
+## Documentation from sort-hooks branch
+
+The changes to [[ikiwiki/pagespec/sorting]] are the same.
+The changes to [[plugins/write]] are replaced by:
+
+### Sorting plugins
+
+Similarly, it's possible to write plugins that add new functions as
+[[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
+the IkiWiki::PageSpec package named `cmp_foo`, which will be used when sorting
+by `foo` or `foo(...)` is requested.
+
+The function will be passed three or more parameters. The first two are
+page names, and the third is `undef` if invoked as `foo`, or the parameter
+`"bar"` if invoked as `foo(bar)`. It may also be passed additional, named
+parameters.
+
+It should return the same thing as Perl's `cmp` and `<=>` operators: negative
+if the first argument is less than the second, positive if the first argument
+is greater, or zero if they are considered equal. It may also raise an
+error using `error`, for instance if it needs a parameter but one isn't
+provided.
+
+You can also define a function called `check_cmp_foo` in the same package.
+If you do, it will be called while preparing to sort by `foo` or `foo(bar)`,
+with argument `undef` or `"bar"` respectively; it may raise an error using
+`error`, if sorting like that isn't going to work.
-- 
cgit v1.2.3


From b68aa11732a1782886793e426f06652656c155cb Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 01:40:32 +0000
Subject: oh dear not fixed after all

---
 doc/bugs/filecheck_failing_to_find_files.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index e896f2129..33975f05c 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -13,7 +13,13 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 >>> Ok, so it's not removal specific, can in fact be triggered by using
 >>> testpagespec (or really anything besides attachment, which passes
 >>> the filename parameter). Nor is it limited to mimetype, all the tests in 
->>> filecheck have the problem. [[Fixed|done]] --[[Joey]] 
+>>> filecheck have the problem. --[[Joey]] 
+
+>>>> Alas, not fixed.  It seems I was mistaken in some of my assumptions.
+>>>> It still happens when attempting to remove attachments.
+>>>> With your fix, the `IkiWiki::srcfile` function is only called when the filename is not passed in, but it appears that in the case of removing attachments, the filename IS passed in, but it is the relative filename as mentioned above.  Thus, the file is still not found, and the mime-type comes back as unknown.
+>>>> The reason my patch worked is because, rather than checking whether a filename was passed in before applying IkiWiki::srcfile to the filename, it checks whether the file can be found, and if it cannot be found, then it applies IkiWiki::srcfile to the filename.
+>>>> --[[KathrynAndersen]]
 
 The following patch fixes the problem:
 
-- 
cgit v1.2.3


From 5dd8c9e99911b112ddffc163d5cca9d7257adc6a Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 01:44:52 +0000
Subject: now my main site uses IkiWiki fully

---
 doc/users/KathrynAndersen.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/users/KathrynAndersen.mdwn b/doc/users/KathrynAndersen.mdwn
index 16cb390c4..8e827b0da 100644
--- a/doc/users/KathrynAndersen.mdwn
+++ b/doc/users/KathrynAndersen.mdwn
@@ -1,8 +1,8 @@
 * aka [[rubykat]]
-* Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need).
 * <http://kerravonsen.dreamwidth.org>
-* <http://www.katspace.org>
+* <http://www.katspace.org> (uses IkiWiki!)
 * <http://github.com/rubykat>
+* Also an active [PmWiki](http://www.pmwiki.org) user, interested in having the best of both worlds.
 
 Has written the following plugins:
 [[!map pages="!*/Discussion and ((link(users/KathrynAndersen) or link(users/rubykat)) and plugins/*) "]]
-- 
cgit v1.2.3


From fb39dc5f5f3e0dc4b5006b2cf7c85ce0e895ebfa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Mar 2010 23:40:38 -0400
Subject: patch

---
 doc/bugs/filecheck_failing_to_find_files.mdwn | 53 +++++++++++++++++++--------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index 33975f05c..3209c8f53 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -21,20 +21,41 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 >>>> The reason my patch worked is because, rather than checking whether a filename was passed in before applying IkiWiki::srcfile to the filename, it checks whether the file can be found, and if it cannot be found, then it applies IkiWiki::srcfile to the filename.
 >>>> --[[KathrynAndersen]]
 
-The following patch fixes the problem:
+>>>>> Can you test if this patch fixes that? --[[Joey]] 
 
-	diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
-	index 01d4909..1cec0cf 100644
-	--- a/IkiWiki/Plugin/filecheck.pm
-	+++ b/IkiWiki/Plugin/filecheck.pm
-	@@ -118,6 +118,10 @@ sub match_mimetype ($$;@) {
-	 	if (! defined $file) {
-	 		return IkiWiki::ErrorReason->new("no file specified");
-	 	}
-	+	if (! -e $file) {
-	+	    # get the absolute path of the file if you can't find it
-	+	    $file = IkiWiki::srcfile($file);
-	+	}
-	 
-	 	# Use ::magic to get the mime type, the idea is to only trust
-	 	# data obtained by examining the actual file contents.
+<pre>
+diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
+index f59d026..0fc180f 100644
+--- a/IkiWiki/Plugin/remove.pm
++++ b/IkiWiki/Plugin/remove.pm
+@@ -49,7 +49,7 @@ sub check_canremove ($$$) {
+ 	# This is sorta overkill, but better safe than sorry.
+ 	if (! defined pagetype($pagesources{$page})) {
+ 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+-			IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
++			IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file");
+ 		}
+ 		else {
+ 			error("removal of attachments is not allowed");
+diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
+index 3908443..1a9da63 100644
+--- a/IkiWiki/Plugin/rename.pm
++++ b/IkiWiki/Plugin/rename.pm
+@@ -50,7 +50,7 @@ sub check_canrename ($$$$$$) {
+ 	IkiWiki::check_canedit($src, $q, $session);
+ 	if ($attachment) {
+ 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+-			IkiWiki::Plugin::attachment::check_canattach($session, $src, $srcfile);
++			IkiWiki::Plugin::attachment::check_canattach($session, $src, "$config{srcdir}/$srcfile");
+ 		}
+ 		else {
+ 			error("renaming of attachments is not allowed");
+@@ -85,7 +85,7 @@ sub check_canrename ($$$$$$) {
+ 		if ($attachment) {
+ 			# Note that $srcfile is used here, not $destfile,
+ 			# because it wants the current file, to check it.
+-			IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile);
++			IkiWiki::Plugin::attachment::check_canattach($session, $dest, "$config{srcdir}/$srcfile");
+ 		}
+ 	}
+</pre>
-- 
cgit v1.2.3


From 62306d85f998b5bbd64d213e8c591809dbc07cb8 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 04:06:31 +0000
Subject: It works!

---
 doc/bugs/filecheck_failing_to_find_files.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index 3209c8f53..f8d8e83e6 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -21,7 +21,9 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 >>>> The reason my patch worked is because, rather than checking whether a filename was passed in before applying IkiWiki::srcfile to the filename, it checks whether the file can be found, and if it cannot be found, then it applies IkiWiki::srcfile to the filename.
 >>>> --[[KathrynAndersen]]
 
->>>>> Can you test if this patch fixes that? --[[Joey]] 
+>>>>> Can you test if this patch fixes that? --[[Joey]]
+
+>>>>>> Yes, it works! --[[KathrynAndersen]]
 
 <pre>
 diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
-- 
cgit v1.2.3


From 0f28f310472a333134af63a18b73372f044b8278 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 00:12:22 -0400
Subject: security?

---
 doc/plugins/contrib/pod/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/plugins/contrib/pod/discussion.mdwn

diff --git a/doc/plugins/contrib/pod/discussion.mdwn b/doc/plugins/contrib/pod/discussion.mdwn
new file mode 100644
index 000000000..8f4b625ee
--- /dev/null
+++ b/doc/plugins/contrib/pod/discussion.mdwn
@@ -0,0 +1,8 @@
+My one concern about this plugin is the `=for` markup in POD.
+
+> Some format names that formatters currently are known to
+> accept include "roff", "man", "latex", "tex", "text", and "html".
+
+I don't know which of these [[!cpan Pod::Xml]] supports. If it currently
+supports, or later support latex, that could be problimatic since that
+could maybe be used to include files or run code. --[[Joey]]
-- 
cgit v1.2.3


From 6693b3eafed5edb061ac31e046a441189660cd77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 00:15:15 -0400
Subject: on plugins and stuff

---
 doc/users/KathrynAndersen/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/users/KathrynAndersen/discussion.mdwn

diff --git a/doc/users/KathrynAndersen/discussion.mdwn b/doc/users/KathrynAndersen/discussion.mdwn
new file mode 100644
index 000000000..c44b28a93
--- /dev/null
+++ b/doc/users/KathrynAndersen/discussion.mdwn
@@ -0,0 +1,6 @@
+Had a look at your site. Sprawling, individualistic, using ikiwiki in lots of
+ways. Makes me happy. :) I see that I have let a lot of contrib plugins
+pile up. I will try to get to these. I'm particularly interested in
+your use of yaml+fields. Encourage you to go ahead with any others you
+have not submitted here, like pmap. (Unless it makes more sense to submit
+that as a patch to the existing map plugin.) --[[Joey]] 
-- 
cgit v1.2.3


From 243b0dd082cf4b66dfef55b2c9b459109bee7398 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 00:16:21 -0400
Subject: fix the other half of the filecheck filename bug

---
 IkiWiki/Plugin/remove.pm                      | 2 +-
 IkiWiki/Plugin/rename.pm                      | 4 ++--
 debian/changelog                              | 2 +-
 doc/bugs/filecheck_failing_to_find_files.mdwn | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index f59d0269e..0fc180f69 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -49,7 +49,7 @@ sub check_canremove ($$$) {
 	# This is sorta overkill, but better safe than sorry.
 	if (! defined pagetype($pagesources{$page})) {
 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
-			IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
+			IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file");
 		}
 		else {
 			error("removal of attachments is not allowed");
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 3908443ca..1a9da6363 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -50,7 +50,7 @@ sub check_canrename ($$$$$$) {
 	IkiWiki::check_canedit($src, $q, $session);
 	if ($attachment) {
 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
-			IkiWiki::Plugin::attachment::check_canattach($session, $src, $srcfile);
+			IkiWiki::Plugin::attachment::check_canattach($session, $src, "$config{srcdir}/$srcfile");
 		}
 		else {
 			error("renaming of attachments is not allowed");
@@ -85,7 +85,7 @@ sub check_canrename ($$$$$$) {
 		if ($attachment) {
 			# Note that $srcfile is used here, not $destfile,
 			# because it wants the current file, to check it.
-			IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile);
+			IkiWiki::Plugin::attachment::check_canattach($session, $dest, "$config{srcdir}/$srcfile");
 		}
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 7249cdfa4..da1ab890e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * Allow wrappers to be built using tcc.
   * Add support for setup files written in YAML.
   * Add --set-yaml switch for setting more complex config file options.
-  * filecheck: Fix bug that prevented the pagespecs from matching when
+  * filecheck: Fix bugs that prevented the pagespecs from matching when
     not called by attachment plugin.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index f8d8e83e6..6501508e4 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -25,6 +25,8 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 
 >>>>>> Yes, it works! --[[KathrynAndersen]]
 
+applied && [[done]]
+
 <pre>
 diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
 index f59d026..0fc180f 100644
-- 
cgit v1.2.3


From 3cea3eb5da0a8f09a495deea9f2a2c73dc76deab Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 04:30:43 +0000
Subject: response

---
 doc/plugins/contrib/pod/discussion.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/pod/discussion.mdwn b/doc/plugins/contrib/pod/discussion.mdwn
index 8f4b625ee..76e858680 100644
--- a/doc/plugins/contrib/pod/discussion.mdwn
+++ b/doc/plugins/contrib/pod/discussion.mdwn
@@ -3,6 +3,8 @@ My one concern about this plugin is the `=for` markup in POD.
 > Some format names that formatters currently are known to
 > accept include "roff", "man", "latex", "tex", "text", and "html".
 
-I don't know which of these [[!cpan Pod::Xml]] supports. If it currently
+I don't know which of these [[!cpan Pod::Xhtml]] supports. If it currently
 supports, or later support latex, that could be problimatic since that
 could maybe be used to include files or run code. --[[Joey]]
+
+> I don't know, either; the documentation for [[!cpan Pod:Xhtml]] is silent on this subject. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 8b09b29735b1dbbfe0ef33ad347ecb9bbdf45b75 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 04:41:37 +0000
Subject: response

---
 doc/users/KathrynAndersen/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/users/KathrynAndersen/discussion.mdwn b/doc/users/KathrynAndersen/discussion.mdwn
index c44b28a93..288ea8c51 100644
--- a/doc/users/KathrynAndersen/discussion.mdwn
+++ b/doc/users/KathrynAndersen/discussion.mdwn
@@ -4,3 +4,11 @@ pile up. I will try to get to these. I'm particularly interested in
 your use of yaml+fields. Encourage you to go ahead with any others you
 have not submitted here, like pmap. (Unless it makes more sense to submit
 that as a patch to the existing map plugin.) --[[Joey]] 
+
+> Thanks.  I would have put more up, but I didn't want to until they were properly documented, and other things have taken a higher priority.
+
+> I think pmap is probably better as a separate plugin, because it has additional dependencies (HTML::LinkList) which people might not want to have to install.
+
+> The "includepage" plugin I'm not sure whether it is worth releasing or not; it's basically a cut-down version of "inline", because the inline plugin is so complicated and has so many options, I felt more at ease to have something simpler.
+
+> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 1093c7e4b2ec5f3b4052ed5c1b5530560864a920 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 00:57:46 -0400
Subject: new bug

---
 doc/bugs/depends_simple_mixup.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 doc/bugs/depends_simple_mixup.mdwn

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
new file mode 100644
index 000000000..506bef904
--- /dev/null
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -0,0 +1,18 @@
+The [[bugs]] page, at least before I commit this, has a bug at the top that
+has been modified to link to done, and ikiwiki's dependency calculations
+failed to notice and update the bugs page. Looking at the indexdb, I saw
+that the page was not included in the `depends_simple` of the bugs page. 
+
+I was able to replicate the problem locally by starting off with the page
+not marked done (when it did appear in the bugs page `depends_simple`
+(appropriatly as a link dependency, since a change to the page removing the
+link would make it match)), then removing the done link. 
+
+At that point, it vanished from `depends_simple`. Presumably because
+the main (pagespec) depends for the bugs page now matched it, as a content
+dependency. But, it seems to me it should still be listed in
+`depends_simple` here. This, I think, is the cause of the bug.
+
+Then re-add the done link, and the dependency calc code breaks down,
+not noticing that bugs dependeded on the page and needs to be updated.
+--[[Joey]]
-- 
cgit v1.2.3


From 4cb464d6e52344b8a0dfd29e82ede78aef1385d3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 01:05:22 -0400
Subject: typo

---
 doc/bugs/depends_simple_mixup.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 506bef904..c2845240d 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -4,7 +4,7 @@ failed to notice and update the bugs page. Looking at the indexdb, I saw
 that the page was not included in the `depends_simple` of the bugs page. 
 
 I was able to replicate the problem locally by starting off with the page
-not marked done (when it did appear in the bugs page `depends_simple`
+marked done (when it did appear in the bugs page `depends_simple`
 (appropriatly as a link dependency, since a change to the page removing the
 link would make it match)), then removing the done link. 
 
-- 
cgit v1.2.3


From 0d524ad672333fd0bafa64e81e261fd297c25580 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 01:38:53 -0400
Subject: Fix incorrect influence info returned by a failing link() pagespec,
 that could lead to bad dependency handling in certian situations.

---
 IkiWiki.pm                         | 4 ++--
 debian/changelog                   | 2 ++
 doc/bugs/depends_simple_mixup.mdwn | 5 +++++
 t/pagespec_match.t                 | 8 +++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 022bfe3bd..927d62940 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2215,7 +2215,7 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links", "" => 1)
+	return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
@@ -2232,7 +2232,7 @@ sub match_link ($$;@) {
 				if match_glob($p_rel, $link, %params);
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link", "" => 1);
+	return IkiWiki::FailReason->new("$page does not link to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
 }
 
 sub match_backlink ($$;@) {
diff --git a/debian/changelog b/debian/changelog
index da1ab890e..b9a105552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * Add --set-yaml switch for setting more complex config file options.
   * filecheck: Fix bugs that prevented the pagespecs from matching when
     not called by attachment plugin.
+  * Fix incorrect influence info returned by a failing link() pagespec,
+    that could lead to bad dependency handling in certian situations.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index c2845240d..2603ff04c 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -15,4 +15,9 @@ dependency. But, it seems to me it should still be listed in
 
 Then re-add the done link, and the dependency calc code breaks down,
 not noticing that bugs dependeded on the page and needs to be updated.
+
+Ok.. Turns out this was not a problem with the actual influences
+calculation or dependency calculation code. Whew! `match_link`
+just didn't set the influence correctly when failing. [[fixed|done]]
+
 --[[Joey]]
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 8b0be4e8a..ade9bca5a 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 72;
+use Test::More tests => 75;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -54,6 +54,7 @@ $config{userdir}="";
 $links{foo}=[qw{bar baz}];
 $links{bar}=[];
 $links{baz}=[];
+$links{meh}=[];
 $links{"bugs/foo"}=[qw{bugs/done}];
 $links{"bugs/done"}=[];
 $links{"bugs/bar"}=[qw{done}];
@@ -82,6 +83,7 @@ ok(! pagespec_match("bar", ""), "empty pagespec should match nothing");
 ok(! pagespec_match("bar", "    	"), "blank pagespec should match nothing");
 ok(pagespec_match("ook", "link(blog/tags/foo)"), "link internal absolute success");
 ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success");
+ok(pagespec_match("meh", "!link(done)"), "negated failing match is a success");
 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
 $IkiWiki::pagectime{bar}=1154532695; # after
@@ -122,3 +124,7 @@ $i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
 is(join(",", sort keys %$i), 'bar,foo', "influences add up over OR");
 $i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
 is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
+$i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
+is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
+$i=pagespec_match("meh", "!link(done)")->influences;
+is(join(",", sort keys %$i), 'meh', "a negated, failing link test is successful, so the page is a link influence");
-- 
cgit v1.2.3


From 0dec80ee0cb9a2ac9dd4287645d02e5a216f2d0b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 01:48:37 -0400
Subject: close, unreproducible

---
 ...n_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn b/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn
index 42e6b9e27..c3cbff43e 100644
--- a/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn
+++ b/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn
@@ -39,3 +39,6 @@ a year ago in September 2007.
 > ikiwiki. (Doesn't quite seem to be version 2.53.x either) Try with a current
 > version, and see if you can send me a source tree that can reproduce the
 > problem? --[[Joey]]
+
+Did not hear back, so calling this [[done]], unless I hear differently.
+--[[Joey]]
-- 
cgit v1.2.3


From 22b9582cddfcb0ee073c99f8867537f67d79fc38 Mon Sep 17 00:00:00 2001
From: "http://users.itk.ppke.hu/~cstamas/openid/"
 <http://users.itk.ppke.hu/~cstamas/openid/@web>
Date: Fri, 26 Mar 2010 08:57:20 +0000
Subject: init page bugreport

---
 ...-transition_does_not_set_perl_moduels_path_properly.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn

diff --git a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
new file mode 100644
index 000000000..7f8045164
--- /dev/null
+++ b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
@@ -0,0 +1,13 @@
+When installing ikiwiki the perl module path is setup correctly
+
+    use lib '/usr/local/ikiwiki-3.20100312/share/perl/5.10.0';
+
+This is not true for ikiwiki-transition:
+
+    $ PATH=/usr/local/ikiwiki-3.20100312/bin ikiwiki-transition prefix_directives ikiwiki.setup
+    Can't locate IkiWiki.pm in @INC (@INC contains: /etc/perl /usr/local/lib/perl/5.10.0 /usr/local/share/perl/5.10.0 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
+    BEGIN failed--compilation aborted at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
+
+The missing line should be added.
+
+Thanks!
-- 
cgit v1.2.3


From 99b402cd622d38cb8337498d8fdb4f135e8be03c Mon Sep 17 00:00:00 2001
From: "http://users.itk.ppke.hu/~cstamas/openid/"
 <http://users.itk.ppke.hu/~cstamas/openid/@web>
Date: Fri, 26 Mar 2010 08:58:41 +0000
Subject: line break for better view

---
 .../ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
index 7f8045164..5dd4bc780 100644
--- a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
+++ b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
@@ -5,7 +5,9 @@ When installing ikiwiki the perl module path is setup correctly
 This is not true for ikiwiki-transition:
 
     $ PATH=/usr/local/ikiwiki-3.20100312/bin ikiwiki-transition prefix_directives ikiwiki.setup
-    Can't locate IkiWiki.pm in @INC (@INC contains: /etc/perl /usr/local/lib/perl/5.10.0 /usr/local/share/perl/5.10.0 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
+    Can't locate IkiWiki.pm in @INC (@INC contains: /etc/perl /usr/local/lib/perl/5.10.0
+     /usr/local/share/perl/5.10.0 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .)
+     at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
     BEGIN failed--compilation aborted at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
 
 The missing line should be added.
-- 
cgit v1.2.3


From d29419ab0bd181beda6971bf622c3ba8bdd2fd8c Mon Sep 17 00:00:00 2001
From: "http://users.itk.ppke.hu/~cstamas/openid/"
 <http://users.itk.ppke.hu/~cstamas/openid/@web>
Date: Fri, 26 Mar 2010 09:43:50 +0000
Subject: me too - thanks

---
 doc/bugs/Error:_Your_login_session_has_expired._.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
index 046d6e10d..b993cd8e7 100644
--- a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
+++ b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
@@ -41,4 +41,6 @@ Whilst trying to edit http://hugh.vm.bytemark.co.uk/ikiwiki.cgi via OpenID. Any
 
 Thanks for you excellent analysis. The bug was due to old pre-3.0 **templates** laying about. After deleting them, ikiwiki defaults to its own templates. Clever. :-)
 
+Great, this saved me big time! It is a google 1st hit. I had the same with accidentally using old templates. Thanks! --[[cstamas]]
+
 [[bugs/done]]
-- 
cgit v1.2.3


From 087085899f7049434ac19761f27826cec9e458d5 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 13:03:37 +0000
Subject:

---
 doc/forum/an_alternative_approach_to_structured_data.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index 188e627f0..045bfd7aa 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -37,8 +37,12 @@ I have written additional plugins which integrate with the [[plugins/contrib/fie
 > with different syntaxes while keeping `field` for the
 > behind-the-scenes bits.
 >
+>> I've started using `field` on a private site and it's working
+>> well for me; I'll try to do some code review on its
+>> [[plugins/contrib/field/discussion]] page. --s
+>
 > My [[plugins/contrib/album]] plugin could benefit from
-> integration with [[field]] for photos' captions and so on,
+> integration with `field` for photos' captions and so on,
 > probably... I'll try to work on that at some point.
 >
 > [[plugins/contrib/report]] may be doing too much, though:
-- 
cgit v1.2.3


From d88af43011193bb0eef79b749ae9a93eda5d266e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 13:20:33 +0000
Subject: brief review of field; fieldsort plugin

---
 doc/plugins/contrib/field/discussion.mdwn | 62 +++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 doc/plugins/contrib/field/discussion.mdwn

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
new file mode 100644
index 000000000..fc1759fab
--- /dev/null
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -0,0 +1,62 @@
+Having tried out `field`, some comments (from [[smcv]]):
+
+The general concept looks great.
+
+The `pagetemplate` hook seems quite namespace-polluting: on a site containing
+a list of books, I'd like to have an `author` field, but that would collide
+with IkiWiki's use of `<TMPL_VAR AUTHOR>` for the author of the *page*
+(i.e. me). Perhaps it'd be better if the pagetemplate hook was only active for
+`<TMPL_VAR FIELD_AUTHOR>` or something? (For those who want the current
+behaviour, an auxiliary plugin would be easy.)
+
+From a coding style point of view, the `$CamelCase` variable names aren't
+IkiWiki style, and the `match_foo` functions look as though they could benefit
+from being thin wrappers around a common `&IkiWiki::Plugin::field::match`
+function (see `meta` for a similar approach).
+
+I think the documentation would probably be clearer in a less manpage-like
+and more ikiwiki-like style?
+
+If one of my branches from [[todo/allow_plugins_to_add_sorting_methods]] is
+accepted, a `field()` cmp type would mean that [[plugins/contrib/report]] can
+stop reimplementing sorting. Here's the implementation I'm using, with
+your "sortspec" concept (a sort-hook would be very similar): if merged,
+I think it should just be part of `field` rather than a separate plugin.
+
+	# Copyright © 2010 Simon McVittie, released under GNU LGPL >= 2.1
+	package IkiWiki::Plugin::fieldsort;
+	use warnings;
+	use strict;
+	use IkiWiki 3.00;
+	use IkiWiki::Plugin::field;
+
+	sub import {
+		hook(type => "getsetup", id => "fieldsort",  call => \&getsetup);
+	}
+
+	sub getsetup () {
+		return
+			plugin => {
+				safe => 1,
+				rebuild => undef,
+			},
+	}
+
+	package IkiWiki::PageSpec;
+
+	sub check_cmp_field {
+		if (!length $_[0]) {
+			error("sort=field requires a parameter");
+		}
+	}
+
+	sub cmp_field {
+		my $left = IkiWiki::Plugin::field::field_get_value($_[2], $_[0]);
+		my $right = IkiWiki::Plugin::field::field_get_value($_[2], $_[1]);
+
+		$left = "" unless defined $left;
+		$right = "" unless defined $right;
+		return $left cmp $right;
+	}
+
+	1;
-- 
cgit v1.2.3


From bea828a2f6b455c46f2b5d6c16805958a2e3412a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 13:30:52 +0000
Subject: doesn't field+template already cover this?

---
 doc/plugins/contrib/ftemplate/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/plugins/contrib/ftemplate/discussion.mdwn

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
new file mode 100644
index 000000000..851ccf960
--- /dev/null
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -0,0 +1,6 @@
+Is this actually necessary? Doesn't the combination of [[plugins/template]]
+with [[plugins/contrib/field]]'s `pagetemplate` hook provide the same
+functionality? I suppose one missing thing is that `ftemplate` looks in
+the "system" templates directories, not just in the wiki, but that
+seems orthogonal (and might even be a good enhancement to `template`).
+--[[smcv]]
-- 
cgit v1.2.3


From fffd7e7e026f61e03b2fa052acdf7130889f6343 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 13:43:37 +0000
Subject: oh, my mistake... this *is* necessary, but could perhaps be done
 better?

---
 doc/plugins/contrib/ftemplate/discussion.mdwn | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index 851ccf960..eb2ec6f13 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -1,6 +1,13 @@
-Is this actually necessary? Doesn't the combination of [[plugins/template]]
-with [[plugins/contrib/field]]'s `pagetemplate` hook provide the same
-functionality? I suppose one missing thing is that `ftemplate` looks in
+I initially thought this wasn't actually necessary - the combination
+of [[plugins/template]] with [[plugins/contrib/field]]'s `pagetemplate`
+hook ought to provide the same functionality. However, `template`
+doesn't run `pagetemplate` hooks; a more general version of this
+plugin would be to have a variant of `template` that runs `pagetemplate`
+hooks (probably easiest to just patch `template` to implement a
+second directive, or have a special parameter `run_hooks="yes"`,
+or something).
+
+Another missing thing is that `ftemplate` looks in
 the "system" templates directories, not just in the wiki, but that
-seems orthogonal (and might even be a good enhancement to `template`).
+seems orthogonal (and might be a good enhancement to `template` anyway).
 --[[smcv]]
-- 
cgit v1.2.3


From b9958fe3cf1a27b58d3e2bd59c76553eb0046782 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 14:09:04 +0000
Subject: brief review of report

---
 doc/plugins/contrib/report/discussion.mdwn | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 doc/plugins/contrib/report/discussion.mdwn

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
new file mode 100644
index 000000000..6b1e28f6a
--- /dev/null
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -0,0 +1,23 @@
+Wow, this plugin does a lot... it seems to be `inline` (but without the feeds
+or the ability to not have `archive="yes"`), plus part of
+[[plugins/contrib/trail]], plus some sorting, plus an ingenious workaround
+for template evaluation being relatively stateless.
+
+A large part of this plugin would just fall off if one of the versions of
+[[todo/allow_add_plugins_to_add_sorting_methods]] was merged, which was a
+large part of the idea of that feature request :-) To make use of that
+you'd have to use `pagespec_match_list` in the trail case too, but that's
+easy enough - just add `list => [@the_trail_pages]` to the arguments.
+
+Another large part would fall off if this plugin required, and internally
+invoked, `inline` (like my `comments` plugin does) - `inline` runs
+`pagetemplate` hooks, and in particular, it'll run the `field` hook.
+Alternatively, this plugin could invoke `pagetemplate` hooks itself,
+removing the special case for `field`.
+
+Perhaps the `headers` thing could migrate into inline somehow? That might
+lead to making inline too big, though.
+
+Is the intention that the `trail` part is a performance hack, or a way
+to select pages? How does it relate to [[todo/wikitrails]] or
+[[plugins/contrib/trail]]? --[[smcv]]
-- 
cgit v1.2.3


From 3c98cf653f6d6950a425620acf0279df902d004b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 15:09:11 +0000
Subject: fix link

---
 doc/plugins/contrib/report/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index 6b1e28f6a..918d0779b 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -4,7 +4,7 @@ or the ability to not have `archive="yes"`), plus part of
 for template evaluation being relatively stateless.
 
 A large part of this plugin would just fall off if one of the versions of
-[[todo/allow_add_plugins_to_add_sorting_methods]] was merged, which was a
+"[[todo/allow_plugins_to_add_sorting_methods]]" was merged, which was a
 large part of the idea of that feature request :-) To make use of that
 you'd have to use `pagespec_match_list` in the trail case too, but that's
 easy enough - just add `list => [@the_trail_pages]` to the arguments.
-- 
cgit v1.2.3


From 1273f1de52998cf54afb3445fd8c616bce53e698 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 13:11:02 -0400
Subject: Add preprocessed 'use lib' line to ikiwiki-transition and
 ikiwiki-calendar if necessary for unusual install.

---
 .gitignore                                         |   3 +-
 Makefile.PL                                        |  16 +-
 debian/changelog                                   |   2 +
 ...on_does_not_set_perl_moduels_path_properly.mdwn |   2 +
 ikiwiki-calendar                                   |  57 ----
 ikiwiki-calendar.in                                |  58 ++++
 ikiwiki-transition                                 | 348 --------------------
 ikiwiki-transition.in                              | 349 +++++++++++++++++++++
 ikiwiki.spec                                       |   2 +-
 9 files changed, 423 insertions(+), 414 deletions(-)
 delete mode 100755 ikiwiki-calendar
 create mode 100755 ikiwiki-calendar.in
 delete mode 100755 ikiwiki-transition
 create mode 100755 ikiwiki-transition.in

diff --git a/.gitignore b/.gitignore
index 8de36e2c8..e9ab152b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,10 @@ blib/*
 doc/.ikiwiki/*
 html/*
 ikiwiki.out
+ikiwiki-transition.out
+ikiwiki-calendar.out
 pm_to_blib
 *.man
-build-stamp
 po/po2wiki_stamp
 po/underlays/*/*.mdwn
 po/underlays/basewiki/*/*.mdwn
diff --git a/Makefile.PL b/Makefile.PL
index 52421a711..5a9028b51 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -28,15 +28,16 @@ W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
 
 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
+outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out
 
-ikiwiki.out: ikiwiki.in
-	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
-	chmod +x ikiwiki.out
+%.out: %.in
+	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
+	chmod +x $@
 
 ikiwiki.setup: ikiwiki.out
 	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
 
-extra_build: ikiwiki.out ikiwiki.setup docwiki
+extra_build: $(outprogs) ikiwiki.setup docwiki
 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
 	./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
 	./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
@@ -52,7 +53,7 @@ docwiki: ikiwiki.out
 
 extra_clean:
 	$(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
-	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
+	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
 underlay_install:
@@ -115,8 +116,9 @@ extra_install: underlay_install
 	install ikiwiki-w3m.cgi $(DESTDIR)$(W3M_CGI_BIN)
 
 	install -d $(DESTDIR)$(PREFIX)/bin
-	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
-	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist ikiwiki-calendar $(DESTDIR)$(PREFIX)/bin/
+	for prog in $(outprogs); do \
+		install $$prog $(DESTDIR)$(PREFIX)/bin/$$(shell echo $$prog | sed 's/\.out//'); \
+	done
 
 	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 	
diff --git a/debian/changelog b/debian/changelog
index b9a105552..57406c6d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
     not called by attachment plugin.
   * Fix incorrect influence info returned by a failing link() pagespec,
     that could lead to bad dependency handling in certian situations.
+  * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
+    if necessary for unusual install.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
index 5dd4bc780..b3e87b529 100644
--- a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
+++ b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
@@ -13,3 +13,5 @@ This is not true for ikiwiki-transition:
 The missing line should be added.
 
 Thanks!
+
+[[done]] --[[Joey]] 
diff --git a/ikiwiki-calendar b/ikiwiki-calendar
deleted file mode 100755
index a9548d6ec..000000000
--- a/ikiwiki-calendar
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use IkiWiki;
-use IkiWiki::Setup;
-use Getopt::Long;
-
-sub usage () {
-	die gettext("usage: ikiwiki-calendar [-f] your.setup [pagespec] [year]"), "\n";
-}
-
-my $force=0;
-GetOptions(
-	"force" => \$force,
-) || usage();
-my $setup=shift		|| usage();
-my $pagespec=shift	|| "*";
-my $startyear=shift	|| 1900+(localtime(time))[5];
-my $endyear=shift	|| $startyear;
-
-%config=IkiWiki::defaultconfig();
-IkiWiki::Setup::load($setup);
-IkiWiki::loadplugins();
-IkiWiki::checkconfig();
-
-my $archivebase = 'archives';
-$archivebase = $config{archivebase} if defined $config{archivebase};
-
-sub writearchive ($$;$) {
-	my $template=template(shift);
-	my $year=shift;
-	my $month=shift;
-
-	my $page=defined $month ? "$year/$month" : $year;
-
-	my $pagefile=newpagefile("$archivebase/$page", $config{default_pageext});
-	$template->param(pagespec => $pagespec);
-	$template->param(year => $year);
-	$template->param(month => $month) if defined $month;
-
-	if ($force || ! -e "$config{srcdir}/$pagefile") {
-		writefile($pagefile, $config{srcdir}, $template->output);
-		IkiWiki::rcs_add($pagefile) if $config{rcs};
-	}
-}
-
-foreach my $y ($startyear..$endyear) {
-	writearchive("calendaryear.tmpl", $y);
-	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
-		writearchive("calendarmonth.tmpl", $y, $m);
-	}
-}
-
-IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
-	if $config{rcs};
-
-system("ikiwiki", "-setup", $setup, "-refresh");
diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
new file mode 100755
index 000000000..9738ea5f7
--- /dev/null
+++ b/ikiwiki-calendar.in
@@ -0,0 +1,58 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use lib '.'; # For use in nonstandard directory, munged by Makefile.
+use IkiWiki;
+use IkiWiki::Setup;
+use Getopt::Long;
+
+sub usage () {
+	die gettext("usage: ikiwiki-calendar [-f] your.setup [pagespec] [year]"), "\n";
+}
+
+my $force=0;
+GetOptions(
+	"force" => \$force,
+) || usage();
+my $setup=shift		|| usage();
+my $pagespec=shift	|| "*";
+my $startyear=shift	|| 1900+(localtime(time))[5];
+my $endyear=shift	|| $startyear;
+
+%config=IkiWiki::defaultconfig();
+IkiWiki::Setup::load($setup);
+IkiWiki::loadplugins();
+IkiWiki::checkconfig();
+
+my $archivebase = 'archives';
+$archivebase = $config{archivebase} if defined $config{archivebase};
+
+sub writearchive ($$;$) {
+	my $template=template(shift);
+	my $year=shift;
+	my $month=shift;
+
+	my $page=defined $month ? "$year/$month" : $year;
+
+	my $pagefile=newpagefile("$archivebase/$page", $config{default_pageext});
+	$template->param(pagespec => $pagespec);
+	$template->param(year => $year);
+	$template->param(month => $month) if defined $month;
+
+	if ($force || ! -e "$config{srcdir}/$pagefile") {
+		writefile($pagefile, $config{srcdir}, $template->output);
+		IkiWiki::rcs_add($pagefile) if $config{rcs};
+	}
+}
+
+foreach my $y ($startyear..$endyear) {
+	writearchive("calendaryear.tmpl", $y);
+	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
+		writearchive("calendarmonth.tmpl", $y, $m);
+	}
+}
+
+IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
+	if $config{rcs};
+
+system("ikiwiki", "-setup", $setup, "-refresh");
diff --git a/ikiwiki-transition b/ikiwiki-transition
deleted file mode 100755
index 1bebb1176..000000000
--- a/ikiwiki-transition
+++ /dev/null
@@ -1,348 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use IkiWiki;
-use HTML::Entities;
-
-my $regex = qr{
-	(\\?)		# 1: escape?
-	\[\[(!?)	# directive open; 2: optional prefix
-	([-\w]+)	# 3: command
-	(		# 4: the parameters (including initial whitespace)
-	\s+
-		(?:
-			(?:[-\w]+=)?		# named parameter key?
-			(?:
-				""".*?"""	# triple-quoted value
-				|
-				"[^"]+"		# single-quoted value
-				|
-				[^\s\]]+	# unquoted value
-			)
-			\s*			# whitespace or end
-						# of directive
-		)
-	*)		# 0 or more parameters
-	\]\]		# directive closed
-}sx;
-
-sub handle_directive {
-	my $escape = shift;
-	my $prefix = shift;
-	my $directive = shift;
-	my $args = shift;
-
-	if (length $escape) {
-		return "${escape}[[${prefix}${directive}${args}]]"
-	}
-	if ($directive =~ m/^(if|more|table|template|toggleable)$/) {
-		$args =~ s{$regex}{handle_directive($1, $2, $3, $4)}eg;
-	}
-	return "[[!${directive}${args}]]"
-}
-
-sub prefix_directives {
-	loadsetup(shift);
-
-	IkiWiki::loadplugins();
-	IkiWiki::checkconfig();
-	IkiWiki::loadindex();
-
-	if (! %pagesources) {
-		error "ikiwiki has not built this wiki yet, cannot transition";
-	}
-
-	foreach my $page (values %pagesources) {
-		next unless defined pagetype($page) &&
-		            -f $config{srcdir}."/".$page;
-		my $content=readfile($config{srcdir}."/".$page);
-		my $oldcontent=$content;
-		$content=~s{$regex}{handle_directive($1, $2, $3, $4)}eg;
-		if ($oldcontent ne $content) {
-			writefile($page, $config{srcdir}, $content);
-		}
-	}
-}
-
-sub indexdb {
-	setstatedir(shift);
-
-	# Note: No lockwiki here because ikiwiki already locks it
-	# before calling this.	
-	if (! IkiWiki::oldloadindex()) {
-		die "failed to load index\n";
-	}
-	if (! IkiWiki::saveindex()) {
-		die "failed to save indexdb\n"
-	}
-	if (! IkiWiki::loadindex()) {
-		die "transition failed, cannot load new indexdb\n";
-	}
-	if (! unlink("$config{wikistatedir}/index")) {
-		die "unlink failed: $!\n";
-	}
-}
-
-sub hashpassword {
-	setstatedir(shift);
-
-	eval q{use IkiWiki::UserInfo};
-	eval q{use Authen::Passphrase::BlowfishCrypt};
-	if ($@) {
-		error("ikiwiki-transition hashpassword: failed to load Authen::Passphrase, passwords not hashed");
-	}
-
-	IkiWiki::lockwiki();
-	IkiWiki::loadplugin("passwordauth");
-	my $userinfo = IkiWiki::userinfo_retrieve();
-	foreach my $user (keys %{$userinfo}) {
-		if (ref $userinfo->{$user} &&
-		    exists $userinfo->{$user}->{password} &&
-		    length $userinfo->{$user}->{password} &&
-		    ! exists $userinfo->{$user}->{cryptpassword}) {
-			IkiWiki::Plugin::passwordauth::setpassword($user, $userinfo->{$user}->{password});
-		}
-	}
-}
-
-sub aggregateinternal {
-	loadsetup(shift);
-	require IkiWiki::Plugin::aggregate;
-	IkiWiki::checkconfig();
-	IkiWiki::Plugin::aggregate::migrate_to_internal();
-}
-
-sub setupformat {
-	my $setup=shift;
-
-	loadsetup($setup);
-	IkiWiki::checkconfig();
-	
-	# unpack old-format wrappers setting into new fields
-	my $cgi_seen=0;
-	my $rcs_seen=0;
-	foreach my $wrapper (@{$config{wrappers}}) {
-		if ($wrapper->{cgi}) {
-			if ($cgi_seen) {
-				die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
-			}
-			$cgi_seen++;
-			print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
-			$config{cgi_wrapper}=$wrapper->{wrapper};
-			$config{cgi_wrappermode}=$wrapper->{wrappermode}
-				if exists $wrapper->{wrappermode};
-		}
-		elsif ($config{rcs}) {
-			if ($rcs_seen) {
-				die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
-			}
-			$rcs_seen++;
-			print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
-			$config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
-			$config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}
-				if exists $wrapper->{wrappermode};
-		}
-		else {
-			die "don't know what to do with wrapper ".$wrapper->{wrapper}."\n";
-		}
-	}
-
-	IkiWiki::Setup::dump($setup);
-}
-
-sub moveprefs {
-	my $setup=shift;
-
-	loadsetup($setup);
-	IkiWiki::checkconfig();
-
-	eval q{use IkiWiki::UserInfo};
-	error $@ if $@;
-
-	foreach my $field (qw{allowed_attachments locked_pages}) {
-		my $orig=$config{$field};
-		foreach my $admin (@{$config{adminuser}}) {
-			my $a=IkiWiki::userinfo_get($admin, $field);
-			if (defined $a && length $a &&
-			    # might already have been moved
-			    (! defined $orig || $a ne $orig)) {
-			    	if (defined $config{$field} &&
-				    length $config{$field}) {
-					$config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
-				}
-				else {
-					$config{$field}=$a;
-				}
-			}
-		}
-	}
-
-	my %banned=map { $_ => 1 } @{$config{banned_users}}, IkiWiki::get_banned_users();
-	$config{banned_users}=[sort keys %banned];
-
-	IkiWiki::Setup::dump($setup);
-}
-
-sub deduplinks {
-	loadsetup(shift);
-	IkiWiki::loadplugins();
-	IkiWiki::checkconfig();
-	IkiWiki::loadindex();
-	foreach my $page (keys %links) {
-		my %l;
-		$l{$_}=1 foreach @{$links{$page}};
-		$links{$page}=[keys %l]
-	}
-	IkiWiki::saveindex();
-}
-
-sub setstatedir {
-	my $dirorsetup=shift;
-
-	if (! defined $dirorsetup) {
-		usage();		
-	}
-
-	if (-d $dirorsetup) {
-		$config{wikistatedir}=$dirorsetup."/.ikiwiki";
-	}
-	elsif (-f $dirorsetup) {
-		loadsetup($dirorsetup);
-	}
-	else {
-		error("ikiwiki-transition: $dirorsetup does not exist");
-	}
-
-	if (! -d $config{wikistatedir}) {
-		error("ikiwiki-transition: $config{wikistatedir} does not exist");
-	}
-}
-	
-sub loadsetup {
-	my $setup=shift;
-	if (! defined $setup) {
-		usage();
-	}
-
-	require IkiWiki::Setup;
-
-	%config = IkiWiki::defaultconfig();
-	IkiWiki::Setup::load($setup);
-}
-
-sub usage {
-	print STDERR "Usage: ikiwiki-transition type ...\n";
-	print STDERR "Currently supported transition subcommands:\n";
-	print STDERR "\tprefix_directives setupfile ...\n";
-	print STDERR "\taggregateinternal setupfile\n";
-	print STDERR "\tsetupformat setupfile\n";
-	print STDERR "\tmoveprefs setupfile\n";
-	print STDERR "\thashpassword setupfile|srcdir\n";
-	print STDERR "\tindexdb setupfile|srcdir\n";
-	print STDERR "\tdeduplinks setupfile\n";
-	exit 1;
-}
-
-usage() unless @ARGV;
-
-my $mode=shift;
-if ($mode eq 'prefix_directives') {
-	prefix_directives(@ARGV);
-}
-elsif ($mode eq 'hashpassword') {
-	hashpassword(@ARGV);
-}
-elsif ($mode eq 'indexdb') {
-	indexdb(@ARGV);
-}
-elsif ($mode eq 'aggregateinternal') {
-	aggregateinternal(@ARGV);
-}
-elsif ($mode eq 'setupformat') {
-	setupformat(@ARGV);
-}
-elsif ($mode eq 'moveprefs') {
-	moveprefs(@ARGV);
-}
-elsif ($mode eq 'deduplinks') {
-	deduplinks(@ARGV);
-}
-else {
-	usage();
-}
-
-package IkiWiki;
-
-# A slightly modified version of the old loadindex function.
-sub oldloadindex {
-	%oldrenderedfiles=%pagectime=();
-	if (! $config{rebuild}) {
-		%pagesources=%pagemtime=%oldlinks=%links=%depends=
-			%destsources=%renderedfiles=%pagecase=%pagestate=();
-	}
-	open (my $in, "<", "$config{wikistatedir}/index") || return;
-	while (<$in>) {
-		chomp;
-		my %items;
-		$items{link}=[];
-		$items{dest}=[];
-		foreach my $i (split(/ /, $_)) {
-			my ($item, $val)=split(/=/, $i, 2);
-			push @{$items{$item}}, decode_entities($val);
-		}
-
-		next unless exists $items{src}; # skip bad lines for now
-
-		my $page=pagename($items{src}[0]);
-		if (! $config{rebuild}) {
-			$pagesources{$page}=$items{src}[0];
-			$pagemtime{$page}=$items{mtime}[0];
-			$oldlinks{$page}=[@{$items{link}}];
-			$links{$page}=[@{$items{link}}];
-			$depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT } if exists $items{depends};
-			$destsources{$_}=$page foreach @{$items{dest}};
-			$renderedfiles{$page}=[@{$items{dest}}];
-			$pagecase{lc $page}=$page;
-			foreach my $k (grep /_/, keys %items) {
-				my ($id, $key)=split(/_/, $k, 2);
-				$pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k}[0];
-			}
-		}
-		$oldrenderedfiles{$page}=[@{$items{dest}}];
-		$pagectime{$page}=$items{ctime}[0];
-	}
-
-	# saveindex relies on %hooks being populated, else it won't save
-	# the page state owned by a given hook. But no plugins are loaded
-	# by this program, so populate %hooks with all hook ids that
-	# currently have page state.
-	foreach my $page (keys %pagemtime) {
-		foreach my $id (keys %{$pagestate{$page}}) {
-			$hooks{_dummy}{$id}=1;
-		}
-	}
-	
-	return close($in);
-}
-
-# Used to be in IkiWiki/UserInfo, but only used here now.
-sub get_banned_users () {
-	my @ret;
-	my $userinfo=userinfo_retrieve();
-	foreach my $user (keys %{$userinfo}) {
-		push @ret, $user if $userinfo->{$user}->{banned};
-	}
-	return @ret;
-}
-
-# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
-# setup file) now.
-sub pagespec_merge ($$) {
-	my $a=shift;
-	my $b=shift;
-
-	return $a if $a eq $b;
-	return "($a) or ($b)";
-}
-
-1
diff --git a/ikiwiki-transition.in b/ikiwiki-transition.in
new file mode 100755
index 000000000..e3be645cc
--- /dev/null
+++ b/ikiwiki-transition.in
@@ -0,0 +1,349 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use lib '.'; # For use in nonstandard directory, munged by Makefile.
+use IkiWiki;
+use HTML::Entities;
+
+my $regex = qr{
+	(\\?)		# 1: escape?
+	\[\[(!?)	# directive open; 2: optional prefix
+	([-\w]+)	# 3: command
+	(		# 4: the parameters (including initial whitespace)
+	\s+
+		(?:
+			(?:[-\w]+=)?		# named parameter key?
+			(?:
+				""".*?"""	# triple-quoted value
+				|
+				"[^"]+"		# single-quoted value
+				|
+				[^\s\]]+	# unquoted value
+			)
+			\s*			# whitespace or end
+						# of directive
+		)
+	*)		# 0 or more parameters
+	\]\]		# directive closed
+}sx;
+
+sub handle_directive {
+	my $escape = shift;
+	my $prefix = shift;
+	my $directive = shift;
+	my $args = shift;
+
+	if (length $escape) {
+		return "${escape}[[${prefix}${directive}${args}]]"
+	}
+	if ($directive =~ m/^(if|more|table|template|toggleable)$/) {
+		$args =~ s{$regex}{handle_directive($1, $2, $3, $4)}eg;
+	}
+	return "[[!${directive}${args}]]"
+}
+
+sub prefix_directives {
+	loadsetup(shift);
+
+	IkiWiki::loadplugins();
+	IkiWiki::checkconfig();
+	IkiWiki::loadindex();
+
+	if (! %pagesources) {
+		error "ikiwiki has not built this wiki yet, cannot transition";
+	}
+
+	foreach my $page (values %pagesources) {
+		next unless defined pagetype($page) &&
+		            -f $config{srcdir}."/".$page;
+		my $content=readfile($config{srcdir}."/".$page);
+		my $oldcontent=$content;
+		$content=~s{$regex}{handle_directive($1, $2, $3, $4)}eg;
+		if ($oldcontent ne $content) {
+			writefile($page, $config{srcdir}, $content);
+		}
+	}
+}
+
+sub indexdb {
+	setstatedir(shift);
+
+	# Note: No lockwiki here because ikiwiki already locks it
+	# before calling this.	
+	if (! IkiWiki::oldloadindex()) {
+		die "failed to load index\n";
+	}
+	if (! IkiWiki::saveindex()) {
+		die "failed to save indexdb\n"
+	}
+	if (! IkiWiki::loadindex()) {
+		die "transition failed, cannot load new indexdb\n";
+	}
+	if (! unlink("$config{wikistatedir}/index")) {
+		die "unlink failed: $!\n";
+	}
+}
+
+sub hashpassword {
+	setstatedir(shift);
+
+	eval q{use IkiWiki::UserInfo};
+	eval q{use Authen::Passphrase::BlowfishCrypt};
+	if ($@) {
+		error("ikiwiki-transition hashpassword: failed to load Authen::Passphrase, passwords not hashed");
+	}
+
+	IkiWiki::lockwiki();
+	IkiWiki::loadplugin("passwordauth");
+	my $userinfo = IkiWiki::userinfo_retrieve();
+	foreach my $user (keys %{$userinfo}) {
+		if (ref $userinfo->{$user} &&
+		    exists $userinfo->{$user}->{password} &&
+		    length $userinfo->{$user}->{password} &&
+		    ! exists $userinfo->{$user}->{cryptpassword}) {
+			IkiWiki::Plugin::passwordauth::setpassword($user, $userinfo->{$user}->{password});
+		}
+	}
+}
+
+sub aggregateinternal {
+	loadsetup(shift);
+	require IkiWiki::Plugin::aggregate;
+	IkiWiki::checkconfig();
+	IkiWiki::Plugin::aggregate::migrate_to_internal();
+}
+
+sub setupformat {
+	my $setup=shift;
+
+	loadsetup($setup);
+	IkiWiki::checkconfig();
+	
+	# unpack old-format wrappers setting into new fields
+	my $cgi_seen=0;
+	my $rcs_seen=0;
+	foreach my $wrapper (@{$config{wrappers}}) {
+		if ($wrapper->{cgi}) {
+			if ($cgi_seen) {
+				die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
+			}
+			$cgi_seen++;
+			print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
+			$config{cgi_wrapper}=$wrapper->{wrapper};
+			$config{cgi_wrappermode}=$wrapper->{wrappermode}
+				if exists $wrapper->{wrappermode};
+		}
+		elsif ($config{rcs}) {
+			if ($rcs_seen) {
+				die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
+			}
+			$rcs_seen++;
+			print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
+			$config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
+			$config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}
+				if exists $wrapper->{wrappermode};
+		}
+		else {
+			die "don't know what to do with wrapper ".$wrapper->{wrapper}."\n";
+		}
+	}
+
+	IkiWiki::Setup::dump($setup);
+}
+
+sub moveprefs {
+	my $setup=shift;
+
+	loadsetup($setup);
+	IkiWiki::checkconfig();
+
+	eval q{use IkiWiki::UserInfo};
+	error $@ if $@;
+
+	foreach my $field (qw{allowed_attachments locked_pages}) {
+		my $orig=$config{$field};
+		foreach my $admin (@{$config{adminuser}}) {
+			my $a=IkiWiki::userinfo_get($admin, $field);
+			if (defined $a && length $a &&
+			    # might already have been moved
+			    (! defined $orig || $a ne $orig)) {
+			    	if (defined $config{$field} &&
+				    length $config{$field}) {
+					$config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
+				}
+				else {
+					$config{$field}=$a;
+				}
+			}
+		}
+	}
+
+	my %banned=map { $_ => 1 } @{$config{banned_users}}, IkiWiki::get_banned_users();
+	$config{banned_users}=[sort keys %banned];
+
+	IkiWiki::Setup::dump($setup);
+}
+
+sub deduplinks {
+	loadsetup(shift);
+	IkiWiki::loadplugins();
+	IkiWiki::checkconfig();
+	IkiWiki::loadindex();
+	foreach my $page (keys %links) {
+		my %l;
+		$l{$_}=1 foreach @{$links{$page}};
+		$links{$page}=[keys %l]
+	}
+	IkiWiki::saveindex();
+}
+
+sub setstatedir {
+	my $dirorsetup=shift;
+
+	if (! defined $dirorsetup) {
+		usage();		
+	}
+
+	if (-d $dirorsetup) {
+		$config{wikistatedir}=$dirorsetup."/.ikiwiki";
+	}
+	elsif (-f $dirorsetup) {
+		loadsetup($dirorsetup);
+	}
+	else {
+		error("ikiwiki-transition: $dirorsetup does not exist");
+	}
+
+	if (! -d $config{wikistatedir}) {
+		error("ikiwiki-transition: $config{wikistatedir} does not exist");
+	}
+}
+	
+sub loadsetup {
+	my $setup=shift;
+	if (! defined $setup) {
+		usage();
+	}
+
+	require IkiWiki::Setup;
+
+	%config = IkiWiki::defaultconfig();
+	IkiWiki::Setup::load($setup);
+}
+
+sub usage {
+	print STDERR "Usage: ikiwiki-transition type ...\n";
+	print STDERR "Currently supported transition subcommands:\n";
+	print STDERR "\tprefix_directives setupfile ...\n";
+	print STDERR "\taggregateinternal setupfile\n";
+	print STDERR "\tsetupformat setupfile\n";
+	print STDERR "\tmoveprefs setupfile\n";
+	print STDERR "\thashpassword setupfile|srcdir\n";
+	print STDERR "\tindexdb setupfile|srcdir\n";
+	print STDERR "\tdeduplinks setupfile\n";
+	exit 1;
+}
+
+usage() unless @ARGV;
+
+my $mode=shift;
+if ($mode eq 'prefix_directives') {
+	prefix_directives(@ARGV);
+}
+elsif ($mode eq 'hashpassword') {
+	hashpassword(@ARGV);
+}
+elsif ($mode eq 'indexdb') {
+	indexdb(@ARGV);
+}
+elsif ($mode eq 'aggregateinternal') {
+	aggregateinternal(@ARGV);
+}
+elsif ($mode eq 'setupformat') {
+	setupformat(@ARGV);
+}
+elsif ($mode eq 'moveprefs') {
+	moveprefs(@ARGV);
+}
+elsif ($mode eq 'deduplinks') {
+	deduplinks(@ARGV);
+}
+else {
+	usage();
+}
+
+package IkiWiki;
+
+# A slightly modified version of the old loadindex function.
+sub oldloadindex {
+	%oldrenderedfiles=%pagectime=();
+	if (! $config{rebuild}) {
+		%pagesources=%pagemtime=%oldlinks=%links=%depends=
+			%destsources=%renderedfiles=%pagecase=%pagestate=();
+	}
+	open (my $in, "<", "$config{wikistatedir}/index") || return;
+	while (<$in>) {
+		chomp;
+		my %items;
+		$items{link}=[];
+		$items{dest}=[];
+		foreach my $i (split(/ /, $_)) {
+			my ($item, $val)=split(/=/, $i, 2);
+			push @{$items{$item}}, decode_entities($val);
+		}
+
+		next unless exists $items{src}; # skip bad lines for now
+
+		my $page=pagename($items{src}[0]);
+		if (! $config{rebuild}) {
+			$pagesources{$page}=$items{src}[0];
+			$pagemtime{$page}=$items{mtime}[0];
+			$oldlinks{$page}=[@{$items{link}}];
+			$links{$page}=[@{$items{link}}];
+			$depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT } if exists $items{depends};
+			$destsources{$_}=$page foreach @{$items{dest}};
+			$renderedfiles{$page}=[@{$items{dest}}];
+			$pagecase{lc $page}=$page;
+			foreach my $k (grep /_/, keys %items) {
+				my ($id, $key)=split(/_/, $k, 2);
+				$pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k}[0];
+			}
+		}
+		$oldrenderedfiles{$page}=[@{$items{dest}}];
+		$pagectime{$page}=$items{ctime}[0];
+	}
+
+	# saveindex relies on %hooks being populated, else it won't save
+	# the page state owned by a given hook. But no plugins are loaded
+	# by this program, so populate %hooks with all hook ids that
+	# currently have page state.
+	foreach my $page (keys %pagemtime) {
+		foreach my $id (keys %{$pagestate{$page}}) {
+			$hooks{_dummy}{$id}=1;
+		}
+	}
+	
+	return close($in);
+}
+
+# Used to be in IkiWiki/UserInfo, but only used here now.
+sub get_banned_users () {
+	my @ret;
+	my $userinfo=userinfo_retrieve();
+	foreach my $user (keys %{$userinfo}) {
+		push @ret, $user if $userinfo->{$user}->{banned};
+	}
+	return @ret;
+}
+
+# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
+# setup file) now.
+sub pagespec_merge ($$) {
+	my $a=shift;
+	my $b=shift;
+
+	return $a if $a eq $b;
+	return "($a) or ($b)";
+}
+
+1
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 2bb87724d..532a91885 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100312
+Version: 3.20100324
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
-- 
cgit v1.2.3


From c4108d58dcef2805deeb1370367d718d9b8f3184 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Sun, 28 Mar 2010 05:06:52 +0000
Subject: Better URL for my Ikiwiki instance; changed the note about DNS.

---
 doc/users/ivan_shmakov.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index 41bf9b09a..de58cb207 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -1,3 +1,4 @@
 &hellip; To put it short: an Ikiwiki newbie.
 
-I run an Ikiwiki instance at <http://gray.am-1.org/~ivan/lhc/> (though the DNS servers seem to be temporarily out of smoke as of 2010-03-12Z.)
+I run an Ikiwiki instance at <http://gray.siamics.net/~ivan/lhc/>
+(though the DNS servers may be flacky due to transition to Dyn Inc.)
-- 
cgit v1.2.3


From ec110abc6d412db5f65ea5b9311596bbe7799fd4 Mon Sep 17 00:00:00 2001
From: Redtexture <Redtexture@web>
Date: Sun, 28 Mar 2010 12:21:51 +0000
Subject: add "wait"  (best to wait to tackle...)

---
 doc/tips/spam_and_softwaresites.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn
index fe73518ef..78a35ff05 100644
--- a/doc/tips/spam_and_softwaresites.mdwn
+++ b/doc/tips/spam_and_softwaresites.mdwn
@@ -82,5 +82,5 @@ Caveat: if there are no commits you want to keep (i.e. all the commits since
 the last merge into master are either spam or spam reverts) then `git rebase`
 will abort. Therefore, this approach only works if you have at least one
 non-spam commit to the documentation since the last merge into `master`. For
-this reason, it's best to tackle spam with reverts until you have at least one
+this reason, it's best wait to tackle spam with reverts until you have at least one
 commit you want merged back into the main history.
-- 
cgit v1.2.3


From 9c6b12fe3de453869be7fa2ae5c1d07e9751a69c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 28 Mar 2010 14:52:03 +0000
Subject: revert misleading clarification, and try to clarify better

---
 doc/tips/spam_and_softwaresites.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn
index 78a35ff05..507858c0c 100644
--- a/doc/tips/spam_and_softwaresites.mdwn
+++ b/doc/tips/spam_and_softwaresites.mdwn
@@ -82,5 +82,6 @@ Caveat: if there are no commits you want to keep (i.e. all the commits since
 the last merge into master are either spam or spam reverts) then `git rebase`
 will abort. Therefore, this approach only works if you have at least one
 non-spam commit to the documentation since the last merge into `master`. For
-this reason, it's best wait to tackle spam with reverts until you have at least one
-commit you want merged back into the main history.
+this reason, it's best to wait until you have at least one
+commit you want merged back into the main history before doing a rebase,
+and until then, tackle spam with reverts.
-- 
cgit v1.2.3


From ba05b907e3563f9aa25a4322abd9ab2d5b56b36b Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Sun, 28 Mar 2010 15:58:37 +0000
Subject: More wishlist items for the `xslt` plugin.

---
 doc/plugins/contrib/xslt/discussion.mdwn | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/doc/plugins/contrib/xslt/discussion.mdwn b/doc/plugins/contrib/xslt/discussion.mdwn
index 9cda02f88..72cce083c 100644
--- a/doc/plugins/contrib/xslt/discussion.mdwn
+++ b/doc/plugins/contrib/xslt/discussion.mdwn
@@ -20,3 +20,30 @@ possible. Can it also read other arbitrary files, run other programs, etc?
 > For the second point, I think the main concern would be resource usage.  XSLT is a pretty limited language; it can read other XML files, but it can't run other programs so far as I know.
 
 > -- [[KathrynAndersen]]
+
+>> XSLT is, indeed, a Turing-complete programming language.
+   However, [XML::LibXSLT][] provides a set of functions to help
+   to minimize the damage that may be caused by running a random
+   program.
+
+>> In particular, `max_depth ()` allows for the maximum
+   recursion depth to be set, while
+   `read_file ()`, `write_file ()`, `create_dir ()`,
+   `read_net ()` and `write_net ()`
+   are the callbacks that allow any of the possible file
+   operations to be denied.
+
+>> To be honest, I'd prefer for the `read_file ()` callback to
+   only grant access to the files below the Ikiwiki source
+   directory, and for all the `write_`&hellip; and
+   &hellip;`_net` callbacks to deny the access unconditionally.
+
+>> One more wishlist item: allow the set of locations to take
+   `.xsl` files from to be preconfigured, so that, e.&nbsp;g.,
+   one could allow (preasumably trusted) system stylesheets,
+   while disallowing any stylesheets that are placed on the Wiki
+   itself.
+
+>> &mdash;&nbsp;Ivan Shmakov, 2010-03-28Z.
+
+[XML::LibXSLT]: http://search.cpan.org/~PAJAS/XML-LibXSLT/LibXSLT.pm
-- 
cgit v1.2.3


From e1eee27fc59dd6126e80ef21e4cc44191119902c Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Sun, 28 Mar 2010 20:01:41 +0000
Subject:

---
 doc/bugs/Comments_dissapeared.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/bugs/Comments_dissapeared.mdwn

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
new file mode 100644
index 000000000..f71a442b8
--- /dev/null
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -0,0 +1,9 @@
+Although I have comments enabled and I have been using them successfully for ages now, I've come to notice that they have stopped working in the last week or two.
+
+I am running version 3.20100312 with the following configuration:
+
+<http://static.natalian.org/2010-03-27/natalian.txt>
+
+In my (HTML5 modified page.tmpl) it doesn't seem to enter the "TMPL_IF COMMENTS" block anymore. I tried the stock page.tmpl and they didn't seem to work either, so the variable name hasn't changed has it?
+
+Any other ideas? With thanks,
-- 
cgit v1.2.3


From 0d07bca315d19e6e957072004393138db6f33d3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 17:17:07 -0400
Subject: fix printing of $@, which is clobbered by the call to gettext

problem reported by viric
---
 IkiWiki/Setup/Automator.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index e9a572450..38e0d4422 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -124,9 +124,10 @@ sub import (@) {
 				IkiWiki::run_hooks(checkconfig => sub { shift->() });
 			};
 			if ($@) {
+				my $err=$@;
 				print STDERR sprintf(gettext("** Disabling plugin %s, since it is failing with this message:"),
 					$plugin)."\n";
-				print STDERR "$@\n";
+				print STDERR "$err\n";
 				push @{$bakconfig{disable_plugins}}, $plugin;
 			}
 		}
-- 
cgit v1.2.3


From a1f50f6a31d4e9f7acd6f8d445e5fb39edba5138 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 17:37:42 -0400
Subject: response

---
 doc/bugs/Comments_dissapeared.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index f71a442b8..b737d9bef 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -7,3 +7,9 @@ I am running version 3.20100312 with the following configuration:
 In my (HTML5 modified page.tmpl) it doesn't seem to enter the "TMPL_IF COMMENTS" block anymore. I tried the stock page.tmpl and they didn't seem to work either, so the variable name hasn't changed has it?
 
 Any other ideas? With thanks,
+
+	comments_pagespec => 'archives/* and !*/Discussion',
+
+> Your setup file only allows comments to pages under archives. That 
+> seems unlikely to be right, so I guess it is causing your problem.
+> --[[Joey]] 
-- 
cgit v1.2.3


From 7e9d1932a2b90d5092315c18603cf495da28d6da Mon Sep 17 00:00:00 2001
From: "http://schors.livejournal.com/" <http://schors.livejournal.com/@web>
Date: Sun, 28 Mar 2010 22:01:53 +0000
Subject:

---
 doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn

diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
new file mode 100644
index 000000000..6ad7975eb
--- /dev/null
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
@@ -0,0 +1,2 @@
+When build wrapper on FreeBSD system, is error occured with clearenv reference. clearenv() das not exists at FreeBSD system, use workaround environ[0]=NULL;
+P.S. new git instalation, FreeBSD 7.x
-- 
cgit v1.2.3


From 0c6e467aa6931ec6bd7720ecaea5e33aeca4d1be Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 18:27:23 -0400
Subject: use __TINYC__ define to avoid tinyc compat fixes breaking FreeBSD

To review, tcc does not really use environ, so you have to use clearenv
there. But POSIX, in their wisdom, didn't standardise clearenv yet,
so on FreeBSD, one still needs to manipulate environ on their own.

(If you use tcc on FreeBSD, this may leave you unsatisfied.)
---
 IkiWiki/Wrapper.pm                             | 6 ++++++
 doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index f175b4a0b..3f3e63ca6 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -101,6 +101,7 @@ EOF
 #include <string.h>
 #include <sys/file.h>
 
+extern char **environ;
 char *newenviron[$#envsave+6];
 int i=0;
 
@@ -121,12 +122,17 @@ $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 
+#ifdef __TINYC__
 	if (clearenv() != 0) {
 		perror("clearenv");
 		exit(1);
 	}
 	for (; i>0; i--)
 		putenv(newenviron[i-1]);
+#else
+	newenviron[i]=NULL;
+	environ=newenviron;
+#endif
 
 	if (setregid(getegid(), -1) != 0 &&
 	    setregid(getegid(), -1) != 0) {
diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
index 6ad7975eb..c2355d6aa 100644
--- a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
@@ -1,2 +1,5 @@
 When build wrapper on FreeBSD system, is error occured with clearenv reference. clearenv() das not exists at FreeBSD system, use workaround environ[0]=NULL;
 P.S. new git instalation, FreeBSD 7.x
+
+> #include <stupid-standards.h> fixed with nasty ifdefs to handle tcc w/o
+> breaking everything else. ||done]] --[[Joey]] 
-- 
cgit v1.2.3


From 6d04e182c4f4f44da37725444a540851fd36ba13 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 18:36:37 -0400
Subject: formatting

---
 doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
index c2355d6aa..ac82541a3 100644
--- a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
@@ -1,5 +1,5 @@
 When build wrapper on FreeBSD system, is error occured with clearenv reference. clearenv() das not exists at FreeBSD system, use workaround environ[0]=NULL;
 P.S. new git instalation, FreeBSD 7.x
 
-> #include <stupid-standards.h> fixed with nasty ifdefs to handle tcc w/o
+> `#include <stupid-standards.h>` fixed with nasty ifdefs to handle tcc w/o
 > breaking everything else. ||done]] --[[Joey]] 
-- 
cgit v1.2.3


From 15164671ceeed70f25cbfe53d81143eb5b13c863 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 18:37:00 -0400
Subject: formatting

---
 doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
index ac82541a3..f38c86e03 100644
--- a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
@@ -2,4 +2,4 @@ When build wrapper on FreeBSD system, is error occured with clearenv reference.
 P.S. new git instalation, FreeBSD 7.x
 
 > `#include <stupid-standards.h>` fixed with nasty ifdefs to handle tcc w/o
-> breaking everything else. ||done]] --[[Joey]] 
+> breaking everything else. [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 1de069338de86dd6e785d9771140b2b687100451 Mon Sep 17 00:00:00 2001
From: "http://schors.livejournal.com/" <http://schors.livejournal.com/@web>
Date: Sun, 28 Mar 2010 22:43:24 +0000
Subject:

---
 doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn

diff --git a/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
new file mode 100644
index 000000000..61964539d
--- /dev/null
+++ b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
@@ -0,0 +1,5 @@
+If i intsall perl modules in my custom directory, cgi wrapper can't find them. I found clearing enviroment variables in code  of wrapper. But information about custom directories put to perl with PERL5LIB variable.
+
+Workaround: add newenviron variable PERL5LIB
+
+My additional question - what wrapper do? I'am russian hosting provider. I am interesting with ikiwiki.
-- 
cgit v1.2.3


From 02e6ec9dd2c5e1e260a1f18406942059fe3d2064 Mon Sep 17 00:00:00 2001
From: "http://schors.livejournal.com/" <http://schors.livejournal.com/@web>
Date: Sun, 28 Mar 2010 22:47:17 +0000
Subject:

---
 doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn

diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn
new file mode 100644
index 000000000..713198b61
--- /dev/null
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn
@@ -0,0 +1 @@
+Mmmm... i see. But it not setup under FreeBSD without magic manual passes.
-- 
cgit v1.2.3


From 911533655186f7c43ac229a4cdbc5be3e7f80d49 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 18:49:15 -0400
Subject: response

---
 README                                                 |  2 +-
 doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/README b/README
index a4dc0d641..7efc59a51 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ All other documentation is in the ikiwiki documentation wiki, which is also
 available online at <http://ikiwiki.info/>
 
 
-A few special variables you can set while using the Makefile:
+A few special variables you can set while using the Makefile.PL:
 
   PROFILE=1 turns on profiling for the build of the doc wiki.
   (Uses Devel::NYTProf)
diff --git a/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
index 61964539d..9804d86c5 100644
--- a/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
+++ b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
@@ -3,3 +3,14 @@ If i intsall perl modules in my custom directory, cgi wrapper can't find them. I
 Workaround: add newenviron variable PERL5LIB
 
 My additional question - what wrapper do? I'am russian hosting provider. I am interesting with ikiwiki.
+
+> The wrapper allows ikiwiki to run as the user who owns the wiki, which
+> is generally not the same as the user that runs the web server.
+> (It also handles some other things, like some locking.)
+> 
+> As a suid program, the wrapper cannot safely let environment variables
+> pass through.
+> 
+> If you want to install ikiwiki's perl modules in a nonstandard location,
+> you can set `INSTALL_BASE` when running `Makefile.PL`. ikiwiki will then
+> be built to look in that location. --[[Joey]]  [[!tag done]]
-- 
cgit v1.2.3


From 6e7bfbe7bb8ba4b94d0e8c203b2117477b217384 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 19:23:34 -0400
Subject: auto-blog.setup: Set tagbase by default, since most bloggers will
 want it.

Also modified first_post page to use a tag format that will work whether
or not tagbase is set.
---
 auto-blog.setup                         | 1 +
 debian/changelog                        | 1 +
 doc/examples/blog/posts/first_post.mdwn | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/auto-blog.setup b/auto-blog.setup
index 7ff413187..95347167f 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -48,4 +48,5 @@ IkiWiki::Setup::Automator->import(
 	blogspam_pagespec => "postcomment(*)",
 	discussion => 0,
 	locked_pages => "*",
+	tagbase => "tags",
 )
diff --git a/debian/changelog b/debian/changelog
index 57406c6d3..2d82c4dba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
     that could lead to bad dependency handling in certian situations.
   * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
     if necessary for unusual install.
+  * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index d49432341..7f814fbb1 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,4 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
 
-[[!tag tags/tech]]
+[[!tag ./tags/tech]]
-- 
cgit v1.2.3


From b6666f5ac81ef4c8646a6290cf5c885adf0e385f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 19:28:48 -0400
Subject: fix tag

Actually, tags can't be made to work with and w/o tagbase, so just make it
assume tagbase is set. Better example anyway.

(It'll be a broken link on ikiwiki.info though.)
---
 doc/examples/blog/posts/first_post.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index 7f814fbb1..f2729fcef 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,4 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
 
-[[!tag ./tags/tech]]
+[[!tag tech]]
-- 
cgit v1.2.3


From 799b93d258bad917262ac160df74136f05d4a451 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 20:23:22 -0400
Subject: don't check $@ after pagespec_translate

pagespec_translate may set $@ if it fails to parse a pagespec, but
due to memoization, this is not reliable. If a memoized call is repeated,
and $@ is already set for some other reason previously, it will remain
set through the call to pagespec_translate.

Instead, just check if pagespec_translate returns undef.
---
 IkiWiki.pm        | 9 ++++-----
 IkiWiki/Render.pm | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 927d62940..6739ba56c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1796,7 +1796,7 @@ sub add_depends ($$;$) {
 
 	# Add explicit dependencies for influences.
 	my $sub=pagespec_translate($pagespec);
-	return if $@;
+	return unless defined $sub;
 	foreach my $p (keys %pagesources) {
 		my $r=$sub->($p, location => $page);
 		my $i=$r->influences;
@@ -2001,7 +2001,7 @@ sub pagespec_match ($$;@) {
 
 	my $sub=pagespec_translate($spec);
 	return IkiWiki::ErrorReason->new("syntax error in pagespec \"$spec\"")
-		if $@ || ! defined $sub;
+		if ! defined $sub;
 	return $sub->($page, @params);
 }
 
@@ -2019,7 +2019,7 @@ sub pagespec_match_list ($$;@) {
 
 	my $sub=pagespec_translate($pagespec);
 	error "syntax error in pagespec \"$pagespec\""
-		if $@ || ! defined $sub;
+		if ! defined $sub;
 
 	my @candidates;
 	if (exists $params{list}) {
@@ -2092,8 +2092,7 @@ sub pagespec_match_list ($$;@) {
 sub pagespec_valid ($) {
 	my $spec=shift;
 
-	my $sub=pagespec_translate($spec);
-	return ! $@;
+	return defined pagespec_translate($spec);
 }
 
 sub glob2re ($) {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index af24df155..abafb0887 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -565,7 +565,7 @@ sub render_dependent ($$$$$$$) {
 		if (exists $depends{$p} && ! defined $reason) {
 			foreach my $dep (keys %{$depends{$p}}) {
 				my $sub=pagespec_translate($dep);
-				next if $@ || ! defined $sub;
+				next unless defined $sub;
 
 				# only consider internal files
 				# if the page explicitly depends
-- 
cgit v1.2.3


From ae4e9b25b714b02ed7003a21da781fccf9475f38 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Mon, 29 Mar 2010 08:15:43 +0000
Subject:

---
 doc/bugs/Comments_dissapeared.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index b737d9bef..ad1638236 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -13,3 +13,8 @@ Any other ideas? With thanks,
 > Your setup file only allows comments to pages under archives. That 
 > seems unlikely to be right, so I guess it is causing your problem.
 > --[[Joey]] 
+
+That's the only place where I want comments. <http://natalian.org/archives/>
+Has the pagespec changed? Is it `archives/*/*` or something like that?
+
+It worked just fine with this configuration. I swear I have not modified it. :) -- [[Kai Hendry]]
-- 
cgit v1.2.3


From 263d9548969dcdf9a6add96f46fe03ba7701a1ca Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 29 Mar 2010 14:58:21 +0100
Subject: ping joey: consider patch for next release?

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 99a9cf1e2..be66db99d 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -183,3 +183,5 @@ definitions essentially.
 >>> ikiwiki for the break, and now I've returned to watching recentchanges.
 >>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have
 >>> you had a chance to look at this yet? -- [[Jon]]
+>>>> Ping :) Hi.  [[Joey]], would you consider this patch for the next
+>>>> ikiwiki release? -- [[Jon]]
-- 
cgit v1.2.3


From 891238e075f0c4716ec8f51d5832745b0348ab77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 11:54:18 -0400
Subject: add warning messages about bzr and mercurial hooks that are not
 correctly setup

---
 IkiWiki/Setup/Automator.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 38e0d4422..402212150 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -72,9 +72,11 @@ sub import (@) {
 		}
 		elsif ($config{rcs} eq 'bzr') {
 			# TODO
+			print STDERR "warning: do not know how to set up the bzr_wrapper hook!\n";
 		}
 		elsif ($config{rcs} eq 'mercurial') {
 			# TODO
+			print STDERR "warning: do not know how to set up the mercurial_wrapper hook!\n";
 		}
 		elsif ($config{rcs} eq 'cvs') {
 			$config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
-- 
cgit v1.2.3


From 97898ce585b36dbcb0a83356ef3e54c41d369437 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 12:16:53 -0400
Subject: review, multiple concerns

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 46 ++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 99a9cf1e2..e4638f94b 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -36,6 +36,30 @@ definitions essentially.
 >> I've made may not be acceptable, though -- I'd appreciate someone providing
 >> some feedback on that hunk!
 
+>>> Well, re that hunk, taint checking is currently disabled, but
+>>> if the perl bug that disallows it is fixed and it is turned back on,
+>>> the hash values will remain tainted, which will probably lead to
+>>> problems.
+>>>
+>>> I'm also leery of using such a complex data structure in config.
+>>> The websetup plugin would be hard pressed to provide a UI for such a
+>>> data structure. (It lacks even UI for a single hash ref yet, let alone
+>>> a list.)
+>>> 
+>>> Also, it seems sorta wrong to have two so very different syntaxes to 
+>>> represent the same meta data. A user without a lot of experience will
+>>> be hard pressed to map from a directive to this in the setup file.
+>>>
+>>> All of which leads me to think the setup file could just contain
+>>> a text that could hold meta directives. Which generalizes really to
+>>> a text that contains any directives, and is, perhaps appended to the
+>>> top of every page. Which nearly generalizes to the sidebar plugin,
+>>> or perhaps something more general than that... 
+>>>
+>>> However, excessive generalization is the root of all evil, so 
+>>> I'm not necessarily saying that's a good idea. Indeed, my memory
+>>> concerns below invalidate this idea pretty well. --[[Joey]] 
+
     diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
     index 6fe9cda..2f8c098 100644
     --- a/IkiWiki/Plugin/meta.pm
@@ -125,6 +149,10 @@ definitions essentially.
 >> are only relevant to defined fields that you wouldn't want to specify a
 >> global default for anyway.
 >>
+>>> I generally agree with this. It is *possible* that meta would have a new
+>>> field added, that takes parameters and make sense to use globally.
+>>> --[[Joey]] 
+>>
 >> Due to this, and the added complexity of the second patch (having to adjust
 >> `IkiWiki/Setup.pm`), I think the first patch makes more sense. I've thus
 >> reverted to it here.
@@ -183,3 +211,21 @@ definitions essentially.
 >>> ikiwiki for the break, and now I've returned to watching recentchanges.
 >>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have
 >>> you had a chance to look at this yet? -- [[Jon]]
+
+>>> For this to work with websetup and --dumpsetup, it needs to define the
+>>> `meta_*` settings in the getsetup function.
+>>>
+>>> I also have some concerns about both these patches, since both throw
+>>> a lot of redundant data at meta, which then stores it in a very redundant
+>>> way. Specifically, meta populates a per-page `%metaheaders` hash
+>>> as well as storing per-page metadata in `%pagestate`. So, if you have
+>>> a wiki with a thousand pages, and you add a 1k site-wide license text,
+>>> that will bloat the memory usage of ikiwiki by in excess of 2
+>>> megabytes. It will also cause ikiwiki to write a similar amount more data
+>>> to its state file which has to be loaded back in each
+>>> run.
+>>>
+>>> Seems that this could be managed much more efficiently by having
+>>> meta special-case the site-wide settings, not store them in these
+>>> per-page data structures, and just make them be used if no per-page
+>>> metadata of the given type is present. --[[Joey]]
-- 
cgit v1.2.3


From 7a8bcf2a6745d570bf9055df7b0390f9a9ca8a0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 12:19:22 -0400
Subject: fix bogus math

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 704cb2c64..01cf12c1a 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -222,7 +222,7 @@ definitions essentially.
 >>> a lot of redundant data at meta, which then stores it in a very redundant
 >>> way. Specifically, meta populates a per-page `%metaheaders` hash
 >>> as well as storing per-page metadata in `%pagestate`. So, if you have
->>> a wiki with a thousand pages, and you add a 1k site-wide license text,
+>>> a wiki with 10 thousand pages, and you add a 1k site-wide license text,
 >>> that will bloat the memory usage of ikiwiki by in excess of 2
 >>> megabytes. It will also cause ikiwiki to write a similar amount more data
 >>> to its state file which has to be loaded back in each
-- 
cgit v1.2.3


From e466d11fd363b4758bc4f624ff73664d89891f9e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 13:17:32 -0400
Subject: add warning about incomplete tla support

---
 IkiWiki/Setup/Automator.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 402212150..2dcb424e5 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -78,6 +78,10 @@ sub import (@) {
 			# TODO
 			print STDERR "warning: do not know how to set up the mercurial_wrapper hook!\n";
 		}
+		elsif ($config{rcs} eq 'tla') {
+			# TODO
+			print STDERR "warning: do not know how to set up the tla_wrapper hook!\n";
+		}
 		elsif ($config{rcs} eq 'cvs') {
 			$config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
 		}
-- 
cgit v1.2.3


From 3e192a4c4a2e80ce35ce35d5edc9afd6b2373f83 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 13:17:49 -0400
Subject: add a table summarizing state of each rcs plugin

---
 doc/rcs.mdwn  | 23 ++++++++++++++++++++---
 docwiki.setup |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index f66b85495..cd41e7f49 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -7,10 +7,27 @@ Ikiwiki started out supporting only [[Subversion|svn]], but the interface
 ikiwiki uses to a revision control system is sufficiently simple and
 generic that it can be adapted to work with many systems by writing a
 [[plugin|plugins/write]]. [[Subversion|svn]] is still a recommended choice;
-[[git]] is another well-tested option.
+[[git]] is another well-tested option. 
 
-These are all the supported revision control systems:
-[[!inline pages="rcs/* and !*/Discussion and !rcs/details" archive=yes]]
+While all supported revision control systems work well enough for basic use,
+some advanced or special features are not supported in all of them.
+Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
+set up a wiki using that revision control system. The `rcs_commit_staged`
+hook is needed to use [[plugins/attachments]] or [[plugins/comments]]. And so
+on. The table below summarises this for each revision control system and links
+to more information about each.
+
+[[!table data="""
+feature             |[[git]]|[[svn]]|[[bzr]]   |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]]   |[[cvs]]
+[[ikiwiki-makerepo]]|yes    |yes    |yes       |yes         |yes          |yes      |no        |yes
+auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes      |incomplete|yes
+`rcs_commit_staged` |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
+`rcs_rename`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
+`rcs_remove`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
+`rcs_diff`          |yes    |yes    |yes       |yes         |no           |yes      |yes       |yes
+anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
+conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
+"""]]
 
 There is a page with [[details]] about how the different systems work with
 ikiwiki, for the curious.
diff --git a/docwiki.setup b/docwiki.setup
index 86f012c50..8278b73ea 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -16,5 +16,5 @@ use IkiWiki::Setup::Standard {
 	userdir => "users",
 	usedirs => 0,
 	prefix_directives => 1,
-	add_plugins => [qw{goodstuff version haiku polygen fortune}],
+	add_plugins => [qw{goodstuff version haiku polygen fortune table}],
 }
-- 
cgit v1.2.3


From 6798a80acab43ce9b6869dea7236887faebc19e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 13:18:49 -0400
Subject: fix link

---
 doc/rcs.mdwn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index cd41e7f49..4e7a8d2a6 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -9,13 +9,13 @@ generic that it can be adapted to work with many systems by writing a
 [[plugin|plugins/write]]. [[Subversion|svn]] is still a recommended choice;
 [[git]] is another well-tested option. 
 
-While all supported revision control systems work well enough for basic use,
-some advanced or special features are not supported in all of them.
+While all supported revision control systems work well enough for basic
+use, some advanced or special features are not supported in all of them.
 Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
 set up a wiki using that revision control system. The `rcs_commit_staged`
-hook is needed to use [[plugins/attachments]] or [[plugins/comments]]. And so
-on. The table below summarises this for each revision control system and links
-to more information about each.
+hook is needed to use [[attachments|plugins/attachment]] or
+[[plugins/comments]]. And so on. The table below summarises this for each
+revision control system and links to more information about each.
 
 [[!table data="""
 feature             |[[git]]|[[svn]]|[[bzr]]   |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]]   |[[cvs]]
-- 
cgit v1.2.3


From 68c67efeffd0f51e01cd557722632367f0dc3849 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 13:27:50 -0400
Subject: clarify example with whitespace

---
 doc/ikiwiki/directive/table.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ikiwiki/directive/table.mdwn b/doc/ikiwiki/directive/table.mdwn
index e27a94b7c..2dac97724 100644
--- a/doc/ikiwiki/directive/table.mdwn
+++ b/doc/ikiwiki/directive/table.mdwn
@@ -6,8 +6,8 @@ or DSV (delimiter-separated values) format.
 ## examples
 
 	\[[!table data="""
-	Customer|Amount
-	Fulanito|134,34
+	Customer |Amount
+	Fulanito |134,34
 	Menganito|234,56
 	Menganito|234,56
 	"""]]
-- 
cgit v1.2.3


From aa116d67ab315dcc3e2150bb080958753df5dfca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 13:37:16 -0400
Subject: update

---
 debian/changelog | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d82c4dba..5ec52d3c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.
-  * openid: Use Openid Simple Registration or OpenID Attribute Exchange
-    to get the user's email address and username.
   * Improve openid url munging; do not display anchors and cgi parameters,
     as used by yahoo and google urls.
   * Add complete German basewiki and directives translation done by
@@ -12,7 +10,6 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
     wiki source files, such as .htaccess, that would normally be skipped
     for security or other reasons. Closes: #447267
     (Thanks to Aaron Wilson for the original patch.)
-  * Allow wrappers to be built using tcc.
   * Add support for setup files written in YAML.
   * Add --set-yaml switch for setting more complex config file options.
   * filecheck: Fix bugs that prevented the pagespecs from matching when
@@ -22,6 +19,10 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
     if necessary for unusual install.
   * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
+  * Allow wrappers to be built using tcc. (Workaround #452876)
+  * openid: Use Openid Simple Registration or OpenID Attribute Exchange
+    to get the user's email address and username. (Neither is yet
+    used, but they are available in the session object now.)
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
-- 
cgit v1.2.3


From 675e34527f56021ce39e56e4288e8f0e32b36cfa Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Mon, 29 Mar 2010 19:59:40 +0100
Subject: thanks for the review, patch to be revised

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 01cf12c1a..7129a44ac 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -232,3 +232,6 @@ definitions essentially.
 >>> meta special-case the site-wide settings, not store them in these
 >>> per-page data structures, and just make them be used if no per-page
 >>> metadata of the given type is present. --[[Joey]]
+
+>>>> Thanks for the review - these are all valid points. I'll get working
+>>>> on a revised patch. -- [[Jon]]
-- 
cgit v1.2.3


From 0b63800df32fd6e5287a253ca01a099f79b77e6e Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Mon, 29 Mar 2010 20:00:56 +0100
Subject: this sounds like the correct approach

---
 doc/todo/more_flexible_inline_postform.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/more_flexible_inline_postform.mdwn b/doc/todo/more_flexible_inline_postform.mdwn
index bc8bc0809..414476bd7 100644
--- a/doc/todo/more_flexible_inline_postform.mdwn
+++ b/doc/todo/more_flexible_inline_postform.mdwn
@@ -16,3 +16,8 @@ logical first step towards doing comment-like things with inlined pages).
 > Perhaps what we need is a `postform` plugin/directive that inline depends
 > on (automatically enables); its preprocess method could automatically be
 > invoked from preprocess_inline when needed. --[[smcv]]
+
+>> I've been looking at this stuff again. I think you are right, this would
+>> be the right approach. The comments plugin could use it similarly, allowing
+>> sites which desire it to have an inline comment submission form on all
+>> pages with comments enabled. I'm going to take a look. -- [[Jon]]
-- 
cgit v1.2.3


From b2890b4e8ff0dc0e0fbaed1ffd9848c48dedf611 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 15:25:34 -0400
Subject: response

---
 doc/bugs/Comments_dissapeared.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index ad1638236..ac297028c 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -18,3 +18,13 @@ That's the only place where I want comments. <http://natalian.org/archives/>
 Has the pagespec changed? Is it `archives/*/*` or something like that?
 
 It worked just fine with this configuration. I swear I have not modified it. :) -- [[Kai Hendry]]
+
+> No changes that I can think of. 'archives/*' will match *all* pages under
+> archives. Anyway, I can see in your site's rss feed that comments are
+> enabled for posts, since they have comments tags there. And
+> in fact I see comments on eg
+> <http://natalian.org/archives/2010/03/25/BBC_News_complaints/>.
+> 
+> So I suspect you have simply not rebuilt your wiki after making some
+> change that fixed the comments, and so only newer pages are getting them.
+> --[[Joey]]
-- 
cgit v1.2.3


From 1c751e882ef2fe68bc4601dc5e927c4813f09706 Mon Sep 17 00:00:00 2001
From: "http://gustaf.thorslund.org/" <http://gustaf.thorslund.org/@web>
Date: Mon, 29 Mar 2010 21:54:30 +0000
Subject:

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 289937121..379285a49 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -59,6 +59,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[roktas]] `git://github.com/roktas/ikiwiki.git`
 * [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki`
   ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
+* [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 8de983dd07a462eeb997b730c5729c6f598ae452 Mon Sep 17 00:00:00 2001
From: "http://gustaf.thorslund.org/" <http://gustaf.thorslund.org/@web>
Date: Mon, 29 Mar 2010 22:07:27 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index b40fd461d..633400f21 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -142,6 +142,7 @@ Personal sites and blogs
 * [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
+* [Gustaf Thorslund's blog](http://blog.thorslund.org)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 386e464188d817f90e1cb6535da2db6bcfaa3fa0 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 30 Mar 2010 05:31:10 +0000
Subject: quick response

---
 doc/plugins/contrib/field/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index fc1759fab..4bb285a50 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -9,6 +9,10 @@ with IkiWiki's use of `<TMPL_VAR AUTHOR>` for the author of the *page*
 `<TMPL_VAR FIELD_AUTHOR>` or something? (For those who want the current
 behaviour, an auxiliary plugin would be easy.)
 
+> No, please.  The idea is to be *able* to override field names if one wishes to, and choose, for yourself, non-colliding field names if one wishes not to.  I don't wish to lose the power of being able to, say, define a page title with YAML format if I want to, or to write a site-specific plugin which calculates a page title, or other nifty things.
+>It's not like one is going to lose the fields defined by the meta plugin; if "author" is defined by \[[!meta author=...]] then that's what will be found by "field" (provided the "meta" plugin is registered; that's what the "field_register" option is for).
+>--[[KathrynAndersen]]
+
 From a coding style point of view, the `$CamelCase` variable names aren't
 IkiWiki style, and the `match_foo` functions look as though they could benefit
 from being thin wrappers around a common `&IkiWiki::Plugin::field::match`
@@ -17,6 +21,8 @@ function (see `meta` for a similar approach).
 I think the documentation would probably be clearer in a less manpage-like
 and more ikiwiki-like style?
 
+> I don't think ikiwiki *has* a "style" for docs, does it?  So I followed the Perl Module style. And I'm rather baffled as to why having the docs laid out in clear sections... make them less clear. --[[KathrynAndersen]]
+
 If one of my branches from [[todo/allow_plugins_to_add_sorting_methods]] is
 accepted, a `field()` cmp type would mean that [[plugins/contrib/report]] can
 stop reimplementing sorting. Here's the implementation I'm using, with
-- 
cgit v1.2.3


From 2d1e4cce45024f6b2c384eaf7b5276c448cb3a05 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 30 Mar 2010 05:38:31 +0000
Subject: response

---
 doc/plugins/contrib/ftemplate/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index eb2ec6f13..adb66ee6a 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -7,7 +7,11 @@ hooks (probably easiest to just patch `template` to implement a
 second directive, or have a special parameter `run_hooks="yes"`,
 or something).
 
+> I got the impression that `pagetemplate` hooks are intended to be completely independent of `template` variables; page-template is for the actual `page.tmpl` template, while `template` is for other templates which are used inside the page content.  So I don't understand why one would need a run_hooks option. --[[KathrynAndersen]]
+
 Another missing thing is that `ftemplate` looks in
 the "system" templates directories, not just in the wiki, but that
 seems orthogonal (and might be a good enhancement to `template` anyway).
 --[[smcv]]
+
+> Yes, I added that because I wanted the option of not having to make all my templates work as wiki pages also. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From a284d5fa0aed7778130f95c9883fe8815ecf37b6 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Tue, 30 Mar 2010 05:48:51 +0000
Subject: update home page URL

---
 doc/users/schmonz.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index 7ebd8311c..03c52b6aa 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -1,3 +1,3 @@
-[Amitai Schlair](http://www.columbia.edu/~ays2105/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing:
+[Amitai Schlair](http://www.netbsd.org/~schmonz/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing:
 
 [[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"]]
-- 
cgit v1.2.3


From 90c444d9f197a5a9b87d3e70248279ac68e351a6 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 30 Mar 2010 06:44:04 +0000
Subject: response

---
 doc/plugins/contrib/report/discussion.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index 918d0779b..42a1009cb 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -18,6 +18,17 @@ removing the special case for `field`.
 Perhaps the `headers` thing could migrate into inline somehow? That might
 lead to making inline too big, though.
 
+> I think inline is *already* too big, honestly. --[[KathrynAndersen]]
+
 Is the intention that the `trail` part is a performance hack, or a way
 to select pages? How does it relate to [[todo/wikitrails]] or
 [[plugins/contrib/trail]]? --[[smcv]]
+
+> The `trail` part is *both* a performance hack, and a way to select pages.  I have over 5000 pages on my site, I need all the performance hacks I can get.
+> For the performance hack, it is a way of reducing the need to iterate through every single page in the wiki in order to find matching pages.
+> For the way-to-select-pages, yes, it is intended to be similar to [[todo/wikitrails]] and [[plugins/contrib/trail]] (and will be more similar with the new release which will be happening soon; it will add prev_* and next_* variables).
+> The idea is that, rather than having to add special "trail" links on PageA to indicate that a page is part of the trail,
+> it takes advantage of the `%links` hash, which already contains, for each page, an array of the links from that page to other pages.  No need for special markup, just use what's there; a trail is defined as "all the pages linked to from page X", and since it's an array, it has an order already.
+> But to avoid that being too limiting, one can use a `pages=...` pagespec to filter that list to a subset; only the pages one is interested in.
+> And one can also sort it, if one so desires.
+> --[[KathrynAndersen]] 
-- 
cgit v1.2.3


From f673ce266c8dadb263c6850cc5f7d3e6e7a68e70 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:01:35 +0000
Subject: feature request (part of ftemplate)

---
 doc/todo/user-defined_templates_outside_the_wiki.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/todo/user-defined_templates_outside_the_wiki.mdwn

diff --git a/doc/todo/user-defined_templates_outside_the_wiki.mdwn b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
new file mode 100644
index 000000000..880ad6493
--- /dev/null
+++ b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
@@ -0,0 +1,8 @@
+[[!tag wishlist]]
+
+The [[plugins/contrib/ftemplate]] plugin looks for templates inside the wiki
+source, but also looks in the system templates directory (the one with
+`page.tmpl`). This means the wiki admin can provide templates that can be
+invoked via `\[[!template]]`, but don't have to "work" as wiki pages in their
+own right. I think the normal [[plugins/template]] plugin could benefit from
+this functionality.
-- 
cgit v1.2.3


From 026355cfa24dc911a247dcafca10c6ea74ae515b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:09:59 +0000
Subject: respond and attempt to invoke Joey :-)

---
 doc/plugins/contrib/ftemplate/discussion.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index adb66ee6a..de4b35ef0 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -9,9 +9,24 @@ or something).
 
 > I got the impression that `pagetemplate` hooks are intended to be completely independent of `template` variables; page-template is for the actual `page.tmpl` template, while `template` is for other templates which are used inside the page content.  So I don't understand why one would need a run_hooks option. --[[KathrynAndersen]]
 
+>> `Render`, `inline`, `comments` and `recentchanges` run `pagetemplate`
+>> hooks, as does anything that uses `IkiWiki::misctemplate`. From that
+>> quick survey, it seems as though `template` is the only thing that
+>> uses `HTML::Template` but *doesn't* run `pagetemplate` hooks?
+>>
+>> It just seems strange to me that `field` needs to have its own
+>> of `template` (this), its own variant of `inline` (`report`),
+>> and so on - I'd tend to lean more towards having `field`
+>> enhance the existing plugins. I'm not an ikiwiki committer,
+>> mind... Joey, your opinion would be appreciated! --[[smcv]]
+
 Another missing thing is that `ftemplate` looks in
 the "system" templates directories, not just in the wiki, but that
 seems orthogonal (and might be a good enhancement to `template` anyway).
 --[[smcv]]
 
 > Yes, I added that because I wanted the option of not having to make all my templates work as wiki pages also. --[[KathrynAndersen]]
+
+>> Yeah, that's something that annoys me about `template` too. I've
+>> opened a todo: [[todo/user-defined_templates_outside_the_wiki]].
+>> --s
-- 
cgit v1.2.3


From 0503bf7c8824d941b26da4c91b4ee1f721fcf54c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:10:40 +0000
Subject:

---
 doc/plugins/contrib/ftemplate/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index de4b35ef0..6a1d9f685 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -15,7 +15,7 @@ or something).
 >> uses `HTML::Template` but *doesn't* run `pagetemplate` hooks?
 >>
 >> It just seems strange to me that `field` needs to have its own
->> of `template` (this), its own variant of `inline` (`report`),
+>> variant of `template` (this), its own variant of `inline` (`report`),
 >> and so on - I'd tend to lean more towards having `field`
 >> enhance the existing plugins. I'm not an ikiwiki committer,
 >> mind... Joey, your opinion would be appreciated! --[[smcv]]
-- 
cgit v1.2.3


From edcea2b98100aa1ff18b91038a33e2ea55f13850 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:27:18 +0000
Subject: respond

---
 doc/plugins/contrib/report/discussion.mdwn | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index 42a1009cb..a6cb6f8bd 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -20,6 +20,13 @@ lead to making inline too big, though.
 
 > I think inline is *already* too big, honestly. --[[KathrynAndersen]]
 
+>> A fair point; perhaps my complaint should be that *inline* does
+>> too many orthogonal things. I suppose the headers feature wouldn't
+>> really make sense in an inline that didn't have `archive="yes"`,
+>> so it'd make sense to recommend this plugin as a replacement
+>> for inlining with archive=yes (for which I now realise "inline"
+>> is the wrong verb anyway :-) ) --s
+
 Is the intention that the `trail` part is a performance hack, or a way
 to select pages? How does it relate to [[todo/wikitrails]] or
 [[plugins/contrib/trail]]? --[[smcv]]
@@ -32,3 +39,18 @@ to select pages? How does it relate to [[todo/wikitrails]] or
 > But to avoid that being too limiting, one can use a `pages=...` pagespec to filter that list to a subset; only the pages one is interested in.
 > And one can also sort it, if one so desires.
 > --[[KathrynAndersen]] 
+
+>> That's an interesting approach to trails; I'd missed the fact that
+>> links are already ordered.
+>>
+>> This does have the same problems as tags, though: see
+>> [[bugs/tagged()_matching_wikilinks]] and
+>> [[todo/matching_different_kinds_of_links]]. I suppose the question
+>> now is whether new code should be consistent with `tag` (and
+>> potentially be fixed at the same time as tag itself), or try to
+>> avoid those problems?
+>>
+>> The combination of `trail` with another pagespec in this plugin
+>> does provide a neat way for it to work around having unwanted
+>> pages in the report, by limiting by a suitable tag or subdirectory
+>> or something. --s
-- 
cgit v1.2.3


From bb8b941bfc3d3564324a23bba14dc8112d8ea6c7 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:48:03 +0000
Subject: respond; correct license of fieldsort plugin to match IkiWiki

---
 doc/plugins/contrib/field/discussion.mdwn | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 4bb285a50..7e94a4029 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -13,6 +13,19 @@ behaviour, an auxiliary plugin would be easy.)
 >It's not like one is going to lose the fields defined by the meta plugin; if "author" is defined by \[[!meta author=...]] then that's what will be found by "field" (provided the "meta" plugin is registered; that's what the "field_register" option is for).
 >--[[KathrynAndersen]]
 
+>> Hmm. I suppose if you put the title (or whatever) in the YAML, then
+>> "almost" all the places in IkiWiki that respect titles will do the
+>> right thing due to the pagetemplate hook, with the exception being
+>> anything that has special side-effects inside `meta` (like `date`),
+>> or anything that looks in `$pagestate{foo}{meta}` directly
+>> (like `map`). Is your plan that `meta` should register itself by
+>> default, and `map` and friends should be adapted to
+>> work based on `getfield()` instead of `$pagestate{foo}{meta}`, then?
+>>
+>> (On the site I mentioned, I'm using an unmodified version of `field`,
+>> and currently working around the collision by tagging books' pages
+>> with `bookauthor` instead of `author` in the YAML.) --s
+
 From a coding style point of view, the `$CamelCase` variable names aren't
 IkiWiki style, and the `match_foo` functions look as though they could benefit
 from being thin wrappers around a common `&IkiWiki::Plugin::field::match`
@@ -23,13 +36,20 @@ and more ikiwiki-like style?
 
 > I don't think ikiwiki *has* a "style" for docs, does it?  So I followed the Perl Module style. And I'm rather baffled as to why having the docs laid out in clear sections... make them less clear. --[[KathrynAndersen]]
 
+>> I keep getting distracted by the big shouty headings :-)
+>> I suppose what I was really getting at was that when this plugin
+>> is merged, its docs will end up split between its plugin
+>> page, [[plugins/write]] and [[ikiwiki/PageSpec]]; on some of the
+>> contrib plugins I've added I've tried to separate the docs
+>> according to how they'll hopefully be laid out after merge. --s
+
 If one of my branches from [[todo/allow_plugins_to_add_sorting_methods]] is
 accepted, a `field()` cmp type would mean that [[plugins/contrib/report]] can
 stop reimplementing sorting. Here's the implementation I'm using, with
 your "sortspec" concept (a sort-hook would be very similar): if merged,
 I think it should just be part of `field` rather than a separate plugin.
 
-	# Copyright © 2010 Simon McVittie, released under GNU LGPL >= 2.1
+	# Copyright © 2010 Simon McVittie, released under GNU GPL >= 2
 	package IkiWiki::Plugin::fieldsort;
 	use warnings;
 	use strict;
-- 
cgit v1.2.3


From 35fcc2ec8f1d3a3048d99a568df645607a99fbf1 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Wed, 31 Mar 2010 00:21:58 +0000
Subject:

---
 doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn

diff --git a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
new file mode 100644
index 000000000..6f742ff70
--- /dev/null
+++ b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
@@ -0,0 +1,4 @@
+[[!table format=dsv delimiter="\t" data="""
+1	2
+2	4
+"""]]
-- 
cgit v1.2.3


From 66ecf1dba5d0aca59affd30029fe14ad5e3efc94 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Wed, 31 Mar 2010 00:24:22 +0000
Subject:

---
 doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
index 6f742ff70..b407255aa 100644
--- a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
+++ b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
@@ -1,3 +1,5 @@
+Table directive should support tab-delimited data, especially important since this is the format you will get if copy/pasting from an HTML table or spreadsheet (Gnumeric, OO Calc, Excel). Test case which fails:
+
 [[!table format=dsv delimiter="\t" data="""
 1	2
 2	4
-- 
cgit v1.2.3


From 7f63763a30e774e9a10bd1416f157dd2b3e2e69b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 31 Mar 2010 02:07:52 +0000
Subject: they do work, with the right syntax (C backslash escapes aren't
 interpreted)

---
 doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
index b407255aa..278826ea0 100644
--- a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
+++ b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
@@ -4,3 +4,17 @@ Table directive should support tab-delimited data, especially important since th
 1	2
 2	4
 """]]
+
+> They do work, but C-style backslash escapes aren't recognised,
+> so the syntax `delimiter="\t"` (as in your test case) looks
+> for the literal string `\t`. Replacing `\t` with a literal
+> tab character makes it work - here's a test (I changed the data
+> to make the table layout more obvious):
+>
+> [[!table format=dsv delimiter="	" data="""
+left	2
+2	right
+alpha	beta
+"""]]
+>
+> So, I think this can be considered [[not_a_bug|done]]? --[[smcv]]
-- 
cgit v1.2.3


From fc5445b90677489642e4ae8d5b2f6c54cdd847c5 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 31 Mar 2010 03:01:41 +0000
Subject: response

---
 doc/plugins/contrib/ftemplate/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index 6a1d9f685..eb84dd09b 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -20,6 +20,8 @@ or something).
 >> enhance the existing plugins. I'm not an ikiwiki committer,
 >> mind... Joey, your opinion would be appreciated! --[[smcv]]
 
+>>> I did it that way basically because I needed the functionality ASAP, and I didn't want to step on anyone's toes, so I made them as separate plugins.  If Joey wants to integrate the functionality into IkiWiki proper, I would be very happy, but I don't want to put pressure on him. --[[KathrynAndersen]]
+
 Another missing thing is that `ftemplate` looks in
 the "system" templates directories, not just in the wiki, but that
 seems orthogonal (and might be a good enhancement to `template` anyway).
-- 
cgit v1.2.3


From 4dcea6207d03fcdc25bc1c172d69c30673b7254a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 31 Mar 2010 17:51:46 -0400
Subject: page.tmpl: Add Cache-Control must-revalidate to ensure that users
 (especially of Firefox) see fresh page content.

Since Firefox version 3, it's done aggressive caching of visited pages, and
does not, by default, check if the cached content is still valid when
reloading or revisiting a page. By default, Firefox seems to not re-contact
the web server at all. Compare with eg, Epiphany and Chromium, which appear
to always check, and get back a 304 when the page is unchanged.

This header makes Firefox do the right thing, at least for html files. It
still over-caches if css, javascript, images, etc, are changed.
---
 debian/changelog    | 2 ++
 templates/page.tmpl | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5ec52d3c0..bbca7cffe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * openid: Use Openid Simple Registration or OpenID Attribute Exchange
     to get the user's email address and username. (Neither is yet
     used, but they are available in the session object now.)
+  * page.tmpl: Add Cache-Control must-revalidate to ensure that users
+    (especially of Firefox) see fresh page content.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 968066a19..c24f88823 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -3,6 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Cache-Control" content="must-revalidate" />
 <title><TMPL_VAR TITLE></title>
 <TMPL_IF NAME="FAVICON">
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
-- 
cgit v1.2.3


From 4eed0abc8c181a027fa802d209fd95d8c10ee9f0 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 1 Apr 2010 00:23:31 +0000
Subject: response; thoughts about inline and tags

---
 doc/plugins/contrib/report/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index a6cb6f8bd..953509297 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -27,6 +27,8 @@ lead to making inline too big, though.
 >> for inlining with archive=yes (for which I now realise "inline"
 >> is the wrong verb anyway :-) ) --s
 
+>>> I think *inline* would be a bit less unwieldy if there was some way of factoring out the feed stuff into a separate plugin, but I don't know if that's possible. --K.A.
+
 Is the intention that the `trail` part is a performance hack, or a way
 to select pages? How does it relate to [[todo/wikitrails]] or
 [[plugins/contrib/trail]]? --[[smcv]]
@@ -54,3 +56,7 @@ to select pages? How does it relate to [[todo/wikitrails]] or
 >> does provide a neat way for it to work around having unwanted
 >> pages in the report, by limiting by a suitable tag or subdirectory
 >> or something. --s
+
+>>> Either that, or somehow combine tagging with fields, such that one could declare a tag, and it would create both a link and a field with a given value.  (I've been working on something like that, but it still has bugs).
+>>> That way, the test for whether something is tagged would be something like "link(tag/foo) and field(tag foo)".
+>>> --K.A.
-- 
cgit v1.2.3


From 63bc057690d388a81e643d4556c6a001d886b59c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 1 Apr 2010 01:35:35 +0000
Subject:

---
 doc/plugins/contrib/report/discussion.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index 953509297..a257198c0 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -60,3 +60,10 @@ to select pages? How does it relate to [[todo/wikitrails]] or
 >>> Either that, or somehow combine tagging with fields, such that one could declare a tag, and it would create both a link and a field with a given value.  (I've been working on something like that, but it still has bugs).
 >>> That way, the test for whether something is tagged would be something like "link(tag/foo) and field(tag foo)".
 >>> --K.A.
+
+>>>> I can see that this'd work well for 1:1 relationships like next
+>>>> and previous, but I don't think that'd work for pages with more than
+>>>> one tag - as far as I can see, `field`'s data model is that each
+>>>> page has no more than one value for each field?
+>>>> [[todo/Matching_different_kinds_of_links]] has some thoughts about
+>>>> how it could be implemented, though. --s
-- 
cgit v1.2.3


From a682df9a1f14ea873c7103f80108330840a15cd0 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 1 Apr 2010 07:22:37 +0000
Subject: considering tags and fields

---
 doc/plugins/contrib/report/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index a257198c0..e23a4ced4 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -67,3 +67,9 @@ to select pages? How does it relate to [[todo/wikitrails]] or
 >>>> page has no more than one value for each field?
 >>>> [[todo/Matching_different_kinds_of_links]] has some thoughts about
 >>>> how it could be implemented, though. --s
+
+>>>>> You have a point there.  I'm not sure what would be better: to add the concept of arrays/sets to `field`, or to think of tags as a special case.  Problem is, I find tags as they currently exist to be too limiting.  I prefer something that can be used for Faceted Tagging <http://en.wikipedia.org/wiki/Faceted_classification>; that is, things like Author:Fred Nurk, Genre:Historical, Rating:Good, and so on.  Of course, that doesn't mean that each tag is limited to only one value, either; just to take the above examples, something might have more than one author, or have multiple genres (such as Historical + Romance).
+
+>>>>> It might be that adding arrays to the `field` plugin is a good way to go: after all, even though field=value is the most common, with the flexibility of things like YAML, one could define all sorts of things.  What I'm not so sure about is how to return the values when queried, since some things would be expecting scalars all the time.  Ah, perhaps I could use wantarray?
+>>>>> Is there a way of checking a HTML::Template template to see if it expecting an array for a particular value?
+>>>>> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 3c9cd4f156018aea3d10dbf02be529e85c05eb66 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 1 Apr 2010 18:13:38 +0100
Subject: Explain tab-delimited tables a bit better

---
 doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn | 2 ++
 doc/ikiwiki/directive/table.mdwn                   | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
index 278826ea0..39d57a4fe 100644
--- a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
+++ b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
@@ -18,3 +18,5 @@ alpha	beta
 """]]
 >
 > So, I think this can be considered [[not_a_bug|done]]? --[[smcv]]
+
+>> I've clarified the documentation. --[[smcv]]
diff --git a/doc/ikiwiki/directive/table.mdwn b/doc/ikiwiki/directive/table.mdwn
index 2dac97724..a6692f92c 100644
--- a/doc/ikiwiki/directive/table.mdwn
+++ b/doc/ikiwiki/directive/table.mdwn
@@ -42,4 +42,9 @@ cells. For example:
   as the table header. Set it to "no" to make a table without a header, or
   "column" to make the first column be the header.
 
+For tab-delimited tables (often obtained by copying and pasting from HTML
+or a spreadsheet), `delimiter` must be set to a literal tab character. These
+are difficult to type in most web browsers - copying and pasting one from
+the table data is likely to be the easiest way.
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From a7ef2204dc36777f847e282f57299d93342a8ad6 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 1 Apr 2010 23:40:37 +0000
Subject: implemented!

---
 doc/todo/matching_different_kinds_of_links.mdwn | 51 +++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 26c5a072b..0049281fe 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -36,6 +36,11 @@ Besides pagespecs, the `rel=` attribute could be used for styles. --Ivan Z.
 > normal links.) Might be better to go ahead and add the variable to
 > core though. --[[Joey]] 
 
+>> I've implemented this with the data structure you suggested, except that
+>> I called it `%typedlinks` instead of `%linktype` (it seemed to make more
+>> sense that way). I also ported `tag` to it, and added a `tagged_is_strict`
+>> config option. See below! --[[smcv]]
+
 I saw somewhere else here some suggestions for the wiki-syntax for specifying the relation name of a link. One more suggestion---[the syntax used in Semantic MediaWiki](http://en.wikipedia.org/wiki/Semantic_MediaWiki#Basic_usage), like this:
 
 <pre>
@@ -45,3 +50,49 @@ I saw somewhere else here some suggestions for the wiki-syntax for specifying th
 So a part of the effect of [[`\[[!taglink TAG\]\]`|plugins/tag]] could be represented as something like `\[[tag::TAG]]` or (more understandable relation name in what concerns the direction) `\[[tagged::TAG]]`.
 
 I don't have any opinion on this syntax (whether it's good or not)...--Ivan Z.
+
+-------
+
+>> [[!template id=gitbranch author="[[Simon_McVittie|smcv]]" branch=smcv/link-types]]
+>> [[!tag patch]]
+
+## Documentation for smcv's branch
+
+### added to [[ikiwiki/pagespec]]
+
+* "`typedlink(type glob)`" - matches pages that link to a given page (or glob)
+  with a given link type. Plugins can create links with a specific type:
+  for instance, the tag plugin creates links of type `tag`.
+
+### added to [[plugins/tag]]
+
+If the `tagged_is_strict` config option is set, `tagged()` will only match
+tags explicitly set with [[ikiwiki/directive/tag]] or
+[[ikiwiki/directive/taglink]]; if not (the default), it will also match
+any other [[WikiLinks|ikiwiki/WikiLink]] to the tag page.
+
+### added to [[plugins/write]]
+
+#### `%typedlinks`
+
+The `%typedlinks` hash records links of specific types. Do not modify this
+hash directly; call `add_link()`. The keys are page names, and the values
+are hash references. In each page's hash reference, the keys are link types
+defined by plugins, and the values are hash references with link targets
+as keys, and 1 as a dummy value, something like this:
+
+	$typedlinks{"foo"} = {
+		tag => { short_word => 1, metasyntactic_variable => 1 },
+		next_page => { bar => 1 },
+	};
+
+Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in
+`%typedlinks`.
+
+#### `add_link($$;$)`
+ 
+ This adds a link to `%links`, ensuring that duplicate links are not
+ added. Pass it the page that contains the link, and the link text.
+ 
+An optional third parameter sets the link type (`undef` produces an ordinary
+[[ikiwiki/WikiLink]]).
-- 
cgit v1.2.3


From 93024e5193e01904b9e9688a4553d24cee23c490 Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:00:46 +0000
Subject:

---
 doc/forum.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index 19ca9ed0b..f4c8bbee4 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit the
-[[bugs]] and [[todo]] pages.
+Note that for more formal bug reports or todo items, you can also edit [http://custom-paper-writing.com/editing-services service essays] the
+[[bugs]] and [[todo]] [http://essaywritingservices.org/book-report.php book report help] pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From c7bccf3a2a23486fc4a2d0923d95c34554e0b087 Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:01:24 +0000
Subject:

---
 doc/forum.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index f4c8bbee4..958238f8a 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit [http://custom-paper-writing.com/editing-services service essays] the
-[[bugs]] and [[todo]] [http://essaywritingservices.org/book-report.php book report help] pages.
+Note that for more formal bug reports or todo items, you can also edit [[http://custom-paper-writing.com/editing-services service essays]] the
+[[bugs]] and [[todo]] [[http://essaywritingservices.org/book-report.php book report help]] pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From 1587e38fd4c4083a3d25e2c613c74c07530a344c Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:03:58 +0000
Subject:

---
 doc/forum.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index 958238f8a..6febfa374 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit [[http://custom-paper-writing.com/editing-services service essays]] the
-[[bugs]] and [[todo]] [[http://essaywritingservices.org/book-report.php book report help]] pages.
+Note that for more formal bug reports or todo items, you can also edit [[service essays http://custom-paper-writing.com/editing-services]] the
+[[bugs]] and [[todo]] [[ book report help http://essaywritingservices.org/book-report.php]] pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From cad194a2eeeaa2226fb9bd60c3f38861b1d6663e Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:05:18 +0000
Subject:

---
 doc/forum.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index 6febfa374..2e766c4e4 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit [[service essays http://custom-paper-writing.com/editing-services]] the
-[[bugs]] and [[todo]] [[ book report help http://essaywritingservices.org/book-report.php]] pages.
+Note that for more formal bug reports or todo items, you can also edit [service essays](http://custom-paper-writing.com/editing-services) the
+[[bugs]] and [[todo]] [book report help](http://essaywritingservices.org/book-report.php) pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From 7f488c70123890aa7f9ca86184c177f6c037eae1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 2 Apr 2010 13:07:22 +0100
Subject: Despam

---
 doc/forum.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index 2e766c4e4..19ca9ed0b 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit [service essays](http://custom-paper-writing.com/editing-services) the
-[[bugs]] and [[todo]] [book report help](http://essaywritingservices.org/book-report.php) pages.
+Note that for more formal bug reports or todo items, you can also edit the
+[[bugs]] and [[todo]] pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From e71a912f0c64b1eb6ead8242868da6f5a9606c8b Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:07:42 +0000
Subject:

---
 doc/shortcuts.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 54dd0fdb1..179cb89e6 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -49,7 +49,9 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
 * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
 * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
-* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]
+* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] 
+* [custom writing company](http://essaywritingservices.org/custom-essay-writing.php) 
+* [certified resume writer](http://cvresumewriters.com/onlineresume.php)
 * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
-- 
cgit v1.2.3


From e0074b91c7d1a44c468bdbf554cbef07434b7dfe Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:18:36 +0000
Subject:

---
 doc/shortcuts.mdwn | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 179cb89e6..f33dfb6b6 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -49,9 +49,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
 * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
 * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
-* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] 
-* [custom writing company](http://essaywritingservices.org/custom-essay-writing.php) 
-* [certified resume writer](http://cvresumewriters.com/onlineresume.php)
+* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]  
 * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
@@ -67,13 +65,13 @@ This page controls what shortcut links the wiki supports.
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
 text passed to the named shortcut, after [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text. The optional
+it, and '%S' is replaced with the raw, non-encoded text [custom writing company](http://essaywritingservices.org/custom-essay-writing.php). The optional
 `desc` parameter controls the description of the link.
 
 Remember that the `name` you give the shortcut will become a new
 [[ikiwiki/directive]].  Avoid using a `name` that conflicts
 with an existing directive.  These directives also accept a `desc`
-parameter that will override the one provided at definition time.
+parameter that will override [certified resume writer](http://cvresumewriters.com/onlineresume.php) the one provided at definition time.
 
 If you come up with a shortcut that you think others might find useful,
 consider contributing it to the [shortcuts page on the ikiwiki
-- 
cgit v1.2.3


From caa397b768c1fa4fda800ae0e86c10ac07b316a3 Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:24:14 +0000
Subject:

---
 doc/security.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/security.mdwn b/doc/security.mdwn
index 21aef316b..a06f3a37f 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -376,7 +376,7 @@ parties.
 Cross Site Request Forging could be used to constuct a link that would
 change a logged-in user's password or other preferences if they clicked on
 the link. It could also be used to construct a link that would cause a wiki
-page to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
+page [order essay](http://custom-paper-writing.com/order) to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
 
 These holes were discovered on 10 April 2008 and fixed the same day with
 the release of ikiwiki 2.42. A fix was also backported to Debian etch, as
@@ -415,7 +415,7 @@ can cause it to crash. This can potentially be used for a denial of service
 attack.
 
 intrigeri discovered this problem on 12 Nov 2008 and a patch put in place
-later that day, in version 2.70. The fix was backported to testing as version
+later that day, in version 2.70. The fix was backported [write my essay](http://custom-essay-writing-service.org/faq.php) to testing as version
 2.53.3, and to stable as version 1.33.7.
 
 ## Insufficient blacklisting in teximg plugin
-- 
cgit v1.2.3


From bb99202474de4cb655d50a4f82b77b67e8445e5c Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:26:46 +0000
Subject:

---
 doc/features.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 3925d78ef..c119dae97 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -125,7 +125,7 @@ yours when you commit.
 In the rare cases where automatic merging fails due to the same part of a
 page being concurrently edited, regular commit conflict markers are
 shown in the file to resolve the conflict, so if you're already familiar
-with that there's no new commit marker syntax to learn.
+with that there's no new commit [order essays](http://custom-paper-writing.com/order) marker syntax to learn.
 
 ### [[RecentChanges]], editing pages in a web browser
 
@@ -158,7 +158,7 @@ since page edit controls can be changed via plugins.
 
 ### [[PageHistory]]
 
-Well, sorta. Rather than implementing YA history browser, it can link to
+Well, sorta. Rather than implementing YA history browser [essay writing companies](http://essaywritingservices.org/custom-essay-writing.php), it can link to
 [[ViewVC]] or the like to browse the history of a wiki page.
 
 ### Full text search
-- 
cgit v1.2.3


From 0c1a1185c1957c161adda779d719d7ddca2d5021 Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:29:22 +0000
Subject:

---
 doc/setup.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 2d4da5536..4ad64d73b 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -105,7 +105,7 @@ After making changes to this file, you need to tell ikiwiki to use it:
 ## Customizing file locations
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,
-and outputs the files to a destination directory. The source directory is
+and outputs the files to a destination directory [write my essay](http://custom-essay-writing-service.org/faq.php). The source directory is
 a working copy checked out from the version control system repository.
 
 When you used `auto.setup`, ikiwiki put the source directory, destination
@@ -118,7 +118,7 @@ First, move the destination directory and repository around.
 	% mv public_html/foo /srv/web/foo.com
 	% mv foo.git /srv/git/foo.git
 
-If you moved the repository to a new location, checkouts pointing at the
+If you moved the repository to a new location [buy reports](http://essaywritingservices.org/book-report.php), checkouts pointing at the
 old location won't work, and the easiest way to deal with this is to delete
 them and re-checkout from the new repository location.
    
-- 
cgit v1.2.3


From 05b6e8ceee2bec4442727e2475abf8a8861d5e0a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 2 Apr 2010 18:28:34 +0100
Subject: Despam, again. Someone ban adrianna please?

---
 doc/features.mdwn  | 4 ++--
 doc/security.mdwn  | 4 ++--
 doc/setup.mdwn     | 4 ++--
 doc/shortcuts.mdwn | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/features.mdwn b/doc/features.mdwn
index c119dae97..3925d78ef 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -125,7 +125,7 @@ yours when you commit.
 In the rare cases where automatic merging fails due to the same part of a
 page being concurrently edited, regular commit conflict markers are
 shown in the file to resolve the conflict, so if you're already familiar
-with that there's no new commit [order essays](http://custom-paper-writing.com/order) marker syntax to learn.
+with that there's no new commit marker syntax to learn.
 
 ### [[RecentChanges]], editing pages in a web browser
 
@@ -158,7 +158,7 @@ since page edit controls can be changed via plugins.
 
 ### [[PageHistory]]
 
-Well, sorta. Rather than implementing YA history browser [essay writing companies](http://essaywritingservices.org/custom-essay-writing.php), it can link to
+Well, sorta. Rather than implementing YA history browser, it can link to
 [[ViewVC]] or the like to browse the history of a wiki page.
 
 ### Full text search
diff --git a/doc/security.mdwn b/doc/security.mdwn
index a06f3a37f..21aef316b 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -376,7 +376,7 @@ parties.
 Cross Site Request Forging could be used to constuct a link that would
 change a logged-in user's password or other preferences if they clicked on
 the link. It could also be used to construct a link that would cause a wiki
-page [order essay](http://custom-paper-writing.com/order) to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
+page to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
 
 These holes were discovered on 10 April 2008 and fixed the same day with
 the release of ikiwiki 2.42. A fix was also backported to Debian etch, as
@@ -415,7 +415,7 @@ can cause it to crash. This can potentially be used for a denial of service
 attack.
 
 intrigeri discovered this problem on 12 Nov 2008 and a patch put in place
-later that day, in version 2.70. The fix was backported [write my essay](http://custom-essay-writing-service.org/faq.php) to testing as version
+later that day, in version 2.70. The fix was backported to testing as version
 2.53.3, and to stable as version 1.33.7.
 
 ## Insufficient blacklisting in teximg plugin
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 4ad64d73b..2d4da5536 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -105,7 +105,7 @@ After making changes to this file, you need to tell ikiwiki to use it:
 ## Customizing file locations
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,
-and outputs the files to a destination directory [write my essay](http://custom-essay-writing-service.org/faq.php). The source directory is
+and outputs the files to a destination directory. The source directory is
 a working copy checked out from the version control system repository.
 
 When you used `auto.setup`, ikiwiki put the source directory, destination
@@ -118,7 +118,7 @@ First, move the destination directory and repository around.
 	% mv public_html/foo /srv/web/foo.com
 	% mv foo.git /srv/git/foo.git
 
-If you moved the repository to a new location [buy reports](http://essaywritingservices.org/book-report.php), checkouts pointing at the
+If you moved the repository to a new location, checkouts pointing at the
 old location won't work, and the easiest way to deal with this is to delete
 them and re-checkout from the new repository location.
    
diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index f33dfb6b6..54dd0fdb1 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -49,7 +49,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
 * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
 * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
-* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]  
+* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]
 * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
@@ -65,13 +65,13 @@ This page controls what shortcut links the wiki supports.
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
 text passed to the named shortcut, after [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text [custom writing company](http://essaywritingservices.org/custom-essay-writing.php). The optional
+it, and '%S' is replaced with the raw, non-encoded text. The optional
 `desc` parameter controls the description of the link.
 
 Remember that the `name` you give the shortcut will become a new
 [[ikiwiki/directive]].  Avoid using a `name` that conflicts
 with an existing directive.  These directives also accept a `desc`
-parameter that will override [certified resume writer](http://cvresumewriters.com/onlineresume.php) the one provided at definition time.
+parameter that will override the one provided at definition time.
 
 If you come up with a shortcut that you think others might find useful,
 consider contributing it to the [shortcuts page on the ikiwiki
-- 
cgit v1.2.3


From 104919ee07b70b166c6c6be13b4f6e5bc5225179 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 16:05:14 -0400
Subject: htmlscrubber: Allow colons in url fragments after '?'

Colons are not allowed at the start of urls, because it can be interpreted
as a protocol, and allowing arbitrary protocols can be unsafe
(CVE-2008-0809). However, this check was too restrictive, not allowing
use of eg, "video.ogv?t=0:03:00/0:04:00" to seek to a given place in a
video, or "somecgi?foo=bar:baz" to pass parameters with colons.

It's still not allowed to have a filename with a colon in it (ie
"foo:bar.png") -- to link to such a file, a fully qualified url must be
used.
---
 IkiWiki/Plugin/htmlscrubber.pm | 2 +-
 debian/changelog               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 26e18ffc7..9f40c752f 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -32,7 +32,7 @@ sub import {
 	);
 	# data is a special case. Allow a few data:image/ types,
 	# but disallow data:text/javascript and everything else.
-	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|\/))/i;
+	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i;
 }
 
 sub getsetup () {
diff --git a/debian/changelog b/debian/changelog
index bbca7cffe..adf0dfed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
     used, but they are available in the session object now.)
   * page.tmpl: Add Cache-Control must-revalidate to ensure that users
     (especially of Firefox) see fresh page content.
+  * htmlscrubber: Allow colons in urls after '?'
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
-- 
cgit v1.2.3


From 1c8ac7d88c5a3d2c63892737e54be8a1b535936c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 16:41:04 -0400
Subject: review from the woods

---
 doc/todo/matching_different_kinds_of_links.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 0049281fe..20acdde49 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -96,3 +96,22 @@ Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in
  
 An optional third parameter sets the link type (`undef` produces an ordinary
 [[ikiwiki/WikiLink]]).
+
+> Some code refers to `oldtypedlinks`, and other to `oldlinktypes`.
+> 
+> I'm curious what your reasoning was for adding a new variable
+> rather than using `pagestate`. Was it only because you needed
+> the `old` version to detect change, or was there other complexity?
+> 
+> I have not convinced myself this is a real problem, but..
+> If a page has a typed link, there seems to be no way to tell
+> if it also has a separate, regular link. `add_link` will add
+> to `@links` when adding a typed, or untyped link. If only untyped
+> links were recorded there, one could tell the difference. But then
+> typed links would not show up at all in eg, a linkmap,
+> unless it was changed to check for typed links too.
+> (Or, regular links could be recorded in typedlinks too,
+> with a empty type. (Bloaty.))
+> 
+> I suspect we could get away without having `tagged_is_strict`
+> without too much transitional trouble. --[[Joey]]
-- 
cgit v1.2.3


From 59ba938822ba0752e8d97e769c0d14f2eb0bbeb3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 16:54:06 -0400
Subject: template: Search for templates in the templatedir, if they are not
 found as pages in the wiki.

---
 IkiWiki/Plugin/template.pm                            | 10 ++++++++--
 debian/changelog                                      |  2 ++
 doc/templates.mdwn                                    |  6 ++++++
 doc/todo/user-defined_templates_outside_the_wiki.mdwn |  2 ++
 doc/wikitemplates.mdwn                                |  6 ++++--
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 3e024c5f8..36282055a 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -37,7 +37,13 @@ sub preprocess (@) {
 	my $template_page="templates/$params{id}";
 	add_depends($params{page}, $template_page);
 
-	my $template_file=$pagesources{$template_page};
+	my $template_file;
+	if (exists $pagesources{$template_page}) {
+		$template_file=srcfile($pagesources{$template_page});
+	}
+	else {
+		$template_file=template_file("$params{id}.tmpl")
+	}
 	return sprintf(gettext("template %s not found"),
 		htmllink($params{page}, $params{destpage}, "/".$template_page))
 			unless defined $template_file;
@@ -50,7 +56,7 @@ sub preprocess (@) {
 	                        $$text_ref=&Encode::decode_utf8($$text_ref);
 				chomp $$text_ref;
 	                },
-	                filename => srcfile($template_file),
+	                filename => $template_file,
        			die_on_bad_params => 0,
 			no_includes => 1,
 			blind_cache => 1,
diff --git a/debian/changelog b/debian/changelog
index adf0dfed6..362ba54ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * page.tmpl: Add Cache-Control must-revalidate to ensure that users
     (especially of Firefox) see fresh page content.
   * htmlscrubber: Allow colons in urls after '?'
+  * template: Search for templates in the templatedir, if they are not
+    found as pages in the wiki.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index eff0e15e9..07531ae98 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -43,6 +43,12 @@ page will provide a link that can be used to create the template. The template
 is a regular wiki page, located in the `templates/` subdirectory inside
 the source directory of the wiki.
 
+(Alternatively, templates can be stored in a directory outside the wiki,
+as files with the extension ".tmpl".
+By default, these are searched for in `/usr/share/ikiwiki/templates`;
+the `templatedir` setting can be used to make another directory be searched
+first.)
+
 The template uses the syntax used by the [[!cpan HTML::Template]] perl
 module, which allows for some fairly complex things to be done. Consult its
 documentation for the full syntax, but all you really need to know are a
diff --git a/doc/todo/user-defined_templates_outside_the_wiki.mdwn b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
index 880ad6493..1d72aa6a7 100644
--- a/doc/todo/user-defined_templates_outside_the_wiki.mdwn
+++ b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
@@ -6,3 +6,5 @@ source, but also looks in the system templates directory (the one with
 invoked via `\[[!template]]`, but don't have to "work" as wiki pages in their
 own right. I think the normal [[plugins/template]] plugin could benefit from
 this functionality.
+
+[[done]] --[[Joey]] 
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index 6c0480cea..6e5a7261d 100644
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -5,7 +5,8 @@ to learn.
 The aim is to keep almost all html out of ikiwiki and in the templates.
 
 It ships with some basic templates which can be customised. These are
-located in /usr/share/ikiwiki/templates by default.
+located in `/usr/share/ikiwiki/templates` by default; the `templatedir`
+setting can be used to make another directory be searched first.
 
 * `page.tmpl` - Used for displaying all regular wiki pages.
 * `misc.tmpl` - Generic template used for any page that doesn't
@@ -43,7 +44,8 @@ The [[plugins/pagetemplate]] plugin can allow individual pages to use a
 different template than `page.tmpl`.
 
 The [[plugins/template]] plugin also uses templates, though those
-[[templates]] are stored in the wiki and inserted into pages.
+[[templates]] are typically stored as pages in the wiki, and are inserted
+into pages.
 
 The [[plugins/edittemplate]] plugin is used to make new pages default to
 containing text from a template, which can be filled as out the page is
-- 
cgit v1.2.3


From f7a2a4b4d4f1868878e8ad294e9641d8adb51aef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 16:55:29 -0400
Subject: qualify template_file

---
 IkiWiki/Plugin/template.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 36282055a..98a13b5fa 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -42,7 +42,7 @@ sub preprocess (@) {
 		$template_file=srcfile($pagesources{$template_page});
 	}
 	else {
-		$template_file=template_file("$params{id}.tmpl")
+		$template_file=IkiWiki::template_file("$params{id}.tmpl")
 	}
 	return sprintf(gettext("template %s not found"),
 		htmllink($params{page}, $params{destpage}, "/".$template_page))
-- 
cgit v1.2.3


From de62ea1cc8111dd96bc84b9c839be99c921168e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 17:03:33 -0400
Subject: fix branch name

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index f37a0758e..8edc95fb9 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -104,7 +104,7 @@ An optional `sort` parameter will be used preferentially when
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
 
-## Documentation from sort-hooks branch
+## Documentation from sort-package branch
 
 The changes to [[ikiwiki/pagespec/sorting]] are the same.
 The changes to [[plugins/write]] are replaced by:
-- 
cgit v1.2.3


From 1b0d4e8d885ded59ca0ad1b4d1ca1315585cce06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 17:16:12 -0400
Subject: minor comment

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 8edc95fb9..e4e1829dc 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -89,6 +89,9 @@ and to sort by an arbitrary `meta` value, you could use:
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
   full title was set.
 
+  > I feel it sould be clearer to call that "sortas", since "sort=" is used
+  > to specify a sort method in other directives. --[[Joey]]
+
 ### Multiple sort orders (added to [[ikiwiki/pagespec/sorting]])
 
 In addition, you can combine several sort orders and/or reverse the order of
-- 
cgit v1.2.3


From 9e7dcefd7ed9424de20706f63c7bab5182c5df78 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 17:26:32 -0400
Subject: comments

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index e4e1829dc..67d85f6f8 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -50,6 +50,21 @@ NIH'd sorting mechanisms:
 >>> share the `IkiWiki::PageSpec` package, but with a `cmp_` prefix. Gitweb:
 >>> <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-package>
 
+>>>> I agree it seems more elegant, so I have focused on it.
+>>>>
+>>>> I don't know about reusing `IkiWiki::PageSpec` for this.
+>>>>
+>>>> I would be inclined to drop the `check_` stuff.
+>>>>
+>>>> Wouldn't it make sense to have `meta(title)` instead
+>>>> of `meta_title`?
+>>>>
+>>>> As I read the regexp in `cmpspec_translate`, the "command"
+>>>> is required to have params. They should be optional, 
+>>>> to match the documentation and because most sort methods
+>>>> do not need parameters.
+>>>> --[[Joey]]
+
 ## Documentation from sort-hooks branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 1faf9b08e16bde9b4b0d72620fcef79c715e64de Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 17:37:38 -0400
Subject: idea

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 67d85f6f8..e1e05e81c 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -63,6 +63,14 @@ NIH'd sorting mechanisms:
 >>>> is required to have params. They should be optional, 
 >>>> to match the documentation and because most sort methods
 >>>> do not need parameters.
+>>>>
+>>>> I wonder if it would make sense to add some combining keywords, so
+>>>> a sortspec reads like `sort="age then ascending title"`
+>>>> In a way, this reduces the amount of syntax that needs to be learned.
+>>>> I like the "then" (and it could allow other operations than
+>>>> simple combination, if any others make sense). Not so sure about the
+>>>> "ascending", which could be "reverse" instead, but "descending age" and
+>>>> "ascending age" both seem useful to be able to explicitly specify.
 >>>> --[[Joey]]
 
 ## Documentation from sort-hooks branch
-- 
cgit v1.2.3


From 2c7fe7ae2cf73141eba817d4275d9a6a897df8a8 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 2 Apr 2010 22:25:16 +0000
Subject: respond (also unindent Joey's review to avoid very deep indentation)

---
 doc/todo/matching_different_kinds_of_links.mdwn | 61 +++++++++++++++++--------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 20acdde49..f8796652e 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -97,21 +97,46 @@ Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in
 An optional third parameter sets the link type (`undef` produces an ordinary
 [[ikiwiki/WikiLink]]).
 
-> Some code refers to `oldtypedlinks`, and other to `oldlinktypes`.
-> 
-> I'm curious what your reasoning was for adding a new variable
-> rather than using `pagestate`. Was it only because you needed
-> the `old` version to detect change, or was there other complexity?
-> 
-> I have not convinced myself this is a real problem, but..
-> If a page has a typed link, there seems to be no way to tell
-> if it also has a separate, regular link. `add_link` will add
-> to `@links` when adding a typed, or untyped link. If only untyped
-> links were recorded there, one could tell the difference. But then
-> typed links would not show up at all in eg, a linkmap,
-> unless it was changed to check for typed links too.
-> (Or, regular links could be recorded in typedlinks too,
-> with a empty type. (Bloaty.))
-> 
-> I suspect we could get away without having `tagged_is_strict`
-> without too much transitional trouble. --[[Joey]]
+## Review
+
+Some code refers to `oldtypedlinks`, and other to `oldlinktypes`. --[[Joey]]
+
+> Oops, I'll fix that. That must mean missing test coverage, too :-(
+> --s
+
+I'm curious what your reasoning was for adding a new variable
+rather than using `pagestate`. Was it only because you needed
+the `old` version to detect change, or was there other complexity?
+--J
+
+> You seemed to be more in favour of adding it to the core in
+> your proposal above, so I assumed that'd be more likely to be
+> accepted :-) I don't mind one way or the other - `%typedlinks`
+> costs one core variable, but saves one level of hash nesting. If
+> you're not sure either, then I think the decision should come down
+> to which one is easier to document clearly - I'm still unhappy with
+> my docs for `%typedlinks`, so I'll try to write docs for it as
+> `pagestate` and see if they work any better. --s
+
+I have not convinced myself this is a real problem, but..
+If a page has a typed link, there seems to be no way to tell
+if it also has a separate, regular link. `add_link` will add
+to `@links` when adding a typed, or untyped link. If only untyped
+links were recorded there, one could tell the difference. But then
+typed links would not show up at all in eg, a linkmap,
+unless it was changed to check for typed links too.
+(Or, regular links could be recorded in typedlinks too,
+with a empty type. (Bloaty.)) --J
+
+> I think I like the semantics as-is - I can't think of any
+> reason why you'd want to ask the question "does A link to B,
+> not counting tags and other typed links?". A typed link is
+> still a link, in my mind at least. --s
+
+I suspect we could get away without having `tagged_is_strict`
+without too much transitional trouble. --[[Joey]]
+
+> If you think so, I can delete about 5 LoC. I don't particularly
+> care either way; [[Jon]] expressed concern about people relying
+> on the current semantics, on one of the pages requesting this
+> change. --s
-- 
cgit v1.2.3


From 011fe920d162924876170d167be11dc64cf8be2f Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:00:53 +0000
Subject: respond at some length

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 163 ++++++++++++---------
 1 file changed, 94 insertions(+), 69 deletions(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index e1e05e81c..156678da7 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -1,4 +1,3 @@
-[[!template id=gitbranch branch=smcv/sort-hooks author="[[Simon_McVittie|smcv]]"]]
 [[!tag patch]]
 
 The available [[ikiwiki/pagespec/sorting]] methods are currently hard-coded in
@@ -11,36 +10,13 @@ title over the page name, but for compatibility, I'm not going to (I do wonder
 whether it would be worth making sort=name an alias for the current sort=title,
 and changing the meaning of sort=title in 4.0, though).
 
-Gitweb:
-<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks>
+*[sort-hooks branch now withdrawn in favour of sort-package --s]*
 
 I briefly tried to turn *all* the current sort types into hook functions, and
 have some of them pre-registered, but decided that probably wasn't a good idea.
 That earlier version of the branch is also available for comparison:
 
-<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks-excessive>
-
-(The older version is untested, and probably doesn't really work as-is - I
-misunderstood the details of how the built-in function `sort` works when using
-`$a` and `$b`. The newer version has been tested, and has a regression test for
-its core functionality.)
-
-This hook *isn't* (yet) sufficient to implement [[plugins/contrib/report]]'s
-NIH'd sorting mechanisms:
-
-* `report` can sort by any [[plugins/contrib/field]], whereas this one has a
-  finite number of hooks: if the `field` plugin's functionality is desirable,
-  perhaps parameterized sort mechanisms similar to pagespec match functions
-  would be useful? Then the `field` plugin could register
-  `hook(type => "sort", id => "field")` and you could have
-  `\[[!inline ... sort="field(Mood)"]]` or something?
-
-* `report` can sort by multiple criteria, with independent direction-changing:
-  if this is desirable, perhaps `pagespec_match_list` could be enhanced to
-  interpret `sort="x -y z(w)"` as sorting by (pseudocode)
-  `{ $cmp_x->($a, $b) || (-$cmp_y->($a, $b)) || $cmp_z->($a, $b, "w") }`?
-
-> I've now added both of these features to the sort-hooks branch. --[[smcv]]
+*[also withdrawn in favour of sort-package --s]*
 
 >> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
 
@@ -53,17 +29,65 @@ NIH'd sorting mechanisms:
 >>>> I agree it seems more elegant, so I have focused on it.
 >>>>
 >>>> I don't know about reusing `IkiWiki::PageSpec` for this.
->>>>
+>>>> --[[Joey]]
+
+>>>>> Fair enough, `IkiWiki::SortSpec::cmp_foo` would be just
+>>>>> as easy, or `IkiWiki::Sorting::cmp_foo` if you don't like
+>>>>> introducing "sort spec" in the API. I took a cue from
+>>>>> [[ikiwiki/pagespec/sorting]] being a subpage of
+>>>>> [[ikiwiki/pagespec]], and decided that yes, sorting is
+>>>>> a bit like a pagespec :-) --s
+
 >>>> I would be inclined to drop the `check_` stuff.
->>>>
+
+>>>>> It basically exists to support `title_natural`, to avoid
+>>>>> firing up the whole import mechanism on every `cmp`
+>>>>> (although I suppose that could just be a call to a
+>>>>> memoized helper function). It also lets sort specs that
+>>>>> *must* have a parameter, like
+>>>>> [[field|plugins/contrib/field/discussion]], fail early
+>>>>> (again, not so valuable).
+>>>>>
+>>>>> The former function could be achieved at a small
+>>>>> compatibility cost by putting `title_natural` in a new
+>>>>> sortnatural plugin (that fails to load if you don't
+>>>>> have `title_natural`), if you'd prefer - that's what would
+>>>>> have happened if `title_natural` was written after this
+>>>>> code had been merged, I suspect. --s
+
 >>>> Wouldn't it make sense to have `meta(title)` instead
->>>> of `meta_title`?
->>>>
+>>>> of `meta_title`? --J
+
+>>>>> Yes, you're right. I added parameters to support `field`,
+>>>>> and didn't think about making `meta` use them too.
+>>>>> However, `title` does need a special case to make it
+>>>>> default to the basename instead of the empty string.
+>>>>>
+>>>>> Another special case for `title` is to use `titlesort`
+>>>>> first (the name `titlesort` is derived from Ogg/FLAC
+>>>>> tags, which can have `titlesort` and `artistsort`).
+>>>>> I could easily extend that to other metas, though;
+>>>>> in fact, for e.g. book lists it would be nice for
+>>>>> `field(bookauthor)` to behave similarly, so you can
+>>>>> display "Douglas Adams" but sort by "Adams, Douglas".
+>>>>>
+>>>>> `meta_title` is also meant to be a prototype of how
+>>>>> `sort=title` could behave in 4.0 or something - sorting
+>>>>> by page name (which usually sorts in approximately the
+>>>>> same place as the meta-title, but occasionally not), while
+>>>>> displaying meta-titles, does look quite odd. --s
+
 >>>> As I read the regexp in `cmpspec_translate`, the "command"
 >>>> is required to have params. They should be optional, 
 >>>> to match the documentation and because most sort methods
->>>> do not need parameters.
->>>>
+>>>> do not need parameters. --J
+
+>>>>> No, `$2` is either `\w+\([^\)]*\)` or `[^\s]+` (with the
+>>>>> latter causing an error later if it doesn't also match `\w+`).
+>>>>> This branch doesn't add any parameterized sort methods,
+>>>>> in fact, although I did provide one on
+>>>>> [[field's_discussion_page|plugins/contrib/report/discussion]]. --s
+
 >>>> I wonder if it would make sense to add some combining keywords, so
 >>>> a sortspec reads like `sort="age then ascending title"`
 >>>> In a way, this reduces the amount of syntax that needs to be learned.
@@ -73,38 +97,42 @@ NIH'd sorting mechanisms:
 >>>> "ascending age" both seem useful to be able to explicitly specify.
 >>>> --[[Joey]]
 
-## Documentation from sort-hooks branch
-
-### sort hook (added to [[plugins/write]])
-
-       hook(type => "sort", id => "foo", call => \&sort_by_foo);
-
-This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
-an existing one.
-
-The callback is given two page names followed by the parameter as arguments, and
-returns negative, zero or positive if the first page should come before,
-close to (i.e. undefined order), or after the second page.
-
-For instance, the built-in `title` sort order could be reimplemented as
-
-       sub sort_by_title {
-               pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
-       }
-
-and to sort by an arbitrary `meta` value, you could use:
-
-       # usage: sort="meta(description)"
-       sub sort_by_meta {
-               my $param = $_[2];
-               error "sort=meta requires a parameter" unless defined $param;
-               my $left = $pagestate{$_[0]}{meta}{$param};
-               $left = "" unless defined $left;
-               my $right = $pagestate{$_[1]}{meta}{$param};
-               $right = "" unless defined $right;
-               return $left cmp $right;
-       }
+>>>>> Perhaps. I do like the simplicity of [[KathyrnAndersen]]'s syntax
+>>>>> from [[plugins/contrib/report]] (which I copied verbatim, except for
+>>>>> turning sort-by-`field` into a parameterized spec), and I can't really
+>>>>> think of any sensible way to combine sort specs other than "sort by a,
+>>>>> break ties by b, ...", possibly with some reversals thrown in.
+>>>>>
+>>>>> If no other combinations do make sense, is your proposal that "then"
+>>>>> is entirely redundant (easy, just make it a predefined sort spec that
+>>>>> returns 0!), or that it's mandatory "punctuation" (add an explicit
+>>>>> check, or make "then" expand to "||" and let Perl fail to compile
+>>>>> the generated code if it's omitted)?
+>>>>>
+>>>>> It is a little unfortunate that reversal has to move into the sort
+>>>>> spec - I prefer `reverse=yes` - but that's necessary for multi-level
+>>>>> sorting. I can see your point about ascending/descending being more
+>>>>> obvious to look at, but they're also considerably more verbose.
+>>>>>
+>>>>> Unfortunately, `sort="ascending mtime"` actually sorts by *descending*
+>>>>> timestamp (but`sort=age` is fine, because `age` could be defined as
+>>>>> now minus `ctime`). `sort=freshness` isn't right either, because
+>>>>> "sort by freshness" seems as though it ought to mean freshest first,
+>>>>> but "sort by ascending freshness" means put the least fresh first. If
+>>>>> we have ascending and descending keywords which are optional, I don't
+>>>>> think we really want different sort types to have different default
+>>>>> directions - it seems clearer to have `ascending` always be a no-op,
+>>>>> and `descending` always negate.
+>>>>>
+>>>>> Perhaps we could borrow from `meta updated` and use `update_age`?
+>>>>> `updateage` would perhaps be a more normal IkiWiki style - but that
+>>>>> makes me think that updateage is a quantity analagous to tonnage or
+>>>>> voltage, with more or less recently updated pages being said to have
+>>>>> more or less updateage. I don't know whether that's good or bad :-)
+>>>>>
+>>>>> I'm sure there's a much better word, but I can't see it. --s
 
+## Documentation from sort-package branch
 
 ### meta_title sort order (conditionally added to [[ikiwiki/pagespec/sorting]])
 
@@ -115,6 +143,8 @@ and to sort by an arbitrary `meta` value, you could use:
   > I feel it sould be clearer to call that "sortas", since "sort=" is used
   > to specify a sort method in other directives. --[[Joey]]
 
+  >> Fair enough, that's easy to do. --[[smcv]]
+
 ### Multiple sort orders (added to [[ikiwiki/pagespec/sorting]])
 
 In addition, you can combine several sort orders and/or reverse the order of
@@ -130,12 +160,7 @@ An optional `sort` parameter will be used preferentially when
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
 
-## Documentation from sort-package branch
-
-The changes to [[ikiwiki/pagespec/sorting]] are the same.
-The changes to [[plugins/write]] are replaced by:
-
-### Sorting plugins
+### Sorting plugins (added to [[plugins/write]])
 
 Similarly, it's possible to write plugins that add new functions as
 [[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
-- 
cgit v1.2.3


From aec7dec2795aedfe1f13cff9a888bed83ee760df Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:12:59 +0000
Subject: make questions to Joey more explicit

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 156678da7..36c134a59 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -36,9 +36,9 @@ That earlier version of the branch is also available for comparison:
 >>>>> introducing "sort spec" in the API. I took a cue from
 >>>>> [[ikiwiki/pagespec/sorting]] being a subpage of
 >>>>> [[ikiwiki/pagespec]], and decided that yes, sorting is
->>>>> a bit like a pagespec :-) --s
+>>>>> a bit like a pagespec :-) Which name would you prefer? --s
 
->>>> I would be inclined to drop the `check_` stuff.
+>>>> I would be inclined to drop the `check_` stuff. --J
 
 >>>>> It basically exists to support `title_natural`, to avoid
 >>>>> firing up the whole import mechanism on every `cmp`
@@ -50,10 +50,10 @@ That earlier version of the branch is also available for comparison:
 >>>>>
 >>>>> The former function could be achieved at a small
 >>>>> compatibility cost by putting `title_natural` in a new
->>>>> sortnatural plugin (that fails to load if you don't
+>>>>> `sortnatural` plugin (that fails to load if you don't
 >>>>> have `title_natural`), if you'd prefer - that's what would
 >>>>> have happened if `title_natural` was written after this
->>>>> code had been merged, I suspect. --s
+>>>>> code had been merged, I suspect. Would you prefer this? --s
 
 >>>> Wouldn't it make sense to have `meta(title)` instead
 >>>> of `meta_title`? --J
@@ -97,7 +97,7 @@ That earlier version of the branch is also available for comparison:
 >>>> "ascending age" both seem useful to be able to explicitly specify.
 >>>> --[[Joey]]
 
->>>>> Perhaps. I do like the simplicity of [[KathyrnAndersen]]'s syntax
+>>>>> Perhaps. I do like the simplicity of [[KathrynAndersen]]'s syntax
 >>>>> from [[plugins/contrib/report]] (which I copied verbatim, except for
 >>>>> turning sort-by-`field` into a parameterized spec), and I can't really
 >>>>> think of any sensible way to combine sort specs other than "sort by a,
@@ -130,7 +130,8 @@ That earlier version of the branch is also available for comparison:
 >>>>> voltage, with more or less recently updated pages being said to have
 >>>>> more or less updateage. I don't know whether that's good or bad :-)
 >>>>>
->>>>> I'm sure there's a much better word, but I can't see it. --s
+>>>>> I'm sure there's a much better word, but I can't see it. Do you have
+>>>>> a better idea? --s
 
 ## Documentation from sort-package branch
 
-- 
cgit v1.2.3


From 5f87d5d242b87ce5cfbd7ac5fcb1efcc62fc5582 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:25:28 +0000
Subject: actually I can see a second use for "nonlinear" syntax - but I don't
 think it's worth it

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 36c134a59..1657ca8e9 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -99,20 +99,28 @@ That earlier version of the branch is also available for comparison:
 
 >>>>> Perhaps. I do like the simplicity of [[KathrynAndersen]]'s syntax
 >>>>> from [[plugins/contrib/report]] (which I copied verbatim, except for
->>>>> turning sort-by-`field` into a parameterized spec), and I can't really
->>>>> think of any sensible way to combine sort specs other than "sort by a,
->>>>> break ties by b, ...", possibly with some reversals thrown in.
+>>>>> turning sort-by-`field` into a parameterized spec).
 >>>>>
->>>>> If no other combinations do make sense, is your proposal that "then"
->>>>> is entirely redundant (easy, just make it a predefined sort spec that
->>>>> returns 0!), or that it's mandatory "punctuation" (add an explicit
->>>>> check, or make "then" expand to "||" and let Perl fail to compile
->>>>> the generated code if it's omitted)?
+>>>>> If we're getting into English-like (or at least SQL-like) queries,
+>>>>> it might make sense to change the signature of the hook function
+>>>>> so it's a function to return a key, e.g.
+>>>>> `sub key_age { return -%pagemtime{$_[0]) }`. Then we could sort like
+>>>>> this:
 >>>>>
->>>>> It is a little unfortunate that reversal has to move into the sort
->>>>> spec - I prefer `reverse=yes` - but that's necessary for multi-level
->>>>> sorting. I can see your point about ascending/descending being more
->>>>> obvious to look at, but they're also considerably more verbose.
+>>>>>     field(artistsort) or field(artist) or constant(Various Artists) then meta(titlesort) or meta(title) or title
+>>>>>
+>>>>> with "or" binding more closely than "then". Does this seem valuable?
+>>>>> I think the implementation would be somewhat more difficult. and
+>>>>> it's probably getting too complicated to be worthwhile, though?
+>>>>> (The keys that actually benefit from this could just
+>>>>> have smarter cmp functions, I think.)
+>>>>>
+>>>>> If the hooks return keys rather than cmp results, then we could even
+>>>>> have "lowercase" as an adjective used like "ascending"... maybe.
+>>>>> However, there are two types of adjective here: "lowercase"
+>>>>> really applies to the keys, whereas "ascending" applies to the "cmp"
+>>>>> result. Again, I think this is getting too complex, and could just
+>>>>> be solved with smarter cmp functions.
 >>>>>
 >>>>> Unfortunately, `sort="ascending mtime"` actually sorts by *descending*
 >>>>> timestamp (but`sort=age` is fine, because `age` could be defined as
-- 
cgit v1.2.3


From c2f54ccfb7b401b59f7eda13095e2ba2af69ed7a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:41:31 +0000
Subject: sort-order could usefully be overridden for meta author, too

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 1657ca8e9..e79e52f39 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -169,6 +169,9 @@ An optional `sort` parameter will be used preferentially when
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
 
+> I now realise that `author` should also have this, again for use
+> with (Western) names. --s
+
 ### Sorting plugins (added to [[plugins/write]])
 
 Similarly, it's possible to write plugins that add new functions as
-- 
cgit v1.2.3


From 0dad28b3530d70830456a3f8d57b0e3f3d52ee2d Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:45:16 +0000
Subject: reduced difference

---
 doc/plugins/contrib/ftemplate/discussion.mdwn | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index eb84dd09b..1e0bca5d8 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -29,6 +29,5 @@ seems orthogonal (and might be a good enhancement to `template` anyway).
 
 > Yes, I added that because I wanted the option of not having to make all my templates work as wiki pages also. --[[KathrynAndersen]]
 
->> Yeah, that's something that annoys me about `template` too. I've
->> opened a todo: [[todo/user-defined_templates_outside_the_wiki]].
->> --s
+>> Joey has added support for
+>> [[todo/user-defined_templates_outside_the_wiki]] now. --s
-- 
cgit v1.2.3


From c4a838b33a34ff61a1dd5c6f65e40df3609e727f Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:53:59 +0000
Subject: perhaps the typedlink(tag foo) pagespec isn't so useful

---
 doc/todo/matching_different_kinds_of_links.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index f8796652e..4f52ade52 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -140,3 +140,12 @@ without too much transitional trouble. --[[Joey]]
 > care either way; [[Jon]] expressed concern about people relying
 > on the current semantics, on one of the pages requesting this
 > change. --s
+
+I might have been wrong to introduce `typedlink(tag foo)`. It's not
+very user-friendly, and is more useful as a backend for other plugins
+that as a feature in its own right - any plugin introducing a link
+type will probably also want to have its own preprocessor directive
+to set that link type, and its own pagespec function to match it.
+I wonder whether to make a `typedlink` plugin that has the typedlink
+pagespec match function and a new `\[[!typedlink to="foo" type="bar"]]`
+though... --[[smcv]]
-- 
cgit v1.2.3


From 3934759592c35ab475e06501e2e4613d5c1f2e08 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 01:13:08 +0000
Subject: vague musings about wikilinks

---
 .../link_plugin_perhaps_too_general__63__.mdwn     | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 doc/todo/link_plugin_perhaps_too_general__63__.mdwn

diff --git a/doc/todo/link_plugin_perhaps_too_general__63__.mdwn b/doc/todo/link_plugin_perhaps_too_general__63__.mdwn
new file mode 100644
index 000000000..8a5fd50eb
--- /dev/null
+++ b/doc/todo/link_plugin_perhaps_too_general__63__.mdwn
@@ -0,0 +1,25 @@
+[[!tag wishlist blue-sky]]
+(This isn't important to me - I don't use MediaWiki or Creole syntax myself -
+but just thinking out loud...)
+
+The [[ikiwiki/wikilink]] syntax IkiWiki uses sometimes conflicts with page
+languages' syntax (notably, [[plugins/contrib/MediaWiki]] and [[plugins/Creole]]
+want their wikilinks the other way round, like
+`\[[plugins/write|how to write a plugin]]`). It would be nice if there was
+some way for page language plugins to opt in/out of the normal wiki link
+processing - then MediaWiki and Creole could have their own `linkify` hook
+that was only active for *their* page types, and used the appropriate
+syntax.
+
+In [[todo/matching_different_kinds_of_links]] I wondered about adding a
+`\[[!typedlink to="foo" type="bar"]]` directive. This made me wonder whether
+a core `\[[!link]]` directive would be useful; this could be a fallback for
+page types where a normal wikilink can't be done for whatever reason, and
+could also provide extension points more easily than WikiLinks' special
+syntax with extra punctuation, which doesn't really scale?
+
+Straw-man:
+
+    \[[!link to="ikiwiki/wikilink" desc="WikiLinks"]]
+
+--[[smcv]]
-- 
cgit v1.2.3


From 5445fe765777dc6254c7e0e13d4fa5e07810751a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 01:15:28 +0000
Subject: cross-reference

---
 doc/todo/rewrite_ikiwiki_in_haskell.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/todo/rewrite_ikiwiki_in_haskell.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell.mdwn
index 204c48cd7..48ed744b1 100644
--- a/doc/todo/rewrite_ikiwiki_in_haskell.mdwn
+++ b/doc/todo/rewrite_ikiwiki_in_haskell.mdwn
@@ -29,6 +29,7 @@ It's appealing for a lot of reasons, including:
     edit in html editors currently.
   - This would be a chance to make WikiLinks with link texts read
     "the right way round" (ie, vaguely wiki creole compatably).
+    *[See also [[todo/link_plugin_perhaps_too_general?]] --[[smcv]]]*
   - The data structures would probably be quite different.
   - I might want to drop a lot of the command-line flags, either
     requiring a setup file be used for those things, or leaving the
-- 
cgit v1.2.3


From e4e53d7a18ec18d1ba72b1a4f124e211148e0f12 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 22:23:36 -0400
Subject: response

---
 doc/todo/matching_different_kinds_of_links.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 4f52ade52..2cd484852 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -104,6 +104,8 @@ Some code refers to `oldtypedlinks`, and other to `oldlinktypes`. --[[Joey]]
 > Oops, I'll fix that. That must mean missing test coverage, too :-(
 > --s
 
+>> A test suite for the dependency resolver *would* be nice. --[[Joey]]
+
 I'm curious what your reasoning was for adding a new variable
 rather than using `pagestate`. Was it only because you needed
 the `old` version to detect change, or was there other complexity?
@@ -133,6 +135,8 @@ with a empty type. (Bloaty.)) --J
 > not counting tags and other typed links?". A typed link is
 > still a link, in my mind at least. --s
 
+>> Me neither, let's not worry about it. --[[Joey]] 
+
 I suspect we could get away without having `tagged_is_strict`
 without too much transitional trouble. --[[Joey]]
 
@@ -149,3 +153,6 @@ to set that link type, and its own pagespec function to match it.
 I wonder whether to make a `typedlink` plugin that has the typedlink
 pagespec match function and a new `\[[!typedlink to="foo" type="bar"]]`
 though... --[[smcv]]
+
+> I agree, per-type matchers are more friendly and I'm not enamored of the
+> multi-parameter pagespec syntax. --[[Joey]]
-- 
cgit v1.2.3


From 931c7b00ccb47371ee6e1d56baf5c52d725a321f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 22:46:31 -0400
Subject: response

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 25 +++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index e79e52f39..c6e18505e 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -38,7 +38,9 @@ That earlier version of the branch is also available for comparison:
 >>>>> [[ikiwiki/pagespec]], and decided that yes, sorting is
 >>>>> a bit like a pagespec :-) Which name would you prefer? --s
 
->>>> I would be inclined to drop the `check_` stuff. --J
+>>>>>> `SortSpec` --[[Joey]] 
+
+>>>> I would be inclined to drop the `check_` stuff. --[[Joey]] 
 
 >>>>> It basically exists to support `title_natural`, to avoid
 >>>>> firing up the whole import mechanism on every `cmp`
@@ -48,6 +50,11 @@ That earlier version of the branch is also available for comparison:
 >>>>> [[field|plugins/contrib/field/discussion]], fail early
 >>>>> (again, not so valuable).
 >>>>>
+>>>>>> AFAIK, `use foo` has very low overhead when the module is already
+>>>>>> loaded. There could be some evalation overhead in `eval q{use foo}`,
+>>>>>> if so it would be worth addressing across the whole codebase.
+>>>>>> --[[Joey]] 
+>>>>>
 >>>>> The former function could be achieved at a small
 >>>>> compatibility cost by putting `title_natural` in a new
 >>>>> `sortnatural` plugin (that fails to load if you don't
@@ -55,8 +62,12 @@ That earlier version of the branch is also available for comparison:
 >>>>> have happened if `title_natural` was written after this
 >>>>> code had been merged, I suspect. Would you prefer this? --s
 
+>>>>>> Yes! (Assuming it does not make sense to support
+>>>>>> natural order sort of other keys than the title, at least..)
+>>>>>>  --[[Joey]]
+
 >>>> Wouldn't it make sense to have `meta(title)` instead
->>>> of `meta_title`? --J
+>>>> of `meta_title`? --[[Joey]]
 
 >>>>> Yes, you're right. I added parameters to support `field`,
 >>>>> and didn't think about making `meta` use them too.
@@ -77,10 +88,12 @@ That earlier version of the branch is also available for comparison:
 >>>>> same place as the meta-title, but occasionally not), while
 >>>>> displaying meta-titles, does look quite odd. --s
 
+>>>>>> Agreed. --[[Joey]]
+
 >>>> As I read the regexp in `cmpspec_translate`, the "command"
 >>>> is required to have params. They should be optional, 
 >>>> to match the documentation and because most sort methods
->>>> do not need parameters. --J
+>>>> do not need parameters. --[[Joey]]
 
 >>>>> No, `$2` is either `\w+\([^\)]*\)` or `[^\s]+` (with the
 >>>>> latter causing an error later if it doesn't also match `\w+`).
@@ -122,6 +135,9 @@ That earlier version of the branch is also available for comparison:
 >>>>> result. Again, I think this is getting too complex, and could just
 >>>>> be solved with smarter cmp functions.
 >>>>>
+>>>>>> I agree. (Also, I think returning keys may make it harder to write
+>>>>>> smarter cmp functions.) --[[Joey]] 
+>>>>>
 >>>>> Unfortunately, `sort="ascending mtime"` actually sorts by *descending*
 >>>>> timestamp (but`sort=age` is fine, because `age` could be defined as
 >>>>> now minus `ctime`). `sort=freshness` isn't right either, because
@@ -132,6 +148,9 @@ That earlier version of the branch is also available for comparison:
 >>>>> directions - it seems clearer to have `ascending` always be a no-op,
 >>>>> and `descending` always negate.
 >>>>>
+>>>>>> I think you've convinced me that ascending/descending impose too
+>>>>>> much semantics on it, so "-" is better. --[[Joey]]
+>>>>>
 >>>>> Perhaps we could borrow from `meta updated` and use `update_age`?
 >>>>> `updateage` would perhaps be a more normal IkiWiki style - but that
 >>>>> makes me think that updateage is a quantity analagous to tonnage or
-- 
cgit v1.2.3


From a875ee8be702bd4575e009dc652015c1157c7c2e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 13:48:30 +0100
Subject: Split out sortnaturally into a plugin

---
 IkiWiki.pm                        | 11 -----------
 IkiWiki/Plugin/sortnaturally.pm   | 32 ++++++++++++++++++++++++++++++++
 debian/NEWS                       |  8 ++++++++
 doc/ikiwiki/pagespec/sorting.mdwn |  5 +++--
 doc/plugins/sortnaturally.mdwn    |  5 +++++
 5 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 IkiWiki/Plugin/sortnaturally.pm
 create mode 100644 doc/plugins/sortnaturally.mdwn

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a89c14058..8f36f5818 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2423,15 +2423,4 @@ sub cmp_title {
 sub cmp_mtime { $IkiWiki::pagemtime{$_[1]} <=> $IkiWiki::pagemtime{$_[0]} }
 sub cmp_age { $IkiWiki::pagectime{$_[1]} <=> $IkiWiki::pagectime{$_[0]} }
 
-sub check_cmp_title_natural {
-	eval q{use Sort::Naturally};
-	if ($@) {
-		error(gettext("Sort::Naturally needed for title_natural sort"));
-	}
-}
-sub cmp_title_natural {
-	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
-		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
-}
-
 1
diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
new file mode 100644
index 000000000..0023f31f9
--- /dev/null
+++ b/IkiWiki/Plugin/sortnaturally.pm
@@ -0,0 +1,32 @@
+#!/usr/bin/perl
+# Sort::Naturally-powered title_natural sort order for IkiWiki
+package IkiWiki::Plugin::sortnaturally;
+
+use IkiWiki 3.00;
+no warnings;
+
+sub import {
+	hook(type => "getsetup", id => "sortnaturally", call => \&getsetup);
+}
+
+sub getsetup {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+}
+
+sub checkconfig () {
+	eval q{use Sort::Naturally};
+	error $@ if $@;
+}
+
+package IkiWiki::PageSpec;
+
+sub cmp_title_natural {
+	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
+		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
+}
+
+1;
diff --git a/debian/NEWS b/debian/NEWS
index 50332670f..614eb11f8 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,11 @@
+ikiwiki (3.20100320) UNRELEASED; urgency=low
+
+  The sort="title_natural" option on [[!inline]] etc. now requires the
+  new sortnaturally plugin. This is not enabled by default, because it requires
+  the Sort::Naturally module.
+
+ -- Simon McVittie <smcv@debian.org>  Sat, 03 Apr 2010 13:46:08 +0100
+
 ikiwiki (3.20091017) unstable; urgency=low
 
   To take advantage of significant performance improvements, all
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index f27972d4e..ba995a521 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -6,9 +6,10 @@ orders can be specified.
 * `age` - List pages from the most recently created to the oldest.
 * `mtime` - List pages with the most recently modified first.
 * `title` - Order by title (page name).
-* `title_natural` - Only available if [[!cpan Sort::Naturally]] is
-  installed. Orders by title, but numbers in the title are treated
+[[!if test="enabled(sortnaturally)" then="""
+* `title_natural` - Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+"""]]
 [[!if test="enabled(meta)" then="""
 * `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
diff --git a/doc/plugins/sortnaturally.mdwn b/doc/plugins/sortnaturally.mdwn
new file mode 100644
index 000000000..91f373f6b
--- /dev/null
+++ b/doc/plugins/sortnaturally.mdwn
@@ -0,0 +1,5 @@
+[[!template id=plugin name=sortnaturally core=1 author="[[chrysn]], [[smcv]]"]]
+[[!tag type/meta]]
+
+This plugin provides the `title_natural` [[ikiwiki/pagespec/sorting]] order,
+which uses Sort::Naturally to sort numbered pages in a more natural order.
-- 
cgit v1.2.3


From 75fd08046548940c443c46bcdf9a5b0b6968b175 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 13:49:20 +0100
Subject: Remove support for check_cmp_foo (pre-sort checks)

---
 IkiWiki.pm             | 4 ----
 doc/plugins/write.mdwn | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8f36f5818..7547f1751 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1973,10 +1973,6 @@ sub cmpspec_translate ($) {
 		}
 
 		if (exists $IkiWiki::PageSpec::{"cmp_$word"}) {
-			if (exists $IkiWiki::PageSpec::{"check_cmp_$word"}) {
-				$IkiWiki::PageSpec::{"check_cmp_$word"}->($params);
-			}
-
 			if (defined $params) {
 				push @data, $params;
 				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, \$data[$#data])";
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index de2b47015..06c8f8e44 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1128,11 +1128,6 @@ is greater, or zero if they are considered equal. It may also raise an
 error using `error`, for instance if it needs a parameter but one isn't
 provided.
 
-You can also define a function called `check_cmp_foo` in the same package.
-If you do, it will be called while preparing to sort by `foo` or `foo(bar)`,
-with argument `undef` or `"bar"` respectively; it may raise an error using
-`error`, if sorting like that isn't going to work.
-
 ### Setup plugins
 
 The ikiwiki setup file is loaded using a pluggable mechanism. If you look
-- 
cgit v1.2.3


From 04a59b3c65e8e60805b6ed6d11d448b1d5babe64 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 13:57:38 +0100
Subject: Move sort hooks to the IkiWiki::SortSpec namespace

Also rename cmpspec_translate (internal function) to sortspec_translate
for consistency.
---
 IkiWiki.pm                      | 14 ++++++++------
 IkiWiki/Plugin/meta.pm          |  2 ++
 IkiWiki/Plugin/sortnaturally.pm |  2 +-
 doc/plugins/write.mdwn          |  2 +-
 t/pagespec_match_list.t         |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7547f1751..d716e8b39 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -37,7 +37,7 @@ our $DEPEND_LINKS=4;
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
-memoize("cmpspec_translate");
+memoize("sortspec_translate");
 memoize("pagespec_translate");
 memoize("template_file");
 
@@ -1935,7 +1935,7 @@ sub add_link ($$) {
 		unless grep { $_ eq $link } @{$links{$page}};
 }
 
-sub cmpspec_translate ($) {
+sub sortspec_translate ($) {
 	my $spec = shift;
 
 	my $code = "";
@@ -1972,13 +1972,13 @@ sub cmpspec_translate ($) {
 			$code .= "-";
 		}
 
-		if (exists $IkiWiki::PageSpec::{"cmp_$word"}) {
+		if (exists $IkiWiki::SortSpec::{"cmp_$word"}) {
 			if (defined $params) {
 				push @data, $params;
-				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, \$data[$#data])";
+				$code .= "IkiWiki::SortSpec::cmp_$word(\@_, \$data[$#data])";
 			}
 			else {
-				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, undef)";
+				$code .= "IkiWiki::SortSpec::cmp_$word(\@_, undef)";
 			}
 		}
 		else {
@@ -2095,7 +2095,7 @@ sub pagespec_match_list ($$;@) {
 	}
 
 	if (defined $params{sort}) {
-		my $f = cmpspec_translate($params{sort});
+		my $f = sortspec_translate($params{sort});
 
 		@candidates = sort { $f->($a, $b) } @candidates;
 	}
@@ -2410,6 +2410,8 @@ sub match_ip ($$;@) {
 	}
 }
 
+package IkiWiki::SortSpec;
+
 sub cmp_title {
 	IkiWiki::pagetitle(IkiWiki::basename($_[0]))
 	cmp
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index e8cc1e392..cd7d0d127 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -348,6 +348,8 @@ sub match_copyright ($$;@) {
 	IkiWiki::Plugin::meta::match("copyright", @_);
 }
 
+package IkiWiki::SortSpec;
+
 sub cmp_meta_title {
 	IkiWiki::Plugin::meta::titlesort($_[0])
 	cmp
diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
index 0023f31f9..f498820a5 100644
--- a/IkiWiki/Plugin/sortnaturally.pm
+++ b/IkiWiki/Plugin/sortnaturally.pm
@@ -22,7 +22,7 @@ sub checkconfig () {
 	error $@ if $@;
 }
 
-package IkiWiki::PageSpec;
+package IkiWiki::SortSpec;
 
 sub cmp_title_natural {
 	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 06c8f8e44..b67142230 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1114,7 +1114,7 @@ while "glob(*)" is not influenced by the contents of any page.
 
 Similarly, it's possible to write plugins that add new functions as
 [[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
-the IkiWiki::PageSpec package named `cmp_foo`, which will be used when sorting
+the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting
 by `foo` or `foo(...)` is requested.
 
 The function will be passed three or more parameters. The first two are
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 743ae4637..68112f5c0 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -10,7 +10,7 @@ $config{srcdir}=$config{destdir}="/dev/null";
 IkiWiki::checkconfig();
 
 {
-	package IkiWiki::PageSpec;
+	package IkiWiki::SortSpec;
 
 	sub cmp_path { $_[0] cmp $_[1] }
 }
-- 
cgit v1.2.3


From 56c64ff1963b33da74677f08a0b8c6579bc2d68b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 13:39:44 +0000
Subject: updated branch

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 56 +++++++++++++++-------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index c6e18505e..8c6e1df3b 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -40,6 +40,8 @@ That earlier version of the branch is also available for comparison:
 
 >>>>>> `SortSpec` --[[Joey]] 
 
+>>>>>>> Done. --s
+
 >>>> I would be inclined to drop the `check_` stuff. --[[Joey]] 
 
 >>>>> It basically exists to support `title_natural`, to avoid
@@ -54,6 +56,8 @@ That earlier version of the branch is also available for comparison:
 >>>>>> loaded. There could be some evalation overhead in `eval q{use foo}`,
 >>>>>> if so it would be worth addressing across the whole codebase.
 >>>>>> --[[Joey]] 
+>>>>>>
+>>>>>>> check_cmp_foo now dropped. --s
 >>>>>
 >>>>> The former function could be achieved at a small
 >>>>> compatibility cost by putting `title_natural` in a new
@@ -66,6 +70,8 @@ That earlier version of the branch is also available for comparison:
 >>>>>> natural order sort of other keys than the title, at least..)
 >>>>>>  --[[Joey]]
 
+>>>>>>> Done. I added some NEWS.Debian for it, too. --s
+
 >>>> Wouldn't it make sense to have `meta(title)` instead
 >>>> of `meta_title`? --[[Joey]]
 
@@ -90,6 +96,11 @@ That earlier version of the branch is also available for comparison:
 
 >>>>>> Agreed. --[[Joey]]
 
+>>>>>>> I've implemented meta(title). meta(author) also has the
+>>>>>>> `sortas` special case; meta(updated) and meta(date)
+>>>>>>> should also work how you'd expect them to (but they're
+>>>>>>> earliest-first, unlike age). --s
+
 >>>> As I read the regexp in `cmpspec_translate`, the "command"
 >>>> is required to have params. They should be optional, 
 >>>> to match the documentation and because most sort methods
@@ -150,6 +161,10 @@ That earlier version of the branch is also available for comparison:
 >>>>>
 >>>>>> I think you've convinced me that ascending/descending impose too
 >>>>>> much semantics on it, so "-" is better. --[[Joey]]
+
+>>>>>>> I've kept the semantics from `report` as-is, then:
+>>>>>>> e.g. `sort="age -title"`. --s
+
 >>>>>
 >>>>> Perhaps we could borrow from `meta updated` and use `update_age`?
 >>>>> `updateage` would perhaps be a more normal IkiWiki style - but that
@@ -160,18 +175,22 @@ That earlier version of the branch is also available for comparison:
 >>>>> I'm sure there's a much better word, but I can't see it. Do you have
 >>>>> a better idea? --s
 
-## Documentation from sort-package branch
+[Regarding the `meta title=foo sort=bar` special case]
 
-### meta_title sort order (conditionally added to [[ikiwiki/pagespec/sorting]])
+> I feel it sould be clearer to call that "sortas", since "sort=" is used
+> to specify a sort method in other directives. --[[Joey]]
+>> Done. --[[smcv]]
 
-* `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
-  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
-  full title was set.
+## Documentation from sort-package branch
 
-  > I feel it sould be clearer to call that "sortas", since "sort=" is used
-  > to specify a sort method in other directives. --[[Joey]]
+### advanced sort orders (conditionally added to [[ikiwiki/pagespec/sorting]])
 
-  >> Fair enough, that's easy to do. --[[smcv]]
+* `title_natural` - Orders by title, but numbers in the title are treated
+  as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
+  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
+  full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc.
+  also work.
 
 ### Multiple sort orders (added to [[ikiwiki/pagespec/sorting]])
 
@@ -179,23 +198,29 @@ In addition, you can combine several sort orders and/or reverse the order of
 sorting, with a string like `age -title` (which would sort by age, then by
 title in reverse order if two pages have the same age).
 
-### meta title sort parameter (added to [[ikiwiki/directive/meta]])
+### meta sortas parameter (added to [[ikiwiki/directive/meta]])
+
+[in title]
 
 An optional `sort` parameter will be used preferentially when
-[[ikiwiki/pagespec/sorting]] by `meta_title`:
+[[ikiwiki/pagespec/sorting]] by `meta(title)`:
 
        \[[!meta title="The Beatles" sort="Beatles, The"]]
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
 
-> I now realise that `author` should also have this, again for use
-> with (Western) names. --s
+[in author]
+
+  An optional `sortas` parameter will be used preferentially when
+  [[ikiwiki/pagespec/sorting]] by `meta(author)`:
+
+        \[[!meta author="Joey Hess" sortas="Hess, Joey"]]
 
 ### Sorting plugins (added to [[plugins/write]])
 
 Similarly, it's possible to write plugins that add new functions as
 [[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
-the IkiWiki::PageSpec package named `cmp_foo`, which will be used when sorting
+the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting
 by `foo` or `foo(...)` is requested.
 
 The function will be passed three or more parameters. The first two are
@@ -208,8 +233,3 @@ if the first argument is less than the second, positive if the first argument
 is greater, or zero if they are considered equal. It may also raise an
 error using `error`, for instance if it needs a parameter but one isn't
 provided.
-
-You can also define a function called `check_cmp_foo` in the same package.
-If you do, it will be called while preparing to sort by `foo` or `foo(bar)`,
-with argument `undef` or `"bar"` respectively; it may raise an error using
-`error`, if sorting like that isn't going to work.
-- 
cgit v1.2.3


From b66f9026177639d06ebbd1134886d37e2451b3a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Apr 2010 15:09:04 -0400
Subject: fix buggy program installation code

---
 Makefile.PL | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 5a9028b51..38db20d44 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -29,6 +29,7 @@ W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
 outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out
+scripts=ikiwiki-update-wikilist ikiwiki-makerepo
 
 %.out: %.in
 	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
@@ -116,8 +117,8 @@ extra_install: underlay_install
 	install ikiwiki-w3m.cgi $(DESTDIR)$(W3M_CGI_BIN)
 
 	install -d $(DESTDIR)$(PREFIX)/bin
-	for prog in $(outprogs); do \
-		install $$prog $(DESTDIR)$(PREFIX)/bin/$$(shell echo $$prog | sed 's/\.out//'); \
+	for prog in $(outprogs) $(scripts); do \
+		install $$prog $(DESTDIR)$(PREFIX)/bin/$$(echo $$prog | sed 's/\.out//'); \
 	done
 
 	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
-- 
cgit v1.2.3


From 0f82fe522560353bb6133ce1bea632a48cd7db13 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Apr 2010 15:15:04 -0400
Subject: releasing version 3.20100403

---
 debian/changelog |  4 +--
 ikiwiki.spec     |  2 +-
 po/bg.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
 po/cs.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
 po/da.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
 po/de.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
 po/es.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
 po/fr.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
 po/gu.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
 po/ikiwiki.pot   | 78 +++++++++++++++++++++++++++++--------------------
 po/it.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
 po/pl.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
 po/sv.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
 po/tr.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
 po/vi.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
 15 files changed, 667 insertions(+), 479 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 362ba54ab..32a38925d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100324) UNRELEASED; urgency=low
+ikiwiki (3.20100403) unstable; urgency=low
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.
@@ -29,7 +29,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * template: Search for templates in the templatedir, if they are not
     found as pages in the wiki.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 03 Apr 2010 14:17:28 -0400
 
 ikiwiki (3.20100312) unstable; urgency=HIGH
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 532a91885..fb7971b27 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100324
+Version: 3.20100403
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index 0e2108597..5585a10d6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Грешка"
 
@@ -137,7 +137,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "готово"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -517,7 +517,7 @@ msgstr "Огледала"
 msgid "Mirror"
 msgstr "Огледало"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 msgid "comment needs moderation"
 msgstr ""
 
@@ -893,12 +893,12 @@ msgstr "грешка при запис на файла „%s”: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr ""
 
@@ -988,60 +988,60 @@ msgstr "грешка при запис на файла „%s”: %s"
 msgid "missing id parameter"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 #, fuzzy
 msgid "failed to process:"
 msgstr "грешка при обработване на шаблона"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, perl-format
 msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1110,25 +1110,35 @@ msgstr "ikiwiki: неуспех при обновяване на страниц
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "грешка при четене на „%s”: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "грешка при четене на „%s”: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "крешка при компилиране на файла %s"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1147,13 +1157,13 @@ msgid "wrapper filename not specified"
 msgstr "не е указан файл на обвивката"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "крешка при компилиране на файла %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "успешно генериране на %s"
@@ -1166,19 +1176,23 @@ msgstr "формат: ikiwiki [опции] източник местоназна
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+msgid "usage: --set-yaml var=value"
+msgstr ""
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
@@ -1186,40 +1200,40 @@ msgstr "осъвременяване на уики..."
 msgid "Discussion"
 msgstr "Дискусия"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
diff --git a/po/cs.po b/po/cs.po
index 09d411e98..0b45bb97a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -55,7 +55,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Chyba"
 
@@ -136,7 +136,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr "mažu bucket..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "hotovo"
 
@@ -244,7 +244,7 @@ msgstr "Přidán komentář"
 msgid "Added a comment: %s"
 msgstr "Přidán komentář: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "nejste přihlášeni jako správce"
 
@@ -498,7 +498,7 @@ msgstr "Zrcadla"
 msgid "Mirror"
 msgstr "Zrcadlo"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "schvalování komentářů"
@@ -877,12 +877,12 @@ msgstr "nepodařilo se přečíst %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "pro indexování %s je potřeba Digest::SHA1"
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr "hledání"
 
@@ -964,52 +964,52 @@ msgstr "zpracovávání selhalo na řádku %d: %s"
 msgid "missing id parameter"
 msgstr "chybí parametr id"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "šablona %s nebyla nalezena"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 msgid "failed to process:"
 msgstr "nepodařilo se zpracovat:"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr "chybí TeXový kód"
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 msgid "failed to generate image from code"
 msgstr "z kódu se nepodařilo vygenerovat obrázek"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, fuzzy, perl-format
 msgid "%s plugin:"
 msgstr "modul"
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, fuzzy, perl-format
 msgid "%s plugins"
 msgstr "moduly"
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr "povolit %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr "konfigurační soubor této wiki je neznámý"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr "hlavní"
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1017,7 +1017,7 @@ msgstr ""
 "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset "
 "znovusestavit wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1090,25 +1090,35 @@ msgstr "ikiwiki: nelze sestavit %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "nemohu číst %s: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "nemohu číst %s: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "nepodařilo se aktualizovat %s"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)"
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nepodporovaný systém pro správu verzí: %s"
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:"
@@ -1127,13 +1137,13 @@ msgid "wrapper filename not specified"
 msgstr "jméno souboru s obalem nebylo zadáno"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "nelze zkompilovat %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s byl úspěšně vytvořen"
@@ -1146,19 +1156,24 @@ msgstr "použití: ikiwiki [volby] zdroj cíl"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup konfigurační.soubor"
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr "použití: --set proměnná=hodnota"
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+#, fuzzy
+msgid "usage: --set-yaml var=value"
+msgstr "použití: --set proměnná=hodnota"
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "znovusestavuji wiki..."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
@@ -1166,38 +1181,38 @@ msgstr "obnovuji wiki..."
 msgid "Discussion"
 msgstr "Diskuse"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr "nelze použít několik rcs modulů"
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
diff --git a/po/da.po b/po/da.po
index 13d1dca59..be7a95e6a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Fejl"
 
@@ -140,7 +140,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "færdig"
 
@@ -251,7 +251,7 @@ msgstr "Tilføjede en kommentar"
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "du er ikke logget på som en administrator"
 
@@ -511,7 +511,7 @@ msgstr "Spejle"
 msgid "Mirror"
 msgstr "Spejl"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "kommentarkoderering"
@@ -892,12 +892,12 @@ msgstr "læsning af %s mislykkedes"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "behøver Digest::SHA1 til indeks %s"
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr "søg"
 
@@ -979,54 +979,54 @@ msgstr "afkodningsfejl på linje %d: %s"
 msgid "missing id parameter"
 msgstr "manglende id-parameter"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "skabelon %s ikke fundet"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 msgid "failed to process:"
 msgstr "dannelsen mislykkedes:"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr "manglende tex-kode"
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 msgid "failed to generate image from code"
 msgstr "billedopbygning fra kode mislykkedes"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, fuzzy, perl-format
 msgid "%s plugin:"
 msgstr "udvidelse"
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, fuzzy, perl-format
 msgid "%s plugins"
 msgstr "udvidelser"
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr "aktivér %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr "opsætningsfilen for denne wiki er ukendt"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr "primær"
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i "
 "kraft."
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1034,7 +1034,7 @@ msgstr ""
 "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du "
 "muligvis genopbygge wikien."
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
@@ -1105,25 +1105,35 @@ msgstr "ikiwiki: kan ikke danne %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "kan ikke læse %s: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "kan ikke læse %s: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "opdatering af %s mislykkedes"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)"
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "revisionskontrolsystem %s ikke understøttet"
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes"
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:"
@@ -1142,13 +1152,13 @@ msgid "wrapper filename not specified"
 msgstr "wrapper-navn ikke angivet"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "kompilering af %s mislykkedes"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "Korrekt bygget %s"
@@ -1161,19 +1171,24 @@ msgstr "brug: ikiwiki [valg] kilde mål"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup opsætningsfil"
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+#, fuzzy
+msgid "usage: --set-yaml var=value"
+msgstr "brug: --set var=værdi"
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "bygger wrappers.."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
@@ -1181,39 +1196,39 @@ msgstr "genopfrisker wiki..."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally krævet for title_natural sortering"
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
diff --git a/po/de.po b/po/de.po
index f69b98603..e5a18d47b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2010-03-14 16:09+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Fehler"
 
@@ -137,7 +137,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr "lösche Behälter (bucket)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "fertig"
 
@@ -247,7 +247,7 @@ msgstr "Kommentar hinzugefügt"
 msgid "Added a comment: %s"
 msgstr "Kommentar hinzugefügt: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "Sie sind nicht als Administrator angemeldet"
 
@@ -507,7 +507,7 @@ msgstr "Spiegel"
 msgid "Mirror"
 msgstr "Spiegel"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 msgid "comment needs moderation"
 msgstr "Kommentar muss moderiert werden"
 
@@ -891,12 +891,12 @@ msgstr "konnte das rsync_command nicht ausführen: %s"
 msgid "rsync_command exited %d"
 msgstr "rsync_command gibt Fehler %d zurück"
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen"
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr "suchen"
 
@@ -978,54 +978,54 @@ msgstr "Auswertungsfehler in Zeile %d: %s"
 msgid "missing id parameter"
 msgstr "fehlender Parameter id"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "Vorlage %s nicht gefunden"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 msgid "failed to process:"
 msgstr "Fehler beim Ablauf:"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr "fehlender TeX-Code"
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 msgid "failed to generate image from code"
 msgstr "konnte kein Bild aus dem Code erzeugen"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, perl-format
 msgid "%s plugin:"
 msgstr "%s-Erweiterung:"
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, fuzzy, perl-format
 msgid "%s plugins"
 msgstr "%s-Erweiterungen"
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr "%s aktivieren?"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr "Hauptseite"
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des "
 "Wikis, um wirksam zu werden."
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1033,7 +1033,7 @@ msgstr ""
 "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam "
 "werden, kann es notwendig sein, das Wikis neu zu bauen."
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1107,26 +1107,36 @@ msgstr "ikiwiki: kann %s nicht erzeugen"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "kann %s nicht lesen: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "kann %s nicht lesen: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "aktualisieren von %s fehlgeschlagen"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)"
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "nicht unterstütztes Versionskontrollsystem %s"
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen"
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1147,13 +1157,13 @@ msgid "wrapper filename not specified"
 msgstr "Dateiname des Wrappers nicht angegeben"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "erzeugen von %s fehlgeschlagen"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s wurde erfolgreich erstellt"
@@ -1166,19 +1176,24 @@ msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup Konfigurationsdatei"
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr "Aufruf: --set Variable=Wert"
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+#, fuzzy
+msgid "usage: --set-yaml var=value"
+msgstr "Aufruf: --set Variable=Wert"
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper.."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
@@ -1186,41 +1201,41 @@ msgstr "aktualisiere Wiki.."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally wird benötigt für title_natural sort"
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
diff --git a/po/es.po b/po/es.po
index 465e9c1a1..413572866 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Error"
 
@@ -142,7 +142,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "completado"
 
@@ -253,7 +253,7 @@ msgstr "Añadir un comentario"
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "No está registrado como un administrador"
 
@@ -515,7 +515,7 @@ msgstr "Réplicas"
 msgid "Mirror"
 msgstr "Réplica"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "aprobación de comentarios"
@@ -892,12 +892,12 @@ msgstr "no puedo leer de %s: %s "
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "se necesita la instalación de Digest::SHA1 para indexar %s"
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr "buscar"
 
@@ -983,54 +983,54 @@ msgstr "error de análisis en la línea %d: %s"
 msgid "missing id parameter"
 msgstr "falta el parámetro \"id\""
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "no he encontrado la plantilla %s"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 msgid "failed to process:"
 msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr "falta el código tex"
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 msgid "failed to generate image from code"
 msgstr "no he podido crear la imagen desde el código"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, fuzzy, perl-format
 msgid "%s plugin:"
 msgstr "complemento"
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, fuzzy, perl-format
 msgid "%s plugins"
 msgstr "complementos"
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr "¿ activar %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr "El archivo de configuración para este wiki es desconocido"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr "principal"
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Los cambios en la configuración que se muestran más abajo precisan una "
 "reconstrucción del wiki para tener efecto."
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1038,7 +1038,7 @@ msgstr ""
 "Para que los cambios en la configuración mostrados más abajo tengan efecto, "
 "es posible que necesite reconstruir el wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1113,25 +1113,35 @@ msgstr "ikiwiki: no puedo convertir la página %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "no puedo leer el archivo %s: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "no puedo leer el archivo %s: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "ha fallado la compilación del programa %s"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)"
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "el sistema de control de versiones %s no está soportado"
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1152,13 +1162,13 @@ msgid "wrapper filename not specified"
 msgstr "el programa envoltorio no ha sido especificado"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "ha fallado la compilación del programa %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "creado con éxito el programa envoltorio %s"
@@ -1171,19 +1181,24 @@ msgstr "uso: ikiwiki [opciones] origen destino"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup archivo_de_configuración"
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+#, fuzzy
+msgid "usage: --set-yaml var=value"
+msgstr "uso: --set variable=valor"
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
@@ -1191,44 +1206,44 @@ msgstr "actualizando el wiki.."
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 "Se necesita el módulo Sort::Naturally para el tipo de ordenación "
 "title_natural"
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
diff --git a/po/fr.po b/po/fr.po
index 723d3a036..6be9482ce 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Erreur"
 
@@ -138,7 +138,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "Suppression du compartiment S3 (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "Terminé"
 
@@ -246,7 +246,7 @@ msgstr "Commentaire ajouté"
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "Vous n'êtes pas authentifié comme administrateur"
 
@@ -506,7 +506,7 @@ msgstr "Miroirs"
 msgid "Mirror"
 msgstr "Miroir"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "modération du commentaire"
@@ -896,12 +896,12 @@ msgstr "Impossible de lire %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "Digest::SHA1 est nécessaire pour indexer %s"
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr "recherche"
 
@@ -983,54 +983,54 @@ msgstr "Erreur d'analyse à la ligne %d : %s"
 msgid "missing id parameter"
 msgstr "Paramètre d'identification manquant"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "Modèle de page %s introuvable"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 msgid "failed to process:"
 msgstr "Échec du traitement :"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr "Il manque le code TeX"
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 msgid "failed to generate image from code"
 msgstr "Échec de la création de l'image à partir du code"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, fuzzy, perl-format
 msgid "%s plugin:"
 msgstr "greffon"
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, fuzzy, perl-format
 msgid "%s plugins"
 msgstr "Greffons"
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr "activer %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr "Le fichier de configuration de ce wiki n'est pas connu"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr "Partie principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Les changements de configuration ci-dessous nécessitent une recompilation du "
 "wiki pour prendre effet"
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1038,7 +1038,7 @@ msgstr ""
 "Pour que les changements de configuration ci-dessous prennent effet vous "
 "devez recompiler le wiki"
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées."
@@ -1110,27 +1110,37 @@ msgstr "ikiwiki : impossible de reconstruire %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "Lecture impossible de %s : %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "Lecture impossible de %s : %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "Impossible de mettre à jour %s"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Vous devez spécifier un nom de wiki (contenant des caractères "
 "alphanumériques)"
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "Système de contrôle de version non reconnu : %s"
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1152,13 +1162,13 @@ msgid "wrapper filename not specified"
 msgstr "Le nom du fichier CGI n'a pas été indiqué"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Échec de la compilation de %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s a été créé avec succès"
@@ -1171,19 +1181,24 @@ msgstr "Syntaxe : ikiwiki [options] source destination"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup fichier de configuration"
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+#, fuzzy
+msgid "usage: --set-yaml var=value"
+msgstr "Syntaxe : -- set var=valeur"
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
@@ -1191,39 +1206,39 @@ msgstr "Rafraîchissement du wiki..."
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
diff --git a/po/gu.po b/po/gu.po
index f7725abb9..d4bfd42c0 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -135,7 +135,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -244,7 +244,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -507,7 +507,7 @@ msgstr "મિરરો"
 msgid "Mirror"
 msgstr "મિરર"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 msgid "comment needs moderation"
 msgstr ""
 
@@ -883,12 +883,12 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr ""
 
@@ -974,60 +974,60 @@ msgstr "ઉકેલવાનું લીટી %d પર નિષ્ફળ: %
 msgid "missing id parameter"
 msgstr "ખોવાયેલ આઇડી વિકલ્પ"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 msgid "failed to process:"
 msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 #, fuzzy
 msgid "missing tex code"
 msgstr "ખોવાયેલ કિંમતો"
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, perl-format
 msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1096,25 +1096,35 @@ msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "વાંચી શકાતી નથી %s: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1133,13 +1143,13 @@ msgid "wrapper filename not specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
@@ -1152,19 +1162,23 @@ msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+msgid "usage: --set-yaml var=value"
+msgstr ""
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
@@ -1172,38 +1186,38 @@ msgstr "વીકીને તાજી કરે છે.."
 msgid "Discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index df3000feb..c2f4e24a9 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-12 15:02-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr ""
 
@@ -136,7 +136,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr ""
 
@@ -242,7 +242,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -951,12 +951,12 @@ msgstr ""
 msgid "missing id parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 msgid "failed to process:"
 msgstr ""
 
@@ -968,41 +968,41 @@ msgstr ""
 msgid "failed to generate image from code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, perl-format
 msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1071,25 +1071,35 @@ msgstr ""
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr ""
 
+#: ../IkiWiki/Setup.pm:34
+#, perl-format
+msgid "cannot load %s in safe mode"
+msgstr ""
+
+#: ../IkiWiki/Setup.pm:46
+#, perl-format
+msgid "failed to parse %s"
+msgstr ""
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1108,13 +1118,13 @@ msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -1127,19 +1137,23 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+msgid "usage: --set-yaml var=value"
+msgstr ""
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1147,38 +1161,38 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index d664c4d30..b1b3dbd55 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -53,7 +53,7 @@ msgstr "Preferenze salvate."
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Errore"
 
@@ -135,7 +135,7 @@ msgstr "creazione nuova pagina %s"
 msgid "deleting bucket.."
 msgstr "eliminazione contenitore..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "fatto"
 
@@ -243,7 +243,7 @@ msgstr "Aggiunto commento"
 msgid "Added a comment: %s"
 msgstr "Aggiunto commento: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "non siete autenticati come amministratore"
 
@@ -501,7 +501,7 @@ msgstr "Mirror"
 msgid "Mirror"
 msgstr "Mirror"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 #, fuzzy
 msgid "comment needs moderation"
 msgstr "moderazione commento"
@@ -888,12 +888,12 @@ msgstr "impossibile leggere %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "è necessario Digest::SHA1 per l'indice di %s"
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr "cerca"
 
@@ -975,54 +975,54 @@ msgstr "errore di interpretazione alla riga %d: %s"
 msgid "missing id parameter"
 msgstr "parametro id mancante"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "modello %s non trovato"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 msgid "failed to process:"
 msgstr "errore nell'elaborazione:"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr "codice tex mancante"
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 msgid "failed to generate image from code"
 msgstr "impossibile generare l'immagine dal codice"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, fuzzy, perl-format
 msgid "%s plugin:"
 msgstr "plugin"
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, fuzzy, perl-format
 msgid "%s plugins"
 msgstr "plugin"
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr "abilitare %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr "il file di setup di questo wiki non è noto"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr "principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Le sottostanti modifiche alla configurazione richiedono la ricompilazione "
 "del wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1030,7 +1030,7 @@ msgstr ""
 "Affinché le sottostanti modifiche alla configurazione abbiano effetto, "
 "occorre ricostruire il wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
@@ -1101,25 +1101,35 @@ msgstr "ikiwiki: impossibile compilare %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "impossibile leggere %s: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "impossibile leggere %s: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "impossibile aggiornare %s"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)"
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "sistema di controllo di revisione %s non supportato"
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "impossibile creare un repository tramite ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1139,13 +1149,13 @@ msgid "wrapper filename not specified"
 msgstr "nome del file del contenitore non specificato"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "errore nel compilare %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s generato con successo"
@@ -1158,19 +1168,24 @@ msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup configfile"
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr "utilizzo: --set var=valore"
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+#, fuzzy
+msgid "usage: --set-yaml var=value"
+msgstr "utilizzo: --set var=valore"
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "generazione contenitori..."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "ricostruzione wiki..."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
@@ -1178,38 +1193,38 @@ msgstr "aggiornamento wiki..."
 msgid "Discussion"
 msgstr "Discussione"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr "impossibile usare più plugin rcs"
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
diff --git a/po/pl.po b/po/pl.po
index 77e1537f4..9fb3cacc0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Błąd"
 
@@ -139,7 +139,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "gotowe"
 
@@ -248,7 +248,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -520,7 +520,7 @@ msgstr "Kopie lustrzane"
 msgid "Mirror"
 msgstr "Kopia lustrzana"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 msgid "comment needs moderation"
 msgstr ""
 
@@ -898,12 +898,12 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr ""
 
@@ -995,61 +995,61 @@ msgstr "awaria w trakcie przetwarzania linii %d: %s"
 msgid "missing id parameter"
 msgstr "brakujący parametr id"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "nieznaleziony szablon %s"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 #, fuzzy
 msgid "failed to process:"
 msgstr "awaria w trakcie przetwarzania:"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 #, fuzzy
 msgid "missing tex code"
 msgstr "brakujące wartości"
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, perl-format
 msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1118,25 +1118,35 @@ msgstr "ikiwiki: awaria w trakcie tworzenia %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "awaria w trakcie odczytu %s: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "awaria w trakcie kompilowania %s"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1155,13 +1165,13 @@ msgid "wrapper filename not specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "awaria w trakcie kompilowania %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "pomyślnie utworzono %s"
@@ -1174,19 +1184,23 @@ msgstr "użycie: ikiwiki [parametry] źródło cel"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+msgid "usage: --set-yaml var=value"
+msgstr ""
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
@@ -1194,40 +1208,40 @@ msgstr "odświeżanie wiki..."
 msgid "Discussion"
 msgstr "Dyskusja"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 20a8020c1..0d4c6202e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Fel"
 
@@ -136,7 +136,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "klar"
 
@@ -245,7 +245,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -513,7 +513,7 @@ msgstr "Speglar"
 msgid "Mirror"
 msgstr "Spegel"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 msgid "comment needs moderation"
 msgstr ""
 
@@ -888,12 +888,12 @@ msgstr "misslyckades med att skriva %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr ""
 
@@ -983,60 +983,60 @@ msgstr "misslyckades med att skriva %s: %s"
 msgid "missing id parameter"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 #, fuzzy
 msgid "failed to process:"
 msgstr "misslyckades med att behandla mall:"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, perl-format
 msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1105,25 +1105,35 @@ msgstr "ikiwiki: kan inte rita upp %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "kan inte läsa %s: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "kan inte läsa %s: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "misslyckades med att kompilera %s"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1142,13 +1152,13 @@ msgid "wrapper filename not specified"
 msgstr "filnamn för wrapper har inte angivits"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "misslyckades med att kompilera %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "generering av %s lyckades"
@@ -1161,19 +1171,23 @@ msgstr "användning: ikiwiki [flaggor] källa mål"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+msgid "usage: --set-yaml var=value"
+msgstr ""
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
@@ -1181,38 +1195,38 @@ msgstr "uppdaterar wiki.."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
diff --git a/po/tr.po b/po/tr.po
index b3742ca36..b59f5e941 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgstr "Tercihler kaydedildi."
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Hata"
 
@@ -132,7 +132,7 @@ msgstr "%s için yeni sayfa oluşturuluyor"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr ""
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -490,7 +490,7 @@ msgstr ""
 msgid "Mirror"
 msgstr ""
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 msgid "comment needs moderation"
 msgstr ""
 
@@ -860,12 +860,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr ""
 
@@ -947,58 +947,58 @@ msgstr ""
 msgid "missing id parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 msgid "failed to process:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 msgid "failed to generate image from code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, perl-format
 msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1067,25 +1067,35 @@ msgstr ""
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr ""
 
+#: ../IkiWiki/Setup.pm:34
+#, perl-format
+msgid "cannot load %s in safe mode"
+msgstr ""
+
+#: ../IkiWiki/Setup.pm:46
+#, perl-format
+msgid "failed to parse %s"
+msgstr ""
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1104,13 +1114,13 @@ msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -1123,19 +1133,23 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+msgid "usage: --set-yaml var=value"
+msgstr ""
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1143,38 +1157,38 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index cfc7184ef..5f968ccb3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-04-03 14:18-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
 msgid "Error"
 msgstr "Lỗi"
 
@@ -137,7 +137,7 @@ msgstr "đang tạo trang mới %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
 msgid "done"
 msgstr "xong"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -513,7 +513,7 @@ msgstr "Nhân bản"
 msgid "Mirror"
 msgstr "Nhân bản"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 msgid "comment needs moderation"
 msgstr ""
 
@@ -888,12 +888,12 @@ msgstr "lỗi ghi %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:184
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:221
 msgid "search"
 msgstr ""
 
@@ -983,60 +983,60 @@ msgstr "lỗi ghi %s: %s"
 msgid "missing id parameter"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/template.pm:41
+#: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
 msgid "template %s not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/template.pm:60
+#: ../IkiWiki/Plugin/template.pm:66
 #, fuzzy
 msgid "failed to process:"
 msgstr "mẫu không xử lý được:"
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 #, fuzzy
 msgid "failed to generate image from code"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, perl-format
 msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:274
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:290
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:433
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:437
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:474
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1105,25 +1105,35 @@ msgstr "ikiwiki: không thể vẽ %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "không thể đọc %s: %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "không thể đọc %s: %s"
+
+#: ../IkiWiki/Setup.pm:46
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "lỗi biên dịch %s"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1142,13 +1152,13 @@ msgid "wrapper filename not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:159
 #, perl-format
 msgid "failed to compile %s"
 msgstr "lỗi biên dịch %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:179
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s đã được tạo ra"
@@ -1161,19 +1171,23 @@ msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:95
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:102
+msgid "usage: --set-yaml var=value"
+msgstr ""
+
+#: ../ikiwiki.in:156
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:219
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:222
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
@@ -1181,38 +1195,38 @@ msgstr "đang làm tươi wiki.."
 msgid "Discussion"
 msgstr "Thảo luận"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:530
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:576
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:605
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1278
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:1901
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2020
+#: ../IkiWiki.pm:2044
 msgid "Sort::Naturally needed for title_natural sort"
 msgstr ""
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2055
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2074
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From af2bf285155ea4fc92932ba0b8e9becef57c69e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Apr 2010 15:15:25 -0400
Subject: add news item for ikiwiki 3.20100403

---
 doc/news/version_3.20100102.3.mdwn | 21 ---------------------
 doc/news/version_3.20100403.mdwn   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 21 deletions(-)
 delete mode 100644 doc/news/version_3.20100102.3.mdwn
 create mode 100644 doc/news/version_3.20100403.mdwn

diff --git a/doc/news/version_3.20100102.3.mdwn b/doc/news/version_3.20100102.3.mdwn
deleted file mode 100644
index b8f61978c..000000000
--- a/doc/news/version_3.20100102.3.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-ikiwiki 3.20100102.3 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   Happy palindrome day!
-
-   * pagestats: Add show parameter. Closes: #[562129](http://bugs.debian.org/562129) (David Paleino)
-   * toc: Add startlevel parameter. (kerravonsen)
-   * Remove example ikiwiki setup file from the Debian package. This
-     re-enables linking to /usr/share/ikiwiki/examples which has the
-     example sites also used by auto-blog.setup. The example setup file
-     can be generated at any time using ikiwiki --dumpsetup so I do
-     not see a reason to ship it. Closes: #[562183](http://bugs.debian.org/562183)
-   * Use env hack in python scripts.
-   * comments: Add a checksum to the name of comment pages, to
-     avoid merge conflicts when comments are posted to two branches of a
-     site.
-   * linkmap: Add option to omit disconnected pages from the map.
-   * inline: Fix bug that limited displayed pages when feedshow was
-     specified w/o show.
-   * Fix several places that did not properly handle capitalization of
-     the discussionpage setting. Specifically, fixes discussion actions
-     on discussion pages, and unbreaks the opendiscussion plugin."""]]
diff --git a/doc/news/version_3.20100403.mdwn b/doc/news/version_3.20100403.mdwn
new file mode 100644
index 000000000..86d6a0f37
--- /dev/null
+++ b/doc/news/version_3.20100403.mdwn
@@ -0,0 +1,30 @@
+ikiwiki 3.20100403 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * websetup: Add websetup\_unsafe to allow marking other settings
+     as unsafe.
+   * Improve openid url munging; do not display anchors and cgi parameters,
+     as used by yahoo and google urls.
+   * Add complete German basewiki and directives translation done by
+     Sebastian Kuhnert.
+   * Add a include setting, which can be used to make ikiwiki process
+     wiki source files, such as .htaccess, that would normally be skipped
+     for security or other reasons. Closes: #[447267](http://bugs.debian.org/447267)
+     (Thanks to Aaron Wilson for the original patch.)
+   * Add support for setup files written in YAML.
+   * Add --set-yaml switch for setting more complex config file options.
+   * filecheck: Fix bugs that prevented the pagespecs from matching when
+     not called by attachment plugin.
+   * Fix incorrect influence info returned by a failing link() pagespec,
+     that could lead to bad dependency handling in certian situations.
+   * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
+     if necessary for unusual install.
+   * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
+   * Allow wrappers to be built using tcc. (Workaround #452876)
+   * openid: Use Openid Simple Registration or OpenID Attribute Exchange
+     to get the user's email address and username. (Neither is yet
+     used, but they are available in the session object now.)
+   * page.tmpl: Add Cache-Control must-revalidate to ensure that users
+     (especially of Firefox) see fresh page content.
+   * htmlscrubber: Allow colons in urls after '?'
+   * template: Search for templates in the templatedir, if they are not
+     found as pages in the wiki."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 195943e588b8c7b6a3a43d10404d2d40a503c1d5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Apr 2010 16:07:32 -0400
Subject: slightly more consistent capitalisation of ikiwiki

For a while, I was avoiding capitalizing ikiwiki at the beginning of a
sentence. I now think that's a bad idea (unless explicitly referring to
the `ikiwiki` command). Still, I don't go all the way and always cap it,
as a proper noun. That would make the logo look bad. ;)

I also tend to avoid capping it as IkiWiki, except when referring to the
perl internals, which do use that capitalization. (Too late to change
that.) However, it's also reasonable to do so in a WikiLink, as a nod to
historical camelcase wikis.
---
 debian/control                     |  6 +++---
 doc/download.mdwn                  |  2 +-
 doc/features.mdwn                  | 12 ++++++------
 doc/forum/speeding_up_ikiwiki.mdwn |  2 +-
 doc/index.mdwn                     |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 24c2c96a5..d7ce9a178 100644
--- a/debian/control
+++ b/debian/control
@@ -42,17 +42,17 @@ Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
 Description: a wiki compiler
- ikiwiki converts a directory full of wiki pages into HTML pages suitable
+ Ikiwiki converts a directory full of wiki pages into HTML pages suitable
  for publishing on a website. Unlike many wikis, ikiwiki does not have its
  own ad-hoc means of storing page history, and instead uses a revision control
  system such as Subversion or Git.
  .
- ikiwiki implements all of the other standard features of a wiki, including
+ Ikiwiki implements all of the other standard features of a wiki, including
  web-based page editing, user registration and logins, a RecentChanges
  page, BackLinks, search, Discussion pages, tags, smart merging and conflict
  resolution, and page locking.
  .
- ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
+ Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
  ikiwiki provides a plugin system which allows many other features to be
  added. Some of the plugins have additional dependencies, found among the
  Recommends and Suggests of this package.
diff --git a/doc/download.mdwn b/doc/download.mdwn
index 45d0d7870..92c8a4f75 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -35,7 +35,7 @@ own RPM.
 
 ## BSD ports
 
-IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
+Ikiwiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
 by running `sudo port install ikiwiki`.
 
 NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 3925d78ef..ab521213d 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -13,7 +13,7 @@ Instead of editing pages in a stupid web form, you can use vim and commit
 changes via [[Subversion|rcs/svn]], [[rcs/git]], or any of a number of other
 [[Revision_Control_Systems|rcs]].
 
-ikiwiki can be run from a [[post-commit]] hook to update your wiki
+Ikiwiki can be run from a [[post-commit]] hook to update your wiki
 immediately whenever you commit a change using the RCS.
 
 It's even possible to securely let
@@ -25,7 +25,7 @@ run a simple wiki without page history, it can do that too.
 
 ## A wiki compiler
 
-ikiwiki is a wiki compiler; it builds a static website for your wiki, and
+Ikiwiki is a wiki compiler; it builds a static website for your wiki, and
 updates it as pages are edited. It is fast and smart about updating a wiki,
 it only builds pages that have changed (and tracks things like creation of
 new pages and links that can indirectly cause a page to need a rebuild)
@@ -45,7 +45,7 @@ easily be added by [[plugins]]. For example it also supports traditional
 [[plugins/HTML]], or pages written in [[reStructuredText|plugins/rst]]
 or [[Textile|plugins/textile]].
 
-ikiwiki also supports files of any other type, including plain text,
+Ikiwiki also supports files of any other type, including plain text,
 images, etc. These are not converted to wiki pages, they are just copied
 unchanged by ikiwiki as it builds your wiki. So you can check in an image,
 program, or other special file and link to it from your wiki pages.
@@ -70,8 +70,8 @@ you would care to syndicate.
 
 ## Valid html and [[css]]
 
-ikiwiki aims to produce 
-[valid XHTML 1.0](http://validator.w3.org/check?url=referer). ikiwiki
+Ikiwiki aims to produce 
+[valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
 generates html using [[templates|wikitemplates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
 
@@ -163,7 +163,7 @@ Well, sorta. Rather than implementing YA history browser, it can link to
 
 ### Full text search
 
-ikiwiki can use the xapian search engine to add powerful
+Ikiwiki can use the xapian search engine to add powerful
 full text [[plugins/search]] capabilities to your wiki.
 
 ### Translation via po files
diff --git a/doc/forum/speeding_up_ikiwiki.mdwn b/doc/forum/speeding_up_ikiwiki.mdwn
index 2c2ac240e..799186cf8 100644
--- a/doc/forum/speeding_up_ikiwiki.mdwn
+++ b/doc/forum/speeding_up_ikiwiki.mdwn
@@ -56,7 +56,7 @@ number is still too large to really visualize: the graphviz PNG and PDF output
 engines segfault for me, the PS one works but I can't get any PS software to
 render it without exploding.
 
-Now, the relations in the links hash are not the same thing as IkiWiki's notion of dependencies. Can anyone point me at  that data structure / where I might be able to add some debugging foo to generate a graph of it?
+Now, the relations in the links hash are not the same thing as Ikiwiki's notion of dependencies. Can anyone point me at  that data structure / where I might be able to add some debugging foo to generate a graph of it?
 
 Once I've figured out that I might be able to optimize some pagespecs. I
 understand pagespecs are essentially translated into sequential perl code. I
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..06acc9cec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -24,5 +24,5 @@ The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
 can be submitted and tracked using this wiki.
 
-ikiwiki is developed by [[Joey]] and many contributors,
+Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
-- 
cgit v1.2.3


From a358d74bef51dae31332ff27e897fe04834571e6 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Wed, 3 Feb 2010 04:29:10 +0100
Subject: Check for existence off srcfile in add_autofile

add_autofile has to have checks, whether to create the file, anyway, so this
will make things more consistent.

Correcter check for the result of verify_src_file().

Cosmetic rename of a variable $addfile to $autofile.
---
 IkiWiki.pm            | 11 ++++++++---
 IkiWiki/Plugin/tag.pm |  5 ++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 90e623330..56c491339 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1897,9 +1897,14 @@ sub add_link ($$) {
 }
 
 sub add_autofile ($) {
-	my $addfile=shift;
-	my ($file,$page) = verify_src_file($addfile,$config{srcdir});
-	if ($page) {
+	my $autofile=shift;
+
+	if (srcfile($autofile, 1)) {
+		return 0;
+	}
+
+	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
+	if (defined $file) {
 		push @autofiles, $file;
 	}
 }
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c0b7feb23..c6c99ae45 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -71,15 +71,14 @@ sub gentag ($) {
 	if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
-		return if (srcfile($tagfile,1));
+
+		return if (! add_autofile($tagfile));
 
 		debug(sprintf(gettext("creating tag page %s"), $tag));
 
 		my $template=template("autotag.tmpl");
 		$template->param(tag => $tag);
 		writefile($tagfile, $config{srcdir}, $template->output);
-
-		add_autofile("$config{srcdir}/$tagfile");
 	}
 }
 
-- 
cgit v1.2.3


From 628a52a6c49f5d2fc5af251f2d718c8dff5e8ed5 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sat, 3 Apr 2010 21:17:20 +0200
Subject: Revert "Revert the effects of find_del_files() for (re)autoadded
 files."

This reverts commit 31680111f0062f07727d14fcf291c98978ad5a2f.
---
 IkiWiki.pm        | 3 +--
 IkiWiki/Render.pm | 9 ---------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 56c491339..1770703a5 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,8 +14,7 @@ use open qw{:utf8 :std};
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
 	    %pagesources %destsources %depends %depends_simple %hooks
-	    %forcerebuild %loaded_plugins @autofiles %dellinks
-	    %delrenderedfiles};
+	    %forcerebuild %loaded_plugins @autofiles};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5b72b6de1..fc71c8919 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -392,9 +392,7 @@ sub find_del_files ($) {
 			else {
 				push @del, $pagesources{$page};
 			}
-			$dellinks{$page}= $links{$page};
 			$links{$page}=[];
-			$delrenderedfiles{$page}= $renderedfiles{$page};
 			$renderedfiles{$page}=[];
 			$pagemtime{$page}=0;
 		}
@@ -644,14 +642,8 @@ sub refresh () {
 		scan($file);
 	}
 
-	my %del_hash = map {$_, 1} @$del;
 	while (my $autofile = shift (@autofiles)) {
 		my $page=pagename($autofile);
-    if (exists $del_hash{$page}) {
-			$links{$page}= $dellinks{$page};
-			$renderedfiles{$page}= $delrenderedfiles{$page};
-			delete $del_hash{$page};
-		}
 		if ($pages->{$page}) {
 			debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 		}
@@ -663,7 +655,6 @@ sub refresh () {
 
 		scan($autofile);
 	}
-	$del = [keys %del_hash];
 
 	calculate_links();
 	
-- 
cgit v1.2.3


From 981400177d68a279f485727be3f013e68f0bf691 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sat, 3 Apr 2010 21:10:16 +0200
Subject: Make sure deleted tag pages don't get recreated.

The reason to do this is basically a user interaction design decision.

It is achieved by adding an entry, associated to the creating plugin, to
%pagestate. To find out if files were deleted a new global hash %del_hash is
%introduced.
---
 IkiWiki.pm            | 19 +++++++++++++++----
 IkiWiki/Plugin/tag.pm |  2 +-
 IkiWiki/Render.pm     |  5 ++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1770703a5..966a3bbc6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,7 +14,7 @@ use open qw{:utf8 :std};
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
 	    %pagesources %destsources %depends %depends_simple %hooks
-	    %forcerebuild %loaded_plugins @autofiles};
+	    %forcerebuild %loaded_plugins %autofiles %del_hash};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
@@ -1895,17 +1895,28 @@ sub add_link ($$) {
 		unless grep { $_ eq $link } @{$links{$page}};
 }
 
-sub add_autofile ($) {
+sub add_autofile ($$) {
 	my $autofile=shift;
+	my $plugin=shift;
 
 	if (srcfile($autofile, 1)) {
 		return 0;
 	}
 
 	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
-	if (defined $file) {
-		push @autofiles, $file;
+
+	if ((!defined $file) ||
+	(exists $pagestate{$page}{$plugin}{autofile_deleted})) {
+		return 0;
+	}
+
+	if (exists $del_hash{$file}) {
+		$pagestate{$page}{$plugin}{autofile_deleted}=1;
+		return 0;
 	}
+
+	$autofiles{$file}=$plugin;
+	return 1;
 }
 
 sub pagespec_translate ($) {
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c6c99ae45..fdd63d637 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -72,7 +72,7 @@ sub gentag ($) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
 
-		return if (! add_autofile($tagfile));
+		return if (! add_autofile($tagfile, "tag"));
 
 		debug(sprintf(gettext("creating tag page %s"), $tag));
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fc71c8919..0c21455fb 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -637,12 +637,14 @@ sub refresh () {
 	my ($changed, $internal_changed)=find_changed($files);
 	run_hooks(needsbuild => sub { shift->($changed) });
 	my $oldlink_targets=calculate_old_links($changed, $del);
+	%del_hash = map { $_ => 1 } @{$del};
 
 	foreach my $file (@$changed) {
 		scan($file);
 	}
 
-	while (my $autofile = shift (@autofiles)) {
+	while (my $autofile = shift @{[keys %autofiles]}) {
+		my $plugin=$autofiles{$autofile};
 		my $page=pagename($autofile);
 		if ($pages->{$page}) {
 			debug(sprintf(gettext("%s has multiple possible source pages"), $page));
@@ -654,6 +656,7 @@ sub refresh () {
 		push @{$changed}, $autofile if find_changed([$autofile]);
 
 		scan($autofile);
+		delete $autofiles{$autofile};
 	}
 
 	calculate_links();
-- 
cgit v1.2.3


From 36202d461f86bb3869444cf161d9bfe62298b8f8 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 5 Feb 2010 12:54:07 +0100
Subject: link to commits

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index a0e76fd48..c4a92824b 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -165,7 +165,7 @@ wrong direction.
 > optimised, and security-sensitive ground, so I have to look at them very
 > carefully. --[[Joey]]
 > 
-> * In the refactoring in f3abeac919c4736429bd3362af6edf51ede8e7fe,
+> * In the refactoring in [f3abeac919c4736429bd3362af6edf51ede8e7fe][],
 >   you introduced at least 2 bugs, one a possible security hole.
 >   Now one part of the code tests `if ($file)` and the other
 >   caller tests `if ($f)`. These two tests both tested `if (! defined $f)`
@@ -181,14 +181,18 @@ wrong direction.
 > I'd like to cherry-pick the above commit, once it's in shape, before
 > looking at the rest in detail. So just a few other things that stood out.
 > 
-> * Commit 4af4d26582f0c2b915d7102fb4a604b176385748 seems unnecessary.
+> * Commit [4af4d26582f0c2b915d7102fb4a604b176385748][] seems unnecessary.
 >   `srcfile($file, 1)` already is documented to return undef if the
 >   file does not exist. (But without the second parameter, it throws
 >   an error.)
 >
-> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 adds a line
+> * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] adds a line
 >   that is intented by a space, not a tab.
 > 
-> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 says that auto-added
+> * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] says that auto-added
 >   files will be recreated if the user deletes them. That seems bad.
 >   `autoindex` goes to some trouble to not recreate deleted files.
+
+[f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
+[4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
+[f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
-- 
cgit v1.2.3


From 129bea3177b59be8ed4cc303720c8747f59a11ba Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sat, 3 Apr 2010 23:38:05 +0200
Subject: answer about autofiles for tags

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 29 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index c4a92824b..07b570b1b 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -164,7 +164,11 @@ wrong direction.
 > Starting review of this. Some of your commits are to very delicate,
 > optimised, and security-sensitive ground, so I have to look at them very
 > carefully. --[[Joey]]
-> 
+
+>> First of, sorry that it took me so damn long to answer. I didn't lose
+>> interest but it took a while for me to find the time and motivation
+>> to address you suggestions. --[[David_Riebenbauer]]
+
 > * In the refactoring in [f3abeac919c4736429bd3362af6edf51ede8e7fe][],
 >   you introduced at least 2 bugs, one a possible security hole.
 >   Now one part of the code tests `if ($file)` and the other
@@ -177,7 +181,11 @@ wrong direction.
 >   bare `_` in the first to make perl reuse the stat buffer.
 > * (As a matter of style, could you put a space after the commas in your
 >   perl?)
-> 
+
+>> The first two points should be addressed in
+>> [da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0][]. And sure, I can add the
+>> spaces. --[[David_Riebenbauer]]
+
 > I'd like to cherry-pick the above commit, once it's in shape, before
 > looking at the rest in detail. So just a few other things that stood out.
 > 
@@ -185,14 +193,27 @@ wrong direction.
 >   `srcfile($file, 1)` already is documented to return undef if the
 >   file does not exist. (But without the second parameter, it throws
 >   an error.)
->
+
+>> You're right. I must have been some confused by some other promplem I
+>> introduced then. Reverted. --[[David_Riebenbauer]]
+
 > * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] adds a line
 >   that is intented by a space, not a tab.
-> 
+
+>> Sorry, That one was reverted anyway. --[[David_Riebenbauer]]
+
 > * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] says that auto-added
 >   files will be recreated if the user deletes them. That seems bad.
 >   `autoindex` goes to some trouble to not recreate deleted files.
 
+>> I reverted the commit and addressed the issue in
+>> [a358d74bef51dae31332ff27e897fe04834571e6][] and
+>> [981400177d68a279f485727be3f013e68f0bf691][].
+ --[[David_Riebenbauer]]
+
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
 [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
+[da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0 (commitdiff for da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0)
+[a358d74bef51dae31332ff27e897fe04834571e6]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=a358d74bef51dae31332ff27e897fe04834571e6 (commitdiff for a358d74bef51dae31332ff27e897fe04834571e6)
+[981400177d68a279f485727be3f013e68f0bf691]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=981400177d68a279f485727be3f013e68f0bf691 (commitdiff for 981400177d68a279f485727be3f013e68f0bf691)
-- 
cgit v1.2.3


From c1a42e76bc6667bfb2882a12d53c25d9f952ca82 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 2 Apr 2010 00:28:02 +0100
Subject: implement typed links; add tagged_is_strict config option

---
 IkiWiki.pm                                         | 58 ++++++++++++++++++----
 IkiWiki/Plugin/tag.pm                              | 36 +++++++++-----
 IkiWiki/Render.pm                                  | 33 ++++++++++++
 .../tagged__40____41___matching_wikilinks.mdwn     |  3 ++
 doc/ikiwiki/pagespec.mdwn                          |  3 ++
 doc/plugins/tag.mdwn                               |  5 ++
 doc/plugins/write.mdwn                             | 21 +++++++-
 t/index.t                                          | 17 +++++--
 t/tag.t                                            | 45 +++++++++++++++++
 9 files changed, 193 insertions(+), 28 deletions(-)
 create mode 100755 t/tag.t

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6739ba56c..25e9247b2 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,7 +14,7 @@ use open qw{:utf8 :std};
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
 	    %pagesources %destsources %depends %depends_simple %hooks
-	    %forcerebuild %loaded_plugins};
+	    %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
@@ -24,7 +24,7 @@ our @EXPORT = qw(hook debug error template htmlpage deptype
 		 add_underlay pagetitle titlepage linkpage newpagefile
 		 inject add_link
                  %config %links %pagestate %wikistate %renderedfiles
-                 %pagesources %destsources);
+                 %pagesources %destsources %typedlinks);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
@@ -1503,7 +1503,7 @@ sub loadindex () {
 	if (! $config{rebuild}) {
 		%pagesources=%pagemtime=%oldlinks=%links=%depends=
 		%destsources=%renderedfiles=%pagecase=%pagestate=
-		%depends_simple=();
+		%depends_simple=%typedlinks=%oldtypedlinks=();
 	}
 	my $in;
 	if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
@@ -1569,6 +1569,14 @@ sub loadindex () {
 			if (exists $d->{state}) {
 				$pagestate{$page}=$d->{state};
 			}
+			if (exists $d->{typedlinks}) {
+				$typedlinks{$page}=$d->{typedlinks};
+
+				while (my ($type, $links) = each %{$typedlinks{$page}}) {
+					next unless %$links;
+					$oldtypedlinks{$page}{$type} = {%$links};
+				}
+			}
 		}
 		$oldrenderedfiles{$page}=[@{$d->{dest}}];
 	}
@@ -1617,6 +1625,10 @@ sub saveindex () {
 			$index{page}{$src}{depends_simple} = $depends_simple{$page};
 		}
 
+		if (exists $typedlinks{$page} && %{$typedlinks{$page}}) {
+			$index{page}{$src}{typedlinks} = $typedlinks{$page};
+		}
+
 		if (exists $pagestate{$page}) {
 			foreach my $id (@hookids) {
 				foreach my $key (keys %{$pagestate{$page}{$id}}) {
@@ -1926,12 +1938,17 @@ sub inject {
 	use warnings;
 }
 
-sub add_link ($$) {
+sub add_link ($$;$) {
 	my $page=shift;
 	my $link=shift;
+	my $type=shift;
 
 	push @{$links{$page}}, $link
 		unless grep { $_ eq $link } @{$links{$page}};
+
+	if (defined $type) {
+		$typedlinks{$page}{$type}{$link} = 1;
+	}
 }
 
 sub pagespec_translate ($) {
@@ -2212,6 +2229,11 @@ sub match_link ($$;@) {
 
 	$link=derel($link, $params{location});
 	my $from=exists $params{location} ? $params{location} : '';
+	my $linktype=$params{linktype};
+	my $qualifier='';
+	if (defined $linktype) {
+		$qualifier=" with type $linktype";
+	}
 
 	my $links = $IkiWiki::links{$page};
 	return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
@@ -2219,19 +2241,33 @@ sub match_link ($$;@) {
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
 		if (length $bestlink) {
-			return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
-				if $bestlink eq IkiWiki::bestlink($page, $p);
+			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && $bestlink eq IkiWiki::bestlink($page, $p)) {
+				return IkiWiki::SuccessReason->new("$page links to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+			}
 		}
 		else {
-			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
-				if match_glob($p, $link, %params);
+			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && match_glob($p, $link, %params)) {
+				return IkiWiki::SuccessReason->new("$page links to page $p$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+			}
 			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
-				if match_glob($p_rel, $link, %params);
+			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p_rel}) && match_glob($p_rel, $link, %params)) {
+				return IkiWiki::SuccessReason->new("$page links to page $p_rel$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+			}
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
+	return IkiWiki::FailReason->new("$page does not link to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
+}
+
+sub match_typedlink($$;@) {
+	my $page = shift;
+	my $args = shift;
+
+	if ($args =~ /^(\w+)\s+(.*)$/) {
+		return match_link($page, $2, @_, linktype => $1);
+	}
+
+	return IkiWiki::ErrorReason->new("typedlink expects e.g. 'tag *' but got: $args");
 }
 
 sub match_backlink ($$;@) {
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index cdcfaf536..af4bff1bc 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -6,8 +6,6 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 
-my %tags;
-
 sub import {
 	hook(type => "getopt", id => "tag", call => \&getopt);
 	hook(type => "getsetup", id => "tag", call => \&getsetup);
@@ -36,6 +34,13 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		tagged_is_strict => {
+			type => "boolean",
+			default => 0,
+			description => "if 1, tagged() doesn't match normal WikiLinks to tag pages",
+			safe => 1,
+			rebuild => 1,
+		},
 }
 
 sub tagpage ($) {
@@ -71,9 +76,8 @@ sub preprocess_tag (@) {
 
 	foreach my $tag (keys %params) {
 		$tag=linkpage($tag);
-		$tags{$page}{$tag}=1;
 		# hidden WikiLink
-		add_link($page, tagpage($tag));
+		add_link($page, tagpage($tag), 'tag');
 	}
 		
 	return "";
@@ -87,15 +91,13 @@ sub preprocess_taglink (@) {
 	return join(" ", map {
 		if (/(.*)\|(.*)/) {
 			my $tag=linkpage($2);
-			$tags{$params{page}}{$tag}=1;
-			add_link($params{page}, tagpage($tag));
+			add_link($params{page}, tagpage($tag), 'tag');
 			return taglink($params{page}, $params{destpage}, $tag,
 				linktext => pagetitle($1));
 		}
 		else {
 			my $tag=linkpage($_);
-			$tags{$params{page}}{$tag}=1;
-			add_link($params{page}, tagpage($tag));
+			add_link($params{page}, tagpage($tag), 'tag');
 			return taglink($params{page}, $params{destpage}, $tag);
 		}
 	}
@@ -110,17 +112,19 @@ sub pagetemplate (@) {
 	my $destpage=$params{destpage};
 	my $template=$params{template};
 
+	my $tags = $typedlinks{$page}{tag};
+
 	$template->param(tags => [
 		map { 
 			link => taglink($page, $destpage, $_, rel => "tag")
-		}, sort keys %{$tags{$page}}
-	]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
+		}, sort keys %$tags
+	]) if defined $tags && %$tags && $template->query(name => "tags");
 
 	if ($template->query(name => "categories")) {
 		# It's an rss/atom template. Add any categories.
-		if (exists $tags{$page} && %{$tags{$page}}) {
+		if (defined $tags && %$tags) {
 			$template->param(categories => [map { category => $_ },
-				sort keys %{$tags{$page}}]);
+				sort keys %$tags]);
 		}
 	}
 }
@@ -130,7 +134,13 @@ package IkiWiki::PageSpec;
 sub match_tagged ($$;@) {
 	my $page = shift;
 	my $glob = shift;
-	return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
+
+	if ($IkiWiki::config{tagged_is_strict}) {
+		return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag');
+	}
+	else {
+		return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
+	}
 }
 
 1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index abafb0887..5810fc974 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -167,6 +167,7 @@ sub scan ($) {
 		else {
 			$links{$page}=[];
 		}
+		delete $typedlinks{$page};
 
 		run_hooks(scan => sub {
 			shift->(
@@ -398,6 +399,7 @@ sub find_del_files ($) {
 				push @del, $pagesources{$page};
 			}
 			$links{$page}=[];
+			delete $typedlinks{$page};
 			$renderedfiles{$page}=[];
 			$pagemtime{$page}=0;
 		}
@@ -499,6 +501,29 @@ sub remove_unrendered () {
 	}
 }
 
+sub link_types_changed ($$) {
+	# each is of the form { type => { link => 1 } }
+	my $new = shift;
+	my $old = shift;
+
+	return 0 if !defined $new && !defined $old;
+	return 1 if !defined $new || !defined $old;
+
+	while (my ($type, $links) = each %$new) {
+		foreach my $link (keys %$links) {
+			return 1 unless exists $old{$type}{$link};
+		}
+	}
+
+	while (my ($type, $links) = each %$old) {
+		foreach my $link (keys %$links) {
+			return 1 unless exists $new{$type}{$link};
+		}
+	}
+
+	return 0;
+}
+
 sub calculate_changed_links ($$$) {
 	my ($changed, $del, $oldlink_targets)=@_;
 
@@ -525,6 +550,14 @@ sub calculate_changed_links ($$$) {
 			}
 			$linkchangers{lc($page)}=1;
 		}
+
+		# we currently assume that changing the type of a link doesn't
+		# change backlinks
+		if (!exists $linkchangers{lc($page)}) {
+			if (link_types_changed($typedlinks{$page}, $oldlinktypes{$page})) {
+				$linkchangers{lc($page)}=1;
+			}
+		}
 	}
 
 	return \%backlinkchanged, \%linkchangers;
diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index e7e4af7c3..9037d6c02 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -28,6 +28,9 @@ rationale on this, or what am I doing wrong, and how to achieve what I want?
 >> is valid. [[todo/matching_different_kinds_of_links]] is probably
 >> how it will eventually be solved. --[[Joey]] 
 
+>>> [[Done]]: you can now set the `tagged_is_strict` config option to `1`
+>>> if you don't want `tagged` to match other wikilinks. --[[smcv]]
+
 > And this is an illustration why a clean work-around (without changing the software) is not possible: while thinking about [[todo/matching_different_kinds_of_links]], I thought one could work around the problem by simply explicitly including the kind of the relation into the link target (like the tagbase in tags), and by having a separate page without the "tagbase" to link to when one wants simply to refer to the tag without tagging. But this won't work: one has to at least once refer to the real tag page if one wants to talk about it, and this reference will count as tagging (unwanted). --Ivan Z.
 
 > But well, perhaps there is a workaround without introducing different kinds of links. One could modify the [[tag plugin|plugins/tag]] so that it adds 2 links to a page: for tagging -- `tagbase/TAG`, and for navigation -- `tagdescription/TAG` (displayed at the bottom). Then the `tagdescription/TAG` page would hold whatever list one wishes (with `tagged(TAG)` in the pagespec), and whenever one wants to merely refer to the tag, one should link to `tagdescription/TAG`--this link won't count as tagging. So, `tagbase/TAG` would become completely auxiliary (internal) link targets for ikiwiki, the users would edit or link to only `tagdescription/TAG`. --Ivan Z.
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 5c191f23f..ca6693024 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -52,6 +52,9 @@ Some more elaborate limits can be added to what matches using these functions:
   specified IP address.
 * "`postcomment(glob)`" - matches only when comments are being 
   posted to a page matching the specified glob
+* "`typedlink(type glob)`" - matches pages that link to a given page (or glob)
+  with a given link type. Plugins can create links with a specific type:
+  for instance, the tag plugin creates links of type `tag`.
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index 8ff70a069..8cd79da41 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -8,6 +8,11 @@ These directives allow tagging pages.
 It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
 match pages that are tagged with a specific tag.
 
+If the `tagged_is_strict` config option is set, `tagged()` will only match
+tags explicitly set with [[ikiwiki/directive/tag]] or
+[[ikiwiki/directive/taglink]]; if not (the default), it will also match
+any other [[WikiLinks|ikiwiki/WikiLink]] to the tag page.
+
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
 page is tagged with the "tags" tag.
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 96a2aa16d..fe7cf0183 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -633,6 +633,22 @@ reference. Do not modify this hash directly; call `add_link()`.
 
 	$links{"foo"} = ["bar", "baz"];
 
+### `%typedlinks`
+
+The `%typedlinks` hash records links of specific types. Do not modify this
+hash directly; call `add_link()`. The keys are page names, and the values
+are hash references. In each page's hash reference, the keys are link types
+defined by plugins, and the values are hash references with link targets
+as keys, and 1 as a dummy value, something like this:
+
+	$typedlinks{"foo"} = {
+		tag => { short_word => 1, metasyntactic_variable => 1 },
+		next_page => { bar => 1 },
+	};
+
+Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in
+`%typedlinks`.
+
 ### `%pagesources`
 
 The `%pagesources` has can be used to look up the source filename
@@ -939,11 +955,14 @@ Optionally, a third parameter can be passed, to specify the preferred
 filename of the page. For example, `targetpage("foo", "rss", "feed")`
 will yield something like `foo/feed.rss`.
 
-### `add_link($$)`
+### `add_link($$;$)`
 
 This adds a link to `%links`, ensuring that duplicate links are not
 added. Pass it the page that contains the link, and the link text.
 
+An optional third parameter sets the link type (`undef` produces an ordinary
+[[ikiwiki/WikiLink]]).
+
 ## Miscellaneous
 
 ### Internal use pages
diff --git a/t/index.t b/t/index.t
index 2f23524a7..44273059d 100755
--- a/t/index.t
+++ b/t/index.t
@@ -4,7 +4,7 @@ use strict;
 use IkiWiki;
 
 package IkiWiki; # use internal variables
-use Test::More tests => 27;
+use Test::More tests => 31;
 
 $config{wikistatedir}="/tmp/ikiwiki-test.$$";
 system "rm -rf $config{wikistatedir}";
@@ -31,6 +31,7 @@ $renderedfiles{"bar"}=["bar.html", "bar.rss", "sparkline-foo.gif"];
 $renderedfiles{"bar.png"}=["bar.png"];
 $links{"Foo"}=["bar.png"];
 $links{"bar"}=["Foo", "new-page"];
+$typedlinks{"bar"}={tag => {"Foo" => 1}};
 $links{"bar.png"}=[];
 $depends{"Foo"}={};
 $depends{"bar"}={"foo*" => 1};
@@ -45,7 +46,7 @@ ok(-s "$config{wikistatedir}/indexdb", "index file created");
 
 # Clear state.
 %oldrenderedfiles=%pagectime=();
-%pagesources=%pagemtime=%oldlinks=%links=%depends=
+%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
 %destsources=%renderedfiles=%pagecase=%pagestate=();
 
 ok(loadindex(), "load index");
@@ -104,10 +105,16 @@ is_deeply(\%destsources, {
 	"sparkline-foo.gif" => "bar",
 	"bar.png" => "bar.png",
 }, "%destsources generated correctly");
+is_deeply(\%typedlinks, {
+	bar => {tag => {"Foo" => 1}},
+}, "%typedlinks loaded correctly");
+is_deeply(\%oldtypedlinks, {
+	bar => {tag => {"Foo" => 1}},
+}, "%oldtypedlinks loaded correctly");
 
 # Clear state.
 %oldrenderedfiles=%pagectime=();
-%pagesources=%pagemtime=%oldlinks=%links=%depends=
+%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
 %destsources=%renderedfiles=%pagecase=%pagestate=();
 
 # When state is loaded for a wiki rebuild, only ctime and oldrenderedfiles
@@ -140,5 +147,9 @@ is_deeply(\%pagecase, {
 }, "%pagecase generated correctly");
 is_deeply(\%destsources, {
 }, "%destsources generated correctly");
+is_deeply(\%typedlinks, {
+}, "%typedlinks cleared correctly");
+is_deeply(\%oldtypedlinks, {
+}, "%oldtypedlinks cleared correctly");
 
 system "rm -rf $config{wikistatedir}";
diff --git a/t/tag.t b/t/tag.t
new file mode 100755
index 000000000..3383fd475
--- /dev/null
+++ b/t/tag.t
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+package IkiWiki;
+
+use warnings;
+use strict;
+use Test::More tests => 10;
+
+BEGIN { use_ok("IkiWiki"); }
+BEGIN { use_ok("IkiWiki::Plugin::tag"); }
+
+ok(! system("rm -rf t/tmp; mkdir t/tmp"));
+
+$config{userdir} = "users";
+$config{tagbase} = "tags";
+$config{tagged_is_strict} = 1;
+
+%oldrenderedfiles=%pagectime=();
+%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
+%destsources=%renderedfiles=%pagecase=%pagestate=();
+
+foreach my $page (qw(tags/numbers tags/letters one two alpha beta)) {
+	$pagesources{$page} = "$page.mdwn";
+	$pagemtime{$page} = $pagectime{$page} = 1000000;
+}
+
+$links{one}=[qw(tags/numbers alpha tags/letters)];
+$links{two}=[qw(tags/numbers)];
+$links{alpha}=[qw(tags/letters one)];
+$links{beta}=[qw(tags/letters)];
+$typedlinks{one}={tag => {"tags/numbers" => 1 }};
+$typedlinks{two}={tag => {"tags/numbers" => 1 }};
+$typedlinks{alpha}={tag => {"tags/letters" => 1 }};
+$typedlinks{beta}={tag => {"tags/letters" => 1 }};
+
+ok(pagespec_match("one", "tagged(numbers)"));
+ok(!pagespec_match("two", "tagged(alpha)"));
+ok(pagespec_match("one", "link(tags/numbers)"));
+ok(pagespec_match("one", "link(alpha)"));
+
+ok(pagespec_match("one", "typedlink(tag tags/numbers)"));
+ok(!pagespec_match("one", "typedlink(tag tags/letters)"));
+# invalid syntax
+ok(pagespec_match("one", "typedlink(tag)")->isa("IkiWiki::ErrorReason"));
+
+1;
-- 
cgit v1.2.3


From f127857676ad014c97537c39cc7758a423f08b9a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 4 Apr 2010 00:21:01 +0100
Subject: Fix some typos that would break Render during changed-link
 calculation

---
 IkiWiki/Render.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5810fc974..e98888d76 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -511,13 +511,13 @@ sub link_types_changed ($$) {
 
 	while (my ($type, $links) = each %$new) {
 		foreach my $link (keys %$links) {
-			return 1 unless exists $old{$type}{$link};
+			return 1 unless exists $old->{$type}{$link};
 		}
 	}
 
 	while (my ($type, $links) = each %$old) {
 		foreach my $link (keys %$links) {
-			return 1 unless exists $new{$type}{$link};
+			return 1 unless exists $new->{$type}{$link};
 		}
 	}
 
@@ -554,7 +554,7 @@ sub calculate_changed_links ($$$) {
 		# we currently assume that changing the type of a link doesn't
 		# change backlinks
 		if (!exists $linkchangers{lc($page)}) {
-			if (link_types_changed($typedlinks{$page}, $oldlinktypes{$page})) {
+			if (link_types_changed($typedlinks{$page}, $oldtypedlinks{$page})) {
 				$linkchangers{lc($page)}=1;
 			}
 		}
-- 
cgit v1.2.3


From ef6344144051ed70649ccbff01bcc4fce927ee2f Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 4 Apr 2010 00:24:27 +0100
Subject: Remove tagged_is_strict option, and just behave as though it was
 enabled

Jon was worried about the backwards-compatibility break involved in making
tagged() not match non-tag links, but Joey seems less concerned about it.
---
 IkiWiki/Plugin/tag.pm                               | 17 +----------------
 doc/bugs/tagged__40____41___matching_wikilinks.mdwn |  3 +--
 doc/plugins/tag.mdwn                                |  5 -----
 t/tag.t                                             |  1 -
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index af4bff1bc..7a85874f6 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -34,13 +34,6 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
-		tagged_is_strict => {
-			type => "boolean",
-			default => 0,
-			description => "if 1, tagged() doesn't match normal WikiLinks to tag pages",
-			safe => 1,
-			rebuild => 1,
-		},
 }
 
 sub tagpage ($) {
@@ -132,15 +125,7 @@ sub pagetemplate (@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
-	my $page = shift;
-	my $glob = shift;
-
-	if ($IkiWiki::config{tagged_is_strict}) {
-		return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag');
-	}
-	else {
-		return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
-	}
+	return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
 }
 
 1
diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index 9037d6c02..a211654f1 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -28,8 +28,7 @@ rationale on this, or what am I doing wrong, and how to achieve what I want?
 >> is valid. [[todo/matching_different_kinds_of_links]] is probably
 >> how it will eventually be solved. --[[Joey]] 
 
->>> [[Done]]: you can now set the `tagged_is_strict` config option to `1`
->>> if you don't want `tagged` to match other wikilinks. --[[smcv]]
+>>> [[Done]]: `tagged` no longer matches other wikilinks. --[[smcv]]
 
 > And this is an illustration why a clean work-around (without changing the software) is not possible: while thinking about [[todo/matching_different_kinds_of_links]], I thought one could work around the problem by simply explicitly including the kind of the relation into the link target (like the tagbase in tags), and by having a separate page without the "tagbase" to link to when one wants simply to refer to the tag without tagging. But this won't work: one has to at least once refer to the real tag page if one wants to talk about it, and this reference will count as tagging (unwanted). --Ivan Z.
 
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index 8cd79da41..8ff70a069 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -8,11 +8,6 @@ These directives allow tagging pages.
 It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
 match pages that are tagged with a specific tag.
 
-If the `tagged_is_strict` config option is set, `tagged()` will only match
-tags explicitly set with [[ikiwiki/directive/tag]] or
-[[ikiwiki/directive/taglink]]; if not (the default), it will also match
-any other [[WikiLinks|ikiwiki/WikiLink]] to the tag page.
-
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
 page is tagged with the "tags" tag.
diff --git a/t/tag.t b/t/tag.t
index 3383fd475..cf3bbdf01 100755
--- a/t/tag.t
+++ b/t/tag.t
@@ -12,7 +12,6 @@ ok(! system("rm -rf t/tmp; mkdir t/tmp"));
 
 $config{userdir} = "users";
 $config{tagbase} = "tags";
-$config{tagged_is_strict} = 1;
 
 %oldrenderedfiles=%pagectime=();
 %pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
-- 
cgit v1.2.3


From f80e1cb577f3b4ca8f525ddb257f190e481b9194 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 4 Apr 2010 00:26:03 +0100
Subject: Remove the typedlink(tag foo) pagespec feature, which is less
 friendly than tagged()

Plugins that introduce a link type should also introduce pagespec syntax
for it.
---
 IkiWiki.pm | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 25e9247b2..6ea0fb3f3 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2259,17 +2259,6 @@ sub match_link ($$;@) {
 	return IkiWiki::FailReason->new("$page does not link to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
 }
 
-sub match_typedlink($$;@) {
-	my $page = shift;
-	my $args = shift;
-
-	if ($args =~ /^(\w+)\s+(.*)$/) {
-		return match_link($page, $2, @_, linktype => $1);
-	}
-
-	return IkiWiki::ErrorReason->new("typedlink expects e.g. 'tag *' but got: $args");
-}
-
 sub match_backlink ($$;@) {
 	my $ret=match_link($_[1], $_[0], @_);
 	$ret->influences($_[1] => $IkiWiki::DEPEND_LINKS);
-- 
cgit v1.2.3


From d7e32dc98d7b9b005f983cd6f3321244f25cf6a5 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 4 Apr 2010 01:20:02 +0100
Subject: Add a unit test for changed-link calculation

---
 t/calculate_changed_links.t | 58 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100755 t/calculate_changed_links.t

diff --git a/t/calculate_changed_links.t b/t/calculate_changed_links.t
new file mode 100755
index 000000000..bf6e2af45
--- /dev/null
+++ b/t/calculate_changed_links.t
@@ -0,0 +1,58 @@
+#!/usr/bin/perl
+package IkiWiki;
+
+use warnings;
+use strict;
+use Test::More tests => 5;
+
+BEGIN { use_ok("IkiWiki"); }
+BEGIN { use_ok("IkiWiki::Render"); }
+%config=IkiWiki::defaultconfig();
+$config{srcdir}=$config{destdir}="/dev/null";
+
+%oldrenderedfiles=%pagectime=();
+%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
+%destsources=%renderedfiles=%pagecase=%pagestate=();
+
+IkiWiki::checkconfig();
+
+foreach my $page (qw(tags/a tags/b Reorder Add Remove TypeAdd TypeRemove)) {
+	$pagesources{$page} = "$page.mdwn";
+	$pagemtime{$page} = $pagectime{$page} = 1000000;
+}
+
+$oldlinks{Reorder} = [qw{tags/a tags/b}];
+$links{Reorder} = [qw{tags/b tags/a}];
+
+$oldlinks{Add} = [qw{tags/b}];
+$links{Add} = [qw{tags/a tags/b}];
+
+$oldlinks{Remove} = [qw{tags/a}];
+$links{Remove} = [];
+
+$oldlinks{TypeAdd} = [qw{tags/a tags/b}];
+$links{TypeAdd} = [qw{tags/a tags/b}];
+# This causes TypeAdd to be rebuilt, but isn't a backlink change, so it doesn't
+# cause tags/b to be rebuilt.
+$oldtypedlinks{TypeAdd}{tag} = { "tags/a" => 1 };
+$typedlinks{TypeAdd}{tag} = { "tags/a" => 1, "tags/b" => 1 };
+
+$oldlinks{TypeRemove} = [qw{tags/a tags/b}];
+$links{TypeRemove} = [qw{tags/a tags/b}];
+# This causes TypeRemove to be rebuilt, but isn't a backlink change, so it
+# doesn't cause tags/b to be rebuilt.
+$oldtypedlinks{TypeRemove}{tag} = { "tags/a" => 1 };
+$typedlinks{TypeRemove}{tag} = { "tags/a" => 1, "tags/b" => 1 };
+
+my $oldlink_targets = calculate_old_links([keys %pagesources], []);
+is_deeply($oldlink_targets, {
+		Reorder => { "tags/a" => "tags/a", "tags/b" => "tags/b" },
+		Add => { "tags/b" => "tags/b" },
+		Remove => { "tags/a" => "tags/a" },
+		TypeAdd => { "tags/a" => "tags/a", "tags/b" => "tags/b" },
+		TypeRemove => { "tags/a" => "tags/a", "tags/b" => "tags/b" },
+	});
+my ($backlinkchanged, $linkchangers) = calculate_changed_links([keys %pagesources], [], $oldlink_targets);
+
+is_deeply($backlinkchanged, { "tags/a" => 1 });
+is_deeply($linkchangers, { add => 1, remove => 1, typeadd => 1, typeremove => 1 });
-- 
cgit v1.2.3


From 20040772cecbddf07ab6369a22ab2fe1ad794b48 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 4 Apr 2010 00:27:20 +0000
Subject: update fieldsort plugin to be compatible with the latest version of
 my branch

---
 doc/plugins/contrib/field/discussion.mdwn | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 7e94a4029..ad17f87e6 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -68,15 +68,13 @@ I think it should just be part of `field` rather than a separate plugin.
 			},
 	}
 
-	package IkiWiki::PageSpec;
+	package IkiWiki::SortSpec;
 
-	sub check_cmp_field {
+	sub cmp_field {
 		if (!length $_[0]) {
 			error("sort=field requires a parameter");
 		}
-	}
 
-	sub cmp_field {
 		my $left = IkiWiki::Plugin::field::field_get_value($_[2], $_[0]);
 		my $right = IkiWiki::Plugin::field::field_get_value($_[2], $_[1]);
 
-- 
cgit v1.2.3


From 61a31a3d63a19f75e3362c7e5ac2067f572c9dca Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 4 Apr 2010 00:34:36 +0000
Subject: updated branch

---
 doc/todo/matching_different_kinds_of_links.mdwn | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 2cd484852..c4383c0b7 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -106,6 +106,10 @@ Some code refers to `oldtypedlinks`, and other to `oldlinktypes`. --[[Joey]]
 
 >> A test suite for the dependency resolver *would* be nice. --[[Joey]]
 
+>>> Bug fixed, I think. A test suite for the dependency resolver seems
+>>> more ambitious than I want to get into right now, but I added a
+>>> unit test for this part of it... --s
+
 I'm curious what your reasoning was for adding a new variable
 rather than using `pagestate`. Was it only because you needed
 the `old` version to detect change, or was there other complexity?
@@ -120,6 +124,17 @@ the `old` version to detect change, or was there other complexity?
 > my docs for `%typedlinks`, so I'll try to write docs for it as
 > `pagestate` and see if they work any better. --s
 
+>> On reflection, I don't think it's any better as a pagestate, and
+>> the contents of pagestates (so far) aren't documented for other
+>> plugins' consumption, so I'm inclined to leave it as-is, unless
+>> you want to veto that. Loose rationale: it needs special handling
+>> in the core to be a dependency type (I re-used the existing link
+>> type), it's API beyond a single plugin, and it's really part of
+>> the core parallel to pagestate rather than being tied to a
+>> specific plugin. Also, I'd need to special-case it to have
+>> ikiwiki not delete it from the index, unless I introduced a
+>> dummy typedlinks plugin (or just hook) that did nothing... --s
+
 I have not convinced myself this is a real problem, but..
 If a page has a typed link, there seems to be no way to tell
 if it also has a separate, regular link. `add_link` will add
@@ -145,6 +160,8 @@ without too much transitional trouble. --[[Joey]]
 > on the current semantics, on one of the pages requesting this
 > change. --s
 
+>> Removed in a newer version of the branch. --s
+
 I might have been wrong to introduce `typedlink(tag foo)`. It's not
 very user-friendly, and is more useful as a backend for other plugins
 that as a feature in its own right - any plugin introducing a link
@@ -156,3 +173,6 @@ though... --[[smcv]]
 
 > I agree, per-type matchers are more friendly and I'm not enamored of the
 > multi-parameter pagespec syntax. --[[Joey]]
+
+>> Removed in a newer version of the branch. I re-introduced it as a
+>> plugin in `smcv/typedlink`, but I don't think we really need it. --s
-- 
cgit v1.2.3


From 618bbaee3815daffe329fc1e2d77f04fcd8392b8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 14:17:48 +0100
Subject: meta: generalize meta_title into meta(title); support author,
 updated, date

I've left meta_title in, undocumented, as a possible replacement for
sort=title in IkiWiki 4.0 or something.
---
 IkiWiki/Plugin/meta.pm            | 58 +++++++++++++++++++++++++++++++++------
 doc/ikiwiki/directive/meta.mdwn   |  7 ++++-
 doc/ikiwiki/pagespec/sorting.mdwn |  5 ++--
 3 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index cd7d0d127..c9fdbc934 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -122,6 +122,12 @@ sub preprocess (@) {
 	}
 	elsif ($key eq 'author') {
 		$pagestate{$page}{meta}{author}=$value;
+		if (exists $params{sort}) {
+			$pagestate{$page}{meta}{authorsort}=$params{sort};
+		}
+		else {
+			$pagestate{$page}{meta}{authorsort}=$value;
+		}
 		# fallthorough
 	}
 	elsif ($key eq 'authorurl') {
@@ -288,14 +294,31 @@ sub pagetemplate (@) {
 	}
 }
 
-sub titlesort {
-	my $key = $pagestate{$_[0]}{meta}{titlesort};
+sub get_sort_key {
+	my $page = $_[0];
+	my $meta = $_[1];
 
-	if (defined $key) {
-		return $key;
-	}
+	# e.g. titlesort (also makes sense for author)
+	my $key = $pagestate{$page}{meta}{$meta . "sort"};
+	return $key if defined $key;
+
+	# e.g. title
+	$key = $pagestate{$page}{meta}{$meta};
+	return $key if defined $key;
 
-	return pagetitle(IkiWiki::basename($_[0]));
+	# fall back to closer-to-core things
+	if ($meta eq 'title') {
+		return pagetitle(IkiWiki::basename($page));
+	}
+	elsif ($meta eq 'date') {
+		return $IkiWiki::pagectime{$page};
+	}
+	elsif ($meta eq 'updated') {
+		return $IkiWiki::pagemtime{$page};
+	}
+	else {
+		return '';
+	}
 }
 
 sub match {
@@ -350,10 +373,27 @@ sub match_copyright ($$;@) {
 
 package IkiWiki::SortSpec;
 
+sub cmp_meta {
+	my $left = $_[0];
+	my $right = $_[1];
+	my $meta = $_[2];
+	error(gettext("sort=meta requires a parameter")) unless defined $meta;
+
+	if ($meta eq 'updated' || $meta eq 'date') {
+		return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+			<=>
+			IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+	}
+
+	return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+		cmp
+		IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+}
+
+# A prototype of how sort=title could behave in 4.0 or something
 sub cmp_meta_title {
-	IkiWiki::Plugin::meta::titlesort($_[0])
-	cmp
-	IkiWiki::Plugin::meta::titlesort($_[1])
+	$_[2] = 'title';
+	return cmp_meta(@_);
 }
 
 1
diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index 8d2a5b1ad..c5f74fac5 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -24,7 +24,7 @@ Supported fields:
   differently in this case.
 
   An optional `sort` parameter will be used preferentially when
-  [[ikiwiki/pagespec/sorting]] by `meta_title`:
+  [[ikiwiki/pagespec/sorting]] by `meta(title)`:
 
 	\[[!meta title="The Beatles" sort="Beatles, The"]]
 
@@ -44,6 +44,11 @@ Supported fields:
 
   Specifies the author of a page.
 
+  An optional `sort` parameter will be used preferentially when
+  [[ikiwiki/pagespec/sorting]] by `meta(author)`:
+
+	\[[!meta author="Joey Hess" sort="Hess, Joey"]]
+
 * authorurl
 
   Specifies an url for the author of a page.
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index ba995a521..fbf598340 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -11,9 +11,10 @@ orders can be specified.
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
 """]]
 [[!if test="enabled(meta)" then="""
-* `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
+* `meta(title)` - Order according to the `\[[!meta title="foo" sort="bar"]]`
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
-  full title was set.
+  full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc.
+  also work.
 """]]
 
 In addition, you can combine several sort orders and/or reverse the order of
-- 
cgit v1.2.3


From 490f95616a8a49f2120655d07c282eefd067e640 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 14:19:18 +0100
Subject: Rename sort parameter to meta title/author to sortas=bar

Joey pointed out that sort=x usually takes a sort order.
---
 IkiWiki/Plugin/meta.pm            |  8 ++++----
 doc/ikiwiki/directive/meta.mdwn   | 10 +++++-----
 doc/ikiwiki/pagespec/sorting.mdwn |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index c9fdbc934..4992617d0 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -89,8 +89,8 @@ sub preprocess (@) {
 	# Metadata collection that needs to happen during the scan pass.
 	if ($key eq 'title') {
 		$pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
-		if (exists $params{sort}) {
-			$pagestate{$page}{meta}{titlesort}=$params{sort};
+		if (exists $params{sortas}) {
+			$pagestate{$page}{meta}{titlesort}=$params{sortas};
 		}
 		else {
 			$pagestate{$page}{meta}{titlesort}=$value;
@@ -122,8 +122,8 @@ sub preprocess (@) {
 	}
 	elsif ($key eq 'author') {
 		$pagestate{$page}{meta}{author}=$value;
-		if (exists $params{sort}) {
-			$pagestate{$page}{meta}{authorsort}=$params{sort};
+		if (exists $params{sortas}) {
+			$pagestate{$page}{meta}{authorsort}=$params{sortas};
 		}
 		else {
 			$pagestate{$page}{meta}{authorsort}=$value;
diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index c5f74fac5..5a3919dea 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -23,12 +23,12 @@ Supported fields:
   be set to a true value in the template; this can be used to format things
   differently in this case.
 
-  An optional `sort` parameter will be used preferentially when
+  An optional `sortas` parameter will be used preferentially when
   [[ikiwiki/pagespec/sorting]] by `meta(title)`:
 
-	\[[!meta title="The Beatles" sort="Beatles, The"]]
+	\[[!meta title="The Beatles" sortas="Beatles, The"]]
 
-	\[[!meta title="David Bowie" sort="Bowie, David"]]
+	\[[!meta title="David Bowie" sortas="Bowie, David"]]
 
 * license
 
@@ -44,10 +44,10 @@ Supported fields:
 
   Specifies the author of a page.
 
-  An optional `sort` parameter will be used preferentially when
+  An optional `sortas` parameter will be used preferentially when
   [[ikiwiki/pagespec/sorting]] by `meta(author)`:
 
-	\[[!meta author="Joey Hess" sort="Hess, Joey"]]
+	\[[!meta author="Joey Hess" sortas="Hess, Joey"]]
 
 * authorurl
 
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index fbf598340..5c6cfcc2b 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -11,7 +11,7 @@ orders can be specified.
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
 """]]
 [[!if test="enabled(meta)" then="""
-* `meta(title)` - Order according to the `\[[!meta title="foo" sort="bar"]]`
+* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
   full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc.
   also work.
-- 
cgit v1.2.3


From ed26f287b207573cc2c2593809b3811f3f832c8c Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Sun, 4 Apr 2010 07:13:51 +0000
Subject: Remove my homepage

---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 633400f21..3b67eb74f 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -138,7 +138,6 @@ Personal sites and blogs
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
-* [Mukund's homepage](http://www.mukund.org/)
 * [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
-- 
cgit v1.2.3


From 17cc857378c518114989c41dfb1411c9ab8419ea Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Sun, 4 Apr 2010 07:16:41 +0000
Subject: Add the Banu website

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 3b67eb74f..4a3e41e83 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -53,6 +53,7 @@ Projects & Organizations
 * [Debian Costa Rica](http://cr.debian.net/)
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
+* [Banu](https://www.banu.com/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 3e2a78840a22c376e40dccd358e94533313596e8 Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <http://liw.fi/@web>
Date: Sun, 4 Apr 2010 09:12:23 +0000
Subject:

---
 doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn

diff --git a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
new file mode 100644
index 000000000..bd0900670
--- /dev/null
+++ b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
@@ -0,0 +1,3 @@
+Version 2.0 of bzr seems to break the bzr plugin.
+
+I traced this to the bzr_log method in the plugin, and patching that seems to fix it. The plugin just needs to parse the input little bit differently.
-- 
cgit v1.2.3


From 3190e3be93a97ccf0f1c2a4a2d4a27cd1326263b Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <http://liw.fi/@web>
Date: Sun, 4 Apr 2010 09:13:01 +0000
Subject:

---
 doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
index bd0900670..2fd25df9c 100644
--- a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
+++ b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
@@ -1,3 +1,4 @@
 Version 2.0 of bzr seems to break the bzr plugin.
 
 I traced this to the bzr_log method in the plugin, and patching that seems to fix it. The plugin just needs to parse the input little bit differently.
+--liw
-- 
cgit v1.2.3


From 6b746ed72ba5fc49451f832f6ced9a7c26cce8f7 Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <http://liw.fi/@web>
Date: Sun, 4 Apr 2010 09:23:05 +0000
Subject:

---
 doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn | 79 +++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
index 2fd25df9c..bda07d15b 100644
--- a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
+++ b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
@@ -2,3 +2,82 @@ Version 2.0 of bzr seems to break the bzr plugin.
 
 I traced this to the bzr_log method in the plugin, and patching that seems to fix it. The plugin just needs to parse the input little bit differently.
 --liw
+
+    From fb897114124e627fd3acf5af8e784c9a77419a81 Mon Sep 17 00:00:00 2001
+    From: Lars Wirzenius <liw@liw.fi>
+    Date: Sun, 4 Apr 2010 21:05:07 +1200
+    Subject: [PATCH] Fix bzr plugin to work with bzr 2.0.
+
+    The output of "bzr log" seems to have changed a bit, so we change the
+    parsing accordingly. This has not been tested with earlier versions of
+    bzr.
+
+    Several problems seemed to occur, all in the bzr_log subroutine:
+
+    1. The @infos list would contain an empty hash, which would confuse the
+       rest of the program.
+    2. This was because bzr_log would push an empty anonymous hash to the
+       list whenever it thought a new record would start.
+    3. However, a new record marker (now?) also happens at th end of bzr log
+       output.
+    4. Now we collect the record to a hash that gets pushed to the list only
+       if it is not empty.
+    5. Also, sometimes bzr log outputs "revno: 1234 [merge]", so we catch only
+       the revision number.
+    6. Finally, there may be non-headers at the of the output, so we ignore
+       those.
+    ---
+     IkiWiki/Plugin/bzr.pm |   23 ++++++++++++++++-------
+     1 files changed, 16 insertions(+), 7 deletions(-)
+
+    diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
+    index 1ffdc23..e813331 100644
+    --- a/IkiWiki/Plugin/bzr.pm
+    +++ b/IkiWiki/Plugin/bzr.pm
+    @@ -73,28 +73,37 @@ sub bzr_log ($) {
+     	my @infos = ();
+     	my $key = undef;
+     
+    +    my $hash = {};
+     	while (<$out>) {
+     		my $line = $_;
+     		my ($value);
+     		if ($line =~ /^message:/) {
+     			$key = "message";
+    -			$infos[$#infos]{$key} = "";
+    +			$$hash{$key} = "";
+     		}
+     		elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
+     			$key = "files";
+    -			unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; }
+    +			unless (defined($$hash{$key})) { $$hash{$key} = ""; }
+     		}
+     		elsif (defined($key) and $line =~ /^  (.*)/) {
+    -			$infos[$#infos]{$key} .= "$1\n";
+    +			$$hash{$key} .= "$1\n";
+     		}
+     		elsif ($line eq "------------------------------------------------------------\n") {
+    +		    if (keys %$hash) {
+    +    		    push (@infos, $hash);
+    +		    }
+    +    		$hash = {};
+     			$key = undef;
+    -			push (@infos, {});
+     		}
+    -		else {
+    +		elsif ($line =~ /: /) {
+     			chomp $line;
+    -				($key, $value) = split /: +/, $line, 2;
+    -			$infos[$#infos]{$key} = $value;
+    +			if ($line =~ /^revno: (\d+)/) {
+    +			    $key = "revno";
+    +			    $value = $1;
+    +			} else {
+    +    			($key, $value) = split /: +/, $line, 2;
+    +    		}
+    +			$$hash{$key} = $value;
+     		} 
+     	}
+     	close $out;
+    -- 
+    1.7.0
-- 
cgit v1.2.3


From 7060b774e45e237727601f500da40aa6b1a19d7f Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sun, 4 Apr 2010 12:03:41 +0000
Subject: Typo.

---
 doc/news/version_3.20100403.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/news/version_3.20100403.mdwn b/doc/news/version_3.20100403.mdwn
index 86d6a0f37..3e9063028 100644
--- a/doc/news/version_3.20100403.mdwn
+++ b/doc/news/version_3.20100403.mdwn
@@ -15,7 +15,7 @@ ikiwiki 3.20100403 released with [[!toggle text="these changes"]]
    * filecheck: Fix bugs that prevented the pagespecs from matching when
      not called by attachment plugin.
    * Fix incorrect influence info returned by a failing link() pagespec,
-     that could lead to bad dependency handling in certian situations.
+     that could lead to bad dependency handling in certain situations.
    * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
      if necessary for unusual install.
    * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
@@ -27,4 +27,4 @@ ikiwiki 3.20100403 released with [[!toggle text="these changes"]]
      (especially of Firefox) see fresh page content.
    * htmlscrubber: Allow colons in urls after '?'
    * template: Search for templates in the templatedir, if they are not
-     found as pages in the wiki."""]]
\ No newline at end of file
+     found as pages in the wiki."""]]
-- 
cgit v1.2.3


From 3a02cfca99922e8e15b55962d534629b777e463f Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Sun, 4 Apr 2010 13:00:52 +0000
Subject:

---
 doc/bugs/Comments_dissapeared.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index ac297028c..7ff1a012f 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -28,3 +28,8 @@ It worked just fine with this configuration. I swear I have not modified it. :)
 > So I suspect you have simply not rebuilt your wiki after making some
 > change that fixed the comments, and so only newer pages are getting them.
 > --[[Joey]]
+
+I have tried rebuilding on my squeeze system and still comments don't appear. Any clues how to debug this?
+<http://natalian.org/comments/>
+
+I was worried is was due to a time skew problem I was experiencing on my VPS in the last month, though the time is right now and still comments do not appear on blog posts like <http://natalian.org/archives/2010/03/25/BBC_News_complaints/>
-- 
cgit v1.2.3


From 834936a408d0d9f481071fbcaefc67273eabb60c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 4 Apr 2010 14:03:51 +0000
Subject: bug report + patch: unnecessary YAML::Any dependency

---
 doc/plugins/contrib/field/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index ad17f87e6..c2b75a76d 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -84,3 +84,11 @@ I think it should just be part of `field` rather than a separate plugin.
 	}
 
 	1;
+
+-------
+
+Bug report: `field` has an unnecessary `use YAML::Any`, presumably from before
+you separated out `ymlfront`. Trivial patch available from
+field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
+<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
+--[[smcv]]
-- 
cgit v1.2.3


From f6dde92957f8b21d8823f2e51d9e3c48bbad7146 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 4 Apr 2010 14:05:42 +0000
Subject: advertise some bugfixes

---
 doc/plugins/contrib/ymlfront/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/plugins/contrib/ymlfront/discussion.mdwn

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
new file mode 100644
index 000000000..f437624b6
--- /dev/null
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -0,0 +1,4 @@
+My field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
+<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
+has some fixes for compatibility with old YAML modules, mostly done by imitating
+Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
-- 
cgit v1.2.3


From 75afa94c36e199956014e108d7894007964c7348 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sun, 4 Apr 2010 21:05:07 +1200
Subject: Fix bzr plugin to work with bzr 2.0.

The output of "bzr log" seems to have changed a bit, so we change the
parsing accordingly. This has not been tested with earlier versions of
bzr.

Several problems seemed to occur, all in the bzr_log subroutine:

1. The @infos list would contain an empty hash, which would confuse the
   rest of the program.
2. This was because bzr_log would push an empty anonymous hash to the
   list whenever it thought a new record would start.
3. However, a new record marker (now?) also happens at th end of bzr log
   output.
4. Now we collect the record to a hash that gets pushed to the list only
   if it is not empty.
5. Also, sometimes bzr log outputs "revno: 1234 [merge]", so we catch only
   the revision number.
6. Finally, there may be non-headers at the of the output, so we ignore
   those.
---
 IkiWiki/Plugin/bzr.pm | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 1ffdc2353..e813331b7 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -73,28 +73,37 @@ sub bzr_log ($) {
 	my @infos = ();
 	my $key = undef;
 
+    my $hash = {};
 	while (<$out>) {
 		my $line = $_;
 		my ($value);
 		if ($line =~ /^message:/) {
 			$key = "message";
-			$infos[$#infos]{$key} = "";
+			$$hash{$key} = "";
 		}
 		elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
 			$key = "files";
-			unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; }
+			unless (defined($$hash{$key})) { $$hash{$key} = ""; }
 		}
 		elsif (defined($key) and $line =~ /^  (.*)/) {
-			$infos[$#infos]{$key} .= "$1\n";
+			$$hash{$key} .= "$1\n";
 		}
 		elsif ($line eq "------------------------------------------------------------\n") {
+		    if (keys %$hash) {
+    		    push (@infos, $hash);
+		    }
+    		$hash = {};
 			$key = undef;
-			push (@infos, {});
 		}
-		else {
+		elsif ($line =~ /: /) {
 			chomp $line;
-				($key, $value) = split /: +/, $line, 2;
-			$infos[$#infos]{$key} = $value;
+			if ($line =~ /^revno: (\d+)/) {
+			    $key = "revno";
+			    $value = $1;
+			} else {
+    			($key, $value) = split /: +/, $line, 2;
+    		}
+			$$hash{$key} = $value;
 		} 
 	}
 	close $out;
-- 
cgit v1.2.3


From f206035a3a7ed0b37c082e80d6d1482983fa583b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Apr 2010 12:17:03 -0400
Subject: fix indentation & whitespace

---
 IkiWiki/Plugin/bzr.pm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index e813331b7..6e45c39e4 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -73,7 +73,7 @@ sub bzr_log ($) {
 	my @infos = ();
 	my $key = undef;
 
-    my $hash = {};
+	my $hash = {};
 	while (<$out>) {
 		my $line = $_;
 		my ($value);
@@ -89,10 +89,10 @@ sub bzr_log ($) {
 			$$hash{$key} .= "$1\n";
 		}
 		elsif ($line eq "------------------------------------------------------------\n") {
-		    if (keys %$hash) {
-    		    push (@infos, $hash);
-		    }
-    		$hash = {};
+			if (keys %$hash) {
+				push (@infos, $hash);
+			}
+			$hash = {};
 			$key = undef;
 		}
 		elsif ($line =~ /: /) {
@@ -100,11 +100,12 @@ sub bzr_log ($) {
 			if ($line =~ /^revno: (\d+)/) {
 			    $key = "revno";
 			    $value = $1;
-			} else {
-    			($key, $value) = split /: +/, $line, 2;
-    		}
+			}
+			else {
+				($key, $value) = split /: +/, $line, 2;
+			}
 			$$hash{$key} = $value;
-		} 
+		}
 	}
 	close $out;
 
@@ -222,7 +223,7 @@ sub rcs_recentchanges ($) {
 	foreach my $info (bzr_log($out)) {
 		my @pages = ();
 		my @message = ();
-        
+
 		foreach my $msgline (split(/\n/, $info->{message})) {
 			push @message, { line => $msgline };
 		}
-- 
cgit v1.2.3


From 992c2c6bca9a8ada45b043c6418b00d295012324 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Apr 2010 12:17:36 -0400
Subject: changelog

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 32a38925d..b7b614604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100404) UNRELEASED; urgency=low
+
+  * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
+
 ikiwiki (3.20100403) unstable; urgency=low
 
   * websetup: Add websetup_unsafe to allow marking other settings
-- 
cgit v1.2.3


From 2a15f9415979e809ef332bdcffa83ff168d5bbef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Apr 2010 12:20:26 -0400
Subject: rename hash and avoid unnecessary hash ref

Variable renamed to be a bit more self-explanatory.
Probably more idiomatic perl to not use a hash ref when a hash can be used.
---
 IkiWiki/Plugin/bzr.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 6e45c39e4..7eb5cfe93 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -73,26 +73,26 @@ sub bzr_log ($) {
 	my @infos = ();
 	my $key = undef;
 
-	my $hash = {};
+	my %info;
 	while (<$out>) {
 		my $line = $_;
 		my ($value);
 		if ($line =~ /^message:/) {
 			$key = "message";
-			$$hash{$key} = "";
+			$info{$key} = "";
 		}
 		elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
 			$key = "files";
-			unless (defined($$hash{$key})) { $$hash{$key} = ""; }
+			unless (defined($info{$key})) { $info{$key} = ""; }
 		}
 		elsif (defined($key) and $line =~ /^  (.*)/) {
-			$$hash{$key} .= "$1\n";
+			$info{$key} .= "$1\n";
 		}
 		elsif ($line eq "------------------------------------------------------------\n") {
-			if (keys %$hash) {
-				push (@infos, $hash);
+			if (keys %info) {
+				push (@infos, {%info});
 			}
-			$hash = {};
+			%info = ();
 			$key = undef;
 		}
 		elsif ($line =~ /: /) {
@@ -104,7 +104,7 @@ sub bzr_log ($) {
 			else {
 				($key, $value) = split /: +/, $line, 2;
 			}
-			$$hash{$key} = $value;
+			$info{$key} = $value;
 		}
 	}
 	close $out;
-- 
cgit v1.2.3


From c9af069b5947ab7fb4a52fe735ef684072868f31 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Apr 2010 12:23:12 -0400
Subject: more idiomatic perl

---
 IkiWiki/Plugin/bzr.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 7eb5cfe93..c96f2d695 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -83,15 +83,13 @@ sub bzr_log ($) {
 		}
 		elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
 			$key = "files";
-			unless (defined($info{$key})) { $info{$key} = ""; }
+			$info{$key} = "" unless defined $info{$key};
 		}
 		elsif (defined($key) and $line =~ /^  (.*)/) {
 			$info{$key} .= "$1\n";
 		}
 		elsif ($line eq "------------------------------------------------------------\n") {
-			if (keys %info) {
-				push (@infos, {%info});
-			}
+			push @infos, {%info} if keys %info;
 			%info = ();
 			$key = undef;
 		}
-- 
cgit v1.2.3


From 6876c5a588a55df212cde24d7eabaa76b67ac292 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Apr 2010 12:28:12 -0400
Subject: close bug, comment

---
 doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
index bda07d15b..39500af20 100644
--- a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
+++ b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
@@ -3,6 +3,10 @@ Version 2.0 of bzr seems to break the bzr plugin.
 I traced this to the bzr_log method in the plugin, and patching that seems to fix it. The plugin just needs to parse the input little bit differently.
 --liw
 
+> Patch applied, [[done]] (but, it would be good if it could be tested with
+> an older bzr, and it's a pity bzr's human-targeted log has to be parsed,
+> I assume there is no machine-targeted version?) --[[Joey]] 
+
     From fb897114124e627fd3acf5af8e784c9a77419a81 Mon Sep 17 00:00:00 2001
     From: Lars Wirzenius <liw@liw.fi>
     Date: Sun, 4 Apr 2010 21:05:07 +1200
-- 
cgit v1.2.3


From b4a162dec20b6723a76ecda3ce262d9d1f9afbb1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Apr 2010 17:06:28 -0400
Subject: fix test suite

---
 IkiWiki/Plugin/bzr.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index c96f2d695..0efc26b49 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -106,6 +106,7 @@ sub bzr_log ($) {
 		}
 	}
 	close $out;
+	push @infos, {%info} if keys %info;
 
 	return @infos;
 }
-- 
cgit v1.2.3


From b51703569d35790f31dccc3dc2921e8bcccd5b49 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Apr 2010 14:59:29 -0400
Subject: speed

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 8c6e1df3b..739a3d6b0 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -181,6 +181,20 @@ That earlier version of the branch is also available for comparison:
 > to specify a sort method in other directives. --[[Joey]]
 >> Done. --[[smcv]]
 
+## speed
+
+I notice the implementation does not use the magic `$a` and `$b` globals.
+That nasty perl optimisation is still worthwhile:
+
+	perl -e 'use warnings; use strict; use Benchmark; sub a { $a <=> $b } sub b ($$) { $_[0] <=> $_[1] }; my @list=reverse(1..9999); timethese(10000, {a => sub {my @f=sort a @list}, b => sub {my @f=sort b  @list}, c => => sub {my @f=sort { b($a,$b) } @list}})'
+	Benchmark: timing 10000 iterations of a, b, c...
+	         a: 80 wallclock secs (76.74 usr +  0.05 sys = 76.79 CPU) @ 130.23/s (n=10000)
+	         b: 112 wallclock secs (106.14 usr +  0.20 sys = 106.34 CPU) @ 94.04/s (n=10000)
+                 c: 330 wallclock secs (320.25 usr +  0.17 sys = 320.42 CPU) @ 31.21/s (n=10000)
+
+Unfortunatly, I think that c is closest to the new implementation.
+--[[Joey]]
+
 ## Documentation from sort-package branch
 
 ### advanced sort orders (conditionally added to [[ikiwiki/pagespec/sorting]])
-- 
cgit v1.2.3


From 861080b918ef71d82f4a4b9a22093f4a379b5ef8 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 5 Apr 2010 19:19:00 +0000
Subject: potential performance improvements

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 739a3d6b0..2ce1de6a4 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -195,6 +195,28 @@ That nasty perl optimisation is still worthwhile:
 Unfortunatly, I think that c is closest to the new implementation.
 --[[Joey]]
 
+> Unfortunately, `$a` isn't always `$main::a` - it's `$Package::a` where
+> `Package` is the call site of the sort call. This was a showstopper when
+> `sort` was a hook implemented in many packages, but now that it's a
+> `SortSpec`, I may be able to fix this by putting a `sort` wrapper in the
+> `SortSpec` namespace, so it's like this:
+>
+>     sub sort ($@)
+>     {
+>         my $cmp = shift;
+>         return sort $cmp @_;
+>     }
+>
+> which would mean that the comparison used `$IkiWiki::SortSpec::a`.
+>
+> I do notice that `pagespec_match_list` performs the sort before the
+> filter by pagespec. Is this a deliberate design choice, or
+> coincidence? I can see that when `limit` is used, this could be
+> used to only run the pagespec match function until `limit` pages
+> have been selected, but the cost is that every page in the wiki
+> is sorted. Or, it might be useful to do the filtering first, then
+> sort the sub-list thus produced, then finally apply the limit? --s
+
 ## Documentation from sort-package branch
 
 ### advanced sort orders (conditionally added to [[ikiwiki/pagespec/sorting]])
-- 
cgit v1.2.3


From 10f4695abd65db6c009864c5abb7cb5dfa1cf153 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Apr 2010 15:28:54 -0400
Subject: response

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 2ce1de6a4..0aca74be2 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -165,7 +165,6 @@ That earlier version of the branch is also available for comparison:
 >>>>>>> I've kept the semantics from `report` as-is, then:
 >>>>>>> e.g. `sort="age -title"`. --s
 
->>>>>
 >>>>> Perhaps we could borrow from `meta updated` and use `update_age`?
 >>>>> `updateage` would perhaps be a more normal IkiWiki style - but that
 >>>>> makes me think that updateage is a quantity analagous to tonnage or
@@ -190,7 +189,7 @@ That nasty perl optimisation is still worthwhile:
 	Benchmark: timing 10000 iterations of a, b, c...
 	         a: 80 wallclock secs (76.74 usr +  0.05 sys = 76.79 CPU) @ 130.23/s (n=10000)
 	         b: 112 wallclock secs (106.14 usr +  0.20 sys = 106.34 CPU) @ 94.04/s (n=10000)
-                 c: 330 wallclock secs (320.25 usr +  0.17 sys = 320.42 CPU) @ 31.21/s (n=10000)
+	         c: 330 wallclock secs (320.25 usr +  0.17 sys = 320.42 CPU) @ 31.21/s (n=10000)
 
 Unfortunatly, I think that c is closest to the new implementation.
 --[[Joey]]
@@ -217,6 +216,10 @@ Unfortunatly, I think that c is closest to the new implementation.
 > is sorted. Or, it might be useful to do the filtering first, then
 > sort the sub-list thus produced, then finally apply the limit? --s
 
+>> Yes, it was deliberate, pagespec matching can be expensive enough that
+>> needing to sort a lot of pages seems likely to be less work. (I don't
+>> remember what benchmarking was done though.) --[[Joey]] 
+
 ## Documentation from sort-package branch
 
 ### advanced sort orders (conditionally added to [[ikiwiki/pagespec/sorting]])
-- 
cgit v1.2.3


From 09d4e9d6bb7a049b0721ffbf7dc6e64bee4404cc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Apr 2010 16:34:49 -0400
Subject: comments: Fix missing entity encoding in title.

The meta title data set by comments needs to be encoded the same way that
meta encodes it. (NB The security implications of the missing encoding
are small.)

Note that meta's encoding of title, description, and guid data, and not
other data, is probably a special case that should be removed. Instead,
these values should be encoded when used. I have avoided doing so here
because that would mean forcing a wiki rebuild on upgrade to have the data
consitently encoded.
---
 IkiWiki/Plugin/comments.pm | 4 +++-
 debian/changelog           | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 98786f432..460341710 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -221,7 +221,9 @@ sub preprocess {
 	}
 
 	if (defined $params{subject}) {
-		$pagestate{$page}{meta}{title} = $params{subject};
+		# encode title the same way meta does
+		eval q{use HTML::Entities};
+		$pagestate{$page}{meta}{title} = HTML::Entities::encode_numeric(decode_entities($params{subject}));
 	}
 
 	if ($params{page} =~ m/\/\Q$config{comments_pagename}\E\d+_/) {
diff --git a/debian/changelog b/debian/changelog
index b7b614604..be89d0918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.20100404) UNRELEASED; urgency=low
 
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
+  * comments: Fix missing entity encoding in title.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From a01028ae8156679a108a40c62aa6b4cc3e2b3ae7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Apr 2010 17:02:10 -0400
Subject: txt: Add a special case for robots.txt.

---
 IkiWiki/Plugin/txt.pm | 9 ++++++++-
 debian/changelog      | 1 +
 doc/plugins/txt.mdwn  | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index 1ed9f0856..0d9a0b35b 100644
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -39,7 +39,14 @@ sub filter (@) {
 	my %params = @_;
 	my $content = $params{content};
 
-	if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) {
+	if (defined $pagesources{$params{page}} &&
+	    $pagesources{$params{page}} =~ /\.txt$/) {
+		if ($pagesources{$params{page}} eq 'robots.txt' &&
+		    $params{page} eq $params{destpage}) {
+			will_render($params{page}, 'robots.txt');
+			writefile('robots.txt', $config{destdir}, $content);
+		}
+
 		encode_entities($content, "<>&");
 		if ($findurl) {
 			my $finder = URI::Find->new(sub {
diff --git a/debian/changelog b/debian/changelog
index be89d0918..77d17f566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20100404) UNRELEASED; urgency=low
 
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
   * comments: Fix missing entity encoding in title.
+  * txt: Add a special case for robots.txt.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn
index 420898d09..a3087c9e0 100644
--- a/doc/plugins/txt.mdwn
+++ b/doc/plugins/txt.mdwn
@@ -12,3 +12,8 @@ The only exceptions are that [[WikiLinks|ikiwiki/WikiLink]] and
 [[directives|ikiwiki/directive]] are still expanded by
 ikiwiki, and that, if the [[!cpan URI::Find]] perl module is installed, URLs
 in the txt file are converted to hyperlinks.
+
+----
+
+As a special case, a file `robots.txt` will be copied intact into the
+`destdir`, as well as creating a wiki page named "robots".
-- 
cgit v1.2.3


From f8457f9a902e880e0240ba7f5180c22999f0e713 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Apr 2010 17:18:30 -0400
Subject: fix bug that left stray </p> tags

Both markdown and tidy add paragraph tags around text, that needs to be
stripped when the text is a short, one line fragment that is being inserted
into a larger page. tidy also adds several newlines to the end, and this
broke removal of the paragraph tags.
---
 IkiWiki.pm                                   | 7 +++----
 doc/bugs/stray___60____47__p__62___tags.mdwn | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6739ba56c..0cbc84788 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1164,7 +1164,7 @@ sub htmlize ($$$$) {
 	my $content=shift;
 	
 	my $oneline = $content !~ /\n/;
-
+	
 	if (exists $hooks{htmlize}{$type}) {
 		$content=$hooks{htmlize}{$type}{call}->(
 			page => $page,
@@ -1185,10 +1185,9 @@ sub htmlize ($$$$) {
 	
 	if ($oneline) {
 		# hack to get rid of enclosing junk added by markdown
-		# and other htmlizers
+		# and other htmlizers/sanitizers
 		$content=~s/^<p>//i;
-		$content=~s/<\/p>$//i;
-		chomp $content;
+		$content=~s/<\/p>\n*$//i;
 	}
 
 	return $content;
diff --git a/doc/bugs/stray___60____47__p__62___tags.mdwn b/doc/bugs/stray___60____47__p__62___tags.mdwn
index 6e508ffda..99d6fe09f 100644
--- a/doc/bugs/stray___60____47__p__62___tags.mdwn
+++ b/doc/bugs/stray___60____47__p__62___tags.mdwn
@@ -13,3 +13,5 @@ I believe that this snippet in `IkiWiki.pm` might be the reason for the imbalanc
         }
 
 The fact that HTML in a `\[[!meta title]]` is added but then escaped might indicate that some other bug is involved.
+
+> [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From cb8b2f80b2f8c91eba3f3a6a5b9913ab80326df8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Mon, 5 Apr 2010 22:50:51 +0100
Subject: Use $a and $b for SortSpec cmp callbacks

---
 IkiWiki.pm                      | 27 ++++++++++++++++++---------
 IkiWiki/Plugin/meta.pm          | 14 ++++++--------
 IkiWiki/Plugin/sortnaturally.pm |  4 ++--
 doc/plugins/write.mdwn          | 20 ++++++++++----------
 t/pagespec_match_list.t         |  2 +-
 5 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d716e8b39..da36494fb 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1975,10 +1975,10 @@ sub sortspec_translate ($) {
 		if (exists $IkiWiki::SortSpec::{"cmp_$word"}) {
 			if (defined $params) {
 				push @data, $params;
-				$code .= "IkiWiki::SortSpec::cmp_$word(\@_, \$data[$#data])";
+				$code .= "IkiWiki::SortSpec::cmp_$word(\$data[$#data])";
 			}
 			else {
-				$code .= "IkiWiki::SortSpec::cmp_$word(\@_, undef)";
+				$code .= "IkiWiki::SortSpec::cmp_$word(undef)";
 			}
 		}
 		else {
@@ -2095,9 +2095,8 @@ sub pagespec_match_list ($$;@) {
 	}
 
 	if (defined $params{sort}) {
-		my $f = sortspec_translate($params{sort});
-
-		@candidates = sort { $f->($a, $b) } @candidates;
+		@candidates = IkiWiki::SortSpec::sort_pages($params{sort},
+			@candidates);
 	}
 
 	@candidates=reverse(@candidates) if $params{reverse};
@@ -2412,13 +2411,23 @@ sub match_ip ($$;@) {
 
 package IkiWiki::SortSpec;
 
+# This is in the SortSpec namespace so that the $a and $b that sort() uses
+# $IkiWiki::SortSpec::a and $IkiWiki::SortSpec::b, so that plugins' cmp
+# functions can access them easily.
+sub sort_pages
+{
+	my $f = IkiWiki::sortspec_translate(shift);
+
+	return sort $f @_;
+}
+
 sub cmp_title {
-	IkiWiki::pagetitle(IkiWiki::basename($_[0]))
+	IkiWiki::pagetitle(IkiWiki::basename($a))
 	cmp
-	IkiWiki::pagetitle(IkiWiki::basename($_[1]))
+	IkiWiki::pagetitle(IkiWiki::basename($b))
 }
 
-sub cmp_mtime { $IkiWiki::pagemtime{$_[1]} <=> $IkiWiki::pagemtime{$_[0]} }
-sub cmp_age { $IkiWiki::pagectime{$_[1]} <=> $IkiWiki::pagectime{$_[0]} }
+sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} }
+sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} }
 
 1
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 4992617d0..553f93455 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -374,25 +374,23 @@ sub match_copyright ($$;@) {
 package IkiWiki::SortSpec;
 
 sub cmp_meta {
-	my $left = $_[0];
-	my $right = $_[1];
-	my $meta = $_[2];
+	my $meta = $_[0];
 	error(gettext("sort=meta requires a parameter")) unless defined $meta;
 
 	if ($meta eq 'updated' || $meta eq 'date') {
-		return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+		return IkiWiki::Plugin::meta::get_sort_key($a, $meta)
 			<=>
-			IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+			IkiWiki::Plugin::meta::get_sort_key($b, $meta);
 	}
 
-	return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+	return IkiWiki::Plugin::meta::get_sort_key($a, $meta)
 		cmp
-		IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+		IkiWiki::Plugin::meta::get_sort_key($b, $meta);
 }
 
 # A prototype of how sort=title could behave in 4.0 or something
 sub cmp_meta_title {
-	$_[2] = 'title';
+	$_[0] = 'title';
 	return cmp_meta(@_);
 }
 
diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
index f498820a5..92453749d 100644
--- a/IkiWiki/Plugin/sortnaturally.pm
+++ b/IkiWiki/Plugin/sortnaturally.pm
@@ -25,8 +25,8 @@ sub checkconfig () {
 package IkiWiki::SortSpec;
 
 sub cmp_title_natural {
-	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
-		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
+	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($a)),
+		IkiWiki::pagetitle(IkiWiki::basename($b)))
 }
 
 1;
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index b67142230..f42cc86ae 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1117,16 +1117,16 @@ Similarly, it's possible to write plugins that add new functions as
 the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting
 by `foo` or `foo(...)` is requested.
 
-The function will be passed three or more parameters. The first two are
-page names, and the third is `undef` if invoked as `foo`, or the parameter
-`"bar"` if invoked as `foo(bar)`. It may also be passed additional, named
-parameters.
-
-It should return the same thing as Perl's `cmp` and `<=>` operators: negative
-if the first argument is less than the second, positive if the first argument
-is greater, or zero if they are considered equal. It may also raise an
-error using `error`, for instance if it needs a parameter but one isn't
-provided.
+The names of pages to be compared are in the global variables `$a` and `$b`
+in the IkiWiki::SortSpec package. The function should return the same thing
+as Perl's `cmp` and `<=>` operators: negative if `$a` is less than `$b`,
+positive if `$a` is greater, or zero if they are considered equal. It may
+also raise an error using `error`, for instance if it needs a parameter but
+one isn't provided.
+
+The function will also be passed one or more parameters. The first is
+`undef` if invoked as `foo`, or the parameter `"bar"` if invoked as `foo(bar)`;
+it may also be passed additional, named parameters.
 
 ### Setup plugins
 
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 68112f5c0..2ad7a9105 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -12,7 +12,7 @@ IkiWiki::checkconfig();
 {
 	package IkiWiki::SortSpec;
 
-	sub cmp_path { $_[0] cmp $_[1] }
+	sub cmp_path { $a cmp $b }
 }
 
 %pagesources=(
-- 
cgit v1.2.3


From be1d97c0bd495fe876853d7d7f6eb42041867649 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 6 Apr 2010 00:58:55 +0100
Subject: Only store titlesort in meta pagestate if it differs from title

---
 IkiWiki/Plugin/meta.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 553f93455..7f19b46a3 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -88,13 +88,18 @@ sub preprocess (@) {
 
 	# Metadata collection that needs to happen during the scan pass.
 	if ($key eq 'title') {
-		$pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
+		my $encoded = HTML::Entities::encode_numeric($value);
+		$pagestate{$page}{meta}{title} = $encoded;
+
 		if (exists $params{sortas}) {
 			$pagestate{$page}{meta}{titlesort}=$params{sortas};
 		}
-		else {
+		elsif ($encoded ne $value) {
 			$pagestate{$page}{meta}{titlesort}=$value;
 		}
+		else {
+			delete $pagestate{$page}{meta}{titlesort};
+		}
 		return "";
 	}
 	elsif ($key eq 'description') {
-- 
cgit v1.2.3


From a2dc8c9373b36f7cc8da239b823b5839788a743d Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 6 Apr 2010 00:59:16 +0100
Subject: Only store authorsort in meta pagestate if it differs from author

---
 IkiWiki/Plugin/meta.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 7f19b46a3..34e902bec 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -131,7 +131,7 @@ sub preprocess (@) {
 			$pagestate{$page}{meta}{authorsort}=$params{sortas};
 		}
 		else {
-			$pagestate{$page}{meta}{authorsort}=$value;
+			delete $pagestate{$page}{meta}{authorsort};
 		}
 		# fallthorough
 	}
-- 
cgit v1.2.3


From b186ec1b4cb8145d6a6cb68478e23d7fb0fa1476 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:02:18 +0000
Subject: ready for review, I think

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 51 +++++++++++++++++-----
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 0aca74be2..d4da13feb 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -20,7 +20,7 @@ That earlier version of the branch is also available for comparison:
 
 >> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
 
->>> [[!template id=gitbranch branch=smcv/sort-package author="[[Simon_McVittie|smcv]]"]]
+>>> [[!template id=gitbranch branch=smcv/ready/sort-package author="[[Simon_McVittie|smcv]]"]]
 >>> I'd be inclined to think that's overkill, but it wasn't very hard to
 >>> implement, and in a way is more elegant. I set it up so sort mechanisms
 >>> share the `IkiWiki::PageSpec` package, but with a `cmp_` prefix. Gitweb:
@@ -207,7 +207,26 @@ Unfortunatly, I think that c is closest to the new implementation.
 >     }
 >
 > which would mean that the comparison used `$IkiWiki::SortSpec::a`.
->
+> --s
+
+>> I've now done this. On a wiki with many [[plugins/contrib/album]]s
+>> (a full rebuild takes half an hour!), I tested a refresh after
+>> `touch tags/*.mdwn` (my tag pages contain inlines of the form
+>> `tagged(foo)` sorted by date, so they exercise sorting).
+>> I also tried removing sorting from `pagespec_match_list`
+>> altogether, as an upper bound for how fast we can possibly make it.
+>>
+>> * `master` at branch point: 63.72user 0.29system
+>> * `master` at branch point: 63.91user 0.37system
+>> * my branch, with `@_`: 65.28user 0.29system
+>> * my branch, with `@_`: 65.21user 0.28system
+>> * my branch, with `$a`: 64.09user 0.28system
+>> * my branch, with `$a`: 63.83user 0.36system
+>> * not sorted at all: 58.99user 0.29system
+>> * not sorted at all: 58.92user 0.29system
+>>
+>> --s
+
 > I do notice that `pagespec_match_list` performs the sort before the
 > filter by pagespec. Is this a deliberate design choice, or
 > coincidence? I can see that when `limit` is used, this could be
@@ -218,7 +237,15 @@ Unfortunatly, I think that c is closest to the new implementation.
 
 >> Yes, it was deliberate, pagespec matching can be expensive enough that
 >> needing to sort a lot of pages seems likely to be less work. (I don't
->> remember what benchmarking was done though.) --[[Joey]] 
+>> remember what benchmarking was done though.) --[[Joey]]
+
+>>> We discussed this on IRC and Joey pointed out that this also affects
+>>> dependency calculation, so I'm not going to get into this now... --s
+
+Joey pointed out on IRC that the `titlesort` feature duplicates all the
+meta titles. I did that in order to sort by the unescaped version, but
+I've now changed the branch to only store that if it makes a difference.
+--s
 
 ## Documentation from sort-package branch
 
@@ -262,13 +289,13 @@ Similarly, it's possible to write plugins that add new functions as
 the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting
 by `foo` or `foo(...)` is requested.
 
-The function will be passed three or more parameters. The first two are
-page names, and the third is `undef` if invoked as `foo`, or the parameter
-`"bar"` if invoked as `foo(bar)`. It may also be passed additional, named
-parameters.
+The names of pages to be compared are in the global variables `$a` and `$b`
+in the IkiWiki::SortSpec package. The function should return the same thing
+as Perl's `cmp` and `<=>` operators: negative if `$a` is less than `$b`,
+positive if `$a` is greater, or zero if they are considered equal. It may
+also raise an error using `error`, for instance if it needs a parameter but
+one isn't provided.
 
-It should return the same thing as Perl's `cmp` and `<=>` operators: negative
-if the first argument is less than the second, positive if the first argument
-is greater, or zero if they are considered equal. It may also raise an
-error using `error`, for instance if it needs a parameter but one isn't
-provided.
+The function will also be passed one or more parameters. The first is
+`undef` if invoked as `foo`, or the parameter `"bar"` if invoked as `foo(bar)`;
+it may also be passed additional, named parameters.
-- 
cgit v1.2.3


From 1fb5b9f61c114a0151416d2de69b5ea420c6706b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:04:47 +0000
Subject: switch branch for review to use ready/foo convention

---
 doc/todo/matching_different_kinds_of_links.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index c4383c0b7..5678ee7e2 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -53,7 +53,7 @@ I don't have any opinion on this syntax (whether it's good or not)...--Ivan Z.
 
 -------
 
->> [[!template id=gitbranch author="[[Simon_McVittie|smcv]]" branch=smcv/link-types]]
+>> [[!template id=gitbranch author="[[Simon_McVittie|smcv]]" branch=smcv/ready/link-types]]
 >> [[!tag patch]]
 
 ## Documentation for smcv's branch
-- 
cgit v1.2.3


From 5408279b5ffd7038bb0c279d1379c7e0d21d0a96 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 6 Apr 2010 01:31:38 +0100
Subject: HTML-encode meta title, description, guid on output, but not in the
 pagestate

This makes them consistent with the rest of the meta keys. A wiki rebuild
will be needed on upgrade to this version; until the wiki is rebuilt,
double-escaping will occur in the titles of pages that have not changed.
---
 IkiWiki/Plugin/comments.pm |  4 ++--
 IkiWiki/Plugin/inline.pm   |  3 ++-
 IkiWiki/Plugin/meta.pm     | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 460341710..0aa043215 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -221,9 +221,9 @@ sub preprocess {
 	}
 
 	if (defined $params{subject}) {
-		# encode title the same way meta does
+		# decode title the same way meta does
 		eval q{use HTML::Entities};
-		$pagestate{$page}{meta}{title} = HTML::Entities::encode_numeric(decode_entities($params{subject}));
+		$pagestate{$page}{meta}{title} = decode_entities($params{subject});
 	}
 
 	if ($params{page} =~ m/\/\Q$config{comments_pagename}\E\d+_/) {
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 44919e58c..644cb588d 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -553,7 +553,8 @@ sub genfeed ($$$$$@) {
 
 		if (exists $pagestate{$p}) {
 			if (exists $pagestate{$p}{meta}{guid}) {
-				$itemtemplate->param(guid => $pagestate{$p}{meta}{guid});
+				eval q{use HTML::Entities};
+				$itemtemplate->param(guid => HTML::Entities::encode_numeric($pagestate{$p}{meta}{guid}));
 			}
 
 			if (exists $pagestate{$p}{meta}{updated}) {
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 5f046cb2a..9906c3f57 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -88,15 +88,15 @@ sub preprocess (@) {
 
 	# Metadata collection that needs to happen during the scan pass.
 	if ($key eq 'title') {
-		$pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
+		$pagestate{$page}{meta}{title}=$value;
 		return "";
 	}
 	elsif ($key eq 'description') {
-		$pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
+		$pagestate{$page}{meta}{description}=$value;
 		# fallthrough
 	}
 	elsif ($key eq 'guid') {
-		$pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value);
+		$pagestate{$page}{meta}{guid}=$value;
 		# fallthrough
 	}
 	elsif ($key eq 'license') {
@@ -264,15 +264,20 @@ sub pagetemplate (@) {
 		$template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}}));
 	}
 	if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) {
-		$template->param(title => $pagestate{$page}{meta}{title});
+		$template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title}));
 		$template->param(title_overridden => 1);
 	}
 
-	foreach my $field (qw{author authorurl description permalink}) {
+	foreach my $field (qw{author authorurl permalink}) {
 		$template->param($field => $pagestate{$page}{meta}{$field})
 			if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
 	}
 
+	foreach my $field (qw{description}) {
+		$template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))
+			if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
+	}
+
 	foreach my $field (qw{license copyright}) {
 		if (exists $pagestate{$page}{meta}{$field} && $template->query(name => $field) &&
 		    ($page eq $destpage || ! exists $pagestate{$destpage}{meta}{$field} ||
-- 
cgit v1.2.3


From 26bf69d17aff4c74dd6c368712091d8c1fc977a6 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:49:38 +0000
Subject: as seen on IRC

---
 ...but_not_all_meta_fields_are_stored_escaped.mdwn | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
new file mode 100644
index 000000000..d79318dd8
--- /dev/null
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -0,0 +1,32 @@
+[[!template id=gitbranch branch=smcv/unescaped-meta author="[[Simon_McVittie|smcv]]"]]
+(Warning: this branch has not been tested thoroughly.)
+
+While discussing the [[plugins/meta]] plugin on IRC, Joey pointed out that
+it stores most meta fields unescaped, but 'title', 'guid' and 'description'
+are special-cased and stored escaped (with numeric XML/HTML entities). This
+is to avoid emitting markup in the <title> of a HTML page, or in an RSS/Atom
+feed, neither of which are subject to the [[plugins/htmlscrubber]].
+
+However, having the meta fields "partially escaped" like this is somewhat
+error-prone. Joey suggested that perhaps everything should be stored
+unescaped, and the escaping should be done on output; this branch
+implements that.
+
+Points of extra subtlety:
+
+* The title given to the [[plugins/search]] plugin was previously HTML;
+  now it's plain text, potentially containing markup characters. I suspect
+  that that's what Xapian wants anyway (which is why I didn't change it),
+  but I could be wrong...
+
+* Page descriptions in the HTML `<head>` were previously double-escaped:
+  the description was stored escaped with numeric entities, then that was
+  output with a second layer of escaping! In this branch, I just emit
+  the page description escaped once, as was presumably the intention.
+
+* It's safe to apply this change to a wiki and neglect to rebuild it
+  (assuming I implemented it correctly!), but until the wiki is rebuilt,
+  titles, descriptions and GUIDs for unchanged pages will appear
+  double-escaped on any page that inlines them in `quick=yes` mode, and
+  is rebuilt for some other reason. The failure mode is too much escaping
+  rather than too little, so it shouldn't be a security problem.
-- 
cgit v1.2.3


From 0ed94696c0a449b425bc319297d39060ee24dcf2 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:50:51 +0000
Subject: pages talking about escaping should really be escaped correctly

---
 doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
index d79318dd8..cbfcfd6b7 100644
--- a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -4,7 +4,7 @@
 While discussing the [[plugins/meta]] plugin on IRC, Joey pointed out that
 it stores most meta fields unescaped, but 'title', 'guid' and 'description'
 are special-cased and stored escaped (with numeric XML/HTML entities). This
-is to avoid emitting markup in the <title> of a HTML page, or in an RSS/Atom
+is to avoid emitting markup in the `<title>` of a HTML page, or in an RSS/Atom
 feed, neither of which are subject to the [[plugins/htmlscrubber]].
 
 However, having the meta fields "partially escaped" like this is somewhat
-- 
cgit v1.2.3


From 315bcf866c490ae2041cef59f960e8021d52e840 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:51:27 +0000
Subject: tag as patch

---
 doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
index cbfcfd6b7..6a934d4eb 100644
--- a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -1,4 +1,5 @@
 [[!template id=gitbranch branch=smcv/unescaped-meta author="[[Simon_McVittie|smcv]]"]]
+[[!tag patch]]
 (Warning: this branch has not been tested thoroughly.)
 
 While discussing the [[plugins/meta]] plugin on IRC, Joey pointed out that
-- 
cgit v1.2.3


From 1f112d570ef235416c4001605e15980b2f628da4 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:55:54 +0000
Subject: if applied, reverting this would be problematic

---
 doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
index 6a934d4eb..8e1ca42e0 100644
--- a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -31,3 +31,9 @@ Points of extra subtlety:
   double-escaped on any page that inlines them in `quick=yes` mode, and
   is rebuilt for some other reason. The failure mode is too much escaping
   rather than too little, so it shouldn't be a security problem.
+
+* Reverting this change, if applied, is more dangerous; until the wiki is
+  rebuilt, any titles, descriptions and GUIDs on unchanged pages that
+  contained markup could appear unescaped on any page that inlines them
+  in `quick=yes` mode, and is rebuilt for some other reason. The failure
+  mode here would be too little escaping, i.e. cross-site scripting.
-- 
cgit v1.2.3


From 5f8df5828834c0163d04ad3b949888d78e37ae73 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 03:59:09 +0000
Subject:

---
 doc/plugins/contrib/ymlfront/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index f437624b6..ce3b2b483 100644
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -2,3 +2,6 @@ My field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb
 <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
 has some fixes for compatibility with old YAML modules, mostly done by imitating
 Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
+
+> I would if I could *find* it.  I checked out the "field-etc" branch, but I can't find the plugins in question under IkiWiki/Plugin; am I looking in the wrong place, or what?
+> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 06f58b1b888a6cea1a9a5cce9e098428f0adab75 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 04:00:47 +0000
Subject: response

---
 doc/plugins/contrib/field/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index c2b75a76d..af5bfd6c9 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -92,3 +92,5 @@ you separated out `ymlfront`. Trivial patch available from
 field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
 <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
 --[[smcv]]
+
+> Can do for the field plugin (delete one line? Easy.)  Will push when I get to a better connection.  --[[KathrynAndersen]]
-- 
cgit v1.2.3


From ee1e7079ebe0a1e9d3d6c79cb221a0fb86f423d5 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 04:41:55 +0000
Subject: more flexible underlays, please?

---
 doc/todo/optional_underlaydir_prefix.mdwn | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 doc/todo/optional_underlaydir_prefix.mdwn

diff --git a/doc/todo/optional_underlaydir_prefix.mdwn b/doc/todo/optional_underlaydir_prefix.mdwn
new file mode 100644
index 000000000..8fd6d76c5
--- /dev/null
+++ b/doc/todo/optional_underlaydir_prefix.mdwn
@@ -0,0 +1,20 @@
+For security reasons, symlinks are disabled in IkiWiki.  That's fair enough, but that means that some problems, which one could otherwise solve by using a symlink, cannot be solved. The specfic problem in this case is that all underlays are placed at the root of the wiki, when it could be more convenient to place some underlays in specific sub-directories.
+
+Use-case 1 (to keep things tidy):
+
+Currently IkiWiki has some javascript files in `underlays/javascript`; that directory is given as one of the underlay directories.  Thus, all the javascript files appear in the root of the generated site.  But it would be tidier if one could say "put the contents of *this* underlaydir under the `js` directory".
+
+Use-case 2 (a read-only external dir):
+
+Suppose I want to include a subset of `/usr/local/share/docs` on my wiki, say the docs about `foo`.  But I want them to be under the `docs/foo` sub-directory on the generated site.  Currently I can't do that.  If I give `/usr/local/share/docs/foo` as an underlaydir, then the contents of that will be in the root of the site, rather than under `docs/foo`.  And if I give `/usr/local/share/docs` as an underlaydir, then the contents of the `foo` dir will be under `foo`, but it will also include every other thing in `/usr/local/share/docs`.
+
+Since we can't use symlinks in an underlay dir to link to these directories, then perhaps one could give a specific underlay dir a specific prefix, which defines the sub-directory that the underlay should appear in.
+
+I'm not sure how this would be implemented, but I guess it could be configured something like this:
+
+    prefixed_underlay => {
+         'js' => '/usr/local/share/ikiwiki/javascript',
+         'docs/foo' => '/usr/local/share/docs/foo',
+    }
+
+[[!taglink wishlist]]
-- 
cgit v1.2.3


From 2efec70c7e55f9426d7051ffebc6c1eb55afb16b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 10:47:28 +0000
Subject: oops, branch returned now

---
 doc/plugins/contrib/ymlfront/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index ce3b2b483..3ad02af29 100644
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -5,3 +5,7 @@ Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
 
 > I would if I could *find* it.  I checked out the "field-etc" branch, but I can't find the plugins in question under IkiWiki/Plugin; am I looking in the wrong place, or what?
 > --[[KathrynAndersen]]
+
+>> Sorry, I accidentally removed `field-etc` by pushing with `--mirror` from a
+>> different checkout. I've put it back; it's a branch from your `ikiplugins.git`,
+>> so yes, the code should be in `IkiWiki/Plugin`. --[[smcv]]
-- 
cgit v1.2.3


From 089a7faff8defe98ffc593702be93f8f35d2153a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 13:25:26 -0400
Subject: first question

---
 doc/plugins/contrib/field/discussion.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index af5bfd6c9..646a5f3f4 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -94,3 +94,18 @@ field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
 --[[smcv]]
 
 > Can do for the field plugin (delete one line? Easy.)  Will push when I get to a better connection.  --[[KathrynAndersen]]
+
+----
+
+Disclaimer: I've only looked at this plugin and ymlfront, not other related
+stuff yet. (I quite like ymlfront, so I looked at this as its dependency. :)
+I also don't want to annoy you with a lot of design discussion 
+if your main goal was to write a plugin that did exactly what you wanted.
+
+My first question is: Why we need another plugin storing metadata
+about the page, when we already have the meta plugin? Much of the
+complication around the field plugin has to do with it accessing info
+belonging to the meta plugin, and generalizing that to be able to access
+info stored by other plugins too. (But I don't see any other plugins that
+currently store such info). Then too, it raises points of confusion like
+smcv's discuission of field author vs meta author above. --[[Joey]] 
-- 
cgit v1.2.3


From c87ddb6908485fecff9c516223ca0b2973df88f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 13:58:55 -0400
Subject: idea

---
 doc/todo/optional_underlaydir_prefix.mdwn | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/doc/todo/optional_underlaydir_prefix.mdwn b/doc/todo/optional_underlaydir_prefix.mdwn
index 8fd6d76c5..dd11d062d 100644
--- a/doc/todo/optional_underlaydir_prefix.mdwn
+++ b/doc/todo/optional_underlaydir_prefix.mdwn
@@ -4,6 +4,9 @@ Use-case 1 (to keep things tidy):
 
 Currently IkiWiki has some javascript files in `underlays/javascript`; that directory is given as one of the underlay directories.  Thus, all the javascript files appear in the root of the generated site.  But it would be tidier if one could say "put the contents of *this* underlaydir under the `js` directory".
 
+> Of course, this could be accomplished, if we wanted to, by moving the
+> files to `underlays/javascript/js`. --[[Joey]] 
+
 Use-case 2 (a read-only external dir):
 
 Suppose I want to include a subset of `/usr/local/share/docs` on my wiki, say the docs about `foo`.  But I want them to be under the `docs/foo` sub-directory on the generated site.  Currently I can't do that.  If I give `/usr/local/share/docs/foo` as an underlaydir, then the contents of that will be in the root of the site, rather than under `docs/foo`.  And if I give `/usr/local/share/docs` as an underlaydir, then the contents of the `foo` dir will be under `foo`, but it will also include every other thing in `/usr/local/share/docs`.
@@ -17,4 +20,25 @@ I'm not sure how this would be implemented, but I guess it could be configured s
          'docs/foo' => '/usr/local/share/docs/foo',
     }
 
+> So, let me review why symlinks are an issue. For normal, non-underlay
+> pages, users who do not have filesystem access to the server may have 
+> commit access, and so could commit eg, a symlink to `/etc/passwd` (or
+> to `/` !). The guards are there to prevent ikiwiki either exposing the
+> symlink target's contents, or potentially overwriting it.
+> 
+> Is this a concern for underlays? Most of the time, certianly not;
+> the underlay tends to be something only the site admin controls.
+> Not all the security checks that are done on the srcdir are done
+> on the underlays, either. Most checks done on files in the underlay
+> are only done because the same code handles srcdir files. The one
+> exception is the test that skips processing symlinks in the underlay dir.
+> (But note that the underlay directory can be a symlinkt to elsewhere
+> which the srcdir, by default, cannot.)
+> 
+> So, one way to approach this is to make ikiwiki follow directory symlinks
+> inside the underlay directory. Just a matter of passing `follow => 1` to
+> find. (This would still not allow individual files to be symlinks, because
+> `readfile` does not allow reading symlinks. But I don't see much need
+> for that.) --[[Joey]]
+
 [[!taglink wishlist]]
-- 
cgit v1.2.3


From 33d934b5ca1666bfe3f9fa3004ad7d31c38c69c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:05:00 -0400
Subject: comment

---
 doc/forum/an_alternative_approach_to_structured_data.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index 045bfd7aa..06c82337a 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -18,6 +18,10 @@ I think it could be really powerful and useful, especially if it becomes part of
 
 > It looks like an interesting idea.  I don't have time right now to look at it in depth, but it looks interesting. -- [[Will]]
 
+> I agree such a separation makes some sense. But note that the discussion on [[todo/structured_page_data]]
+> talks about associating data types with fields for a good reason: It's hard to later develop a good UI for
+> querying or modifying a page's data if all the data has an implicit type "string". --[[Joey]] 
+
 ## Second Pass
 
 I have written additional plugins which integrate with the [[plugins/contrib/field]] plugin to both set and get structured page data.
-- 
cgit v1.2.3


From 6fd59908ba8f6999f63c94c918f8c309ed108f74 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:06:29 -0400
Subject: comment

---
 doc/plugins/contrib/pod/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/contrib/pod/discussion.mdwn b/doc/plugins/contrib/pod/discussion.mdwn
index 76e858680..9187b1350 100644
--- a/doc/plugins/contrib/pod/discussion.mdwn
+++ b/doc/plugins/contrib/pod/discussion.mdwn
@@ -8,3 +8,7 @@ supports, or later support latex, that could be problimatic since that
 could maybe be used to include files or run code. --[[Joey]]
 
 > I don't know, either; the documentation for [[!cpan Pod:Xhtml]] is silent on this subject. --[[KathrynAndersen]]
+
+>> I'm afraid the only approach is to audit the existing code in the perl
+>> module(s), and then hope nothing is added to them later that opens a
+>> security hole. --[[Joey]] 
-- 
cgit v1.2.3


From ff267e7ac33226cfbdf30ae8e9b9f7688c485dc7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:09:02 -0400
Subject: comment

---
 doc/users/KathrynAndersen/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/users/KathrynAndersen/discussion.mdwn b/doc/users/KathrynAndersen/discussion.mdwn
index 288ea8c51..35340b22f 100644
--- a/doc/users/KathrynAndersen/discussion.mdwn
+++ b/doc/users/KathrynAndersen/discussion.mdwn
@@ -9,6 +9,10 @@ that as a patch to the existing map plugin.) --[[Joey]]
 
 > I think pmap is probably better as a separate plugin, because it has additional dependencies (HTML::LinkList) which people might not want to have to install.
 
+>> One approach commonly used in ikiwiki is to make such optional features
+>> be enabled by a switch somewhere, and 'eval q{use Foo}` so the module
+>> does not have to be loaded unless the feature is used. --[[Joey]] 
+
 > The "includepage" plugin I'm not sure whether it is worth releasing or not; it's basically a cut-down version of "inline", because the inline plugin is so complicated and has so many options, I felt more at ease to have something simpler.
 
 > --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 407a3493599afbb2f16a0ace49ff1924997895d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:20:44 -0400
Subject: nearly there!

---
 doc/todo/matching_different_kinds_of_links.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 5678ee7e2..76a99f6a5 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -176,3 +176,15 @@ though... --[[smcv]]
 
 >> Removed in a newer version of the branch. I re-introduced it as a
 >> plugin in `smcv/typedlink`, but I don't think we really need it. --s
+
+----
+
+I am ready to merge this, but I noticed one problem -- since `match_tagged`
+now only matches pages with the tag linktype, a wiki will need to be
+rebuilt on upgrade in order to get the linktype of existing tags in it
+recorded. So there needs to be a NEWS item about this and
+the postinst modified to force the rebuild.
+
+Also, the ready branch adds `typedlink()` to [[ikiwiki/pagespec]],
+but you removed that feature as documented above.
+--[[Joey]]
-- 
cgit v1.2.3


From b29c50c731d17c83fef21ef606654ce3bde84310 Mon Sep 17 00:00:00 2001
From: webkatalog <webkatalog@web>
Date: Tue, 6 Apr 2010 18:38:17 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4a3e41e83..ef9c3da59 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -96,6 +96,7 @@ Personal sites and blogs
 * [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page.
 * [Chez Fred](http://fred.ccheznous.org)
 * [Cameron Dale](http://www.camrdale.org/)
+* [webkatalog ohne backlinkpflicht](http://www.1a-verzeichnis.de/)
 * [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki 
   [asciidoc plugin](http://mowson.org/karl/colophon/).
 * [Carl Worth's Boring Web Pages](http://www.cworth.org)
-- 
cgit v1.2.3


From 4568ba8a6228cb80cea4b3c4520ae8a066e6f04a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:39:51 -0400
Subject: Revert spam

This reverts commit b29c50c731d17c83fef21ef606654ce3bde84310.

Nice try, no cigar.
---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index ef9c3da59..4a3e41e83 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -96,7 +96,6 @@ Personal sites and blogs
 * [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page.
 * [Chez Fred](http://fred.ccheznous.org)
 * [Cameron Dale](http://www.camrdale.org/)
-* [webkatalog ohne backlinkpflicht](http://www.1a-verzeichnis.de/)
 * [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki 
   [asciidoc plugin](http://mowson.org/karl/colophon/).
 * [Carl Worth's Boring Web Pages](http://www.cworth.org)
-- 
cgit v1.2.3


From e496920e51ae9f0ecfbad5799634a5064193dcdb Mon Sep 17 00:00:00 2001
From: webkatalog <webkatalog@web>
Date: Tue, 6 Apr 2010 18:43:08 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4a3e41e83..472bd5728 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -143,6 +143,7 @@ Personal sites and blogs
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
+* [Webkatalog ohne Backlinkpflicht](http://www.1a-verzeichnis.de/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 1a646f7e77e94128c3ef6938fbd727b302c9ef07 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 15:12:54 -0400
Subject: Revert spam

This reverts commit e496920e51ae9f0ecfbad5799634a5064193dcdb.

"Twice is enemy action"; enjoy your ban!
---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 472bd5728..4a3e41e83 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -143,7 +143,6 @@ Personal sites and blogs
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
-* [Webkatalog ohne Backlinkpflicht](http://www.1a-verzeichnis.de/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 48178c48ed63f1004e44b2e7850bcef773f0a1e5 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 6 Apr 2010 20:59:45 +0100
Subject: Auto-rebuild wikis on upgrade due to the taglink change

debian/NEWS and debian/postinst should be edited before release to have
an appropriate version number.
---
 debian/NEWS     | 10 ++++++++++
 debian/postinst |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/NEWS b/debian/NEWS
index 50332670f..afb3a8652 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+ikiwiki (3.UNRELEASED) UNRELEASED; urgency=low
+
+  Starting from this version, the tagged(x) pagespec only matches links that
+  were set up by the [[!tag]] or [[!taglink]] directives. To make this change,
+  all wikis need to be rebuilt on upgrade to this version. If you listed your
+  wiki in /etc/ikiwiki/wikilist this will be done automatically when the
+  Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild.
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 06 Apr 2010 20:53:07 +0100
+
 ikiwiki (3.20091017) unstable; urgency=low
 
   To take advantage of significant performance improvements, all
diff --git a/debian/postinst b/debian/postinst
index bf1825ab7..90b9e8a42 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=3.20091010
+firstcompat=3.20100401
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then
-- 
cgit v1.2.3


From b8f4ffdc5d381da04000502f20f0d4e4c13704b3 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 6 Apr 2010 21:00:48 +0100
Subject: Remove typedlink from [[ikiwiki/pagespec]]

It's not supported in this branch any more.
---
 doc/ikiwiki/pagespec.mdwn | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index ca6693024..5c191f23f 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -52,9 +52,6 @@ Some more elaborate limits can be added to what matches using these functions:
   specified IP address.
 * "`postcomment(glob)`" - matches only when comments are being 
   posted to a page matching the specified glob
-* "`typedlink(type glob)`" - matches pages that link to a given page (or glob)
-  with a given link type. Plugins can create links with a specific type:
-  for instance, the tag plugin creates links of type `tag`.
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
-- 
cgit v1.2.3


From 899639f10d49cff410059c3af2e1d5717c25b738 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 20:03:26 +0000
Subject: fixed

---
 doc/todo/matching_different_kinds_of_links.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 76a99f6a5..8e81860a1 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -185,6 +185,12 @@ rebuilt on upgrade in order to get the linktype of existing tags in it
 recorded. So there needs to be a NEWS item about this and
 the postinst modified to force the rebuild.
 
+> Done, although you'll need to plug in an appropriate version number when
+> you release it. Is there a distinctive reminder string you grep for
+> during releases? I've used `UNRELEASED` for now. --[[smcv]]
+
 Also, the ready branch adds `typedlink()` to [[ikiwiki/pagespec]],
 but you removed that feature as documented above.
 --[[Joey]]
+
+> Done. --s
-- 
cgit v1.2.3


From af99d4cb10b06292e8a0acd472ae905e072e3e84 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 22:24:24 +0000
Subject: reply

---
 doc/users/KathrynAndersen/discussion.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/users/KathrynAndersen/discussion.mdwn b/doc/users/KathrynAndersen/discussion.mdwn
index 35340b22f..4f2790c39 100644
--- a/doc/users/KathrynAndersen/discussion.mdwn
+++ b/doc/users/KathrynAndersen/discussion.mdwn
@@ -11,7 +11,9 @@ that as a patch to the existing map plugin.) --[[Joey]]
 
 >> One approach commonly used in ikiwiki is to make such optional features
 >> be enabled by a switch somewhere, and 'eval q{use Foo}` so the module
->> does not have to be loaded unless the feature is used. --[[Joey]] 
+>> does not have to be loaded unless the feature is used. --[[Joey]]
+
+>>> Unfortunately, HTML::LinkList isn't an optional feature for pmap; that's what it uses to create the HTML for the map. --[[KathrynAndersen]]
 
 > The "includepage" plugin I'm not sure whether it is worth releasing or not; it's basically a cut-down version of "inline", because the inline plugin is so complicated and has so many options, I felt more at ease to have something simpler.
 
-- 
cgit v1.2.3


From 121405e8aa80e7ceb5283b0ff8c9865458a6dd52 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 23:09:59 +0000
Subject: response to Joey and smcv

---
 doc/plugins/contrib/field/discussion.mdwn | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 646a5f3f4..b243e2dfe 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -21,7 +21,9 @@ behaviour, an auxiliary plugin would be easy.)
 >> (like `map`). Is your plan that `meta` should register itself by
 >> default, and `map` and friends should be adapted to
 >> work based on `getfield()` instead of `$pagestate{foo}{meta}`, then?
->>
+
+>>> Based on `field_get_value()`, yes.  That would be my ideal.  Do you think I should implement that as an ikiwiki branch? --[[KathrynAndersen]]
+
 >> (On the site I mentioned, I'm using an unmodified version of `field`,
 >> and currently working around the collision by tagging books' pages
 >> with `bookauthor` instead of `author` in the YAML.) --s
@@ -94,6 +96,7 @@ field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
 --[[smcv]]
 
 > Can do for the field plugin (delete one line? Easy.)  Will push when I get to a better connection.  --[[KathrynAndersen]]
+>> Done! -K.A.
 
 ----
 
@@ -109,3 +112,16 @@ belonging to the meta plugin, and generalizing that to be able to access
 info stored by other plugins too. (But I don't see any other plugins that
 currently store such info). Then too, it raises points of confusion like
 smcv's discuission of field author vs meta author above. --[[Joey]] 
+
+> The point is exactly in the generalization, to provide a uniform interface for accessing structured data, no matter what the source of it, whether that be the meta plugin or some other plugin.
+
+> There were a few reasons for this:
+
+>1. In converting my site over from PmWiki, I needed something that was equivalent to PmWiki's Page-Text-Variables (which is how PmWiki implements structured data).
+>2. I also wanted an equivalent of PmWiki's Page-Variables, which, rather than being simple variables, are the return-value of a function.  This gives one a lot of power, because one can do calculations, derive one thing from another.  Heck, just being able to have a "basename" variable is useful.
+>3. I noticed that in the discussion about structured data, it was mired down in disagreements about what form the structured data should take; I wanted to overcome that hurdle by decoupling the form from the content.
+>4. I actually use this to solve (1), because, while I do use ymlfront, initially my pages were in PmWiki format (I wrote (another) unreleased plugin which parses PmWiki format) including PmWiki's Page-Text-Variables for structured data.  So I needed something that could deal with multiple formats.
+
+> So, yes, it does cater to mostly my personal needs, but I think it is more generally useful, also.
+> --[[KathrynAndersen]]
+
-- 
cgit v1.2.3


From c7eaf3c262f322290f6e15959369c14d190bbe09 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 23:19:18 +0000
Subject: response

---
 doc/forum/an_alternative_approach_to_structured_data.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index 06c82337a..6e6af8adb 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -20,7 +20,9 @@ I think it could be really powerful and useful, especially if it becomes part of
 
 > I agree such a separation makes some sense. But note that the discussion on [[todo/structured_page_data]]
 > talks about associating data types with fields for a good reason: It's hard to later develop a good UI for
-> querying or modifying a page's data if all the data has an implicit type "string". --[[Joey]] 
+> querying or modifying a page's data if all the data has an implicit type "string". --[[Joey]]
+
+>> I'm not sure that having an implicit type of "string" is really such a bad thing.  After all, Perl itself manages with just string and number, and easily converts from one to the other.  Strong typing is generally used to (a) restrict what can be done with the data and/or (b) restrict how the data is input.  The latter could be done with some sort of validated form, but that, too, could be decoupled from looking up and returning the value of a field. --[[KathrynAndersen]]
 
 ## Second Pass
 
-- 
cgit v1.2.3


From 811d398646337717f8f2ad92897c6410faa42777 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 23:20:49 +0000
Subject: response

---
 doc/todo/optional_underlaydir_prefix.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/optional_underlaydir_prefix.mdwn b/doc/todo/optional_underlaydir_prefix.mdwn
index dd11d062d..06900a904 100644
--- a/doc/todo/optional_underlaydir_prefix.mdwn
+++ b/doc/todo/optional_underlaydir_prefix.mdwn
@@ -41,4 +41,6 @@ I'm not sure how this would be implemented, but I guess it could be configured s
 > `readfile` does not allow reading symlinks. But I don't see much need
 > for that.) --[[Joey]]
 
+>> If you think that enabling symlinks in underlay directories wouldn't be a security issue, then I'm all for it!  That would be much simpler to implement, I'm sure. --[[KathrynAndersen]]
+
 [[!taglink wishlist]]
-- 
cgit v1.2.3


From 1158fe8f4400943d7a24350c6ac8fee6a95c2bed Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 7 Apr 2010 02:55:50 +0000
Subject: further discussion, point out potential XSS

---
 doc/plugins/contrib/field/discussion.mdwn | 110 ++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index b243e2dfe..16b40cf06 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -24,10 +24,64 @@ behaviour, an auxiliary plugin would be easy.)
 
 >>> Based on `field_get_value()`, yes.  That would be my ideal.  Do you think I should implement that as an ikiwiki branch? --[[KathrynAndersen]]
 
+>>>> This doesn't solve cases where certain fields are treated specially; for
+>>>> instance, putting a `\[[!meta permalink]]` on a page is not the same as
+>>>> putting it in `ymlfront` (in the latter case you won't get your
+>>>> `<link>` header), and putting `\[[!meta date]]` is not the same as putting
+>>>> `date` in `ymlfront` (in the latter case, `%pagectime` won't be changed).
+>>>>
+>>>> One way to resolve that would be to have `ymlfront`, or similar, be a
+>>>> front-end for `meta` rather than for `field`, and call
+>>>> `IkiWiki::Plugin::meta::preprocess` (or a refactored-out function that's
+>>>> similar).
+>>>>
+>>>> There are also some cross-site scripting issues (see below)... --[[smcv]]
+
 >> (On the site I mentioned, I'm using an unmodified version of `field`,
 >> and currently working around the collision by tagging books' pages
 >> with `bookauthor` instead of `author` in the YAML.) --s
 
+>> Revisiting this after more thought, the problem here is similar to the
+>> possibility that a wiki user adds a `meta` shortcut
+>> to [[shortcuts]], or conversely, that a plugin adds a `cpan` directive
+>> that conflicts with the `cpan` shortcut that pages already use. (In the
+>> case of shortcuts, this is resolved by having plugin-defined directives
+>> always win.) For plugin-defined meta keywords this is the plugin
+>> author's/wiki admin's problem - just don't enable conflicting plugins! -
+>> but it gets scary when you start introducing things like `ymlfront`, which
+>> allow arbitrary, wiki-user-defined fields, even ones that subvert
+>> other plugins' assumptions.
+>>
+>> The `pagetemplate` hook is particularly alarming because page templates are
+>> evaluated in many contexts, not all of which are subject to the
+>> htmlscrubber or escaping; because the output from `field` isn't filtered,
+>> prefixed or delimited, when combined with an arbitrary-key-setting plugin
+>> like `ymlfront` it can interfere with other plugins' expectations
+>> and potentially cause cross-site scripting exploits. For instance, `inline`
+>> has a `pagetemplate` hook which defines the `FEEDLINKS` template variable
+>> to be a blob of HTML to put in the `<head>` of the page. As a result, this
+>> YAML would be bad:
+>>
+>>     ---
+>>     FEEDLINKS: <script>alert('code injection detected')</script>
+>>     ---
+>>
+>> (It might require a different case combination due to implementation
+>> details, I'm not sure.)
+>>
+>> It's difficult for `field` to do anything about this, because it doesn't
+>> know whether a field is meant to be plain text, HTML, a URL, or something
+>> else.
+>>
+>> If `field`'s `pagetemplate` hook did something more limiting - like
+>> only emitting template variables starting with `field_`, or from some
+>> finite set, or something - then this would cease to be a problem, I think?
+>>
+>> `ftemplate` and `getfield` don't have this problem, as far as I can see,
+>> because their output is in contexts where the user could equally well have
+>> written raw HTML directly; the user can cause themselves confusion, but
+>> can't cause harmful output. --[[smcv]]
+
 From a coding style point of view, the `$CamelCase` variable names aren't
 IkiWiki style, and the `match_foo` functions look as though they could benefit
 from being thin wrappers around a common `&IkiWiki::Plugin::field::match`
@@ -125,3 +179,59 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 > So, yes, it does cater to mostly my personal needs, but I think it is more generally useful, also.
 > --[[KathrynAndersen]]
 
+>> Is it fair to say, then, that `field`'s purpose is to take other
+>> plugins' arbitrary per-page data, and present it as a single
+>> merged/flattened string => string map per page? From the plugins
+>> here, things you then use that merged map for include:
+>>
+>> * sorting - stolen by [[todo/allow_plugins_to_add_sorting_methods]]
+>> * substitution into pages with Perl-like syntax - `getfield`
+>> * substitution into wiki-defined templates - the `pagetemplate`
+>>   hook
+>> * substitution into user-defined templates - `ftemplate`
+>>
+>> As I mentioned above, the flattening can cause collisions (and in the
+>> `pagetemplate` case, even security problems).
+>>
+>> I wonder whether conflating Page Text Variables with Page Variables
+>> causes `field` to be more general than it needs to be?
+>> To define a Page Variable (function-like field), you need to write
+>> a plugin containing that Perl function; if we assume that `field`
+>> or something resembling it gets merged into ikiwiki, then it's
+>> reasonable to expect third-party plugins to integrate with whatever
+>> scaffolding there is for these (either in an enabled-by-default
+>> plugin that most people are expected to leave enabled, like `meta`
+>> now, or in the core), and it doesn't seem onerous to expect each
+>> plugin that wants to participate in this mechanism to have code to
+>> do so. While it's still contrib, `field` could just have a special case
+>> for the meta plugin, rather than the converse?
+>>
+>> If Page Text Variables are limited to being simple strings as you
+>> suggest over in [[forum/an_alternative_approach_to_structured_data]],
+>> then they're functionally similar to `meta` fields, so one way to
+>> get their functionality would be to extend `meta` so that
+>>
+>>     \[[!meta badger="mushroom"]]
+>>
+>> (for an unrecognised keyword `badger`) would store
+>> `$pagestate{$page}{meta}{badger} = "mushroom"`? Getting this to
+>> appear in templates might be problematic, because a naive
+>> `pagetemplate` hook would have the same problem that `field` combined
+>> with `ymlfront` currently does.
+>>
+>> One disadvantage that would appear if the function-like and
+>> meta-like fields weren't in the same namespace would be that it
+>> wouldn't be possible to switch a field from being meta-like to being
+>> function-like without changing any wiki content that referenced it.
+>>
+>> Perhaps meta-like fields should just *be* `meta` (with the above
+>> enhancement), as a trivial case of function-like fields? That would
+>> turn `ymlfront` into an alternative syntax for `meta`, I think?
+>> That, in turn, would hopefully solve the special-fields problem,
+>> by just delegating it to meta. I've been glad of the ability to define
+>> new ad-hoc fields with this plugin without having to write an extra plugin
+>> to do so (listing books with a `bookauthor` and sorting them by
+>> `"field(bookauthor) title"`), but that'd be just as easy if `meta`
+>> accepted ad-hoc fields?
+>>
+>> --[[smcv]]
-- 
cgit v1.2.3


From 3b1dd03c7e7f56eaf6da956779c885c2e9e7ef53 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 22:57:02 -0400
Subject: improve wording to not encourage explicitly passing undef

---
 doc/plugins/write.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index fe7cf0183..71ff1fd29 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -960,8 +960,8 @@ will yield something like `foo/feed.rss`.
 This adds a link to `%links`, ensuring that duplicate links are not
 added. Pass it the page that contains the link, and the link text.
 
-An optional third parameter sets the link type (`undef` produces an ordinary
-[[ikiwiki/WikiLink]]).
+An optional third parameter sets the link type. If not specified,
+it is an ordinary [[ikiwiki/WikiLink]].
 
 ## Miscellaneous
 
-- 
cgit v1.2.3


From c0ca1967586234ae4e84e485af53804df2198bcd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 22:58:22 -0400
Subject: tweak wording and versions and add changelog entry

---
 debian/NEWS      | 12 ++++++------
 debian/changelog |  6 +++++-
 debian/postinst  |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index afb3a8652..4e433fd37 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,10 +1,10 @@
-ikiwiki (3.UNRELEASED) UNRELEASED; urgency=low
+ikiwiki (3.20100406) unstable; urgency=low
 
-  Starting from this version, the tagged(x) pagespec only matches links that
-  were set up by the [[!tag]] or [[!taglink]] directives. To make this change,
-  all wikis need to be rebuilt on upgrade to this version. If you listed your
-  wiki in /etc/ikiwiki/wikilist this will be done automatically when the
-  Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild.
+  Starting from this version, the tagged() pagespec only matches tags,
+  not regular wikilinks. To support this change, all wikis need to be
+  rebuilt on upgrade to this version. If you listed your wiki in
+  /etc/ikiwiki/wikilist this will be done automatically when the Debian
+  package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild.
 
  -- Simon McVittie <smcv@debian.org>  Tue, 06 Apr 2010 20:53:07 +0100
 
diff --git a/debian/changelog b/debian/changelog
index 77d17f566..435b7982f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-ikiwiki (3.20100404) UNRELEASED; urgency=low
+ikiwiki (3.20100406) UNRELEASED; urgency=low
 
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
   * comments: Fix missing entity encoding in title.
   * txt: Add a special case for robots.txt.
+  * Add support for link types, and make the the tagged() pagespec only
+    match tags, not regular links (a bugfix). 
+  * Rebuild wikis on upgrade to this version to get tag link types recorded
+    correctly.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/debian/postinst b/debian/postinst
index 90b9e8a42..8eac26361 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=3.20100401
+firstcompat=3.20100406
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then
-- 
cgit v1.2.3


From 25f3dd88180b1f96c7626f93f7f8841ef7df6f59 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:02:18 -0400
Subject: add note about minor back compat issue

---
 debian/NEWS | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 4e433fd37..e1cb00473 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,10 +1,13 @@
 ikiwiki (3.20100406) unstable; urgency=low
 
-  Starting from this version, the tagged() pagespec only matches tags,
-  not regular wikilinks. To support this change, all wikis need to be
-  rebuilt on upgrade to this version. If you listed your wiki in
-  /etc/ikiwiki/wikilist this will be done automatically when the Debian
-  package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild.
+  Starting from this version, the `tagged()` pagespec only matches tags,
+  not regular wikilinks. If your wiki accidentially relied on the old,
+  buggy behavior, you might need to change pagespecs to use `link()`.
+
+  To support the above change, all wikis need to be rebuilt on upgrade to
+  this version. If you listed your wiki in /etc/ikiwiki/wikilist this will
+  be done automatically when the Debian package is upgraded. Or use 
+  ikiwiki-mass-rebuild to force a rebuild.
 
  -- Simon McVittie <smcv@debian.org>  Tue, 06 Apr 2010 20:53:07 +0100
 
-- 
cgit v1.2.3


From e12cd5f293fea9d85c7e4cdc86e2bf9381d5676a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 7 Apr 2010 03:03:40 +0000
Subject: update fieldsort plugin again; remove obsolete bug + fix note
 (thanks!)

---
 doc/plugins/contrib/field/discussion.mdwn | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 16b40cf06..2ea195e5b 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -131,8 +131,8 @@ I think it should just be part of `field` rather than a separate plugin.
 			error("sort=field requires a parameter");
 		}
 
-		my $left = IkiWiki::Plugin::field::field_get_value($_[2], $_[0]);
-		my $right = IkiWiki::Plugin::field::field_get_value($_[2], $_[1]);
+		my $left = IkiWiki::Plugin::field::field_get_value($_[0], $a);
+		my $right = IkiWiki::Plugin::field::field_get_value($_[0], $b);
 
 		$left = "" unless defined $left;
 		$right = "" unless defined $right;
@@ -141,17 +141,6 @@ I think it should just be part of `field` rather than a separate plugin.
 
 	1;
 
--------
-
-Bug report: `field` has an unnecessary `use YAML::Any`, presumably from before
-you separated out `ymlfront`. Trivial patch available from
-field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
-<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
---[[smcv]]
-
-> Can do for the field plugin (delete one line? Easy.)  Will push when I get to a better connection.  --[[KathrynAndersen]]
->> Done! -K.A.
-
 ----
 
 Disclaimer: I've only looked at this plugin and ymlfront, not other related
-- 
cgit v1.2.3


From fcd810d236fdf779beb740082953a14feba07f0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:04:54 -0400
Subject: close

---
 doc/todo/matching_different_kinds_of_links.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 8e81860a1..da3ea49f6 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -193,4 +193,4 @@ Also, the ready branch adds `typedlink()` to [[ikiwiki/pagespec]],
 but you removed that feature as documented above.
 --[[Joey]]
 
-> Done. --s
+> [[Done]]. --s
-- 
cgit v1.2.3


From ffb0802c4a2e48021677a78695d84a356b1b8024 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:15:39 -0400
Subject: don't force a rebuild

Rebuild can be needed sometimes, but not always, so undef.
---
 IkiWiki/Plugin/sortnaturally.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
index 92453749d..62e42767c 100644
--- a/IkiWiki/Plugin/sortnaturally.pm
+++ b/IkiWiki/Plugin/sortnaturally.pm
@@ -13,7 +13,7 @@ sub getsetup {
 	return
 		plugin => {
 			safe => 1,
-			rebuild => 1,
+			rebuild => undef,
 		},
 }
 
-- 
cgit v1.2.3


From be2af2e5c1ddfe90802a67aa150cf17dbe903df0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:19:00 -0400
Subject: add cpan link

---
 doc/plugins/sortnaturally.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/sortnaturally.mdwn b/doc/plugins/sortnaturally.mdwn
index 91f373f6b..a16381946 100644
--- a/doc/plugins/sortnaturally.mdwn
+++ b/doc/plugins/sortnaturally.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=sortnaturally core=1 author="[[chrysn]], [[smcv]]"]]
 [[!tag type/meta]]
 
-This plugin provides the `title_natural` [[ikiwiki/pagespec/sorting]] order,
-which uses Sort::Naturally to sort numbered pages in a more natural order.
+This plugin provides the `title_natural` [[ikiwiki/pagespec/sorting]]
+order, which uses [[!cpan Sort::Naturally]] to sort numbered pages in a
+more natural order.
-- 
cgit v1.2.3


From dad7ac5a21bc049b9f559c98f4e113c99edb4eb5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:24:22 -0400
Subject: question

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index d4da13feb..d7f10528a 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -10,6 +10,9 @@ title over the page name, but for compatibility, I'm not going to (I do wonder
 whether it would be worth making sort=name an alias for the current sort=title,
 and changing the meaning of sort=title in 4.0, though).
 
+> What compatability concerns, exactly, are there that prevent making that
+> change now? --[[Joey]] 
+
 *[sort-hooks branch now withdrawn in favour of sort-package --s]*
 
 I briefly tried to turn *all* the current sort types into hook functions, and
-- 
cgit v1.2.3


From 04a9d8e867f1eef46e9c79dee055756bdbb6a039 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:26:59 -0400
Subject: remove note about more sort types possibly being available

Good plugins should document them :)
---
 doc/ikiwiki/pagespec/sorting.mdwn | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 5c6cfcc2b..37995f1e8 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -21,7 +21,4 @@ In addition, you can combine several sort orders and/or reverse the order of
 sorting, with a string like `age -title` (which would sort by age, then by
 title in reverse order if two pages have the same age).
 
-Plugins can add additional sort orders, so more might be available on this
-wiki.
-
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From 153c0ff13ba01fa42b3e34b410311c490ee084e9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:29:18 -0400
Subject: minor style etc changes

---
 IkiWiki.pm             | 6 ++----
 IkiWiki/Plugin/meta.pm | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6d2f4dac3..2cad6a3ef 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2435,10 +2435,8 @@ sub match_ip ($$;@) {
 package IkiWiki::SortSpec;
 
 # This is in the SortSpec namespace so that the $a and $b that sort() uses
-# $IkiWiki::SortSpec::a and $IkiWiki::SortSpec::b, so that plugins' cmp
-# functions can access them easily.
-sub sort_pages
-{
+# are easily available in this namespace, for cmp functions to use them.
+sub sort_pages {
 	my $f = IkiWiki::sortspec_translate(shift);
 
 	return sort $f @_;
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 34e902bec..892f6b2c9 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -300,8 +300,8 @@ sub pagetemplate (@) {
 }
 
 sub get_sort_key {
-	my $page = $_[0];
-	my $meta = $_[1];
+	my $page = shift;
+	my $meta = shift;
 
 	# e.g. titlesort (also makes sense for author)
 	my $key = $pagestate{$page}{meta}{$meta . "sort"};
@@ -379,7 +379,7 @@ sub match_copyright ($$;@) {
 package IkiWiki::SortSpec;
 
 sub cmp_meta {
-	my $meta = $_[0];
+	my $meta = shift;
 	error(gettext("sort=meta requires a parameter")) unless defined $meta;
 
 	if ($meta eq 'updated' || $meta eq 'date') {
-- 
cgit v1.2.3


From 32ce94f5a30e52da17f06b9b9dce7f3d3112da98 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:30:10 -0400
Subject: close (but one question remains!)

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index d7f10528a..b523cd19f 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -43,7 +43,7 @@ That earlier version of the branch is also available for comparison:
 
 >>>>>> `SortSpec` --[[Joey]] 
 
->>>>>>> Done. --s
+>>>>>>> [[Done]]. --s
 
 >>>> I would be inclined to drop the `check_` stuff. --[[Joey]] 
 
-- 
cgit v1.2.3


From 425ffc34f730c76ff964111a65055b62739928d4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:35:14 -0400
Subject: update for sort changes

---
 debian/changelog | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 435b7982f..5a9c85ac7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,23 @@
 ikiwiki (3.20100406) UNRELEASED; urgency=low
 
+  [ Joey Hess ]
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
   * comments: Fix missing entity encoding in title.
   * txt: Add a special case for robots.txt.
+
+  [ Simon McVittie ]
   * Add support for link types, and make the the tagged() pagespec only
-    match tags, not regular links (a bugfix). 
+    match tags, not regular links (a bugfix).
   * Rebuild wikis on upgrade to this version to get tag link types recorded
     correctly.
+  * Revamp sorting system; allow new sort methods to be added by plugins,
+    and add a "sortspec" syntax that can combine, reverse, etc sort methods
+  * meta: Add `meta(author)`, `meta(title)` etc sortspecs to allow sorting
+    by metadata.
+  * meta: Add optional sortas parameter to author and title meta directives.
+    This can be used to get names sorted by last name without displaying
+    them last name first.
+  * sortnarurally: New plugin; the title_natural sort method has moved here.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From 196851d4e2ff608e80855ae6ba12178a24595e5b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:37:46 -0400
Subject: typo

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a9c85ac7..9acd11e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,13 +11,13 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
   * Rebuild wikis on upgrade to this version to get tag link types recorded
     correctly.
   * Revamp sorting system; allow new sort methods to be added by plugins,
-    and add a "sortspec" syntax that can combine, reverse, etc sort methods
+    and add a "sortspec" syntax that can combine, reverse, etc sort methods.
   * meta: Add `meta(author)`, `meta(title)` etc sortspecs to allow sorting
     by metadata.
   * meta: Add optional sortas parameter to author and title meta directives.
     This can be used to get names sorted by last name without displaying
     them last name first.
-  * sortnarurally: New plugin; the title_natural sort method has moved here.
+  * sortnaturally: New plugin; the title_natural sort method has moved here.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From d58444a3e956e329cea4cbcdddcba99664ee585e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Apr 2010 00:01:38 -0400
Subject: note about sort and dependency types

There's a gotcha where pagespec_match_list is used with a dependency type
that is not a full content dependency, and so ikiwiki does not know that
a content change to a page that sorted too low to match needs to trigger
a rebuild, since its sort order may have changed.

Inline is mostly ok re this, as it does use content dependencies. Except
for in the case of raw mode. But then, page metadata is documented to not
be loaded, so it doesn't make sense to use sortspecs that depend on
metadata. I hope. :)
---
 doc/plugins/write.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 05ddf2215..707622956 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -734,7 +734,10 @@ Additional named parameters can be specified:
 * `filter` is a reference to a function, that is called and passed a page,
   and returns true if the page should be filtered out of the list.
 * `sort` specifies a sort order for the list. See
-  [[ikiwiki/PageSpec/sorting]] for the avilable sort methods.
+  [[ikiwiki/PageSpec/sorting]] for the avilable sort methods. Note that
+  if a sort method is specified that depends on the
+  page content (such as 'meta(foo)'), the deptype needs to be set to
+  a content dependency.
 * `reverse` if true, sorts in reverse.
 * `num` if nonzero, specifies the maximum number of matching pages that
   will be returned.
-- 
cgit v1.2.3


From ef1ebf6079bd2a91d1d799bafacf6a51d4633db3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Apr 2010 00:28:56 -0400
Subject: add peter's git repo

---
 doc/git.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 379285a49..55967e543 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -26,7 +26,8 @@ be browsed, subscribed to etc on its
 You are of course free to set up your own ikiwiki git repository with your
 own [[patches|patch]]. If you list it here, the `gitremotes` script will
 automatically add it to git remotes. Your repo will automatically be pulled
-into [[Joey]]'s working tree. This is recommended. :-)
+into [[Joey]]'s working repository where he can see your branches and
+think about merging them. This is recommended. :-)
 
 <!-- Machine-parsed format: * wikilink <git:url> -->
 
@@ -60,6 +61,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki`
   ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
 * [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
+* [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 2e9fae5c11d9fabf6270de18d0c26bc251750b09 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 7 Apr 2010 15:12:39 +0000
Subject: response about XSS, meta and pagetemplates

---
 doc/plugins/contrib/field/discussion.mdwn | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 2ea195e5b..dd9342224 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -224,3 +224,32 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >> accepted ad-hoc fields?
 >>
 >> --[[smcv]]
+
+>>> Your point above about cross-site scripting is a valid one, and something I
+>>> hadn't thought of (oops).
+
+>>> I still want to be able to populate pagetemplate templates with field, because I
+>>> use it for a number of things, such as setting which CSS files to use for a
+>>> given page, and, as I said, for titles.  But apart from the titles, I
+>>> realize I've been setting them in places other than the page data itself.
+>>> (Another unreleased plugin, `concon`, uses Config::Context to be able to
+>>> set variables on a per-site, per-directory and a per-page basis).
+
+>>> The first possible solution is what you suggested above: for field to only
+>>> set values in pagetemplate which are prefixed with *field_*.  I don't think
+>>> this is quite satisfactory, since that would still mean that people could
+>>> put un-scrubbed values into a pagetemplate, albeit they would be values
+>>> named field_foo, etc.
+
+>>> An alternative solution would be to classify field registration as "secure"
+>>> and "insecure".  Sources such as ymlfront would be insecure, sources such
+>>> as concon (or the $config hash) would be secure, since they can't be edited
+>>> as pages.  Then, when doing pagetemplate substitution (but not ftemplate
+>>> substitution) the insecure sources could be HTML-escaped.
+
+>>> Another problem, as you point out, is special-case fields, such as a number of
+>>> those defined by `meta`, which have side-effects associated with them, more
+>>> than just providing a value to pagetemplate.  Perhaps `meta` should deal with
+>>> the side-effects, but use `field` as an interface to get the values of those special fields.
+
+>>> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From e46a3b753463e71d8a24c35a5035cfbc47dd4816 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 7 Apr 2010 17:39:04 +0000
Subject: "safe" and "unsafe" too simplistic, I suspect

---
 doc/plugins/contrib/field/discussion.mdwn | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index dd9342224..24c37cc4c 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -239,13 +239,60 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >>> set values in pagetemplate which are prefixed with *field_*.  I don't think
 >>> this is quite satisfactory, since that would still mean that people could
 >>> put un-scrubbed values into a pagetemplate, albeit they would be values
->>> named field_foo, etc.
+>>> named field_foo, etc. --[[KathrynAndersen]]
+
+>>>> They can already do similar; `PERMALINK` is pre-sanitized to
+>>>> ensure that it's a "safe" URL, but if an extremely confused wiki admin was
+>>>> to put `COPYRIGHT` in their RSS/Atom feed's `<link>`, a malicious user
+>>>> could put an unsafe (e.g. Javascript) URL in there (`COPYRIGHT` *is*
+>>>> HTML-scrubbed, but "javascript:alert('pwned!')" is just text as far as a
+>>>> HTML sanitizer is concerned, so it passes straight through). The solution
+>>>> is to not use variables in situations where that variable would be
+>>>> inappropriate. Because `field` is so generic, the definition of what's
+>>>> appropriate is difficult. --[[smcv]]
 
 >>> An alternative solution would be to classify field registration as "secure"
 >>> and "insecure".  Sources such as ymlfront would be insecure, sources such
 >>> as concon (or the $config hash) would be secure, since they can't be edited
 >>> as pages.  Then, when doing pagetemplate substitution (but not ftemplate
 >>> substitution) the insecure sources could be HTML-escaped.
+>>> --[[KathrynAndersen]]
+
+>>>> Whether you trust the supplier of data seems orthogonal to whether its value
+>>>> is (meant to be) interpreted as plain text, HTML, a URL or what?
+>>>>
+>>>> Even in cases where you trust the supplier, you need to escape things
+>>>> suitably for the context, not for security but for correctness. The
+>>>> definition of the value, and the context it's being used in, changes the
+>>>> processing you need to do. An incomplete list:
+>>>>
+>>>> * HTML used as HTML needs to be html-scrubbed if and only if untrusted
+>>>> * URLs used as URLs need to be put through `safeurl()` if and only if
+>>>>   untrusted
+>>>> * HTML used as plain text needs tags removed regardless
+>>>> * URLs used as plain text are safe
+>>>> * URLs or plain text used in HTML need HTML-escaping (and URLs also need
+>>>>   `safeurl()` if untrusted)
+>>>> * HTML or plain text used in URLs need URL-escaping (and the resulting
+>>>>   URL might need sanitizing too?)
+>>>>
+>>>> I can't immediately think of other data types we'd be interested in beyond
+>>>> text, HTML and URL, but I'm sure there are plenty.
+>>>>
+>>>> One reasonable option would be to declare that `field` takes text-valued
+>>>> fields, in which case either consumers need to escape
+>>>> it with `<TMPL_VAR FIELD_FOO ESCAPE=HTML>`, and not interpret it as a URL
+>>>> without first checking `safeurl`), or the pagetemplate hook needs to
+>>>> pre-escape.
+>>>>
+>>>> Another reasonable option would be to declare that `field` takes raw HTML,
+>>>> in which case consumers need to only use it in contexts that will be
+>>>> HTML-scrubbed (but it becomes unsuitable for using as text - problematic
+>>>> for text-based things like sorting or URLs, and not ideal for searching).
+>>>>
+>>>> You could even let each consumer choose how it's going to use the field,
+>>>> by having the `foo` field generate `TEXT_FOO` and `HTML_FOO` variables?
+>>>> --[[smcv]]
 
 >>> Another problem, as you point out, is special-case fields, such as a number of
 >>> those defined by `meta`, which have side-effects associated with them, more
-- 
cgit v1.2.3


From c127e964f1704a6704639350851afee722825529 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Wed, 7 Apr 2010 21:25:26 +0100
Subject: expand my response

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 7129a44ac..82670250e 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -217,6 +217,16 @@ definitions essentially.
 
 >>> For this to work with websetup and --dumpsetup, it needs to define the
 >>> `meta_*` settings in the getsetup function.
+>>>> 
+>>>> I think this will be problematic with the current implementation of this
+>>>> patch. The datatype here is an array of hash references, with each hash
+>>>> having a variable (and arbitrary) number of key/value pairs.  I can't
+>>>> think of an intuitive way of implementing a way of editing such a
+>>>> datatype in the web interface, let alone registering the option in
+>>>> getsetup.
+>>>> 
+>>>> Perhaps a limited set of defined meta values could be exposed via
+>>>> websetup (the obvious ones: author, copyright, license, etc.) -- [[Jon]]
 >>>
 >>> I also have some concerns about both these patches, since both throw
 >>> a lot of redundant data at meta, which then stores it in a very redundant
@@ -232,6 +242,5 @@ definitions essentially.
 >>> meta special-case the site-wide settings, not store them in these
 >>> per-page data structures, and just make them be used if no per-page
 >>> metadata of the given type is present. --[[Joey]]
-
->>>> Thanks for the review - these are all valid points. I'll get working
->>>> on a revised patch. -- [[Jon]]
+>>>> 
+>>>> that should be easy enough to do. I will work on a patch. -- [[Jon]]
-- 
cgit v1.2.3


From 15a65ffae67b7eaf2702b3a42edee95daf8f4c89 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 7 Apr 2010 23:29:25 +0000
Subject: further response to smcv on pagetemplates

---
 doc/plugins/contrib/field/discussion.mdwn | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 24c37cc4c..36c2118e7 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -278,13 +278,34 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >>>>
 >>>> I can't immediately think of other data types we'd be interested in beyond
 >>>> text, HTML and URL, but I'm sure there are plenty.
->>>>
+
+>>>>> But isn't this a problem with anything that uses pagetemplates?  Or is
+>>>>> the point that, with plugins other than `field`, they all know,
+>>>>> beforehand, the names of all the fields that they are dealing with, and
+>>>>> thus the writer of the plugin knows which treatment each particular field
+>>>>> needs?  For example, that `meta` knows that `title` needs to be
+>>>>> HTML-escaped, and that `baseurl` doesn't.  In that case, yes, I see the problem.
+>>>>> It's a tricky one.  It isn't as if there's only ever going to be a fixed set of fields that need different treatment, either.  Because the site admin is free to add whatever fields they like to the page template (if they aren't using the default one, that is.  I'm not using the default one myself).
+>>>>> Mind you, for trusted sources, since the person writing the page template and the person providing the variable are the same, they themselves would know whether the value will be treated as HTML, plain text, or a URL, and thus could do the needed escaping themselves when writing down the value.
+
+>>>>> Looking at the content of the default `page.tmpl` let's see what variables fall into which categories:
+>>>>> * Used as URL: BASEURL, EDITURL, PARENTLINKS->URL, RECENTCHANGESURL, HISTORYURL, GETSOURCEURL, PREFSURL, OTHERLANGUAGES->URL, ADDCOMMENTURL, BACKLINKS->URL, MORE_BACKLINKS->URL
+>>>>> * Used as part of a URL: FAVICON, LOCAL_CSS
+>>>>> * Needs to be HTML-escaped: TITLE
+>>>>> * Used as-is (as HTML): FEEDLINKS, RELVCS, META, PERCENTTRANSLATED, SEARCHFORM, COMMENTSLINK, DISCUSSIONLINK, OTHERLANGUAGES->PERCENT, SIDEBAR, CONTENT, COMMENTS, TAGS->LINK, COPYRIGHT, LICENSE, MTIME, EXTRAFOOTER
+
+>>>>> This looks as if only TITLE needs HTML-escaping all the time, and that the URLS all end with "URL" in their name.  Unfortunately the FAVICON and LOCAL_CSS which are part of URLS don't have "URL" in their name, though that's fair enough, since they aren't full URLs.
+
+>>>>>  --K.A.
+
 >>>> One reasonable option would be to declare that `field` takes text-valued
 >>>> fields, in which case either consumers need to escape
 >>>> it with `<TMPL_VAR FIELD_FOO ESCAPE=HTML>`, and not interpret it as a URL
 >>>> without first checking `safeurl`), or the pagetemplate hook needs to
 >>>> pre-escape.
->>>>
+
+>>>>> Since HTML::Template does have the ability to do ESCAPE=HTML/URL/JS, why not take advantage of that? Some things, like TITLE, probably should have ESCAPE=HTML all the time; that would solve the "to escape or not to escape" problem that `meta` has with titles. After all, when one *sorts* by title, one doesn't really want HTML-escaping in it; only when one uses it in a template. -- K.A.
+
 >>>> Another reasonable option would be to declare that `field` takes raw HTML,
 >>>> in which case consumers need to only use it in contexts that will be
 >>>> HTML-scrubbed (but it becomes unsuitable for using as text - problematic
@@ -294,6 +315,8 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >>>> by having the `foo` field generate `TEXT_FOO` and `HTML_FOO` variables?
 >>>> --[[smcv]]
 
+>>>>> Something similar is already done in `template` and `ftemplate` with the `raw_` prefix, which determines whether the variable should have `htmlize` run over it first before the value is applied to the template.  Of course, that isn't scrubbing or escaping, because with those templates, the scrubbing is done afterwards as part of the normal processing.
+
 >>> Another problem, as you point out, is special-case fields, such as a number of
 >>> those defined by `meta`, which have side-effects associated with them, more
 >>> than just providing a value to pagetemplate.  Perhaps `meta` should deal with
-- 
cgit v1.2.3


From ce9cf967d01eb8e112c19d9f7b1c9a727717ef30 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 7 Apr 2010 23:33:04 +0000
Subject: formatting

---
 doc/plugins/contrib/field/discussion.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 36c2118e7..103e061e5 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -289,10 +289,11 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >>>>> Mind you, for trusted sources, since the person writing the page template and the person providing the variable are the same, they themselves would know whether the value will be treated as HTML, plain text, or a URL, and thus could do the needed escaping themselves when writing down the value.
 
 >>>>> Looking at the content of the default `page.tmpl` let's see what variables fall into which categories:
->>>>> * Used as URL: BASEURL, EDITURL, PARENTLINKS->URL, RECENTCHANGESURL, HISTORYURL, GETSOURCEURL, PREFSURL, OTHERLANGUAGES->URL, ADDCOMMENTURL, BACKLINKS->URL, MORE_BACKLINKS->URL
->>>>> * Used as part of a URL: FAVICON, LOCAL_CSS
->>>>> * Needs to be HTML-escaped: TITLE
->>>>> * Used as-is (as HTML): FEEDLINKS, RELVCS, META, PERCENTTRANSLATED, SEARCHFORM, COMMENTSLINK, DISCUSSIONLINK, OTHERLANGUAGES->PERCENT, SIDEBAR, CONTENT, COMMENTS, TAGS->LINK, COPYRIGHT, LICENSE, MTIME, EXTRAFOOTER
+
+>>>>> * **Used as URL:** BASEURL, EDITURL, PARENTLINKS->URL, RECENTCHANGESURL, HISTORYURL, GETSOURCEURL, PREFSURL, OTHERLANGUAGES->URL, ADDCOMMENTURL, BACKLINKS->URL, MORE_BACKLINKS->URL
+>>>>> * **Used as part of a URL:** FAVICON, LOCAL_CSS
+>>>>> * **Needs to be HTML-escaped:** TITLE
+>>>>> * **Used as-is (as HTML):** FEEDLINKS, RELVCS, META, PERCENTTRANSLATED, SEARCHFORM, COMMENTSLINK, DISCUSSIONLINK, OTHERLANGUAGES->PERCENT, SIDEBAR, CONTENT, COMMENTS, TAGS->LINK, COPYRIGHT, LICENSE, MTIME, EXTRAFOOTER
 
 >>>>> This looks as if only TITLE needs HTML-escaping all the time, and that the URLS all end with "URL" in their name.  Unfortunately the FAVICON and LOCAL_CSS which are part of URLS don't have "URL" in their name, though that's fair enough, since they aren't full URLs.
 
-- 
cgit v1.2.3


From a4a63cb7f9dcafb72810ba1a2ad69654cb8199d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Apr 2010 16:07:43 -0400
Subject: Update dependency for git-core to git transition.

---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9acd11e60..e14cc91f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
     them last name first.
   * sortnaturally: New plugin; the title_natural sort method has moved here.
 
+  [ Joey Hess ]
+  * Update dependency for git-core to git transition.
+
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
 ikiwiki (3.20100403) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d7ce9a178..b8fe81914 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends},
   libhtml-parser-perl, liburi-perl
 Recommends: gcc | c-compiler, 
   libc6-dev | libc-dev,
-  subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
+  subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
   libxml-simple-perl, libnet-openid-consumer-perl,
   liblwpx-paranoidagent-perl, libtimedate-perl,
   libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
-- 
cgit v1.2.3


From 1c1c76c53e1d0e713e470bb6542c5cc3cef20ad2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Apr 2010 12:25:10 -0400
Subject: close bug, was fixed in 3.20100403

---
 ...ox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
index 46e77a265..558eb90c8 100644
--- a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
+++ b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
@@ -5,3 +5,10 @@ Only explicitly pressing "reload" helps.
 Is it a bug? I haven't been noticing such problems usually on other sites. --Ivan Z.
 
 This remains to be true now, with Epiphany 2.26.3 (Mozilla/5.0 (X11; U; Linux i686; en; rv:1.9.1.4pre) Gecko/20080528 Epiphany/2.22 Firefox/3.5). --Ivan Z.
+
+> In the most recent ikiwiki release, I added a Cache-Control hack
+> explicitly to work around firefox's broken over-caching.
+> 
+> (When I tested epiphany and chromium, neither had firefox's problem.)
+>
+> [[!tag done]]
-- 
cgit v1.2.3


From d1a616df2ed79b1602658c5d10d54ee00afc537e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Apr 2010 18:43:25 -0400
Subject: po: Check that translated underlay directories exist before using
 them for master language.

---
 IkiWiki/Plugin/po.pm | 4 +++-
 debian/changelog     | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 2250a7f9f..00c58fbe5 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -174,7 +174,9 @@ sub checkconfig () {
 		if ($config{po_master_language}{code} ne 'en') {
 			# Add underlay containing translated source files
 			# for the master language.
-			add_underlay("locale/$config{po_master_language}{code}/$underlay");
+print STDERR "added underlay locale/$config{po_master_language}{code}/$underlay\n";
+			add_underlay("locale/$config{po_master_language}{code}/$underlay")
+				if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay";
 		}
 	}
 }
diff --git a/debian/changelog b/debian/changelog
index e14cc91f5..e985a5da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * Update dependency for git-core to git transition.
+  * po: Check that translated underlay directories exist before using them
+    for master language.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From a8761a086ebf353192e4721090ff11d3f67707b6 Mon Sep 17 00:00:00 2001
From: Cord <Cord@web>
Date: Sat, 10 Apr 2010 07:06:06 +0000
Subject:

---
 doc/todo/More_flexible_po-plugin_for_translation.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/todo/More_flexible_po-plugin_for_translation.mdwn

diff --git a/doc/todo/More_flexible_po-plugin_for_translation.mdwn b/doc/todo/More_flexible_po-plugin_for_translation.mdwn
new file mode 100644
index 000000000..3399f7834
--- /dev/null
+++ b/doc/todo/More_flexible_po-plugin_for_translation.mdwn
@@ -0,0 +1,5 @@
+I have a website with multi-language content, where some content is only in English, some in German, and some is available in both languages.
+
+The po-module currently has only one master-language, with slave languages, and a  PageSpec should be considered.
+
+It would be nice to flag the content which should have a translation on a file-by-file basis (with some inline directive?) which could contain the information of the master-language for that file and the desired target-languages.
-- 
cgit v1.2.3


From 61cbcb049fd1eb6a57ca2f51c78767a25d22820b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Apr 2010 14:35:45 -0400
Subject: update changelog, update rebuild version

---
 debian/NEWS      | 8 ++++----
 debian/changelog | 4 +++-
 debian/postinst  | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index b796154fa..25ebed0b4 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -8,10 +8,10 @@ ikiwiki (3.20100406) unstable; urgency=low
   not regular wikilinks. If your wiki accidentially relied on the old,
   buggy behavior, you might need to change pagespecs to use `link()`.
 
-  To support the above change, all wikis need to be rebuilt on upgrade to
-  this version. If you listed your wiki in /etc/ikiwiki/wikilist this will
-  be done automatically when the Debian package is upgraded. Or use 
-  ikiwiki-mass-rebuild to force a rebuild.
+  Due to the above and other changes, all wikis need to be rebuilt on
+  upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
+  this will be done automatically when the Debian package is upgraded. Or
+  use ikiwiki-mass-rebuild to force a rebuild.
 
  -- Simon McVittie <smcv@debian.org>  Tue, 06 Apr 2010 20:53:07 +0100
 
diff --git a/debian/changelog b/debian/changelog
index e985a5da8..113138358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100406) UNRELEASED; urgency=low
+ikiwiki (3.20100410) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
@@ -18,6 +18,8 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
     This can be used to get names sorted by last name without displaying
     them last name first.
   * sortnaturally: New plugin; the title_natural sort method has moved here.
+  * meta: store fields consistently unescaped, and escape on use
+    A wiki rebuild is also needed due to this change.
 
   [ Joey Hess ]
   * Update dependency for git-core to git transition.
diff --git a/debian/postinst b/debian/postinst
index 8eac26361..fa0591153 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=3.20100406
+firstcompat=3.20100410
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then
-- 
cgit v1.2.3


From 1004e6c739aaf2d66acd41e5a8a8fc3b6d4ba2c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Apr 2010 14:40:03 -0400
Subject: fix testsuite

typedlink matchspec was removed
---
 t/tag.t | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/t/tag.t b/t/tag.t
index cf3bbdf01..fe547d85b 100755
--- a/t/tag.t
+++ b/t/tag.t
@@ -3,7 +3,7 @@ package IkiWiki;
 
 use warnings;
 use strict;
-use Test::More tests => 10;
+use Test::More tests => 7;
 
 BEGIN { use_ok("IkiWiki"); }
 BEGIN { use_ok("IkiWiki::Plugin::tag"); }
@@ -36,9 +36,4 @@ ok(!pagespec_match("two", "tagged(alpha)"));
 ok(pagespec_match("one", "link(tags/numbers)"));
 ok(pagespec_match("one", "link(alpha)"));
 
-ok(pagespec_match("one", "typedlink(tag tags/numbers)"));
-ok(!pagespec_match("one", "typedlink(tag tags/letters)"));
-# invalid syntax
-ok(pagespec_match("one", "typedlink(tag)")->isa("IkiWiki::ErrorReason"));
-
 1;
-- 
cgit v1.2.3


From d2c36a6f4b8b4bf30d59c430893a88352ac208fc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Apr 2010 15:29:31 -0400
Subject: close

---
 doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
index 8e1ca42e0..587771ba4 100644
--- a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -20,6 +20,9 @@ Points of extra subtlety:
   that that's what Xapian wants anyway (which is why I didn't change it),
   but I could be wrong...
 
+  > AFAICS, this if anything, fixes a bug, xapian definitely expects
+  > unescaped text here. --[[Joey]] 
+
 * Page descriptions in the HTML `<head>` were previously double-escaped:
   the description was stored escaped with numeric entities, then that was
   output with a second layer of escaping! In this branch, I just emit
@@ -37,3 +40,5 @@ Points of extra subtlety:
   contained markup could appear unescaped on any page that inlines them
   in `quick=yes` mode, and is rebuilt for some other reason. The failure
   mode here would be too little escaping, i.e. cross-site scripting.
+
+[[!tag done]]
-- 
cgit v1.2.3


From d5eb5401496db1d7374a23f996e6924338d14ae2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Apr 2010 18:28:15 -0400
Subject: po: Configuring the same language as master and slave confuses
 processing; so filter out such a misconfiguration.

---
 IkiWiki/Plugin/po.pm | 2 +-
 debian/changelog     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 00c58fbe5..759e812e6 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -133,6 +133,7 @@ sub checkconfig () {
 				      $field, 'po'));
 		}
 	}
+	delete $config{po_slave_languages}{$config{po_master_language}{code}};;
 
 	map {
 		islanguagecode($_)
@@ -174,7 +175,6 @@ sub checkconfig () {
 		if ($config{po_master_language}{code} ne 'en') {
 			# Add underlay containing translated source files
 			# for the master language.
-print STDERR "added underlay locale/$config{po_master_language}{code}/$underlay\n";
 			add_underlay("locale/$config{po_master_language}{code}/$underlay")
 				if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay";
 		}
diff --git a/debian/changelog b/debian/changelog
index 113138358..208578527 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
   * Update dependency for git-core to git transition.
   * po: Check that translated underlay directories exist before using them
     for master language.
+  * po: Configuring the same language as master and slave confuses processing;
+    so filter out such a misconfiguration.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From 1be32275837760c65ef96e40893fb8ba540bc939 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Apr 2010 22:04:48 -0400
Subject: formatting

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 208578527..26b00a07c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,8 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
     This can be used to get names sorted by last name without displaying
     them last name first.
   * sortnaturally: New plugin; the title_natural sort method has moved here.
-  * meta: store fields consistently unescaped, and escape on use
-    A wiki rebuild is also needed due to this change.
+  * meta: store fields consistently unescaped, and escape on use.
+    (A wiki rebuild is also needed due to this change.)
 
   [ Joey Hess ]
   * Update dependency for git-core to git transition.
-- 
cgit v1.2.3


From cecbd529389788c1f1cb647e2ff297cda7554456 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Apr 2010 00:30:27 -0400
Subject: plan for more efficient pagespec_match_list sorting

(smcv please note)
---
 doc/todo/smarter_sorting.mdwn | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 doc/todo/smarter_sorting.mdwn

diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
new file mode 100644
index 000000000..5a6d63ef1
--- /dev/null
+++ b/doc/todo/smarter_sorting.mdwn
@@ -0,0 +1,33 @@
+I benchmarked a build of a large wiki (my home wiki), and it was spending
+quite a lot of time sorting; `CORE::sort` was called only 1138 times, but
+still flagged as the #1 time sink. (I'm not sure I trust NYTProf fully
+about that FWIW, since it also said 27238263 calls to `cmp_age` were
+the #3 timesink, and I suspect it may not entirely accurately measure
+the overhead of so many short function calls.)
+
+`pagespec_match_list` currently always sorts *all* pages first, and then
+finds the top M that match the pagespec. That's innefficient when M is
+small (as for example in a typical blog, where only 20 posts are shown,
+out of maybe thousands).
+
+As [[smcv]] noted, It could be flipped, so the pagespec is applied first,
+and then sort the smaller matching set. But, checking pagespecs is likely
+more expensive than sorting. (Also, influence calculation complicates
+doing that, since only influences for the M returned pages should be tracked.)
+
+Another option, when there is a limit on M pages to return, might be to
+cull the M top pages without sorting the rest. This could be done using
+a variant of Ye Olde Bubble Sort. Take the first M pages, and (quick)sort.
+Then for each of the rest, check if it is higher than the Mth page.
+If it is, bubble it up so it's sorted.
+If not, throw it out (that's the fast bit and why this is not O(N^2)).
+
+This would be bad when M is very large, and particularly, of course, when
+there is no limit and all pages are being matched on. (For example, an
+archive page shows all pages that match a pagespec specifying a creation
+date range.) Well, in this case, it *does* make sense to flip it, limit by
+pagespe first, and do a (quick)sort second. (No influence complications,
+either.)
+
+Adding these special cases will be more complicated, but I think the best
+of both worlds. --[[Joey]]
-- 
cgit v1.2.3


From 0bfc364a7df124509855b8ed0b1b33ab5bc9ebbb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Apr 2010 01:30:03 -0400
Subject: optimization: pagespec_match_list with no num limit matches before
 sorting

This can be a lot faster, since huge numbers of pages are not sorted
only to mostly be thrown away. It sped up a build of my blog by at least
5 minutes.
---
 IkiWiki.pm                    | 38 ++++++++++++++++++++++++++------------
 doc/todo/smarter_sorting.mdwn |  3 +++
 t/pagespec_match_list.t       |  6 +++++-
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2cad6a3ef..74d452c50 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1951,8 +1951,9 @@ sub add_link ($$;$) {
 	}
 }
 
-sub sortspec_translate ($) {
+sub sortspec_translate ($$) {
 	my $spec = shift;
+	my $reverse = shift;
 
 	my $code = "";
 	my @data;
@@ -2007,6 +2008,10 @@ sub sortspec_translate ($) {
 		return sub { 0 };
 	}
 
+	if ($reverse) {
+		$code="-($code)";
+	}
+
 	no warnings;
 	return eval 'sub { '.$code.' }';
 }
@@ -2109,18 +2114,20 @@ sub pagespec_match_list ($$;@) {
 			? grep { ! $params{filter}->($_) } keys %pagesources
 			: keys %pagesources;
 	}
-
-	if (defined $params{sort}) {
-		@candidates = IkiWiki::SortSpec::sort_pages($params{sort},
-			@candidates);
+	
+	my $num=$params{num};
+	my $sort=$params{sort};
+	my $reverse=$params{reverse};
+	# when only the top matches will be returned, it's efficient to
+	# sort before matching to pagespec,
+	if (defined $num && defined $sort) {
+		@candidates=IkiWiki::SortSpec::sort_pages(
+			$sort, $reverse, @candidates);
 	}
-
-	@candidates=reverse(@candidates) if $params{reverse};
 	
 	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
 	
 	# clear params, remainder is passed to pagespec
-	my $num=$params{num};
 	delete @params{qw{num deptype reverse sort filter list}};
 	
 	my @matches;
@@ -2144,7 +2151,15 @@ sub pagespec_match_list ($$;@) {
 		$depends_simple{$page}{lc $k} |= $i->{$k};
 	}
 
-	return @matches;
+	# when all matches will be returned, it's efficient to
+	# sort after matching
+	if (! defined $num && defined $sort) {
+		return IkiWiki::SortSpec::sort_pages(
+			$sort, $reverse, @matches);
+	}
+	else {
+		return @matches;
+	}
 }
 
 sub pagespec_valid ($) {
@@ -2437,9 +2452,8 @@ package IkiWiki::SortSpec;
 # This is in the SortSpec namespace so that the $a and $b that sort() uses
 # are easily available in this namespace, for cmp functions to use them.
 sub sort_pages {
-	my $f = IkiWiki::sortspec_translate(shift);
-
-	return sort $f @_;
+	my $f=IkiWiki::sortspec_translate(shift, shift);
+	sort $f @_
 }
 
 sub cmp_title {
diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
index 5a6d63ef1..f8ac216dc 100644
--- a/doc/todo/smarter_sorting.mdwn
+++ b/doc/todo/smarter_sorting.mdwn
@@ -29,5 +29,8 @@ date range.) Well, in this case, it *does* make sense to flip it, limit by
 pagespe first, and do a (quick)sort second. (No influence complications,
 either.)
 
+> Flipping when there's no limit implemented, and it knocked 1/3 off
+> the rebuild time of my blog's archive pages. --[[Joey]] 
+
 Adding these special cases will be more complicated, but I think the best
 of both worlds. --[[Joey]]
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 2ad7a9105..c7688c6c0 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 90;
+use Test::More tests => 92;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -38,12 +38,16 @@ $links{foo3}=[qw{bar}];
 is_deeply([pagespec_match_list("foo", "bar")], ["bar"]);
 is_deeply([sort(pagespec_match_list("foo", "* and !post/*"))], ["bar", "foo", "foo2", "foo3"]);
 is_deeply([sort(pagespec_match_list("foo", "post/*"))], ["post/1", "post/2", "post/3"]);
+is_deeply([pagespec_match_list("foo", "post/*", sort => "title")],
+	["post/1", "post/2", "post/3"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", reverse => 1)],
 	["post/3", "post/2", "post/1"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 2)],
 	["post/1", "post/2"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50)],
 	["post/1", "post/2", "post/3"]);
+is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50, reverse => 1)],
+	["post/3", "post/2", "post/1"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
                          filter => sub { $_[0] =~ /3/}) ],
 	["post/1", "post/2"]);
-- 
cgit v1.2.3


From 9060cb0cf8f73fca276719dd92dfae9b48d64d38 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 11 Apr 2010 14:32:18 +0100
Subject: Space sorting orders consistently

Markdown interprets the empty lines resulting from [[!if]] as a request
that each <li> contain a <p>. For consistent spacing in the HTML, either
the unconditional items should have blank lines between (resulting in
each <li> having a <p>), or the conditional items should not (resulting
in messy source code, and no <li> having a <p>). I think the former
looks nicer.
---
 doc/ikiwiki/pagespec/sorting.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 37995f1e8..ccd7f7eaa 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -4,7 +4,9 @@ specifying the order that matching pages are shown in. The following sort
 orders can be specified.
 
 * `age` - List pages from the most recently created to the oldest.
+
 * `mtime` - List pages with the most recently modified first.
+
 * `title` - Order by title (page name).
 [[!if test="enabled(sortnaturally)" then="""
 * `title_natural` - Orders by title, but numbers in the title are treated
-- 
cgit v1.2.3


From d50bd08439d5df17855b62f7c4d658027f93792d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Apr 2010 12:41:32 -0400
Subject: refactor sortspec translation

---
 IkiWiki.pm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 74d452c50..1730e476a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2102,6 +2102,8 @@ sub pagespec_match_list ($$;@) {
 	my $sub=pagespec_translate($pagespec);
 	error "syntax error in pagespec \"$pagespec\""
 		if ! defined $sub;
+	my $sort=sortspec_translate($params{sort}, $params{reverse})
+		if defined $params{sort};
 
 	my @candidates;
 	if (exists $params{list}) {
@@ -2115,21 +2117,18 @@ sub pagespec_match_list ($$;@) {
 			: keys %pagesources;
 	}
 	
+	# clear params, remainder is passed to pagespec
+	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
 	my $num=$params{num};
-	my $sort=$params{sort};
-	my $reverse=$params{reverse};
+	delete @params{qw{num deptype reverse sort filter list}};
+	
 	# when only the top matches will be returned, it's efficient to
 	# sort before matching to pagespec,
 	if (defined $num && defined $sort) {
 		@candidates=IkiWiki::SortSpec::sort_pages(
-			$sort, $reverse, @candidates);
+			$sort, @candidates);
 	}
 	
-	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
-	
-	# clear params, remainder is passed to pagespec
-	delete @params{qw{num deptype reverse sort filter list}};
-	
 	my @matches;
 	my $firstfail;
 	my $count=0;
@@ -2155,7 +2154,7 @@ sub pagespec_match_list ($$;@) {
 	# sort after matching
 	if (! defined $num && defined $sort) {
 		return IkiWiki::SortSpec::sort_pages(
-			$sort, $reverse, @matches);
+			$sort, @matches);
 	}
 	else {
 		return @matches;
@@ -2452,7 +2451,7 @@ package IkiWiki::SortSpec;
 # This is in the SortSpec namespace so that the $a and $b that sort() uses
 # are easily available in this namespace, for cmp functions to use them.
 sub sort_pages {
-	my $f=IkiWiki::sortspec_translate(shift, shift);
+	my $f=shift;
 	sort $f @_
 }
 
-- 
cgit v1.2.3


From df022df35e3e3fd1d2916e762a2359f23a84a955 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Apr 2010 14:57:40 -0400
Subject: implemented the other half of this

Writing my own sort code actually was faster than the built in sort. Whee!
(That's not supposed to happen, is it. ;)

But, I need to make sure influences are calculated alright.
---
 doc/todo/smarter_sorting.mdwn | 107 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
index f8ac216dc..4a638213f 100644
--- a/doc/todo/smarter_sorting.mdwn
+++ b/doc/todo/smarter_sorting.mdwn
@@ -13,7 +13,7 @@ out of maybe thousands).
 As [[smcv]] noted, It could be flipped, so the pagespec is applied first,
 and then sort the smaller matching set. But, checking pagespecs is likely
 more expensive than sorting. (Also, influence calculation complicates
-doing that, since only influences for the M returned pages should be tracked.)
+doing that.)
 
 Another option, when there is a limit on M pages to return, might be to
 cull the M top pages without sorting the rest. This could be done using
@@ -22,6 +22,111 @@ Then for each of the rest, check if it is higher than the Mth page.
 If it is, bubble it up so it's sorted.
 If not, throw it out (that's the fast bit and why this is not O(N^2)).
 
+> The patch below implements this, perhaps not as efficiently as possible.
+> It speeds up building just the top page of my blog by 1 second (out of
+> 18). It's probably buggy.
+> 
+> But, I have not thought enough about influence calculation.
+> I need to figure out which pagespec matches influences need to be
+> accumulated for in order to determine all possible influences of a
+> pagespec are known.
+> 
+> The old code accumulates influences from matching all successful pages
+> up to the num cutoff, as well as influences from an arbitrary (sometimes
+> zero) number of failed matches. New code does not accumulate influences
+> from all the top successful matches, only an arbitrary group of
+> successes and some failures.
+
+<pre>
+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 1730e47..6798799 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -2122,36 +2122,53 @@ sub pagespec_match_list ($$;@) {
+ 	my $num=$params{num};
+ 	delete @params{qw{num deptype reverse sort filter list}};
+ 	
+-	# when only the top matches will be returned, it's efficient to
+-	# sort before matching to pagespec,
+-	if (defined $num && defined $sort) {
+-		@candidates=IkiWiki::SortSpec::sort_pages(
+-			$sort, @candidates);
+-	}
+-	
++	# Find the first num matches (or all), before sorting.
+ 	my @matches;
+-	my $firstfail;
+ 	my $count=0;
+ 	my $accum=IkiWiki::SuccessReason->new();
+-	foreach my $p (@candidates) {
+-		my $r=$sub->($p, %params, location => $page);
++	my $i;
++	for ($i=0; $i < @candidates; $i++) {
++		my $r=$sub->($candidates[$i], %params, location => $page);
+ 		error(sprintf(gettext("cannot match pages: %s"), $r))
+ 			if $r->isa("IkiWiki::ErrorReason");
+ 		$accum |= $r;
+ 		if ($r) {
+-			push @matches, $p;
++			push @matches, $candidates[$i];
+ 			last if defined $num && ++$count == $num;
+ 		}
+ 	}
+ 
++	# We have num natches, but they may not be the best.
++	# Efficiently find and add the rest, without sorting the full list of
++	# candidates.
++	if (defined $num && defined $sort) {
++		@matches=IkiWiki::SortSpec::sort_pages($sort, @matches);
++
++		for ($i++; $i < @candidates; $i++) {
++			# Comparing candidate with lowest match is cheaper,
++			# so it's done before testing against pagespec.
++			if (IkiWiki::SortSpec::cmptwo($candidates[$i], $matches[-1], $sort) < 0 &&
++			    $sub->($candidates[$i], %params, location => $page)
++			) {
++				# this could be done less expensively
++				# using a binary search
++				for (my $j=0; $j < @matches; $j++) {
++					if (IkiWiki::SortSpec::cmptwo($candidates[$i], $matches[$j], $sort) < 0) {
++						$matches[$j]=$candidates[$i];
++						last;
++					}
++				}
++			}
++		}
++	}
++
+ 	# Add simple dependencies for accumulated influences.
+-	my $i=$accum->influences;
+-	foreach my $k (keys %$i) {
+-		$depends_simple{$page}{lc $k} |= $i->{$k};
++	my $inf=$accum->influences;
++	foreach my $k (keys %$inf) {
++		$depends_simple{$page}{lc $k} |= $inf->{$k};
+ 	}
+ 
+-	# when all matches will be returned, it's efficient to
+-	# sort after matching
++	# Sort if we didn't already.
+ 	if (! defined $num && defined $sort) {
+ 		return IkiWiki::SortSpec::sort_pages(
+ 			$sort, @matches);
+@@ -2455,6 +2472,12 @@ sub sort_pages {
+ 	sort $f @_
+ }
+ 
++sub cmptwo {
++	$a=$_[0];
++	$b=$_[1];
++	$_[2]->();
++}
++
+ sub cmp_title {
+ 	IkiWiki::pagetitle(IkiWiki::basename($a))
+ 	cmp
+</pre>
+
 This would be bad when M is very large, and particularly, of course, when
 there is no limit and all pages are being matched on. (For example, an
 archive page shows all pages that match a pagespec specifying a creation
-- 
cgit v1.2.3


From f5da8d3aed4b710983c7492cf708d0c874bce9e7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Apr 2010 15:16:57 -0400
Subject: more tests with more items

---
 t/pagespec_match_list.t | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index c7688c6c0..05dc012fe 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 92;
+use Test::More tests => 94;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -132,3 +132,14 @@ foreach my $spec ("nosuchpage or link(bar)", "link(bar) or nosuchpage",
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 }
+
+my @ps;
+foreach my $p (100..500) {
+	$IkiWiki::pagectime{"p/$p"} = $p;
+	$pagesources{"p/$p"} = "p/$p.mdwn";
+	unshift @ps, "p/$p";
+}
+is_deeply([pagespec_match_list("foo", "p/*", sort => "age")],
+	[@ps]);
+is_deeply([pagespec_match_list("foo", "p/*", sort => "age", num => 20)],
+	[@ps[0..19]]);
-- 
cgit v1.2.3


From 24fb346938037b0d41988510bc6e19e81aa62190 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Apr 2010 16:04:49 -0400
Subject: fix bug

---
 doc/todo/smarter_sorting.mdwn | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
index 4a638213f..33c825641 100644
--- a/doc/todo/smarter_sorting.mdwn
+++ b/doc/todo/smarter_sorting.mdwn
@@ -24,7 +24,7 @@ If not, throw it out (that's the fast bit and why this is not O(N^2)).
 
 > The patch below implements this, perhaps not as efficiently as possible.
 > It speeds up building just the top page of my blog by 1 second (out of
-> 18). It's probably buggy.
+> 18).
 > 
 > But, I have not thought enough about influence calculation.
 > I need to figure out which pagespec matches influences need to be
@@ -39,10 +39,10 @@ If not, throw it out (that's the fast bit and why this is not O(N^2)).
 
 <pre>
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-index 1730e47..6798799 100644
+index 1730e47..bc8b23d 100644
 --- a/IkiWiki.pm
 +++ b/IkiWiki.pm
-@@ -2122,36 +2122,53 @@ sub pagespec_match_list ($$;@) {
+@@ -2122,36 +2122,54 @@ sub pagespec_match_list ($$;@) {
  	my $num=$params{num};
  	delete @params{qw{num deptype reverse sort filter list}};
  	
@@ -89,7 +89,8 @@ index 1730e47..6798799 100644
 +				# using a binary search
 +				for (my $j=0; $j < @matches; $j++) {
 +					if (IkiWiki::SortSpec::cmptwo($candidates[$i], $matches[$j], $sort) < 0) {
-+						$matches[$j]=$candidates[$i];
++						splice @matches, $j, $#matches-$j+1, $candidates[$i],
++							@matches[$j..$#matches-1];
 +						last;
 +					}
 +				}
@@ -112,7 +113,7 @@ index 1730e47..6798799 100644
  	if (! defined $num && defined $sort) {
  		return IkiWiki::SortSpec::sort_pages(
  			$sort, @matches);
-@@ -2455,6 +2472,12 @@ sub sort_pages {
+@@ -2455,6 +2473,12 @@ sub sort_pages {
  	sort $f @_
  }
  
-- 
cgit v1.2.3


From aaaef740107aacd8f6987711da6895c02e4473ad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Apr 2010 16:46:38 -0400
Subject: update

---
 doc/todo/smarter_sorting.mdwn | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
index 33c825641..901e143a7 100644
--- a/doc/todo/smarter_sorting.mdwn
+++ b/doc/todo/smarter_sorting.mdwn
@@ -16,15 +16,9 @@ more expensive than sorting. (Also, influence calculation complicates
 doing that.)
 
 Another option, when there is a limit on M pages to return, might be to
-cull the M top pages without sorting the rest. This could be done using
-a variant of Ye Olde Bubble Sort. Take the first M pages, and (quick)sort.
-Then for each of the rest, check if it is higher than the Mth page.
-If it is, bubble it up so it's sorted.
-If not, throw it out (that's the fast bit and why this is not O(N^2)).
+cull the M top pages without sorting the rest.
 
-> The patch below implements this, perhaps not as efficiently as possible.
-> It speeds up building just the top page of my blog by 1 second (out of
-> 18).
+> The patch below implements this.
 > 
 > But, I have not thought enough about influence calculation.
 > I need to figure out which pagespec matches influences need to be
@@ -36,6 +30,11 @@ If not, throw it out (that's the fast bit and why this is not O(N^2)).
 > zero) number of failed matches. New code does not accumulate influences
 > from all the top successful matches, only an arbitrary group of
 > successes and some failures.
+> 
+> Also, by the time I finished this, it was not measuarably faster than 
+> the old method. At least not with a few thousand pages; it
+> might be worth revisiting this sometime for many more pages? [[done]]
+> --[[Joey]] 
 
 <pre>
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 46551be9efcdecc41163750fabadebf4957358b3 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Wed, 14 Apr 2010 15:42:25 +0000
Subject: Give a bit more details about the Wikis (now one more) I run.

---
 doc/users/ivan_shmakov.mdwn | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index de58cb207..3d3951d71 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -1,4 +1,14 @@
 &hellip; To put it short: an Ikiwiki newbie.
 
-I run an Ikiwiki instance at <http://gray.siamics.net/~ivan/lhc/>
-(though the DNS servers may be flacky due to transition to Dyn Inc.)
+Currently, I run a couple of Ikiwiki instances.  Namely:
+
+* <http://lhc.am-1.org/lhc/>
+  &mdash; to hold random stuff written by me, my colleagues,
+  students, etc.
+
+* <http://rsdesne.am-1.org/rsdesne-2010/>
+  &mdash; for some of the materials related to the
+  &ldaquo;Remote Sensing in Education, Science and National
+  Economy&rdaquo; (2010-03-29 &hellip; 2010-04-10, Altai State
+  University) program I've recently recently participated in as
+  an instructor.
-- 
cgit v1.2.3


From 43ad6bf96171e88a165278078d61fd221f14b1b4 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Wed, 14 Apr 2010 15:54:49 +0000
Subject: More details on my personal preferences (as related to Ikiwiki.)

---
 doc/users/ivan_shmakov.mdwn | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index 3d3951d71..d21825c2f 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -1,5 +1,10 @@
 &hellip; To put it short: an Ikiwiki newbie.
 
+[Emacs]: http://www.gnu.org/software/emacs/
+[Lynx]: http://lynx.isc.org/
+
+## Wikis
+
 Currently, I run a couple of Ikiwiki instances.  Namely:
 
 * <http://lhc.am-1.org/lhc/>
@@ -12,3 +17,34 @@ Currently, I run a couple of Ikiwiki instances.  Namely:
   Economy&rdaquo; (2010-03-29 &hellip; 2010-04-10, Altai State
   University) program I've recently recently participated in as
   an instructor.
+
+## Preferences
+
+I prefer to use [Lynx][] along with [Emacs][] (via
+`emacsclient`) to work with the wikis.  (Note the &ldaquo;Local
+variables&rdaquo; section below.)
+
+The things I dislike in the wiki engines are:
+
+* the use of home-brew specialized version control systems
+  &mdash; while there're a lot of much more developed general
+  purpose ones;
+
+* oversimplified syntax
+  &mdash; which (to some extent) precludes more sophisticated
+  forms of automated processing; in particular, this forces one
+  to reformat the material, once complete, to, say, prepare a
+  book, or an article, or slides.
+
+Out of all the wiki engines I'm familiar with, only Ikiwiki is
+free of the first of these.  I hope that it will support more
+elaborate syntaxes eventually.
+
+----
+
+    Local variables:
+    mode: markdown
+    coding: utf-8
+    fill-column: 64
+    ispell-dictionary: "american"
+    End: 
-- 
cgit v1.2.3


From 766ad1cb4c78a9cc3f745deb0f9325a139d363d9 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Wed, 14 Apr 2010 15:56:45 +0000
Subject: Fixed the double quotes.

---
 doc/users/ivan_shmakov.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index d21825c2f..69fc29d7f 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -13,16 +13,16 @@ Currently, I run a couple of Ikiwiki instances.  Namely:
 
 * <http://rsdesne.am-1.org/rsdesne-2010/>
   &mdash; for some of the materials related to the
-  &ldaquo;Remote Sensing in Education, Science and National
-  Economy&rdaquo; (2010-03-29 &hellip; 2010-04-10, Altai State
+  &ldquo;Remote Sensing in Education, Science and National
+  Economy&rdquo; (2010-03-29 &hellip; 2010-04-10, Altai State
   University) program I've recently recently participated in as
   an instructor.
 
 ## Preferences
 
 I prefer to use [Lynx][] along with [Emacs][] (via
-`emacsclient`) to work with the wikis.  (Note the &ldaquo;Local
-variables&rdaquo; section below.)
+`emacsclient`) to work with the wikis.  (Note the &ldquo;Local
+variables&rdquo; section below.)
 
 The things I dislike in the wiki engines are:
 
-- 
cgit v1.2.3


From e6e77d2311503627fb9ac8485f323535de059359 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Wed, 14 Apr 2010 16:03:20 +0000
Subject: Fixed a typo.

---
 doc/users/ivan_shmakov.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index 69fc29d7f..4123e0fc6 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -15,7 +15,7 @@ Currently, I run a couple of Ikiwiki instances.  Namely:
   &mdash; for some of the materials related to the
   &ldquo;Remote Sensing in Education, Science and National
   Economy&rdquo; (2010-03-29 &hellip; 2010-04-10, Altai State
-  University) program I've recently recently participated in as
+  University) program I've recently participated in as
   an instructor.
 
 ## Preferences
-- 
cgit v1.2.3


From 53c8e674ace50d8733e913e8cfa5d40793e5019d Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Wed, 14 Apr 2010 17:38:39 +0000
Subject: Correct comment. We want to merge the branch *doc* into branch
 *master* as the sample output suggests.

---
 doc/tips/spam_and_softwaresites.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn
index 507858c0c..a07889e6b 100644
--- a/doc/tips/spam_and_softwaresites.mdwn
+++ b/doc/tips/spam_and_softwaresites.mdwn
@@ -34,7 +34,7 @@ branch. If there is, see 'erase spam from the commit history', below, first.
 
 Once you are confident it's clean:
 
-    # ensure you are on the doc branch
+    # ensure you are on the master branch
     $ git branch
       doc
     * master
-- 
cgit v1.2.3


From 43ed0cd07ece2b5238d1c148552620a6a1c37436 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 14 Apr 2010 16:04:52 -0400
Subject: note link types are now available

---
 doc/todo/structured_page_data.mdwn            | 3 +++
 doc/todo/tracking_bugs_with_dependencies.mdwn | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/doc/todo/structured_page_data.mdwn b/doc/todo/structured_page_data.mdwn
index da9da9663..9f21fab7f 100644
--- a/doc/todo/structured_page_data.mdwn
+++ b/doc/todo/structured_page_data.mdwn
@@ -253,6 +253,9 @@ in a large number of other cases.
 > dependencies between bugs from arbitrary links.
 >> This issue (the need for distinguished kinds of links) has also been brought up in other discussions: [[tracking_bugs_with_dependencies#another_kind_of_links]] (deps vs. links) and [[tag_pagespec_function]] (tags vs. links). --Ivan Z.
 
+>>> And multiple link types are now supported; plugins can set the link
+>>> type when registering a link, and pagespec functions can match on them. --[[Joey]] 
+
 ----
 
     #!/usr/bin/perl
diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 5f3ece290..456dadad0 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -81,6 +81,9 @@ I like the idea of [[tips/integrated_issue_tracking_with_ikiwiki]], and I do so
 
 >> I saw that this issue is targeted at by the work on [[structured page data#another_kind_of_links]]. --Ivan Z.
 
+>>> It's fixed now; links can have a type, such as "tag", or "dependency", 
+>>> and pagespecs can match links of a given typo. --[[Joey]] 
+
 Okie - I've had a quick attempt at this.  Initial patch attached.  This one doesn't quite work.
 And there is still a lot of debugging stuff in there.
 
-- 
cgit v1.2.3


From 2f6da5fd2b17541ff88072862d37c4d6f95a50b5 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Thu, 15 Apr 2010 07:19:47 +0000
Subject: Describe my tag type proposal

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 doc/todo/Multiple_categorization_namespaces.mdwn

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
new file mode 100644
index 000000000..8a0866dc5
--- /dev/null
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -0,0 +1,24 @@
+I came across this when working on converting my old blog into an ikiwiki, but I think it could be of more general use.
+
+The background: I have a (currently suspended, waiting to be converted) blog on the [il Cannocchiale](http://www.ilcannocchiale.it) hosting platform. Aside from the usual metatadata (title, author), il Cannocchiale also provides tags and two additional categorization namespaces: a blog-specific user-defind "column" (Rubrica) and a platform-wide "category" (Categoria). The latter is used to group and label a couple of platform-wide lists of latest posts, the former may be used in many different ways (e.g. multi-author blogs could have one column per author or so, or as a form of 'macro-tagging'). Columns are also a little more sophisticated than classical tags because you can assign them a subtitle too.
+
+When I started working on the conversion, my first idea was to convert Rubriche to subdirectories of an ikiwiki blog. However, this left me with a few annoying things: when rebuilding links from the import, I had to (programmatically) dive into each subdirectory to see where each post was; this would also be problematic for future posting, too. It also meant that moving a post from a Robrica to the other would break all links (unless ikiwiki has a way to fix this automagically). And I wasn't too keen on the fact that the Rubrica would come up in the URL of the post. And finally, of course, I couldn't use this to preserve the Categoria metadata.
+
+Another solution I thought about was to use special deeper tags for the Rubrica and Categoria (like: `\[[!tag "Rubrica/Some name"]]`), but this is horrible, clumsy, and makes special treatment of these tags a PITN (for example you wouldn't want the Rubrica to be displayed together with the other tags, and you would want it displayed somewhere else like next to the title of the post). This solution however looks to me as the proper path, as long as tags could support totally separate namespaces. I have a tentative implementation of this `tagtype` feature at [my git clone of ikiwiki](http://git.oblomov.eu/ikiwiki).
+
+The feature is currently implemented as follows: a `tagtypes` config options takes an array of strings: the tag types to be defined _aside from the usual tags_. Each tag type automatically provides a new directive which sets up tags that different from standard tags by having a different tagbase (the same as the tagtype) and link type (again, the same as the tagtype) (a TODO item for this would to make the directive, tagbase and link type customizable). For example, for my imported blog I would define
+
+    tagtypes => [qw{Categoria Rubrica}]
+
+and then in the blog posts I would have stuff like
+
+    \[[!Categoria "LAVORO/Vita da impiegato"]]
+    \[[!Rubrica "Il mio mondo"]]
+    \[[!meta title="Blah blah"]]
+    \[[!meta author="oblomov"]]
+
+    The body of the article
+
+    \[[!tag a bunch of tags]]
+
+and the tags would appear at the bottom of the post, the Rubrica next to the title, etc. All of this information would end up as categories in the feeds (although I would like to rework that code to make use of namespaces, terms and labels in a different way).
-- 
cgit v1.2.3


From 19700c70e54cd6d94cf02bf160d65f951dcb7d66 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 15 Apr 2010 07:39:32 +0000
Subject: response, alternative proposal

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 8a0866dc5..dc66a0245 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -22,3 +22,14 @@ and then in the blog posts I would have stuff like
     \[[!tag a bunch of tags]]
 
 and the tags would appear at the bottom of the post, the Rubrica next to the title, etc. All of this information would end up as categories in the feeds (although I would like to rework that code to make use of namespaces, terms and labels in a different way).
+
+> Note [[plugins/contrib/report/discussion]].  To quote myself from the latter page:
+> *I find tags as they currently exist to be too limiting. I prefer something that can be used for Faceted Tagging http://en.wikipedia.org/wiki/Faceted_classification; that is, things like Author:Fred Nurk, Genre:Historical, Rating:Good, and so on. Of course, that doesn't mean that each tag is limited to only one value, either; just to take the above examples, something might have more than one author, or have multiple genres (such as Historical + Romance).*
+
+> So you aren't the only one who wants to do more with tags, but I don't think that adding a new directive for each tag type is the way to go; I think it would be simpler to just have one directive, and take advantage of the new [[matching different kinds of links]] functionality, and enhance the tag directive.
+> Perhaps something like this:
+
+	     \[[!tag categorica="LAVORO/Vita da impiegato" rubrica="Il mio mondo"]]
+
+> Part of my thinking in this is to also combine tags with [[plugins/contrib/field]], so that the tags for a page could be queried and displayed; that way, one could put them wherever you wanted on the page, using any of [[plugins/contrib/getfield]], [[plugins/contrib/ftemplate]], or [[plugins/contrib/report]].
+> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 55d4e6bdce5cf16c629765bf227125ea8899417b Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Thu, 15 Apr 2010 13:54:54 +0000
Subject: Reply to KA about collapsing metadata functionality

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index dc66a0245..15b97e480 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -2,7 +2,7 @@ I came across this when working on converting my old blog into an ikiwiki, but I
 
 The background: I have a (currently suspended, waiting to be converted) blog on the [il Cannocchiale](http://www.ilcannocchiale.it) hosting platform. Aside from the usual metatadata (title, author), il Cannocchiale also provides tags and two additional categorization namespaces: a blog-specific user-defind "column" (Rubrica) and a platform-wide "category" (Categoria). The latter is used to group and label a couple of platform-wide lists of latest posts, the former may be used in many different ways (e.g. multi-author blogs could have one column per author or so, or as a form of 'macro-tagging'). Columns are also a little more sophisticated than classical tags because you can assign them a subtitle too.
 
-When I started working on the conversion, my first idea was to convert Rubriche to subdirectories of an ikiwiki blog. However, this left me with a few annoying things: when rebuilding links from the import, I had to (programmatically) dive into each subdirectory to see where each post was; this would also be problematic for future posting, too. It also meant that moving a post from a Robrica to the other would break all links (unless ikiwiki has a way to fix this automagically). And I wasn't too keen on the fact that the Rubrica would come up in the URL of the post. And finally, of course, I couldn't use this to preserve the Categoria metadata.
+When I started working on the conversion, my first idea was to convert Rubriche to subdirectories of an ikiwiki blog. However, this left me with a few annoying things: when rebuilding links from the import, I had to (programmatically) dive into each subdirectory to see where each post was; this would also be problematic for future posting, too. It also meant that moving a post from a Rubrica to the other would break all links (unless ikiwiki has a way to fix this automagically). And I wasn't too keen on the fact that the Rubrica would come up in the URL of the post. And finally, of course, I couldn't use this to preserve the Categoria metadata.
 
 Another solution I thought about was to use special deeper tags for the Rubrica and Categoria (like: `\[[!tag "Rubrica/Some name"]]`), but this is horrible, clumsy, and makes special treatment of these tags a PITN (for example you wouldn't want the Rubrica to be displayed together with the other tags, and you would want it displayed somewhere else like next to the title of the post). This solution however looks to me as the proper path, as long as tags could support totally separate namespaces. I have a tentative implementation of this `tagtype` feature at [my git clone of ikiwiki](http://git.oblomov.eu/ikiwiki).
 
@@ -33,3 +33,13 @@ and the tags would appear at the bottom of the post, the Rubrica next to the tit
 
 > Part of my thinking in this is to also combine tags with [[plugins/contrib/field]], so that the tags for a page could be queried and displayed; that way, one could put them wherever you wanted on the page, using any of [[plugins/contrib/getfield]], [[plugins/contrib/ftemplate]], or [[plugins/contrib/report]].
 > --[[KathrynAndersen]]
+
+>> A very generic metadata framework could cover all possible usages of fields, tags, and related metadata, but keeping its _user interface_ generic would only make it hard to use. Note that this is not an objection to the idea of collapsing the fields and tags functionality (at quick glance, I cannot see a real difference between single-valued custom tagtypes and fields, but see below), but more about the syntax.
+
+>> I had thought about the `\[[!tag type1=value1 type2=value2]]` syntax myself, but ultimately decided against it for a number of reasons, most importantly the fact that (1) it's harder to type, (2) it's harder to spot errors in the tag types (so for example if one misspelled `categoria` as `categorica`, he might not notice it as quickly as seeing the un-parsed `\[[!categorica ]]` directive in the output html) and (3) it encourages collapsing possibly unrelated metadata together (for example, I would never consider putting the categoria information together with the rubrica  one; of course with your syntax it's perfectly possible to keep them separate as well).
+
+>> Point (2) may be considered a downside as well as an upside, depending on perspective, of course. And it would be possible to have a set of predefined tag types to match against, like in my tagtype directive approach but with your syntax. Point (3) is of course entirely in the hands of the user, but that's exactly what syntax should be about. There is nothing functionally wrong with e.g. `\[[!meta tag=sometag author=someauthor title=sometitle rubrica=somecolumn]]`, but I honestly find it horrible.
+
+>> A solution could be to allow both syntaxes, getting to have for example `\[[!sometagtype "blah"]]` as a shortcut for `\[[!tag sometagtype="blah"]]` (or, in the more general case, `\[[!somefieldname "blah"]]` as a shortcut for `\[[!meta fieldname="blah"]]`).
+
+>> I would like to point out however that there are some functional differences between categorization metadata vs other metadata that might suggest to keep fields and (my extended) tags separate. For examples, in feeds you'd want all categorization metadata to fall in one place, with some appropriate manipulation (which I still have to implement, by the way), while things like author or title would go to the corresponding feed item properties. Although it all would be possible with appropriate report or template juggling, having such default metadata handled natively looks like a bonus to me.
-- 
cgit v1.2.3


From 81ce1cf9daf113c88581407d5e68d8f6ee61d674 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 13:38:24 -0400
Subject: remove example comments_pagespec setting

auto-blog.setup configures this automatically now
---
 doc/examples/blog.mdwn | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index f542cad0c..b9b57b944 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -19,10 +19,8 @@ Some additional configuration you might want to do:
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].
 
-* Enable the [[comments|plugins/comments]] plugin and configure it to
-  enable comments to posts to the blog:
-
-  	comments_pagespec => 'blog/posts/* and !*/Discussion',
+* Enable the [[comments|plugins/comments]] plugin to
+  enable comments to posts to the blog.
 
 * Enable the [[calendar|plugins/calendar]] plugin and run the
   [[ikiwiki-calendar]] command from cron daily to get an interlinked
-- 
cgit v1.2.3


From 3131433f64235ad5425eb93d5773580b607876fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 13:40:53 -0400
Subject: calendar: Add archive_pagespec, which is used by ikiwiki-calendar to
 specify which pages to include on the calendar archive pages. (The pagespec
 can still also be specified on the ikiwiki-calendar command line.)

---
 IkiWiki/Plugin/calendar.pm          | 8 ++++++++
 debian/changelog                    | 4 ++++
 doc/ikiwiki-calendar.mdwn           | 8 +++++---
 doc/ikiwiki/directive/calendar.mdwn | 7 +++++--
 ikiwiki-calendar.in                 | 6 +++++-
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index ff84bc440..0f0e9518a 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -47,6 +47,14 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		archive_pagespec => {
+			type => "pagespec",
+			example => "posts/* and !*/Discussion",
+			description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command",
+			link => 'ikiwiki/PageSpec',
+			safe => 1,
+			rebuild => 0,
+		},
 }
 
 sub is_leap_year (@) {
diff --git a/debian/changelog b/debian/changelog
index 26b00a07c..7c607b2a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,10 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
     for master language.
   * po: Configuring the same language as master and slave confuses processing;
     so filter out such a misconfiguration.
+  * calendar: Add archive_pagespec, which is used by ikiwiki-calendar to
+    specify which pages to include on the calendar archive pages.
+    (The pagespec can still also be specified on the ikiwiki-calendar command
+    line.)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn
index 982892fca..c1f4d7267 100644
--- a/doc/ikiwiki-calendar.mdwn
+++ b/doc/ikiwiki-calendar.mdwn
@@ -16,9 +16,11 @@ You must specify the setup file for your wiki. The pages will
 be created inside its `srcdir`, beneath the `archivebase`
 directory used by the calendar plugin (default "archives").
 
-You will probably want to specify a [[ikiwiki/PageSpec]]
-to control which pages are included on the calendars. The
-default is all pages. To limit it to only posts in a blog,
+To control which pages are included on the calendars,
+a [[ikiwiki/PageSpec]] can be specified. The default is
+all pages, or the pages specified by the `comments_pagespec`
+setting in the config file. A pagespec can also be specified
+on the command line. To limit it to only posts in a blog,
 use something like "posts/* and !*/Discussion".
 
 It defaults to creating calendar pages for the current
diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
index b2ac75b11..8a08081ee 100644
--- a/doc/ikiwiki/directive/calendar.mdwn
+++ b/doc/ikiwiki/directive/calendar.mdwn
@@ -40,9 +40,12 @@ An example crontab:
   "month" or "year". The default is a month view calendar.
 * `pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the
   month calendar. Defaults to "*".
-* `archivebase` - Configures the base of the archives hierarchy. The
-  default is "archives". Note that this default can also be overridden
+* `archivebase` - Configures the base of the archives hierarchy. 
+  The default is "archives". Note that this default can also be overridden
   for the whole wiki by setting `archivebase` in ikiwiki's setup file.
+  Calendars link to pages under here, with names like "2010/04" and
+  "2010". These pages can be automatically created using the
+  [[ikiwiki-calendar]] tool. 
 * `year` - The year for which the calendar is requested. Defaults to the
   current year.
 * `month` - The numeric month for which the calendar is requested, in the
diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
index 9738ea5f7..6b6f693b3 100755
--- a/ikiwiki-calendar.in
+++ b/ikiwiki-calendar.in
@@ -15,7 +15,7 @@ GetOptions(
 	"force" => \$force,
 ) || usage();
 my $setup=shift		|| usage();
-my $pagespec=shift	|| "*";
+my $pagespec=shift;
 my $startyear=shift	|| 1900+(localtime(time))[5];
 my $endyear=shift	|| $startyear;
 
@@ -27,6 +27,10 @@ IkiWiki::checkconfig();
 my $archivebase = 'archives';
 $archivebase = $config{archivebase} if defined $config{archivebase};
 
+if (! defined $pagespec) {
+	$pagespec=$config{archive_pagespec} || "*";
+}
+
 sub writearchive ($$;$) {
 	my $template=template(shift);
 	my $year=shift;
-- 
cgit v1.2.3


From fe733e2a424f50227e4a501c3efbf1ce43e07352 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 14:29:14 -0400
Subject: enhance pagestats and rework example blog front page

* pagestats: Class parameter can be used to override default class for
  custom styling.
* pagestats: Use style=list to get a list of tags, scaled by use like
  in a tag cloud. This is useful to put in a sidebar.
* Rework example blog front page.
---
 IkiWiki/Plugin/pagestats.pm          | 21 ++++++++++++++++++---
 debian/changelog                     |  5 +++++
 doc/examples/blog/archives.mdwn      |  7 +++++++
 doc/examples/blog/comments.mdwn      |  2 +-
 doc/examples/blog/index.mdwn         | 12 ++++++++----
 doc/ikiwiki/directive/pagestats.mdwn | 11 ++++++++++-
 6 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 doc/examples/blog/archives.mdwn

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 1c0b46830..48715bd3e 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -75,7 +75,7 @@ sub preprocess (@) {
 	}
 
 	if ($style eq 'table') {
-		return "<table class='pageStats'>\n".
+		return "<table class='".(exists $params{class} ? $params{class} : "pageStats")."'>\n".
 			join("\n", map {
 				"<tr><td>".
 				htmllink($params{page}, $params{destpage}, $_, noimageinline => 1).
@@ -87,16 +87,31 @@ sub preprocess (@) {
 	else {
 		# In case of misspelling, default to a page cloud
 
-		my $res = "<div class='pagecloud'>\n";
+		my $res;
+		if ($style eq 'list') {
+			$res = "<ul class='".(exists $params{class} ? $params{class} : "list")."'>\n";
+		}
+		else {
+			$res = "<div class='".(exists $params{class} ? $params{class} : "pagecloud")."'>\n";
+		}
 		foreach my $page (sort keys %counts) {
 			next unless $counts{$page} > 0;
 
 			my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)];
+			
+			$res.="<li>" if $style eq 'list';
 			$res .= "<span class=\"$class\">".
 			        htmllink($params{page}, $params{destpage}, $page).
 			        "</span>\n";
+			$res.="</li>" if $style eq 'list';
+
+		}
+		if ($style eq 'list') {
+			$res = "</ul>\n";
+		}
+		else {
+			$res .= "</div>\n";
 		}
-		$res .= "</div>\n";
 
 		return $res;
 	}
diff --git a/debian/changelog b/debian/changelog
index 7c607b2a5..c2b0c3c23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,11 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
     specify which pages to include on the calendar archive pages.
     (The pagespec can still also be specified on the ikiwiki-calendar command
     line.)
+  * pagestats: Class parameter can be used to override default class for
+    custom styling.
+  * pagestats: Use style=list to get a list of tags, scaled by use like
+    in a tag cloud. This is useful to put in a sidebar.
+  * Rework example blog front page.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/examples/blog/archives.mdwn b/doc/examples/blog/archives.mdwn
new file mode 100644
index 000000000..14686cdfe
--- /dev/null
+++ b/doc/examples/blog/archives.mdwn
@@ -0,0 +1,7 @@
+[[!if test="enabled(calendar)" then="""
+Browse through blog archives by year:
+[[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]]
+"""
+else="""
+Calendar based archives are not enabled. See [[posts]] for a full list of posts.
+"""]]
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 4735dea08..0b503ba01 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,3 +1,3 @@
-This page will show all comments made to posts in my [[blog|index]].
+This page will show recent comments made to posts in the [[blog|index]].
 
 [[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]]
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 01b714fcd..b273ba1a9 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,9 +1,13 @@
-[[!pagestats pages="./tags/*" among="./posts/*"]]
+[[!template id=note text="""
 
-Welcome to my blog.
+* [[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
+* [[Recent_Comments|comments]]
+* [[Archives]]
 
-Have a look at the most recent posts below, or browse the tag cloud on the
-right. Archives of all [[posts]] and all [[comments]] are also available.
+[[!if test="enabled(calendar)" then="""
+[[!calendar pages="./posts/* and !*/Discussion"]]
+
+"""]]
 
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn
index 68f4d2734..d0e0e7be7 100644
--- a/doc/ikiwiki/directive/pagestats.mdwn
+++ b/doc/ikiwiki/directive/pagestats.mdwn
@@ -4,10 +4,16 @@ This directive can generate stats about how pages link to each other. It can
 produce either a tag cloud, or a table counting the number of links to each
 page.
 
-Here's how to use it to create a [[tag]] cloud:
+Here's how to use it to create a [[tag]] cloud, with tags sized based
+on frequency of use:
 
 	\[[!pagestats pages="tags/*"]]
 
+Here's how to create a list of tags, sized by use as they would be in a
+cloud.
+	
+	\[[!pagestats style="list" pages="tags/*"]]
+
 And here's how to create a table of all the pages on the wiki:
 
 	\[[!pagestats style="table"]]
@@ -28,4 +34,7 @@ links:
 
 	\[[!pagestats style="table" show="10"]]
 
+The optional `class` parameter can be used to control the class
+of the generated tag cloud `div` or page stats `table`.
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From d6bfe2a25ec20ea33a0537143afdfbb847e4183f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 14:32:53 -0400
Subject: don't link to ikiwiki-calendar, broken link on basewiki

---
 doc/ikiwiki/directive/calendar.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
index 8a08081ee..198da9d51 100644
--- a/doc/ikiwiki/directive/calendar.mdwn
+++ b/doc/ikiwiki/directive/calendar.mdwn
@@ -45,7 +45,7 @@ An example crontab:
   for the whole wiki by setting `archivebase` in ikiwiki's setup file.
   Calendars link to pages under here, with names like "2010/04" and
   "2010". These pages can be automatically created using the
-  [[ikiwiki-calendar]] tool. 
+  `ikiwiki-calendar` program. 
 * `year` - The year for which the calendar is requested. Defaults to the
   current year.
 * `month` - The numeric month for which the calendar is requested, in the
-- 
cgit v1.2.3


From acd99bfe11b16e0edef570c51f840b306032efaa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 14:39:07 -0400
Subject: propigate ikiwiki setup error out

---
 ikiwiki-calendar.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
index 6b6f693b3..cdfecff3f 100755
--- a/ikiwiki-calendar.in
+++ b/ikiwiki-calendar.in
@@ -59,4 +59,5 @@ foreach my $y ($startyear..$endyear) {
 IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
 	if $config{rcs};
 
-system("ikiwiki", "-setup", $setup, "-refresh");
+exec("ikiwiki", "-setup", $setup, "-refresh");
+die "failed to run ikiwiki -setup $setup -refresh\n";
-- 
cgit v1.2.3


From 691dab03069f452b95f2319f9dcc52a27c9ff7b2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 14:45:03 -0400
Subject: typo

---
 IkiWiki/Plugin/pagestats.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 48715bd3e..17b26f7ba 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -107,7 +107,7 @@ sub preprocess (@) {
 
 		}
 		if ($style eq 'list') {
-			$res = "</ul>\n";
+			$res .= "</ul>\n";
 		}
 		else {
 			$res .= "</div>\n";
-- 
cgit v1.2.3


From baaa848f6c06b0b3a59677d3551e130c65e5fde7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 15:04:17 -0400
Subject: CSS and templates for sidebar changed to use a class, not an id.

Multiple sidebars should be possible; also, I want to add a sidebar
template.
---
 debian/changelog               | 3 ++-
 doc/examples/blog.mdwn         | 2 +-
 doc/examples/blog/index.mdwn   | 1 -
 doc/examples/blog/sidebar.mdwn | 7 -------
 doc/style.css                  | 2 +-
 templates/page.tmpl            | 2 +-
 6 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 doc/examples/blog/sidebar.mdwn

diff --git a/debian/changelog b/debian/changelog
index c2b0c3c23..03361e6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100410) UNRELEASED; urgency=low
+ikiwiki (3.20100415) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
@@ -36,6 +36,7 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
   * pagestats: Use style=list to get a list of tags, scaled by use like
     in a tag cloud. This is useful to put in a sidebar.
   * Rework example blog front page.
+  * CSS and templates for sidebar changed to use a class, not an id.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index b9b57b944..33637e57d 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -14,7 +14,7 @@ Some additional configuration you might want to do:
 	\[[!tag tags/life]]
 
 * Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all
-  the categories you've tagged posts with.
+  the categories you've tagged posts with, and other navigation links.
 
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index b273ba1a9..da95e7660 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -4,7 +4,6 @@
 * [[Recent_Comments|comments]]
 * [[Archives]]
 
-[[!if test="enabled(calendar)" then="""
 [[!calendar pages="./posts/* and !*/Discussion"]]
 
 """]]
diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
deleted file mode 100644
index a9fac388e..000000000
--- a/doc/examples/blog/sidebar.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-Example sidebar
-
-* [[Blog|index]]
-* [[Archive|posts]]
-
-Categories:
-[[!map pages="./tags/* and !*/Discussion"]]
diff --git a/doc/style.css b/doc/style.css
index 317d4c7aa..af0fc230c 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -228,7 +228,7 @@ div.recentchanges {
 .bigPC { font-size: 115%; }
 .biggestPC { font-size: 130%; }
 
-#sidebar {
+.sidebar {
 	line-height: 3ex;
 	width: 20ex;
 	float: right;
diff --git a/templates/page.tmpl b/templates/page.tmpl
index c24f88823..7e850a56b 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -92,7 +92,7 @@
 </div> <!-- .pageheader -->
 
 <TMPL_IF SIDEBAR>
-<div id="sidebar">
+<div class="sidebar">
 <TMPL_VAR SIDEBAR>
 </div>
 </TMPL_IF>
-- 
cgit v1.2.3


From c50d218916d28f6ee1f1ad2b2280e4dd8c90dc1b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 15:31:18 -0400
Subject: enable calendar by default

Makes it a bit easier to include the calendar on the sidebar template.
---
 auto-blog.setup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/auto-blog.setup b/auto-blog.setup
index 95347167f..0a2a81bf7 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import(
 	cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
 	cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",
 	adminemail => "$ENV{USER}\@$domain",
-	add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam}],
+	add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar}],
 	disable_plugins => [qw{}],
 	libdir => "$ENV{HOME}/.ikiwiki",
 	rss => 1,
@@ -46,6 +46,7 @@ IkiWiki::Setup::Automator->import(
 	example => "blog",
 	comments_pagespec => "posts/* and !*/Discussion",
 	blogspam_pagespec => "postcomment(*)",
+	archive_pagespec => "posts/* and !*/Discussion",
 	discussion => 0,
 	locked_pages => "*",
 	tagbase => "tags",
-- 
cgit v1.2.3


From 3fbc9e411eec34361e711813e09a516e1fb62e03 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 15:38:23 -0400
Subject: increase sidebar width from 20 to 30 ex

This makes it big enough to fit a month calendar.
---
 doc/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/style.css b/doc/style.css
index af0fc230c..80b76b26c 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -230,7 +230,7 @@ div.recentchanges {
 
 .sidebar {
 	line-height: 3ex;
-	width: 20ex;
+	width: 30ex;
 	float: right;
 	margin-left: 40px;
 	margin-bottom: 40px;
-- 
cgit v1.2.3


From 1fbc1b518a6764b0bd6d8c580bc3480ec4ada01d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 15:41:56 -0400
Subject: disable feeds in raw mode

---
 IkiWiki/Plugin/inline.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 644cb588d..3359af314 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -160,7 +160,7 @@ sub preprocess_inline (@) {
 	my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
 	my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
 	my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
-	my $feeds=! $nested && (exists $params{feeds} ? yesno($params{feeds}) : !$quick);
+	my $feeds=! $nested && (exists $params{feeds} ? yesno($params{feeds}) : !$quick && ! $raw);
 	my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1;
 	my $feedonly=yesno($params{feedonly});
 	if (! exists $params{show} && ! $archive) {
-- 
cgit v1.2.3


From 5143d790b023f7f04ebdf694225b2946af676503 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:08:33 -0400
Subject: sidebar styling improvements

Added a visible border; tuned down the whitespace/borders.

Note the use of the -1 pixel margin-top -- this makes the sidebar appear
to hang down from the line under the actions at the top of the page.
---
 doc/style.css | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 80b76b26c..bdd4bb466 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -229,13 +229,14 @@ div.recentchanges {
 .biggestPC { font-size: 130%; }
 
 .sidebar {
-	line-height: 3ex;
 	width: 30ex;
 	float: right;
-	margin-left: 40px;
-	margin-bottom: 40px;
-	padding: 2ex 2ex;
+	margin-left: 4px;
+	margin-bottom: 4px;
+	margin-top: -1px;
+	padding: 0ex 2ex;
 	background: white;
+	border: 2px solid black;
 	color: black !important;
 }
 
-- 
cgit v1.2.3


From 843ce484fc9a65a814be62ab9617fc461640fbeb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:21:06 -0400
Subject: update

---
 doc/examples/blog.mdwn       |  3 ---
 doc/examples/blog/index.mdwn | 18 ++++++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index 33637e57d..8775c01ab 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -13,9 +13,6 @@ Some additional configuration you might want to do:
   example of how to tag a post is:
 	\[[!tag tags/life]]
 
-* Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all
-  the categories you've tagged posts with, and other navigation links.
-
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].
 
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index da95e7660..062c71f2e 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,16 +1,14 @@
-[[!template id=note text="""
+[[!inline pages="./posts/* and !*/Discussion" show="10"
+actions=yes rootpage="posts"]]
 
-* [[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-* [[Recent_Comments|comments]]
-* [[Archives]]
+[[!sidebar """
+[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
 
-[[!calendar pages="./posts/* and !*/Discussion"]]
+[[Recent Comments|comments]]
 
-"""]]
+[[Archives]]
 
-[[!inline pages="./posts/* and !*/Discussion" show="10"
-actions=yes rootpage="posts"]]
-
-----
+[[!calendar pages="./posts/* and !*/Discussion"]]
+"""]]
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).
-- 
cgit v1.2.3


From 358fa953e189d6f8a7925be8533fe7b7c5699503 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:40:01 -0400
Subject: sidebar: Now a sidebar directive can be used to override the sidebar
 shown on a page.

---
 IkiWiki/Plugin/sidebar.pm          | 42 +++++++++++++++++++++++++++++++++++++-
 debian/changelog                   |  2 ++
 doc/ikiwiki/directive/sidebar.mdwn | 14 +++++++++++++
 doc/plugins/sidebar.mdwn           | 17 +++++++--------
 4 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 doc/ikiwiki/directive/sidebar.mdwn

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 41812e1c1..d63cb5246 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -10,6 +10,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "sidebar", call => \&getsetup);
+	hook(type => "preprocess", id => "sidebar", call => \&preprocess);
 	hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);
 }
 
@@ -21,9 +22,39 @@ sub getsetup () {
 		},
 }
 
+my %pagesidebar;
+
+sub preprocess (@) {
+	my %params=@_;
+	my $content=shift;
+	shift;
+
+	if (! defined $content) {
+		error(gettext("sidebar content not specified"));
+	}
+
+	my $page=$params{page};
+	return "" unless $page eq $params{destpage};
+	my $file = $pagesources{$page};
+	my $type = pagetype($file);
+
+	$pagesidebar{$page}=
+		IkiWiki::htmlize($page, $page, $type,
+		IkiWiki::linkify($page, $page,
+		IkiWiki::preprocess($page, $page,
+		IkiWiki::filter($page, $page, $content))));
+
+	return "";
+}
+
+my $oldfile;
+my $oldcontent;
+
 sub sidebar_content ($) {
 	my $page=shift;
 	
+	return $pagesidebar{$page} if exists $pagesidebar{$page};
+
 	my $sidebar_page=bestlink($page, "sidebar") || return;
 	my $sidebar_file=$pagesources{$sidebar_page} || return;
 	my $sidebar_type=pagetype($sidebar_file);
@@ -34,7 +65,16 @@ sub sidebar_content ($) {
 		# currently requires a wiki rebuild.
 		add_depends($page, $sidebar_page);
 
-		my $content=readfile(srcfile($sidebar_file));
+		my $content;
+		if (defined $oldfile && $sidebar_file eq $oldfile) {
+			$content=$oldcontent;
+		}
+		else {
+			$content=readfile(srcfile($sidebar_file));
+			$oldcontent=$content;
+			$oldfile=$sidebar_file;
+		}
+
 		return unless length $content;
 		return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type,
 		       IkiWiki::linkify($sidebar_page, $page,
diff --git a/debian/changelog b/debian/changelog
index 03361e6a0..267a2fd7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
     in a tag cloud. This is useful to put in a sidebar.
   * Rework example blog front page.
   * CSS and templates for sidebar changed to use a class, not an id.
+  * sidebar: Now a sidebar directive can be used to override the sidebar
+    shown on a page.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
new file mode 100644
index 000000000..46f016747
--- /dev/null
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -0,0 +1,14 @@
+The `sidebar` directive is supplied by the [[!iki plugins/sidebar desc=sidebar]] plugin.
+
+This directive specifies a custom sidebar to display on the page, instead
+of any sidebar that is displayed globally.
+
+## examples
+
+	\[[!sidebar """
+	This is my custom sidebar for this page.
+
+	\[[!calendar pages="posts/*"]]
+	"""]]
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/sidebar.mdwn b/doc/plugins/sidebar.mdwn
index 4e356d65a..cd0f0ecf1 100644
--- a/doc/plugins/sidebar.mdwn
+++ b/doc/plugins/sidebar.mdwn
@@ -10,15 +10,16 @@ Typically this will be a page in the root of the wiki, but it can also be a
 [[plugins/sidebar|plugins/sidebar]], will be treated as a sidebar for the
 [[plugins]] page, and of all of its SubPages, if the plugin is enabled.
 
-Note that to disable a sidebar for a [[ikiwiki/SubPage]] of a page that has
-a sidebar, you can create a sidebar page that is completely empty. This
-will turn off the sidebar altogether.
+There is also a [[ikiwiki/directive/sidebar]] directive that can be used
+to provide a custom sidebar content for a page.
 
-Warning: Any change to the sidebar will cause a rebuild of the whole wiki,
-since every page includes a copy that has to be updated. This can
-especially be a problem if the sidebar includes an [[ikiwiki/directive/inline]]
-directive, since any changes to pages inlined into the sidebar
-will change the sidebar and cause a full wiki rebuild.
+----
+
+Warning: Any change to the sidebar page will cause a rebuild of the whole
+wiki, since every page includes a copy that has to be updated. This can
+especially be a problem if the sidebar includes an
+[[ikiwiki/directive/inline]] directive, since any changes to pages inlined
+into the sidebar will change the sidebar and cause a full wiki rebuild.
 
 Instead, if you include a [[ikiwiki/directive/map]] directive on the sidebar,
 and it does not use the `show` parameter, only adding or removing pages
-- 
cgit v1.2.3


From adbbd014dc76f334ed897f6801afa4cb0b483864 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:52:41 -0400
Subject: Enable calendar and sidebar in auto-blog.setup.

---
 auto-blog.setup  | 2 +-
 debian/changelog | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/auto-blog.setup b/auto-blog.setup
index 0a2a81bf7..ff52befa3 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import(
 	cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
 	cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",
 	adminemail => "$ENV{USER}\@$domain",
-	add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar}],
+	add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar sidebar}],
 	disable_plugins => [qw{}],
 	libdir => "$ENV{HOME}/.ikiwiki",
 	rss => 1,
diff --git a/debian/changelog b/debian/changelog
index 267a2fd7a..af19f4a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * CSS and templates for sidebar changed to use a class, not an id.
   * sidebar: Now a sidebar directive can be used to override the sidebar
     shown on a page.
+  * Enable calendar and sidebar in auto-blog.setup.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From 37a0c2d40beaba9ae050a4eddc925b910d739736 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:55:20 -0400
Subject: add note if ikiwiki-calendar needs to be run

---
 doc/examples/blog/archives.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/examples/blog/archives.mdwn b/doc/examples/blog/archives.mdwn
index 14686cdfe..d07b73b74 100644
--- a/doc/examples/blog/archives.mdwn
+++ b/doc/examples/blog/archives.mdwn
@@ -1,7 +1,8 @@
-[[!if test="enabled(calendar)" then="""
+[[!if test="archives/*" then="""
 Browse through blog archives by year:
 [[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]]
 """
 else="""
-Calendar based archives are not enabled. See [[posts]] for a full list of posts.
+You need to use the `ikiwiki-calendar` program to generate calendar-based
+archive pages.
 """]]
-- 
cgit v1.2.3


From 1f7175e891f87c350decc1ec821bebb5adc22c2a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:31:50 -0400
Subject: sidebar: Add global_sidebars setting.

---
 IkiWiki/Plugin/sidebar.pm          | 9 +++++++++
 debian/changelog                   | 1 +
 doc/ikiwiki/directive/sidebar.mdwn | 4 ++--
 doc/plugins/sidebar.mdwn           | 8 +++++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index d63cb5246..1b302dcf9 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -20,6 +20,13 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		global_sidebars => {
+			type => "boolean",
+			examples => 1,
+			description => "show sidebar page on all pages?"
+			safe => 1,
+			rebuild => 1,
+		},
 }
 
 my %pagesidebar;
@@ -55,6 +62,8 @@ sub sidebar_content ($) {
 	
 	return $pagesidebar{$page} if exists $pagesidebar{$page};
 
+	return if defined $config{global_sidebars} && !$config{global_sidebars};
+
 	my $sidebar_page=bestlink($page, "sidebar") || return;
 	my $sidebar_file=$pagesources{$sidebar_page} || return;
 	my $sidebar_type=pagetype($sidebar_file);
diff --git a/debian/changelog b/debian/changelog
index af19f4a00..c379253d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * sidebar: Now a sidebar directive can be used to override the sidebar
     shown on a page.
   * Enable calendar and sidebar in auto-blog.setup.
+  * sidebar: Add global_sidebars setting.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 46f016747..34f078672 100644
--- a/doc/ikiwiki/directive/sidebar.mdwn
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -1,7 +1,7 @@
 The `sidebar` directive is supplied by the [[!iki plugins/sidebar desc=sidebar]] plugin.
 
-This directive specifies a custom sidebar to display on the page, instead
-of any sidebar that is displayed globally.
+This directive specifies a custom sidebar to display on the page,
+overriding any sidebar that is displayed globally.
 
 ## examples
 
diff --git a/doc/plugins/sidebar.mdwn b/doc/plugins/sidebar.mdwn
index cd0f0ecf1..012733456 100644
--- a/doc/plugins/sidebar.mdwn
+++ b/doc/plugins/sidebar.mdwn
@@ -1,9 +1,11 @@
 [[!template id=plugin name=sidebar author="Tuomo Valkonen"]]
 [[!tag type/chrome]]
 
-If this plugin is enabled, then a sidebar is added to pages in the wiki.
-The content of the sidebar is simply the content of a page named
-"sidebar" (ie, create a "sidebar.mdwn").
+This plugin allows adding a sidebar to pages in the wiki.
+
+By default, and unless the `global_sidebars` setting is turned off,
+a sidebar is added to all pages in the wiki. The content of the sidebar
+is simply the content of a page named "sidebar" (ie, create a "sidebar.mdwn").
 
 Typically this will be a page in the root of the wiki, but it can also be a
 [[ikiwiki/SubPage]]. In fact, this page,
-- 
cgit v1.2.3


From d7c164dbf29ef57f8ed2963985bd250acbef96df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:32:11 -0400
Subject: disable global sidebars by default

---
 auto-blog.setup | 1 +
 1 file changed, 1 insertion(+)

diff --git a/auto-blog.setup b/auto-blog.setup
index ff52befa3..ef03295d6 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -47,6 +47,7 @@ IkiWiki::Setup::Automator->import(
 	comments_pagespec => "posts/* and !*/Discussion",
 	blogspam_pagespec => "postcomment(*)",
 	archive_pagespec => "posts/* and !*/Discussion",
+	global_sidebars => 0,
 	discussion => 0,
 	locked_pages => "*",
 	tagbase => "tags",
-- 
cgit v1.2.3


From d63e043f0abf642ff4048cc20c6caf03db3e55fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:38:13 -0400
Subject: allow sidebar directive to enable use of sidebar page

This way, the example blog always has a sidebar on the index page,
but not the overhead of sidebars on all the other pages. And if a
user wants to, they can enable global_sidebars to switch to sidebars on
every page.
---
 IkiWiki/Plugin/sidebar.pm          | 33 ++++++++++++++++++---------------
 doc/examples/blog/index.mdwn       | 10 +---------
 doc/examples/blog/sidebar.mdwn     |  9 +++++++++
 doc/ikiwiki/directive/sidebar.mdwn |  8 +++++++-
 4 files changed, 35 insertions(+), 25 deletions(-)
 create mode 100644 doc/examples/blog/sidebar.mdwn

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 1b302dcf9..f706480ca 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -23,7 +23,7 @@ sub getsetup () {
 		global_sidebars => {
 			type => "boolean",
 			examples => 1,
-			description => "show sidebar page on all pages?"
+			description => "show sidebar page on all pages?",
 			safe => 1,
 			rebuild => 1,
 		},
@@ -36,20 +36,22 @@ sub preprocess (@) {
 	my $content=shift;
 	shift;
 
-	if (! defined $content) {
-		error(gettext("sidebar content not specified"));
-	}
-
 	my $page=$params{page};
 	return "" unless $page eq $params{destpage};
-	my $file = $pagesources{$page};
-	my $type = pagetype($file);
-
-	$pagesidebar{$page}=
-		IkiWiki::htmlize($page, $page, $type,
-		IkiWiki::linkify($page, $page,
-		IkiWiki::preprocess($page, $page,
-		IkiWiki::filter($page, $page, $content))));
+	
+	if (! defined $content) {
+		$pagesidebar{$page}=undef;
+	}
+	else {
+		my $file = $pagesources{$page};
+		my $type = pagetype($file);
+
+		$pagesidebar{$page}=
+			IkiWiki::htmlize($page, $page, $type,
+			IkiWiki::linkify($page, $page,
+			IkiWiki::preprocess($page, $page,
+			IkiWiki::filter($page, $page, $content))));
+	}
 
 	return "";
 }
@@ -60,9 +62,10 @@ my $oldcontent;
 sub sidebar_content ($) {
 	my $page=shift;
 	
-	return $pagesidebar{$page} if exists $pagesidebar{$page};
+	return $pagesidebar{$page} if defined $pagesidebar{$page};
 
-	return if defined $config{global_sidebars} && !$config{global_sidebars};
+	return if ! exists $pagesidebar{$page} && 
+		defined $config{global_sidebars} && ! $config{global_sidebars};
 
 	my $sidebar_page=bestlink($page, "sidebar") || return;
 	my $sidebar_file=$pagesources{$sidebar_page} || return;
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 062c71f2e..a22c40c72 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,14 +1,6 @@
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
-[[!sidebar """
-[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-
-[[Recent Comments|comments]]
-
-[[Archives]]
-
-[[!calendar pages="./posts/* and !*/Discussion"]]
-"""]]
+[[!sidebar]]
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).
diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
new file mode 100644
index 000000000..f24a8e57a
--- /dev/null
+++ b/doc/examples/blog/sidebar.mdwn
@@ -0,0 +1,9 @@
+[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
+
+[[Recent Comments|comments]]
+
+[[Archives]]
+
+[[!if "enabled(calendar)" then="""
+[[!calendar pages="./posts/* and !*/Discussion"]]
+"""]]
diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 34f078672..401d7c786 100644
--- a/doc/ikiwiki/directive/sidebar.mdwn
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -1,8 +1,12 @@
 The `sidebar` directive is supplied by the [[!iki plugins/sidebar desc=sidebar]] plugin.
 
-This directive specifies a custom sidebar to display on the page,
+This directive can specify a custom sidebar to display on the page,
 overriding any sidebar that is displayed globally.
 
+If no custom sidebar content is specified, it forces the sidebar page to
+be used as the sidebar, even if the `global_sidebars` setting has been
+used to disable use of the sidebar page by default.
+
 ## examples
 
 	\[[!sidebar """
@@ -11,4 +15,6 @@ overriding any sidebar that is displayed globally.
 	\[[!calendar pages="posts/*"]]
 	"""]]
 
+	\[[!sidebar]]
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From 4bbbd77a48f9c3188c97637d4d4b0d503fc1738e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:49:32 -0400
Subject: typo

---
 doc/examples/blog/sidebar.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index f24a8e57a..1d01f0a6c 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -4,6 +4,6 @@
 
 [[Archives]]
 
-[[!if "enabled(calendar)" then="""
+[[!if test="enabled(calendar)" then="""
 [[!calendar pages="./posts/* and !*/Discussion"]]
 """]]
-- 
cgit v1.2.3


From 4c6f5a48bcfc2462a915387515bfa39b9239a7da Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:50:43 -0400
Subject: fix sidebar directive parameter handling

---
 IkiWiki/Plugin/sidebar.pm          | 6 ++----
 doc/ikiwiki/directive/sidebar.mdwn | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index f706480ca..808f0bed2 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -33,13 +33,11 @@ my %pagesidebar;
 
 sub preprocess (@) {
 	my %params=@_;
-	my $content=shift;
-	shift;
 
 	my $page=$params{page};
 	return "" unless $page eq $params{destpage};
 	
-	if (! defined $content) {
+	if (! defined $params{content}) {
 		$pagesidebar{$page}=undef;
 	}
 	else {
@@ -50,7 +48,7 @@ sub preprocess (@) {
 			IkiWiki::htmlize($page, $page, $type,
 			IkiWiki::linkify($page, $page,
 			IkiWiki::preprocess($page, $page,
-			IkiWiki::filter($page, $page, $content))));
+			IkiWiki::filter($page, $page, $params{content}))));
 	}
 
 	return "";
diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 401d7c786..599695d22 100644
--- a/doc/ikiwiki/directive/sidebar.mdwn
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -9,7 +9,7 @@ used to disable use of the sidebar page by default.
 
 ## examples
 
-	\[[!sidebar """
+	\[[!sidebar content="""
 	This is my custom sidebar for this page.
 
 	\[[!calendar pages="posts/*"]]
-- 
cgit v1.2.3


From f41ebb8862b7602afea6f8ecfd074f11407165fc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:56:36 -0400
Subject: reorg

---
 doc/examples/blog/sidebar.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index 1d01f0a6c..de0feba9e 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -1,9 +1,9 @@
-[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
+[[!if test="enabled(calendar)" then="""
+[[!calendar pages="./posts/* and !*/Discussion"]]
+"""]]
 
 [[Recent Comments|comments]]
 
 [[Archives]]
 
-[[!if test="enabled(calendar)" then="""
-[[!calendar pages="./posts/* and !*/Discussion"]]
-"""]]
+[[Tags]]: [[!pagestats style="list" pages="* and !smileys/*"]]
-- 
cgit v1.2.3


From a0a472d57716466fba9d8f39e7586b3ca0d17578 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:57:35 -0400
Subject: fix tagspec

---
 doc/examples/blog/sidebar.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index de0feba9e..5c1f17723 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -6,4 +6,5 @@
 
 [[Archives]]
 
-[[Tags]]: [[!pagestats style="list" pages="* and !smileys/*"]]
+[[Tags]]:
+[[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-- 
cgit v1.2.3


From 50d08bc2aea1d8d52e07ae1750e73b722bd2db24 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 18:18:48 -0400
Subject: conditional: Fix bug that forced "all" mode off by default.

Commit b7351daacd0d4a041a51b43d99b7bf589de54f53 introduced the bug.
---
 IkiWiki/Plugin/conditional.pm | 2 +-
 debian/changelog              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 892b1cff9..8a5796149 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -30,7 +30,7 @@ sub preprocess_if (@) {
 	}
 
 	my $result=0;
-	if (! IkiWiki::yesno($params{all}) ||
+	if ((exists $params{all} && ! IkiWiki::yesno($params{all})) ||
 	    # An optimisation to avoid needless looping over every page
 	    # for simple uses of some of the tests.
 	    $params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
diff --git a/debian/changelog b/debian/changelog
index c379253d7..dfb94ae22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
     shown on a page.
   * Enable calendar and sidebar in auto-blog.setup.
   * sidebar: Add global_sidebars setting.
+  * conditional: Fix bug that forced "all" mode off by default.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From 579ee70e9524844fb40be41b859a5c2869663cda Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 18:51:35 -0400
Subject: fix parameter parsing when pagespec is ommited, and year is present

---
 ikiwiki-calendar.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
index cdfecff3f..04352b970 100755
--- a/ikiwiki-calendar.in
+++ b/ikiwiki-calendar.in
@@ -15,7 +15,10 @@ GetOptions(
 	"force" => \$force,
 ) || usage();
 my $setup=shift		|| usage();
-my $pagespec=shift;
+my $pagespec;
+if (@ARGV && $ARGV[0] !~ /^\d+$/) {
+	$pagespec=shift;
+}
 my $startyear=shift	|| 1900+(localtime(time))[5];
 my $endyear=shift	|| $startyear;
 
-- 
cgit v1.2.3


From c0a2eaf7964657a164e2108ded1931d0c360fd63 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 18:51:50 -0400
Subject: calendarmonth.tmpl: The month calendar is now put in a sidebar.

---
 debian/changelog             | 1 +
 templates/calendarmonth.tmpl | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dfb94ae22..e4056fdc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * Enable calendar and sidebar in auto-blog.setup.
   * sidebar: Add global_sidebars setting.
   * conditional: Fix bug that forced "all" mode off by default.
+  * calendarmonth.tmpl: The month calendar is now put in a sidebar.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl
index 37ad78c5c..23cd95430 100644
--- a/templates/calendarmonth.tmpl
+++ b/templates/calendarmonth.tmpl
@@ -1,3 +1,5 @@
+[[!sidebar content="""
 [[!calendar type=month month=<TMPL_VAR MONTH> year=<TMPL_VAR YEAR> pages="<TMPL_VAR PAGESPEC>"]]
+"""]]
 
 [[!inline pages="creation_month(<TMPL_VAR MONTH>) and creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>" show=0 feeds=no reverse=yes]]
-- 
cgit v1.2.3


From 034594fcb9f8a1705dd6a5325df9bfc8e6d76532 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 19:14:10 -0400
Subject: update name of libsparkline-php

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index b8fe81914..87f7d8209 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
   libfile-mimeinfo-perl, libcrypt-ssleay-perl,
   liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl,
   libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl,
-  sparkline-php, texlive, dvipng, libtext-wikicreole-perl,
+  libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
   libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
   po4a (>= 0.35-1), gettext, libyaml-perl
 Conflicts: ikiwiki-plugin-table
-- 
cgit v1.2.3


From 425f6a8de2ed66b934c16c102456b15da4ff5a14 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 19:21:01 -0400
Subject: reduce border

---
 doc/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/style.css b/doc/style.css
index bdd4bb466..44e06ae4f 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -236,7 +236,7 @@ div.recentchanges {
 	margin-top: -1px;
 	padding: 0ex 2ex;
 	background: white;
-	border: 2px solid black;
+	border: 1px solid black;
 	color: black !important;
 }
 
-- 
cgit v1.2.3


From f0ed76441d94c9bec9ebc1314b81301fe179a7fc Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 15 Apr 2010 23:36:42 +0000
Subject: some comments about this and autoindex

---
 ...auto-create_tag_pages_according_to_a_template.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 07b570b1b..7631e6fc8 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -211,6 +211,25 @@ wrong direction.
 >> [981400177d68a279f485727be3f013e68f0bf691][].
  --[[David_Riebenbauer]]
 
+>>> This doesn't seem to have all the refinements that autoindex has:
+>>>
+>>> * `autoindex` attaches the record of deletions off the `index` page, which
+>>>   is (nearly) guaranteed to exist; this one attaches the record of
+>>>   deletions to the deleted page's page state.
+>>>
+>>> * `autoindex` forgets that a page was deleted when that page is
+>>>   re-created
+>>>
+>>> * `autoindex` forgets that a page was deleted when it's no longer needed
+>>>   anyway (this may be harder for `autotag`?)
+>>>
+>>> It'd probably be an interesting test of the core change to port
+>>> `autoindex` to use it? (Adding the file to the RCS would be
+>>> necessary to get parity with `autoindex`.) --[[smcv]]
+
+> Regarding the call from `IkiWiki.pm` to `Render.pm`, wouldn't this be
+> quite easy to solve by moving `verify_src_file` to IkiWiki.pm? --[[smcv]]
+
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
 [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
-- 
cgit v1.2.3


From b5e7f7a67f9893c7083afe3594c4a274c1b96062 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 15 Apr 2010 23:39:02 +0000
Subject: slight clarification

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 7631e6fc8..6118cb014 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -213,9 +213,10 @@ wrong direction.
 
 >>> This doesn't seem to have all the refinements that autoindex has:
 >>>
->>> * `autoindex` attaches the record of deletions off the `index` page, which
+>>> * `autoindex` attaches the record of deletions to the `index` page, which
 >>>   is (nearly) guaranteed to exist; this one attaches the record of
->>>   deletions to the deleted page's page state.
+>>>   deletions to the deleted page's page state. Won't that tend to result
+>>>   in losing the record along with the deleted page?
 >>>
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
-- 
cgit v1.2.3


From 142e025ae471c91e68a23476f700df0b8ad6b31d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 20:12:03 -0400
Subject: calendar: Improved display of arrows.

---
 IkiWiki/Plugin/calendar.pm | 21 +++++++++++----------
 debian/changelog           |  1 +
 doc/plugins/calendar.mdwn  |  2 ++
 doc/style.css              |  8 ++++++++
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 0f0e9518a..aeb5f3d29 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -164,11 +164,11 @@ sub format_month (@) {
 	# Start producing the month calendar
 	$calendar=<<EOF;
 <table class="month-calendar">
-	<caption class="month-calendar-head">
-	$purl
-	$url
-	$nurl
-	</caption>
+	<tr>
+	<th class="month-calendar-arrow">$purl</th>
+	<th class="month-calendar-head" colspan="5">$url</th>
+	<th class="month-calendar-arrow">$nurl</th>
+	</tr>
 	<tr>
 EOF
 
@@ -312,13 +312,14 @@ sub format_year (@) {
 	add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
 
 	# Start producing the year calendar
+	my $m=$params{months_per_row}-2;
 	$calendar=<<EOF;
 <table class="year-calendar">
-	<caption class="year-calendar-head">
-	$purl
-	$url
-	$nurl
-	</caption>
+	<tr>
+	<th class="year-calendar-arrow">$purl</th>
+ 	<th class="year-calendar-head" colspan="$m">$url</th>
+	<th class="year-calendar-arrow">$nurl</th>
+	</tr>
 	<tr>
 		<th class="year-calendar-subhead" colspan="$params{months_per_row}">Months</th>
 	</tr>
diff --git a/debian/changelog b/debian/changelog
index e4056fdc6..737d73655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * sidebar: Add global_sidebars setting.
   * conditional: Fix bug that forced "all" mode off by default.
   * calendarmonth.tmpl: The month calendar is now put in a sidebar.
+  * calendar: Improved display of arrows.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index 49fd90627..76e718a3b 100644
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -14,6 +14,7 @@ customization.
 
 * `month-calendar` - The month calendar as a whole.
 * `month-calendar-head` - The head of the month calendar (ie,"March").
+* `month-calendar-arrow` - Arrow pointing to previous/next month.
 * `month-calendar-day-head` - A column head in the month calendar (ie, a
   day-of-week abbreviation).
 * `month-calendar-day-noday`, `month-calendar-day-link`,
@@ -27,6 +28,7 @@ customization.
   weekends.
 * `year-calendar` - The year calendar as a whole.
 * `year-calendar-head` - The head of the year calendar (ie, "2007").
+* `year-calendar-arrow` - Arrow pointing to previous/next year.
 * `year-calendar-subhead` - For example, "Months".
 * `year-calendar-month-link`, `year-calendar-month-nolink`,
   `year-calendar-month-future`, `year-calendar-this-month` - The month
diff --git a/doc/style.css b/doc/style.css
index 44e06ae4f..7ffcf9fe2 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -431,3 +431,11 @@ pre.hl { color:#000000; background-color:#ffffff; }
 /* For the calendar plugin. */
 .month-calendar-day-this-day { background-color: #eee; }
 .year-calendar-this-month { background-color: #eee; }
+.month-calendar-arrow A:link,
+.year-calendar-arrow A:link,
+.month-calendar-arrow A:visited,
+.year-calendar-arrow A:visited {
+	text-decoration: none;
+	font-weight: normal;
+	font-size: 150%;
+}
-- 
cgit v1.2.3


From dd64c2a9c0d7a1bfe9d3b89957efe8f045091111 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 22:18:56 -0400
Subject: sidebar plugin optimisations

The pagetemplate hook may be called multiple times, for example when pages
are inlined into a page. Sidebars were being calculated each time that
happened, only to be thrown away when the final pagetemplate hook was
called. Avoid this unnecessary work.

Remove stored sidebar content on use to save some memory.
---
 IkiWiki/Plugin/sidebar.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 808f0bed2..0350f2b71 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -60,7 +60,7 @@ my $oldcontent;
 sub sidebar_content ($) {
 	my $page=shift;
 	
-	return $pagesidebar{$page} if defined $pagesidebar{$page};
+	return delete $pagesidebar{$page} if defined $pagesidebar{$page};
 
 	return if ! exists $pagesidebar{$page} && 
 		defined $config{global_sidebars} && ! $config{global_sidebars};
@@ -97,11 +97,10 @@ sub sidebar_content ($) {
 sub pagetemplate (@) {
 	my %params=@_;
 
-	my $page=$params{page};
 	my $template=$params{template};
-	
-	if ($template->query(name => "sidebar")) {
-		my $content=sidebar_content($page);
+	if ($params{destpage} eq $params{page} &&
+	    $template->query(name => "sidebar")) {
+		my $content=sidebar_content($params{destpage});
 		if (defined $content && length $content) {
 		        $template->param(sidebar => $content);
 		}
-- 
cgit v1.2.3


From 208a77a977615b3e285d08b33345daca7072432e Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 16 Apr 2010 03:41:25 +0000
Subject: response

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 15b97e480..eb1f58cfa 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -38,8 +38,16 @@ and the tags would appear at the bottom of the post, the Rubrica next to the tit
 
 >> I had thought about the `\[[!tag type1=value1 type2=value2]]` syntax myself, but ultimately decided against it for a number of reasons, most importantly the fact that (1) it's harder to type, (2) it's harder to spot errors in the tag types (so for example if one misspelled `categoria` as `categorica`, he might not notice it as quickly as seeing the un-parsed `\[[!categorica ]]` directive in the output html) and (3) it encourages collapsing possibly unrelated metadata together (for example, I would never consider putting the categoria information together with the rubrica  one; of course with your syntax it's perfectly possible to keep them separate as well).
 
->> Point (2) may be considered a downside as well as an upside, depending on perspective, of course. And it would be possible to have a set of predefined tag types to match against, like in my tagtype directive approach but with your syntax. Point (3) is of course entirely in the hands of the user, but that's exactly what syntax should be about. There is nothing functionally wrong with e.g. `\[[!meta tag=sometag author=someauthor title=sometitle rubrica=somecolumn]]`, but I honestly find it horrible.
+>> Point (2) may be considered a downside as well as an upside, depending on perspective, of course. And it would be possible to have a set of predefined tag types to match against, like in my tagtype directive approach but with your syntax.
+
+>>> You seem to have answered your own objections already. -- K.A.
+
+>>Point (3) is of course entirely in the hands of the user, but that's exactly what syntax should be about. There is nothing functionally wrong with e.g. `\[[!meta tag=sometag author=someauthor title=sometitle rubrica=somecolumn]]`, but I honestly find it horrible.
+
+>>> So, really, point 3 comes down to differing aesthetics. -- K.A.
 
 >> A solution could be to allow both syntaxes, getting to have for example `\[[!sometagtype "blah"]]` as a shortcut for `\[[!tag sometagtype="blah"]]` (or, in the more general case, `\[[!somefieldname "blah"]]` as a shortcut for `\[[!meta fieldname="blah"]]`).
 
 >> I would like to point out however that there are some functional differences between categorization metadata vs other metadata that might suggest to keep fields and (my extended) tags separate. For examples, in feeds you'd want all categorization metadata to fall in one place, with some appropriate manipulation (which I still have to implement, by the way), while things like author or title would go to the corresponding feed item properties. Although it all would be possible with appropriate report or template juggling, having such default metadata handled natively looks like a bonus to me.
+
+>>> Whereas I prefer being able to control such things with templates, because it gives more flexibility AND control. - K.A.
-- 
cgit v1.2.3


From 5c263623c2446191332088a29fda4e045cc06f1e Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 16 Apr 2010 17:19:44 +0200
Subject: answer about the `%pagestate` of autopages.

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 6118cb014..ca3475149 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -217,20 +217,40 @@ wrong direction.
 >>>   is (nearly) guaranteed to exist; this one attaches the record of
 >>>   deletions to the deleted page's page state. Won't that tend to result
 >>>   in losing the record along with the deleted page?
->>>
+
+>>>> This is probably on of the harder things to do, 'cause there are (most of the
+>>>> time) several pages that are responsible for the creation of a single tag page.
+>>>> Of course I could attach the info to all of them.
+
+>>>> With current behaviour I think the information in `%pagestate` is kept around
+>>>> regardless whether the corresponding page exists or not.
+>>>> --[[David_Riebenbauer]]
+
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
->>>
+
+>>>> Yes, I forgot about that and that is a bug. I'll fix that.
+>>>> --[[David_Riebenbauer]]
+
 >>> * `autoindex` forgets that a page was deleted when it's no longer needed
 >>>   anyway (this may be harder for `autotag`?)
->>>
+
+>>>> I don't think so. AFAIK ikiwiki can detect whether there are taglinks to a page
+>>>> anyway, so it should be quite easy. I'll try to implement that too.
+>>>> --[[David_Riebenbauer]]
+
 >>> It'd probably be an interesting test of the core change to port
 >>> `autoindex` to use it? (Adding the file to the RCS would be
 >>> necessary to get parity with `autoindex`.) --[[smcv]]
 
+>>>> Good suggestion. Adding the files to RCS is on my todo list anyway.
+>>>> --[[David_Riebenbauer]]
+
 > Regarding the call from `IkiWiki.pm` to `Render.pm`, wouldn't this be
 > quite easy to solve by moving `verify_src_file` to IkiWiki.pm? --[[smcv]]
 
+>> True. I'll do that. --[[David_Riebenbauer]]
+
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
 [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
-- 
cgit v1.2.3


From e26ac520bffe39e400a037aa35b68f617991da2b Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 16 Apr 2010 17:21:54 +0200
Subject: typo

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index ca3475149..c4d9538a1 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -126,7 +126,7 @@ is not satisfied for the newly created tag page. I shall put debug msgs into Ren
 
 ---
 
-I've made another attempt at fixiing this
+I've made another attempt at fixing this
 
 The current progress can be found at my [git repository][gitweb] on branch
 `autotag`:
-- 
cgit v1.2.3


From 18b39ff9757a0e6bc8672a2453411676a09bffea Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 16 Apr 2010 15:31:31 +0000
Subject: try to clarify

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index c4d9538a1..b8b0186b4 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -226,6 +226,11 @@ wrong direction.
 >>>> regardless whether the corresponding page exists or not.
 >>>> --[[David_Riebenbauer]]
 
+>>>>> Sorry, I'll try to be clearer: `autoindex` hard-codes that the [[index]] page
+>>>>> of the entire wiki is the one responsible for storing the page state. That
+>>>>> page isn't responsible for the creation of the tag page, it's just an
+>>>>> arbitrary page that's (more or less) guaranteed to exist. --[[smcv]]
+
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
 
-- 
cgit v1.2.3


From 49be30eae88b4a027becc3e67bc321e0bf89840f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 12:08:12 -0400
Subject: clarify re %pagestate persistence

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index b8b0186b4..1259552bf 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -231,6 +231,11 @@ wrong direction.
 >>>>> page isn't responsible for the creation of the tag page, it's just an
 >>>>> arbitrary page that's (more or less) guaranteed to exist. --[[smcv]]
 
+>>>>> I don't like that [[plugins/autoindex]] has to do that,
+>>>>> but `%pagestate` values are only stored for pages that exist,
+>>>>> so it was necessary. (Another way to look at this is that
+>>>>> `%pagestate` is not the ideal data structure.) --[[Joey]]
+
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
 
-- 
cgit v1.2.3


From a70c2518af7f48036a21d04c5b4070f3ea96002c Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 16 Apr 2010 18:16:47 +0200
Subject: answer to clarification.

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 1259552bf..0ae025a13 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -236,6 +236,8 @@ wrong direction.
 >>>>> so it was necessary. (Another way to look at this is that
 >>>>> `%pagestate` is not the ideal data structure.) --[[Joey]]
 
+>>>>> Ok, now I know what you mean. --[[David_Riebenbauer]]
+
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
 
-- 
cgit v1.2.3


From 6c5c0f8c682a2727bb71652668fef90a40d99f25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 12:21:44 -0400
Subject: add mtime-to-git script to pull more correct mtimes out of git

---
 mtime-to-git | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100755 mtime-to-git

diff --git a/mtime-to-git b/mtime-to-git
new file mode 100755
index 000000000..9875af5d7
--- /dev/null
+++ b/mtime-to-git
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Sets mtimes of all files in the tree their last change date
+# based on git's log. Useful to avoid too new dates after a
+# fresh checkout, which lead to ikiwiki unnecessarily rebuilding
+# basewiki files on upgrade.
+if [ -d .git ]; then
+	for file in $(git ls-files); do
+		date="$(git log -1 --date=rfc "$file" | grep ^Date: | sed -e 's/Date://')"
+		if [ -n "$date" ]; then
+			echo "$date $file"
+			touch -d"$date" $file
+		fi
+	done
+fi
-- 
cgit v1.2.3


From 720522859806d9cf50231ed6aa28085754713701 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 16 Apr 2010 17:51:51 +0000
Subject: ... and indeed there is a better way to store it

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 0ae025a13..8fc97578c 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -236,6 +236,9 @@ wrong direction.
 >>>>> so it was necessary. (Another way to look at this is that
 >>>>> `%pagestate` is not the ideal data structure.) --[[Joey]]
 
+>>>>>> Aha! Having looked at [[plugins/write]] again, it turns out that what this
+>>>>>> feature should really use is `%wikistate`, I think? :-) --[[smcv]]
+
 >>>>> Ok, now I know what you mean. --[[David_Riebenbauer]]
 
 >>> * `autoindex` forgets that a page was deleted when that page is
-- 
cgit v1.2.3


From ff5b73163f97110e83dd777cf7e14debebf85288 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Fri, 16 Apr 2010 18:20:29 +0000
Subject: Proposal for tags/meta/field coalescing

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index eb1f58cfa..ee3bbd88d 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -51,3 +51,22 @@ and the tags would appear at the bottom of the post, the Rubrica next to the tit
 >> I would like to point out however that there are some functional differences between categorization metadata vs other metadata that might suggest to keep fields and (my extended) tags separate. For examples, in feeds you'd want all categorization metadata to fall in one place, with some appropriate manipulation (which I still have to implement, by the way), while things like author or title would go to the corresponding feed item properties. Although it all would be possible with appropriate report or template juggling, having such default metadata handled natively looks like a bonus to me.
 
 >>> Whereas I prefer being able to control such things with templates, because it gives more flexibility AND control. - K.A.
+
+>>>> Flexibility and control is good for tuning and power-usage, but sensible defaults are a must for a platform to be usable out of the box without much intervention. Moreover, there's a possible problem with what kind of data must be passed over to templates.
+
+Aside from the name of the plugin (and thus of the main directive), which could be `tag`, `meta`, `field` or whatever (maybe extending `meta` would be the most sensible choice), the features we want are
+
+  1. allow multiple values per type/attribute/field/whatever (fields currently only allows one)
+  2. allow both hidden and visible references (à la tag vs taglink)
+  3. allow each type/attribute/field to be exposed under multiple queries (e.g. tags and categories; this is mostly important for backwards compatibility, not sure if it might have other uses too)
+  4. allow arbitrary types/attributes/fields/whatever (even 'undefined' ones)
+
+Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would thus have the following parameters:
+
+  * `directive` : the name of the directive that can be used to set the value as a hidden reference; we can discuss whether, for pre- or user-defined types, it being undef means no directive or a default directive matching the attribute name would be defined.
+  * `linkdirective` : the name of the directive that can be used for a visible reference; no such directive would be defined by default
+  * `linktype` : link type for (hidden and visible) references
+  * `linkbase` : akin to the tagbase parameter
+  * `queries` : list of template queries this type/attribute/field/whatever is exposed to
+
+Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From b14f84c4acccbc8450a9102b3b647013989b27bb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 17:02:29 -0400
Subject: --gettime revamp

* Rename --getctime to --gettime. (The old name still works for
  backwards compatability.)
* --gettime now also looks up last modification time.
* Add rcs_getmtime to plugin API; currently only implemented
  for git.
---
 IkiWiki.pm                                         |  8 +++++--
 IkiWiki/Plugin/bzr.pm                              |  5 +++++
 IkiWiki/Plugin/cvs.pm                              |  5 +++++
 IkiWiki/Plugin/darcs.pm                            |  5 +++++
 IkiWiki/Plugin/git.pm                              |  5 +++++
 IkiWiki/Plugin/mercurial.pm                        |  5 +++++
 IkiWiki/Plugin/monotone.pm                         |  5 +++++
 IkiWiki/Plugin/norcs.pm                            |  7 +++++-
 IkiWiki/Plugin/svn.pm                              |  5 +++++
 IkiWiki/Plugin/tla.pm                              |  5 +++++
 IkiWiki/Render.pm                                  | 18 +++++++++++++---
 debian/changelog                                   |  5 +++++
 .../How_does_ikiwiki_remember_times__63__.mdwn     | 25 ++++++----------------
 ...old_repository_to_new_ikiwiki_system__63__.mdwn |  4 ----
 doc/plugins/write.mdwn                             |  7 ++++++
 doc/rcs.mdwn                                       |  8 +++++--
 doc/tips/Importing_posts_from_Wordpress.mdwn       |  2 +-
 doc/tips/inside_dot_ikiwiki/discussion.mdwn        |  7 +++---
 doc/todo/auto_getctime_on_fresh_build.mdwn         |  8 +++++--
 doc/usage.mdwn                                     | 10 ++++-----
 ikiwiki.in                                         |  3 ++-
 mtime-to-git                                       | 14 ------------
 22 files changed, 109 insertions(+), 57 deletions(-)
 delete mode 100755 mtime-to-git

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1730e476a..7655dada5 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -440,10 +440,10 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
-	getctime => {
+	gettime => {
 		type => "internal",
 		default => 0,
-		description => "running in getctime mode",
+		description => "running in gettime mode",
 		safe => 0,
 		rebuild => 0,
 	},
@@ -1790,6 +1790,10 @@ sub rcs_getctime ($) {
 	$hooks{rcs}{rcs_getctime}{call}->(@_);
 }
 
+sub rcs_getmtime ($) {
+	$hooks{rcs}{rcs_getmtime}{call}->(@_);
+}
+
 sub rcs_receive () {
 	$hooks{rcs}{rcs_receive}{call}->();
 }
diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 0efc26b49..f79ca7c8f 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -20,6 +20,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -306,4 +307,8 @@ sub rcs_getctime ($) {
 	return $ctime;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for bzr\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 26a3e9dd2..360d97249 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -49,6 +49,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub genwrapper () {
@@ -485,4 +486,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for cvs\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index bc8394b90..c1d6661d3 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -18,6 +18,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub silentsystem (@) {
@@ -427,4 +428,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for darcs\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index b02f4a5ed..86d80186f 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -25,6 +25,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 	hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive);
 }
 
@@ -634,6 +635,10 @@ sub rcs_getctime ($) {
 	return $ctime;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for git\n"; # TODO
+}
+
 sub rcs_receive () {
 	# The wiki may not be the only thing in the git repo.
 	# Determine if it is in a subdirectory by examining the srcdir,
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index ea00a3364..34e009c7a 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -20,6 +20,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -254,4 +255,8 @@ sub rcs_getctime ($) {
 	return $ctime;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for mercurial\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index c33cf7e3a..67d4abbaa 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -23,6 +23,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -693,4 +694,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for monotone\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm
index e6a05a3c5..053652a5f 100644
--- a/IkiWiki/Plugin/norcs.pm
+++ b/IkiWiki/Plugin/norcs.pm
@@ -18,6 +18,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub getsetup () {
@@ -63,7 +64,11 @@ sub rcs_diff ($) {
 }
 
 sub rcs_getctime ($) {
-	error gettext("getctime not implemented");
+	return 0;
+}
+
+sub rcs_getmtime ($) {
+	return 0;
 }
 
 1
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 7d27ec842..85c205f09 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -19,6 +19,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -379,4 +380,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for svn\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index 764da9b98..f5ad0cc96 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -18,6 +18,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -284,4 +285,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for tla\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e98888d76..e1cb68462 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -365,14 +365,26 @@ sub find_new_files ($) {
 			}
 			else {
 				push @new, $file;
-				if ($config{getctime} && -e "$config{srcdir}/$file") {
+				if ($config{gettime} && -e "$config{srcdir}/$file") {
 					eval {
-						my $time=rcs_getctime("$config{srcdir}/$file");
-						$pagectime{$page}=$time;
+						my $ctime=rcs_getctime("$config{srcdir}/$file");
+						if ($ctime > 0) {
+							$pagectime{$page}=$ctime;
+						}
 					};
 					if ($@) {
 						print STDERR $@;
 					}
+					my $mtime;
+					eval {
+						my $mtime=rcs_getmtime("$config{srcdir}/$file");
+					};
+					if ($@) {
+						print STDERR $@;
+					}
+					elsif ($mtime > 0) {
+						utime($mtime, $mtime, "$config{srcdir}/$file");
+					}
 				}
 			}
 			$pagecase{lc $page}=$page;
diff --git a/debian/changelog b/debian/changelog
index 737d73655..615d5916f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,11 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * conditional: Fix bug that forced "all" mode off by default.
   * calendarmonth.tmpl: The month calendar is now put in a sidebar.
   * calendar: Improved display of arrows.
+  * Rename --getctime to --gettime. (The old name still works for
+    backwards compatability.)
+  * --gettime now also looks up last modification time.
+  * Add rcs_getmtime to plugin API; currently only implemented
+    for git.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
index 6ce576db1..6b7739fd0 100644
--- a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
+++ b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
@@ -20,15 +20,17 @@ Do I have it right?
 > Some VCS, like git, set the file mtimes to the current time
 > when making a new checkout, so they will be lost if you do that.
 > The creation times can be retrived using the `--getctime` option.
-> I suppose it might be nice if there were a `--getmtime` that pulled
-> true modification times out of the VCS, but I haven't found it a big
-> deal in practice for the last modification times to be updated to the
-> current time when rebuilding a wiki like this. --[[Joey]] 
+> --[[Joey]] 
 >
 > > Thanks for the clarification. I ran some tests of my own to make sure I understand it right, and I'm satisfied
 > > that the order of posts in my blog can be retrieved from the VCS using the `--getctime` option, at least if I
 > > choose to order my posts by creation time rather than modification time. But I now know that I can't rely on
 > > page modification times in ikiwiki as these can be lost permanently.
+> 
+> > > Update: It's now renamed to `--gettime`, and pulls both the creation
+> > > and modification times. Also, per [[todo/auto_getctime_on_fresh_build]],
+> > > this is now done automatically the first time ikiwiki builds a
+> > > srcdir. So, no need to worry about this any more! --[[Joey]] 
 > >
 > > I would suggest that there should at least be a `--getmtime` option like you describe, and perhaps that 
 > > `--getctime` and `--getmtime` be _on by default_. In my opinion the creation times and modification times of 
@@ -91,19 +93,6 @@ Do I have it right?
 > A quick workaround for me to get modification times right is the following
 > little zsh script, which unfortunately only works for git:
 
-    #!/usr/bin/env zsh
-    
-    set +x
-    
-    for FILE in **/*(.); do
-      TIMES="`git log --pretty=format:%ai $FILE`"
-      MTIME="`echo $TIMES | head -n1`"
-    
-      if [ ! -z $MTIME ]; then
-        echo  touch -m -d "$MTIME" $FILE
-        touch -m -d "$MTIME" $FILE
-      fi
-    
-    done
+>> Elided; no longer needed since --gettime does that, and much faster! --[[Joey]] 
 
 > --[[David_Riebenbauer]]
diff --git a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn
index fe67e6aba..d7a33b526 100644
--- a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn
+++ b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn
@@ -20,10 +20,6 @@ How do I set up an ikiwiki system using a pre-existing repository (instead of cr
 >    recreate the ikiwiki srcdir
 > 3. `git clone` from the bare git repository a second time,
 >    to create a checkout you can manually edit (optional)
-> 4. run `ikiwiki --getctime --setup your.setup`
->    The getctime will ensure page creation times are accurate
->    by putting the info out of the git history,
->    and only needs to be done once.
 >
 > If you preserved your repository, but not the setup file,
 > the easiest way to make one is probably to run
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 707622956..cf7044b2c 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1085,6 +1085,13 @@ it up in the history.
 
 It's ok if this is not implemented, and throws an error.
 
+#### `rcs_getmtime($)`
+
+This is used to get the page modification time for a file from the RCS, by
+looking it up in the history.
+
+It's ok if this is not implemented, and throws an error.
+
 #### `rcs_receive()`
 
 This is called when ikiwiki is running as a pre-receive hook (or
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index 4e7a8d2a6..b5bfc2414 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -14,8 +14,10 @@ use, some advanced or special features are not supported in all of them.
 Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
 set up a wiki using that revision control system. The `rcs_commit_staged`
 hook is needed to use [[attachments|plugins/attachment]] or
-[[plugins/comments]]. And so on. The table below summarises this for each
-revision control system and links to more information about each.
+[[plugins/comments]]. `rcs_getctime` may be implemented in a fast way
+(ie, one log lookup for all files), or very slowly (one lookup per file).
+And so on. The table below summarises this for each revision control
+system and links to more information about each.
 
 [[!table data="""
 feature             |[[git]]|[[svn]]|[[bzr]]   |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]]   |[[cvs]]
@@ -25,6 +27,8 @@ auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes
 `rcs_rename`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
 `rcs_remove`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
 `rcs_diff`          |yes    |yes    |yes       |yes         |no           |yes      |yes       |yes
+`rcs_getctime`      |fast   |slow   |slow      |slow        |slow         |slow     |slow      |slow
+`rcs_getmtime`      |fast   |no     |no        |no          |no           |no       |no        |no
 anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
 conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
 """]]
diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn
index 59330caa4..8774c9723 100644
--- a/doc/tips/Importing_posts_from_Wordpress.mdwn
+++ b/doc/tips/Importing_posts_from_Wordpress.mdwn
@@ -1,6 +1,6 @@
 Use case: You want to move away from Wordpress to Ikiwiki as your blogging/website platform, but you want to retain your old posts.
 
-[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's <tt>--getctime</tt> to get the preserve creation times on checkout. 
+[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's <tt>--gettime</tt> to get the preserve creation times on checkout. 
 
 WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned.
 
diff --git a/doc/tips/inside_dot_ikiwiki/discussion.mdwn b/doc/tips/inside_dot_ikiwiki/discussion.mdwn
index 34d5b9252..69df369ec 100644
--- a/doc/tips/inside_dot_ikiwiki/discussion.mdwn
+++ b/doc/tips/inside_dot_ikiwiki/discussion.mdwn
@@ -6,14 +6,15 @@ My database appears corrupted:
 No idea how this happened.  I've blown it away and recreated it but, for future reference, is there any less violent way to recover from this situation?  I miss having the correct created and last edited times.  --[[sabr]]
 > update: fixed ctimes and mtimes using [these instructions](http://u32.net/Mediawiki_Conversion/Git_Import/#Correct%20Creation%20and%20Last%20Edited%20time) --[[sabr]]
 
-> That's overly complex. Just run `ikiwiki -setup your.setup -getctime`. 
+> That's overly complex. Just run `ikiwiki -setup your.setup -gettime`. 
 > BTW, I'd be interested in examining such a corrupt storable file to try
 > to see what happened to it. --[[Joey]]
 
->> --getctime appears to only set the last edited date.  It's not supposed to set the creation date, is it?  The only place that info is stored is in the git repo.
+>> --gettime appears to only set the last edited date.  It's not supposed to set the creation date, is it?  The only place that info is stored is in the git repo.
 
 >>> Pulling the page creation date out of the git history is exactly what
->>> --getctime does. --[[Joey]]
+>>> --gettime does. (It used to be called --getctime, and only do that; now
+>>> it also pulls out the last modified date). --[[Joey]]
 
 >> Alas, I seem to have lost the bad index file to periodic /tmp wiping; I'll send it to you if it happens again.  --[[sabr]]
 
diff --git a/doc/todo/auto_getctime_on_fresh_build.mdwn b/doc/todo/auto_getctime_on_fresh_build.mdwn
index ea95fb8c9..760c56fa1 100644
--- a/doc/todo/auto_getctime_on_fresh_build.mdwn
+++ b/doc/todo/auto_getctime_on_fresh_build.mdwn
@@ -1,9 +1,13 @@
 [[!tag wishlist]]
 
-It might be a good idea to enable --getctime when `.ikiwiki` does not
+It might be a good idea to enable --gettime when `.ikiwiki` does not
 exist. This way a new checkout of a `srcdir` would automatically get
-ctimes right. (Running --getctime whenever a rebuild is done would be too
+ctimes right. (Running --gettime whenever a rebuild is done would be too
 slow.) --[[Joey]] 
 
 Could this be too annoying in some cases, eg, checking out a large wiki
 that needs to get set up right away? --[[Joey]] 
+
+> Not for git with the new, optimised --getctime. For other VCS.. well,
+> pity they're not as fast as git ;), but it is a one-time expense...
+> [[done]] --[[Joey]]
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index db1e36a10..553fef01e 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -320,13 +320,11 @@ also be configured using a setup file.
   intercepted. If you enable this option then you must run at least the 
   CGI portion of ikiwiki over SSL.
 
-* --getctime
+* --gettime
 
-  Pull creation time for each new page out of the revision control
-  system. This rarely used option provides a way to get the real creation
-  times of items in weblogs, such as when building a wiki from a new
-  VCS checkout. It is unoptimised and quite slow. It is best used
-  with --rebuild, to force ikiwiki to get the ctime for all pages.
+  Extract creation and modification times for each new page from the
+  the revision control's log. This is done automatically when building a
+  wiki for the first time, so you normally do not need to use this option.
 
 * --set var=value
   
diff --git a/ikiwiki.in b/ikiwiki.in
index 38e4d3201..801ff9a0b 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -44,7 +44,8 @@ sub getconfig () {
 			"wrappergroup=s" => \$config{wrappergroup},
 			"usedirs!" => \$config{usedirs},
 			"prefix-directives!" => \$config{prefix_directives},
-			"getctime" => \$config{getctime},
+			"getctime" => \$config{gettime},
+			"gettime" => \$config{gettime},
 			"numbacklinks=i" => \$config{numbacklinks},
 			"rcs=s" => \$config{rcs},
 			"no-rcs" => sub { $config{rcs}="" },
diff --git a/mtime-to-git b/mtime-to-git
deleted file mode 100755
index 9875af5d7..000000000
--- a/mtime-to-git
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Sets mtimes of all files in the tree their last change date
-# based on git's log. Useful to avoid too new dates after a
-# fresh checkout, which lead to ikiwiki unnecessarily rebuilding
-# basewiki files on upgrade.
-if [ -d .git ]; then
-	for file in $(git ls-files); do
-		date="$(git log -1 --date=rfc "$file" | grep ^Date: | sed -e 's/Date://')"
-		if [ -n "$date" ]; then
-			echo "$date $file"
-			touch -d"$date" $file
-		fi
-	done
-fi
-- 
cgit v1.2.3


From e3e245956fe6dcbb884428d24bed4cb9eb7c8ba7 Mon Sep 17 00:00:00 2001
From: Cord <Cord@web>
Date: Fri, 16 Apr 2010 21:48:35 +0000
Subject: typo

---
 doc/examples/softwaresite/news.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/examples/softwaresite/news.mdwn b/doc/examples/softwaresite/news.mdwn
index 9b53c7d99..20efba6e0 100644
--- a/doc/examples/softwaresite/news.mdwn
+++ b/doc/examples/softwaresite/news.mdwn
@@ -1,4 +1,4 @@
-This is where annoucements of new releases, features, and other news is
+This is where announcements of new releases, features, and other news is
 posted. FooBar users are recommended to subscribe to this page's RSS
 feed.
 
-- 
cgit v1.2.3


From 0bd6c327666e2ac747183faca483c46ee2774285 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 18:11:30 -0400
Subject: fix file, should be symlink

---
 underlays/basewiki/ikiwiki/pagespec/sorting.mdwn | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
 mode change 100644 => 120000 underlays/basewiki/ikiwiki/pagespec/sorting.mdwn

diff --git a/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn b/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn
deleted file mode 100644
index 41aa58151..000000000
--- a/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-Some [[directives|ikiwiki/directive]] that use
-[[PageSpecs|ikiwiki/pagespec]] allow
-specifying the order that matching pages are shown in. The following sort
-orders can be specified.
-
-* `age` - List pages from the most recently created to the oldest.
-* `mtime` - List pages with the most recently modified first.
-* `title` - Order by title.
-* `title_natural` - Only available if [[!cpan Sort::Naturally]] is
-  installed. Orders by title, but numbers in the title are treated
-  as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
diff --git a/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn b/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn
new file mode 120000
index 000000000..93ccbb18d
--- /dev/null
+++ b/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn
@@ -0,0 +1 @@
+../../../../doc/ikiwiki/pagespec/sorting.mdwn
\ No newline at end of file
-- 
cgit v1.2.3


From dee2940c0bc97080088c99f399cd0ff0df3bec23 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 18:29:45 -0400
Subject: automatically run --gettime, and optimise it for git

* Automatically run --gettime the first time ikiwiki is run on
  a given srcdir.
* Optimise --gettime for git, so it's appropriatly screamingly
  fast. (This could be done for other backends too.)
* However, --gettime for git no longer follows renames.
* Use above to fix up timestamps on docwiki, as well as ensure that
  timestamps on basewiki files shipped in the deb are sane.
---
 IkiWiki.pm             |  2 +-
 IkiWiki/Plugin/git.pm  | 48 ++++++++++++++++++++++++++++++++++++------------
 IkiWiki/Render.pm      | 11 +++++++++--
 debian/changelog       |  7 +++++++
 debian/control         |  2 +-
 doc/plugins/write.mdwn |  4 ++++
 doc/usage.mdwn         |  2 +-
 docwiki.setup          | 17 ++++++++++++++++-
 ikiwiki.in             |  2 +-
 9 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7655dada5..b37b1f344 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -442,7 +442,6 @@ sub getsetup () {
 	},
 	gettime => {
 		type => "internal",
-		default => 0,
 		description => "running in gettime mode",
 		safe => 0,
 		rebuild => 0,
@@ -1512,6 +1511,7 @@ sub loadindex () {
 			open ($in, "<", "$config{wikistatedir}/indexdb") || return;
 		}
 		else {
+			$config{gettime}=1; # first build
 			return;
 		}
 	}
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 86d80186f..aa402c04f 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -616,27 +616,51 @@ sub rcs_diff ($) {
 	}
 }
 
-sub rcs_getctime ($) {
+{
+my %time_cache;
+
+sub findtimes ($$) {
 	my $file=shift;
+	my $id=shift; # 0 = mtime ; 1 = ctime
+
 	# Remove srcdir prefix
 	$file =~ s/^\Q$config{srcdir}\E\/?//;
 
-	my @raw_lines = run_or_die('git', 'log', 
-		'--follow', '--no-merges',
-		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
-		'-r', '--', $file);
-	my @ci;
-	while (my $parsed = parse_diff_tree("", \@raw_lines)) {
-		push @ci, $parsed;
+	if (! keys %time_cache) {
+		my $date;
+		foreach my $line (run_or_die('git', 'log',
+				'--pretty=format:%ct',
+				'--name-only', '--relative')) {
+			if (! defined $date && $line =~ /^(\d+)$/) {
+				$date=$line;
+			}
+			elsif (! length $line) {
+				$date=undef;
+			}
+			else {
+				if (! $time_cache{$line}) {
+					$time_cache{$line}[0]=$date; # mtime
+				}
+				$time_cache{$line}[1]=$date; # ctime
+			}
+		}
 	}
-	my $ctime = $ci[$#ci]->{'author_epoch'};
-	debug("ctime for '$file': ". localtime($ctime));
 
-	return $ctime;
+	return exists $time_cache{$file} ? $time_cache{$file}[$id] : 0;
+}
+
+}
+
+sub rcs_getctime ($) {
+	my $file=shift;
+
+	return findtimes($file, 1);
 }
 
 sub rcs_getmtime ($) {
-	error "rcs_getmtime is not implemented for git\n"; # TODO
+	my $file=shift;
+
+	return findtimes($file, 0);
 }
 
 sub rcs_receive () {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e1cb68462..a6b0f0617 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -352,6 +352,8 @@ sub find_new_files ($) {
 	my @new;
 	my @internal_new;
 
+	my $times_noted;
+
 	foreach my $file (@$files) {
 		my $page=pagename($file);
 		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
@@ -363,7 +365,12 @@ sub find_new_files ($) {
 			if (isinternal($page)) {
 				push @internal_new, $file;
 			}
-			else {
+			elsif ($config{rcs}) {
+				if (! $times_noted) {
+					debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+					$times_noted=1;
+				}
+
 				push @new, $file;
 				if ($config{gettime} && -e "$config{srcdir}/$file") {
 					eval {
@@ -377,7 +384,7 @@ sub find_new_files ($) {
 					}
 					my $mtime;
 					eval {
-						my $mtime=rcs_getmtime("$config{srcdir}/$file");
+						$mtime=rcs_getmtime("$config{srcdir}/$file");
 					};
 					if ($@) {
 						print STDERR $@;
diff --git a/debian/changelog b/debian/changelog
index 615d5916f..60a67cbe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,8 +47,15 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * Rename --getctime to --gettime. (The old name still works for
     backwards compatability.)
   * --gettime now also looks up last modification time.
+  * Automatically run --gettime the first time ikiwiki is run on 
+    a given srcdir.
   * Add rcs_getmtime to plugin API; currently only implemented
     for git.
+  * Optimise --gettime for git, so it's appropriatly screamingly
+    fast. (This could be done for other backends too.)
+  * However, --gettime for git no longer follows renames.
+  * Use above to fix up timestamps on docwiki, as well as ensure that
+    timestamps on basewiki files shipped in the deb are sane.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/debian/control b/debian/control
index 87f7d8209..ae06f32b0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libtimedate-perl, libhtml-template-perl,
   libhtml-scrubber-perl, wdg-html-validator,
   libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34),
-  libfile-chdir-perl
+  libfile-chdir-perl,
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.8.4
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index cf7044b2c..0bf6fcf48 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1085,6 +1085,8 @@ it up in the history.
 
 It's ok if this is not implemented, and throws an error.
 
+If the RCS cannot determine a ctime for the file, return 0.
+
 #### `rcs_getmtime($)`
 
 This is used to get the page modification time for a file from the RCS, by
@@ -1092,6 +1094,8 @@ looking it up in the history.
 
 It's ok if this is not implemented, and throws an error.
 
+If the RCS cannot determine a mtime for the file, return 0.
+
 #### `rcs_receive()`
 
 This is called when ikiwiki is running as a pre-receive hook (or
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 553fef01e..2e12517ea 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -320,7 +320,7 @@ also be configured using a setup file.
   intercepted. If you enable this option then you must run at least the 
   CGI portion of ikiwiki over SSL.
 
-* --gettime
+* --gettime, --no-gettime
 
   Extract creation and modification times for each new page from the
   the revision control's log. This is done automatically when building a
diff --git a/docwiki.setup b/docwiki.setup
index 8278b73ea..6bc200066 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -1,6 +1,18 @@
 #!/usr/bin/perl
 # Configuration file for ikiwiki to build its documentation wiki.
 
+# Use git during the build, if it's available and if we're building
+# from a git checkout. This ensures ikiwiki gets the right mtimes and
+# ctimes for files in the doc wiki.
+our $rcs="norcs";
+BEGIN {
+	my $git=`which git 2>&1`;
+	chomp $git;
+	if (-x $git && -d ".git") {
+		$rcs="git";
+	}
+}
+
 use IkiWiki::Setup::Standard {
 	wikiname => "ikiwiki",
 	srcdir => "doc",
@@ -9,7 +21,7 @@ use IkiWiki::Setup::Standard {
 	underlaydirbase => "underlays",
 	underlaydir => "underlays/basewiki",
 	discussion => 0,
-	exclude => qr/\/discussion|bugs\/*|todo\/*|forum\/*/,
+	exclude => qr/\/discussion|bugs\/*|todo\/*|forum\/*/, # save space
 	locale => '',
 	verbose => 1,
 	syslog => 0,
@@ -17,4 +29,7 @@ use IkiWiki::Setup::Standard {
 	usedirs => 0,
 	prefix_directives => 1,
 	add_plugins => [qw{goodstuff version haiku polygen fortune table}],
+	disable_plugins => [qw{recentchanges}], # not appropriate for doc dir
+	rcs => $rcs,
+	gitorigin_branch => '', # don't pull during build
 }
diff --git a/ikiwiki.in b/ikiwiki.in
index 801ff9a0b..acd37f802 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -45,7 +45,7 @@ sub getconfig () {
 			"usedirs!" => \$config{usedirs},
 			"prefix-directives!" => \$config{prefix_directives},
 			"getctime" => \$config{gettime},
-			"gettime" => \$config{gettime},
+			"gettime!" => \$config{gettime},
 			"numbacklinks=i" => \$config{numbacklinks},
 			"rcs=s" => \$config{rcs},
 			"no-rcs" => sub { $config{rcs}="" },
-- 
cgit v1.2.3


From b13bb0c83c8f23bca97734882997fd3dc29f0553 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 18:43:51 -0400
Subject: implement rcs_getmtime for svn

This is a slow implementation; it runs svn log once per file
still, rather than running svn log once on the whole srcdir.

I did it this way because in my experience, svn log, run on a directory,
does not always list every change to files inside that directory.
I don't know why, and I use svn as little as possible these days.
---
 IkiWiki/Plugin/svn.pm | 42 +++++++++++++++++++++++++++++++-----------
 debian/changelog      |  2 +-
 doc/rcs.mdwn          |  2 +-
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 85c205f09..6e1d4a40f 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -350,9 +350,18 @@ sub rcs_diff ($) {
 	return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
 }
 
-sub rcs_getctime ($) {
+{
+
+my ($lastfile, $lastmtime, $lastctime);
+
+sub findtimes ($) {
 	my $file=shift;
 
+	if ($lastfile eq $file) {
+		return $lastmtime, $lastctime;
+	}
+	$lastfile=$file;
+
 	my $svn_log_infoline=qr/^r\d+\s+\|\s+[^\s]+\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
 		
 	my $child = open(SVNLOG, "-|");
@@ -360,28 +369,39 @@ sub rcs_getctime ($) {
 		exec("svn", "log", $file) || error("svn log $file failed to run");
 	}
 
-	my $date;
+	my ($cdate, $mdate);
 	while (<SVNLOG>) {
 		if (/$svn_log_infoline/) {
-			$date=$1;
+			$cdate=$1;
+			$mdate=$1 unless defined $mdate;
 	    	}
 	}
-	close SVNLOG || warn "svn log $file exited $?";
+	close SVNLOG || error "svn log $file exited $?";
 
-	if (! defined $date) {
-		warn "failed to parse svn log for $file\n";
-		return 0;
+	if (! defined $cdate) {
+		error "failed to parse svn log for $file\n";
 	}
 		
 	eval q{use Date::Parse};
 	error($@) if $@;
-	$date=str2time($date);
-	debug("found ctime ".localtime($date)." for $file");
-	return $date;
+	
+	$lastctime=str2time($cdate);
+	$lastmtime=str2time($mdate);
+	return $lastmtime, $lastctime;
+}
+
+}
+
+sub rcs_getctime ($) {
+	my $file=shift;
+
+	return (findtimes($file))[1];
 }
 
 sub rcs_getmtime ($) {
-	error "rcs_getmtime is not implemented for svn\n"; # TODO
+	my $file=shift;
+
+	return (findtimes($file))[0];
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index 60a67cbe3..774aedc40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,7 +50,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * Automatically run --gettime the first time ikiwiki is run on 
     a given srcdir.
   * Add rcs_getmtime to plugin API; currently only implemented
-    for git.
+    for git and svn.
   * Optimise --gettime for git, so it's appropriatly screamingly
     fast. (This could be done for other backends too.)
   * However, --gettime for git no longer follows renames.
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index b5bfc2414..450d16800 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -28,7 +28,7 @@ auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes
 `rcs_remove`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
 `rcs_diff`          |yes    |yes    |yes       |yes         |no           |yes      |yes       |yes
 `rcs_getctime`      |fast   |slow   |slow      |slow        |slow         |slow     |slow      |slow
-`rcs_getmtime`      |fast   |no     |no        |no          |no           |no       |no        |no
+`rcs_getmtime`      |fast   |slow   |no        |no          |no           |no       |no        |no
 anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
 conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
 """]]
-- 
cgit v1.2.3


From 64bc7d60a22ce33dca5434177cb0b410caca6102 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 18:46:28 -0400
Subject: update changelog

---
 debian/changelog | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 774aedc40..d65ffffd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,12 +48,14 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
     backwards compatability.)
   * --gettime now also looks up last modification time.
   * Automatically run --gettime the first time ikiwiki is run on 
-    a given srcdir.
+    a given srcdir. (Use --no-gettime to disable.)
   * Add rcs_getmtime to plugin API; currently only implemented
     for git and svn.
   * Optimise --gettime for git, so it's appropriatly screamingly
-    fast. (This could be done for other backends too.)
-  * However, --gettime for git no longer follows renames.
+    fast. (This could be done for most other backends too.)
+  * However, --gettime for git no longer follows renames. That would
+    be slow, and where a renamed wiki page is the same page is really
+    an iffy thing.
   * Use above to fix up timestamps on docwiki, as well as ensure that
     timestamps on basewiki files shipped in the deb are sane.
 
-- 
cgit v1.2.3


From 9265ce85b6905024a45e66b89bd6c9c910c0b07a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 19:23:11 -0400
Subject: squelch warning

---
 IkiWiki/Plugin/svn.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 6e1d4a40f..d10b4888d 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -357,7 +357,7 @@ my ($lastfile, $lastmtime, $lastctime);
 sub findtimes ($) {
 	my $file=shift;
 
-	if ($lastfile eq $file) {
+	if (defined $lastfile && $lastfile eq $file) {
 		return $lastmtime, $lastctime;
 	}
 	$lastfile=$file;
-- 
cgit v1.2.3


From e31b1b27f83f47da10b2775f192eb8eefcfc68a2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 19:25:25 -0400
Subject: remove note about needing --gettime; automatically run on first build
 now

---
 doc/tips/Importing_posts_from_Wordpress.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn
index 8774c9723..ecc6ae505 100644
--- a/doc/tips/Importing_posts_from_Wordpress.mdwn
+++ b/doc/tips/Importing_posts_from_Wordpress.mdwn
@@ -1,6 +1,6 @@
 Use case: You want to move away from Wordpress to Ikiwiki as your blogging/website platform, but you want to retain your old posts.
 
-[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's <tt>--gettime</tt> to get the preserve creation times on checkout. 
+[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file.
 
 WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned.
 
-- 
cgit v1.2.3


From c6c03768da90df0d7474edce09c2abf2a7e32052 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 19:42:18 -0400
Subject: add list of compatability breaking changes

---
 doc/roadmap.mdwn            | 14 ++++++++++++++
 doc/roadmap/discussion.mdwn |  1 +
 2 files changed, 15 insertions(+)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index a701a2685..0c7bf2fa8 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -69,6 +69,20 @@ backwards compatability.
 
 ----
 
+# compatability breaking changes
+
+Probably incomplete list:
+
+* Drop old `--getctime` option.
+* Remove compatability code in `loadindex` to handle old index data layouts.
+* Make pagespecs match relative by default? (see [[discussion]])
+* Flip wikilinks? (see [[todo/link_plugin_perhaps_too_general?]])
+* YADA format setup files per default?
+
+In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
+upgrade to deal with changes that break compatability. Some things that
+can't help with.
+
 # future goals
 
 * Conversion support for existing other wikis.
diff --git a/doc/roadmap/discussion.mdwn b/doc/roadmap/discussion.mdwn
index 0b69867bf..8233b1990 100644
--- a/doc/roadmap/discussion.mdwn
+++ b/doc/roadmap/discussion.mdwn
@@ -3,6 +3,7 @@ backwards compatibility problems. Should this be marked as a future plan, perhap
 major version number like 2.0? --Ethan
 
 Yes, I'm looking at making this kind of change at 2.0, added to the list.
+(Update: Didn't make it in 2.0 or 3.0...)
 However, I have doubts that it makes good sense to go relative by default.
 While it's not consitent with links, it seems to work better overall to
 have pagespecs be absolute by default, IMHO. --[[Joey]]
-- 
cgit v1.2.3


From c769a33392c4dedbabfb1fa1fda5c8bb30b84c78 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Apr 2010 12:20:50 -0400
Subject: autoindex: Switch to using %wikistate instead of abusing
 $pagestate{index}.

---
 IkiWiki/Plugin/autoindex.pm                          | 20 ++++++++++++++------
 debian/changelog                                     |  2 ++
 ...uto-create_tag_pages_according_to_a_template.mdwn |  3 +++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 555856b11..c71d73349 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -61,8 +61,16 @@ sub refresh () {
 	}
 	
 	my %deleted;
-        if (ref $pagestate{index}{autoindex}{deleted}) {
-	       %deleted=%{$pagestate{index}{autoindex}{deleted}};
+	if (ref $wikistate{autoindex}{deleted}) {
+		%deleted=%{$wikistate{autoindex}{deleted}};
+	}
+        elsif (ref $pagestate{index}{autoindex}{deleted}) {
+		# compatability code
+		%deleted=%{$pagestate{index}{autoindex}{deleted}};
+		delete $pagestate{index}{autoindex};
+	}
+
+	if (keys %deleted) {
 		foreach my $dir (keys %deleted) {
 			# remove deleted page state if the deleted page is re-added,
 			# or if all its subpages are deleted
@@ -71,7 +79,7 @@ sub refresh () {
 				delete $deleted{$dir};
 			}
 		}
-		$pagestate{index}{autoindex}{deleted}=\%deleted;
+		$wikistate{autoindex}{deleted}=\%deleted;
 	}
 
 	my @needed;
@@ -82,10 +90,10 @@ sub refresh () {
 				# This page must have just been deleted, so
 				# don't re-add it. And remember it was
 				# deleted.
-				if (! ref $pagestate{index}{autoindex}{deleted}) {
-					$pagestate{index}{autoindex}{deleted}={};
+				if (! ref $wikistate{autoindex}{deleted}) {
+					$wikistate{autoindex}{deleted}={};
 				}
-				${$pagestate{index}{autoindex}{deleted}}{$dir}=1;
+				${$wikistate{autoindex}{deleted}}{$dir}=1;
 			}
 			else {
 				push @needed, $dir;
diff --git a/debian/changelog b/debian/changelog
index d65ffffd7..4721c5309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
     an iffy thing.
   * Use above to fix up timestamps on docwiki, as well as ensure that
     timestamps on basewiki files shipped in the deb are sane.
+  * autoindex: Switch to using %wikistate instead of abusing
+    $pagestate{index}.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 8fc97578c..49da3c80c 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -239,6 +239,9 @@ wrong direction.
 >>>>>> Aha! Having looked at [[plugins/write]] again, it turns out that what this
 >>>>>> feature should really use is `%wikistate`, I think? :-) --[[smcv]]
 
+>>>>>>> Ah, indeed, that came after I wrote autoindex. I've fixed autoindex to
+>>>>>>> use it. --[[Joey]]
+
 >>>>> Ok, now I know what you mean. --[[David_Riebenbauer]]
 
 >>> * `autoindex` forgets that a page was deleted when that page is
-- 
cgit v1.2.3


From 7834989d863bb695c8fca90c89c53b7fc10600cd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Apr 2010 12:24:58 -0400
Subject: typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4721c5309..01d650290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,7 +54,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * Optimise --gettime for git, so it's appropriatly screamingly
     fast. (This could be done for most other backends too.)
   * However, --gettime for git no longer follows renames. That would
-    be slow, and where a renamed wiki page is the same page is really
+    be slow, and whether a renamed wiki page is the same page is really
     an iffy thing.
   * Use above to fix up timestamps on docwiki, as well as ensure that
     timestamps on basewiki files shipped in the deb are sane.
-- 
cgit v1.2.3


From 7fcc0faf8367c5ae64a3ff06d0d74baa063c4dfc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 12:45:20 -0400
Subject: few more suggestions

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 49da3c80c..def55f3ee 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -269,6 +269,15 @@ wrong direction.
 
 >> True. I'll do that. --[[David_Riebenbauer]]
 
+> Seems that `%autofiles` stores plugin names as keys, but never
+> really uses them. So it could just as easily be an array.
+> 
+> I'd be happy if the `%del_hash` global were not needed. 
+> Looks like it could be avoided by moving the checks
+> that `add_autofile` does into the autofile handling loop in
+> `Render`. (Also, that loop should probably be in its own
+> function anyway.) --[[Joey]] 
+
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
 [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
-- 
cgit v1.2.3


From 2269a4c74b24378d8e7e2229ca3374a197d08d9c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 12:54:22 -0400
Subject: whitespace

---
 IkiWiki.pm        | 24 ++++++++++++------------
 IkiWiki/Render.pm |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2f26a16ce..3812961dc 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -12,20 +12,20 @@ use Storable;
 use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
-	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
-	    %pagesources %destsources %depends %depends_simple %hooks
-	    %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
-	    %autofiles %del_hash};
+	%pagestate %wikistate %renderedfiles %oldrenderedfiles
+	%pagesources %destsources %depends %depends_simple %hooks
+	%forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
+	%autofiles %del_hash};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
-                 add_depends pagespec_match pagespec_match_list bestlink
-		 htmllink readfile writefile pagetype srcfile pagename
-		 displaytime will_render gettext ngettext urlto targetpage
-		 add_underlay pagetitle titlepage linkpage newpagefile
-		 inject add_link add_autofile
-                 %config %links %pagestate %wikistate %renderedfiles
-                 %pagesources %destsources %typedlinks);
+	add_depends pagespec_match pagespec_match_list bestlink
+	htmllink readfile writefile pagetype srcfile pagename
+	displaytime will_render gettext ngettext urlto targetpage
+	add_underlay pagetitle titlepage linkpage newpagefile
+	inject add_link add_autofile
+	%config %links %pagestate %wikistate %renderedfiles
+	%pagesources %destsources %typedlinks);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
@@ -1891,7 +1891,7 @@ sub define_gettext () {
 			return shift;
 		}
 	};
-  	*ngettext=sub {
+	*ngettext=sub {
 		$getobj->() if $getobj;
 		if ($gettext_obj) {
 			$gettext_obj->nget(@_);
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 796af6af2..c80030deb 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -43,7 +43,7 @@ sub backlinks ($) {
 	my @links;
 	foreach my $p (backlink_pages($page)) {
 		my $href=urlto($p, $page);
-                
+
 		# Trim common dir prefixes from both pages.
 		my $p_trimmed=$p;
 		my $page_trimmed=$page;
-- 
cgit v1.2.3


From b7d50abc0f3dbe99d2a3664c12ea95d24bfcf04b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:35:15 -0400
Subject: refactor autofiles

Made add_autofile take a generator function, and just register the
autofile, for later possible creation. The testing is moved into Render,
which allows cleaning up some stuff.
---
 IkiWiki.pm            | 35 ++++++++++------------------------
 IkiWiki/Plugin/tag.pm | 12 ++++++------
 IkiWiki/Render.pm     | 52 +++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 3812961dc..c22c75df8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -15,7 +15,7 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	%pagestate %wikistate %renderedfiles %oldrenderedfiles
 	%pagesources %destsources %depends %depends_simple %hooks
 	%forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
-	%autofiles %del_hash};
+	%autofiles};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
@@ -1956,6 +1956,15 @@ sub add_link ($$;$) {
 	}
 }
 
+sub add_autofile ($$$) {
+	my $file=shift;
+	my $plugin=shift;
+	my $generator=shift;
+	
+	$autofiles{$file}{plugin}=$plugin;
+	$autofiles{$file}{generator}=$generator;
+}
+
 sub sortspec_translate ($$) {
 	my $spec = shift;
 	my $reverse = shift;
@@ -2021,30 +2030,6 @@ sub sortspec_translate ($$) {
 	return eval 'sub { '.$code.' }';
 }
 
-sub add_autofile ($$) {
-	my $autofile=shift;
-	my $plugin=shift;
-
-	if (srcfile($autofile, 1)) {
-		return 0;
-	}
-
-	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
-
-	if ((!defined $file) ||
-	(exists $pagestate{$page}{$plugin}{autofile_deleted})) {
-		return 0;
-	}
-
-	if (exists $del_hash{$file}) {
-		$pagestate{$page}{$plugin}{autofile_deleted}=1;
-		return 0;
-	}
-
-	$autofiles{$file}=$plugin;
-	return 1;
-}
-
 sub pagespec_translate ($) {
 	my $spec=shift;
 
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 9e6f417bf..7a918a4e8 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -70,13 +70,13 @@ sub gentag ($) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
 
-		return if (! add_autofile($tagfile, "tag"));
+		add_autofile($tagfile, sub {
+			debug(sprintf(gettext("creating tag page %s"), $tag));
 
-		debug(sprintf(gettext("creating tag page %s"), $tag));
-
-		my $template=template("autotag.tmpl");
-		$template->param(tag => $tag);
-		writefile($tagfile, $config{srcdir}, $template->output);
+			my $template=template("autotag.tmpl");
+			$template->param(tag => $tag);
+			writefile($tagfile, $config{srcdir}, $template->output);
+		});
 	}
 }
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c80030deb..83242a197 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -680,6 +680,37 @@ sub render_backlinks ($) {
 	}
 }
 
+sub gen_autofile ($$$) {
+	my $autofile=shift;
+	my $pages=shift;
+	my $del=shift;
+	
+	if (srcfile($autofile, 1)) {
+		return 0;
+	}
+
+	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
+	
+	if ((!defined $file) ||
+	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
+		return 0;
+	}
+	
+	if ($pages->{$page}) {
+		return 0;
+	}
+
+	if (grep { $_ eq $file } @$del) {
+		$wikistate{$autofiles{$autofile}{generator}}{autofile_deleted}=1;
+		return 0;
+	}
+
+	$autofiles{$autofile}{generator}->();
+	$pages->{$page}=1;
+	return 1;
+}
+
+
 sub refresh () {
 	srcdir_check();
 	run_hooks(refresh => sub { shift->() });
@@ -689,26 +720,19 @@ sub refresh () {
 	my ($changed, $internal_changed)=find_changed($files);
 	run_hooks(needsbuild => sub { shift->($changed) });
 	my $oldlink_targets=calculate_old_links($changed, $del);
-	%del_hash = map { $_ => 1 } @{$del};
 
 	foreach my $file (@$changed) {
 		scan($file);
 	}
 
-	while (my $autofile = shift @{[keys %autofiles]}) {
-		my $plugin=$autofiles{$autofile};
-		my $page=pagename($autofile);
-		if ($pages->{$page}) {
-			debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+	foreach my $autofile (keys %autofiles) {
+		if (gen_autofile($autofile, $pages, $del)) {
+			push @{$files}, $autofile;
+			push @{$new}, $autofile if find_new_files([$autofile]);
+			push @{$changed}, $autofile if find_changed([$autofile]);
+			
+			scan($autofile);
 		}
-		$pages->{$page}=1;
-
-		push @{$files}, $autofile;
-		push @{$new}, $autofile if find_new_files([$autofile]);
-		push @{$changed}, $autofile if find_changed([$autofile]);
-
-		scan($autofile);
-		delete $autofiles{$autofile};
 	}
 
 	calculate_links();
-- 
cgit v1.2.3


From c721a9ef872db85b26d430a2098234a4fca6ec51 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:41:06 -0400
Subject: my autotag branch

---
 .../auto-create_tag_pages_according_to_a_template.mdwn     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index def55f3ee..867306f0d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -269,14 +269,12 @@ wrong direction.
 
 >> True. I'll do that. --[[David_Riebenbauer]]
 
-> Seems that `%autofiles` stores plugin names as keys, but never
-> really uses them. So it could just as easily be an array.
-> 
-> I'd be happy if the `%del_hash` global were not needed. 
-> Looks like it could be avoided by moving the checks
-> that `add_autofile` does into the autofile handling loop in
-> `Render`. (Also, that loop should probably be in its own
-> function anyway.) --[[Joey]] 
+>> I've pushed an autotag branch of my own, which refactors
+>> things a bit. It is untested so far though. --[[Joey]]
+>>
+>> * `verify_src_file` only called from Render.pm
+>> * Gets rid of `%del_files`.
+>> * Uses `%wikistate`.
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From 9fbef7e1d2c4e8bbaf3eaf89885f18b88edbe429 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:42:50 -0400
Subject: reformat

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 867306f0d..ed681ac4d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -269,12 +269,13 @@ wrong direction.
 
 >> True. I'll do that. --[[David_Riebenbauer]]
 
->> I've pushed an autotag branch of my own, which refactors
->> things a bit. It is untested so far though. --[[Joey]]
->>
->> * `verify_src_file` only called from Render.pm
->> * Gets rid of `%del_files`.
->> * Uses `%wikistate`.
+[[!template id=gitbranch branch=origin/autotag author="[[Joey]]"]]
+I've pushed an autotag branch of my own, which refactors
+things a bit. It is untested so far though. --[[Joey]]
+
+* `verify_src_file` only called from Render.pm
+* Gets rid of `%del_files`.
+* Uses `%wikistate`.
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From a1aa71efc9d1db42b425f43afc1ff4a37c4c0f3a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:49:20 -0400
Subject: document the gitbranch template

---
 doc/git.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 55967e543..0f280fb35 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -65,6 +65,10 @@ think about merging them. This is recommended. :-)
 
 ## branches
 
+In order to refer to a branch in one of the above git repositories, for
+example when submitting a [[patch]], you can use the
+[[templates/gitbranch]] template.
+
 Some of the branches included in the main repository include:
 
 * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
-- 
cgit v1.2.3


From 9ff5174f1164cb2d31ff487a9c84d08559b81d39 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 17 Apr 2010 18:45:23 +0200
Subject: Fix get_ctime implementation in Bazaar plugin, add get_mtime
 implementation.

---
 IkiWiki/Plugin/bzr.pm | 28 +++++++++++++++++++---------
 t/bazaar.t            |  5 ++++-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index f79ca7c8f..3712302ce 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -286,14 +286,8 @@ sub rcs_diff ($) {
 	}
 }
 
-sub rcs_getctime ($) {
-	my ($file) = @_;
-
-	# XXX filename passes through the shell here, should try to avoid
-	# that just in case
-	my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
-	open (my $out, "@cmdline |");
-
+sub extract_timestamp ($) {
+	my ($out) = @_;
 	my @log = bzr_log($out);
 
 	if (length @log < 1) {
@@ -307,8 +301,24 @@ sub rcs_getctime ($) {
 	return $ctime;
 }
 
+sub rcs_getctime ($) {
+	my ($file) = @_;
+
+	# XXX filename passes through the shell here, should try to avoid
+	# that just in case
+	my @cmdline = ("bzr", "log", "--forward", "--limit", '1', "$config{srcdir}/$file");
+	open (my $out, "@cmdline |");
+	return extract_timestamp($out);
+}
+
 sub rcs_getmtime ($) {
-	error "rcs_getmtime is not implemented for bzr\n"; # TODO
+	my ($file) = @_;
+
+	# XXX filename passes through the shell here, should try to avoid
+	# that just in case
+	my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
+	open (my $out, "@cmdline |");
+	return extract_timestamp($out);
 }
 
 1
diff --git a/t/bazaar.t b/t/bazaar.t
index 2ca44a65e..0bdd883d5 100755
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -12,7 +12,7 @@ BEGIN {
 		}
 	}
 }
-use Test::More tests => 16;
+use Test::More tests => 17;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -60,6 +60,9 @@ is($changes[1]{pages}[0]{"page"}, "test1");
 my $ctime = IkiWiki::rcs_getctime("test2.mdwn");
 ok($ctime >= time() - 20);
 
+my $mtime = IkiWiki::rcs_getmtime("test2.mdwn");
+ok($mtime >= time() - 20);
+
 writefile('test3.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test3.mdwn");
 IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");
-- 
cgit v1.2.3


From 2f9504a10d87f6950325dcea2d8a1f5a5d3eefe4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:55:32 -0400
Subject: bzr: changelog and refactor

---
 IkiWiki/Plugin/bzr.pm | 20 ++++++++------------
 debian/changelog      |  2 ++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 3712302ce..e7c1b8d8e 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -286,8 +286,10 @@ sub rcs_diff ($) {
 	}
 }
 
-sub extract_timestamp ($) {
-	my ($out) = @_;
+sub extract_timestamp (@) {
+	# XXX filename passes through the shell here, should try to avoid
+	# that just in case
+	open (my $out, "@_ |");
 	my @log = bzr_log($out);
 
 	if (length @log < 1) {
@@ -297,28 +299,22 @@ sub extract_timestamp ($) {
 	eval q{use Date::Parse};
 	error($@) if $@;
 	
-	my $ctime = str2time($log[0]->{"timestamp"});
-	return $ctime;
+	my $time = str2time($log[0]->{"timestamp"});
+	return $time;
 }
 
 sub rcs_getctime ($) {
 	my ($file) = @_;
 
-	# XXX filename passes through the shell here, should try to avoid
-	# that just in case
 	my @cmdline = ("bzr", "log", "--forward", "--limit", '1', "$config{srcdir}/$file");
-	open (my $out, "@cmdline |");
-	return extract_timestamp($out);
+	return extract_timestamp(@cmdline);
 }
 
 sub rcs_getmtime ($) {
 	my ($file) = @_;
 
-	# XXX filename passes through the shell here, should try to avoid
-	# that just in case
 	my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
-	open (my $out, "@cmdline |");
-	return extract_timestamp($out);
+	return extract_timestamp(@cmdline);
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index 01d650290..b7ec99463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
     timestamps on basewiki files shipped in the deb are sane.
   * autoindex: Switch to using %wikistate instead of abusing
     $pagestate{index}.
+  * bzr: Support rcs_getmtime, and fix rcs_getctime implementation
+    (Jelmer Vernooij)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From 6f485b8f459549521541af7bb087185dada112bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:57:59 -0400
Subject: note that tla plugin is not being maintained

---
 doc/rcs/tla.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/rcs/tla.mdwn b/doc/rcs/tla.mdwn
index cad5d51f4..79eecd627 100644
--- a/doc/rcs/tla.mdwn
+++ b/doc/rcs/tla.mdwn
@@ -2,6 +2,9 @@
 [GNU](http://www.gnu.org/) [Arch](http://www.gnuarch.org/) revision control
 system. Ikiwiki supports storing a wiki in tla.
 
+Warning: Since tla is not being maintained, neither is this plugin, and
+using ikiwiki with tla is not recommended.
+
 Ikiwiki can run as a [[post-commit]] hook to update a wiki whenever commits
 come in. When running as a [[cgi]] with tla, ikiwiki automatically
 commits edited pages to the Arch repostory, and uses the Arch
-- 
cgit v1.2.3


From cd8ec309d26cbc3f634328cb90e4c9d38b404632 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:58:31 -0400
Subject: bzr getmtime done

---
 doc/rcs.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index 450d16800..8b9929920 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -28,7 +28,7 @@ auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes
 `rcs_remove`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
 `rcs_diff`          |yes    |yes    |yes       |yes         |no           |yes      |yes       |yes
 `rcs_getctime`      |fast   |slow   |slow      |slow        |slow         |slow     |slow      |slow
-`rcs_getmtime`      |fast   |slow   |no        |no          |no           |no       |no        |no
+`rcs_getmtime`      |fast   |slow   |slow      |no          |no           |no       |no        |no
 anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
 conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
 """]]
-- 
cgit v1.2.3


From e289e0b4ba48d01e24586dbdcaeda367763edd67 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 14:00:25 -0400
Subject: recommend git

---
 doc/rcs.mdwn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index 8b9929920..248d93024 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -6,8 +6,7 @@ histories.
 Ikiwiki started out supporting only [[Subversion|svn]], but the interface
 ikiwiki uses to a revision control system is sufficiently simple and
 generic that it can be adapted to work with many systems by writing a
-[[plugin|plugins/write]]. [[Subversion|svn]] is still a recommended choice;
-[[git]] is another well-tested option. 
+[[plugin|plugins/write]]. These days, most people use [[git]].
 
 While all supported revision control systems work well enough for basic
 use, some advanced or special features are not supported in all of them.
-- 
cgit v1.2.3


From ca02c57ee47d4c05946c0c34eee32a0ad4ec6b01 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 14:07:12 -0400
Subject: document add_autofile

---
 doc/plugins/write.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 0bf6fcf48..e33c99421 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -966,6 +966,22 @@ added. Pass it the page that contains the link, and the link text.
 An optional third parameter sets the link type. If not specified,
 it is an ordinary [[ikiwiki/WikiLink]].
 
+### `add_autofile($$$)`
+
+Sometimes you may want to add a file to the `srcdir`. For example,
+[[plugins/tag]] pages can be automatically created as needed. This function
+can be used to do that. 
+
+The three parameters are the filename to add, the name of the plugin,
+and a callback function. The callback will be called if it is appropriate
+to automatically add the file, and should then take care of creating it,
+and doing anything else it needs to (such as checking it into revision
+control). Note that the callback may not always be called. For example,
+if an automatically added file is deleted by the user, ikiwiki will avoid
+re-adding it again.
+
+This function needs to be called during the scan hook, or earlier to work.
+
 ## Miscellaneous
 
 ### Internal use pages
-- 
cgit v1.2.3


From adc196a8b53c0b0b4f9ec4cbcea85ba37e421b59 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 15:40:39 -0400
Subject: tag_autocreate fixups

Fix style of prompt.
Optional to rebuild when it is changed. (Needed to get new all missing tags)
---
 IkiWiki/Plugin/tag.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 7a918a4e8..1145a9f13 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -37,9 +37,9 @@ sub getsetup () {
 		tag_autocreate => {
 			type => "boolean",
 			example => 0,
-			description => "Autocreate new tag pages",
+			description => "autocreate new tag pages?",
 			safe => 1,
-			rebuild => 1,
+			rebuild => undef,
 		},
 }
 
@@ -66,7 +66,7 @@ sub taglink ($$$;@) {
 
 sub gentag ($) {
 	my $tag=shift;
-	if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
+	if ($config{tag_autocreate}) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
 
-- 
cgit v1.2.3


From 3651e6263c55a0b6184fe46c856a96740621361f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 15:43:58 -0400
Subject: fix autofile call

---
 IkiWiki/Plugin/tag.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 1145a9f13..957b012ef 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -70,7 +70,7 @@ sub gentag ($) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
 
-		add_autofile($tagfile, sub {
+		add_autofile($tagfile, "tag", sub {
 			debug(sprintf(gettext("creating tag page %s"), $tag));
 
 			my $template=template("autotag.tmpl");
-- 
cgit v1.2.3


From b00d8771cc212349ca886401bc68facdf08e0d3c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 15:48:00 -0400
Subject: call gentag for taglinks too

---
 IkiWiki/Plugin/tag.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 957b012ef..9f6df5fc4 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -45,7 +45,7 @@ sub getsetup () {
 
 sub tagpage ($) {
 	my $tag=shift;
-			
+	
 	if ($tag !~ m{^\.?/} &&
 	    defined $config{tagbase}) {
 		$tag="/".$config{tagbase}."/".$tag;
@@ -96,7 +96,6 @@ sub preprocess_tag (@) {
 		# hidden WikiLink
 		add_link($page, tagpage($tag), 'tag');
 		
-		# add tagpage if necessary
 		gentag($tag);
 	}
 		
@@ -112,12 +111,14 @@ sub preprocess_taglink (@) {
 		if (/(.*)\|(.*)/) {
 			my $tag=linkpage($2);
 			add_link($params{page}, tagpage($tag), 'tag');
+			gentag($tag);
 			return taglink($params{page}, $params{destpage}, $tag,
 				linktext => pagetitle($1));
 		}
 		else {
 			my $tag=linkpage($_);
 			add_link($params{page}, tagpage($tag), 'tag');
+			gentag($tag);
 			return taglink($params{page}, $params{destpage}, $tag);
 		}
 	}
-- 
cgit v1.2.3


From 2fc342b048d23d8355631000b7285fb5d26b258a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 16:01:41 -0400
Subject: fix autotag behavior for relative tags

A tag like ./foo is searched for relative to the tagging page.
However, if multiple pages use such a tag, the only one sure
to be in common is in the root, so autocreate it there to
avoid scattering redunadant autocreated tags around the tree.

(This is probably not ideal.)

Also renamed the tagpage and taglink functions for clarity.
---
 IkiWiki/Plugin/tag.pm | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 9f6df5fc4..d2a3d4dfd 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -43,7 +43,7 @@ sub getsetup () {
 		},
 }
 
-sub tagpage ($) {
+sub taglink ($) {
 	my $tag=shift;
 	
 	if ($tag !~ m{^\.?/} &&
@@ -55,20 +55,28 @@ sub tagpage ($) {
 	return $tag;
 }
 
-sub taglink ($$$;@) {
+sub htmllink_tag ($$$;@) {
 	my $page=shift;
 	my $destpage=shift;
 	my $tag=shift;
 	my %opts=@_;
 
-	return htmllink($page, $destpage, tagpage($tag), %opts);
+	return htmllink($page, $destpage, taglink($tag), %opts);
 }
 
 sub gentag ($) {
 	my $tag=shift;
+
 	if ($config{tag_autocreate}) {
-		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
-		$tagfile=~s/^\///;
+		my $tagpage=taglink($tag);
+		if ($tagpage=~/^\.\/(.*)/) {
+			$tagpage=$1;
+		}
+		else {
+			$tagpage=~s/^\///;
+		}
+
+		my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
 		add_autofile($tagfile, "tag", sub {
 			debug(sprintf(gettext("creating tag page %s"), $tag));
@@ -94,7 +102,7 @@ sub preprocess_tag (@) {
 		$tag=linkpage($tag);
 		
 		# hidden WikiLink
-		add_link($page, tagpage($tag), 'tag');
+		add_link($page, taglink($tag), 'tag');
 		
 		gentag($tag);
 	}
@@ -110,16 +118,16 @@ sub preprocess_taglink (@) {
 	return join(" ", map {
 		if (/(.*)\|(.*)/) {
 			my $tag=linkpage($2);
-			add_link($params{page}, tagpage($tag), 'tag');
+			add_link($params{page}, taglink($tag), 'tag');
 			gentag($tag);
-			return taglink($params{page}, $params{destpage}, $tag,
+			return htmllink_tag($params{page}, $params{destpage}, $tag,
 				linktext => pagetitle($1));
 		}
 		else {
 			my $tag=linkpage($_);
-			add_link($params{page}, tagpage($tag), 'tag');
+			add_link($params{page}, taglink($tag), 'tag');
 			gentag($tag);
-			return taglink($params{page}, $params{destpage}, $tag);
+			return htmllink_tag($params{page}, $params{destpage}, $tag);
 		}
 	}
 	grep {
@@ -137,7 +145,7 @@ sub pagetemplate (@) {
 
 	$template->param(tags => [
 		map { 
-			link => taglink($page, $destpage, $_, rel => "tag")
+			link => htmllink_tag($page, $destpage, $_, rel => "tag")
 		}, sort keys %$tags
 	]) if defined $tags && %$tags && $template->query(name => "tags");
 
@@ -153,7 +161,7 @@ sub pagetemplate (@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
-	return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
+	return match_link($_[0], IkiWiki::Plugin::tag::taglink($_[1]), linktype => 'tag');
 }
 
 1
-- 
cgit v1.2.3


From f78e6798aa5482e534d7254b87a7b58e9fcc0145 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 16:08:37 -0400
Subject: move decode_utf8 closer to reason for it

Filenames need to be decoded, as File::Find does not provide them in
decoded form, but other callers of verify_src_file will be using utf8.
---
 IkiWiki/Render.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 83242a197..fff9dcce6 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -282,7 +282,7 @@ sub srcdir_check () {
 }
 
 sub verify_src_file ($$) {
-	my $file=decode_utf8(shift);
+	my $file=shift;
 	my $dir=shift;
 
 	return if -l $file || -d _;
@@ -310,7 +310,7 @@ sub find_src_files () {
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			my ($file, $page) = verify_src_file($_, $config{srcdir});
+			my ($file, $page) = verify_src_file(decode_utf8($_), $config{srcdir});
 			if (defined $file) {
 				push @files, $file;
 				if ($pages{$page}) {
@@ -324,7 +324,7 @@ sub find_src_files () {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				my ($file, $page) = verify_src_file($_, $dir);
+				my ($file, $page) = verify_src_file(decode_utf8($_), $dir);
 				if (defined $file) {
 					# avoid underlaydir override
 					# attacks; see security.mdwn
-- 
cgit v1.2.3


From 831b891abdc68d1b111381d6559cebd5a9b6c78f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 16:14:15 -0400
Subject: move File::Find control back into its code blocks

Ok, this is longer, but features less scary action at a distance.
---
 IkiWiki/Render.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fff9dcce6..41f179a50 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -291,7 +291,6 @@ sub verify_src_file ($$) {
 	my $page = pagename($file);
 	if (! exists $pagesources{$page} &&
 		file_pruned($file)) {
-		$File::Find::prune=1;
 		return;
 	}
 
@@ -318,6 +317,9 @@ sub find_src_files () {
 				}
 				$pages{$page}=1;
 			}
+			else {
+				$File::Find::prune=1;
+			}
 		},
 	}, $config{srcdir});
 	foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
@@ -336,6 +338,9 @@ sub find_src_files () {
 						}
 					}
 				}
+				else {
+					$File::Find::prune=1;
+				}
 			},
 		}, $dir);
 	};
-- 
cgit v1.2.3


From 59ceeb5621ae0ae2bcb7501c6ac0c7a06562a7cc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 17:15:07 -0400
Subject: improve docs

---
 doc/plugins/write.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index e33c99421..5190a26ed 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -968,9 +968,9 @@ it is an ordinary [[ikiwiki/WikiLink]].
 
 ### `add_autofile($$$)`
 
-Sometimes you may want to add a file to the `srcdir`. For example,
-[[plugins/tag]] pages can be automatically created as needed. This function
-can be used to do that. 
+Sometimes you may want to add a file to the `srcdir` as a result of content
+of other pages. For example, [[plugins/tag]] pages can be automatically
+created as needed. This function can be used to do that. 
 
 The three parameters are the filename to add, the name of the plugin,
 and a callback function. The callback will be called if it is appropriate
@@ -980,7 +980,8 @@ control). Note that the callback may not always be called. For example,
 if an automatically added file is deleted by the user, ikiwiki will avoid
 re-adding it again.
 
-This function needs to be called during the scan hook, or earlier to work.
+This function needs to be called during the scan hook, or earlier in the
+build process, in order to add the file early enough for it to be built.
 
 ## Miscellaneous
 
-- 
cgit v1.2.3


From a97964688b73d0a3237c798dce3fb064ff29ff11 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 19:05:40 -0400
Subject: unfinished file_prune revamp

Many calls to file_prune were incorrectly calling it with 2 parameters.
In cases where the filename being checked is relative to the srcdir,
that is not needed.

Made absolute filenames be pruned. (This won't work for the 2 parameter call
style.)
---
 IkiWiki.pm                   |  2 +-
 IkiWiki/Plugin/attachment.pm |  2 +-
 IkiWiki/Plugin/comments.pm   |  4 ++--
 IkiWiki/Plugin/editpage.pm   |  4 ++--
 IkiWiki/Plugin/rename.pm     |  5 ++---
 IkiWiki/Receive.pm           |  2 +-
 t/file_pruned.t              | 40 +++++++++++++++++++++++++++++++++++++---
 7 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b37b1f344..a5f83ac7a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -355,7 +355,7 @@ sub getsetup () {
 	},
 	wiki_file_prune_regexps => {
 		type => "internal",
-		default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
+		default => [qr/(^|\/)\.\.(\/|$)/, qr/^\//, qr/^\./, qr/\/\./,
 			qr/\.x?html?$/, qr/\.ikiwiki-new$/,
 			qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
 			qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index ad1dd9bca..8c3ff887a 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -137,7 +137,7 @@ sub formbuilder (@) {
 		$filename=linkpage(IkiWiki::possibly_foolish_untaint(
 				attachment_location($form->field('page')).
 				IkiWiki::basename($filename)));
-		if (IkiWiki::file_pruned($filename, $config{srcdir})) {
+		if (IkiWiki::file_pruned($filename)) {
 			error(gettext("bad attachment filename"));
 		}
 		
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 0aa043215..1c219b6c6 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -338,7 +338,7 @@ sub editcomment ($$) {
 	my $page = $form->field('page');
 	$page = IkiWiki::possibly_foolish_untaint($page);
 	if (! defined $page || ! length $page ||
-		IkiWiki::file_pruned($page, $config{srcdir})) {
+		IkiWiki::file_pruned($page)) {
 		error(gettext("bad page name"));
 	}
 
@@ -548,7 +548,7 @@ sub commentmoderation ($$) {
 				# pending comment before untainting.
 				my ($f)= $id =~ /$config{wiki_file_regexp}/;
 				if (! defined $f || ! length $f ||
-				    IkiWiki::file_pruned($f, $config{srcdir})) {
+				    IkiWiki::file_pruned($f)) {
 					error("illegal file");
 				}
 
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 44fe5514a..ee1de8eaa 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -94,7 +94,7 @@ sub cgi_editpage ($$) {
 	$page=possibly_foolish_untaint($page);
 	my $absolute=($page =~ s#^/+##);
 	if (! defined $page || ! length $page ||
-	    file_pruned($page, $config{srcdir})) {
+	    file_pruned($page)) {
 		error(gettext("bad page name"));
 	}
 
@@ -220,7 +220,7 @@ sub cgi_editpage ($$) {
 			my $best_loc;
 			if (! defined $from || ! length $from ||
 			    $from ne $form->field('from') ||
-			    file_pruned($from, $config{srcdir}) ||
+			    file_pruned($from) ||
 			    $from=~/^\// || 
 			    $absolute ||
 			    $form->submitted) {
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 1a9da6363..69e615ead 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -63,9 +63,8 @@ sub check_canrename ($$$$$$) {
 			error(gettext("no change to the file name was specified"));
 		}
 
-		# Must be a legal filename, and not absolute.
-		if (IkiWiki::file_pruned($destfile, $config{srcdir}) || 
-		    $destfile=~/^\//) {
+		# Must be a legal filename.
+		if (IkiWiki::file_pruned($destfile)) {
 			error(sprintf(gettext("illegal name")));
 		}
 
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index cd94d0938..ae1bd8bef 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -82,7 +82,7 @@ sub test () {
 		my ($file)=$change->{file}=~/$config{wiki_file_regexp}/;
 		$file=IkiWiki::possibly_foolish_untaint($file);
 		if (! defined $file || ! length $file ||
-		    IkiWiki::file_pruned($file, $config{srcdir})) {
+		    IkiWiki::file_pruned($file)) {
 			error(gettext("bad file name %s"), $file);
 		}
 
diff --git a/t/file_pruned.t b/t/file_pruned.t
index f9c1c257e..4335ed917 100755
--- a/t/file_pruned.t
+++ b/t/file_pruned.t
@@ -1,41 +1,75 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 27;
+use Test::More tests => 54;
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 
 ok(IkiWiki::file_pruned("src/.htaccess", "src"));
+ok(IkiWiki::file_pruned(".htaccess"));
 ok(IkiWiki::file_pruned("src/.ikiwiki/", "src"));
+ok(IkiWiki::file_pruned(".ikiwiki/"));
 ok(IkiWiki::file_pruned("src/.ikiwiki/index", "src"));
+ok(IkiWiki::file_pruned(".ikiwiki/index"));
 ok(IkiWiki::file_pruned("src/CVS/foo", "src"));
+ok(IkiWiki::file_pruned("CVS/foo"));
 ok(IkiWiki::file_pruned("src/subdir/CVS/foo", "src"));
+ok(IkiWiki::file_pruned("subdir/CVS/foo"));
 ok(IkiWiki::file_pruned("src/.svn", "src"));
+ok(IkiWiki::file_pruned(".svn"));
 ok(IkiWiki::file_pruned("src/subdir/.svn", "src"));
+ok(IkiWiki::file_pruned("subdir/.svn"));
 ok(IkiWiki::file_pruned("src/subdir/.svn/foo", "src"));
+ok(IkiWiki::file_pruned("subdir/.svn/foo"));
 ok(IkiWiki::file_pruned("src/.git", "src"));
+ok(IkiWiki::file_pruned(".git"));
 ok(IkiWiki::file_pruned("src/subdir/.git", "src"));
+ok(IkiWiki::file_pruned("subdir/.git"));
 ok(IkiWiki::file_pruned("src/subdir/.git/foo", "src"));
+ok(IkiWiki::file_pruned("subdir/.git/foo"));
 ok(! IkiWiki::file_pruned("src/svn/fo", "src"));
+ok(! IkiWiki::file_pruned("svn/fo"));
 ok(! IkiWiki::file_pruned("src/git", "src"));
+ok(! IkiWiki::file_pruned("git"));
 ok(! IkiWiki::file_pruned("src/index.mdwn", "src"));
+ok(! IkiWiki::file_pruned("index.mdwn"));
 ok(! IkiWiki::file_pruned("src/index.", "src"));
+ok(! IkiWiki::file_pruned("index."));
 
 # these are ok because while the filename starts with ".", the canonpathed
 # version does not
 ok(! IkiWiki::file_pruned("src/.", "src"));
 ok(! IkiWiki::file_pruned("src/./", "src"));
+# OTOH, without a srcdir, no canonpath, so they're not allowed.
+ok(IkiWiki::file_pruned("."));
+ok(IkiWiki::file_pruned("./"));
+
+# Without a srcdir, absolute filenames are not allowed.
+ok(IkiWiki::file_pruned("/etc/passwd"));
+ok(IkiWiki::file_pruned("//etc/passwd"));
+ok(IkiWiki::file_pruned("/"));
+ok(IkiWiki::file_pruned("//"));
+ok(IkiWiki::file_pruned("///"));
+
 
 ok(IkiWiki::file_pruned("src/..", "src"));
+ok(IkiWiki::file_pruned(".."));
 ok(IkiWiki::file_pruned("src/../", "src"));
+ok(IkiWiki::file_pruned("../"));
 ok(IkiWiki::file_pruned("src/../", "src"));
+ok(IkiWiki::file_pruned("../"));
 
+# This is perhaps counterintuitive.
 ok(! IkiWiki::file_pruned("src", "src"));
+
+# Dots, etc, in the srcdir are ok.
 ok(! IkiWiki::file_pruned("/.foo/src", "/.foo/src"));
 ok(IkiWiki::file_pruned("/.foo/src/.foo/src", "/.foo/src"));
 ok(! IkiWiki::file_pruned("/.foo/src/index.mdwn", "/.foo/src/index.mdwn"));
 
-ok(IkiWiki::file_pruned("x/y/foo.dpkg-tmp", "src"));
-ok(IkiWiki::file_pruned("x/y/foo.ikiwiki-new", "src"));
+ok(IkiWiki::file_pruned("src/y/foo.dpkg-tmp", "src"));
+ok(IkiWiki::file_pruned("y/foo.dpkg-tmp"));
+ok(IkiWiki::file_pruned("src/y/foo.ikiwiki-new", "src"));
+ok(IkiWiki::file_pruned("y/foo.ikiwiki-new"));
-- 
cgit v1.2.3


From 56bf9c04a290cfce6270f974c1d48be8a5d54942 Mon Sep 17 00:00:00 2001
From: PeteG <PeteG@web>
Date: Sun, 18 Apr 2010 12:33:51 +0000
Subject:

---
 doc/peteg.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/peteg.mdwn

diff --git a/doc/peteg.mdwn b/doc/peteg.mdwn
new file mode 100644
index 000000000..90593c16f
--- /dev/null
+++ b/doc/peteg.mdwn
@@ -0,0 +1,7 @@
+I'm adding some plugins to Ikiwiki to support a bioacoustic wiki. See here:
+
+<http://bioacoustics.cse.unsw.edu.au/wiki/>
+
+Personal home page:
+
+http://peteg.org/
-- 
cgit v1.2.3


From 472694b8b420be128c1d9d0ba8393ea6efff8716 Mon Sep 17 00:00:00 2001
From: PeteG <PeteG@web>
Date: Sun, 18 Apr 2010 12:34:20 +0000
Subject:

---
 doc/peteg.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/peteg.mdwn b/doc/peteg.mdwn
index 90593c16f..4e2face0e 100644
--- a/doc/peteg.mdwn
+++ b/doc/peteg.mdwn
@@ -4,4 +4,4 @@ I'm adding some plugins to Ikiwiki to support a bioacoustic wiki. See here:
 
 Personal home page:
 
-http://peteg.org/
+<http://peteg.org/>
-- 
cgit v1.2.3


From 63e6c00890a11144f8d035f7052a6229227fce52 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 19 Apr 2010 02:23:12 +0000
Subject: response to the further thoughts

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 26 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index ee3bbd88d..1861d860c 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -56,17 +56,25 @@ and the tags would appear at the bottom of the post, the Rubrica next to the tit
 
 Aside from the name of the plugin (and thus of the main directive), which could be `tag`, `meta`, `field` or whatever (maybe extending `meta` would be the most sensible choice), the features we want are
 
-  1. allow multiple values per type/attribute/field/whatever (fields currently only allows one)
-  2. allow both hidden and visible references (à la tag vs taglink)
-  3. allow each type/attribute/field to be exposed under multiple queries (e.g. tags and categories; this is mostly important for backwards compatibility, not sure if it might have other uses too)
-  4. allow arbitrary types/attributes/fields/whatever (even 'undefined' ones)
+1. allow multiple values per type/attribute/field/whatever (fields currently only allows one)
+   * Agreed about multiple values; I've been considering whether I should add that to `field`. -- K.A.
+2. allow both hidden and visible references (a la tag vs taglink)
+   * Hidden and visible references; that's fair enough too.  My approach with `ymlfront` and `getfield` is that the YAML code is hidden, and the display is done with `getfield`, but there's no reason not to use additional approaches. -- K.A.
+3. allow each type/attribute/field to be exposed under multiple queries (e.g. tags and categories; this is mostly important for backwards compatibility, not sure if it might have other uses too)
+   * I'm not sure what you mean here. -- K.A.
+4. allow arbitrary types/attributes/fields/whatever (even 'undefined' ones)
+   * Are you saying that these must be typed, or are you saying that they can be user-defined? -- K.A.
 
 Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would thus have the following parameters:
 
-  * `directive` : the name of the directive that can be used to set the value as a hidden reference; we can discuss whether, for pre- or user-defined types, it being undef means no directive or a default directive matching the attribute name would be defined.
-  * `linkdirective` : the name of the directive that can be used for a visible reference; no such directive would be defined by default
-  * `linktype` : link type for (hidden and visible) references
-  * `linkbase` : akin to the tagbase parameter
-  * `queries` : list of template queries this type/attribute/field/whatever is exposed to
+* `directive` : the name of the directive that can be used to set the value as a hidden reference; we can discuss whether, for pre- or user-defined types, it being undef means no directive or a default directive matching the attribute name would be defined.
+  * I still want there to be able to be enough flexibility in the concept to enable plugins such as `yamlfront`, which sets the data using YAML format, rather than using directives. -- K.A.
+* `linkdirective` : the name of the directive that can be used for a visible reference; no such directive would be defined by default
+* `linktype` : link type for (hidden and visible) references
+  * Is this the equivalent to "field name"? -- K.A.
+* `linkbase` : akin to the tagbase parameter
+  * Is this a field-name -> directory mapping? -- K.A.
+* `queries` : list of template queries this type/attribute/field/whatever is exposed to
+  * I'm not sure what you mean here. -- K.A.
 
 Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From 99cdd38dd54047d0e79dbf65d58ba11ee38f2c92 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Mon, 19 Apr 2010 08:36:38 +0000
Subject: Respond

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 1861d860c..ae35e8dfe 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -62,19 +62,25 @@ Aside from the name of the plugin (and thus of the main directive), which could
    * Hidden and visible references; that's fair enough too.  My approach with `ymlfront` and `getfield` is that the YAML code is hidden, and the display is done with `getfield`, but there's no reason not to use additional approaches. -- K.A.
 3. allow each type/attribute/field to be exposed under multiple queries (e.g. tags and categories; this is mostly important for backwards compatibility, not sure if it might have other uses too)
    * I'm not sure what you mean here. -- K.A.
+     * Typical example is tags: they are accessible both as `tags` and as `categories`, although the way they are presented changes a little -- G.B.
 4. allow arbitrary types/attributes/fields/whatever (even 'undefined' ones)
    * Are you saying that these must be typed, or are you saying that they can be user-defined? -- K.A.
+     * I am saying that the user should be able to define (e.g. in the config) some set of types/fields/attributes/whatever, following the specification illustrated below, but also be able to use something like `\[[!meta somefield="somevalue"]]` where `somefield` was never defined before. In this case `somefield` will have some default values for the properties described in the spec below. -- G.B.
 
 Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would thus have the following parameters:
 
 * `directive` : the name of the directive that can be used to set the value as a hidden reference; we can discuss whether, for pre- or user-defined types, it being undef means no directive or a default directive matching the attribute name would be defined.
   * I still want there to be able to be enough flexibility in the concept to enable plugins such as `yamlfront`, which sets the data using YAML format, rather than using directives. -- K.A.
+     * The possibility to use a directive does not preclude other ways of defining the field values. IOW, even if the directive `somefield` is defined, the user would still be able to use the syntax `\[[!meta somefield="somevalue"]]`, or any other syntax (such as YAML). -- G.B.
 * `linkdirective` : the name of the directive that can be used for a visible reference; no such directive would be defined by default
 * `linktype` : link type for (hidden and visible) references
   * Is this the equivalent to "field name"? -- K.A.
+     * This would be such by default, but it could be set to something different. [[Typed links|matching_different_kinds_of_links]] is a very recent ikiwiki feature. -- G.B.
 * `linkbase` : akin to the tagbase parameter
   * Is this a field-name -> directory mapping? -- K.A.
+     * yes, with each directory having one page per value. It might not make sense for all fields, of course -- G.B.
 * `queries` : list of template queries this type/attribute/field/whatever is exposed to
   * I'm not sure what you mean here. -- K.A.
+     * as mentioned before, some fields may be made accessible through different template queries, in different form. This is the case already for tags, that also come up in the `categories` query (used by Atom and RSS feeds). -- G.B.
 
-Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
+Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries, or also see what is done with the fields in the current `meta` plugin). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From 1b7c455f4a4214bc9df766be4ec2b12adcf679e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 Apr 2010 16:03:53 -0400
Subject: thinking about changing how templatedir works and allowing
 wikitemplate files into the srcdir

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 doc/todo/auto_rebuild_on_template_change.mdwn

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
new file mode 100644
index 000000000..c4ffae178
--- /dev/null
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -0,0 +1,33 @@
+If `page.tmpl` is changed, it would be nice if ikiwiki automatically
+noticed, and rebuilt all pages. If `inlinepage.tmpl` is changed, a rebuild
+of all pages using it in an inline would be stellar.
+
+This would allow setting:
+
+	templatedir => "$srcdir/templates",
+
+.. and then the [[wikitemplates]] are managed like other wiki files; and
+like other wiki files, a change to them automatically updates dependent
+pages.
+
+Originally, it made good sense not to have the templatedir inside the wiki.
+Those templates can be used to bypass the htmlscrubber, and you don't want
+just anyone to edit them. But the same can be said of `style.css` and
+`ikiwiki.js`, which *are* in the wiki. We rely on `allowed_attachments`
+being set to secure those to prevent users uploading replacements. And we
+assume that users who can directly (non-anon) commit *can* edit them, and
+that's ok.
+
+So, perhaps the easiest way to solve this [[wishlist]] would be to
+make templatedir *default* to "$srcdir/templates/, and make ikiwiki
+register dependencies on `page.tmpl`, `inlinepage.tmpl`, etc, as they're
+used. Although, having every page declare an explicit dep on `page.tmpl`
+is perhaps a bit much; might be better to implement a special case for that
+one. Also, having the templates be copied to `destdir` is not desirable.
+
+The risk is that a site might have `allowed_attachments` set to "templates/*"
+or "*.tmpl" something like that. I think such a configuration is the *only*
+risk, and it's unlikely enough that a NEWS warning should suffice.
+
+(This would also help to clear up the tricky disctinction between
+wikitemplates and in-wiki templates.)
-- 
cgit v1.2.3


From e1ebdda72bb14c70c9d35c29f5a6afe197623282 Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Mon, 19 Apr 2010 16:12:09 -0700
Subject: Remove www prefix from Svend's website URLs

---
 doc/ikiwikiusers.mdwn | 2 +-
 doc/users/svend.mdwn  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4a3e41e83..cb4213405 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -120,7 +120,7 @@ Personal sites and blogs
 * [[Adam_Trickett|ajt]]'s home intranet/sanbox system ([Internet site & blog](http://www.iredale.net/) -- not ikiwiki yet)
 * [[Simon_McVittie|smcv]]'s [website](http://www.pseudorandom.co.uk/) and
   [blog](http://smcv.pseudorandom.co.uk/)
-* Svend's [website](http://www.ciffer.net/~svend/) and [blog](http://www.ciffer.net/~svend/blog/)
+* Svend's [website](http://ciffer.net/~svend/) and [blog](http://ciffer.net/~svend/blog/)
 * [muammar's site](http://muammar.me)
 * [Per Bothner's blog](http://per.bothner.com/blog/)
 * [Bernd Zeimetz (bzed)](http://bzed.de/)
diff --git a/doc/users/svend.mdwn b/doc/users/svend.mdwn
index 69d83584f..712a0d3e7 100644
--- a/doc/users/svend.mdwn
+++ b/doc/users/svend.mdwn
@@ -1,4 +1,4 @@
 [[!meta title="Svend Sorensen"]]
 
-* [website](http://www.ciffer.net/~svend/)
-* [blog](http://www.ciffer.net/~svend/blog/)
+* [website](http://ciffer.net/~svend/)
+* [blog](http://ciffer.net/~svend/blog/)
-- 
cgit v1.2.3


From 2111bf0408620a307c8c0373489ef34ca6626fd2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 Apr 2010 22:14:22 -0400
Subject: move message into if block

---
 IkiWiki/Render.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index a6b0f0617..1114e05c8 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -366,13 +366,13 @@ sub find_new_files ($) {
 				push @internal_new, $file;
 			}
 			elsif ($config{rcs}) {
-				if (! $times_noted) {
-					debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
-					$times_noted=1;
-				}
-
 				push @new, $file;
 				if ($config{gettime} && -e "$config{srcdir}/$file") {
+					if (! $times_noted) {
+						debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+						$times_noted=1;
+					}
+
 					eval {
 						my $ctime=rcs_getctime("$config{srcdir}/$file");
 						if ($ctime > 0) {
-- 
cgit v1.2.3


From 09c647c1773d5c8eafacea486082684909e47449 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 20 Apr 2010 02:31:00 +0000
Subject: response

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index c4ffae178..2799842ed 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -31,3 +31,5 @@ risk, and it's unlikely enough that a NEWS warning should suffice.
 
 (This would also help to clear up the tricky disctinction between
 wikitemplates and in-wiki templates.)
+
+> But would this require that templates be parseable as wiki pages?  Because that would be a nuisance. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 9f00692a798888b9cc9edb30a961c6418efba39b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 Apr 2010 22:37:55 -0400
Subject: response

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 2799842ed..cde19700c 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -25,11 +25,15 @@ used. Although, having every page declare an explicit dep on `page.tmpl`
 is perhaps a bit much; might be better to implement a special case for that
 one. Also, having the templates be copied to `destdir` is not desirable.
 
-The risk is that a site might have `allowed_attachments` set to "templates/*"
-or "*.tmpl" something like that. I think such a configuration is the *only*
-risk, and it's unlikely enough that a NEWS warning should suffice.
+The risk is that a site might have `allowed_attachments` set to
+`templates/*` or `*.tmpl` something like that. I think such a configuration
+is the *only* risk, and it's unlikely enough that a NEWS warning should
+suffice.
 
 (This would also help to clear up the tricky disctinction between
 wikitemplates and in-wiki templates.)
 
 > But would this require that templates be parseable as wiki pages?  Because that would be a nuisance. --[[KathrynAndersen]]
+
+>> It would be better for them not to be rendered separately at all.
+>> --[[Joey]]  
-- 
cgit v1.2.3


From 16afa9e8446771fabe45ab45d8a36d09034d0319 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 20 Apr 2010 02:41:13 +0000
Subject: further clarification

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index ae35e8dfe..190070816 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -79,8 +79,10 @@ Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would t
 * `linkbase` : akin to the tagbase parameter
   * Is this a field-name -> directory mapping? -- K.A.
      * yes, with each directory having one page per value. It might not make sense for all fields, of course -- G.B.
+       * (nods) I've been working on something similar with my unreleased `tagger` module. In that, by default, the field-name maps to the closest wiki-page of the same name.  Thus, if one had the field "genre=poetry" on the page fiction/stories/mary/lamb, then that would map to fiction/genre/poetry if fiction/genre existed. --K.A.
 * `queries` : list of template queries this type/attribute/field/whatever is exposed to
   * I'm not sure what you mean here. -- K.A.
      * as mentioned before, some fields may be made accessible through different template queries, in different form. This is the case already for tags, that also come up in the `categories` query (used by Atom and RSS feeds). -- G.B.
+       * Ah, do you mean that the input value is the same, but the output format is different?  Like the difference between TMPL_VAR NAME="FOO" and TMPL_VAR NAME="raw_FOO"; one is htmlized, and the other is not. -- K.A.
 
 Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries, or also see what is done with the fields in the current `meta` plugin). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From fda191cbbbfa76114a27a53bfc5b90289f26f72b Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 20 Apr 2010 02:43:44 +0000
Subject: formatting

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 190070816..74e5bc812 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -79,10 +79,10 @@ Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would t
 * `linkbase` : akin to the tagbase parameter
   * Is this a field-name -> directory mapping? -- K.A.
      * yes, with each directory having one page per value. It might not make sense for all fields, of course -- G.B.
-       * (nods) I've been working on something similar with my unreleased `tagger` module. In that, by default, the field-name maps to the closest wiki-page of the same name.  Thus, if one had the field "genre=poetry" on the page fiction/stories/mary/lamb, then that would map to fiction/genre/poetry if fiction/genre existed. --K.A.
+         * (nods) I've been working on something similar with my unreleased `tagger` module. In that, by default, the field-name maps to the closest wiki-page of the same name.  Thus, if one had the field "genre=poetry" on the page fiction/stories/mary/lamb, then that would map to fiction/genre/poetry if fiction/genre existed. --K.A.
 * `queries` : list of template queries this type/attribute/field/whatever is exposed to
   * I'm not sure what you mean here. -- K.A.
      * as mentioned before, some fields may be made accessible through different template queries, in different form. This is the case already for tags, that also come up in the `categories` query (used by Atom and RSS feeds). -- G.B.
-       * Ah, do you mean that the input value is the same, but the output format is different?  Like the difference between TMPL_VAR NAME="FOO" and TMPL_VAR NAME="raw_FOO"; one is htmlized, and the other is not. -- K.A.
+         * Ah, do you mean that the input value is the same, but the output format is different?  Like the difference between TMPL_VAR NAME="FOO" and TMPL_VAR NAME="raw_FOO"; one is htmlized, and the other is not. -- K.A.
 
 Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries, or also see what is done with the fields in the current `meta` plugin). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From 529929e732e1c6604d31b68e81898780de06e640 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 20 Apr 2010 02:45:14 +0000
Subject: non comprend

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index cde19700c..6a1013f8d 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -37,3 +37,5 @@ wikitemplates and in-wiki templates.)
 
 >> It would be better for them not to be rendered separately at all.
 >> --[[Joey]]  
+
+>>> I don't follow you. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From de6167a3b03389c0ec8223e7ee101707b6c73953 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 Apr 2010 23:45:42 -0400
Subject: change wording

This is more accurate when a file that is not a page is what is removed.
---
 IkiWiki/Render.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 1114e05c8..172b08b1e 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -431,7 +431,7 @@ sub remove_del (@) {
 	foreach my $file (@_) {
 		my $page=pagename($file);
 		if (! isinternal($page)) {
-			debug(sprintf(gettext("removing old page %s"), $page));
+			debug(sprintf(gettext("removing obsolete %s"), $page));
 		}
 	
 		foreach my $old (@{$oldrenderedfiles{$page}}) {
-- 
cgit v1.2.3


From 563428ebd2a75cfabccf1974da0c1cbbe07eb369 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 Apr 2010 23:52:16 -0400
Subject: response

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 6a1013f8d..2558d5f3e 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -24,6 +24,7 @@ register dependencies on `page.tmpl`, `inlinepage.tmpl`, etc, as they're
 used. Although, having every page declare an explicit dep on `page.tmpl`
 is perhaps a bit much; might be better to implement a special case for that
 one. Also, having the templates be copied to `destdir` is not desirable.
+(However, if they're not copied, wikilinks to them will be broken. Hmm.)
 
 The risk is that a site might have `allowed_attachments` set to
 `templates/*` or `*.tmpl` something like that. I think such a configuration
@@ -39,3 +40,8 @@ wikitemplates and in-wiki templates.)
 >> --[[Joey]]  
 
 >>> I don't follow you. --[[KathrynAndersen]]
+
+>>>> If they don't render to output files, they clearly don't
+>>>> need to be treated as wiki pages. (They need to be treated
+>>>> as raw files anyway, because you don't want random users editing them 
+>>>> in the online editor.) --[[Joey]] 
-- 
cgit v1.2.3


From 1239fa55d5d5b9ca81dbde0874f4ff8d1980429d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 00:07:41 -0400
Subject: no need to return content from postscan hook

---
 IkiWiki/Plugin/search.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c0e8703d8..a1e7026ca 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -70,7 +70,7 @@ sub index (@) {
 
 	# A unique pageterm is used to identify the document for a page.
 	my $pageterm=pageterm($params{page});
-	return $params{content} unless defined $pageterm;
+	return unless defined $pageterm;
 	
 	my $db=xapiandb();
 	my $doc=Search::Xapian::Document->new();
-- 
cgit v1.2.3


From 11718519348382892d5c6fdb21b8e721c2413eb0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 01:32:19 -0400
Subject: similarity to internal pages

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 2558d5f3e..2e4ba8e9a 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -24,7 +24,8 @@ register dependencies on `page.tmpl`, `inlinepage.tmpl`, etc, as they're
 used. Although, having every page declare an explicit dep on `page.tmpl`
 is perhaps a bit much; might be better to implement a special case for that
 one. Also, having the templates be copied to `destdir` is not desirable.
-(However, if they're not copied, wikilinks to them will be broken. Hmm.)
+In a sense, these template would be like internal pages, except not wiki
+pages, but raw files.
 
 The risk is that a site might have `allowed_attachments` set to
 `templates/*` or `*.tmpl` something like that. I think such a configuration
-- 
cgit v1.2.3


From d1a1f3ad21e9e58d1232fc3d997028a463ccad4a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 01:54:42 -0400
Subject: fix minor bug if a page's name is "0"

---
 IkiWiki/Render.pm | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 172b08b1e..bbf8f915e 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -634,34 +634,35 @@ sub render_dependent ($$$$$$$) {
 							if ($type == $IkiWiki::DEPEND_LINKS) {
 								next unless $linkchangers->{lc($page)};
 							}
-							return $page;
+							$reason=$page;
+							return 1;
 						}
 					}
 					return undef;
 				};
 
 				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_CONTENT) {
-					last if $reason =
-						$in->(\@changed, $IkiWiki::DEPEND_CONTENT);
-					last if $internal_dep && ($reason =
+					last if $in->(\@changed, $IkiWiki::DEPEND_CONTENT);
+					last if $internal_dep && (
 						$in->($internal_new, $IkiWiki::DEPEND_CONTENT) ||
 						$in->($internal_del, $IkiWiki::DEPEND_CONTENT) ||
-						$in->($internal_changed, $IkiWiki::DEPEND_CONTENT));
+						$in->($internal_changed, $IkiWiki::DEPEND_CONTENT)
+					);
 				}
 				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_PRESENCE) {
-					last if $reason = 
-						$in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
-					last if $internal_dep && ($reason =
+					last if $in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
+					last if $internal_dep && (
 						$in->($internal_new, $IkiWiki::DEPEND_PRESENCE) ||
-						$in->($internal_del, $IkiWiki::DEPEND_PRESENCE));
+						$in->($internal_del, $IkiWiki::DEPEND_PRESENCE)
+					);
 				}
 				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_LINKS) {
-					last if $reason =
-						$in->(\@changed, $IkiWiki::DEPEND_LINKS);
-					last if $internal_dep && ($reason =
+					last if $in->(\@changed, $IkiWiki::DEPEND_LINKS);
+					last if $internal_dep && (
 						$in->($internal_new, $IkiWiki::DEPEND_LINKS) ||
 						$in->($internal_del, $IkiWiki::DEPEND_LINKS) ||
-						$in->($internal_changed, $IkiWiki::DEPEND_LINKS));
+						$in->($internal_changed, $IkiWiki::DEPEND_LINKS)
+					);
 				}
 			}
 		}
-- 
cgit v1.2.3


From 52ccc03d10c532b3cf6335b00a9b60057061596b Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Tue, 20 Apr 2010 15:40:10 +0100
Subject: clarify whether the raw files would be put in destdir

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 2e4ba8e9a..09a623427 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -46,3 +46,6 @@ wikitemplates and in-wiki templates.)
 >>>> need to be treated as wiki pages. (They need to be treated
 >>>> as raw files anyway, because you don't want random users editing them 
 >>>> in the online editor.) --[[Joey]] 
+
+>>>>> Just to be clear, the raw files would not be copied across to the output
+>>>>> directory? -- [[Jon]]
-- 
cgit v1.2.3


From 3b8f4f59d6720e5a77cae30eacc4c46582b1603b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 20 Apr 2010 15:01:39 +0000
Subject: internal pages: the revenge?

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 09a623427..b5c107915 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -49,3 +49,9 @@ wikitemplates and in-wiki templates.)
 
 >>>>> Just to be clear, the raw files would not be copied across to the output
 >>>>> directory? -- [[Jon]]
+
+>>>>>> Without modifying ikiwiki, they'd be copied to the output directory as
+>>>>>> (e.g.) http://ikiwiki.info/templates/inlinepage.tmpl; to not copy them,
+>>>>>> it'd either be necessary to make them be internal pages
+>>>>>> (templates/inlinepage._tmpl) or special-case them in some other way.
+>>>>>> --[[smcv]]
-- 
cgit v1.2.3


From 7a92c0aa4aea1bffc9090d982c4b55af9e0b0c02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 13:49:46 -0400
Subject: clarify why absolute is tested & stripped here

file_prune also fails on absolute filenames now
---
 IkiWiki/Plugin/editpage.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index ee1de8eaa..dff777138 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -92,7 +92,7 @@ sub cgi_editpage ($$) {
 	# wiki_file_regexp.
 	my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/;
 	$page=possibly_foolish_untaint($page);
-	my $absolute=($page =~ s#^/+##);
+	my $absolute=($page =~ s#^/+##); # absolute name used for force location
 	if (! defined $page || ! length $page ||
 	    file_pruned($page)) {
 		error(gettext("bad page name"));
-- 
cgit v1.2.3


From 5d3f7877299942cbec4fde6054761635d90a089a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 13:54:24 -0400
Subject: use one parameter form of file_pruned here too

In File::Find, $_ is relative to the current directory, so that is ok.
Also, the directory name doesn't need to be stripped from $_.
---
 IkiWiki/Plugin/comments.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 1c219b6c6..32e4d0937 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -645,7 +645,7 @@ sub comments_pending () {
 		no_chdir => 1,
 		wanted => sub {
 			$_=decode_utf8($_);
-			if (IkiWiki::file_pruned($_, $dir)) {
+			if (IkiWiki::file_pruned($_)) {
 				$File::Find::prune=1;
 			}
 			elsif (! -l $_ && ! -d _) {
@@ -653,7 +653,6 @@ sub comments_pending () {
 				my ($f)=/$config{wiki_file_regexp}/; # untaint
 				if (defined $f && $f =~ /\Q._comment\E$/) {
 					my $ctime=(stat($f))[10];
-					$f=~s/^\Q$dir\E\/?//;
                                         push @ret, [$f, $ctime];
 				}
 			}
-- 
cgit v1.2.3


From 230a8b22a471c018c8ec48cd07427c42238a4970 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 13:59:17 -0400
Subject: remove explicit absolute test

file_pruned now tests for that
---
 IkiWiki/Plugin/editpage.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index dff777138..2130a8402 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -221,7 +221,6 @@ sub cgi_editpage ($$) {
 			if (! defined $from || ! length $from ||
 			    $from ne $form->field('from') ||
 			    file_pruned($from) ||
-			    $from=~/^\// || 
 			    $absolute ||
 			    $form->submitted) {
 				@page_locs=$best_loc=$page;
-- 
cgit v1.2.3


From 6d063a6698ad72476d9243956b0f13ec33a09dbd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 14:06:00 -0400
Subject: switch to 1 parameter version of file_pruned

Another bit of code that didn't realize that File::Find sets $_ to the
relative filename.
---
 IkiWiki/Plugin/autoindex.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index c71d73349..1d0612e84 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -40,14 +40,12 @@ sub refresh () {
 			no_chdir => 1,
 			wanted => sub {
 				$_=decode_utf8($_);
-				if (IkiWiki::file_pruned($_, $dir)) {
+				if (IkiWiki::file_pruned($_)) {
 					$File::Find::prune=1;
 				}
 				elsif (! -l $_) {
 					my ($f)=/$config{wiki_file_regexp}/; # untaint
 					return unless defined $f;
-					$f=~s/^\Q$dir\E\/?//;
-					return unless length $f;
 					return if $f =~ /\._([^.]+)$/; # skip internal page
 					if (! -d _) {
 						$pages{pagename($f)}=1;
-- 
cgit v1.2.3


From cff3937b681a6c2505eb52b43b2e3e7086f99c45 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 14:08:29 -0400
Subject: remove 2 argument form of file_pruned

---
 IkiWiki.pm      |  9 +--------
 t/file_pruned.t | 39 ++-------------------------------------
 2 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a5f83ac7a..6d3b6c606 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1843,15 +1843,8 @@ sub deptype (@) {
 }
 
 my $file_prune_regexp;
-sub file_pruned ($;$) {
+sub file_pruned ($) {
 	my $file=shift;
-	if (@_) {
-		require File::Spec;
-		$file=File::Spec->canonpath($file);
-		my $base=File::Spec->canonpath(shift);
-		return if $file eq $base;
-		$file =~ s#^\Q$base\E/+##;
-	}
 
 	if (defined $config{include} && length $config{include}) {
 		return 0 if $file =~ m/$config{include}/;
diff --git a/t/file_pruned.t b/t/file_pruned.t
index 4335ed917..34f366610 100755
--- a/t/file_pruned.t
+++ b/t/file_pruned.t
@@ -1,52 +1,31 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 54;
+use Test::More tests => 27;
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 
-ok(IkiWiki::file_pruned("src/.htaccess", "src"));
 ok(IkiWiki::file_pruned(".htaccess"));
-ok(IkiWiki::file_pruned("src/.ikiwiki/", "src"));
 ok(IkiWiki::file_pruned(".ikiwiki/"));
-ok(IkiWiki::file_pruned("src/.ikiwiki/index", "src"));
 ok(IkiWiki::file_pruned(".ikiwiki/index"));
-ok(IkiWiki::file_pruned("src/CVS/foo", "src"));
 ok(IkiWiki::file_pruned("CVS/foo"));
-ok(IkiWiki::file_pruned("src/subdir/CVS/foo", "src"));
 ok(IkiWiki::file_pruned("subdir/CVS/foo"));
-ok(IkiWiki::file_pruned("src/.svn", "src"));
 ok(IkiWiki::file_pruned(".svn"));
-ok(IkiWiki::file_pruned("src/subdir/.svn", "src"));
 ok(IkiWiki::file_pruned("subdir/.svn"));
-ok(IkiWiki::file_pruned("src/subdir/.svn/foo", "src"));
 ok(IkiWiki::file_pruned("subdir/.svn/foo"));
-ok(IkiWiki::file_pruned("src/.git", "src"));
 ok(IkiWiki::file_pruned(".git"));
-ok(IkiWiki::file_pruned("src/subdir/.git", "src"));
 ok(IkiWiki::file_pruned("subdir/.git"));
-ok(IkiWiki::file_pruned("src/subdir/.git/foo", "src"));
 ok(IkiWiki::file_pruned("subdir/.git/foo"));
-ok(! IkiWiki::file_pruned("src/svn/fo", "src"));
 ok(! IkiWiki::file_pruned("svn/fo"));
-ok(! IkiWiki::file_pruned("src/git", "src"));
 ok(! IkiWiki::file_pruned("git"));
-ok(! IkiWiki::file_pruned("src/index.mdwn", "src"));
 ok(! IkiWiki::file_pruned("index.mdwn"));
-ok(! IkiWiki::file_pruned("src/index.", "src"));
 ok(! IkiWiki::file_pruned("index."));
-
-# these are ok because while the filename starts with ".", the canonpathed
-# version does not
-ok(! IkiWiki::file_pruned("src/.", "src"));
-ok(! IkiWiki::file_pruned("src/./", "src"));
-# OTOH, without a srcdir, no canonpath, so they're not allowed.
 ok(IkiWiki::file_pruned("."));
 ok(IkiWiki::file_pruned("./"));
 
-# Without a srcdir, absolute filenames are not allowed.
+# absolute filenames are not allowed.
 ok(IkiWiki::file_pruned("/etc/passwd"));
 ok(IkiWiki::file_pruned("//etc/passwd"));
 ok(IkiWiki::file_pruned("/"));
@@ -54,22 +33,8 @@ ok(IkiWiki::file_pruned("//"));
 ok(IkiWiki::file_pruned("///"));
 
 
-ok(IkiWiki::file_pruned("src/..", "src"));
 ok(IkiWiki::file_pruned(".."));
-ok(IkiWiki::file_pruned("src/../", "src"));
-ok(IkiWiki::file_pruned("../"));
-ok(IkiWiki::file_pruned("src/../", "src"));
 ok(IkiWiki::file_pruned("../"));
 
-# This is perhaps counterintuitive.
-ok(! IkiWiki::file_pruned("src", "src"));
-
-# Dots, etc, in the srcdir are ok.
-ok(! IkiWiki::file_pruned("/.foo/src", "/.foo/src"));
-ok(IkiWiki::file_pruned("/.foo/src/.foo/src", "/.foo/src"));
-ok(! IkiWiki::file_pruned("/.foo/src/index.mdwn", "/.foo/src/index.mdwn"));
-
-ok(IkiWiki::file_pruned("src/y/foo.dpkg-tmp", "src"));
 ok(IkiWiki::file_pruned("y/foo.dpkg-tmp"));
-ok(IkiWiki::file_pruned("src/y/foo.ikiwiki-new", "src"));
 ok(IkiWiki::file_pruned("y/foo.ikiwiki-new"));
-- 
cgit v1.2.3


From 1f56dead00ee1188d9ed9650b9b2483b69c4d525 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 14:13:46 -0400
Subject: oops, fix for no_chdir mode

$_ will be absolute then
---
 IkiWiki/Plugin/autoindex.pm | 6 ++++--
 IkiWiki/Plugin/comments.pm  | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 1d0612e84..23a17d4e9 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -39,12 +39,14 @@ sub refresh () {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				$_=decode_utf8($_);
+				my $file=decode_utf8($_);
+				$file=~s/^\Q$dir\E\/?//;
+				return unless length $file;
 				if (IkiWiki::file_pruned($_)) {
 					$File::Find::prune=1;
 				}
 				elsif (! -l $_) {
-					my ($f)=/$config{wiki_file_regexp}/; # untaint
+					my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 					return unless defined $f;
 					return if $f =~ /\._([^.]+)$/; # skip internal page
 					if (! -d _) {
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 32e4d0937..03ca19c98 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -644,13 +644,14 @@ sub comments_pending () {
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			$_=decode_utf8($_);
+			my $file=decode_utf8($_);
+			$file=~s/^\Q$dir\E\/?//;
+			return unless length $file;
 			if (IkiWiki::file_pruned($_)) {
 				$File::Find::prune=1;
 			}
 			elsif (! -l $_ && ! -d _) {
-				$File::Find::prune=0;
-				my ($f)=/$config{wiki_file_regexp}/; # untaint
+				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 				if (defined $f && $f =~ /\Q._comment\E$/) {
 					my $ctime=(stat($f))[10];
                                         push @ret, [$f, $ctime];
-- 
cgit v1.2.3


From 59bb1f1db37d8b8170e5dd8e5a857df7742bffb9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 14:23:48 -0400
Subject: fix stat to use unmunged filename

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 03ca19c98..ccc9e1068 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -653,7 +653,7 @@ sub comments_pending () {
 			elsif (! -l $_ && ! -d _) {
 				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 				if (defined $f && $f =~ /\Q._comment\E$/) {
-					my $ctime=(stat($f))[10];
+					my $ctime=(stat($_))[10];
                                         push @ret, [$f, $ctime];
 				}
 			}
-- 
cgit v1.2.3


From 81eae1a531ab6e538985a8531b39ef3c5f865bdc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 14:25:17 -0400
Subject: typo

---
 IkiWiki/Plugin/editpage.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 2130a8402..26e38abc1 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -92,7 +92,7 @@ sub cgi_editpage ($$) {
 	# wiki_file_regexp.
 	my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/;
 	$page=possibly_foolish_untaint($page);
-	my $absolute=($page =~ s#^/+##); # absolute name used for force location
+	my $absolute=($page =~ s#^/+##); # absolute name used to force location
 	if (! defined $page || ! length $page ||
 	    file_pruned($page)) {
 		error(gettext("bad page name"));
-- 
cgit v1.2.3


From 4b4fdc85abba7200eed78eb473341e44fecc6087 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Tue, 20 Apr 2010 20:18:29 +0000
Subject: Clarifications

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 74e5bc812..a8ee6755c 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -80,9 +80,14 @@ Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would t
   * Is this a field-name -> directory mapping? -- K.A.
      * yes, with each directory having one page per value. It might not make sense for all fields, of course -- G.B.
          * (nods) I've been working on something similar with my unreleased `tagger` module. In that, by default, the field-name maps to the closest wiki-page of the same name.  Thus, if one had the field "genre=poetry" on the page fiction/stories/mary/lamb, then that would map to fiction/genre/poetry if fiction/genre existed. --K.A.
+             * that's the idea. In your case you could have the linkbase of genre be fiction/genre, and it would be created if it was missing. -- G.B.
 * `queries` : list of template queries this type/attribute/field/whatever is exposed to
   * I'm not sure what you mean here. -- K.A.
      * as mentioned before, some fields may be made accessible through different template queries, in different form. This is the case already for tags, that also come up in the `categories` query (used by Atom and RSS feeds). -- G.B.
          * Ah, do you mean that the input value is the same, but the output format is different?  Like the difference between TMPL_VAR NAME="FOO" and TMPL_VAR NAME="raw_FOO"; one is htmlized, and the other is not. -- K.A.
+              * Actually this is about the same information appearing in different queries (e.g. NAME="FOO" and NAME="BAR"). Example: say that I defined a "Rubrica" field. I would want both tags and categories to appear in `categories` template query, but only tags would appear in the `tags` query, and only Rubrica values to appear in `rubrica` queries. The issue of different output formats was presented in the next paragraph instead. -- G.B.
 
 Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries, or also see what is done with the fields in the current `meta` plugin). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
+
+One possibility could be to have the `queries` configuration allow a hash mapping query names to functions that would transform the data. Lacking that possibility, we might have to leave some predefined fields to have custom Perl-side treatment and leave custom fields to be untransformable.
+
-- 
cgit v1.2.3


From 93cf1db7b9655a64aec6ab17b7192e5e7429f12e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 17:21:50 -0400
Subject: fix uninitialized value warning

$cgi->params('do') may not be defined. The CSRF code may delete all
cgi params. This uninitalized value was introduced when do=register
support was added recently.
---
 IkiWiki/Plugin/passwordauth.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 4848b47bb..baddca093 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -105,11 +105,13 @@ sub formbuilder_setup (@) {
 	my $session=$params{session};
 	my $cgi=$params{cgi};
 
-	if ($form->title eq "signin" || $form->title eq "register" || $cgi->param("do") eq "register") {
+	my $do_register=defined $cgi->param("do") && $cgi->param("do") eq "register";
+
+	if ($form->title eq "signin" || $form->title eq "register" || $do_register) {
 		$form->field(name => "name", required => 0);
 		$form->field(name => "password", type => "password", required => 0);
 		
-		if ($form->submitted eq "Register" || $form->submitted eq "Create Account" || $cgi->param("do") eq "register") {
+		if ($form->submitted eq "Register" || $form->submitted eq "Create Account" || $do_register) {
 			$form->field(name => "confirm_password", type => "password");
 			$form->field(name => "account_creation_password", type => "password")
 				 if (defined $config{account_creation_password} &&
@@ -247,8 +249,10 @@ sub formbuilder (@) {
 	my $cgi=$params{cgi};
 	my $buttons=$params{buttons};
 
+	my $do_register=defined $cgi->param("do") && $cgi->param("do") eq "register";
+
 	if ($form->title eq "signin" || $form->title eq "register") {
-		if (($form->submitted && $form->validate) || $cgi->param("do") eq "register") {
+		if (($form->submitted && $form->validate) || $do_register) {
 			if ($form->submitted eq 'Login') {
 				$session->param("name", $form->field("name"));
 				IkiWiki::cgi_postsignin($cgi, $session);
@@ -311,7 +315,7 @@ sub formbuilder (@) {
 				$form->field(name => "name", required => 0);
 				push @$buttons, "Reset Password";
 			}
-			elsif ($form->submitted eq "Register" || $cgi->param("do") eq "register") {
+			elsif ($form->submitted eq "Register" || $do_register) {
 				@$buttons="Create Account";
 			}
 		}
-- 
cgit v1.2.3


From bfca8345ea7d49df6a4f6521f1db416d28671f35 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 17:42:36 -0400
Subject: bugfix

Avoid file_pruned triggering on absolute paths causing the whole
comments_pending directory being pruned.

Simplify code.
---
 IkiWiki/Plugin/comments.pm | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ccc9e1068..58bd4b851 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -646,16 +646,12 @@ sub comments_pending () {
 		wanted => sub {
 			my $file=decode_utf8($_);
 			$file=~s/^\Q$dir\E\/?//;
-			return unless length $file;
-			if (IkiWiki::file_pruned($_)) {
-				$File::Find::prune=1;
-			}
-			elsif (! -l $_ && ! -d _) {
-				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-				if (defined $f && $f =~ /\Q._comment\E$/) {
-					my $ctime=(stat($_))[10];
-                                        push @ret, [$f, $ctime];
-				}
+			return if ! length $file || IkiWiki::file_pruned($file)
+				|| -l $_ || -d _ || $file !~ /\Q._comment\E$/;
+			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+			if (defined $f) {
+				my $ctime=(stat($_))[10];
+				push @ret, [$f, $ctime];
 			}
 		}
 	}, $dir);
-- 
cgit v1.2.3


From d578f3ff78190f816c74f6935e1e0024b25dc090 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 17:49:00 -0400
Subject: darcs: ensure whole darcs query manifest output is consumed

By a stroke of luck, after a long & full day, I happened to
remember that in the morning, I had seen someone on irc mention
that darcs query manifest doesn't like it if its full output
is not consumed.

So contrary to the usual case where bug reports sent via irc are like
messages written in sand before the new tide, this one was seen and
fixed.

(But use http://ikiwiki.info/bugs/ next time!)
---
 IkiWiki/Plugin/darcs.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index c1d6661d3..f17fadcb1 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -63,7 +63,7 @@ sub file_in_vc ($$) {
 	}
 	my $found=0;
 	while (<DARCS_MANIFEST>) {
-		$found = 1, last if /^(\.\/)?$file$/;
+		$found = 1 if /^(\.\/)?$file$/;
 	}
 	close(DARCS_MANIFEST) or error("'darcs query manifest' exited " . $?);
 
-- 
cgit v1.2.3


From 511f7f9cb94ebdd8ea33973a0ca74d2f8249aa3f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 18:16:40 -0400
Subject: bugfix

So this is the one place that does need to canonpath and compare,
as two argument file_pruned used to.
---
 IkiWiki/Plugin/autoindex.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 23a17d4e9..0dd76259e 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -36,13 +36,17 @@ sub refresh () {
 
 	my (%pages, %dirs);
 	foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {
+		require File::Spec;
+		$dir=File::Spec->canonpath($dir);
+
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				my $file=decode_utf8($_);
+				my $file=File::Spec->canonpath(decode_utf8($_));
+				return if $file eq $dir;
 				$file=~s/^\Q$dir\E\/?//;
 				return unless length $file;
-				if (IkiWiki::file_pruned($_)) {
+				if (IkiWiki::file_pruned($file)) {
 					$File::Find::prune=1;
 				}
 				elsif (! -l $_) {
-- 
cgit v1.2.3


From 5d2df9651fee83cf17acde48ba12442104311492 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Wed, 21 Apr 2010 08:17:03 +0000
Subject: Missing links with no CGI

---
 doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn

diff --git a/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn b/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
new file mode 100644
index 000000000..d9f3d518f
--- /dev/null
+++ b/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
@@ -0,0 +1,5 @@
+When the CGI URL is not defined, links to missing pages appear as plain, unstyled text. I think the 'createlink' span should always wrap this text, even when the actual question mark linking to the CGI for the create action is missing. This ensures consistent styling regardless of whether the CGI is available or not (and is thus useful for example when the same wiki has clones with the CGI link and clones without).
+
+A proposed patch is available [on my ikiwiki clone](http://git.oblomov.eu/ikiwiki/patch/290d1b498f00f63e6d41218ddb76d87e68ed5081)
+
+[[!tag patch cgi]]
-- 
cgit v1.2.3


From 0fa25a361cbb49711938599d6cf06201ce0cc79a Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Wed, 21 Apr 2010 00:16:32 +0200
Subject: Always give createlink class to links to nonexistent pages

With this change, the <span> with class createlink is always created
around the link text, even when no CGI URL is defined. This allows
styling of these 'links' in this case too. The same class is used as when
CGI URL is defined so that e.g. clones of the same ikiwiki, one with CGI
and one without, display in the same way (modulo the missing question mark
link).
(cherry picked from commit 290d1b498f00f63e6d41218ddb76d87e68ed5081)
---
 IkiWiki.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6d3b6c606..ba2c09c36 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1086,14 +1086,16 @@ sub htmllink ($$$;@) {
 		$bestlink=htmlpage($bestlink);
 
 		if (! $destsources{$bestlink}) {
-			return $linktext unless length $config{cgiurl};
-			return "<span class=\"createlink\"><a href=\"".
+			my $cgilink = "";
+			if (length $config{cgiurl}) {
+				$cgilink = "<a href=\"".
 				cgiurl(
 					do => "create",
 					page => lc($link),
 					from => $lpage
-				).
-				"\" rel=\"nofollow\">?</a>$linktext</span>"
+				)."\" rel=\"nofollow\">?</a>";
+			}
+			return "<span class=\"createlink\">$cgilink$linktext</span>"
 		}
 	}
 	
-- 
cgit v1.2.3


From d6810097ce7e51989573db4052a636647d7bbbd7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 12:50:34 -0400
Subject: layout

---
 IkiWiki.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ba2c09c36..4084d4997 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1089,11 +1089,11 @@ sub htmllink ($$$;@) {
 			my $cgilink = "";
 			if (length $config{cgiurl}) {
 				$cgilink = "<a href=\"".
-				cgiurl(
-					do => "create",
-					page => lc($link),
-					from => $lpage
-				)."\" rel=\"nofollow\">?</a>";
+					cgiurl(
+						do => "create",
+						page => lc($link),
+						from => $lpage
+					)."\" rel=\"nofollow\">?</a>";
 			}
 			return "<span class=\"createlink\">$cgilink$linktext</span>"
 		}
-- 
cgit v1.2.3


From 5c855b2bcab82e4075d49713d53869857a4e9385 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 12:50:43 -0400
Subject: applied

---
 doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn b/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
index d9f3d518f..73213209a 100644
--- a/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
+++ b/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
@@ -2,4 +2,4 @@ When the CGI URL is not defined, links to missing pages appear as plain, unstyle
 
 A proposed patch is available [on my ikiwiki clone](http://git.oblomov.eu/ikiwiki/patch/290d1b498f00f63e6d41218ddb76d87e68ed5081)
 
-[[!tag patch cgi]]
+[[!tag patch cgi done]]
-- 
cgit v1.2.3


From 9c8761ba49b06a76a923eb91735f842f419d2916 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 14:27:12 -0400
Subject: add_autofile filename should be relative to srcdir

---
 doc/plugins/write.mdwn | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 5190a26ed..404c3b44f 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -972,13 +972,13 @@ Sometimes you may want to add a file to the `srcdir` as a result of content
 of other pages. For example, [[plugins/tag]] pages can be automatically
 created as needed. This function can be used to do that. 
 
-The three parameters are the filename to add, the name of the plugin,
-and a callback function. The callback will be called if it is appropriate
-to automatically add the file, and should then take care of creating it,
-and doing anything else it needs to (such as checking it into revision
-control). Note that the callback may not always be called. For example,
-if an automatically added file is deleted by the user, ikiwiki will avoid
-re-adding it again.
+The three parameters are the filename to create (relative to the `srcdir`),
+the name of the plugin, and a callback function. The callback will be
+called if it is appropriate to automatically add the file, and should then
+take care of creating it, and doing anything else it needs to (such as
+checking it into revision control). Note that the callback may not always
+be called. For example, if an automatically added file is deleted by the
+user, ikiwiki will avoid re-adding it again.
 
 This function needs to be called during the scan hook, or earlier in the
 build process, in order to add the file early enough for it to be built.
-- 
cgit v1.2.3


From 034b4e826627dddf47ff27278897804e39741e57 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:05:59 -0400
Subject: remove verify_src_file

Splitting out this function bothered me. It is conceptially similar to
file_pruned, and yet also very specific to exactly the security needs of
find_src_files.

I liked that it got rid of duplicate code in the latter function. So
instead, put a helper sub in that, which I think allows refactoring
things more cleanly, and with less boilerplate.

As to the needs of gen_autofile, I'm not convinced this needs to handle
the same set of problems that verify_src_file did. So I sat down and
wrote a custom validator for autofiles, which turned out to seem to just
need three things: Make sure the candidate filename is not something
that would be pruned; untaint the candidate filename; and make sure that
srcdir doesn't already have something with its name. (Plus, of course,
all the other checks that were already in gen_autofile.)

(In passing, also fixed a bunch of bugs I had introduced in this branch.)
---
 IkiWiki/Render.pm | 115 ++++++++++++++++++++++++++----------------------------
 1 file changed, 55 insertions(+), 60 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 03b2910fd..14f6f9d5f 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -281,68 +281,59 @@ sub srcdir_check () {
 	
 }
 
-sub verify_src_file ($$) {
-	my $file=shift;
-	my $dir=shift;
-
-	return if -l $file || -d _;
-	$file=~s/^\Q$dir\E\/?//;
-	return if ! length $file;
-	my $page = pagename($file);
-	if (! exists $pagesources{$page} &&
-		file_pruned($file)) {
-		return;
-	}
-
-	my ($file_untainted) = $file =~ /$config{wiki_file_regexp}/; # untaint
-	if (! defined $file_untainted) {
-		warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-	}
-	return ($file_untainted, $page);
-}
-
 sub find_src_files () {
 	my @files;
 	my %pages;
 	eval q{use File::Find};
 	error($@) if $@;
-	find({
-		no_chdir => 1,
-		wanted => sub {
-			my ($file, $page) = verify_src_file(decode_utf8($_), $config{srcdir});
-			if (defined $file) {
-				push @files, $file;
-				if ($pages{$page}) {
-					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+
+	my ($page, $dir, $underlay);
+	my $helper=sub {
+		my $file=decode_utf8($_);
+
+		return if -l $file || -d _;
+		$file=~s/^\Q$dir\E\/?//;
+		return if ! length $file;
+		$page = pagename($file);
+		if (! exists $pagesources{$page} &&
+		    file_pruned($file)) {
+			$File::Find::prune=1;
+			return;
+		}
+
+		my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+		if (! defined $f) {
+			warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+		}
+	
+		if ($underlay) {
+			# avoid underlaydir override attacks; see security.mdwn
+			if (! -l "$config{srcdir}/$f" && ! -e _) {
+				if (! $pages{$page}) {
+					push @files, $f;
+					$pages{$page}=1;
 				}
-				$pages{$page}=1;
 			}
-			else {
-				$File::Find::prune=1;
+		}
+		else {
+			push @files, $f;
+			if ($pages{$page}) {
+				debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 			}
-		},
-	}, $config{srcdir});
-	foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
+			$pages{$page}=1;
+		}
+	};
+
+	find({
+		no_chdir => 1,
+		wanted => $helper,
+	}, $dir=$config{srcdir});
+	$underlay=1;
+	foreach (@{$config{underlaydirs}}, $config{underlaydir}) {
 		find({
 			no_chdir => 1,
-			wanted => sub {
-				my ($file, $page) = verify_src_file(decode_utf8($_), $dir);
-				if (defined $file) {
-					# avoid underlaydir override
-					# attacks; see security.mdwn
-					if (! -l "$config{srcdir}/$file" &&
-					    ! -e _) {
-						if (! $pages{$page}) {
-							push @files, $file;
-							$pages{$page}=1;
-						}
-					}
-				}
-				else {
-					$File::Find::prune=1;
-				}
-			},
-		}, $dir);
+			wanted => $helper,
+		}, $dir=$_);
 	};
 	return \@files, \%pages;
 }
@@ -691,24 +682,28 @@ sub gen_autofile ($$$) {
 	my $pages=shift;
 	my $del=shift;
 	
-	if (srcfile($autofile, 1)) {
-		return 0;
+	if (srcfile($autofile, 1) || file_pruned($autofile)) {
+		return;
 	}
-
-	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
 	
+	my $file="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
+	if (! defined $file || -l $file || -d _ || -e _) {
+		return;
+	}
+
 	if ((!defined $file) ||
 	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
-		return 0;
+		return;
 	}
 	
+	my $page = pagename($file);
 	if ($pages->{$page}) {
-		return 0;
+		return;
 	}
 
 	if (grep { $_ eq $file } @$del) {
-		$wikistate{$autofiles{$autofile}{generator}}{autofile_deleted}=1;
-		return 0;
+		$wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted}=1;
+		return;
 	}
 
 	$autofiles{$autofile}{generator}->();
-- 
cgit v1.2.3


From e72973afdb3b08b1755295e348e223a7c51cf702 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Wed, 21 Apr 2010 19:07:32 +0000
Subject: debugging

---
 doc/bugs/Comments_dissapeared.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index 7ff1a012f..c7403f0f1 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -33,3 +33,15 @@ I have tried rebuilding on my squeeze system and still comments don't appear. An
 <http://natalian.org/comments/>
 
 I was worried is was due to a time skew problem I was experiencing on my VPS in the last month, though the time is right now and still comments do not appear on blog posts like <http://natalian.org/archives/2010/03/25/BBC_News_complaints/>
+
+# Getting closer
+
+    hendry@webconverger templates$ for i in *.tmpl; do ./test-template.perl $i || echo $i has an error; done
+    HTML::Template->new() : At least one <TMPL_IF> or <TMPL_UNLESS> not terminated at end of file! at /usr/share/perl5/HTML/Template.pm line 2351.
+    page.tmpl has an error
+    hendry@webconverger templates$ cat test-template.perl 
+    #!/usr/bin/perl
+    use HTML::Template;
+    my $htc = HTML::Template->new(filename => "$ARGV[0]");
+
+I think the problem was before that it was `<TMPL_IF COMMENTS>` and now it is `<TMPL_IF NAME="COMMENTS">` ?
-- 
cgit v1.2.3


From 9fa5f71034497043e2b5dbb2c40417aebd94e327 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:18:11 -0400
Subject: update; my branch is (partially) debugged now

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index ed681ac4d..63bcabaee 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -273,7 +273,7 @@ wrong direction.
 I've pushed an autotag branch of my own, which refactors
 things a bit. It is untested so far though. --[[Joey]]
 
-* `verify_src_file` only called from Render.pm
+* `verify_src_file` only called from Render.pm (actually, function removed)
 * Gets rid of `%del_files`.
 * Uses `%wikistate`.
 
-- 
cgit v1.2.3


From c4afb13fa588643476535612e2279eae79534dcc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:19:47 -0400
Subject: spelling

---
 debian/changelog | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7ec99463..6b91fd3e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,13 +45,13 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * calendarmonth.tmpl: The month calendar is now put in a sidebar.
   * calendar: Improved display of arrows.
   * Rename --getctime to --gettime. (The old name still works for
-    backwards compatability.)
+    backwards compatibility.)
   * --gettime now also looks up last modification time.
   * Automatically run --gettime the first time ikiwiki is run on 
     a given srcdir. (Use --no-gettime to disable.)
   * Add rcs_getmtime to plugin API; currently only implemented
     for git and svn.
-  * Optimise --gettime for git, so it's appropriatly screamingly
+  * Optimise --gettime for git, so it's appropriately screamingly
     fast. (This could be done for most other backends too.)
   * However, --gettime for git no longer follows renames. That would
     be slow, and whether a renamed wiki page is the same page is really
@@ -1146,7 +1146,7 @@ ikiwiki (2.55) unstable; urgency=low
   * attachment: Do not escape _ when determining attachment filenames.
   * Rebuild pages that change their type. (Gabriel McManus)
   * monotone: Add support for rename, delete, and also diff. (William Uther)
-  * toggle: Fix incompatability between javascript and webkit.
+  * toggle: Fix incompatibility between javascript and webkit.
   * bzr: Add support for rename and delete. (Jelmer Vernooij)
   * attachment: Use relative paths when inserting links.
   * toggle: Fix for when html got tidied. Closes: #492529 (Enrico Zini)
@@ -2133,7 +2133,7 @@ ikiwiki (2.6) unstable; urgency=low
     - relax asumption about the possible submit values (use "Save Page"
       explicitly);
     - de-hardcode the submit buttons from the editpage template
-      (This was needed for compatability with a bug in CGI::FormBuilder
+      (This was needed for compatibility with a bug in CGI::FormBuilder
       3.0401, but ikiwiki already needs a newer version.)
   * Pass buttons to all other formbuilder_setup hooks too.
   * Add color parameter to postsparkline. Closes: #438900
@@ -2182,7 +2182,7 @@ ikiwiki (2.4) unstable; urgency=low
 
   * Make the toc plugin use html-compatible anchors. This is necessary since
     most web sites serve ikiwiki xhtml files as text/html and mozilla browsers
-    get confused. So it's best for ikiwiki to follow the compatability
+    get confused. So it's best for ikiwiki to follow the compatibility
     recommendations in appendix C of the XHTML spec. Closes: #432045
   * Support building on systems that lack asprintf.
   * mercurial getctime is currently broken, apparently by some change in
@@ -2680,7 +2680,7 @@ ikiwiki (1.41) unstable; urgency=low
   * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs,
     if an older version is installed, just don't gettext strings, instead of
     crashing.
-  * Added smileys for Moin Moin compatability.
+  * Added smileys for Moin Moin compatibility.
   * Fix handling of discussion links on discussion pages when l10n is used.
   * Make gitorigin_branch and gitmaster_branch configurable via the setup
     file. Closes: #408599
@@ -2988,7 +2988,7 @@ ikiwiki (1.29) unstable; urgency=low
   * Note that plugins that accessed this variable will need to be updated!
     The plugin interface has been increased to version 1.01 for this change.
     As few plugins use %renderedfiles I haven't done anything else to ensure
-    compatability of old plugins.
+    compatibility of old plugins.
   * Add will_render function to the plugin interface, used to register that a
     page renders a destination file, and do some security checks. Previously
     but no longer rendered files will be cleaned up.
@@ -3326,7 +3326,7 @@ ikiwiki (1.13) unstable; urgency=low
     treating the GlobList as a very limited microlanguage that is transformed
     to perl code that does the matching.
   * The old GlobList format is deprecated, and I encourage users to switch to
-    using the new PageSpec format. Compatability with the old format will be
+    using the new PageSpec format. Compatibility with the old format will be
     removed at some point, possibly by 2.0.
   * Wiki rebuild needed on upgrade to this version due to PageSpec change.
   * Add support for creation_month and creation_year to PageSpec.
@@ -3385,7 +3385,7 @@ ikiwiki (1.11) unstable; urgency=low
     This will be the page that a source page will be part of, which is
     different than the source page for inlined pages.
   * Audited all plugins to endure they pass (page, destpage) to htmllink
-    appropriatly. This means inlining of various plugins will not work
+    appropriately. This means inlining of various plugins will not work
     properly, with correct links generated.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 27 Jul 2006 20:51:23 -0400
-- 
cgit v1.2.3


From 9ed523d762afd74c3004a07fc8ee12daa9354813 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Wed, 21 Apr 2010 19:21:38 +0000
Subject:

---
 doc/bugs/Comments_dissapeared.mdwn | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index c7403f0f1..830c3519f 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -34,14 +34,28 @@ I have tried rebuilding on my squeeze system and still comments don't appear. An
 
 I was worried is was due to a time skew problem I was experiencing on my VPS in the last month, though the time is right now and still comments do not appear on blog posts like <http://natalian.org/archives/2010/03/25/BBC_News_complaints/>
 
-# Getting closer
+# Debugging templates
 
-    hendry@webconverger templates$ for i in *.tmpl; do ./test-template.perl $i || echo $i has an error; done
-    HTML::Template->new() : At least one <TMPL_IF> or <TMPL_UNLESS> not terminated at end of file! at /usr/share/perl5/HTML/Template.pm line 2351.
-    page.tmpl has an error
-    hendry@webconverger templates$ cat test-template.perl 
+`sudo apt-get install libhtml-template-compiled-perl`
+
+    hendry@webconverger templates$ cat test-template.perl
     #!/usr/bin/perl
-    use HTML::Template;
-    my $htc = HTML::Template->new(filename => "$ARGV[0]");
+    use HTML::Template::Compiled;
+    local $HTML::Template::Compiled::DEBUG = 1;
+    my $htc = HTML::Template::Compiled->new(
+             filename => "$ARGV[0]",
+    );
+    eval {  
+            print $htc->output;
+    };
+    if ($@) {
+            # reports as text
+            my $msg = $htc->debug_code;
+            # reports as a html table
+            my $msg_html = $htc->debug_code('html');
+    }
+    hendry@webconverger templates$ ./test-template.perl page.tmpl
+    Missing closing tag for 'IF' atend of page.tmpl line 159
+
 
 I think the problem was before that it was `<TMPL_IF COMMENTS>` and now it is `<TMPL_IF NAME="COMMENTS">` ?
-- 
cgit v1.2.3


From 204c0a63f3fd7673dac83da6aa5f9c9e3cc9a6c5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:22:05 -0400
Subject: document tag_autocreate

---
 debian/changelog     | 2 ++
 doc/plugins/tag.mdwn | 3 +++
 doc/roadmap.mdwn     | 1 +
 3 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b7ec99463..d66b5e4d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100415) UNRELEASED; urgency=low
 
   [ Joey Hess ]
+  * tag: Automatic creation of tag pages can now be enabled using
+    the tag_autocreate setting. (David Riebenbauer)
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
   * comments: Fix missing entity encoding in title.
   * txt: Add a special case for robots.txt.
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index 8ff70a069..bdf39d7e8 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -8,6 +8,9 @@ These directives allow tagging pages.
 It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
 match pages that are tagged with a specific tag.
 
+If the `tag_autocreate` setting is enabled, tag pages will automatically be
+created as needed.
+
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
 page is tagged with the "tags" tag.
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 0c7bf2fa8..8e2a01827 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -78,6 +78,7 @@ Probably incomplete list:
 * Make pagespecs match relative by default? (see [[discussion]])
 * Flip wikilinks? (see [[todo/link_plugin_perhaps_too_general?]])
 * YADA format setup files per default?
+* Enable `tag_autocreate` by default.
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From 86e73e42e835821984fdf6dc5671dae06cec5f90 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Wed, 21 Apr 2010 19:48:31 +0000
Subject:

---
 doc/bugs/Comments_dissapeared.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index 830c3519f..787f18c98 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -59,3 +59,11 @@ I was worried is was due to a time skew problem I was experiencing on my VPS in
 
 
 I think the problem was before that it was `<TMPL_IF COMMENTS>` and now it is `<TMPL_IF NAME="COMMENTS">` ?
+
+
+
+# Solved
+
+A merge with the templates in master with my [html5](http://git.webconverger.org/?p=ikiwiki;a=shortlog;h=refs/heads/html5) branch looks like it has solved the problem. Also see [[bugs/html5_support]].
+
+[[bugs/done]]
-- 
cgit v1.2.3


From e3ea28f8c7fb9682d9e5bea32de835cee7605846 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:53:44 -0400
Subject: update, tag deletion bug

---
 ...uto-create_tag_pages_according_to_a_template.mdwn | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 63bcabaee..d7637ef1b 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -152,12 +152,12 @@ consider this a feature, not a bug)
 Todo/Bugs:
 
 * Will still create a page even if there's a page other than `$tag` under
-`tagbase` satisfying the tag link.
+`tagbase` satisfying the tag link. (details? --[[Joey]])
 * Call from `IkiWiki.pm` to `Render.pm`, which adds a module dependency in the
-wrong direction.
+wrong direction. (fixed --[[Joey]] )
 * Add files to RCS.
 * Unit tests.
-* Proper documentation.
+* Proper documentation. (fixed (mostly) --[[Joey]])
 
 --[[David_Riebenbauer]]
 
@@ -273,9 +273,17 @@ wrong direction.
 I've pushed an autotag branch of my own, which refactors
 things a bit. It is untested so far though. --[[Joey]]
 
-* `verify_src_file` only called from Render.pm (actually, function removed)
-* Gets rid of `%del_files`.
-* Uses `%wikistate`.
+---
+
+Known bugs in my branch (probably also in David's):
+
+* Does not remember that a tag was deleted.
+  
+  The code to do that only works if, at the same time the tag
+  is deleted, one of the pages that has the tag is modified.
+  That's because `add_autofile` needs to be called before it's
+  aware the autofile exists, and if it's not aware, it does not
+  record it as a deleted autofile.
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From 2a0e3787a056b160843eca263c82d591c7161988 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:54:18 -0400
Subject: bugfixes

---
 IkiWiki/Render.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 14f6f9d5f..09c9121f3 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -681,18 +681,18 @@ sub gen_autofile ($$$) {
 	my $autofile=shift;
 	my $pages=shift;
 	my $del=shift;
-	
+
 	if (srcfile($autofile, 1) || file_pruned($autofile)) {
 		return;
 	}
 	
-	my $file="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
+	my ($file)="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
 	if (! defined $file || -l $file || -d _ || -e _) {
 		return;
 	}
 
 	if ((!defined $file) ||
-	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
+	    (exists $wikistate{$autofiles{$autofile}{plugin}}{deleted_autofile}{$autofile})) {
 		return;
 	}
 	
@@ -701,8 +701,8 @@ sub gen_autofile ($$$) {
 		return;
 	}
 
-	if (grep { $_ eq $file } @$del) {
-		$wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted}=1;
+	if (grep { $_ eq $autofile } @$del) {
+		$wikistate{$autofiles{$autofile}{plugin}}{deleted_autofile}{$autofile}=1;
 		return;
 	}
 
-- 
cgit v1.2.3


From a71b92ed5c5572a1384367f8a90e1fc489b3c660 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:59:39 -0400
Subject: remember autofiles always

This fixes the problem that it did not remember if an autofile is deleted,
unless a plugin happened to register the autofile at the same time.

With the new code, we just never recreate an autofile more than once.

Only downside is that the list of autofiles is never pruned either.
And I don't really see a way to prune it.
---
 IkiWiki/Render.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 09c9121f3..b3afabf32 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -692,7 +692,7 @@ sub gen_autofile ($$$) {
 	}
 
 	if ((!defined $file) ||
-	    (exists $wikistate{$autofiles{$autofile}{plugin}}{deleted_autofile}{$autofile})) {
+	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile})) {
 		return;
 	}
 	
@@ -702,11 +702,11 @@ sub gen_autofile ($$$) {
 	}
 
 	if (grep { $_ eq $autofile } @$del) {
-		$wikistate{$autofiles{$autofile}{plugin}}{deleted_autofile}{$autofile}=1;
 		return;
 	}
 
 	$autofiles{$autofile}{generator}->();
+	$wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}=1;
 	$pages->{$page}=1;
 	return 1;
 }
-- 
cgit v1.2.3


From 6a30b45e7521f98a3e94b04ff46eeeb7f80774ca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:07:23 -0400
Subject: update

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index d7637ef1b..f10c2cdee 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -250,6 +250,12 @@ wrong direction. (fixed --[[Joey]] )
 >>>> Yes, I forgot about that and that is a bug. I'll fix that.
 >>>> --[[David_Riebenbauer]]
 
+>>>>> In my branch, it keeps a list of autofiles that were created,
+>>>>> not deleted. And I think that turns out to be necessary, really.
+>>>>> However, I see no way to clean out that list on deletion and
+>>>>> manual recreation -- it still needs to remember it was once an autofile,
+>>>>> in order to avoid recreating it if it's deleted yet again. --[[Joey]]
+
 >>> * `autoindex` forgets that a page was deleted when it's no longer needed
 >>>   anyway (this may be harder for `autotag`?)
 
@@ -264,6 +270,13 @@ wrong direction. (fixed --[[Joey]] )
 >>>> Good suggestion. Adding the files to RCS is on my todo list anyway.
 >>>> --[[David_Riebenbauer]]
 
+>>>>> I think it may be better to allow the `add_autofile` caller
+>>>>> to specify if it is added to RCS. In my branch, it can do
+>>>>> so by just making the callback it registers call `rcs_add`; 
+>>>>> and I have tag do this. Other plugins might want autofiles
+>>>>> that do not get checked in, conceivably.
+>>>>> --[[Joey]] 
+
 > Regarding the call from `IkiWiki.pm` to `Render.pm`, wouldn't this be
 > quite easy to solve by moving `verify_src_file` to IkiWiki.pm? --[[smcv]]
 
@@ -271,19 +284,8 @@ wrong direction. (fixed --[[Joey]] )
 
 [[!template id=gitbranch branch=origin/autotag author="[[Joey]]"]]
 I've pushed an autotag branch of my own, which refactors
-things a bit. It is untested so far though. --[[Joey]]
-
----
-
-Known bugs in my branch (probably also in David's):
-
-* Does not remember that a tag was deleted.
-  
-  The code to do that only works if, at the same time the tag
-  is deleted, one of the pages that has the tag is modified.
-  That's because `add_autofile` needs to be called before it's
-  aware the autofile exists, and if it's not aware, it does not
-  record it as a deleted autofile.
+things a bit and fixes bugs around deletion/recreation.
+I've tested it somewhat. --[[Joey]]
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From fd6fb4c5071d9317b4388a0db6b97037cc010477 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:13:37 -0400
Subject: commit autocreated tag pages

---
 IkiWiki/Plugin/tag.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index d2a3d4dfd..c98dd80b2 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -79,11 +79,18 @@ sub gentag ($) {
 		my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
 		add_autofile($tagfile, "tag", sub {
-			debug(sprintf(gettext("creating tag page %s"), $tag));
+			my $message=sprintf(gettext("creating tag page %s"), $tag);
+			debug($message);
 
 			my $template=template("autotag.tmpl");
 			$template->param(tag => $tag);
 			writefile($tagfile, $config{srcdir}, $template->output);
+			if ($config{rcs}) {
+				IkiWiki::disable_commit_hook();
+				IkiWiki::rcs_add($tagfile);
+				IkiWiki::rcs_commit_staged($message, undef, undef);
+				IkiWiki::enable_commit_hook();
+			}
 		});
 	}
 }
-- 
cgit v1.2.3


From 760b840e8f5af9e8ea0197bda783fd9b54a8ab7c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:19:16 -0400
Subject: update

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index f10c2cdee..724a52ec9 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -281,6 +281,7 @@ wrong direction. (fixed --[[Joey]] )
 > quite easy to solve by moving `verify_src_file` to IkiWiki.pm? --[[smcv]]
 
 >> True. I'll do that. --[[David_Riebenbauer]]
+>> Fixed in my branch --[[Joey]]
 
 [[!template id=gitbranch branch=origin/autotag author="[[Joey]]"]]
 I've pushed an autotag branch of my own, which refactors
-- 
cgit v1.2.3


From b21db4197802ebd4d268b81b3df9448aa8108742 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 21 Apr 2010 20:23:19 +0000
Subject: elide an older patch that's no longer under discussion

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 81 +---------------------
 1 file changed, 1 insertion(+), 80 deletions(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index f10c2cdee..e993a9aa4 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -15,86 +15,7 @@ A new setting is used to enable or disable auto-create tag pages, `tag_autocreat
 The new tag file is created during the preprocess phase. 
 The new tag file is then complied during the change phase.
 
-_tag.pm from version 3.01_
-
-
-	--- tag.pm      2009-02-06 10:26:03.000000000 -0700
-	+++ tag_new.pm  2009-02-06 12:17:19.000000000 -0700
-	@@ -14,6 +14,7 @@
-			hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
-			hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1);
-			hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
-	+       hook(type => "change", id => "tag", call => \&change);
-	 }
-	 
-	 sub getopt () {
-	@@ -36,6 +37,36 @@
-							safe => 1,
-							rebuild => 1,
-					},
-	+               tag_autocreate => {
-	+                       type => "boolean",
-	+                       example => 0,
-	+                       description => "Auto-create the new tag pages, uses autotagpage.tmpl ",
-	+                       safe => 1,
-	+                       rebulid => 1,
-	+               },
-	+}
-	+
-	+my $autocreated_page = 0;
-	+
-	+sub gen_tag_page($)    {
-	+       my $tag=shift;
-	+
-	+       my $tag_file=$tag.'.'.$config{default_pageext};
-	+       return if (-f $config{srcdir}.$tag_file);
-	+
-	+       my $template=template("autotagpage.tmpl");
-	+       $template->param(tag => $tag);
-	+       writefile($tag_file, $config{srcdir}, $template->output);
-	+       $autocreated_page = 1;
-	+
-	+       if ($config{rcs}) {
-	+               IkiWiki::disable_commit_hook();
-	+               IkiWiki::rcs_add($tag_file);
-	+               IkiWiki::rcs_commit_staged(
-	+                       gettext("Automatic tag page generation"),
-	+                       undef, undef);
-	+               IkiWiki::enable_commit_hook();
-	+       }
-	 }
-	 
-	 sub tagpage ($) {
-	@@ -47,6 +78,10 @@
-					$tag=~y#/#/#s; # squash dups
-			}
-	 
-	+       if (defined $config{tag_autocreate} && $config{tag_autocreate} ) {
-	+               gen_tag_page($tag);
-	+       }
-	+
-			return $tag;
-	 }
-	 
-	@@ -125,4 +160,18 @@
-			}
-	 }
-	 
-	+sub change(@) {
-	+       return unless($autocreated_page);
-	+       $autocreated_page = 0;
-	+
-	+       # This refresh/saveindex is to complie the autocreated tag pages
-	+       IkiWiki::refresh();
-	+       IkiWiki::saveindex();
-	+
-	+       # This refresh/saveindex is to fix the Tags link
-	+       # With out this additional refresh/saveindex the tag link displays ?tag
-	+       IkiWiki::refresh();
-	+       IkiWiki::saveindex();
-	+}
-	+
-
+*see git history of this page if you want the patch --[[smcv]]*
 
 This uses a [[template|wikitemplates]] called `autotagpage.tmpl`, here is my template file:
 
-- 
cgit v1.2.3


From ffe9fd8eb14cedaf31477dbce72c28dd38cc78ae Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 21 Apr 2010 20:30:14 +0000
Subject: suppressing auto-creation can be quite counter-intuitive

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index e993a9aa4..5a1aff928 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -177,6 +177,32 @@ wrong direction. (fixed --[[Joey]] )
 >>>>> manual recreation -- it still needs to remember it was once an autofile,
 >>>>> in order to avoid recreating it if it's deleted yet again. --[[Joey]]
 
+>>>>>> Are these really the semantics we want? It seems strange to me
+>>>>>> that this:
+>>>>>>
+>>>>>> * tag a page as foo
+>>>>>> * tags/foo automatically appears
+>>>>>> * delete tags/foo
+>>>>>> * create tags/foo manually
+>>>>>> * delete tags/foo again
+>>>>>> * tags/foo isn't automatically created
+>>>>>>
+>>>>>> isn't the same as this:
+>>>>>>
+>>>>>> * create tags/foo
+>>>>>> * delete tags/foo
+>>>>>> * tag a page as foo
+>>>>>> * tags/foo automatically appears
+>>>>>>
+>>>>>> or even this:
+>>>>>>
+>>>>>> * create tags/foo
+>>>>>> * tag a page as foo
+>>>>>> * delete tags/foo
+>>>>>> * tags/foo automatically appears (?)
+>>>>>>
+>>>>>> --[[smcv]]
+
 >>> * `autoindex` forgets that a page was deleted when it's no longer needed
 >>>   anyway (this may be harder for `autotag`?)
 
-- 
cgit v1.2.3


From 463ba55dce0d07e97fa44500146e850f72d7ea24 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:33:03 -0400
Subject: note re includes

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index b5c107915..a112cb9da 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -35,6 +35,10 @@ suffice.
 (This would also help to clear up the tricky disctinction between
 wikitemplates and in-wiki templates.)
 
+Note also that when using templates from "$srcdir/templates/", `no_includes`
+needs to be set. Currently this is done by the two plugins that use
+such templates, while includes are allowed in `templatedir`.
+
 > But would this require that templates be parseable as wiki pages?  Because that would be a nuisance. --[[KathrynAndersen]]
 
 >> It would be better for them not to be rendered separately at all.
-- 
cgit v1.2.3


From 1336a3270b664dbd548c6ad66ec981d5fa24a953 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:36:58 -0400
Subject: response

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 254ec42b5..32870dd3d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -203,6 +203,12 @@ wrong direction. (fixed --[[Joey]] )
 >>>>>>
 >>>>>> --[[smcv]]
 
+>>>>>>> I agree that the last of these is not desired. It could be avoided
+>>>>>>> by extending the list of autofiles to include those that were not
+>>>>>>> created due to the file/page already existing.
+>>>>>>> 
+>>>>>>> Hmm, that would fix the previous scenario too. --[[Joey]] 
+
 >>> * `autoindex` forgets that a page was deleted when it's no longer needed
 >>>   anyway (this may be harder for `autotag`?)
 
-- 
cgit v1.2.3


From 167964b68661de57983993efd7261a75da661665 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:41:36 -0400
Subject: remember autofiles that were tried and failed to be added

This way, if an autofile is registered for a file that already exists,
it is remembered that it was tried, and it doesn't get recreated when
removed.
---
 IkiWiki/Render.pm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index b3afabf32..c3e07baf6 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -682,20 +682,29 @@ sub gen_autofile ($$$) {
 	my $pages=shift;
 	my $del=shift;
 
-	if (srcfile($autofile, 1) || file_pruned($autofile)) {
+	if (file_pruned($autofile)) {
 		return;
 	}
-	
+
 	my ($file)="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
-	if (! defined $file || -l $file || -d _ || -e _) {
+	if (! defined $file) {
+		return;
+	}
+
+	# Remember autofiles that were tried, and never try them again later.
+	if (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}) {
 		return;
 	}
+	$wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}=1;
 
-	if ((!defined $file) ||
-	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile})) {
+	if (srcfile($autofile, 1) || file_pruned($autofile)) {
 		return;
 	}
 	
+	if (-l $file || -d _ || -e _) {
+		return;
+	}
+
 	my $page = pagename($file);
 	if ($pages->{$page}) {
 		return;
@@ -706,7 +715,6 @@ sub gen_autofile ($$$) {
 	}
 
 	$autofiles{$autofile}{generator}->();
-	$wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}=1;
 	$pages->{$page}=1;
 	return 1;
 }
-- 
cgit v1.2.3


From 8cde2365e43f1c96432dcedb378be55d2308dd08 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 19:09:59 -0400
Subject: add separate template variable for tag page and sanitize displayed
 tag name

---
 IkiWiki/Plugin/tag.pm  | 3 ++-
 templates/autotag.tmpl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c98dd80b2..6a6517671 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -83,7 +83,8 @@ sub gentag ($) {
 			debug($message);
 
 			my $template=template("autotag.tmpl");
-			$template->param(tag => $tag);
+			$template->param(tag => IkiWiki::basename($tag));
+			$template->param(tagpage => $tagpage);
 			writefile($tagfile, $config{srcdir}, $template->output);
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl
index a8824171b..7b0d4c90f 100644
--- a/templates/autotag.tmpl
+++ b/templates/autotag.tmpl
@@ -1,3 +1,3 @@
-## Pages tagged <TMPL_VAR TAG> ##
+## Pages tagged <TMPL_VAR TAGNAME> ##
 
 [[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"]]
-- 
cgit v1.2.3


From 1a09cddd39d4e15c442973dc256bf91b3c27997c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 19:42:00 -0400
Subject: fix false positive in link_types_changed

loadindex does not bother populating oldtypedlinks if there is no link
type. However, the code in link_types_changed assumed that if oldtypedlinks
is not defined, and typedlinks is, they must differ.
---
 IkiWiki/Render.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index bbf8f915e..0e5336f22 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -526,7 +526,7 @@ sub link_types_changed ($$) {
 	my $old = shift;
 
 	return 0 if !defined $new && !defined $old;
-	return 1 if !defined $new || !defined $old;
+	return 1 if (!defined $new && %$old) || (!defined $old && %$new);
 
 	while (my ($type, $links) = each %$new) {
 		foreach my $link (keys %$links) {
-- 
cgit v1.2.3


From 673d6c958050b7ce07d5d8512d5370f9531225cd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 19:45:56 -0400
Subject: add missing undef guard in derel

---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 4084d4997..8af290745 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2245,7 +2245,7 @@ sub derel ($$) {
 	if ($path =~ m!^\./!) {
 		$from=~s#/?[^/]+$## if defined $from;
 		$path=~s#^\./##;
-		$path="$from/$path" if length $from;
+		$path="$from/$path" if defined $from && length $from;
 	}
 
 	return $path;
-- 
cgit v1.2.3


From 77779dc4a09a9b686935e8e615cf2502f7125bb4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 19:46:27 -0400
Subject: pass pagespec parameters along from match_tagged

---
 IkiWiki/Plugin/tag.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 7a85874f6..62e0cc3b8 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -125,7 +125,9 @@ sub pagetemplate (@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
-	return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
+	my $page=shift;
+	my $glob=shift;
+	return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag', @_);
 }
 
 1
-- 
cgit v1.2.3


From 0e2b5ebe314c617ae4139b5daad314e01208d37b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 19:49:11 -0400
Subject: clarify

---
 IkiWiki/Plugin/tag.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 72ae682f3..dd7583ab2 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -170,8 +170,8 @@ package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
 	my $page=shift;
-	my $glob=shift;
-	return match_link($page, IkiWiki::Plugin::tag::taglink($glob), linktype => 'tag', @_);
+	my $glob=IkiWiki::Plugin::tag::taglink(shift);
+	return match_link($page, $glob, linktype => 'tag', @_);
 }
 
 1
-- 
cgit v1.2.3


From 752ccf8b48bab173839b5c7892e9868ee71846f0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:08:23 -0400
Subject: fixes

---
 IkiWiki/Plugin/tag.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index dd7583ab2..a7f37a512 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -79,12 +79,12 @@ sub gentag ($) {
 		my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
 		add_autofile($tagfile, "tag", sub {
-			my $message=sprintf(gettext("creating tag page %s"), $tag);
+			my $message=sprintf(gettext("creating tag page %s"), $tagpage);
 			debug($message);
 
 			my $template=template("autotag.tmpl");
-			$template->param(tag => IkiWiki::basename($tag));
-			$template->param(tagpage => $tagpage);
+			$template->param(tagname => IkiWiki::basename($tag));
+			$template->param(tag => $tag);
 			writefile($tagfile, $config{srcdir}, $template->output);
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
-- 
cgit v1.2.3


From 129cd00bdb03e32df8645b12138cb4c79952775e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:15:11 -0400
Subject: remove broken ./tag support

The commit that added the (working) support for using /tag to override
tagbase also tried to make ./tag work. Problem is, tags are links,
and ./foo is not a valid link (though I think there's a wishlist about it).

So, using ./tag really resulted in tag creation links that led to a
"bad page name" error. And even if the tag were created in the right place,
the link didn't go to it.
---
 IkiWiki/Plugin/tag.pm          | 2 +-
 doc/ikiwiki/directive/tag.mdwn | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 62e0cc3b8..8ec08e936 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -39,7 +39,7 @@ sub getsetup () {
 sub tagpage ($) {
 	my $tag=shift;
 			
-	if ($tag !~ m{^\.?/} &&
+	if ($tag !~ m{^/} &&
 	    defined $config{tagbase}) {
 		$tag="/".$config{tagbase}."/".$tag;
 		$tag=~y#/#/#s; # squash dups
diff --git a/doc/ikiwiki/directive/tag.mdwn b/doc/ikiwiki/directive/tag.mdwn
index 64736f8cd..807a96f25 100644
--- a/doc/ikiwiki/directive/tag.mdwn
+++ b/doc/ikiwiki/directive/tag.mdwn
@@ -28,7 +28,7 @@ into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is
 If you want to override the tagbase for a particular tag, you can use
 something like this:
 
-	\[[!tag ./foo]]
+	\[[!tag /foo]]
 	\[[!taglink /foo]]
 
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From 0bc76be8a7201de4bfaa74b7aacc0b280c097699 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:32:19 -0400
Subject: reword news

---
 debian/NEWS | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 25ebed0b4..9fd882ad2 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,19 +1,26 @@
 ikiwiki (3.20100406) unstable; urgency=low
-  
-  The title_natural sort method (as used by the inline directive, etc)
-  have been moved to the new sortnaturally plugin, which is not enabled
-  by default since it requires the Sort::Naturally perl module.
+
+  This version of ikiwiki has a lot of changes that you need to know about.
+
+  The --getctime switch is renamed to --gettimes, and it also gets the 
+  file modification time. And it's a lot faster (when using git). But
+  the really important change is, you don't have to remember to use this
+  switch. Now ikiwiki will do it when it needs to.
 
   Starting from this version, the `tagged()` pagespec only matches tags,
   not regular wikilinks. If your wiki accidentially relied on the old,
   buggy behavior, you might need to change pagespecs to use `link()`.
 
+  The title_natural sort method (as used by the inline directive, etc)
+  have been moved to the new sortnaturally plugin, which is not enabled
+  by default since it requires the Sort::Naturally perl module.
+
   Due to the above and other changes, all wikis need to be rebuilt on
   upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
   this will be done automatically when the Debian package is upgraded. Or
   use ikiwiki-mass-rebuild to force a rebuild.
 
- -- Simon McVittie <smcv@debian.org>  Tue, 06 Apr 2010 20:53:07 +0100
+ -- Joey Hess <joeyh@debian.org>  Wed, 21 Apr 2010 20:31:29 -0400
 
 ikiwiki (3.20091017) unstable; urgency=low
 
-- 
cgit v1.2.3


From d048e9c64aca24b8e064aaf1608862b50c427de2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:39:20 -0400
Subject: turn on tag_autocreate by default if tagbase is set

---
 IkiWiki/Plugin/tag.pm          | 5 +++--
 debian/NEWS                    | 4 ++++
 doc/ikiwiki/directive/tag.mdwn | 3 ++-
 doc/plugins/tag.mdwn           | 8 ++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index cd7ecc212..62f030f4e 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -36,7 +36,7 @@ sub getsetup () {
 		},
 		tag_autocreate => {
 			type => "boolean",
-			example => 0,
+			example => 1,
 			description => "autocreate new tag pages?",
 			safe => 1,
 			rebuild => undef,
@@ -67,7 +67,8 @@ sub htmllink_tag ($$$;@) {
 sub gentag ($) {
 	my $tag=shift;
 
-	if ($config{tag_autocreate}) {
+	if ($config{tag_autocreate} ||
+	    ($config{tagbase} && ! defined $config{tag_autocreate})) {
 		my $tagpage=taglink($tag);
 		if ($tagpage=~/^\.\/(.*)/) {
 			$tagpage=$1;
diff --git a/debian/NEWS b/debian/NEWS
index 9fd882ad2..8b87bc601 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -11,6 +11,10 @@ ikiwiki (3.20100406) unstable; urgency=low
   not regular wikilinks. If your wiki accidentially relied on the old,
   buggy behavior, you might need to change pagespecs to use `link()`.
 
+  Tag pages can automatically be created as new tags are used. This
+  feature is enabled by default if you have configured a tagbase. It
+  can be turned on or off using the `tag_autocreate` setting.
+
   The title_natural sort method (as used by the inline directive, etc)
   have been moved to the new sortnaturally plugin, which is not enabled
   by default since it requires the Sort::Naturally perl module.
diff --git a/doc/ikiwiki/directive/tag.mdwn b/doc/ikiwiki/directive/tag.mdwn
index 807a96f25..c8d9b9816 100644
--- a/doc/ikiwiki/directive/tag.mdwn
+++ b/doc/ikiwiki/directive/tag.mdwn
@@ -19,7 +19,8 @@ instead:
 Note that if the wiki is configured to use a tagbase, then the tags will be
 located under a base directory, such as "tags/". This is a useful way to
 avoid having to write the full path to tags, if you want to keep them
-grouped together out of the way.
+grouped together out of the way. Also, since ikiwiki then knows where to put
+tags, it will automatically create tag pages when new tags are used.
 
 Bear in mind that specifying a tagbase means you will need to incorporate it
 into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index bdf39d7e8..8e1286e62 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -8,8 +8,12 @@ These directives allow tagging pages.
 It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
 match pages that are tagged with a specific tag.
 
-If the `tag_autocreate` setting is enabled, tag pages will automatically be
-created as needed.
+The `tagbase` setting can be used to make tags default to being put in a
+particular subdirectory.
+
+The `tag_autocreate` setting can be used to control whether new tag pages
+are created as needed. It defaults to being done only if a `tagbase` is
+set.
 
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
-- 
cgit v1.2.3


From 557912c723a6e8df320a3c6dae461956cf893f10 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:47:18 -0400
Subject: my autotag branch seems ready

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 32870dd3d..b05e1db3d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -239,7 +239,7 @@ wrong direction. (fixed --[[Joey]] )
 [[!template id=gitbranch branch=origin/autotag author="[[Joey]]"]]
 I've pushed an autotag branch of my own, which refactors
 things a bit and fixes bugs around deletion/recreation.
-I've tested it somewhat. --[[Joey]]
+I've tested it fairly thouroughly. --[[Joey]]
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From 32dd388f8dbb1f52a46c40a2e0b9a00eca43f40e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 21:38:53 -0400
Subject: indent

---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8af290745..0791e1e75 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2221,7 +2221,7 @@ sub merge_influences {
 	my $anded=shift;
 
 	if (! $anded || (($this || %{$this->[1]}) &&
-	                ($other || %{$other->[1]}))) {
+	                 ($other || %{$other->[1]}))) {
 		foreach my $influence (keys %{$other->[1]}) {
 			$this->[1]{$influence} |= $other->[1]{$influence};
 		}
-- 
cgit v1.2.3


From 6c5f315970b0e7a8473e9a1151229459781192a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 21:38:58 -0400
Subject: argh. head exploding.

---
 doc/bugs/depends_simple_mixup.mdwn | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 2603ff04c..2ebd53e85 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -18,6 +18,42 @@ not noticing that bugs dependeded on the page and needs to be updated.
 
 Ok.. Turns out this was not a problem with the actual influences
 calculation or dependency calculation code. Whew! `match_link`
-just didn't set the influence correctly when failing. [[fixed|done]]
+just didn't set the influence correctly when failing. fixed
 
 --[[Joey]]
+
+---
+
+Update: Reopening this because the fix for it rather sucks.
+
+I made `match_link` return on failure an influence of
+type DEPEND_LINKS. So, a tag page that inlines `tagged(foo)`
+gets a `depends_simple` built up that contains link dependencies for
+*every* page in the wiki. A very bloaty way to represent the dependency!
+
+Per [[dependency_types]], `link(done)` only needs to list in
+`depends_simple` the pages that currently match. If a page is modified
+to add the link, the regular dependency calculation code notices that
+a new page matches. If a page that had the link is modified to remove it,
+the `depends_simple` lets ikiwiki remember that the now non-matching page
+matched before.
+
+Where that fell down was `!link(done)`. A page matching that was not added
+to `depends_simple`, because the `link(done)` did not match it. If the page
+is modified to add the link, the regular dependency calculation code
+didn't notice, since the pagespec no longer matched.
+
+In this case, `depends_simple` needs to contain all pages
+that do *not* match `link_done)`, but before my change, it contained
+all pages that *do* match. After my change, it contained all pages.
+
+So, seems what is needed is a way for influence info to be manipulated by
+the boolean operations that are applied. One way would be to have two
+sets of influences be returned, one for successful matches, and one for
+failed matches. Normally, these would be the same. For successful
+`match_link`, the successful influence would be the page.
+For failed `match_link`, the failed influence would be the page.
+
+Then, when NOTting a `*Reason`, swap the two sets of influences.
+When ANDing/ORing, combine the individual sets. Querying the object for
+influences should return only the successful influences.
-- 
cgit v1.2.3


From 8cf6b7abf87818f9063b6ef672f20125de75249c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 21:42:18 -0400
Subject: link fix

---
 doc/bugs/depends_simple_mixup.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 2ebd53e85..4fe69a90a 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -31,7 +31,7 @@ type DEPEND_LINKS. So, a tag page that inlines `tagged(foo)`
 gets a `depends_simple` built up that contains link dependencies for
 *every* page in the wiki. A very bloaty way to represent the dependency!
 
-Per [[dependency_types]], `link(done)` only needs to list in
+Per [[todo/dependency_types]], `link(done)` only needs to list in
 `depends_simple` the pages that currently match. If a page is modified
 to add the link, the regular dependency calculation code notices that
 a new page matches. If a page that had the link is modified to remove it,
-- 
cgit v1.2.3


From 09ff797682fd89380a4a71564ec02649af99851e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 21:55:12 -0400
Subject: more wrongness

---
 doc/bugs/depends_simple_mixup.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 4fe69a90a..472de6349 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -57,3 +57,8 @@ For failed `match_link`, the failed influence would be the page.
 Then, when NOTting a `*Reason`, swap the two sets of influences.
 When ANDing/ORing, combine the individual sets. Querying the object for
 influences should return only the successful influences.
+
+In light of this, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
+thuroughly wrong. So, what about influence info for other matches
+like `!author(foo)` etc? Currently, none is returned, but it should
+be a content influence. What about backlink influence data?
-- 
cgit v1.2.3


From 17a89d3d19f3a04ca2686ff18df127e5afaf9577 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 21:57:12 -0400
Subject: update

---
 doc/plugins/tag/discussion.mdwn                             | 1 +
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/plugins/tag/discussion.mdwn b/doc/plugins/tag/discussion.mdwn
index 03dcb7b2f..dfd749252 100644
--- a/doc/plugins/tag/discussion.mdwn
+++ b/doc/plugins/tag/discussion.mdwn
@@ -28,3 +28,4 @@ See [[todo/auto-create tag pages according to a template]]
 
 -- Jeremy Schultz <jeremy.schultz@uleth.ca>
 
+`tag_autocreate` can now enable this. --[[Joey]] 
diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 32870dd3d..1e0a910f4 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -247,3 +247,5 @@ I've tested it somewhat. --[[Joey]]
 [da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0 (commitdiff for da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0)
 [a358d74bef51dae31332ff27e897fe04834571e6]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=a358d74bef51dae31332ff27e897fe04834571e6 (commitdiff for a358d74bef51dae31332ff27e897fe04834571e6)
 [981400177d68a279f485727be3f013e68f0bf691]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=981400177d68a279f485727be3f013e68f0bf691 (commitdiff for 981400177d68a279f485727be3f013e68f0bf691)
+
+[[!tag done]]
-- 
cgit v1.2.3


From 13325317a32529e02769baa5e61e6c401c675b27 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 22:04:03 -0400
Subject: backlink influence data seems ok

---
 doc/bugs/depends_simple_mixup.mdwn | 2 +-
 t/pagespec_match_list.t            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 472de6349..e7b48f802 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -61,4 +61,4 @@ influences should return only the successful influences.
 In light of this, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
 thuroughly wrong. So, what about influence info for other matches
 like `!author(foo)` etc? Currently, none is returned, but it should
-be a content influence. What about backlink influence data?
+be a content influence. (Backlink influence data is ok.)
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 05dc012fe..ee5d60f88 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 94;
+use Test::More tests => 107;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -80,7 +80,7 @@ foreach my $spec ("* and link(bar)", "* or link(bar)") {
 }
 
 # a pagespec with backlinks() will add as an influence the page with the links
-foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)") {
+foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)", "!backlink(foo)") {
 	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
-- 
cgit v1.2.3


From c98414e192285b2607ee9fcb27f0e8e00db5fb26 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 23:08:54 -0400
Subject: added a test case for this bug

Further analysis suggests fixing this might not be as dreadful as I first
thought!
---
 doc/bugs/depends_simple_mixup.mdwn | 24 ++++++++++++++++++++++--
 t/pagespec_match_list.t            | 20 +++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index e7b48f802..79bfa8bdc 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -44,9 +44,11 @@ is modified to add the link, the regular dependency calculation code
 didn't notice, since the pagespec no longer matched.
 
 In this case, `depends_simple` needs to contain all pages
-that do *not* match `link_done)`, but before my change, it contained
+that do *not* match `link(done)`, but before my change, it contained
 all pages that *do* match. After my change, it contained all pages.
 
+----
+
 So, seems what is needed is a way for influence info to be manipulated by
 the boolean operations that are applied. One way would be to have two
 sets of influences be returned, one for successful matches, and one for
@@ -58,7 +60,25 @@ Then, when NOTting a `*Reason`, swap the two sets of influences.
 When ANDing/ORing, combine the individual sets. Querying the object for
 influences should return only the successful influences.
 
-In light of this, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
+----
+
+Would it be possible to avoid the complication of maintianing two sets of
+influence info? 
+
+Well, notice that the influence of `pagespec_match($page, "link(done)")`
+is $page. Iff the match succeeds.
+
+Also, the influence of `pagespec_match($page, "!link(done)")` is
+$page. Iff the (overall) match succeeds.
+
+Does that hold for all cases? If so, the code that populates
+`depends_simple` could just test if the pagespec was successful, and
+if not, avoid adding $page influences, while still adding any other, 
+non-$page influences.
+
+----
+
+Hmm, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
 thuroughly wrong. So, what about influence info for other matches
 like `!author(foo)` etc? Currently, none is returned, but it should
 be a content influence. (Backlink influence data is ok.)
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index ee5d60f88..27546e6ca 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 107;
+use Test::More tests => 115;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -27,6 +27,8 @@ IkiWiki::checkconfig();
 $IkiWiki::pagectime{foo} = 2;
 $IkiWiki::pagectime{foo2} = 2;
 $IkiWiki::pagectime{foo3} = 1;
+$IkiWiki::pagectime{foo4} = 1;
+$IkiWiki::pagectime{foo5} = 1;
 $IkiWiki::pagectime{bar} = 3;
 $IkiWiki::pagectime{"post/1"} = 6;
 $IkiWiki::pagectime{"post/2"} = 6;
@@ -69,12 +71,28 @@ foreach my $spec ("* and link(bar)", "* or link(bar)") {
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 	ok($IkiWiki::depends_simple{foo2}{foo2} == $IkiWiki::DEPEND_LINKS);
+	ok($IkiWiki::depends_simple{foo2}{foo} != $IkiWiki::DEPEND_LINKS);
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 	pagespec_match_list("foo3", $spec, deptype => deptype("links"));
 	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
 	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
+	ok($IkiWiki::depends_simple{foo3}{foo} != $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+}
+# Above we tested that a link pagespec is influenced
+# by the pages that currently contain the link.
+
+# Oppositely, a pagespec that tests for pages that do not have a link
+# is not influenced by pages that currently contain the link, but
+# is instead influenced by pages that currently do not (but that
+# could be changed to have it).
+foreach my $spec ("* and !link(bar)", "* and !(!(!link(bar)))") {
+	pagespec_match_list("foo2", $spec);
+	ok($IkiWiki::depends_simple{foo2}{foo2} != $IkiWiki::DEPEND_LINKS);
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 }
-- 
cgit v1.2.3


From ef34ea7c05189db8952b08d78aad718ccb64475a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:07:25 -0400
Subject: fix test cases for dynamic influence calculation

---
 t/add_depends.t         | 10 +++++++++-
 t/pagespec_match_list.t | 25 ++++++++++++++++++-------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/t/add_depends.t b/t/add_depends.t
index 9b074818c..aa58fb0ff 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 38;
+use Test::More tests => 40;
 
 BEGIN { use_ok("IkiWiki"); }
 %config=IkiWiki::defaultconfig();
@@ -60,3 +60,11 @@ ok(! ($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_PRESENCE));
 ok(add_depends("foo9", "*", deptype("monkey")));
 ok($IkiWiki::depends{foo9}{"*"} & $IkiWiki::DEPEND_CONTENT);
 ok(! ($IkiWiki::depends{foo9}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+
+# Influences are added for dependencies involving links.
+$pagesources{"foo"}="foo.mdwn";
+$links{foo}=[qw{bar}]; 
+$pagesources{"bar"}="bar.mdwn";
+$links{bar}=[qw{}];
+ok(add_depends("foo", "link(bar) and backlink(meep)"));
+ok($IkiWiki::depends_simple{foo}{foo} == $IkiWiki::DEPEND_LINKS);
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 27546e6ca..244ad9159 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 115;
+use Test::More tests => 126;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -71,19 +71,27 @@ foreach my $spec ("* and link(bar)", "* or link(bar)") {
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 	ok($IkiWiki::depends_simple{foo2}{foo2} == $IkiWiki::DEPEND_LINKS);
-	ok($IkiWiki::depends_simple{foo2}{foo} != $IkiWiki::DEPEND_LINKS);
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 	pagespec_match_list("foo3", $spec, deptype => deptype("links"));
 	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
 	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
-	ok($IkiWiki::depends_simple{foo3}{foo} != $IkiWiki::DEPEND_LINKS);
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 }
-# Above we tested that a link pagespec is influenced
-# by the pages that currently contain the link.
+
+# A link pagespec is influenced by the pages that currently contain the link.
+# It is not influced by pages that do not currently contain the link,
+# because if those pages were changed to contain it, regular dependency
+# handling would be triggered.
+foreach my $spec ("* and link(bar)", "link(bar)", "no_such_page or link(bar)") {
+	pagespec_match_list("foo2", $spec);
+	ok($IkiWiki::depends_simple{foo2}{foo2} == $IkiWiki::DEPEND_LINKS);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo}, $spec);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+}
 
 # Oppositely, a pagespec that tests for pages that do not have a link
 # is not influenced by pages that currently contain the link, but
@@ -91,8 +99,8 @@ foreach my $spec ("* and link(bar)", "* or link(bar)") {
 # could be changed to have it).
 foreach my $spec ("* and !link(bar)", "* and !(!(!link(bar)))") {
 	pagespec_match_list("foo2", $spec);
-	ok($IkiWiki::depends_simple{foo2}{foo2} != $IkiWiki::DEPEND_LINKS);
-	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS, $spec);
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 }
@@ -103,12 +111,14 @@ foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)", "!backli
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 	pagespec_match_list("foo2", $spec, deptype => deptype("links"));
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
 	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 	pagespec_match_list("foo2", $spec, deptype => deptype("presence", "links"));
@@ -116,6 +126,7 @@ foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)", "!backli
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_CONTENT));
 	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 	pagespec_match_list("foo2", $spec);
-- 
cgit v1.2.3


From bc6d6026093ae6f2bfd72a2c06887358a0e59b6b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:10:13 -0400
Subject: add influence info for failed metadata matches

This is needed so that when a negated pagespec like "!author(foo)"
stops matching, due to the page being changed, ikiwiki knows that
the match was influenced by the page content.
---
 IkiWiki/Plugin/meta.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 128a6342c..159008614 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -346,11 +346,11 @@ sub match {
 			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
 		}
 		else {
-			return IkiWiki::FailReason->new("$re does not match $field of $page", "" => 1);
+			return IkiWiki::FailReason->new("$re does not match $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$page does not have a $field", "" => 1);
+		return IkiWiki::FailReason->new("$page does not have a $field", $page => $IkiWiki::DEPEND_CONTENT);
 	}
 }
 
-- 
cgit v1.2.3


From 2b175d7c1fe997277800c0d501332e96de475c6d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:12:15 -0400
Subject: improved fix for depends_simple_mixup

Avoid adding the page matched against as an influence for
currently failing pagespec matches, while still adding
any other influences.

This avoids bloating depends_simple with lots of bogus influences when
matching eg, "!link(done)". It's only necessary for the page being tested
to be an influence of that if the page matches.
---
 IkiWiki.pm                         | 14 +++++++++++++-
 doc/bugs/depends_simple_mixup.mdwn |  6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0791e1e75..509f9ba2e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1818,10 +1818,12 @@ sub add_depends ($$;$) {
 	foreach my $p (keys %pagesources) {
 		my $r=$sub->($p, location => $page);
 		my $i=$r->influences;
+		my $static=$r->influences_static;
 		foreach my $k (keys %$i) {
+			next unless $r || $static || $k eq $page;
 			$depends_simple{$page}{lc $k} |= $i->{$k};
 		}
-		last if $r->influences_static;
+		last if $static;
 	}
 
 	$depends{$page}{$pagespec} |= $deptype;
@@ -2136,6 +2138,9 @@ sub pagespec_match_list ($$;@) {
 		my $r=$sub->($p, %params, location => $page);
 		error(sprintf(gettext("cannot match pages: %s"), $r))
 			if $r->isa("IkiWiki::ErrorReason");
+		unless ($r) {
+			$r->remove_influence($p);
+		}
 		$accum |= $r;
 		if ($r) {
 			push @matches, $p;
@@ -2232,6 +2237,13 @@ sub merge_influences {
 	}
 }
 
+sub remove_influence {
+	my $this=shift;
+	my $torm=shift;
+
+	delete $this->[1]{$torm};
+}
+
 package IkiWiki::ErrorReason;
 
 our @ISA = 'IkiWiki::FailReason';
diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 79bfa8bdc..a5910d02e 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -81,4 +81,8 @@ non-$page influences.
 Hmm, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
 thuroughly wrong. So, what about influence info for other matches
 like `!author(foo)` etc? Currently, none is returned, but it should
-be a content influence. (Backlink influence data is ok.)
+be a content influence. (Backlink influence data seems ok.)
+
+----
+
+[[done]] again!
-- 
cgit v1.2.3


From 738bd2fa1fef83f5624b06c00577ffe4c5a3245d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:28:21 -0400
Subject: note that the new version will have some optimisation fixes

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6b91fd3e6..76405e7da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
     $pagestate{index}.
   * bzr: Support rcs_getmtime, and fix rcs_getctime implementation
     (Jelmer Vernooij)
+  * Quite a lot of new optimisations, and one major fix to a recent
+    performance regression.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From 0db4d920aafa0c7a6b53c59e2605230134ed45eb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:28:58 -0400
Subject: force rebuild from pre 20100422

to ensure those wrong massive depends_simple don't linger on systems that
rebuilt for the other reasons already
---
 debian/NEWS      | 2 +-
 debian/changelog | 2 +-
 debian/postinst  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 9fd882ad2..2fbe0ea7b 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (3.20100406) unstable; urgency=low
+ikiwiki (3.20100422) unstable; urgency=low
 
   This version of ikiwiki has a lot of changes that you need to know about.
 
diff --git a/debian/changelog b/debian/changelog
index 76405e7da..647124b8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100415) UNRELEASED; urgency=low
+ikiwiki (3.20100422) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
diff --git a/debian/postinst b/debian/postinst
index fa0591153..810b7cfe0 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=3.20100410
+firstcompat=3.20100422
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then
-- 
cgit v1.2.3


From 56bb1b48e4b788ecc36d3b7e2583e29af3dd1617 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:36:13 -0400
Subject: format

---
 debian/NEWS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 433fc845c..3a8705680 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -7,13 +7,13 @@ ikiwiki (3.20100422) unstable; urgency=low
   the really important change is, you don't have to remember to use this
   switch. Now ikiwiki will do it when it needs to.
 
-  Starting from this version, the `tagged()` pagespec only matches tags,
+  Starting from this version, the "tagged()" pagespec only matches tags,
   not regular wikilinks. If your wiki accidentially relied on the old,
-  buggy behavior, you might need to change pagespecs to use `link()`.
+  buggy behavior, you might need to change its pagespecs to use "link()".
 
-  Tag pages can automatically be created as new tags are used. This
+  Now tag pages can automatically be created as new tags are used. This
   feature is enabled by default if you have configured a tagbase. It
-  can be turned on or off using the `tag_autocreate` setting.
+  can be turned on or off using the tag_autocreate setting.
 
   The title_natural sort method (as used by the inline directive, etc)
   have been moved to the new sortnaturally plugin, which is not enabled
-- 
cgit v1.2.3


From 170725dc3e6dd99397959c50d8f33bb0c7926f3a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:40:05 -0400
Subject: update

---
 doc/ikiwiki/directive/pagestats/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/ikiwiki/directive/pagestats/discussion.mdwn b/doc/ikiwiki/directive/pagestats/discussion.mdwn
index d72b4058d..99029e88e 100644
--- a/doc/ikiwiki/directive/pagestats/discussion.mdwn
+++ b/doc/ikiwiki/directive/pagestats/discussion.mdwn
@@ -13,3 +13,6 @@ Thanks
 
 > The approach that [PmWiki](http://www.pmwiki.org) takes is that it enables the optional auto-creation of (empty) pages which match a particular "group" (set of sub-pages); thus one could set all the "tags/*" pages to be auto-created, creating a new tags/foo page the first time the \[[!tag foo]] directive is used. See [[todo/auto-create_tag_pages_according_to_a_template]] for more discussion on this idea.
 > -- [[KathrynAndersen]]
+
+> Update: Ikiwiki can auto-create tags now, though it only defaults to
+> doing so when tagbase is set. --[[Joey]] 
-- 
cgit v1.2.3


From 1f5d1dff615b8741a2104dad1d42c13b5b4f6d02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:42:53 -0400
Subject: update

---
 doc/roadmap.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 8e2a01827..c126fd585 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -78,7 +78,8 @@ Probably incomplete list:
 * Make pagespecs match relative by default? (see [[discussion]])
 * Flip wikilinks? (see [[todo/link_plugin_perhaps_too_general?]])
 * YADA format setup files per default?
-* Enable `tag_autocreate` by default.
+* Enable tagbase by default (so that tag autocreation will work by default).
+  Note that this is already done for wikis created by `auto-blog.setup`.
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From 8dc7f3005ebf36d5b126867e7ca0440d495d8ee3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 13:17:45 -0400
Subject: only remove page from influences when influences are not static

This matches what add_depends done
---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 19ed69d75..ec8b32a63 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2148,7 +2148,7 @@ sub pagespec_match_list ($$;@) {
 		my $r=$sub->($p, %params, location => $page);
 		error(sprintf(gettext("cannot match pages: %s"), $r))
 			if $r->isa("IkiWiki::ErrorReason");
-		unless ($r) {
+		unless ($r || $r->influences_static) {
 			$r->remove_influence($p);
 		}
 		$accum |= $r;
-- 
cgit v1.2.3


From ad296f90c3b99bb5e033f769c44e5653f518f264 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 13:45:25 -0400
Subject: add

---
 ...dittemplate_should_look_in_templates_directory_by_default.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/todo/edittemplate_should_look_in_templates_directory_by_default.mdwn

diff --git a/doc/todo/edittemplate_should_look_in_templates_directory_by_default.mdwn b/doc/todo/edittemplate_should_look_in_templates_directory_by_default.mdwn
new file mode 100644
index 000000000..4bc10e432
--- /dev/null
+++ b/doc/todo/edittemplate_should_look_in_templates_directory_by_default.mdwn
@@ -0,0 +1,8 @@
+[[plugins/edittemplate]] looks for the specified template relative to the
+page the directive appears on. Which can be handy, eg, make a
+blog/mytemplate and put the directive on blog, and it will find
+"mytemplate". However, it can also be confusing, since other templates
+always are looked for in `templates/`.
+
+I think it should probably fall back to looking for `templates/$foo`.
+--[[Joey]] 
-- 
cgit v1.2.3


From 584391aedd2f5392db7e9d3d46cf202d6cb8e951 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 14:07:45 -0400
Subject: clarify

---
 doc/plugins/write.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 404c3b44f..9e8c59f63 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -315,9 +315,9 @@ a new custom parameter to the template.
 
 This hook allows plugins to change the [[template|wikitemplates]] that is
 used for a page in the wiki. The hook is passed a "page" parameter, and
-should return the name of the template file to use, or undef if it doesn't
-want to change the default ("page.tmpl"). Template files are looked for in
-/usr/share/ikiwiki/templates by default.
+should return the name of the template file to use (relative to the
+template directory), or undef if it doesn't want to change the default
+("page.tmpl").
 
 ### sanitize
 
-- 
cgit v1.2.3


From 23d62f42bd8fe18087cd293962a79d937cf5a3bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 14:35:00 -0400
Subject: remove add_templates option

Templates are moving into the srcdir, and will also be searched for in
configured underlays, so this is redundant.
---
 IkiWiki.pm                 |  9 +--------
 IkiWiki/Plugin/underlay.pm | 11 -----------
 doc/plugins/underlay.mdwn  |  6 ------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ec8b32a63..c2c2337b4 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -157,13 +157,6 @@ sub getsetup () {
 		safe => 0, # path
 		rebuild => 1,
 	},
-	templatedirs => {
-		type => "internal",
-		default => [],
-		description => "additional directories containing template files",
-		safe => 0,
-		rebuild => 0,
-	},
 	underlaydir => {
 		type => "string",
 		default => "$installdir/share/ikiwiki/basewiki",
@@ -1661,7 +1654,7 @@ sub saveindex () {
 sub template_file ($) {
 	my $template=shift;
 
-	foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
+	foreach my $dir ($config{templatedir},
 	                 "$installdir/share/ikiwiki/templates") {
 		return "$dir/$template" if -e "$dir/$template";
 	}
diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 116fe7324..3ea19c635 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -27,14 +27,6 @@ sub getsetup () {
 			safe => 0,
 			rebuild => 1,
 		},
-		add_templates => {
-			type => "string",
-			example => ["$ENV{HOME}/.ikiwiki/templates"],
-			description => "extra template directories to add",
-			advanced => 1,
-			safe => 0,
-			rebuild => 1,
-		},
 }
 
 sub checkconfig () {
@@ -43,9 +35,6 @@ sub checkconfig () {
 			add_underlay($dir);
 		}
 	}
-	if ($config{add_templates}) {
-		push @{$config{templatedirs}}, @{$config{add_templates}};
-	}
 }
 
 1;
diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn
index 8836a394c..0cf819472 100644
--- a/doc/plugins/underlay.mdwn
+++ b/doc/plugins/underlay.mdwn
@@ -12,9 +12,3 @@ revision control, like photos or software releases.
 Directories in `add_underlays` should usually be absolute. If relative,
 they're interpreted as relative to the parent directory of the basewiki
 underlay, which is probably not particularly useful in this context.
-
---
-
-This plugin also adds an `add_templates` option to the setup file.
-Its value is a list of template directories to look for template files in,
-if they are not present in the `templatedir`.
-- 
cgit v1.2.3


From 8eac7c2ad4966bdf2a1ea003df9e356da4c4e6bd Mon Sep 17 00:00:00 2001
From: "http://seph.myopenid.com/" <http://seph.myopenid.com/@web>
Date: Thu, 22 Apr 2010 19:15:42 +0000
Subject:

---
 doc/ikiwiki/directive/map/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
index f6eaa6b80..a39862347 100644
--- a/doc/ikiwiki/directive/map/discussion.mdwn
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -83,3 +83,9 @@ Is there any way to do that?  I don't mind mucking around with `\[[!meta]]` on e
 >>> I think that the ideas and code in
 >>> [[todo/tracking_bugs_with_dependencies]] might also handle this case.
 >>> --[[Joey]]
+
+----
+
+I feel like this should be obvious, but I can't figure out how to sort numerically. 
+
+I have `map pages="./* and !*/Discussion and !*/sidebar"`  and a bunch of pages with names like 1, 2, 3, 11, 12, 1/1.1, 12/12.3 etc. I want to sort them numerically. I see lots of conversation implying there's a simple way to do it, but not how.
-- 
cgit v1.2.3


From 418670c7e85ca32252b82b505ba6bb907229306e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 22 Apr 2010 19:28:31 +0000
Subject: map can't currently change sort ordering

---
 doc/ikiwiki/directive/map/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
index a39862347..b7ac17b1a 100644
--- a/doc/ikiwiki/directive/map/discussion.mdwn
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -89,3 +89,9 @@ Is there any way to do that?  I don't mind mucking around with `\[[!meta]]` on e
 I feel like this should be obvious, but I can't figure out how to sort numerically. 
 
 I have `map pages="./* and !*/Discussion and !*/sidebar"`  and a bunch of pages with names like 1, 2, 3, 11, 12, 1/1.1, 12/12.3 etc. I want to sort them numerically. I see lots of conversation implying there's a simple way to do it, but not how.
+
+> No, you can't: map can't currently use a non-default sort order. If it
+> could, then you could use [[plugins/sortnaturally]]. There's a
+> [[feature_request|todo/sort_parameter_for_map_plugin_and_directive]];
+> [[a_bug_references_it|bugs/map_sorts_by_pagename_and_not_title_when_show=title_is_used]].
+> --[[smcv]]
-- 
cgit v1.2.3


From abd233931247ef38f1b084afd5906619f02c13b6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 15:34:32 -0400
Subject: look for templates in srcdir and underlays, first

This entailed changing template_params; it no longer takes the template
filename as its first parameter.

Add template_depends to api and replace calls to template() with
template_depends() in appropriate places, where a dependency should be
added on the template.

Other plugins don't use template(), so will need further work.

Also, includes are disabled for security. Enabling includes only when using
templates from the templatedir would be nice, but would add a lot of
complexity to the implementation.
---
 IkiWiki.pm                 | 59 +++++++++++++++++++++++++++-------------------
 IkiWiki/Plugin/comments.pm |  2 +-
 IkiWiki/Plugin/editpage.pm |  2 +-
 IkiWiki/Plugin/google.pm   |  2 +-
 IkiWiki/Plugin/inline.pm   | 22 ++++++++++-------
 IkiWiki/Plugin/search.pm   |  2 +-
 IkiWiki/Render.pm          |  4 +++-
 doc/plugins/write.mdwn     |  8 +++++++
 8 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c2c2337b4..1327e4db5 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -18,8 +18,8 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	%autofiles};
 
 use Exporter q{import};
-our @EXPORT = qw(hook debug error template htmlpage deptype
-	add_depends pagespec_match pagespec_match_list bestlink
+our @EXPORT = qw(hook debug error htmlpage template template_depends
+	deptype add_depends pagespec_match pagespec_match_list bestlink
 	htmllink readfile writefile pagetype srcfile pagename
 	displaytime will_render gettext ngettext urlto targetpage
 	add_underlay pagetitle titlepage linkpage newpagefile
@@ -1652,47 +1652,58 @@ sub saveindex () {
 }
 
 sub template_file ($) {
-	my $template=shift;
+	my $name=shift;
 
+	my $template=srcfile("templates/$name", 1);
+	return $template if defined $template;
+	
 	foreach my $dir ($config{templatedir},
 	                 "$installdir/share/ikiwiki/templates") {
-		return "$dir/$template" if -e "$dir/$template";
+		return "$dir/$name" if -e "$dir/$name";
 	}
 	return;
 }
 
 sub template_params (@) {
-	my $filename=template_file(shift);
-
-	if (! defined $filename) {
-		return if wantarray;
-		return "";
-	}
+	filter => sub {
+		my $text_ref = shift;
+		${$text_ref} = decode_utf8(${$text_ref});
+	},
+	loop_context_vars => 1,
+	die_on_bad_params => 0,
+	@_,
+	no_includes => 1,
+}
 
-	my @ret=(
-		filter => sub {
-			my $text_ref = shift;
-			${$text_ref} = decode_utf8(${$text_ref});
-		},
-		filename => $filename,
-		loop_context_vars => 1,
-		die_on_bad_params => 0,
+sub template ($;@) {
+	require HTML::Template;
+	return HTML::Template->new(template_params(
+		filename => template_file(shift),
 		@_
-	);
-	return wantarray ? @ret : {@ret};
+	));
 }
 
-sub template ($;@) {
+sub template_depends ($$;@) {
+	my $name=shift;
+	my $page=shift;
+
+	if (defined $page) {
+		add_depends($page, "templates/$name");
+	}
+	my $filename=template_file($name);
+
 	require HTML::Template;
-	return HTML::Template->new(template_params(@_));
+	return HTML::Template->new(template_params(
+		filename => $filename,
+		@_
+	));
 }
 
 sub misctemplate ($$;@) {
 	my $title=shift;
 	my $pagebody=shift;
 	
-	my $template=template("misc.tmpl");
-	$template->param(
+	my $template=template("misc.tmpl",
 		title => $title,
 		indexlink => indexlink(),
 		wikiname => $config{wikiname},
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 58bd4b851..ed75a6e46 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -274,7 +274,7 @@ sub editcomment ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => scalar IkiWiki::template_params('editcomment.tmpl'),
+		template => template('editcomment.tmpl'),
 	);
 
 	IkiWiki::decode_form_utf8($form);
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 26e38abc1..5c94ecbca 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -78,7 +78,7 @@ sub cgi_editpage ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => scalar template_params("editpage.tmpl"),
+		template => template("editpage.tmpl"),
 	);
 	
 	decode_form_utf8($form);
diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 48ad4c8ce..68cb16513 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -36,7 +36,7 @@ sub pagetemplate (@) {
 	# Add search box to page header.
 	if ($template->query(name => "searchform")) {
 		if (! defined $form) {
-			my $searchform = template("googleform.tmpl", blind_cache => 1);
+			my $searchform = template_depends("googleform.tmpl", $page, blind_cache => 1);
 			$searchform->param(url => $config{url});
 			$form=$searchform->output;
 		}
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 3359af314..043649742 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -299,7 +299,7 @@ sub preprocess_inline (@) {
 	    (exists $params{postform} && yesno($params{postform}))) &&
 	    IkiWiki->can("cgi_editpage")) {
 		# Add a blog post form, with feed buttons.
-		my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
+		my $formtemplate=template_depends("blogpost.tmpl", $params{page}, blind_cache => 1);
 		$formtemplate->param(cgiurl => $config{cgiurl});
 		$formtemplate->param(rootpage => rootpage(%params));
 		$formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
@@ -320,19 +320,23 @@ sub preprocess_inline (@) {
 	}
 	elsif ($feeds && !$params{preview} && ($emptyfeeds || @feedlist)) {
 		# Add feed buttons.
-		my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
+		my $linktemplate=template_depends("feedlink.tmpl", $params{page}, blind_cache => 1);
 		$linktemplate->param(rssurl => $rssurl) if $rss;
 		$linktemplate->param(atomurl => $atomurl) if $atom;
 		$ret.=$linktemplate->output;
 	}
 	
 	if (! $feedonly) {
-		require HTML::Template;
-		my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
-		if (! @params) {
-			error sprintf(gettext("nonexistant template %s"), $params{template});
+		my $template;
+		if (! $raw) {
+			eval {
+				$template=template_depends($params{template}.".tmpl", $params{page},
+					blind_cache => 1);
+			};
+			if (! $@ || ! $template) {
+				error sprintf(gettext("nonexistant template %s"), $params{template});
+			}
 		}
-		my $template=HTML::Template->new(@params) unless $raw;
 		my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));
 	
 		foreach my $page (@list) {
@@ -534,7 +538,7 @@ sub genfeed ($$$$$@) {
 	
 	my $url=URI->new(encode_utf8(urlto($page,"",1)));
 	
-	my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1);
+	my $itemtemplate=template_depends($feedtype."item.tmpl", $page, blind_cache => 1);
 	my $content="";
 	my $lasttime = 0;
 	foreach my $p (@pages) {
@@ -598,7 +602,7 @@ sub genfeed ($$$$$@) {
 		$lasttime = $pagemtime{$p} if $pagemtime{$p} > $lasttime;
 	}
 
-	my $template=template($feedtype."page.tmpl", blind_cache => 1);
+	my $template=template_depends($feedtype."page.tmpl", $page, blind_cache => 1);
 	$template->param(
 		title => $page ne "index" ? pagetitle($page) : $config{wikiname},
 		wikiname => $config{wikiname},
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index a1e7026ca..55edf8752 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -52,7 +52,7 @@ sub pagetemplate (@) {
 	# Add search box to page header.
 	if ($template->query(name => "searchform")) {
 		if (! defined $form) {
-			my $searchform = template("searchform.tmpl", blind_cache => 1);
+			my $searchform = template_depends("searchform.tmpl", $page, blind_cache => 1);
 			$searchform->param(searchaction => $config{cgiurl});
 			$form=$searchform->output;
 		}
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 49d080c16..7cf19645e 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -74,7 +74,9 @@ sub genpage ($$) {
 			$templatefile=$file;
 		}
 	});
-	my $template=template(defined $templatefile ? $templatefile : 'page.tmpl', blind_cache => 1);
+	my $template=template_depends(
+		defined $templatefile ? $templatefile : 'page.tmpl', $page,
+		blind_cache => 1);
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 9e8c59f63..eaa008131 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -705,6 +705,14 @@ Creates and returns a [[!cpan HTML::Template]] object. The first parameter
 is the name of the file in the template directory. The optional remaining
 parameters are passed to `HTML::Template->new`.
 
+### `template_depends($$;@)`
+
+Use this instead of `template()` if the content of a template is being
+included into a page. This causes the page to depend on the template,
+so it will be updated if the template is modified.
+
+Like `template()`, except the second parameter is the page.
+
 ### `htmlpage($)`
 
 Passed a page name, returns the base name that will be used for a the html
-- 
cgit v1.2.3


From bbd7e73f64cb5e24965343f7e605870e060c5df1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 15:58:06 -0400
Subject: refactor to remove template_params

template_file will be kept separate, since it needs to be memoized
---
 IkiWiki.pm | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1327e4db5..0aaf60569 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1664,23 +1664,8 @@ sub template_file ($) {
 	return;
 }
 
-sub template_params (@) {
-	filter => sub {
-		my $text_ref = shift;
-		${$text_ref} = decode_utf8(${$text_ref});
-	},
-	loop_context_vars => 1,
-	die_on_bad_params => 0,
-	@_,
-	no_includes => 1,
-}
-
 sub template ($;@) {
-	require HTML::Template;
-	return HTML::Template->new(template_params(
-		filename => template_file(shift),
-		@_
-	));
+	template_depends(shift, undef, @_);
 }
 
 sub template_depends ($$;@) {
@@ -1693,10 +1678,17 @@ sub template_depends ($$;@) {
 	my $filename=template_file($name);
 
 	require HTML::Template;
-	return HTML::Template->new(template_params(
+	return HTML::Template->new(
+		filter => sub {
+			my $text_ref = shift;
+			${$text_ref} = decode_utf8(${$text_ref});
+		},
+		loop_context_vars => 1,
+		die_on_bad_params => 0,
 		filename => $filename,
-		@_
-	));
+		@_,
+		no_includes => 1,
+	);
 }
 
 sub misctemplate ($$;@) {
-- 
cgit v1.2.3


From 915d5bc32689623b1ff5594602a546e59f826b58 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 15:59:04 -0400
Subject: add

---
 template-transition-notes | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 template-transition-notes

diff --git a/template-transition-notes b/template-transition-notes
new file mode 100644
index 000000000..193dd79d4
--- /dev/null
+++ b/template-transition-notes
@@ -0,0 +1,5 @@
+* add_templates option removed from underlay plugin
+  (can use add_underlays instead)
+* includes no longer allowed in templates
+* template directive no longer uses $foo.tmpl , only
+  page $foo.
-- 
cgit v1.2.3


From 4c99904af30c9213060809937962c1a4ab9c5ad2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 16:29:49 -0400
Subject: reference my branch for this

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index a112cb9da..66aa07193 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -39,6 +39,9 @@ Note also that when using templates from "$srcdir/templates/", `no_includes`
 needs to be set. Currently this is done by the two plugins that use
 such templates, while includes are allowed in `templatedir`.
 
+Have started working on this.
+[[!template id=gitbranch branch=origin/templatemove author="[[Joey]]"]]
+
 > But would this require that templates be parseable as wiki pages?  Because that would be a nuisance. --[[KathrynAndersen]]
 
 >> It would be better for them not to be rendered separately at all.
-- 
cgit v1.2.3


From 2cd92fcb22166351193cc2b68d9c61744b480b36 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 20:13:47 -0400
Subject: use meta title

---
 templates/autotag.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl
index 7b0d4c90f..f670982b6 100644
--- a/templates/autotag.tmpl
+++ b/templates/autotag.tmpl
@@ -1,3 +1,3 @@
-## Pages tagged <TMPL_VAR TAGNAME> ##
+[[!meta title="tag <TMPL_VAR TAGNAME>"]]
 
 [[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"]]
-- 
cgit v1.2.3


From 898fc1095563412400484d5378ad82b334414b36 Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Fri, 23 Apr 2010 02:36:27 +0000
Subject:

---
 ...ails_oddly_when_older_ikiwiki_is_installed.mdwn | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn

diff --git a/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn b/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
new file mode 100644
index 000000000..b11972165
--- /dev/null
+++ b/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
@@ -0,0 +1,26 @@
+I got this failure when trying to build ikiwiki version 3.20100403:
+
+	$ perl Makefile.PL INSTALL_BASE=/opt/ikiwiki PREFIX=
+	Writing Makefile for IkiWiki
+	$ make
+
+*...snip...*
+
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki.in > ikiwiki.out
+	chmod +x ikiwiki.out
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-transition.in > ikiwiki-transition.out
+	chmod +x ikiwiki-transition.out
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-calendar.in > ikiwiki-calendar.out
+	chmod +x ikiwiki-calendar.out
+	HOME=/home/me /usr/bin/perl -Iblib/lib   ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+	Use of uninitialized value $IkiWiki::Setup::config{"setuptype"} in concatenation (.) or string at IkiWiki/Setup.pm line 53.
+	Can't locate IkiWiki/Setup/.pm in @INC (@INC contains: . /opt/ikiwiki/lib/perl5/i486-linux-gnu-thread-multi /opt/ikiwiki/lib/perl5 blib/lib /etc/perl /usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 35) line 3.
+
+	make: *** [ikiwiki.setup] Error 2
+
+Note that I had been trying to upgrade with an installed ikiwiki 3.20091114
+already in place under /opt/ikiwiki.  The build does not fail for me
+if I first remove the old ikiwiki installation, nor does it fail with
+3.20100403 or newer installed at /opt/ikiwiki.  Hence this is not
+really a critical bug, although it's somewhat perplexing to me why it
+ought to make a difference.
-- 
cgit v1.2.3


From a2feb7d477a57a4e7feb1334e7ff4abc4067b1d3 Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Fri, 23 Apr 2010 02:40:36 +0000
Subject: rename
 bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn to
 bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn

---
 ...ails_oddly_when_older_ikiwiki_is_installed.mdwn | 26 ++++++++++++++++++++++
 ...ails_oddly_when_older_ikiwiki_is_installed.mdwn | 26 ----------------------
 2 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
 delete mode 100644 doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn

diff --git a/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
new file mode 100644
index 000000000..b11972165
--- /dev/null
+++ b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
@@ -0,0 +1,26 @@
+I got this failure when trying to build ikiwiki version 3.20100403:
+
+	$ perl Makefile.PL INSTALL_BASE=/opt/ikiwiki PREFIX=
+	Writing Makefile for IkiWiki
+	$ make
+
+*...snip...*
+
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki.in > ikiwiki.out
+	chmod +x ikiwiki.out
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-transition.in > ikiwiki-transition.out
+	chmod +x ikiwiki-transition.out
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-calendar.in > ikiwiki-calendar.out
+	chmod +x ikiwiki-calendar.out
+	HOME=/home/me /usr/bin/perl -Iblib/lib   ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+	Use of uninitialized value $IkiWiki::Setup::config{"setuptype"} in concatenation (.) or string at IkiWiki/Setup.pm line 53.
+	Can't locate IkiWiki/Setup/.pm in @INC (@INC contains: . /opt/ikiwiki/lib/perl5/i486-linux-gnu-thread-multi /opt/ikiwiki/lib/perl5 blib/lib /etc/perl /usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 35) line 3.
+
+	make: *** [ikiwiki.setup] Error 2
+
+Note that I had been trying to upgrade with an installed ikiwiki 3.20091114
+already in place under /opt/ikiwiki.  The build does not fail for me
+if I first remove the old ikiwiki installation, nor does it fail with
+3.20100403 or newer installed at /opt/ikiwiki.  Hence this is not
+really a critical bug, although it's somewhat perplexing to me why it
+ought to make a difference.
diff --git a/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn b/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
deleted file mode 100644
index b11972165..000000000
--- a/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-I got this failure when trying to build ikiwiki version 3.20100403:
-
-	$ perl Makefile.PL INSTALL_BASE=/opt/ikiwiki PREFIX=
-	Writing Makefile for IkiWiki
-	$ make
-
-*...snip...*
-
-	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki.in > ikiwiki.out
-	chmod +x ikiwiki.out
-	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-transition.in > ikiwiki-transition.out
-	chmod +x ikiwiki-transition.out
-	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-calendar.in > ikiwiki-calendar.out
-	chmod +x ikiwiki-calendar.out
-	HOME=/home/me /usr/bin/perl -Iblib/lib   ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
-	Use of uninitialized value $IkiWiki::Setup::config{"setuptype"} in concatenation (.) or string at IkiWiki/Setup.pm line 53.
-	Can't locate IkiWiki/Setup/.pm in @INC (@INC contains: . /opt/ikiwiki/lib/perl5/i486-linux-gnu-thread-multi /opt/ikiwiki/lib/perl5 blib/lib /etc/perl /usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 35) line 3.
-
-	make: *** [ikiwiki.setup] Error 2
-
-Note that I had been trying to upgrade with an installed ikiwiki 3.20091114
-already in place under /opt/ikiwiki.  The build does not fail for me
-if I first remove the old ikiwiki installation, nor does it fail with
-3.20100403 or newer installed at /opt/ikiwiki.  Hence this is not
-really a critical bug, although it's somewhat perplexing to me why it
-ought to make a difference.
-- 
cgit v1.2.3


From 5bc7efab7cc7a437d3d593a3ff62595ed0ab7f81 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 23:00:33 -0400
Subject: switch to PERL5LIB so that use lib inserted for INSTALL_BASE is
 overridden during build

---
 Makefile.PL                                                     | 6 +++---
 doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 38db20d44..794a2ed47 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -36,7 +36,7 @@ scripts=ikiwiki-update-wikilist ikiwiki-makerepo
 	chmod +x $@
 
 ikiwiki.setup: ikiwiki.out
-	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+	PERL5LIB=. HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -dumpsetup ikiwiki.setup
 
 extra_build: $(outprogs) ikiwiki.setup docwiki
 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
@@ -50,10 +50,10 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
 	rm -f ikiwiki.spec.bkp
 	
 docwiki: ikiwiki.out
-	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
+	PERL5LIB=. $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -setup docwiki.setup -refresh
 
 extra_clean:
-	$(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
+	PERL5LIB=. $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
 	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
diff --git a/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
index b11972165..7b252031b 100644
--- a/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
+++ b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
@@ -24,3 +24,8 @@ if I first remove the old ikiwiki installation, nor does it fail with
 3.20100403 or newer installed at /opt/ikiwiki.  Hence this is not
 really a critical bug, although it's somewhat perplexing to me why it
 ought to make a difference.
+
+> So, using INSTALL_BASE causes a 'use lib' to be hardcoded into the `.out`
+> files; which overrides the -libdir and the -I, and so the old version
+> of IkiWiki.pm is used.
+> [[fixed|done]] --[[Joey]] 
-- 
cgit v1.2.3


From aaf1d98ebe08271abee8b55f76e5a59183894acb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 23:14:57 -0400
Subject: better fix for use lib issue

PER5LIB does not override fully, so need to run .in versions
---
 Makefile.PL | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 794a2ed47..b079886ac 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,8 +35,8 @@ scripts=ikiwiki-update-wikilist ikiwiki-makerepo
 	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
 	chmod +x $@
 
-ikiwiki.setup: ikiwiki.out
-	PERL5LIB=. HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -dumpsetup ikiwiki.setup
+ikiwiki.setup:
+	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup
 
 extra_build: $(outprogs) ikiwiki.setup docwiki
 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
@@ -49,11 +49,11 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
 	sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
 	rm -f ikiwiki.spec.bkp
 	
-docwiki: ikiwiki.out
-	PERL5LIB=. $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -setup docwiki.setup -refresh
+docwiki:
+	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh
 
 extra_clean:
-	PERL5LIB=. $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
+	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
 	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
-- 
cgit v1.2.3


From f5466ad7173459bc9481781d8f54ba969f56a516 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Fri, 23 Apr 2010 16:29:05 +0100
Subject: how important is perl 5.10?

---
 doc/setup/discussion.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index b71263dae..2000c5dfb 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -245,3 +245,12 @@ Thank you! I'm not a Perl programmer, so what's your opinion: is this behavior a
 
 I am experiencing the same problem "/etc/ikiwiki/custom: failed to set up the repository with ikiwiki-makerepo
 " on Debian squeeze with perl5.10.0. Upgrading to ikiwiki 3.10 fixes it. -- [Albert](http://www.docunext.com/)
+
+----
+
+Just a note, perl 5.10 isn't packaged as part of RHEL or thus CentOS nor EPEL,
+so it's not especially trivial to satisfy that requirement for ikiwiki on
+those platforms, without backporting it from Fedora or building from source.
+However, I have an ikiwiki 3.20100403 running on RHEL-4 supplied 5.8.8 without
+(seemingly too much) complaint.  How strong is the 5.10 requirement? what
+precicely breaks without it? -- [[Jon]]
-- 
cgit v1.2.3


From e779098796e18c11c43e9e38339577376ded8e2b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 12:35:23 -0400
Subject: update copyright years

---
 debian/copyright | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index ad72a0459..d4bb1009f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
 Files: *
-Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info>
+Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 License: GPL-2+
  The full text of the GPL is distributed as doc/GPL in ikiwiki's source,
  and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
 
 Files: templates/*, underlays/basewiki/*, doc/ikiwiki/directive/*, ikiwiki.setup, po/underlay/*
-Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info>
+Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 License: other
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
-- 
cgit v1.2.3


From 4afe2d1170e85a09d43460045b5825fce081c469 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Fri, 23 Apr 2010 17:20:51 +0000
Subject: add my repository in the list

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 0f280fb35..a5fd742ca 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -62,6 +62,7 @@ think about merging them. This is recommended. :-)
   ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
 * [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
+* [[privat]] `git://github.com/privat/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 92c927cb9285fb2b6e185f24d93ced3729bda04e Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 23 Apr 2010 18:28:20 +0100
Subject: half-formed thought about accessible profiling

---
 doc/users/jon.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index d5593dcbf..eb01821ff 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -51,6 +51,8 @@ Penultimately, the following are merely half-formed thoughts:
    unticking checkboxes next to a tag name (rather than entering the 
    directive into the text of the page directly)
  * perhaps the same for meta
+ * I'd like to make profiling ikiwiki in action very easy for newcomers.
+   Perhaps even a plugin that created a file /profile or similar on build.
 
 Finally, backlinks (since I have issues with the current backlinks
 implementation, see [[bugs/backlinks onhover thing can go weird]]):
-- 
cgit v1.2.3


From 53c8bf9ed98f263163768daeb1d4e0fdbf6e7ef3 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Fri, 23 Apr 2010 17:28:38 +0000
Subject: multiple_sidebars in a gitbranch

---
 doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index 02b83244e..bb4339f88 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -15,6 +15,8 @@ those contents instead.
 
 >> Here a simple [[patch]] for multiple sidebars. Not too fancy but better than having multiple copies of the sidebar plugin. --[[jeanprivat]]
 
+>>> I made a [[git]] branch for it [[!template id=gitbranch branch="privat/multiple_sidebars" author="[[jeanprivat]]"]] --[[jeanprivat]]
+
 <pre>
 --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
 +++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
-- 
cgit v1.2.3


From 796ece2a8a482f219a5d4c568af271286511574e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 13:30:52 -0400
Subject: response

---
 doc/setup/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 2000c5dfb..74f7740db 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -254,3 +254,7 @@ those platforms, without backporting it from Fedora or building from source.
 However, I have an ikiwiki 3.20100403 running on RHEL-4 supplied 5.8.8 without
 (seemingly too much) complaint.  How strong is the 5.10 requirement? what
 precicely breaks without it? -- [[Jon]]
+
+> I don't remember what was the specific problem with perl 5.8.8. All I can
+> find is some taint checking bugs, which are currently worked around by
+> taint checking being disabled. --[[Joey]]
-- 
cgit v1.2.3


From 011d88052d6dacb6a9d84b1489d37eefeb992da1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 14:00:53 -0400
Subject: fix logic

---
 IkiWiki/Plugin/inline.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 043649742..2d47cb4be 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -333,8 +333,8 @@ sub preprocess_inline (@) {
 				$template=template_depends($params{template}.".tmpl", $params{page},
 					blind_cache => 1);
 			};
-			if (! $@ || ! $template) {
-				error sprintf(gettext("nonexistant template %s"), $params{template});
+			if ($@ || ! $template) {
+				error sprintf(gettext("nonexistant template %s.tmpl"), $params{template});
 			}
 		}
 		my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));
-- 
cgit v1.2.3


From 54898d16d4c86fddcb1b5588eac67a729c14deeb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 14:44:37 -0400
Subject: allow a bare page name to be specified as a template

---
 IkiWiki.pm                | 31 +++++++++++++++++++++----------
 doc/plugins/write.mdwn    | 11 +++++++++--
 template-transition-notes |  1 +
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0aaf60569..03441b594 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1653,9 +1653,18 @@ sub saveindex () {
 
 sub template_file ($) {
 	my $name=shift;
+	
+	my $tpage="templates/$name";
+	if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
+		$tpage=$pagesources{$tpage};
+		$name.=".tmpl";
+	}
 
-	my $template=srcfile("templates/$name", 1);
-	return $template if defined $template;
+	my $template=srcfile($tpage, 1);
+	if (defined $template) {
+		return $template, $tpage if wantarray;
+		return $template;
+	}
 	
 	foreach my $dir ($config{templatedir},
 	                 "$installdir/share/ikiwiki/templates") {
@@ -1664,18 +1673,16 @@ sub template_file ($) {
 	return;
 }
 
-sub template ($;@) {
-	template_depends(shift, undef, @_);
-}
-
 sub template_depends ($$;@) {
 	my $name=shift;
 	my $page=shift;
-
-	if (defined $page) {
-		add_depends($page, "templates/$name");
+	
+	my ($filename, $tpage)=template_file($name);
+	if (defined $page && defined $tpage) {
+		add_depends($page, $tpage);
 	}
-	my $filename=template_file($name);
+
+	return unless defined $filename;
 
 	require HTML::Template;
 	return HTML::Template->new(
@@ -1691,6 +1698,10 @@ sub template_depends ($$;@) {
 	);
 }
 
+sub template ($;@) {
+	template_depends(shift, undef, @_);
+}
+
 sub misctemplate ($$;@) {
 	my $title=shift;
 	my $pagebody=shift;
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index eaa008131..1407b5a12 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -702,8 +702,15 @@ the entire wiki build and make the wiki unusable.
 ### `template($;@)`
 
 Creates and returns a [[!cpan HTML::Template]] object. The first parameter
-is the name of the file in the template directory. The optional remaining
-parameters are passed to `HTML::Template->new`.
+is the name of the template file. The optional remaining parameters are
+passed to `HTML::Template->new`.
+
+The template file is first looked for in the templates/ subdirectory of the
+srcdir. Failing that, it is looked for in the templatedir. Typically
+the filename will have a ".tmpl" extension. If a filename with no extension
+is passed, a wiki page in templates/ with its name is used as the template.
+That should only be done for templates which it is safe to let wiki users
+edit.
 
 ### `template_depends($$;@)`
 
diff --git a/template-transition-notes b/template-transition-notes
index 193dd79d4..ccff3e78f 100644
--- a/template-transition-notes
+++ b/template-transition-notes
@@ -3,3 +3,4 @@
 * includes no longer allowed in templates
 * template directive no longer uses $foo.tmpl , only
   page $foo.
+* template_params removed (not exported API)
-- 
cgit v1.2.3


From d4d7d5ddaf9264d7bc46b83ff87eb919b876568c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 14:45:02 -0400
Subject: use same error string as template.pm does

---
 IkiWiki/Plugin/inline.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2d47cb4be..5d99c9da2 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -334,7 +334,7 @@ sub preprocess_inline (@) {
 					blind_cache => 1);
 			};
 			if ($@ || ! $template) {
-				error sprintf(gettext("nonexistant template %s.tmpl"), $params{template});
+				error sprintf(gettext("template %s not found"), $params{template}.".tmpl");
 			}
 		}
 		my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));
-- 
cgit v1.2.3


From 753bfb17a0b593137341fe61c1a7db5dccd00efa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 14:45:48 -0400
Subject: switch to using template_depends

It now handles all the details of finding a page template that this used to
need to implement.
---
 IkiWiki/Plugin/template.pm | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 98a13b5fa..fc8292010 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -5,7 +5,6 @@ package IkiWiki::Plugin::template;
 use warnings;
 use strict;
 use IkiWiki 3.00;
-use HTML::Template;
 use Encode;
 
 sub import {
@@ -34,36 +33,20 @@ sub preprocess (@) {
 		error gettext("missing id parameter")
 	}
 
-	my $template_page="templates/$params{id}";
-	add_depends($params{page}, $template_page);
-
-	my $template_file;
-	if (exists $pagesources{$template_page}) {
-		$template_file=srcfile($pagesources{$template_page});
-	}
-	else {
-		$template_file=IkiWiki::template_file("$params{id}.tmpl")
-	}
-	return sprintf(gettext("template %s not found"),
-		htmllink($params{page}, $params{destpage}, "/".$template_page))
-			unless defined $template_file;
-
+	# The bare id is used, so a page templates/$id will be used as 
+	# the template.
 	my $template;
 	eval {
-		$template=HTML::Template->new(
-	        	filter => sub {
-	                        my $text_ref = shift;
-	                        $$text_ref=&Encode::decode_utf8($$text_ref);
-				chomp $$text_ref;
-	                },
-	                filename => $template_file,
-       			die_on_bad_params => 0,
-			no_includes => 1,
-			blind_cache => 1,
-		);
+		$template=template_depends($params{id}, $params{page},
+			blind_cache => 1);
 	};
 	if ($@) {
-		error gettext("failed to process:")." $@"
+		error gettext("failed to process:")." $@";
+	}
+	if (! $template) {
+		error sprintf(gettext("%s not found"),
+			htmllink($params{page}, $params{destpage},
+				"/templates/$params{id}"))
 	}
 
 	$params{basename}=IkiWiki::basename($params{page});
-- 
cgit v1.2.3


From ee8d237f98b2c82b441dc7c26f6ce8545362cb73 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 14:50:00 -0400
Subject: improved error message

---
 IkiWiki/Plugin/inline.pm   | 7 ++++++-
 IkiWiki/Plugin/template.pm | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 5d99c9da2..95fe90312 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -329,11 +329,16 @@ sub preprocess_inline (@) {
 	if (! $feedonly) {
 		my $template;
 		if (! $raw) {
+			# cannot use wiki pages as templates; template not sanitized due to
+			# format hook hack
 			eval {
 				$template=template_depends($params{template}.".tmpl", $params{page},
 					blind_cache => 1);
 			};
-			if ($@ || ! $template) {
+			if ($@) {
+				error gettext("failed to process template:")." $@";
+			}
+			if (! $template) {
 				error sprintf(gettext("template %s not found"), $params{template}.".tmpl");
 			}
 		}
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index fc8292010..e5a0c05c3 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -41,7 +41,7 @@ sub preprocess (@) {
 			blind_cache => 1);
 	};
 	if ($@) {
-		error gettext("failed to process:")." $@";
+		error gettext("failed to process template:")." $@";
 	}
 	if (! $template) {
 		error sprintf(gettext("%s not found"),
-- 
cgit v1.2.3


From 78fd3b35a2805489185a14e00b53b450eec961f1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 15:02:07 -0400
Subject: allow template pages to not be under templates/

---
 IkiWiki.pm             |  4 +++-
 doc/plugins/write.mdwn | 14 ++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 03441b594..78612cd08 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1654,7 +1654,7 @@ sub saveindex () {
 sub template_file ($) {
 	my $name=shift;
 	
-	my $tpage="templates/$name";
+	my $tpage=($name =~ /^\//) ? $name : "templates/$name";
 	if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
 		$tpage=$pagesources{$tpage};
 		$name.=".tmpl";
@@ -1665,6 +1665,8 @@ sub template_file ($) {
 		return $template, $tpage if wantarray;
 		return $template;
 	}
+
+	$name=~s:/::; # avoid path traversal
 	
 	foreach my $dir ($config{templatedir},
 	                 "$installdir/share/ikiwiki/templates") {
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 1407b5a12..00b54bdd3 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -705,12 +705,14 @@ Creates and returns a [[!cpan HTML::Template]] object. The first parameter
 is the name of the template file. The optional remaining parameters are
 passed to `HTML::Template->new`.
 
-The template file is first looked for in the templates/ subdirectory of the
-srcdir. Failing that, it is looked for in the templatedir. Typically
-the filename will have a ".tmpl" extension. If a filename with no extension
-is passed, a wiki page in templates/ with its name is used as the template.
-That should only be done for templates which it is safe to let wiki users
-edit.
+Normally, the template file is first looked for in the templates/ subdirectory
+of the srcdir. Failing that, it is looked for in the templatedir.
+
+Wiki pages can be used as templates. This should be done only for templates
+which it is safe to let wiki users edit. Enable it by passing a filename
+with no ".tmpl" extension. Template pages are normally looked for in
+the templates/ directory. If the page name starts with "/", a page
+elsewhere in the wiki can be used.
 
 ### `template_depends($$;@)`
 
-- 
cgit v1.2.3


From d1cc7e81c84e57c32b6560f82065caf6535c0692 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 15:11:25 -0400
Subject: use template() rather than rolling it by hand

---
 IkiWiki/Plugin/edittemplate.pm | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 5f0551d92..d65072010 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -114,28 +114,18 @@ sub filltemplate ($$) {
 	my $template_page=shift;
 	my $page=shift;
 
-	my $template_file=$pagesources{$template_page};
-	if (! defined $template_file) {
-		return;
-	}
-
 	my $template;
 	eval {
-		$template=HTML::Template->new(
-			filter => sub {
-				my $text_ref = shift;
-				$$text_ref=&Encode::decode_utf8($$text_ref);
-				chomp $$text_ref;
-			},
-			filename => srcfile($template_file),
-			die_on_bad_params => 0,
-			no_includes => 1,
-		);
+		# force page name absolute so it doesn't look in templates/
+		$template=template("/".$template_page);
 	};
 	if ($@) {
 		# Indicate that the earlier preprocessor directive set 
 		# up a template that doesn't work.
-		return "[[!pagetemplate ".gettext("failed to process")." $@]]";
+		return "[[!pagetemplate ".gettext("failed to process template:")." $@]]";
+	}
+	if (! defined $template) {
+		return;
 	}
 
 	$template->param(name => $page);
-- 
cgit v1.2.3


From 0e68f76a9ab76bc6d0f0d45617517220afc146ff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 15:23:34 -0400
Subject: update

---
 IkiWiki/Plugin/template.pm | 2 +-
 template-transition-notes  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index e5a0c05c3..d2b2fef55 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -33,7 +33,7 @@ sub preprocess (@) {
 		error gettext("missing id parameter")
 	}
 
-	# The bare id is used, so a page templates/$id will be used as 
+	# The bare id is used, so a page templates/$id can be used as 
 	# the template.
 	my $template;
 	eval {
diff --git a/template-transition-notes b/template-transition-notes
index ccff3e78f..a319616f4 100644
--- a/template-transition-notes
+++ b/template-transition-notes
@@ -1,6 +1,4 @@
 * add_templates option removed from underlay plugin
   (can use add_underlays instead)
 * includes no longer allowed in templates
-* template directive no longer uses $foo.tmpl , only
-  page $foo.
 * template_params removed (not exported API)
-- 
cgit v1.2.3


From 83703d2f4a8832155e3c111792489062ccc4793b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 15:32:39 -0400
Subject: move template documentation to the template directive

allow new templates to be created via the inline that lists them
---
 doc/ikiwiki/directive/template.mdwn | 71 ++++++++++++++++++++++++++++++--
 doc/templates.mdwn                  | 82 ++-----------------------------------
 2 files changed, 71 insertions(+), 82 deletions(-)

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index d538b69b1..ae71ba5b5 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -5,14 +5,79 @@ wiki, by using the template directive. The directive has an `id` parameter
 that identifies the template to use. The remaining parameters are used to
 fill out the template.
 
-Example:
+## Example
 
 	\[[!template id=note text="""Here is the text to insert into my note."""]]
 
 This fills out the `note` template, filling in the `text` field with
 the specified value, and inserts the result into the page.
 
-For a list of available templates, and details about how to create more,
-see the [[templates]] page.
+## Using a template
+
+Generally, a value can include any markup that would be allowed in the wiki
+page outside the template. Triple-quoting the value even allows quotes to
+be included in it. Combined with multi-line quoted values, this allows for
+large chunks of marked up text to be embedded into a template:
+
+        \[[!template id=foo name="Sally" color="green" age=8 notes="""
+        * \[[Charley]]'s sister.
+        * "I want to be an astronaut when I grow up."
+        * Really 8 and a half.
+        """]]
+
+## Creating a template
+
+The template is a regular wiki page, located in the `templates/`
+subdirectory inside the source directory of the wiki.
+
+(Alternatively, templates can be stored in a directory outside the wiki,
+as files with the extension ".tmpl".
+By default, these are searched for in `/usr/share/ikiwiki/templates`;
+the `templatedir` setting can be used to make another directory be searched
+first.)
+
+The template uses the syntax used by the [[!cpan HTML::Template]] perl
+module, which allows for some fairly complex things to be done. Consult its
+documentation for the full syntax, but all you really need to know are a
+few things:
+
+* Each parameter you pass to the template directive will generate a 
+  template variable. There are also some pre-defined variables like PAGE
+  and BASENAME.
+* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
+  in the value will first be converted to html.
+* To insert the raw value of a variable, with wiki markup not yet converted
+  to html, use `<TMPL_VAR raw_variable>`.
+* To make a block of text conditional on a variable being set use
+  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+* To use one block of text if a variable is set and a second if it's not,
+  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+
+Here's a sample template:
+
+        <span class="infobox">
+        Name: \[[<TMPL_VAR raw_name>]]<br />
+        Age: <TMPL_VAR age><br />
+        <TMPL_IF NAME="color">
+        Favorite color: <TMPL_VAR color><br />
+        <TMPL_ELSE>
+        No favorite color.<br />
+        </TMPL_IF>
+        <TMPL_IF NAME="notes">
+        <hr />
+        <TMPL_VAR notes>
+        </TMPL_IF>
+        </span>
+
+The filled out template will be formatted the same as the rest of the page
+that contains it, so you can include WikiLinks and all other forms of wiki
+markup in the template. Note though that such WikiLinks will not show up as
+backlinks to the page that uses the template.
+
+Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator in the
+example above. This ensures that if the name contains something that might
+be mistaken for wiki markup, it's not converted to html before being
+processed as a [[ikiwiki/WikiLink]].
+
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 07531ae98..f2b581d2f 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -9,85 +9,9 @@ wiki.
 
 [[!if test="enabled(template) and enabled(inline)" then="""
 
-These templates are available for inclusion onto other pages in this
-wiki:
+These templates are available for use with the template directive.
 
 [[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
-sort=title template=titlepage]]
+sort=title template=titlepage
+rootpage=templates postformtext="Add a new template named:"]]
 """]]
-
-## Using a template
-
-Using a template works like this:
-
-	\[[!template id=note text="""Here is the text to insert into my note."""]]
-
-This fills out the [[note]] template, filling in the `text` field with
-the specified value, and inserts the result into the page.
-
-Generally, a value can include any markup that would be allowed in the wiki
-page outside the template. Triple-quoting the value even allows quotes to
-be included in it. Combined with multi-line quoted values, this allows for
-large chunks of marked up text to be embedded into a template:
-
-        \[[!template id=foo name="Sally" color="green" age=8 notes="""
-        * \[[Charley]]'s sister.
-        * "I want to be an astronaut when I grow up."
-        * Really 8 and a half.
-        """]]
-
-## Creating a template
-
-To create a template, simply add a template directive to a page, and the 
-page will provide a link that can be used to create the template. The template
-is a regular wiki page, located in the `templates/` subdirectory inside
-the source directory of the wiki.
-
-(Alternatively, templates can be stored in a directory outside the wiki,
-as files with the extension ".tmpl".
-By default, these are searched for in `/usr/share/ikiwiki/templates`;
-the `templatedir` setting can be used to make another directory be searched
-first.)
-
-The template uses the syntax used by the [[!cpan HTML::Template]] perl
-module, which allows for some fairly complex things to be done. Consult its
-documentation for the full syntax, but all you really need to know are a
-few things:
-
-* Each parameter you pass to the template directive will generate a 
-  template variable. There are also some pre-defined variables like PAGE
-  and BASENAME.
-* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
-  in the value will first be converted to html.
-* To insert the raw value of a variable, with wiki markup not yet converted
-  to html, use `<TMPL_VAR raw_variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
-* To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
-
-Here's a sample template:
-
-        <span class="infobox">
-        Name: \[[<TMPL_VAR raw_name>]]<br />
-        Age: <TMPL_VAR age><br />
-        <TMPL_IF NAME="color">
-        Favorite color: <TMPL_VAR color><br />
-        <TMPL_ELSE>
-        No favorite color.<br />
-        </TMPL_IF>
-        <TMPL_IF NAME="notes">
-        <hr />
-        <TMPL_VAR notes>
-        </TMPL_IF>
-        </span>
-
-The filled out template will be formatted the same as the rest of the page
-that contains it, so you can include WikiLinks and all other forms of wiki
-markup in the template. Note though that such WikiLinks will not show up as
-backlinks to the page that uses the template.
-
-Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator. This
-ensures that if the name contains something that might be mistaken for wiki
-markup, it's not converted to html before being processed as a
-[[ikiwiki/WikiLink]].
-- 
cgit v1.2.3


From d822e37d0efc34f2267f275030de11cd3c7ff7bb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 15:32:39 -0400
Subject: move template documentation to the template directive

allow new templates to be created via the inline that lists them
(cherry picked from commit 83703d2f4a8832155e3c111792489062ccc4793b)
---
 doc/ikiwiki/directive/template.mdwn | 71 ++++++++++++++++++++++++++++++--
 doc/templates.mdwn                  | 82 ++-----------------------------------
 2 files changed, 71 insertions(+), 82 deletions(-)

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index d538b69b1..ae71ba5b5 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -5,14 +5,79 @@ wiki, by using the template directive. The directive has an `id` parameter
 that identifies the template to use. The remaining parameters are used to
 fill out the template.
 
-Example:
+## Example
 
 	\[[!template id=note text="""Here is the text to insert into my note."""]]
 
 This fills out the `note` template, filling in the `text` field with
 the specified value, and inserts the result into the page.
 
-For a list of available templates, and details about how to create more,
-see the [[templates]] page.
+## Using a template
+
+Generally, a value can include any markup that would be allowed in the wiki
+page outside the template. Triple-quoting the value even allows quotes to
+be included in it. Combined with multi-line quoted values, this allows for
+large chunks of marked up text to be embedded into a template:
+
+        \[[!template id=foo name="Sally" color="green" age=8 notes="""
+        * \[[Charley]]'s sister.
+        * "I want to be an astronaut when I grow up."
+        * Really 8 and a half.
+        """]]
+
+## Creating a template
+
+The template is a regular wiki page, located in the `templates/`
+subdirectory inside the source directory of the wiki.
+
+(Alternatively, templates can be stored in a directory outside the wiki,
+as files with the extension ".tmpl".
+By default, these are searched for in `/usr/share/ikiwiki/templates`;
+the `templatedir` setting can be used to make another directory be searched
+first.)
+
+The template uses the syntax used by the [[!cpan HTML::Template]] perl
+module, which allows for some fairly complex things to be done. Consult its
+documentation for the full syntax, but all you really need to know are a
+few things:
+
+* Each parameter you pass to the template directive will generate a 
+  template variable. There are also some pre-defined variables like PAGE
+  and BASENAME.
+* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
+  in the value will first be converted to html.
+* To insert the raw value of a variable, with wiki markup not yet converted
+  to html, use `<TMPL_VAR raw_variable>`.
+* To make a block of text conditional on a variable being set use
+  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+* To use one block of text if a variable is set and a second if it's not,
+  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+
+Here's a sample template:
+
+        <span class="infobox">
+        Name: \[[<TMPL_VAR raw_name>]]<br />
+        Age: <TMPL_VAR age><br />
+        <TMPL_IF NAME="color">
+        Favorite color: <TMPL_VAR color><br />
+        <TMPL_ELSE>
+        No favorite color.<br />
+        </TMPL_IF>
+        <TMPL_IF NAME="notes">
+        <hr />
+        <TMPL_VAR notes>
+        </TMPL_IF>
+        </span>
+
+The filled out template will be formatted the same as the rest of the page
+that contains it, so you can include WikiLinks and all other forms of wiki
+markup in the template. Note though that such WikiLinks will not show up as
+backlinks to the page that uses the template.
+
+Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator in the
+example above. This ensures that if the name contains something that might
+be mistaken for wiki markup, it's not converted to html before being
+processed as a [[ikiwiki/WikiLink]].
+
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 07531ae98..f2b581d2f 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -9,85 +9,9 @@ wiki.
 
 [[!if test="enabled(template) and enabled(inline)" then="""
 
-These templates are available for inclusion onto other pages in this
-wiki:
+These templates are available for use with the template directive.
 
 [[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
-sort=title template=titlepage]]
+sort=title template=titlepage
+rootpage=templates postformtext="Add a new template named:"]]
 """]]
-
-## Using a template
-
-Using a template works like this:
-
-	\[[!template id=note text="""Here is the text to insert into my note."""]]
-
-This fills out the [[note]] template, filling in the `text` field with
-the specified value, and inserts the result into the page.
-
-Generally, a value can include any markup that would be allowed in the wiki
-page outside the template. Triple-quoting the value even allows quotes to
-be included in it. Combined with multi-line quoted values, this allows for
-large chunks of marked up text to be embedded into a template:
-
-        \[[!template id=foo name="Sally" color="green" age=8 notes="""
-        * \[[Charley]]'s sister.
-        * "I want to be an astronaut when I grow up."
-        * Really 8 and a half.
-        """]]
-
-## Creating a template
-
-To create a template, simply add a template directive to a page, and the 
-page will provide a link that can be used to create the template. The template
-is a regular wiki page, located in the `templates/` subdirectory inside
-the source directory of the wiki.
-
-(Alternatively, templates can be stored in a directory outside the wiki,
-as files with the extension ".tmpl".
-By default, these are searched for in `/usr/share/ikiwiki/templates`;
-the `templatedir` setting can be used to make another directory be searched
-first.)
-
-The template uses the syntax used by the [[!cpan HTML::Template]] perl
-module, which allows for some fairly complex things to be done. Consult its
-documentation for the full syntax, but all you really need to know are a
-few things:
-
-* Each parameter you pass to the template directive will generate a 
-  template variable. There are also some pre-defined variables like PAGE
-  and BASENAME.
-* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
-  in the value will first be converted to html.
-* To insert the raw value of a variable, with wiki markup not yet converted
-  to html, use `<TMPL_VAR raw_variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
-* To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
-
-Here's a sample template:
-
-        <span class="infobox">
-        Name: \[[<TMPL_VAR raw_name>]]<br />
-        Age: <TMPL_VAR age><br />
-        <TMPL_IF NAME="color">
-        Favorite color: <TMPL_VAR color><br />
-        <TMPL_ELSE>
-        No favorite color.<br />
-        </TMPL_IF>
-        <TMPL_IF NAME="notes">
-        <hr />
-        <TMPL_VAR notes>
-        </TMPL_IF>
-        </span>
-
-The filled out template will be formatted the same as the rest of the page
-that contains it, so you can include WikiLinks and all other forms of wiki
-markup in the template. Note though that such WikiLinks will not show up as
-backlinks to the page that uses the template.
-
-Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator. This
-ensures that if the name contains something that might be mistaken for wiki
-markup, it's not converted to html before being processed as a
-[[ikiwiki/WikiLink]].
-- 
cgit v1.2.3


From 7e79da76332b93214a7d9a5c91bc046db4219ee2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 16:10:46 -0400
Subject: template docu reorg

Remove wikitemplates page; fold its contents into templates page.
Update all backlinks. Document new ability to put templates inside srcdir.
---
 doc/bugs/SSI_include_stripped_from_mdwn.mdwn       |  2 +-
 doc/bugs/login_page_non-obvious_with_openid.mdwn   |  4 +-
 doc/features.mdwn                                  |  2 +-
 doc/freesoftware.mdwn                              |  2 +-
 doc/ikiwiki-calendar.mdwn                          |  2 +-
 doc/ikiwiki/directive/edittemplate.mdwn            |  2 +-
 doc/ikiwiki/directive/pagetemplate.mdwn            |  8 +-
 doc/ikiwiki/directive/template.mdwn                |  8 +-
 doc/plugins/autoindex.mdwn                         |  2 +-
 doc/plugins/map/discussion.mdwn                    |  2 +-
 doc/plugins/pagetemplate.mdwn                      |  6 +-
 doc/plugins/template.mdwn                          |  4 +-
 doc/plugins/write.mdwn                             |  4 +-
 doc/templates.mdwn                                 | 91 +++++++++++++++++++---
 doc/tips/comments_feed.mdwn                        |  2 +-
 ...o-create_tag_pages_according_to_a_template.mdwn |  2 +-
 doc/todo/auto_rebuild_on_template_change.mdwn      |  2 +-
 doc/todo/html.mdwn                                 |  2 +-
 doc/todo/multiple_templates.mdwn                   |  2 +-
 doc/usage.mdwn                                     |  5 +-
 doc/wikitemplates.mdwn                             | 52 -------------
 doc/wikitemplates/discussion.mdwn                  | 46 -----------
 22 files changed, 111 insertions(+), 141 deletions(-)
 delete mode 100644 doc/wikitemplates.mdwn
 delete mode 100644 doc/wikitemplates/discussion.mdwn

diff --git a/doc/bugs/SSI_include_stripped_from_mdwn.mdwn b/doc/bugs/SSI_include_stripped_from_mdwn.mdwn
index 5519e45c6..270da86d3 100644
--- a/doc/bugs/SSI_include_stripped_from_mdwn.mdwn
+++ b/doc/bugs/SSI_include_stripped_from_mdwn.mdwn
@@ -10,7 +10,7 @@ If I have a &lt;--#include virtual="foo" --&gt; in some file, it gets stripped,
 > Anyway, it makes sense for the htmlscrubber to strip server-side
 > includes because otherwise your wiki could be attacked
 > by them being added to it. If you want to use both the htmlscrubber and
-> SSI together, I'd suggest you modify the [[wikitemplates]]
+> SSI together, I'd suggest you modify the [[templates]]
 > and put the SSI on there.
 > 
 > Ie, `page.tmpl` has a 
diff --git a/doc/bugs/login_page_non-obvious_with_openid.mdwn b/doc/bugs/login_page_non-obvious_with_openid.mdwn
index 1d087985a..9aa702037 100644
--- a/doc/bugs/login_page_non-obvious_with_openid.mdwn
+++ b/doc/bugs/login_page_non-obvious_with_openid.mdwn
@@ -36,7 +36,7 @@ If you want to keep it as one form, then perhaps using some javascript to disabl
 > that allows modifying that form, but does not allow creating a separate
 > form. The best way to make it obvious how to use it currently is to just
 > disable password auth, then it's nice and simple. :-) Javascript is an
-> interesting idea. It's also possible to write a custom [[signin.tmpl wikitemplates]] that
+> interesting idea. It's also possible to write a custom [[templates]] that
 > is displayed instead of the regular signin form, and it should be
 > possible to use that to manually lay it out better than FormBuilder
 > manages with its automatic layout. --[[Joey]]
@@ -44,4 +44,4 @@ If you want to keep it as one form, then perhaps using some javascript to disabl
 > I've improved the form, I think it's more obvious now that the openid
 > stuff is separate. Good enough to call this [[done]]. I think. --[[Joey]]
 
->> Looks good, thanks!  :-) -- [[AdamShand]]
\ No newline at end of file
+>> Looks good, thanks!  :-) -- [[AdamShand]]
diff --git a/doc/features.mdwn b/doc/features.mdwn
index ab521213d..07ce648ea 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -72,7 +72,7 @@ you would care to syndicate.
 
 Ikiwiki aims to produce 
 [valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
-generates html using [[templates|wikitemplates]], and uses [[css]], so you
+generates html using [[templates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
 
 ## [[Plugins]]
diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 7ac1ac6b4..2243d9b1f 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -4,7 +4,7 @@ ikiwiki, and this documentation wiki, are licensed under the terms of the
 GNU [[GPL]], version 2 or later.
 
 The parts of ikiwiki that become part of your own wiki (the [[basewiki]]
-pages (but not the smilies) and the [[templates|wikitemplates]]) are licensed
+pages (but not the smilies) and the [[templates]]) are licensed
 as follows: 
 
 > Redistribution and use in source and compiled forms, with or without
diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn
index c1f4d7267..03cbdd86c 100644
--- a/doc/ikiwiki-calendar.mdwn
+++ b/doc/ikiwiki-calendar.mdwn
@@ -43,7 +43,7 @@ An example crontab:
 
 # TEMPLATES
 
-This command uses two [[template|wikitemplates]] to generate
+This command uses two [[templates]] to generate
 the pages, `calendarmonth.tmpl` and `calendaryear.tmpl`.
 
 # AUTHOR
diff --git a/doc/ikiwiki/directive/edittemplate.mdwn b/doc/ikiwiki/directive/edittemplate.mdwn
index d731bdb47..c486e821b 100644
--- a/doc/ikiwiki/directive/edittemplate.mdwn
+++ b/doc/ikiwiki/directive/edittemplate.mdwn
@@ -21,7 +21,7 @@ something like:
 	Details:
 
 The template page can also contain [[!cpan HTML::Template]] directives,
-similar to other ikiwiki [[templates]]. Currently only one variable is
+like other ikiwiki [[templates]]. Currently only one variable is
 set: `<TMPL_VAR name>` is replaced with the name of the page being
 created.
 
diff --git a/doc/ikiwiki/directive/pagetemplate.mdwn b/doc/ikiwiki/directive/pagetemplate.mdwn
index 8ad901c1a..401b38099 100644
--- a/doc/ikiwiki/directive/pagetemplate.mdwn
+++ b/doc/ikiwiki/directive/pagetemplate.mdwn
@@ -1,17 +1,13 @@
 The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate desc=pagetemplate]] plugin.
 
-This directive allows a page to be displayed using a different template than
-the default `page.tmpl` template.
+This directive allows a page to be displayed using a different
+[[template|templates]] than the default `page.tmpl` template.
 
 The page text is inserted into the template, so the template controls the
 overall look and feel of the wiki page. This is in contrast to the
 [[ikiwiki/directive/template]] directive, which allows inserting templates
 _into_ the body of a page.
 
-This directive can only reference templates that are already installed
-by the system administrator, typically into the
-`/usr/share/ikiwiki/templates` directory. Example:
-
 	\[[!pagetemplate template="my_fancy.tmpl"]]
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index ae71ba5b5..052ca7873 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -1,7 +1,11 @@
 The `template` directive is supplied by the [[!iki plugins/template desc=template]] plugin.
 
-[[Templates]] are files that can be filled out and inserted into pages in the
-wiki, by using the template directive. The directive has an `id` parameter
+The template directive allows wiki pages to be used as templates.
+These templates can be filled out and inserted into other pages in the
+wiki using the directive. The [[templates]] page lists templates
+that can be used with this directive.
+
+The directive has an `id` parameter
 that identifies the template to use. The remaining parameters are used to
 fill out the template.
 
diff --git a/doc/plugins/autoindex.mdwn b/doc/plugins/autoindex.mdwn
index d1133e4f5..7c4e40419 100644
--- a/doc/plugins/autoindex.mdwn
+++ b/doc/plugins/autoindex.mdwn
@@ -3,5 +3,5 @@
 
 This plugin searches for [[SubPages|ikiwiki/subpage]] with a missing parent
 page, and generates the parent pages. The generated page content is
-controlled by the `autoindex.tmpl` [[template|wikitemplates]], which by
+controlled by the `autoindex.tmpl` [[template|templates]], which by
 default, uses a [[map]] to list the SubPages.
diff --git a/doc/plugins/map/discussion.mdwn b/doc/plugins/map/discussion.mdwn
index 2f7b140d6..54c921b0f 100644
--- a/doc/plugins/map/discussion.mdwn
+++ b/doc/plugins/map/discussion.mdwn
@@ -1,7 +1,7 @@
 I'm wanting a [[map]] (with indentation levels) showing page _titles_
 instead of page 'names'.  As far as I can see, this is not an option with
 existing plugins - I can get a list of pages using [[inline]] and
-appropriate [[wikitemplates]], but that has no indentation and therefore
+appropriate [[templates]], but that has no indentation and therefore
 doesn't show structure well.
 
 The quick way is to modify the map plugin to have a 'titles' option.  The
diff --git a/doc/plugins/pagetemplate.mdwn b/doc/plugins/pagetemplate.mdwn
index 53f069d0d..8254e14c5 100644
--- a/doc/plugins/pagetemplate.mdwn
+++ b/doc/plugins/pagetemplate.mdwn
@@ -3,8 +3,4 @@
 
 This plugin provides the [[ikiwiki/directive/pagetemplate]]
 [[ikiwiki/directive]], which allows a page to be displayed
-using a different [[template|wikitemplates]] than the default.
-
-This plugin can only use templates that are already installed in
-`/usr/share/ikiwiki/templates` (or wherever ikiwiki is configured to look for
-them). You can choose to use any .tmpl files in that directory.
+using a different [[template|templates]] than the default.
diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn
index da775f232..8d17e2825 100644
--- a/doc/plugins/template.mdwn
+++ b/doc/plugins/template.mdwn
@@ -3,5 +3,5 @@
 
 This plugin provides the [[ikiwiki/directive/template]] [[ikiwiki/directive]].
 With this plugin, you can set up templates, and cause them to be filled out
-and inserted into pages in the wiki. It's documented and existing templates
-are listed in the [[templates]] page.
+and inserted into pages in the wiki. Existing templates are listed in the
+[[templates]] page.
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 00b54bdd3..9128c7f54 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -297,7 +297,7 @@ value is ignored.
 
 	hook(type => "pagetemplate", id => "foo", call => \&pagetemplate);
 
-[[Templates|wikitemplates]] are filled out for many different things in
+[[Templates]] are filled out for many different things in
 ikiwiki, like generating a page, or part of a blog page, or an rss feed, or
 a cgi. This hook allows modifying the variables available on those
 templates. The function is passed named parameters. The "page" and
@@ -313,7 +313,7 @@ a new custom parameter to the template.
 
 	hook(type => "templatefile", id => "foo", call => \&templatefile);
 
-This hook allows plugins to change the [[template|wikitemplates]] that is
+This hook allows plugins to change the [[template|templates]] that is
 used for a page in the wiki. The hook is passed a "page" parameter, and
 should return the name of the template file to use (relative to the
 template directory), or undef if it doesn't want to change the default
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index f2b581d2f..f7b3adae5 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -1,17 +1,88 @@
-[[!meta robots="noindex, follow"]]
-[[!if test="enabled(template)"
-then="This wiki has templates **enabled**."
-else="This wiki has templates **disabled**."
-]]
+[[Ikiwiki]] uses many templates for many purposes. By editing its templates,
+you can fully customise this site.
 
-Templates are files that can be filled out and inserted into pages in the
-wiki.
+[[!if test="enabled(template)" then="""
+## The template directive
 
+The template directive allows wiki pages to be used as templates.
+These templates can be filled out and inserted into other pages in the
+wiki using the directive.
+"""]]
 [[!if test="enabled(template) and enabled(inline)" then="""
-
-These templates are available for use with the template directive.
-
 [[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
 sort=title template=titlepage
 rootpage=templates postformtext="Add a new template named:"]]
 """]]
+
+[[!if test="enabled(edittemplate)" then="""
+## The edittemplate directive
+
+The edittemplate directive can be used to make new pages default to
+containing text from a template, which can be filled as out the page is
+edited.
+"""]]
+
+## Wiki templates
+
+These templates are used to build the wiki. The aim is to keep almost all
+html out of ikiwiki and in the templates.
+
+* `page.tmpl` - Used for displaying all regular wiki pages.
+* `misc.tmpl` - Generic template used for any page that doesn't
+  have a custom template.
+* `editpage.tmpl` - Create/edit page.
+* `change.tmpl` - Used to create a page describing a change made to the wiki.
+* `passwordmail.tmpl` - Not a html template, this is used to
+  generate a mail with an url the user can use to reset their password.
+* `rsspage.tmpl` - Used for generating rss feeds for [[blogs|blog]].
+* `rssitem.tmpl` - Used for generating individual items on rss feeds.
+* `atompage.tmpl` - Used for generating atom feeds for blogs.
+* `atomitem.tmpl` - Used for generating individual items on atom feeds.
+* `inlinepage.tmpl` - Used for adding a page inline in a blog
+  page.
+* `archivepage.tmpl` - Used for listing a page in a blog archive page.
+* `microblog.tmpl` - Used for showing a microblogging post inline.
+* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
+* `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used.
+* `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create
+  a page for a post.
+* `searchform.tmpl` - Used by the [[plugins/search]] plugin to add a search
+  form to wiki pages.
+* `searchquery.tmpl` - This is an omega template, used by the
+  [[plugins/search]] plugin.
+* `comment.tmpl` - This template is used to display a comment
+  by the [[plugins/comments]] plugin.
+* `editcomment.tmpl` - This template is the comment post form for the
+  [[plugins/comments]] plugin.
+* `commentmoderation.tmpl` - This template is used to produce the comment
+  moderation form.
+* `recentchanges.tmpl` - This template is used for listing a change
+  on the RecentChanges page.
+
+[[!if test="enabled(pagetemplate)" then="""
+## The pagetemplate directive
+
+The pagetemplate directive can allow individual pages to use a
+different template than `page.tmpl`.
+"""]]
+
+## Template locations
+
+Templates are located in `/usr/share/ikiwiki/templates` by default;
+the `templatedir` setting can be used to make another directory be
+searched first. Customized templates can also be placed inside the
+"templates/" directory in your wiki's source.
+
+## Template syntax
+
+Ikiwiki uses the HTML::Template module as its template engine. This
+supports things like conditionals and loops in templates and is pretty easy
+to learn. All you really need to know are a few things:
+
+* To insert the value of a template variable, use `<TMPL_VAR variable>`.
+* To make a block of text conditional on a variable being set use
+  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+* To use one block of text if a variable is set and a second if it's not,
+  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/tips/comments_feed.mdwn b/doc/tips/comments_feed.mdwn
index 6f8137256..6d4dbb803 100644
--- a/doc/tips/comments_feed.mdwn
+++ b/doc/tips/comments_feed.mdwn
@@ -6,5 +6,5 @@ add a feed that contains all the comments posted to any page. Here's how:
 	\[[!inline pages="internal(*/comment_*)" template=comment]]
 
 The special [[ikiwiki/PageSpec]] matches all comments. The
-[[template|wikitemplates]] causes the comments to be displayed formatted
+[[template|templates]] causes the comments to be displayed formatted
 nicely.
diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index f6d444890..7eb404910 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -17,7 +17,7 @@ The new tag file is then complied during the change phase.
 
 *see git history of this page if you want the patch --[[smcv]]*
 
-This uses a [[template|wikitemplates]] called `autotagpage.tmpl`, here is my template file:
+This uses a [[template|templates]] called `autotagpage.tmpl`, here is my template file:
 
     \[[!inline pages="link(<TMPL_VAR TAG>)" archive="yes"]]
 
diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index a112cb9da..838d15c1a 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -6,7 +6,7 @@ This would allow setting:
 
 	templatedir => "$srcdir/templates",
 
-.. and then the [[wikitemplates]] are managed like other wiki files; and
+.. and then the [[templates]] are managed like other wiki files; and
 like other wiki files, a change to them automatically updates dependent
 pages.
 
diff --git a/doc/todo/html.mdwn b/doc/todo/html.mdwn
index 44f20c876..4f4542be2 100644
--- a/doc/todo/html.mdwn
+++ b/doc/todo/html.mdwn
@@ -1,6 +1,6 @@
 Create some nice(r) stylesheets.
 
 Should be doable w/o touching a single line of code, just
-editing the [[wikitemplates]] and/or editing [[style.css]].
+editing the [[templates]] and/or editing [[style.css]].
 
 [[done]] ([[css_market]] ..)
diff --git a/doc/todo/multiple_templates.mdwn b/doc/todo/multiple_templates.mdwn
index 72783c556..30fb8d6ee 100644
--- a/doc/todo/multiple_templates.mdwn
+++ b/doc/todo/multiple_templates.mdwn
@@ -1,4 +1,4 @@
-> Another useful feature might be to be able to choose a different [[template|wikitemplates]]
+> Another useful feature might be to be able to choose a different [[template|templates]]
 > file for some pages; [[blog]] pages would use a template different from the
 > home page, even if both are managed in the same repository, etc.
 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 2e12517ea..9cf61cc6c 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -120,10 +120,11 @@ also be configured using a setup file.
 
 * --templatedir dir
 
-  Specify the directory that the page [[templates|wikitemplates]] are stored in.
+  Specify the directory that [[templates|templates]] are stored in.
   Default is `/usr/share/ikiwiki/templates`, or another location as configured at
   build time. If the templatedir is changed, missing templates will still
-  be searched for in the default location as a fallback.
+  be searched for in the default location as a fallback. Templates can also be
+  placed in the "templates/" subdirectory of the srcdir.
 
   Note that if you choose to copy and modify ikiwiki's templates, you will need
   to be careful to keep them up to date when upgrading to new versions of
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
deleted file mode 100644
index 6e5a7261d..000000000
--- a/doc/wikitemplates.mdwn
+++ /dev/null
@@ -1,52 +0,0 @@
-ikiwiki uses the HTML::Template module as its template engine. This
-supports things like conditionals and loops in templates and is pretty easy
-to learn.
-
-The aim is to keep almost all html out of ikiwiki and in the templates.
-
-It ships with some basic templates which can be customised. These are
-located in `/usr/share/ikiwiki/templates` by default; the `templatedir`
-setting can be used to make another directory be searched first.
-
-* `page.tmpl` - Used for displaying all regular wiki pages.
-* `misc.tmpl` - Generic template used for any page that doesn't
-  have a custom template.
-* `editpage.tmpl` - Create/edit page.
-* `change.tmpl` - Used to create a page describing a change made to the wiki.
-* `passwordmail.tmpl` - Not a html template, this is used to
-  generate a mail with an url the user can use to reset their password.
-* `rsspage.tmpl` - Used for generating rss feeds for [[blogs|blog]].
-* `rssitem.tmpl` - Used for generating individual items on rss feeds.
-* `atompage.tmpl` - Used for generating atom feeds for blogs.
-* `atomitem.tmpl` - Used for generating individual items on atom feeds.
-* `inlinepage.tmpl` - Used for adding a page inline in a blog
-  page.
-* `archivepage.tmpl` - Used for listing a page in a blog archive page.
-* `microblog.tmpl` - Used for showing a microblogging post inline.
-* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
-* `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used.
-* `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create
-  a page for a post.
-* `searchform.tmpl` - Used by the [[plugins/search]] plugin to add a search
-  form to wiki pages.
-* `searchquery.tmpl` - This is an omega template, used by the
-  [[plugins/search]] plugin.
-* `comment.tmpl` - This template is used to display a comment
-  by the [[plugins/comments]] plugin.
-* `editcomment.tmpl` - This template is the comment post form for the
-  [[plugins/comments]] plugin.
-* `commentmoderation.tmpl` - This template is used to produce the comment
-  moderation form.
-* `recentchanges.tmpl` - This template is used for listing a change
-  on the RecentChanges page.
-
-The [[plugins/pagetemplate]] plugin can allow individual pages to use a
-different template than `page.tmpl`.
-
-The [[plugins/template]] plugin also uses templates, though those
-[[templates]] are typically stored as pages in the wiki, and are inserted
-into pages.
-
-The [[plugins/edittemplate]] plugin is used to make new pages default to
-containing text from a template, which can be filled as out the page is
-edited.
diff --git a/doc/wikitemplates/discussion.mdwn b/doc/wikitemplates/discussion.mdwn
deleted file mode 100644
index f97444e5f..000000000
--- a/doc/wikitemplates/discussion.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-## Place for local templates
-Where does one put any locally modified templates for an individual ikiwiki? --Ivan Z.
-
-> You can put them whereever you like; the `templatedir` controls
-> where ikiwiki looks for them. --[[Joey]] 
-
-Thank you for your response! My question arose out of my intention to make
-custom templates for a wiki--specifically suited for the kind of  content
-it will have--so, that would mean I would want to distribute them through
-git together with other content of the wiki. So, for this case the
-separation of conceptually ONE thing (the content, the templates, and the
-config option which orders to use these templates) into THREE separate
-files/repos (the main content repo, the repo with templates, and the config
-file) is not convenient: instead of distributing a single repo, I have to
-tell people to take three things if they want to replicate this wiki. How
-would you solve this inconvenience? Perhaps, a default location of the
-templates *inside* the source repo would do?--Ivan Z.
-
-> I would avoid putting the templates in a subdirectory of the ikiwiki srcdir.
-> (I'd also avoid putting the ikiwiki setup file there.)
-> While it's safe to do either in some cases, there are configurations where
-> it's unsafe. For example, a malicious user could use attachment handling to
-> replace those files with their own, bad versions.
-> 
-> So, two ideas for where to put the templatedir and ikiwiki setup. 
-
-> * The easiest option is to put your wiki content in a subdirectory
->   ("wiki", say) and point `srcdir` at that.
->   then you can have another subdirectory for the wikitemplates,
->   and put the setup file at the top.
-> * Another option if using git would be to have a separate branch,
->   in the same git repository, that holds wikitemplates and the setup file.
->   Then you check out the repository once to make the `srcdir` available,
->   and have a second checkout, of the other branch, to make the other stuff
->   available.
-> 
-> Note that with either of these methods, you have to watch out if
-> giving other direct commit access to the repository. They could
-> still edit the setup file and templates, so only trusted users should
-> be given access. (It is, however, perfectly safe to let people edit
-> the wiki via the web, and is even safe to configure
-> [[tips/untrusted_git_push]] to such a repository.) --[[Joey]]
-
-Thanks, that's a nice and simple idea: to have a subdirectory! I'll try it. --Ivan Z.
-
-A [[!taglink wish|wishlist]]: the ikiwiki program could be improved so that it follows the same logic as git in looking for its config: it could ascend directories until it finds an `.ikiwiki/` directory with `.ikiwiki/setup` and then uses that configuration. Now I'm tired to always type `ikiwiki --setup path/to/the/setup --refresh` when working in my working clone of the sources; I'd like to simply type `ikiwiki` instead, and let it find the setup file. The default location to look for templates could also be made to be a sibling of the setup file: `.ikiwiki/templates/`. --Ivan Z.
-- 
cgit v1.2.3


From 96c9c8aa925120423fc563dbf233c73fc805288b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 16:20:02 -0400
Subject: fix return of tpage

---
 IkiWiki.pm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 78612cd08..7382f11e4 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1661,16 +1661,20 @@ sub template_file ($) {
 	}
 
 	my $template=srcfile($tpage, 1);
-	if (defined $template) {
-		return $template, $tpage if wantarray;
-		return $template;
+	if (! defined $template) {
+		$name=~s:/::; # avoid path traversal
+		foreach my $dir ($config{templatedir},
+		                 "$installdir/share/ikiwiki/templates") {
+			if (-e "$dir/$name") {
+				$template="$dir/$name";
+				last;
+			}
+		}
 	}
 
-	$name=~s:/::; # avoid path traversal
-	
-	foreach my $dir ($config{templatedir},
-	                 "$installdir/share/ikiwiki/templates") {
-		return "$dir/$name" if -e "$dir/$name";
+	if (defined $template) {	
+		return $template, $tpage if wantarray;
+		return $template;
 	}
 	return;
 }
-- 
cgit v1.2.3


From 8d72e3dc09b017329397bee88db88b4c5dab351e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 16:40:42 -0400
Subject: add myclean

---
 Makefile.PL | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.PL b/Makefile.PL
index 38db20d44..09ec2e730 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -57,6 +57,10 @@ extra_clean:
 	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
+# Joey uses this before committing.
+myclean: clean
+	git checkout po ikiwiki.spec
+
 underlay_install:
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
 	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
-- 
cgit v1.2.3


From 6486452e4c94f5699d98d13e25a361435ed3ddeb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 16:41:07 -0400
Subject: special case for page.tmpl dependency handling

Rather than wasting resources recording that every page depends on
page.tmpl, add a special case. The special case curretly rebuilds non-page
files too when page.tmpl changes, but that's minor.
---
 IkiWiki/Render.pm | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7cf19645e..8ae0cbd4f 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -74,9 +74,16 @@ sub genpage ($$) {
 			$templatefile=$file;
 		}
 	});
-	my $template=template_depends(
-		defined $templatefile ? $templatefile : 'page.tmpl', $page,
-		blind_cache => 1);
+	my $template;
+	if (defined $templatefile) {
+		$template=template_depends($templatefile, $page,
+			blind_cache => 1);
+	}
+	else {
+		# no explicit depends as special case
+		$template=template('page.tmpl', 
+			blind_cache => 1);
+	}
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
@@ -763,8 +770,14 @@ sub refresh () {
 	foreach my $file (@$new, @$del) {
 		render_linkers($file);
 	}
-	
-	if (@$changed || @$internal_changed ||
+
+	if ($rendered{"templates/page.tmpl"}) {
+		foreach my $f (@$files) {
+			next if $f eq "templates/page.tmpl";
+			render($f, sprintf(gettext("building %s, which depends on %s"), $f, "templates/page.tmpl"));
+		}
+	}
+	elsif (@$changed || @$internal_changed ||
 	    @$del || @$internal_del || @$internal_new) {
 		1 while render_dependent($files, $new, $internal_new,
 			$del, $internal_del, $internal_changed,
-- 
cgit v1.2.3


From d5c5fef363564261ccba236f1d64eaa60567d514 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 16:48:37 -0400
Subject: update

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 66aa07193..037d0d1db 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -62,3 +62,15 @@ Have started working on this.
 >>>>>> it'd either be necessary to make them be internal pages
 >>>>>> (templates/inlinepage._tmpl) or special-case them in some other way.
 >>>>>> --[[smcv]]
+
+>>>>>>> In my branch, I left in support for the templatedir, and also
+>>>>>>> /usr/share/ikiwiki/templates. So, users do not have to put their
+>>>>>>> custom templates in templates/ in the wiki. If they do, 
+>>>>>>> the templates are copied to the destdir like other non-wiki page files
+>>>>>>> are. The templates are not wiki pages, except those used by a few
+>>>>>>> things like the [[plugins/template]] plugin.
+>>>>>>> 
+>>>>>>> That seems acceptable, since users probably don't need to modify
+>>>>>>> many templates, so the clutter is small. (Especially when
+>>>>>>> compared to the other clutter the basewiki always puts in destdir.)
+>>>>>>> This could be revisted later. --[[Joey]] 
-- 
cgit v1.2.3


From 6c64ce0336240be16eeae81313e53c630cb196bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:01:22 -0400
Subject: update news for template change

---
 debian/NEWS                                   | 32 +++++++++++++++++++--------
 doc/todo/auto_rebuild_on_template_change.mdwn |  2 ++
 template-transition-notes                     |  4 ----
 3 files changed, 25 insertions(+), 13 deletions(-)
 delete mode 100644 template-transition-notes

diff --git a/debian/NEWS b/debian/NEWS
index 3a8705680..69967c84c 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -2,22 +2,36 @@ ikiwiki (3.20100422) unstable; urgency=low
 
   This version of ikiwiki has a lot of changes that you need to know about.
 
+  Now you can include customised versions of templates in the source
+  of your wiki. (For example, templates/page.tmpl.) When these templates
+  are changed, ikiwiki will automatically rebuild pages that use them.
+
   The --getctime switch is renamed to --gettimes, and it also gets the 
   file modification time. And it's a lot faster (when using git). But
   the really important change is, you don't have to remember to use this
   switch. Now ikiwiki will do it when it needs to.
 
-  Starting from this version, the "tagged()" pagespec only matches tags,
-  not regular wikilinks. If your wiki accidentially relied on the old,
-  buggy behavior, you might need to change its pagespecs to use "link()".
+  At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
+  If your wiki accidentially relied on the old, buggy behavior, you might
+  need to change its pagespecs to use "link()".
+
+  Many of your wishes have been answered: Now tag pages can automatically be
+  created when new tags are used. This feature is enabled by default if you
+  have configured a tagbase. It can be turned on or off using the
+  tag_autocreate setting.
+
+  These changes may also affect some users:
+
+  * The title_natural sort method (as used by the inline directive, etc)
+    have been moved to the new sortnaturally plugin, which is not enabled
+    by default since it requires the Sort::Naturally perl module.
 
-  Now tag pages can automatically be created as new tags are used. This
-  feature is enabled by default if you have configured a tagbase. It
-  can be turned on or off using the tag_autocreate setting.
+  * TMPL_INCLUDE is no longer supported in any template used by ikiwiki.
+    It used to be allowed in certian templates, but not in others.
 
-  The title_natural sort method (as used by the inline directive, etc)
-  have been moved to the new sortnaturally plugin, which is not enabled
-  by default since it requires the Sort::Naturally perl module.
+  * The add_templates option has been removed from the underlay plugin.
+    If you used this option, you can instead use templates/ subdirectories
+    inside underlay directories added by the add_underlays option.
 
   Due to the above and other changes, all wikis need to be rebuilt on
   upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 192b22f70..ea990b877 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -74,3 +74,5 @@ Have started working on this.
 >>>>>>> many templates, so the clutter is small. (Especially when
 >>>>>>> compared to the other clutter the basewiki always puts in destdir.)
 >>>>>>> This could be revisted later. --[[Joey]] 
+
+[[done]]
diff --git a/template-transition-notes b/template-transition-notes
deleted file mode 100644
index a319616f4..000000000
--- a/template-transition-notes
+++ /dev/null
@@ -1,4 +0,0 @@
-* add_templates option removed from underlay plugin
-  (can use add_underlays instead)
-* includes no longer allowed in templates
-* template_params removed (not exported API)
-- 
cgit v1.2.3


From 9b112cc986023e3a9ec5a4b5e9824af05e80c4d8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:23:31 -0400
Subject: add test case to ensure all templates are documented

---
 doc/templates.mdwn       | 42 +++++++++++++++++++++---------------------
 t/templates_documented.t | 14 ++++++++++++++
 2 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100755 t/templates_documented.t

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index f7b3adae5..7b56600d1 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -30,34 +30,34 @@ html out of ikiwiki and in the templates.
 * `page.tmpl` - Used for displaying all regular wiki pages.
 * `misc.tmpl` - Generic template used for any page that doesn't
   have a custom template.
-* `editpage.tmpl` - Create/edit page.
-* `change.tmpl` - Used to create a page describing a change made to the wiki.
-* `passwordmail.tmpl` - Not a html template, this is used to
-  generate a mail with an url the user can use to reset their password.
-* `rsspage.tmpl` - Used for generating rss feeds for [[blogs|blog]].
+* `rsspage.tmpl` - Used for generating rss feeds for blogs.
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
 * `atompage.tmpl` - Used for generating atom feeds for blogs.
 * `atomitem.tmpl` - Used for generating individual items on atom feeds.
-* `inlinepage.tmpl` - Used for adding a page inline in a blog
-  page.
+* `inlinepage.tmpl` - Used for displaying a post in a blog.
 * `archivepage.tmpl` - Used for listing a page in a blog archive page.
+* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.
 * `microblog.tmpl` - Used for showing a microblogging post inline.
 * `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
-* `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used.
-* `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create
+* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.
+* `aggregatepost.tmpl` - Used by the aggregate plugin to create
   a page for a post.
-* `searchform.tmpl` - Used by the [[plugins/search]] plugin to add a search
-  form to wiki pages.
-* `searchquery.tmpl` - This is an omega template, used by the
-  [[plugins/search]] plugin.
-* `comment.tmpl` - This template is used to display a comment
-  by the [[plugins/comments]] plugin.
-* `editcomment.tmpl` - This template is the comment post form for the
-  [[plugins/comments]] plugin.
-* `commentmoderation.tmpl` - This template is used to produce the comment
-  moderation form.
-* `recentchanges.tmpl` - This template is used for listing a change
-  on the RecentChanges page.
+* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin 
+  and google plugin to add search forms to wiki pages.
+* `searchquery.tmpl` - This is a Omega template, used by the
+  search plugin.
+* `comment.tmpl` - Used by the comments plugin to display a comment.
+* `change.tmpl` - Used to create a page describing a change made to the wiki.
+* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.
+* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.
+* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.
+* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to
+  make calendar archive pages.
+* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
+  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
+  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
+  `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not
+  normally need to be customised.
 
 [[!if test="enabled(pagetemplate)" then="""
 ## The pagetemplate directive
diff --git a/t/templates_documented.t b/t/templates_documented.t
new file mode 100755
index 000000000..826c51d36
--- /dev/null
+++ b/t/templates_documented.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More 'no_plan';
+
+$/=undef;
+open(IN, "doc/templates.mdwn") || die "doc/templates.mdwn: $!";
+my $page=<IN>;
+close IN;
+
+foreach my $file (glob("templates/*.tmpl")) {
+	$file=~s/templates\///;
+	ok($page =~ /\Q$file\E/, "$file documented on doc/templates.mdwn");
+}
-- 
cgit v1.2.3


From 33b0a69e90f4c2e22fe0e0c812836a2eb661c6d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:36:07 -0400
Subject: improve attachment example

---
 doc/ikiwiki/pagespec/attachment.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/ikiwiki/pagespec/attachment.mdwn b/doc/ikiwiki/pagespec/attachment.mdwn
index 419f00ee4..fa2bc5867 100644
--- a/doc/ikiwiki/pagespec/attachment.mdwn
+++ b/doc/ikiwiki/pagespec/attachment.mdwn
@@ -7,11 +7,12 @@ If attachments are enabled, the wiki admin can control what types of
 attachments will be accepted, via the `allowed_attachments`
 configuration setting.
 
-For example, to limit arbitrary files to 50 kilobytes, but allow
-larger mp3 files to be uploaded by joey into a specific directory, and
-check all attachments for viruses, something like this could be used:
+For example, to limit most users to uploading small images, and nothing else,
+while allowing larger mp3 files to be uploaded by joey into a specific
+directory, and check all attachments for viruses, something like this could be
+used:
   
-	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))
+	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))
 
 The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
 additional tests:
-- 
cgit v1.2.3


From 1473bf84c525d18f933fa2dcae86628af9dfff76 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:38:37 -0400
Subject: update re template change

---
 doc/security.mdwn | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/security.mdwn b/doc/security.mdwn
index 21aef316b..34a005239 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -162,10 +162,11 @@ closed though.
 
 ## HTML::Template security
 
-If the [[plugins/template]] plugin is enabled, users can modify templates
-like any other part of the wiki. This assumes that HTML::Template is secure
+If the [[plugins/template]] plugin is enabled, all users can modify templates
+like any other part of the wiki. Some trusted users can modify templates
+without it too. This assumes that HTML::Template is secure
 when used with untrusted/malicious templates. (Note that includes are not
-allowed, so that's not a problem.)
+allowed.)
 
 ----
 
-- 
cgit v1.2.3


From 5fc6e56eb86a502f01bd6b79098be5f7e8bac446 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:41:24 -0400
Subject: changelog/NEWS update for template changes

---
 debian/NEWS      | 4 ++++
 debian/changelog | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/debian/NEWS b/debian/NEWS
index 69967c84c..664f55b6e 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -6,6 +6,10 @@ ikiwiki (3.20100422) unstable; urgency=low
   of your wiki. (For example, templates/page.tmpl.) When these templates
   are changed, ikiwiki will automatically rebuild pages that use them.
 
+  Allowing untrusted users to upload attachments with the ".tmpl"
+  extension is not recommended, as that allows anyone to change
+  a wiki's templates.
+
   The --getctime switch is renamed to --gettimes, and it also gets the 
   file modification time. And it's a lot faster (when using git). But
   the really important change is, you don't have to remember to use this
diff --git a/debian/changelog b/debian/changelog
index 0ab04f522..425e28fa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ ikiwiki (3.20100422) UNRELEASED; urgency=low
   [ Joey Hess ]
   * tag: Automatic creation of tag pages can now be enabled using
     the tag_autocreate setting. (David Riebenbauer)
+  * Customised templates can now be included in the source of wikis
+    (and also in underlays), and dependencies on them are tracked.
+  * TMPL_INCLUDE is no longer supported in any template.
+  * underlay: Removed the add_templates option.
+  * Add template_depends function to plugin API.
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
   * comments: Fix missing entity encoding in title.
   * txt: Add a special case for robots.txt.
-- 
cgit v1.2.3


From 9976abe63ca7359255cdce890e6013e9a2105a13 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:43:29 -0400
Subject: typo

---
 debian/NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/NEWS b/debian/NEWS
index 664f55b6e..f976bdc01 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -27,7 +27,7 @@ ikiwiki (3.20100422) unstable; urgency=low
   These changes may also affect some users:
 
   * The title_natural sort method (as used by the inline directive, etc)
-    have been moved to the new sortnaturally plugin, which is not enabled
+    has been moved to the new sortnaturally plugin, which is not enabled
     by default since it requires the Sort::Naturally perl module.
 
   * TMPL_INCLUDE is no longer supported in any template used by ikiwiki.
-- 
cgit v1.2.3


From 05517a5426fb585fdd56b21ce13cb4b80d2bc709 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:41:52 -0400
Subject: wording

---
 doc/templates.mdwn | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 7b56600d1..c91037670 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -4,9 +4,8 @@ you can fully customise this site.
 [[!if test="enabled(template)" then="""
 ## The template directive
 
-The template directive allows wiki pages to be used as templates.
-These templates can be filled out and inserted into other pages in the
-wiki using the directive.
+The template directive allows wiki pages to be used as templates,
+filled out and inserted into other pages in the wiki.
 """]]
 [[!if test="enabled(template) and enabled(inline)" then="""
 [[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
-- 
cgit v1.2.3


From a46e17893204142c4cb3400057e814aa7856d350 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:43:45 -0400
Subject: add link to templates page

---
 doc/ikiwiki.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn
index e0a971d96..4d840696c 100644
--- a/doc/ikiwiki.mdwn
+++ b/doc/ikiwiki.mdwn
@@ -14,3 +14,4 @@ Some documentation on using ikiwiki:
 * [[ikiwiki/markdown]]
 * [[ikiwiki/openid]]
 * [[ikiwiki/searching]]
+* [[templates]]
-- 
cgit v1.2.3


From be3d754320088ecbb0d60a1675d71078611ef62c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:45:54 -0400
Subject: remove paragraph about old style directives, it's been long enough

---
 doc/ikiwiki/wikilink.mdwn | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index f561d5850..0c30aafa2 100644
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -22,15 +22,3 @@ page, but the link will appear like this: [[foo_bar|SandBox]].
 
 To link to an anchor inside a page, you can use something like
 `\[[WikiLink#foo]]` .
-
-## Directives and WikiLinks
-
-ikiwiki has two syntaxes for
-[[directives|directive]].  The older syntax
-used spaces to distinguish between directives and
-wikilinks; as a result, with that syntax in use, you cannot use spaces
-in WikiLinks, and must replace spaces with underscores.  The newer
-syntax, enabled with the `prefix_directives` option in an ikiwiki
-setup file, prefixes directives with `!`, and thus does not prevent
-links with spaces.  Future versions of ikiwiki will turn this option
-on by default.
-- 
cgit v1.2.3


From b28323e76a98d56fa4af813338a134dea0106626 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:47:46 -0400
Subject: fix caps

---
 doc/ikiwiki/subpage.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ikiwiki/subpage.mdwn b/doc/ikiwiki/subpage.mdwn
index e047b860c..862f45ec1 100644
--- a/doc/ikiwiki/subpage.mdwn
+++ b/doc/ikiwiki/subpage.mdwn
@@ -5,8 +5,8 @@ this page, [[SubPage]] has some related pages placed under it, like
 wiki rather than just having a great big directory full of pages.
 
 To add a SubPage, just make a subdirectory and put pages in it. For
-example, this page is SubPage.mdwn in this wiki's source, and there is also
-a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages
+example, this page is subpage.mdwn in this wiki's source, and there is also
+a subpage subdirectory, which contains subpage/linkingrules.mdwn. Subpages
 can be nested as deeply as you'd like.
 
 Linking to and from a SubPage is explained in [[LinkingRules]].
-- 
cgit v1.2.3


From e90d67d3c9a93862657563e17e24054087f205d1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:54:59 -0400
Subject: Moved javascript files under the ikiwiki/ directory, to avoid
 cluttering the top of the web root. This is another things that requires a
 wiki rebuild on upgrade to this version.

---
 IkiWiki/Plugin/relativedate.pm               |  4 +-
 IkiWiki/Plugin/toggle.pm                     |  4 +-
 debian/changelog                             |  5 +-
 debian/postinst                              |  2 +-
 underlays/javascript/ikiwiki.js              | 54 --------------------
 underlays/javascript/ikiwiki/ikiwiki.js      | 54 ++++++++++++++++++++
 underlays/javascript/ikiwiki/relativedate.js | 76 ++++++++++++++++++++++++++++
 underlays/javascript/ikiwiki/toggle.js       | 29 +++++++++++
 underlays/javascript/relativedate.js         | 76 ----------------------------
 underlays/javascript/toggle.js               | 29 -----------
 10 files changed, 168 insertions(+), 165 deletions(-)
 delete mode 100644 underlays/javascript/ikiwiki.js
 create mode 100644 underlays/javascript/ikiwiki/ikiwiki.js
 create mode 100644 underlays/javascript/ikiwiki/relativedate.js
 create mode 100644 underlays/javascript/ikiwiki/toggle.js
 delete mode 100644 underlays/javascript/relativedate.js
 delete mode 100644 underlays/javascript/toggle.js

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 7f006af83..7e615f7f1 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -37,9 +37,9 @@ sub include_javascript ($;$) {
 	my $page=shift;
 	my $absolute=shift;
 	
-	return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+	return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>'."\n".
-		'<script src="'.urlto("relativedate.js", $page, $absolute).
+		'<script src="'.urlto("ikiwiki/relativedate.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>';
 }
 
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index f9c899540..3319421d9 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -81,9 +81,9 @@ sub include_javascript ($;$) {
 	my $page=shift;
 	my $absolute=shift;
 	
-	return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+	return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>'."\n".
-		'<script src="'.urlto("toggle.js", $page, $absolute).
+		'<script src="'.urlto("ikiwiki/toggle.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>';
 }
 
diff --git a/debian/changelog b/debian/changelog
index 0ab04f522..f9d012e42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100422) UNRELEASED; urgency=low
+ikiwiki (3.20100424) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * tag: Automatic creation of tag pages can now be enabled using
@@ -66,6 +66,9 @@ ikiwiki (3.20100422) UNRELEASED; urgency=low
     (Jelmer Vernooij)
   * Quite a lot of new optimisations, and one major fix to a recent
     performance regression.
+  * Moved javascript files under the ikiwiki/ directory, to avoid cluttering
+    the top of the web root. This is another things that requires a wiki
+    rebuild on upgrade to this version.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/debian/postinst b/debian/postinst
index 810b7cfe0..76ad115ac 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=3.20100422
+firstcompat=3.20100424
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then
diff --git a/underlays/javascript/ikiwiki.js b/underlays/javascript/ikiwiki.js
deleted file mode 100644
index aebc5cf7e..000000000
--- a/underlays/javascript/ikiwiki.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// ikiwiki's javascript utility function library
-
-var hooks;
-
-// Run onload as soon as the DOM is ready, if possible.
-// gecko, opera 9
-if (document.addEventListener) {
-	document.addEventListener("DOMContentLoaded", run_hooks_onload, false);
-}
-// other browsers
-window.onload = run_hooks_onload;
-
-var onload_done = 0;
-
-function run_hooks_onload() {
-	// avoid firing twice
-	if (onload_done)
-		return;
-	onload_done = true;
-
-	run_hooks("onload");
-}
-
-function run_hooks(name) {
-	if (typeof(hooks) != "undefined") {
-		for (var i = 0; i < hooks.length; i++) {
-			if (hooks[i].name == name) {
-				hooks[i].call();
-			}
-		}
-	}
-}
-
-function hook(name, call) {
-	if (typeof(hooks) == "undefined")
-		hooks = new Array;
-	hooks.push({name: name, call: call});
-}
-
-function getElementsByClass(cls, node, tag) {
-        if (document.getElementsByClass)
-                return document.getElementsByClass(cls, node, tag);
-        if (! node) node = document;
-        if (! tag) tag = '*';
-        var ret = new Array();
-        var pattern = new RegExp("(^|\\s)"+cls+"(\\s|$)");
-        var els = node.getElementsByTagName(tag);
-        for (i = 0; i < els.length; i++) {
-                if ( pattern.test(els[i].className) ) {
-                        ret.push(els[i]);
-                }
-        }
-        return ret;
-}
diff --git a/underlays/javascript/ikiwiki/ikiwiki.js b/underlays/javascript/ikiwiki/ikiwiki.js
new file mode 100644
index 000000000..aebc5cf7e
--- /dev/null
+++ b/underlays/javascript/ikiwiki/ikiwiki.js
@@ -0,0 +1,54 @@
+// ikiwiki's javascript utility function library
+
+var hooks;
+
+// Run onload as soon as the DOM is ready, if possible.
+// gecko, opera 9
+if (document.addEventListener) {
+	document.addEventListener("DOMContentLoaded", run_hooks_onload, false);
+}
+// other browsers
+window.onload = run_hooks_onload;
+
+var onload_done = 0;
+
+function run_hooks_onload() {
+	// avoid firing twice
+	if (onload_done)
+		return;
+	onload_done = true;
+
+	run_hooks("onload");
+}
+
+function run_hooks(name) {
+	if (typeof(hooks) != "undefined") {
+		for (var i = 0; i < hooks.length; i++) {
+			if (hooks[i].name == name) {
+				hooks[i].call();
+			}
+		}
+	}
+}
+
+function hook(name, call) {
+	if (typeof(hooks) == "undefined")
+		hooks = new Array;
+	hooks.push({name: name, call: call});
+}
+
+function getElementsByClass(cls, node, tag) {
+        if (document.getElementsByClass)
+                return document.getElementsByClass(cls, node, tag);
+        if (! node) node = document;
+        if (! tag) tag = '*';
+        var ret = new Array();
+        var pattern = new RegExp("(^|\\s)"+cls+"(\\s|$)");
+        var els = node.getElementsByTagName(tag);
+        for (i = 0; i < els.length; i++) {
+                if ( pattern.test(els[i].className) ) {
+                        ret.push(els[i]);
+                }
+        }
+        return ret;
+}
diff --git a/underlays/javascript/ikiwiki/relativedate.js b/underlays/javascript/ikiwiki/relativedate.js
new file mode 100644
index 000000000..5142332f1
--- /dev/null
+++ b/underlays/javascript/ikiwiki/relativedate.js
@@ -0,0 +1,76 @@
+// Causes html elements in the 'relativedate' class to be displayed
+// as relative dates. The date is parsed from the title attribute, or from
+// the element content.
+
+var dateElements;
+
+hook("onload", getDates);
+
+function getDates() {
+	dateElements = getElementsByClass('relativedate');
+	for (var i = 0; i < dateElements.length; i++) {
+		var elt = dateElements[i];
+		var title = elt.attributes.title;
+		var d = new Date(title ? title.value : elt.innerHTML);
+		if (! isNaN(d)) {
+			dateElements[i].date=d;
+			elt.title=elt.innerHTML;
+		}
+	}
+
+	showDates();
+}
+
+function showDates() {
+	for (var i = 0; i < dateElements.length; i++) {
+		var elt = dateElements[i];
+		var d = elt.date;
+		if (! isNaN(d)) {
+			elt.innerHTML=relativeDate(d);
+		}
+	}
+	setTimeout(showDates,30000); // keep updating every 30s
+}
+
+var timeUnits = new Array;
+timeUnits['minute'] = 60;
+timeUnits['hour'] = timeUnits['minute'] * 60;
+timeUnits['day'] = timeUnits['hour'] * 24;
+timeUnits['month'] = timeUnits['day'] * 30;
+timeUnits['year'] = timeUnits['day'] * 364;
+var timeUnitOrder = ['year', 'month', 'day', 'hour', 'minute'];
+
+function relativeDate(date) {
+	var now = new Date();
+	var offset = date.getTime() - now.getTime();
+	var seconds = Math.round(Math.abs(offset) / 1000);
+
+	// hack to avoid reading just in the future if there is a minor
+	// amount of clock slip
+	if (offset >= 0 && seconds < 30 * timeUnits['minute']) {
+		return "just now";
+	}
+
+	var ret = "";
+	var shown = 0;
+	for (i = 0; i < timeUnitOrder.length; i++) {
+		var unit = timeUnitOrder[i];
+		if (seconds >= timeUnits[unit]) {
+			var num = Math.floor(seconds / timeUnits[unit]);
+			seconds -= num * timeUnits[unit];
+			if (ret)
+				ret += "and ";
+			ret += num + " " + unit + (num > 1 ? "s" : "") + " ";
+
+			if (++shown == 2)
+				break;
+		}
+		else if (shown)
+			break;
+	}
+
+	if (! ret)
+		ret = "less than a minute "
+
+	return ret + (offset < 0 ? "ago" : "from now");
+}
diff --git a/underlays/javascript/ikiwiki/toggle.js b/underlays/javascript/ikiwiki/toggle.js
new file mode 100644
index 000000000..d190b737a
--- /dev/null
+++ b/underlays/javascript/ikiwiki/toggle.js
@@ -0,0 +1,29 @@
+// Uses CSS to hide toggleables, to avoid any flashing on page load. The
+// CSS is only emitted after it tests that it's going to be able
+// to show the toggleables.
+if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
+	document.write('<style type="text/css">div.toggleable { display: none; }</style>');
+	hook("onload", inittoggle);
+}
+
+function inittoggle() {
+	var as = getElementsByClass('toggle');
+	for (var i = 0; i < as.length; i++) {
+		var id = as[i].href.match(/#(\w.+)/)[1];
+		if (document.getElementById(id).className == "toggleable")
+			document.getElementById(id).style.display="none";
+		as[i].onclick = function() {
+			toggle(this);
+			return false;
+		}
+	}
+}
+
+function toggle(s) {
+	var id = s.href.match(/#(\w.+)/)[1];
+	style = document.getElementById(id).style;
+	if (style.display == "none")
+		style.display = "block";
+	else
+		style.display = "none";
+}
diff --git a/underlays/javascript/relativedate.js b/underlays/javascript/relativedate.js
deleted file mode 100644
index 5142332f1..000000000
--- a/underlays/javascript/relativedate.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Causes html elements in the 'relativedate' class to be displayed
-// as relative dates. The date is parsed from the title attribute, or from
-// the element content.
-
-var dateElements;
-
-hook("onload", getDates);
-
-function getDates() {
-	dateElements = getElementsByClass('relativedate');
-	for (var i = 0; i < dateElements.length; i++) {
-		var elt = dateElements[i];
-		var title = elt.attributes.title;
-		var d = new Date(title ? title.value : elt.innerHTML);
-		if (! isNaN(d)) {
-			dateElements[i].date=d;
-			elt.title=elt.innerHTML;
-		}
-	}
-
-	showDates();
-}
-
-function showDates() {
-	for (var i = 0; i < dateElements.length; i++) {
-		var elt = dateElements[i];
-		var d = elt.date;
-		if (! isNaN(d)) {
-			elt.innerHTML=relativeDate(d);
-		}
-	}
-	setTimeout(showDates,30000); // keep updating every 30s
-}
-
-var timeUnits = new Array;
-timeUnits['minute'] = 60;
-timeUnits['hour'] = timeUnits['minute'] * 60;
-timeUnits['day'] = timeUnits['hour'] * 24;
-timeUnits['month'] = timeUnits['day'] * 30;
-timeUnits['year'] = timeUnits['day'] * 364;
-var timeUnitOrder = ['year', 'month', 'day', 'hour', 'minute'];
-
-function relativeDate(date) {
-	var now = new Date();
-	var offset = date.getTime() - now.getTime();
-	var seconds = Math.round(Math.abs(offset) / 1000);
-
-	// hack to avoid reading just in the future if there is a minor
-	// amount of clock slip
-	if (offset >= 0 && seconds < 30 * timeUnits['minute']) {
-		return "just now";
-	}
-
-	var ret = "";
-	var shown = 0;
-	for (i = 0; i < timeUnitOrder.length; i++) {
-		var unit = timeUnitOrder[i];
-		if (seconds >= timeUnits[unit]) {
-			var num = Math.floor(seconds / timeUnits[unit]);
-			seconds -= num * timeUnits[unit];
-			if (ret)
-				ret += "and ";
-			ret += num + " " + unit + (num > 1 ? "s" : "") + " ";
-
-			if (++shown == 2)
-				break;
-		}
-		else if (shown)
-			break;
-	}
-
-	if (! ret)
-		ret = "less than a minute "
-
-	return ret + (offset < 0 ? "ago" : "from now");
-}
diff --git a/underlays/javascript/toggle.js b/underlays/javascript/toggle.js
deleted file mode 100644
index d190b737a..000000000
--- a/underlays/javascript/toggle.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Uses CSS to hide toggleables, to avoid any flashing on page load. The
-// CSS is only emitted after it tests that it's going to be able
-// to show the toggleables.
-if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
-	document.write('<style type="text/css">div.toggleable { display: none; }</style>');
-	hook("onload", inittoggle);
-}
-
-function inittoggle() {
-	var as = getElementsByClass('toggle');
-	for (var i = 0; i < as.length; i++) {
-		var id = as[i].href.match(/#(\w.+)/)[1];
-		if (document.getElementById(id).className == "toggleable")
-			document.getElementById(id).style.display="none";
-		as[i].onclick = function() {
-			toggle(this);
-			return false;
-		}
-	}
-}
-
-function toggle(s) {
-	var id = s.href.match(/#(\w.+)/)[1];
-	style = document.getElementById(id).style;
-	if (style.display == "none")
-		style.display = "block";
-	else
-		style.display = "none";
-}
-- 
cgit v1.2.3


From c0b2334815303d4dc2fdf0b22dff12085671c8d8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 01:13:37 -0400
Subject: reword, reorg, add example

---
 doc/templates.mdwn | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index c91037670..0e54ae8a0 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -2,7 +2,7 @@
 you can fully customise this site.
 
 [[!if test="enabled(template)" then="""
-## The template directive
+## template pages
 
 The template directive allows wiki pages to be used as templates,
 filled out and inserted into other pages in the wiki.
@@ -12,21 +12,32 @@ filled out and inserted into other pages in the wiki.
 sort=title template=titlepage
 rootpage=templates postformtext="Add a new template named:"]]
 """]]
+[[!if test="enabled(template)" then="""
+[[!template id=note text="This note box is built using the
+[[note]] template!"]]
+[[!template id=popup mouseover="popup example" popup="This popup is built using
+the [[popup]] template!"]]
+"""]]
 
 [[!if test="enabled(edittemplate)" then="""
-## The edittemplate directive
+## edit templates
 
 The edittemplate directive can be used to make new pages default to
 containing text from a template, which can be filled as out the page is
 edited.
 """]]
 
-## Wiki templates
+## wiki templates
 
 These templates are used to build the wiki. The aim is to keep almost all
 html out of ikiwiki and in the templates.
 
-* `page.tmpl` - Used for displaying all regular wiki pages.
+* `page.tmpl` - Used for displaying all regular wiki pages. This is the
+  key template customize.
+[[!if test="enabled(pagetemplate)" then="""
+  (The pagetemplate directive can be used to make a page use a
+  different template than `page.tmpl`.)
+"""]]
 * `misc.tmpl` - Generic template used for any page that doesn't
   have a custom template.
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
@@ -58,13 +69,6 @@ html out of ikiwiki and in the templates.
   `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not
   normally need to be customised.
 
-[[!if test="enabled(pagetemplate)" then="""
-## The pagetemplate directive
-
-The pagetemplate directive can allow individual pages to use a
-different template than `page.tmpl`.
-"""]]
-
 ## Template locations
 
 Templates are located in `/usr/share/ikiwiki/templates` by default;
-- 
cgit v1.2.3


From df012e54c7bf5a8e8fb2cb3c2f8cbf8dc30686f9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 01:13:58 -0400
Subject: chomp template values

Before the template reorg, this was done by a template filter.
---
 IkiWiki/Plugin/template.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index d2b2fef55..52c482c38 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -56,12 +56,14 @@ sub preprocess (@) {
 		          IkiWiki::filter($params{page}, $params{destpagea},
 		          $params{$param}), $scan);
 		if ($template->query(name => $param)) {
-			$template->param($param =>
-				IkiWiki::htmlize($params{page}, $params{destpage},
+			my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage},
 					pagetype($pagesources{$params{page}}),
-					$value));
+					$value);
+			chomp $htmlvalue;
+			$template->param($param => $htmlvalue);
 		}
 		if ($template->query(name => "raw_$param")) {
+			chomp $value;
 			$template->param("raw_$param" => $value);
 		}
 	}
-- 
cgit v1.2.3


From a95d824cb43b9ffadb802f0804818b329f57d69a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 01:36:01 -0400
Subject: update

---
 doc/templates.mdwn | 46 +++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 0e54ae8a0..67e5517e4 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -1,6 +1,21 @@
 [[Ikiwiki]] uses many templates for many purposes. By editing its templates,
 you can fully customise this site.
 
+Templates are located in `/usr/share/ikiwiki/templates` by default;
+the `templatedir` setting can be used to make another directory be
+searched first. Customized templates can also be placed inside the
+"templates/" directory in your wiki's source.
+
+Ikiwiki uses the HTML::Template module as its template engine. This
+supports things like conditionals and loops in templates and is pretty
+easy to learn. All you really need to know are a few things:
+
+* To insert the value of a template variable, use `<TMPL_VAR variable>`.
+* To make a block of text conditional on a variable being set use
+  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+* To use one block of text if a variable is set and a second if it's not,
+  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+
 [[!if test="enabled(template)" then="""
 ## template pages
 
@@ -12,12 +27,6 @@ filled out and inserted into other pages in the wiki.
 sort=title template=titlepage
 rootpage=templates postformtext="Add a new template named:"]]
 """]]
-[[!if test="enabled(template)" then="""
-[[!template id=note text="This note box is built using the
-[[note]] template!"]]
-[[!template id=popup mouseover="popup example" popup="This popup is built using
-the [[popup]] template!"]]
-"""]]
 
 [[!if test="enabled(edittemplate)" then="""
 ## edit templates
@@ -33,11 +42,9 @@ These templates are used to build the wiki. The aim is to keep almost all
 html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
-  key template customize.
-[[!if test="enabled(pagetemplate)" then="""
+  key template to customize. [[!if test="enabled(pagetemplate)" then="""
   (The pagetemplate directive can be used to make a page use a
-  different template than `page.tmpl`.)
-"""]]
+  different template than `page.tmpl`.)"""]]
 * `misc.tmpl` - Generic template used for any page that doesn't
   have a custom template.
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
@@ -69,23 +76,4 @@ html out of ikiwiki and in the templates.
   `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not
   normally need to be customised.
 
-## Template locations
-
-Templates are located in `/usr/share/ikiwiki/templates` by default;
-the `templatedir` setting can be used to make another directory be
-searched first. Customized templates can also be placed inside the
-"templates/" directory in your wiki's source.
-
-## Template syntax
-
-Ikiwiki uses the HTML::Template module as its template engine. This
-supports things like conditionals and loops in templates and is pretty easy
-to learn. All you really need to know are a few things:
-
-* To insert the value of a template variable, use `<TMPL_VAR variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
-* To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
-
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From 7099978b7255db504ea17ccd07533e86c2b262fa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 16:00:18 -0400
Subject: bugfix

---
 IkiWiki.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7382f11e4..8bae6b72f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1712,7 +1712,8 @@ sub misctemplate ($$;@) {
 	my $title=shift;
 	my $pagebody=shift;
 	
-	my $template=template("misc.tmpl",
+	my $template=template("misc.tmpl");
+	$template->param(
 		title => $title,
 		indexlink => indexlink(),
 		wikiname => $config{wikiname},
-- 
cgit v1.2.3


From c2656f08f3a3671b0ba7dc861d53347c7f695ec1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 16:11:33 -0400
Subject: template() - return params in list context

I forgot CGI::Formbuilder's horrible interface that needs template
parameters instead of a constructed object.
---
 IkiWiki.pm                 |   7 +-
 IkiWiki/Plugin/comments.pm |   2 +-
 IkiWiki/Plugin/editpage.pm |   2 +-
 doc/plugins/write.mdwn     |   8 +-
 po/bg.po                   | 236 ++++++++++++++++++++++---------------------
 po/cs.po                   | 243 +++++++++++++++++++++++---------------------
 po/da.po                   | 242 ++++++++++++++++++++++++--------------------
 po/de.po                   | 242 ++++++++++++++++++++++++--------------------
 po/es.po                   | 246 ++++++++++++++++++++++++---------------------
 po/fr.po                   | 242 ++++++++++++++++++++++++--------------------
 po/gu.po                   | 235 +++++++++++++++++++++++--------------------
 po/ikiwiki.pot             | 218 ++++++++++++++++++++-------------------
 po/it.po                   | 242 ++++++++++++++++++++++++--------------------
 po/pl.po                   | 241 +++++++++++++++++++++++---------------------
 po/sv.po                   | 236 ++++++++++++++++++++++---------------------
 15 files changed, 1416 insertions(+), 1226 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8bae6b72f..c218ed8ab 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1690,8 +1690,7 @@ sub template_depends ($$;@) {
 
 	return unless defined $filename;
 
-	require HTML::Template;
-	return HTML::Template->new(
+	my @opts=(
 		filter => sub {
 			my $text_ref = shift;
 			${$text_ref} = decode_utf8(${$text_ref});
@@ -1702,6 +1701,10 @@ sub template_depends ($$;@) {
 		@_,
 		no_includes => 1,
 	);
+	return @opts if wantarray;
+
+	require HTML::Template;
+	return HTML::Template->new(@opts);
 }
 
 sub template ($;@) {
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ed75a6e46..f7dc99dca 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -274,7 +274,7 @@ sub editcomment ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => template('editcomment.tmpl'),
+		template => { template('editcomment.tmpl') },
 	);
 
 	IkiWiki::decode_form_utf8($form);
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 5c94ecbca..7bb6eb07c 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -78,7 +78,7 @@ sub cgi_editpage ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => template("editpage.tmpl"),
+		template => { template("editpage.tmpl") },
 	);
 	
 	decode_form_utf8($form);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 9128c7f54..a9ea7db73 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -701,9 +701,11 @@ the entire wiki build and make the wiki unusable.
 
 ### `template($;@)`
 
-Creates and returns a [[!cpan HTML::Template]] object. The first parameter
-is the name of the template file. The optional remaining parameters are
-passed to `HTML::Template->new`.
+Creates and returns a [[!cpan HTML::Template]] object. (In a list context,
+returns the parameters needed to construct the obhect.) 
+
+The first parameter is the name of the template file. The optional remaining
+parameters are passed to `HTML::Template->new`.
 
 Normally, the template file is first looked for in the templates/ subdirectory
 of the srcdir. Failing that, it is looked for in the templatedir.
diff --git a/po/bg.po b/po/bg.po
index 5585a10d6..f85323ea3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Грешка"
 
@@ -137,7 +137,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "готово"
 
@@ -178,7 +178,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -210,55 +210,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -268,7 +268,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -298,14 +298,14 @@ msgstr "премахване на старата страница „%s”"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
@@ -325,9 +325,10 @@ msgstr "не е указан файл на обвивката"
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
-msgid "failed to process"
+msgid "failed to process template:"
 msgstr "грешка при обработване на шаблона"
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -358,18 +359,18 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -458,12 +459,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr ""
+msgid "template %s not found"
+msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
@@ -494,21 +495,25 @@ msgstr ""
 "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/"
 "markdown” (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 #, fuzzy
 msgid "redir page not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "шаблонът „%s” не е намерен"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Огледала"
@@ -525,10 +530,6 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "функцията „getctime” не е реализирана"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -546,39 +547,39 @@ msgstr "Всички страници имат връзки от други ст
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Акаунтът е създаден. Можете да влезете."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Грешка при създаване на акаунта."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Грешка при изпращане на поща"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -609,94 +610,94 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -841,44 +842,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr "не е указан файл на обвивката"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "обновяване на страницата „%s”"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”"
@@ -983,21 +984,21 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "създаване на нова страницa „%s”"
+
+#: ../IkiWiki/Plugin/template.pm:33
 #, fuzzy
 msgid "missing id parameter"
 msgstr "липсващ параметър „id” на шаблона"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
+#, fuzzy, perl-format
+msgid "%s not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/template.pm:66
-#, fuzzy
-msgid "failed to process:"
-msgstr "грешка при обработване на шаблона"
-
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
@@ -1056,54 +1057,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1176,64 +1182,65 @@ msgstr "формат: ikiwiki [опции] източник местоназна
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Дискусия"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
@@ -1258,6 +1265,13 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to process"
+#~ msgstr "грешка при обработване на шаблона"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "функцията „getctime” не е реализирана"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "грешка при запис на файла „%s”: %s"
@@ -1316,10 +1330,6 @@ msgstr ""
 #~ "изпълнява като „svn post-commit hook”. Няма да бъдат разпратени "
 #~ "известявания"
 
-#, fuzzy
-#~ msgid "%s not found"
-#~ msgstr "шаблонът „%s” не е намерен"
-
 #~ msgid "What's this?"
 #~ msgstr "Какво е това?"
 
diff --git a/po/cs.po b/po/cs.po
index 0b45bb97a..71195bae2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -55,7 +55,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Chyba"
 
@@ -136,7 +136,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr "mažu bucket..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "hotovo"
 
@@ -174,7 +174,7 @@ msgstr "chybné jméno souboru s přílohou"
 msgid "attachment upload"
 msgstr "příloha nahrána"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "automatické vytváření indexu"
 
@@ -208,55 +208,55 @@ msgstr "komentář musí mít obsah"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "chybný název stránky"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "komentář k %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "komentáře na stránce „%s“ jsou uzamčeny"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "komentář uložen pro schválení"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Váš komentář bude zobrazen po schválení moderátorem"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Přidán komentář"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Přidán komentář: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "nejste přihlášeni jako správce"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -266,7 +266,7 @@ msgstr[1] "Komentáře"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Komentáře"
@@ -297,14 +297,14 @@ msgstr "odstraňuji starý náhled %s"
 msgid "%s is not an editable page"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
@@ -322,9 +322,11 @@ msgstr "nebyl zadán parametr match"
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s byla zaregistrována pro %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "nepodařilo se zpracovat"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "nepodařilo se zpracovat:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -352,18 +354,18 @@ msgstr "není stránkou"
 msgid "%s is an attachment, not a page."
 msgstr "%s není ani příloha, ani stránka."
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "nejste oprávněni měnit %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
@@ -445,12 +447,12 @@ msgstr "parametry %s a %s nelze použít zároveň"
 msgid "Add a new post titled:"
 msgstr "Přidat nový příspěvek nazvaný:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "neexistující šablona %s"
+msgid "template %s not found"
+msgstr "šablona %s nebyla nalezena"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
@@ -478,18 +480,23 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "styl nebyl nalezen"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "stránka, na kterou vede přesměrování, nebyla nalezena"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "cykly nejsou v přesměrování povoleny"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "vyžaduje parametry „from“ a „to“"
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Zrcadla"
@@ -507,10 +514,6 @@ msgstr "schvalování komentářů"
 msgid "more"
 msgstr "více"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime není implementováno"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Přihlásit pomocí"
@@ -527,39 +530,39 @@ msgstr "Na každou stránku vede odkaz z jiné stránky."
 msgid "bad or missing template"
 msgstr "chybná nebo chybějící šablona"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Vytvoření účtu bylo úspěšné. Nyní se můžete přihlásit."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Chyba při vytváření účtu."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr "Bez e-mailové adresy nelze zaslat postup na resetování hesla."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Nepodařilo se odeslat email."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr "Postup na resetování hesla vám byl odeslán na e-mail."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "chybné URL pro resetování hesla"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "resetování hesla bylo zamítnuto"
 
@@ -589,40 +592,40 @@ msgstr "LWP nebyl nalezen, nepinkám"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není platným kódem jazyka"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "sestavuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "aktualizovány PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -630,7 +633,7 @@ msgstr ""
 "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
 "budou odstraněny také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -638,50 +641,50 @@ msgstr ""
 "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
 "budou přejmenovány také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT soubor (%s) neexistuje"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nepodařilo se zkopírovat PO soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "nepodařilo se aktualizovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nepodařilo se zkopírovat POT soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "nepodařilo se přeložit %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "odstraněny zastaralé PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "nepodařilo se zapsat %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "překlad se nezdařil"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
@@ -825,44 +828,44 @@ msgstr "%s není ve zdrojovém adresáři a proto nelze přejmenovat"
 msgid "no change to the file name was specified"
 msgstr "jméno souboru nebylo změněno"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "neplatné jméno"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s již existuje"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s již na disku existuje"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "přejmenování %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "Také přejmenovat podstránky a přílohy"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Najednou lze přejmenovat pouze jednu přílohu."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Vyberte přílohu, kterou chcete přejmenovat."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "přejmenování %s na %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizace pro přejmenování %s na %s"
@@ -960,18 +963,19 @@ msgstr "Stáhnout zdrojová data"
 msgid "parse fail at line %d: %s"
 msgstr "zpracovávání selhalo na řádku %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "vytvářím novou stránku %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "chybí parametr id"
 
 #: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
-msgid "template %s not found"
-msgstr "šablona %s nebyla nalezena"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "nepodařilo se zpracovat:"
+msgid "%s not found"
+msgstr "%s nenalezen"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1034,12 +1038,12 @@ msgstr "nemohu určit identitu nedůvěryhodného uživatele %s"
 msgid "bad file name %s"
 msgstr "chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1048,42 +1052,47 @@ msgstr ""
 "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-"
 "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s má několik možných zdrojových stránek"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "sestavuji %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "odstraňuji %s, již není sestavována pomocí %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "sestavuji %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze sestavit %s"
@@ -1156,63 +1165,64 @@ msgstr "použití: ikiwiki [volby] zdroj cíl"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup konfigurační.soubor"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "použití: --set proměnná=hodnota"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "použití: --set proměnná=hodnota"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "znovusestavuji wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskuse"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "nelze použít několik rcs modulů"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
@@ -1237,6 +1247,18 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?"
 msgid "What is the domain name of the web server?"
 msgstr "Jaké je doménové jméno webového serveru?"
 
+#~ msgid "failed to process"
+#~ msgstr "nepodařilo se zpracovat"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "neexistující šablona %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime není implementováno"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
+
 #~ msgid "failed to read %s"
 #~ msgstr "nepodařilo se přečíst %s"
 
@@ -1284,9 +1306,6 @@ msgstr "Jaké je doménové jméno webového serveru?"
 #~ "REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat "
 #~ "oznámení"
 
-#~ msgid "%s not found"
-#~ msgstr "%s nenalezen"
-
 #~ msgid "What's this?"
 #~ msgstr "Co to je?"
 
diff --git a/po/da.po b/po/da.po
index be7a95e6a..f830d667d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Fejl"
 
@@ -140,7 +140,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "færdig"
 
@@ -181,7 +181,7 @@ msgstr "dårligt vedhæftningsfilnavn"
 msgid "attachment upload"
 msgstr "vedhæftningsoplægning"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "automatisk indeks-dannelse"
 
@@ -215,55 +215,55 @@ msgstr "kommentar skal have indhold"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "dårligt sidenavn"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommenterer på %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "kommentarer på side '%s' er lukket"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "kommentar gemt for moderering"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Tilføjede en kommentar"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Kommentarmoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "kommentarkoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -273,7 +273,7 @@ msgstr[1] "Kommentarer"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Kommentarer"
@@ -304,14 +304,14 @@ msgstr "fjerner gammelt smugkig %s"
 msgid "%s is not an editable page"
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "redigerer %s"
@@ -329,9 +329,11 @@ msgstr "sammenligning ikke angivet"
 msgid "edittemplate %s registered for %s"
 msgstr "redigeringsskabelon %s registreret for %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "dannelsen mislykkedes"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "dannelsen mislykkedes:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -360,18 +362,18 @@ msgstr "kan ikke få sider til at passe sammen: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Du har ikke lov til at ændre %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "du kan ikke påvirke en fil med modus %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
@@ -456,12 +458,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr "Tilføj nyt indlæg med følgende titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "ikke-eksisterende skabelon: %s"
+msgid "template %s not found"
+msgstr "skabelon %s ikke fundet"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 
@@ -491,18 +493,23 @@ msgstr ""
 "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) "
 "mislykkedes"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "stilsnit (stylesheet) ikke fundet"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "henvisningsside ikke fundet"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "ring af henvisninger er ikke tilladt"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "kræver 'from'- og 'to'-parametre"
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Spejle"
@@ -520,10 +527,6 @@ msgstr "kommentarkoderering"
 msgid "more"
 msgstr "mere"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime ikke implementeret"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Log på med"
@@ -540,40 +543,40 @@ msgstr "Alle sider har henvisninger fra andre sider."
 msgid "bad or missing template"
 msgstr "dårlig eller manglende skabelon"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Konto korrekt oprettet. Nu kan du logge på."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Fejl ved kontooprettelse."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Afsendelse af mail mislykkedes"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr "Du har fået tilsendt adgangskodenulstillingsinstruktioner."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "Ukorrekt adgangskodenumstillings-URL"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "adgangskodenulstilling afvist"
 
@@ -603,12 +606,12 @@ msgstr "LWP ikke fundet, pinger ikke"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -616,7 +619,7 @@ msgstr ""
 "%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -624,21 +627,21 @@ msgstr ""
 "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -646,7 +649,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -654,50 +657,50 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -840,44 +843,44 @@ msgstr "%s er ikke i srcdir, så kan ikke blive omdøbt"
 msgid "no change to the file name was specified"
 msgstr "ingen ændring til filnavnet blev angivet"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "ugyldigt navn"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s eksisterer allerede"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s eksisterer allerede på disken"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "omdøb %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "Omdøb også UnderSider og vedhæftninger"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Kun en vedhæftning kan blive omdøbt ad gangen."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Vælg vedhæftningen som skal omdøbes."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "omdøb %s til %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "opdatering til omdøbning af %s til %s"
@@ -975,18 +978,19 @@ msgstr "Direkte datanedlastning"
 msgid "parse fail at line %d: %s"
 msgstr "afkodningsfejl på linje %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "opretter ny side %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "manglende id-parameter"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "skabelon %s ikke fundet"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "dannelsen mislykkedes:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "fødning ikke fundet"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1049,12 +1053,12 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "gennemlæser %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1063,42 +1067,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1171,64 +1180,65 @@ msgstr "brug: ikiwiki [valg] kilde mål"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup opsætningsfil"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "bygger wrappers.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally krævet for title_natural sortering"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
@@ -1253,6 +1263,18 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er webserverens domænenavn?"
 
+#~ msgid "failed to process"
+#~ msgstr "dannelsen mislykkedes"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "ikke-eksisterende skabelon: %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime ikke implementeret"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Sort::Naturally krævet for title_natural sortering"
+
 #~ msgid "failed to read %s"
 #~ msgstr "læsning af %s mislykkedes"
 
diff --git a/po/de.po b/po/de.po
index e5a18d47b..2452c8d21 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2010-03-14 16:09+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Fehler"
 
@@ -137,7 +137,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr "lösche Behälter (bucket)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "fertig"
 
@@ -176,7 +176,7 @@ msgstr "fehlerhafter Dateiname für Anhang"
 msgid "attachment upload"
 msgstr "Anhang hochladen"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "automatische Index-Erstellung"
 
@@ -210,56 +210,56 @@ msgstr "ein Kommentar sollte Inhalt haben"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "fehlerhafter Seitenname"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommentiere %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 "Seite %s existiert nicht, Sie können sie deshalb auch nicht kommentieren"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Kommentare zur Seite %s sind gesperrt"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "Der Kommentar wurde zur Moderation gespeichert"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Ihr Kommentar wird nach Moderation verschickt"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Kommentar hinzugefügt"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Kommentar hinzugefügt: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "Sie sind nicht als Administrator angemeldet"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -269,7 +269,7 @@ msgstr[1] "%i Kommentare"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr "Kommentieren"
 
@@ -299,14 +299,14 @@ msgstr "entferne alte Vorschau %s"
 msgid "%s is not an editable page"
 msgstr "Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "erstelle %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "bearbeite %s"
@@ -324,9 +324,11 @@ msgstr "Übereinstimmung nicht angegeben"
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s für %s registriert"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "Ablauf fehlgeschlagen"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "Fehler beim Ablauf:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -354,18 +356,18 @@ msgstr "Keine Seite"
 msgid "%s is an attachment, not a page."
 msgstr "Seite %s ist ein Anhang und keine Seite."
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Sie dürfen %s nicht verändern"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
@@ -451,12 +453,12 @@ msgstr "die Parameter %s und %s können nicht zusammen benutzt werden"
 msgid "Add a new post titled:"
 msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "nicht-vorhandene Vorlage %s"
+msgid "template %s not found"
+msgstr "Vorlage %s nicht gefunden"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
@@ -487,18 +489,23 @@ msgstr ""
 "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) "
 "fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "Stylesheet nicht gefunden"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "Umleitungsseite nicht gefunden"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "Zyklische Umleitungen sind nicht erlaubt"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "erfordert die Parameter 'from' und 'to'"
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Spiegel"
@@ -515,10 +522,6 @@ msgstr "Kommentar muss moderiert werden"
 msgid "more"
 msgstr "mehr"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime ist nicht implementiert"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Anmelden mit"
@@ -535,41 +538,41 @@ msgstr "Alle Seiten haben mindestens einen Verweis von einer anderen Seite."
 msgid "bad or missing template"
 msgstr "fehlerhafte oder fehlende Vorlage"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr "Ihre Benutzerseite: "
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr "Benutzerseite erstellen"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Kontoerstellung erfolgreich. Sie können sich jetzt anmelden."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Konto konnte nicht erstellt werden."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "es gibt keine E-Mail Adresse, deshalb kann keine Anweisung zum Zurücksetzen "
 "des Passwortes zugeschickt werden."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Es konnte keine E-Mail versandt werden"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr "Ihnen wurden Anweisungen zum Zurücksetzen des Passworts zugesandt."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "fehlerhafte URL zum Zurücksetzen des Passworts"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "zurücksetzen des Passworts abgelehnt"
 
@@ -599,12 +602,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35"
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist keine gültige Sprachkodierung"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -612,7 +615,7 @@ msgstr ""
 "%s ist kein gültiger Wert für po_link_to, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -620,21 +623,21 @@ msgstr ""
 "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -642,7 +645,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -650,50 +653,50 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -839,44 +842,44 @@ msgstr "%s ist nicht im srcdir und kann deshalb nicht umbenannt werden"
 msgid "no change to the file name was specified"
 msgstr "es wurde keine Änderung des Dateinamens angegeben"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "unzulässiger Name"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s existiert bereits"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s existiert bereits auf der Festplatte"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "benenne %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "benenne %s in %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualisiert zum Umbenennen von %s nach %s"
@@ -974,18 +977,19 @@ msgstr "Direkter Daten-Download"
 msgid "parse fail at line %d: %s"
 msgstr "Auswertungsfehler in Zeile %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "erstelle neue Seite %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "fehlender Parameter id"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "Vorlage %s nicht gefunden"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "Fehler beim Ablauf:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "Vorlage (feed) nicht gefunden"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1051,12 +1055,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "durchsuche %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1065,42 +1069,47 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1176,66 +1185,67 @@ msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup Konfigurationsdatei"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "Aufruf: --set Variable=Wert"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "Aufruf: --set Variable=Wert"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally wird benötigt für title_natural sort"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
@@ -1260,6 +1270,18 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?"
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
 
+#~ msgid "failed to process"
+#~ msgstr "Ablauf fehlgeschlagen"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "nicht-vorhandene Vorlage %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime ist nicht implementiert"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Sort::Naturally wird benötigt für title_natural sort"
+
 #~ msgid "failed to read %s"
 #~ msgstr "lesen von %s fehlgeschlagen"
 
diff --git a/po/es.po b/po/es.po
index 413572866..a6f3a2c6b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Error"
 
@@ -142,7 +142,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "completado"
 
@@ -183,7 +183,7 @@ msgstr "nombre de archivo adjunto erróneo"
 msgid "attachment upload"
 msgstr "enviado el adjunto"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "creación de índice automática"
 
@@ -217,55 +217,55 @@ msgstr "Un comentario debe tener algún contenido"
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nombre de página erróneo"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "creando comentarios en la página %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "la página '%s' no existe, así que no se puede comentar sobre ella"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "los comentarios para la página '%s' están cerrados"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "comentario guardado a la espera de aprobación"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Su comentario será publicado después de que el moderador lo revise"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Añadir un comentario"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "No está registrado como un administrador"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -275,7 +275,7 @@ msgstr[1] "Comentarios"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Comentarios"
@@ -306,14 +306,14 @@ msgstr "eliminando la antigua previsualización %s"
 msgid "%s is not an editable page"
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
@@ -331,9 +331,11 @@ msgstr "falta indicar la coincidencia de páginas (match)"
 msgid "edittemplate %s registered for %s"
 msgstr "plantilla de edición %s registrada para %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "fallo en el proceso"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -362,18 +364,18 @@ msgstr "no encuentro páginas coincidentes: %s"
 msgid "%s is an attachment, not a page."
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No puede cambiar %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "no puede actuar sobre un archivo con permisos %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
@@ -460,12 +462,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr "Añadir una entrada nueva titulada:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "la plantilla %s no existe "
+msgid "template %s not found"
+msgstr "no he encontrado la plantilla %s"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
@@ -495,18 +497,23 @@ msgstr ""
 "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar "
 "el programa /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "hoja de estilo no encontrada "
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "falta la página a donde redirigir"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "ciclo de redirección no permitido"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "los parámetros 'from' y 'to' son obligatorios"
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Réplicas"
@@ -524,10 +531,6 @@ msgstr "aprobación de comentarios"
 msgid "more"
 msgstr "ver más"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "la funcionalidad getctime no está incluida"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Identificarse mediante "
@@ -545,43 +548,43 @@ msgstr "Todas las páginas están referenciadas entre sí."
 msgid "bad or missing template"
 msgstr "plantilla errónea ó no existente"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Cuenta de usuario creada con éxito. Ahora puede identificarse."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Error creando la cuenta de usuario."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "No tengo dirección de correo electrónica, así que no puedo enviar "
 "instrucciones para reiniciar la contraseña"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "No he podido enviar el mensaje de correo electrónico"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Las instrucciones para reiniciar la contraseña se le han enviado por correo "
 "electrónico"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "el url para reiniciar la contraseña es incorrecto"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "reinicio de contraseña denegado"
 
@@ -611,94 +614,94 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -840,44 +843,44 @@ msgstr "%s no está en el directorio fuente por lo que no puede ser renombrado"
 msgid "no change to the file name was specified"
 msgstr "no se ha indicado cambio alguno en el nombre del archivo"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "nombre no válido"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s ya existe"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s ya existe en el disco"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "cambiando de nombre %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "También cambia de nombre las subpáginas y los adjuntos"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Únicamente un adjunto puede ser renombrado a la vez."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Por favor, seleccione el adjunto al que cambiar el nombre."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "%s cambia de nombre a %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "actualizado el cambio de nombre de %s a %s"
@@ -979,18 +982,19 @@ msgstr "Enlace directo para descarga"
 msgid "parse fail at line %d: %s"
 msgstr "error de análisis en la línea %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "creando nueva página %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "falta el parámetro \"id\""
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "no he encontrado la plantilla %s"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "fuente de datos no encontrada"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1055,12 +1059,12 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1069,44 +1073,49 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1181,69 +1190,68 @@ msgstr "uso: ikiwiki [opciones] origen destino"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup archivo_de_configuración"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
-"Se necesita el módulo Sort::Naturally para el tipo de ordenación "
-"title_natural"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
@@ -1271,6 +1279,20 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "failed to process"
+#~ msgstr "fallo en el proceso"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "la plantilla %s no existe "
+
+#~ msgid "getctime not implemented"
+#~ msgstr "la funcionalidad getctime no está incluida"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr ""
+#~ "Se necesita el módulo Sort::Naturally para el tipo de ordenación "
+#~ "title_natural"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "no puedo leer de %s: %s "
diff --git a/po/fr.po b/po/fr.po
index 6be9482ce..b98a498c0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Erreur"
 
@@ -138,7 +138,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "Suppression du compartiment S3 (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "Terminé"
 
@@ -176,7 +176,7 @@ msgstr "Nom de la pièce jointe incorrect"
 msgid "attachment upload"
 msgstr "Envoi de la pièce jointe"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "Génération de l'index automatique"
 
@@ -210,55 +210,55 @@ msgstr "Un commentaire doit avoir un contenu."
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "Nom de page incorrect"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "Faire un commentaire sur %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "La page '%s' n'existe pas, commentaire impossible."
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Le commentaire pour la page '%s' est terminé."
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "Le commentaire a été enregistré, en attente de « modération »"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Votre commentaire sera publié après vérification par le modérateur"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Commentaire ajouté"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "Vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -268,7 +268,7 @@ msgstr[1] "Commentaires"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Commentaires"
@@ -299,14 +299,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s"
 msgid "%s is not an editable page"
 msgstr "%s n'est pas une page éditable"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "Édition de %s"
@@ -324,9 +324,11 @@ msgstr "correspondance non indiquée"
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s enregistré pour %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "Échec du traitement"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "Échec du traitement :"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -354,18 +356,18 @@ msgstr "Ce n'est pas une page."
 msgid "%s is an attachment, not a page."
 msgstr "%s est une pièce jointe, pas une page."
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Vous n'êtes pas autorisé à modifier %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
@@ -452,12 +454,12 @@ msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble."
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "Le modèle de page %s n'existe pas"
+msgid "template %s not found"
+msgstr "Modèle de page %s introuvable"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -486,18 +488,23 @@ msgstr ""
 "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown "
 "(%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "Feuille de style introuvable "
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "Page de redirection introuvable"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "Redirection cyclique non autorisée"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "les paramètres « from » et « to » sont nécessaires."
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Miroirs"
@@ -515,10 +522,6 @@ msgstr "modération du commentaire"
 msgid "more"
 msgstr "lire la suite"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime n'est pas implémenté"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "S'identifier en tant que"
@@ -535,43 +538,43 @@ msgstr "Toutes les pages sont liées à d'autres pages."
 msgid "bad or missing template"
 msgstr "Modèle de page incorrect ou manquant"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Erreur lors de la création du compte."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Aucune adresse indiquée. Impossible d'envoyer les instructions pour "
 "réinitialiser le mot de passe."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Impossible d'envoyer un courriel"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Vous avez reçu un message contenant les instructions pour réinitialiser le "
 "mot de passe"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "Adresse pour la réinitialisation du mot de passe incorrecte"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "réinitialisation du mot de passe refusée"
 
@@ -603,12 +606,12 @@ msgstr ""
 "Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
 "version 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un code de langue valable"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -616,7 +619,7 @@ msgstr ""
 "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
 "défaut."
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -624,23 +627,23 @@ msgstr ""
 "po_link_to=negotiated nécessite que usedirs soit activé, retour à "
 "po_link_to=default."
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -648,7 +651,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -656,50 +659,50 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -844,44 +847,44 @@ msgstr "%s n'est pas dans srcdir. Impossible de le renommer"
 msgid "no change to the file name was specified"
 msgstr "Aucun changement dans le nom du fichier n'a été spécifié"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "Appellation interdite"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s existe déjà sur le disque"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "%s renommé"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "« SubPages » et attachements renommés."
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Modification de pièce jointe : une seule à la fois"
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Veuillez sélectionner la pièce jointe à renommer"
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "Renomme %s en %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "mise à jour, suite au changement de %s en %s"
@@ -979,18 +982,19 @@ msgstr "Téléchargement direct des données"
 msgid "parse fail at line %d: %s"
 msgstr "Erreur d'analyse à la ligne %d : %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "Création de la nouvelle page %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "Paramètre d'identification manquant"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "Modèle de page %s introuvable"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "Échec du traitement :"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "Flux introuvable "
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1054,12 +1058,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1068,42 +1072,47 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1181,64 +1190,65 @@ msgstr "Syntaxe : ikiwiki [options] source destination"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup fichier de configuration"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
@@ -1263,6 +1273,18 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "failed to process"
+#~ msgstr "Échec du traitement"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "Le modèle de page %s n'existe pas"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime n'est pas implémenté"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
+
 #~ msgid "failed to read %s"
 #~ msgstr "Impossible de lire %s"
 
diff --git a/po/gu.po b/po/gu.po
index d4bfd42c0..4f652358d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -135,7 +135,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -176,7 +176,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -208,55 +208,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -266,7 +266,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -296,14 +296,14 @@ msgstr "જુનાં પાનાં દૂર કરે છે %s"
 msgid "%s is not an editable page"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
@@ -323,9 +323,10 @@ msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ ન
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
-msgid "failed to process"
+msgid "failed to process template:"
 msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -356,18 +357,18 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -453,12 +454,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
+msgid "template %s not found"
+msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
@@ -485,20 +486,24 @@ msgstr ""
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "સ્ટાઇલશીટ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 #, fuzzy
 msgid "redir page not found"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "ફીડ મળ્યું નહી"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "મિરરો"
@@ -515,10 +520,6 @@ msgstr ""
 msgid "more"
 msgstr "વધુ"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime અમલમાં મૂકાયેલ નથી"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -536,39 +537,39 @@ msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે 
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "ખાતું બનાવવાનું સફળ. તમે હવે લોગઇન કરી શકો છો."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "ખાતું બનાવવામાં ક્ષતિ."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "મેઇલ મોકલવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -599,94 +600,94 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -831,44 +832,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "રેન્ડર કરે છે %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "%s નો સુધારો %s નાં %s વડે"
@@ -970,19 +971,20 @@ msgstr "સીધી માહિતી ડાઉનલોડ"
 msgid "parse fail at line %d: %s"
 msgstr "ઉકેલવાનું લીટી %d પર નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "નવું પાનું %s બનાવે છે"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "ખોવાયેલ આઇડી વિકલ્પ"
 
 #: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
-msgid "template %s not found"
+msgid "%s not found"
 msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
-
 #: ../IkiWiki/Plugin/teximg.pm:72
 #, fuzzy
 msgid "missing tex code"
@@ -1042,54 +1044,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1162,62 +1169,63 @@ msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
@@ -1242,6 +1250,16 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to process"
+#~ msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime અમલમાં મૂકાયેલ નથી"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "%s વાંચવામાં નિષ્ફળ: %s"
@@ -1295,9 +1313,6 @@ msgstr ""
 #~ msgstr ""
 #~ "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી"
 
-#~ msgid "%s not found"
-#~ msgstr "ટેમ્પલેટ %s મળ્યું નહી"
-
 #~ msgid "What's this?"
 #~ msgstr "આ શું છે?"
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index c2f4e24a9..638e724d5 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr ""
 
@@ -136,7 +136,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr ""
 
@@ -174,7 +174,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -206,55 +206,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -264,7 +264,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -294,14 +294,14 @@ msgstr ""
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -319,8 +319,9 @@ msgstr ""
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+msgid "failed to process template:"
 msgstr ""
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -349,18 +350,18 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -442,12 +443,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
+msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -474,18 +475,22 @@ msgstr ""
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr ""
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr ""
@@ -502,10 +507,6 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr ""
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -522,39 +523,39 @@ msgstr ""
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -584,93 +585,93 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -812,44 +813,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -947,17 +948,18 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, perl-format
+msgid "creating tag page %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr ""
 
 #: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
-msgid "template %s not found"
-msgstr ""
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
+msgid "%s not found"
 msgstr ""
 
 #: ../IkiWiki/Plugin/teximg.pm:72
@@ -1017,54 +1019,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:434
+#, perl-format
+msgid "removing obsolete %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1137,62 +1144,63 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
+#: ../IkiWiki.pm:2009
+#, perl-format
+msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index b1b3dbd55..45efc2d3f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -53,7 +53,7 @@ msgstr "Preferenze salvate."
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Errore"
 
@@ -135,7 +135,7 @@ msgstr "creazione nuova pagina %s"
 msgid "deleting bucket.."
 msgstr "eliminazione contenitore..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "fatto"
 
@@ -173,7 +173,7 @@ msgstr "nome file dell'allegato non valido"
 msgid "attachment upload"
 msgstr "carica allegato"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "generazione automatica dell'indice"
 
@@ -207,55 +207,55 @@ msgstr "i commenti devono avere un contenuto"
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nome pagina non valido"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "commento su %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "la pagina «%s» non esiste, impossibile commentarla"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "i commenti per la pagina «%s» sono chiusi"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "commento trattenuto per moderazione"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Il commento sarà pubblicato dopo la verifica del moderatore"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Aggiunto commento"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Aggiunto commento: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "non siete autenticati come amministratore"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Moderazione commenti"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "moderazione commento"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -265,7 +265,7 @@ msgstr[1] "Commenti"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Commenti"
@@ -296,14 +296,14 @@ msgstr "rimozione vecchia anteprima %s"
 msgid "%s is not an editable page"
 msgstr "%s non è una pagina modificabile"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "creazione %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "modifica %s"
@@ -321,9 +321,11 @@ msgstr "corrispondenza non specificata"
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s registrato per %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "errore nell'elaborazione"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "errore nell'elaborazione:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -351,18 +353,18 @@ msgstr "non è una pagina"
 msgid "%s is an attachment, not a page."
 msgstr "%s è un allegato, non una pagina."
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "non è permesso modificare %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "non è permesso lavorare su un file in modalità %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
@@ -447,12 +449,12 @@ msgstr "i parametri %s e %s non possono essere usati insieme"
 msgid "Add a new post titled:"
 msgstr "Aggiungere un nuovo articolo dal titolo:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "modello %s non esistente"
+msgid "template %s not found"
+msgstr "modello %s non trovato"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
 
@@ -481,18 +483,23 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "foglio di stile non trovato"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "pagina di reindirizzamento non trovata"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "ciclo di reindirizzamento non ammesso"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "sono richiesti i parametri \"to\" e \"from\""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Mirror"
@@ -510,10 +517,6 @@ msgstr "moderazione commento"
 msgid "more"
 msgstr "altro"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime non implementata"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Accedi tramite"
@@ -530,42 +533,42 @@ msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine."
 msgid "bad or missing template"
 msgstr "modello errato o mancante"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Account creato con successo. È ora possibile effettuare l'accesso."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Errore nella creazione dell'account."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Nessun indirizzo email, impossibile inviare per email le istruzioni per "
 "reimpostare la password."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Impossibile spedire il messaggio"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Il messaggio con le istruzioni per reimpostare la password è stato inviato."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "url per il reset della password non corretto"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "reset della password non permesso"
 
@@ -597,19 +600,19 @@ msgstr ""
 "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno "
 "alla versione 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s non è una codifica di lingua valida"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -617,21 +620,21 @@ msgstr ""
 "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "file PO aggiornati"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -639,7 +642,7 @@ msgstr ""
 "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
 "stata eliminata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -647,50 +650,50 @@ msgstr ""
 "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
 "stata rinominata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Il file POT (%s) non esiste"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "impossibile copiare il file PO di underlay in %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "impossibile copiare il file POT in %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/D"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "impossibile tradurre %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
@@ -836,44 +839,44 @@ msgstr "%s non è in src, quindi non può essere rinominato"
 msgid "no change to the file name was specified"
 msgstr "non è stata specificata nessuna modifica al nome del file"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "nome non valido"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s esiste già"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s già presente su disco"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "rinomina di %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "Rinomina anche SottoPagine e allegati"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Si può rinominare un solo allegato alla volta."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Selezionare l'allegato da rinominare."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "rinomina %s in %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aggiornamento per rinomina di %s in %s"
@@ -971,18 +974,19 @@ msgstr "Scaricamento diretto dei dati"
 msgid "parse fail at line %d: %s"
 msgstr "errore di interpretazione alla riga %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "creazione nuova pagina %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "parametro id mancante"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "modello %s non trovato"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "errore nell'elaborazione:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "notiziario non trovato"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1045,12 +1049,12 @@ msgstr "impossibile determinare l'id del committer non fidato %s"
 msgid "bad file name %s"
 msgstr "nome file %s scorretto"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "scansione %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1059,42 +1063,47 @@ msgstr ""
 "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare "
 "allow_symlinks_before_srcdir per abilitare questa configurazione"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorato il file dal nome scorretto %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s ha diverse pagine sorgenti possibili"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "rimozione della vecchia pagina %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "compilazione di %s, che è collegato a %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "rimozione di %s, non più richiesto da %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "compilazione di %s, che dipende da %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1168,63 +1177,64 @@ msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup configfile"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "utilizzo: --set var=valore"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "utilizzo: --set var=valore"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "generazione contenitori..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "ricostruzione wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Discussione"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "impossibile usare più plugin rcs"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
@@ -1249,6 +1259,18 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
 msgid "What is the domain name of the web server?"
 msgstr "Qual è il nome del dominio del server web?"
 
+#~ msgid "failed to process"
+#~ msgstr "errore nell'elaborazione"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "modello %s non esistente"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime non implementata"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
+
 #~ msgid "failed to read %s"
 #~ msgstr "impossibile leggere %s"
 
diff --git a/po/pl.po b/po/pl.po
index 9fb3cacc0..837c5acd2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Błąd"
 
@@ -139,7 +139,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "gotowe"
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -212,55 +212,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -270,7 +270,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -300,14 +300,14 @@ msgstr "usuwanie starej strony %s"
 msgid "%s is not an editable page"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "edycja %s"
@@ -327,9 +327,10 @@ msgstr "nieokreślona nazwa pliku osłony"
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
-msgid "failed to process"
+msgid "failed to process template:"
 msgstr "awaria w trakcie przetwarzania:"
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -360,18 +361,18 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -460,12 +461,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr "Tytuł nowego wpisu"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "brakujący szablon %s"
+msgid "template %s not found"
+msgstr "nieznaleziony szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
@@ -497,21 +498,25 @@ msgstr ""
 "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub "
 "uruchamiania programu /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "nieznaleziony szablon ze stylami CSS"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 #, fuzzy
 msgid "redir page not found"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "nieznaleziony kanał RSS"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Kopie lustrzane"
@@ -528,10 +533,6 @@ msgstr ""
 msgid "more"
 msgstr "więcej"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "niedostępna funkcja getctime"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -549,39 +550,39 @@ msgstr "Dla każdej strony istnieje odnośnik z innej strony"
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Konto założone pomyślnie. Teraz można zalogować się."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Błąd w trakcie zakładania konta."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Awaria w trakcie wysyłania wiadomości"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -612,94 +613,94 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -846,44 +847,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "renderowanie %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s"
@@ -990,20 +991,20 @@ msgstr "Bezpośrednie pobieranie danych"
 msgid "parse fail at line %d: %s"
 msgstr "awaria w trakcie przetwarzania linii %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "tworzenie nowej strony %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 #, fuzzy
 msgid "missing id parameter"
 msgstr "brakujący parametr id"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "nieznaleziony szablon %s"
-
-#: ../IkiWiki/Plugin/template.pm:66
-#, fuzzy
-msgid "failed to process:"
-msgstr "awaria w trakcie przetwarzania:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "nie znaleziono %s"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 #, fuzzy
@@ -1064,54 +1065,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "skanowanie %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1184,64 +1190,65 @@ msgstr "użycie: ikiwiki [parametry] źródło cel"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Dyskusja"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
@@ -1266,6 +1273,16 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to process"
+#~ msgstr "awaria w trakcie przetwarzania:"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "brakujący szablon %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "niedostępna funkcja getctime"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "awaria w trakcie odczytu %s: %s"
@@ -1323,10 +1340,6 @@ msgstr ""
 #~ "Brak możliwości wysłania powiadomień od Subversion przez \"haczyk\" post-"
 #~ "commit z powodu nieustawionego parametru REV"
 
-#, fuzzy
-#~ msgid "%s not found"
-#~ msgstr "nie znaleziono %s"
-
 #~ msgid "What's this?"
 #~ msgstr "Więcej o OpenID"
 
diff --git a/po/sv.po b/po/sv.po
index 0d4c6202e..2cba1cc2e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Fel"
 
@@ -136,7 +136,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "klar"
 
@@ -177,7 +177,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -209,55 +209,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -267,7 +267,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -297,14 +297,14 @@ msgstr "tar bort gammal sida %s"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
@@ -324,9 +324,10 @@ msgstr "filnamn för wrapper har inte angivits"
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
-msgid "failed to process"
+msgid "failed to process template:"
 msgstr "misslyckades med att behandla mall:"
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -357,18 +358,18 @@ msgstr "kan inte läsa %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -455,12 +456,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr ""
+msgid "template %s not found"
+msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
@@ -490,21 +491,25 @@ msgstr ""
 "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/"
 "markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 #, fuzzy
 msgid "redir page not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "mallen %s hittades inte"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Speglar"
@@ -521,10 +526,6 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime inte implementerad"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -542,39 +543,39 @@ msgstr "Alla sidor länkas till av andra sidor."
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Kontot har skapats. Du kan nu logga in."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Fel vid skapandet av konto."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Misslyckades med att skicka e-post"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -605,94 +606,94 @@ msgstr "RPC::XML::Client hittades inte, pingar inte"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -836,44 +837,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr "filnamn för wrapper har inte angivits"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "ritar upp %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "uppdatering av %s, %s av %s"
@@ -978,21 +979,21 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "skapar nya sidan %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 #, fuzzy
 msgid "missing id parameter"
 msgstr "mall saknar id-parameter"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
+#, fuzzy, perl-format
+msgid "%s not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/template.pm:66
-#, fuzzy
-msgid "failed to process:"
-msgstr "misslyckades med att behandla mall:"
-
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
@@ -1051,54 +1052,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1171,62 +1177,63 @@ msgstr "användning: ikiwiki [flaggor] källa mål"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
@@ -1251,6 +1258,13 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to process"
+#~ msgstr "misslyckades med att behandla mall:"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime inte implementerad"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "misslyckades med att skriva %s: %s"
@@ -1305,10 +1319,6 @@ msgstr ""
 #~ "REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka "
 #~ "notifieringar"
 
-#, fuzzy
-#~ msgid "%s not found"
-#~ msgstr "mallen %s hittades inte"
-
 #~ msgid "What's this?"
 #~ msgstr "Vad är det här?"
 
-- 
cgit v1.2.3


From cce3042457facddfe5100327dbe98445d9d12b7c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 16:44:45 -0400
Subject: po: fix some uninitalized value warnings when used by websetup

---
 IkiWiki/Plugin/po.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 759e812e6..7c979ebca 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -567,7 +567,7 @@ sub mybestlink ($$) {
 	my $link=shift;
 
 	return $origsubs{'bestlink'}->($page, $link)
-		if $config{po_link_to} eq "default";
+		if defined $config{po_link_to} && $config{po_link_to} eq "default";
 
 	my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
 	my @caller = caller(1);
@@ -585,7 +585,7 @@ sub mybeautify_urlpath ($) {
 	my $url=shift;
 
 	my $res=$origsubs{'beautify_urlpath'}->($url);
-	if ($config{po_link_to} eq "negotiated") {
+	if (defined $config{po_link_to} && $config{po_link_to} eq "negotiated") {
 		$res =~ s!/\Qindex.$config{po_master_language}{code}.$config{htmlext}\E$!/!;
 		$res =~ s!/\Qindex.$config{htmlext}\E$!/!;
 		map {
@@ -729,6 +729,7 @@ sub istranslatablefile ($) {
 	my $type=pagetype($file);
 	return 0 if ! defined $type || $type eq 'po';
 	return 0 if $file =~ /\.pot$/;
+	return 0 if ! defined $config{po_translatable_pages};
 	return 1 if pagespec_match(pagename($file), $config{po_translatable_pages});
 	return;
 }
-- 
cgit v1.2.3


From 0d8fc55d3356ea7da2ce175d25230d207bd32088 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 19:50:23 -0400
Subject: bugfix

---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c218ed8ab..c2cadd35f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1654,7 +1654,7 @@ sub saveindex () {
 sub template_file ($) {
 	my $name=shift;
 	
-	my $tpage=($name =~ /^\//) ? $name : "templates/$name";
+	my $tpage=($name =~ s/^\///) ? $name : "templates/$name";
 	if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
 		$tpage=$pagesources{$tpage};
 		$name.=".tmpl";
-- 
cgit v1.2.3


From ca9c6cc254d934837406ef9bb0dc5d021983661b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 20:22:20 -0400
Subject: add support for mass dependencies

Registered by passing "" as page name to add_depends.
---
 IkiWiki.pm               |  4 ++--
 IkiWiki/Plugin/google.pm |  6 +++++-
 IkiWiki/Plugin/search.pm |  6 +++++-
 IkiWiki/Render.pm        | 19 +++++++++----------
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c2cadd35f..0ac49ade9 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -13,8 +13,8 @@ use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	%pagestate %wikistate %renderedfiles %oldrenderedfiles
-	%pagesources %destsources %depends %depends_simple %hooks
-	%forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
+	%pagesources %destsources %depends %depends_simple @mass_depends 
+	%hooks %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
 	%autofiles};
 
 use Exporter q{import};
diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 68cb16513..529a2c801 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -25,6 +25,10 @@ sub checkconfig () {
 	if (! length $config{url}) {
 		error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google'));
 	}
+	
+	# This is a mass dependency, so if the search form template
+	# changes, every page is rebuilt.
+	add_depends("", "googleform.tmpl");
 }
 
 my $form;
@@ -36,7 +40,7 @@ sub pagetemplate (@) {
 	# Add search box to page header.
 	if ($template->query(name => "searchform")) {
 		if (! defined $form) {
-			my $searchform = template_depends("googleform.tmpl", $page, blind_cache => 1);
+			my $searchform = template("googleform.tmpl", blind_cache => 1);
 			$searchform->param(url => $config{url});
 			$form=$searchform->output;
 		}
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 55edf8752..c9a69f443 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -41,6 +41,10 @@ sub checkconfig () {
 	if (! defined $config{omega_cgi}) {
 		$config{omega_cgi}="/usr/lib/cgi-bin/omega/omega";
 	}
+
+	# This is a mass dependency, so if the search form template
+	# changes, every page is rebuilt.
+	add_depends("", "searchform.tmpl");
 }
 
 my $form;
@@ -52,7 +56,7 @@ sub pagetemplate (@) {
 	# Add search box to page header.
 	if ($template->query(name => "searchform")) {
 		if (! defined $form) {
-			my $searchform = template_depends("searchform.tmpl", $page, blind_cache => 1);
+			my $searchform = template("searchform.tmpl", blind_cache => 1);
 			$searchform->param(searchaction => $config{cgiurl});
 			$form=$searchform->output;
 		}
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8ae0cbd4f..50af2bdec 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -591,13 +591,18 @@ sub render_dependent ($$$$$$$) {
 	
 	my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
 	my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
+
+	my $mass_reason;
+	foreach my $p ("page.tmpl", keys %{$depends_simple{""}}) {
+		$mass_reason=$p if $rendered{$p};
+	}
 	 
 	foreach my $f (@$files) {
 		next if $rendered{$f};
 		my $p=pagename($f);
-		my $reason = undef;
-	
-		if (exists $depends_simple{$p}) {
+		my $reason = $mass_reason;
+
+		if (exists $depends_simple{$p} && ! defined $reason) {
 			foreach my $d (keys %{$depends_simple{$p}}) {
 				if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
 				     $lc_changed{$d})
@@ -771,13 +776,7 @@ sub refresh () {
 		render_linkers($file);
 	}
 
-	if ($rendered{"templates/page.tmpl"}) {
-		foreach my $f (@$files) {
-			next if $f eq "templates/page.tmpl";
-			render($f, sprintf(gettext("building %s, which depends on %s"), $f, "templates/page.tmpl"));
-		}
-	}
-	elsif (@$changed || @$internal_changed ||
+	if (@$changed || @$internal_changed ||
 	    @$del || @$internal_del || @$internal_new) {
 		1 while render_dependent($files, $new, $internal_new,
 			$del, $internal_del, $internal_changed,
-- 
cgit v1.2.3


From c6a473b8eea0ea015c44c3cd7a267f6325febac5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 20:30:05 -0400
Subject: update

---
 doc/templates.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 67e5517e4..892e36cd2 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -23,8 +23,8 @@ The template directive allows wiki pages to be used as templates,
 filled out and inserted into other pages in the wiki.
 """]]
 [[!if test="enabled(template) and enabled(inline)" then="""
-[[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
-sort=title template=titlepage
+[[!inline pages="templates/* and !*.tmpl and !*/discussion"
+feeds=no archive=yes sort=title template=titlepage
 rootpage=templates postformtext="Add a new template named:"]]
 """]]
 
-- 
cgit v1.2.3


From a1575b0c8398f3ebb70b2364b986964fb354e09a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 20:41:35 -0400
Subject: bugfixes

---
 IkiWiki/Plugin/google.pm |  2 +-
 IkiWiki/Plugin/search.pm |  2 +-
 IkiWiki/Render.pm        | 13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 529a2c801..85467fa0b 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -28,7 +28,7 @@ sub checkconfig () {
 	
 	# This is a mass dependency, so if the search form template
 	# changes, every page is rebuilt.
-	add_depends("", "googleform.tmpl");
+	add_depends("", "templates/googleform.tmpl");
 }
 
 my $form;
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c9a69f443..be39fdf1e 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -44,7 +44,7 @@ sub checkconfig () {
 
 	# This is a mass dependency, so if the search form template
 	# changes, every page is rebuilt.
-	add_depends("", "searchform.tmpl");
+	add_depends("", "templates/searchform.tmpl");
 }
 
 my $form;
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 50af2bdec..d0c7e58a3 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -592,15 +592,20 @@ sub render_dependent ($$$$$$$) {
 	my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
 	my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
 
-	my $mass_reason;
-	foreach my $p ("page.tmpl", keys %{$depends_simple{""}}) {
-		$mass_reason=$p if $rendered{$p};
+	foreach my $p ("templates/page.tmpl", keys %{$depends_simple{""}}) {
+		if ($rendered{$p}) {
+			foreach my $f (@$files) {
+				next if $rendered{$f};
+				render($f, sprintf(gettext("building %s, which depends on %s"), $f, $p));
+			}
+			return 0;
+		}
 	}
 	 
 	foreach my $f (@$files) {
 		next if $rendered{$f};
 		my $p=pagename($f);
-		my $reason = $mass_reason;
+		my $reason = undef;
 
 		if (exists $depends_simple{$p} && ! defined $reason) {
 			foreach my $d (keys %{$depends_simple{$p}}) {
-- 
cgit v1.2.3


From e05c9653ef823d1af3c79a89a6231c86be7f8960 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 21:13:53 -0400
Subject: rebuild on template removal

---
 IkiWiki/Render.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d0c7e58a3..871e005b2 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -593,7 +593,7 @@ sub render_dependent ($$$$$$$) {
 	my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
 
 	foreach my $p ("templates/page.tmpl", keys %{$depends_simple{""}}) {
-		if ($rendered{$p}) {
+		if ($rendered{$p} || grep { $_ eq $p } @$del) {
 			foreach my $f (@$files) {
 				next if $rendered{$f};
 				render($f, sprintf(gettext("building %s, which depends on %s"), $f, $p));
-- 
cgit v1.2.3


From ca9c17db57a408e6cc118cf33fcec886a72388fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 21:38:22 -0400
Subject: reword templatedir description

---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0ac49ade9..63a7f5e2a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -152,7 +152,7 @@ sub getsetup () {
 	templatedir => {
 		type => "string",
 		default => "$installdir/share/ikiwiki/templates",
-		description => "location of template files",
+		description => "additional directory to search for template files",
 		advanced => 1,
 		safe => 0, # path
 		rebuild => 1,
-- 
cgit v1.2.3


From 5afda336720dc83e0fd4c6e2f311ff6664c68211 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 21:39:03 -0400
Subject: wording

---
 doc/templates.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 892e36cd2..9208db0eb 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -8,7 +8,7 @@ searched first. Customized templates can also be placed inside the
 
 Ikiwiki uses the HTML::Template module as its template engine. This
 supports things like conditionals and loops in templates and is pretty
-easy to learn. All you really need to know are a few things:
+easy to learn. All you really need to know to modify templates is this:
 
 * To insert the value of a template variable, use `<TMPL_VAR variable>`.
 * To make a block of text conditional on a variable being set use
-- 
cgit v1.2.3


From f49b9e7411bf9748dc81389e14d70cafaa6ded02 Mon Sep 17 00:00:00 2001
From: "http://id.ertugkaramatli.com/" <http://id.ertugkaramatli.com/@web>
Date: Sun, 25 Apr 2010 13:25:59 +0000
Subject: added my personal site

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index cb4213405..edf36b5c6 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -143,6 +143,7 @@ Personal sites and blogs
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
+* [Ertug Karamatli](http://pages.karamatli.com)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 506075695f32a63bfc8b57cef1a601bd937b7a72 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 25 Apr 2010 14:16:53 -0400
Subject: typo

---
 doc/usage.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 9cf61cc6c..2f87d60d5 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -330,7 +330,7 @@ also be configured using a setup file.
 * --set var=value
   
   This allows setting an arbitrary configuration variable, the same as if it
-  were set via a setup file. Since most options commonly used options can be
+  were set via a setup file. Since most commonly used options can be
   configured using command-line switches, you will rarely need to use this.
 
 * --set-yaml var=value
-- 
cgit v1.2.3


From 86484c109d30c0062c5a5056f4adf41c0581b5e9 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 26 Apr 2010 15:14:08 +0000
Subject: table name for querying the mediawiki mysql db

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 9719d9a7e..db1a1745c 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -59,7 +59,13 @@ specific prefix: e.g. `Category:` will be stripped off.
 ### Querying the database
 
 If you have access to the relational database in which your mediawiki data is
-stored, it is possible to derive a list of page names from this.
+stored, it is possible to derive a list of page names from this. With mediawiki's
+MySQL backend, the page table is, appropriately enough, called `table`:
+
+ SELECT page_namespace, page_title FROM page;
+
+As with the previous method, you will need to do some filtering based on the
+namespace.
 
 ## Step 2: fetching the page data
 
-- 
cgit v1.2.3


From 60481cad90d61a4d1abe2dc5e69eee69ce938992 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 26 Apr 2010 15:19:04 +0000
Subject: move list of namespaces to its own section

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index db1a1745c..fe0fd46b0 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -48,10 +48,7 @@ in HTML, you may need to add further processing to the last line.
 
 Note that by default, `Special:Allpages` will only list pages in the main
 namespace. You need to add a `&namespace=XX` argument to get pages in a
-different namespace. The following numbers correspond to common namespaces:
-
- * 10 - templates (`Template:foo`)
- * 14 - categories (`Category:bar`)
+different namespace. (See below for the default list of namespaces)
 
 Note that the page names obtained this way will not include any namespace
 specific prefix: e.g. `Category:` will be stripped off.
@@ -67,6 +64,12 @@ MySQL backend, the page table is, appropriately enough, called `table`:
 As with the previous method, you will need to do some filtering based on the
 namespace.
 
+### namespaces
+
+The list of default namespaces in mediawiki is available from <http://www.mediawiki.org/wiki/Manual:Namespace#Built-in_namespaces>, reproduced here for convenience:
+
+[[mediawiki_namespaces]]
+
 ## Step 2: fetching the page data
 
 Once you have a list of page names, you can fetch the data for each page.
-- 
cgit v1.2.3


From 76e8e4ea838516ebdb8e981fff47efa6af836079 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 26 Apr 2010 15:24:50 +0000
Subject: insert table of common namespaces

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index fe0fd46b0..3a266bc8b 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -66,9 +66,18 @@ namespace.
 
 ### namespaces
 
-The list of default namespaces in mediawiki is available from <http://www.mediawiki.org/wiki/Manual:Namespace#Built-in_namespaces>, reproduced here for convenience:
-
-[[mediawiki_namespaces]]
+The list of default namespaces in mediawiki is available from <http://www.mediawiki.org/wiki/Manual:Namespace#Built-in_namespaces>. Here are reproduced the ones you are most likely to encounter if you are running a small mediawiki install for your own purposes:
+
+[[!table data="""
+Index   | Name         | Example
+0       | Main         | Foo
+1       | Talk         | Talk:Foo
+2       | User         | User:Jon
+3       | User talk    | User_talk:Jon
+6       | File         | File:Barack_Obama_signature.svg
+10      | Template     | Template:Prettytable
+14      | Category     | Category:Pages_needing_review
+"""]]
 
 ## Step 2: fetching the page data
 
-- 
cgit v1.2.3


From d3c994d980c2f52102c78c0157ce06140c639bc6 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 26 Apr 2010 15:29:04 +0000
Subject: fix indent

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 3a266bc8b..38de01109 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -59,7 +59,7 @@ If you have access to the relational database in which your mediawiki data is
 stored, it is possible to derive a list of page names from this. With mediawiki's
 MySQL backend, the page table is, appropriately enough, called `table`:
 
- SELECT page_namespace, page_title FROM page;
+    SELECT page_namespace, page_title FROM page;
 
 As with the previous method, you will need to do some filtering based on the
 namespace.
-- 
cgit v1.2.3


From 0689f2dbc5d4f80cd13f51055b24ff0506f638fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 13:43:24 -0400
Subject: add blipvert

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index a5fd742ca..a0b9c950f 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -63,6 +63,7 @@ think about merging them. This is recommended. :-)
 * [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
 * [[privat]] `git://github.com/privat/ikiwiki.git`
+* [[blipvert]] `git://github.com/blipvert/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 7f3047f67c1bb45e25b91362f9ae4bb18734e140 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 13:47:01 -0400
Subject: added match_guid function to meta plugin (cherry picked from commit
 8b6fde73669ddf9204acb3d334c3984566f3c59d)

Conflicts:

	IkiWiki/Plugin/meta.pm
---
 IkiWiki/Plugin/meta.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 159008614..7d68a9b2d 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -376,6 +376,10 @@ sub match_copyright ($$;@) {
 	IkiWiki::Plugin::meta::match("copyright", @_);
 }
 
+sub match_guid ($$;@) {
+	IkiWiki::Plugin::meta::match("guid", @_);
+}
+
 package IkiWiki::SortSpec;
 
 sub cmp_meta {
-- 
cgit v1.2.3


From 06d5a19370e07d39e3dcbd975fe479388104b0a5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 13:47:40 -0400
Subject: document match_guid

---
 doc/ikiwiki/pagespec.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 5c191f23f..7810e790b 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -40,8 +40,8 @@ Some more elaborate limits can be added to what matches using these functions:
 * "`internal(glob)`" - like `glob()`, but matches even internal-use 
   pages that globs do not usually match.
 * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
-  "`license(glob)`", "`copyright(glob)`" - match pages that have the given
-  metadata, matching the specified glob.
+  "`license(glob)`", "`copyright(glob)`", "`guid(glob)`" 
+  - match pages that have the given metadata, matching the specified glob.
 * "`user(username)`" - tests whether a modification is being made by a
   user with the specified username. If openid is enabled, an openid can also
   be put here. Glob patterns can be used in the username. For example, 
-- 
cgit v1.2.3


From a17e6ed4632f7f618151b2a882827aba20dded90 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 13:52:54 -0400
Subject: Minor, seemingly harmless tweaks to misc.tmpl

Whenever the DIV tag structure of page.tmpl has been changed, the DIV
tag structure of misc.tmpl must also change to reflect this, or else
any page which uses misc.tmpl will not look right.  My intent is to
make ease parallel maintenance of these two files by eliminating
trivial/accidental difference between the two, so that duplicated
regions can be more readily identified (perhaps even mechanically).

(cherry-picked from commit 075980f94996e8f67d9632ae95b8bf41fdf09afa, but
without the changes to comments in page.tmpl)
---
 templates/misc.tmpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index 9ec9a59cb..535a6f06b 100644
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -9,11 +9,11 @@
 </TMPL_IF>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title><TMPL_VAR TITLE></title>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 <TMPL_IF NAME="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" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 </head>
 <body>
 
@@ -32,9 +32,9 @@
 <TMPL_VAR PAGEBODY>
 </div>
 
-<div id="footer">
-<!-- from <TMPL_VAR NAME=WIKINAME> -->
-</div>
+<div id="footer" class="pagefooter">
+<!-- from <TMPL_VAR WIKINAME> -->
+</div><!-- .pagefooter #footer -->
 
 </body>
 </html>
-- 
cgit v1.2.3


From fc0c43aa759ee5ee16b24acf5116c6b3c6167bc7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 15:51:20 -0400
Subject: fix missing \

---
 po/underlays/basewiki/ikiwiki/formatting.de.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/underlays/basewiki/ikiwiki/formatting.de.po b/po/underlays/basewiki/ikiwiki/formatting.de.po
index d4955eeb8..a0171c348 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.de.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.de.po
@@ -163,7 +163,7 @@ msgid ""
 msgstr ""
 "Um eine URL oder E-Mail-Adresse zu verlinken, kann man die\n"
 "URL einfach ein spitze Klammern schreiben: <<http://ikiwiki.info>>; "
-"man kann auch die Form \\[Link-Text\\]\\(URL)\) verwenden.\n"
+"man kann auch die Form \\[Link-Text\\]\\(URL)\\) verwenden.\n"
 
 #. type: Plain text
 msgid ""
-- 
cgit v1.2.3


From a6bd053638c67e5410c4a0a3742ba3825320b344 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 16:31:00 -0400
Subject: remove manual file remove instructions

Since that was written, ikiwiki got fixed to track old rendered files
across --rebuild and remove them.
---
 doc/tips/switching_to_usedirs.mdwn | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/tips/switching_to_usedirs.mdwn b/doc/tips/switching_to_usedirs.mdwn
index 183ce00ac..92871439f 100644
--- a/doc/tips/switching_to_usedirs.mdwn
+++ b/doc/tips/switching_to_usedirs.mdwn
@@ -8,9 +8,7 @@ to usedirs, or edit your setup file and turn usedirs back off.
   or manually.
 * Since usedirs is enabled, ikiwiki will have created a bunch of new
   html files. Where before ikiwiki generated a `dest/foo.html`, now it will
-  generate `dest/foo/index.html`. But, the old html files will still be
-  present too. Remove them:
-	find dest -name \*.html -not -name index.html -exec rm {} \;
+  generate `dest/foo/index.html`. The old html files will be removed.
 * If you have a blog that is aggregated on a Planet or similar, all the
   items in the RSS or atom feed will seem like new posts, since their URLs
   have changed. See [[howto_avoid_flooding_aggregators]] for a workaround.
-- 
cgit v1.2.3


From 97b0c6e455f9edb99d9bd5145a8e82549ed54694 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 17:14:03 -0400
Subject: Fix removal of rendered files in rebuild mode.

Needed to handle the move of the .js files into ikiwiki/, but also this is
a longstanding bug.

Old pagemtime is not remembered in rebuild mode, and changing that would
need a lot of changes. So instead, loop on pagectime, which is remembered.

Change to remembering old pagesources info in rebuild mode. This seems safe
enough.
---
 IkiWiki.pm        | 2 +-
 IkiWiki/Render.pm | 2 +-
 debian/changelog  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 63a7f5e2a..944001d9b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1531,8 +1531,8 @@ sub loadindex () {
 		my $d=$pages->{$src};
 		my $page=pagename($src);
 		$pagectime{$page}=$d->{ctime};
+		$pagesources{$page}=$src;
 		if (! $config{rebuild}) {
-			$pagesources{$page}=$src;
 			$pagemtime{$page}=$d->{mtime};
 			$renderedfiles{$page}=$d->{dest};
 			if (exists $d->{links} && ref $d->{links}) {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 871e005b2..b04664e41 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -409,7 +409,7 @@ sub find_del_files ($) {
 	my @del;
 	my @internal_del;
 
-	foreach my $page (keys %pagemtime) {
+	foreach my $page (keys %pagectime) {
 		if (! $pages->{$page}) {
 			if (isinternal($page)) {
 				push @internal_del, $pagesources{$page};
diff --git a/debian/changelog b/debian/changelog
index 53febb433..1229b1198 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ ikiwiki (3.20100424) UNRELEASED; urgency=low
   * Moved javascript files under the ikiwiki/ directory, to avoid cluttering
     the top of the web root. This is another things that requires a wiki
     rebuild on upgrade to this version.
+  * Fix removal of rendered files in rebuild mode.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From 194824ce293a64f7dce68d568d1f906d675af858 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 18:32:06 -0400
Subject: loop on pagesources, not ctime

---
 IkiWiki/Render.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index b04664e41..7e3d78861 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -409,7 +409,7 @@ sub find_del_files ($) {
 	my @del;
 	my @internal_del;
 
-	foreach my $page (keys %pagectime) {
+	foreach my $page (keys %pagesources) {
 		if (! $pages->{$page}) {
 			if (isinternal($page)) {
 				push @internal_del, $pagesources{$page};
-- 
cgit v1.2.3


From 3ac2ae1f14952bd92038183d92b1eb618c9d0f55 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 18:47:17 -0400
Subject: Add page() PageSpec, which is like glob() but matches only pages, 
 not other files.

---
 IkiWiki.pm                | 10 +++++++++-
 debian/changelog          |  2 ++
 doc/ikiwiki/pagespec.mdwn | 11 ++++++-----
 t/pagespec_match.t        | 16 +++++++++++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 944001d9b..623396c9c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2299,7 +2299,11 @@ sub match_glob ($$;@) {
 
 	my $regexp=IkiWiki::glob2re($glob);
 	if ($page=~/^$regexp$/i) {
-		if (! IkiWiki::isinternal($page) || $params{internal}) {
+		if ($params{onlypage} &&
+		    ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
+			return IkiWiki::FailReason->new("$page is not a page");
+		}
+		elsif (! IkiWiki::isinternal($page) || $params{internal}) {
 			return IkiWiki::SuccessReason->new("$glob matches $page");
 		}
 		else {
@@ -2315,6 +2319,10 @@ sub match_internal ($$;@) {
 	return match_glob($_[0], $_[1], @_, internal => 1)
 }
 
+sub match_page ($$;@) {
+	return match_glob($_[0], $_[1], @_, onlypage => 1)
+}
+
 sub match_link ($$;@) {
 	my $page=shift;
 	my $link=lc(shift);
diff --git a/debian/changelog b/debian/changelog
index 1229b1198..610d0c9cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,8 @@ ikiwiki (3.20100424) UNRELEASED; urgency=low
     the top of the web root. This is another things that requires a wiki
     rebuild on upgrade to this version.
   * Fix removal of rendered files in rebuild mode.
+  * Add page() PageSpec, which is like glob() but matches only pages, 
+    not other files.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 7810e790b..1c99aefac 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -24,19 +24,20 @@ match all pages except for Discussion pages and the SandBox:
 
 Some more elaborate limits can be added to what matches using these functions:
 
+* "`glob(someglob)`" - matches pages and other files that match the given glob.
+  Just writing the glob by itself is actually a shorthand for this function.
+* "`page(glob)`" - like `glob()`, but only matches pages, not other files
 * "`link(page)`" - matches only pages that link to a given page (or glob)
 * "`tagged(tag)`" - matches pages that are tagged or link to the given tag (or
   tags matched by a glob)
 * "`backlink(page)`" - matches only pages that a given page links to
-* "`creation_month(month)`" - matches only pages created on the given month
+* "`creation_month(month)`" - matches only files created on the given month
 * "`creation_day(mday)`" - or day of the month
 * "`creation_year(year)`" - or year
-* "`created_after(page)`" - matches only pages created after the given page
+* "`created_after(page)`" - matches only files created after the given page
   was created
-* "`created_before(page)`" - matches only pages created before the given page
+* "`created_before(page)`" - matches only files created before the given page
   was created
-* "`glob(someglob)`" - matches pages that match the given glob. Just writing
-  the glob by itself is actually a shorthand for this function.
 * "`internal(glob)`" - like `glob()`, but matches even internal-use 
   pages that globs do not usually match.
 * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index ade9bca5a..97bcc969c 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 75;
+use Test::More tests => 85;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -66,7 +66,21 @@ $links{"ook"}=[qw{/blog/tags/foo}];
 foreach my $p (keys %links) {
 	$pagesources{$p}="$p.mdwn";
 }
+$pagesources{"foo.png"}="foo.png";
+$pagesources{"foo"}="foo.mdwn";
+$IkiWiki::hooks{htmlize}{mdwn}={};
 
+ok(pagespec_match("foo", "foo"), "simple");
+ok(! pagespec_match("foo", "bar"), "simple fail");
+ok(pagespec_match("foo", "foo"), "simple glob");
+ok(pagespec_match("foo", "f*"), "simple glob fail");
+ok(pagespec_match("foo", "page(foo)"), "page()");
+print pagespec_match("foo", "page(foo)")."\n";
+ok(! pagespec_match("foo", "page(bar)"), "page() fail");
+ok(! pagespec_match("foo.png", "page(foo.png)"), "page() fails on non-page");
+ok(! pagespec_match("foo.png", "page(foo*)"), "page() fails on non-page glob");
+ok(pagespec_match("foo", "page(foo)"), "page() glob");
+ok(pagespec_match("foo", "page(f*)"), "page() glob fail");
 ok(pagespec_match("foo", "link(bar)"), "link");
 ok(pagespec_match("foo", "link(ba?)"), "glob link");
 ok(! pagespec_match("foo", "link(quux)"), "failed link");
-- 
cgit v1.2.3


From a6d38b7f26561e26b8c3d813f19b8eff736684d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 19:01:31 -0400
Subject: update test suite for recent index load on rebuild changes

---
 t/index.t | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/t/index.t b/t/index.t
index 44273059d..392a167e9 100755
--- a/t/index.t
+++ b/t/index.t
@@ -117,11 +117,14 @@ is_deeply(\%oldtypedlinks, {
 %pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
 %destsources=%renderedfiles=%pagecase=%pagestate=();
 
-# When state is loaded for a wiki rebuild, only ctime and oldrenderedfiles
-# are retained.
+# When state is loaded for a wiki rebuild, only ctime, oldrenderedfiles,
+# and pagesources are retained.
 $config{rebuild}=1;
 ok(loadindex(), "load index");
 is_deeply(\%pagesources, {
+	Foo => "Foo.mdwn",
+	bar => "bar.mdwn",
+	"bar.png" => "bar.png",
 }, "%pagesources loaded correctly");
 is_deeply(\%pagemtime, {
 }, "%pagemtime loaded correctly");
@@ -143,7 +146,10 @@ is_deeply(\%depends, {
 }, "%depends loaded correctly");
 is_deeply(\%pagestate, {
 }, "%pagestate loaded correctly");
-is_deeply(\%pagecase, {
+is_deeply(\%pagecase, { # generated implicitly since pagesources is loaded
+	foo => "Foo",
+	bar => "bar",
+	"bar.png" => "bar.png"
 }, "%pagecase generated correctly");
 is_deeply(\%destsources, {
 }, "%destsources generated correctly");
-- 
cgit v1.2.3


From a9cf5810a6c6d2f266d9ddcc5b676f836d4d11e6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Apr 2010 00:00:09 -0400
Subject: releasing version 3.20100427

---
 debian/NEWS      | 4 ++--
 debian/changelog | 4 ++--
 ikiwiki.spec     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index f976bdc01..6a410866d 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (3.20100422) unstable; urgency=low
+ikiwiki (3.20100427) unstable; urgency=low
 
   This version of ikiwiki has a lot of changes that you need to know about.
 
@@ -42,7 +42,7 @@ ikiwiki (3.20100422) unstable; urgency=low
   this will be done automatically when the Debian package is upgraded. Or
   use ikiwiki-mass-rebuild to force a rebuild.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 21 Apr 2010 20:31:29 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 00:00:00 -0400
 
 ikiwiki (3.20091017) unstable; urgency=low
 
diff --git a/debian/changelog b/debian/changelog
index 610d0c9cb..411f67bd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100424) UNRELEASED; urgency=low
+ikiwiki (3.20100427) unstable; urgency=low
 
   [ Joey Hess ]
   * tag: Automatic creation of tag pages can now be enabled using
@@ -78,7 +78,7 @@ ikiwiki (3.20100424) UNRELEASED; urgency=low
   * Add page() PageSpec, which is like glob() but matches only pages, 
     not other files.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 00:00:00 -0400
 
 ikiwiki (3.20100403) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index fb7971b27..8d871eb21 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100403
+Version: 3.20100427
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
-- 
cgit v1.2.3


From 47dfa3b8b97c97532f4e49f9883b6a59a9036b40 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Apr 2010 00:00:46 -0400
Subject: add news item for ikiwiki 3.20100427

---
 doc/news/version_3.20100122.mdwn |  15 ------
 doc/news/version_3.20100427.mdwn | 111 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 15 deletions(-)
 delete mode 100644 doc/news/version_3.20100122.mdwn
 create mode 100644 doc/news/version_3.20100427.mdwn

diff --git a/doc/news/version_3.20100122.mdwn b/doc/news/version_3.20100122.mdwn
deleted file mode 100644
index 11051fad8..000000000
--- a/doc/news/version_3.20100122.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-ikiwiki 3.20100122 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * inline: Avoid showing edit links if page editing is disabled.
-     (Sjoerd)
-   * signinedit: Auto-disable the plugin when all authentication methods
-     are disabled.
-   * comments: Fix permalinks for comments using new conflict-free filenames.
-   * img: Support alignment of images with captions. (Giuseppe Bilotta)
-   * websetup: Fix utf-8 problems.
-   * websetup: Fix bug in array change detection.
-   * linkmap: Simplify and improve browser compatibility by using an img,
-     not object tag.
-   * git: The new git-notes feature in git 1.6.6 changes git log output
-     in a way that broke ikiwiki's parser if notes are added to commits.
-   * po: Avoid crash when a page is empty."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100427.mdwn b/doc/news/version_3.20100427.mdwn
new file mode 100644
index 000000000..5fe732f87
--- /dev/null
+++ b/doc/news/version_3.20100427.mdwn
@@ -0,0 +1,111 @@
+News for ikiwiki 3.20100427:
+
+   This version of ikiwiki has a lot of changes that you need to know about.
+   Now you can include customised versions of templates in the source
+   of your wiki. (For example, templates/page.tmpl.) When these templates
+   are changed, ikiwiki will automatically rebuild pages that use them.
+   Allowing untrusted users to upload attachments with the ".tmpl"
+   extension is not recommended, as that allows anyone to change
+   a wiki's templates.
+   The --getctime switch is renamed to --gettimes, and it also gets the
+   file modification time. And it's a lot faster (when using git). But
+   the really important change is, you don't have to remember to use this
+   switch. Now ikiwiki will do it when it needs to.
+   At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
+   If your wiki accidentially relied on the old, buggy behavior, you might
+   need to change its pagespecs to use "link()".
+   Many of your wishes have been answered: Now tag pages can automatically be
+   created when new tags are used. This feature is enabled by default if you
+   have configured a tagbase. It can be turned on or off using the
+   tag\_autocreate setting.
+   These changes may also affect some users:
+   * The title\_natural sort method (as used by the inline directive, etc)
+     has been moved to the new sortnaturally plugin, which is not enabled
+     by default since it requires the Sort::Naturally perl module.
+   * TMPL\_INCLUDE is no longer supported in any template used by ikiwiki.
+     It used to be allowed in certian templates, but not in others.
+   * The add\_templates option has been removed from the underlay plugin.
+     If you used this option, you can instead use templates/ subdirectories
+     inside underlay directories added by the add\_underlays option.
+   Due to the above and other changes, all wikis need to be rebuilt on
+   upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
+   this will be done automatically when the Debian package is upgraded. Or
+   use ikiwiki-mass-rebuild to force a rebuild.
+
+ikiwiki 3.20100427 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * [ Joey Hess ]
+   * tag: Automatic creation of tag pages can now be enabled using
+     the tag\_autocreate setting. (David Riebenbauer)
+   * Customised templates can now be included in the source of wikis
+     (and also in underlays), and dependencies on them are tracked.
+   * TMPL\_INCLUDE is no longer supported in any template.
+   * underlay: Removed the add\_templates option.
+   * Add template\_depends function to plugin API.
+   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
+   * comments: Fix missing entity encoding in title.
+   * txt: Add a special case for robots.txt.
+ * [ Simon McVittie ]
+   * Add support for link types, and make the the tagged() pagespec only
+     match tags, not regular links (a bugfix).
+   * Rebuild wikis on upgrade to this version to get tag link types recorded
+     correctly.
+   * Revamp sorting system; allow new sort methods to be added by plugins,
+     and add a "sortspec" syntax that can combine, reverse, etc sort methods.
+   * meta: Add `meta(author)`, `meta(title)` etc sortspecs to allow sorting
+     by metadata.
+   * meta: Add optional sortas parameter to author and title meta directives.
+     This can be used to get names sorted by last name without displaying
+     them last name first.
+   * sortnaturally: New plugin; the title\_natural sort method has moved here.
+   * meta: store fields consistently unescaped, and escape on use.
+     (A wiki rebuild is also needed due to this change.)
+ * [ Joey Hess ]
+   * Update dependency for git-core to git transition.
+   * po: Check that translated underlay directories exist before using them
+     for master language.
+   * po: Configuring the same language as master and slave confuses processing;
+     so filter out such a misconfiguration.
+   * calendar: Add archive\_pagespec, which is used by ikiwiki-calendar to
+     specify which pages to include on the calendar archive pages.
+     (The pagespec can still also be specified on the ikiwiki-calendar command
+     line.)
+   * pagestats: Class parameter can be used to override default class for
+     custom styling.
+   * pagestats: Use style=list to get a list of tags, scaled by use like
+     in a tag cloud. This is useful to put in a sidebar.
+   * Rework example blog front page.
+   * CSS and templates for sidebar changed to use a class, not an id.
+   * sidebar: Now a sidebar directive can be used to override the sidebar
+     shown on a page.
+   * Enable calendar and sidebar in auto-blog.setup.
+   * sidebar: Add global\_sidebars setting.
+   * conditional: Fix bug that forced "all" mode off by default.
+   * calendarmonth.tmpl: The month calendar is now put in a sidebar.
+   * calendar: Improved display of arrows.
+   * Rename --getctime to --gettime. (The old name still works for
+     backwards compatibility.)
+   * --gettime now also looks up last modification time.
+   * Automatically run --gettime the first time ikiwiki is run on
+     a given srcdir. (Use --no-gettime to disable.)
+   * Add rcs\_getmtime to plugin API; currently only implemented
+     for git and svn.
+   * Optimise --gettime for git, so it's appropriately screamingly
+     fast. (This could be done for most other backends too.)
+   * However, --gettime for git no longer follows renames. That would
+     be slow, and whether a renamed wiki page is the same page is really
+     an iffy thing.
+   * Use above to fix up timestamps on docwiki, as well as ensure that
+     timestamps on basewiki files shipped in the deb are sane.
+   * autoindex: Switch to using %wikistate instead of abusing
+     $pagestate{index}.
+   * bzr: Support rcs\_getmtime, and fix rcs\_getctime implementation
+     (Jelmer Vernooij)
+   * Quite a lot of new optimisations, and one major fix to a recent
+     performance regression.
+   * Moved javascript files under the ikiwiki/ directory, to avoid cluttering
+     the top of the web root. This is another things that requires a wiki
+     rebuild on upgrade to this version.
+   * Fix removal of rendered files in rebuild mode.
+   * Add page() PageSpec, which is like glob() but matches only pages,
+     not other files."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 9daf3db277c31d3ce434253af2dfb7e0e436b5f9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Apr 2010 00:02:49 -0400
Subject: format

---
 doc/news/version_3.20100427.mdwn | 74 ++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/doc/news/version_3.20100427.mdwn b/doc/news/version_3.20100427.mdwn
index 5fe732f87..1701fd670 100644
--- a/doc/news/version_3.20100427.mdwn
+++ b/doc/news/version_3.20100427.mdwn
@@ -1,36 +1,44 @@
-News for ikiwiki 3.20100427:
+This version of ikiwiki has a lot of changes that you need to know about.
 
-   This version of ikiwiki has a lot of changes that you need to know about.
-   Now you can include customised versions of templates in the source
-   of your wiki. (For example, templates/page.tmpl.) When these templates
-   are changed, ikiwiki will automatically rebuild pages that use them.
-   Allowing untrusted users to upload attachments with the ".tmpl"
-   extension is not recommended, as that allows anyone to change
-   a wiki's templates.
-   The --getctime switch is renamed to --gettimes, and it also gets the
-   file modification time. And it's a lot faster (when using git). But
-   the really important change is, you don't have to remember to use this
-   switch. Now ikiwiki will do it when it needs to.
-   At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
-   If your wiki accidentially relied on the old, buggy behavior, you might
-   need to change its pagespecs to use "link()".
-   Many of your wishes have been answered: Now tag pages can automatically be
-   created when new tags are used. This feature is enabled by default if you
-   have configured a tagbase. It can be turned on or off using the
-   tag\_autocreate setting.
-   These changes may also affect some users:
-   * The title\_natural sort method (as used by the inline directive, etc)
-     has been moved to the new sortnaturally plugin, which is not enabled
-     by default since it requires the Sort::Naturally perl module.
-   * TMPL\_INCLUDE is no longer supported in any template used by ikiwiki.
-     It used to be allowed in certian templates, but not in others.
-   * The add\_templates option has been removed from the underlay plugin.
-     If you used this option, you can instead use templates/ subdirectories
-     inside underlay directories added by the add\_underlays option.
-   Due to the above and other changes, all wikis need to be rebuilt on
-   upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
-   this will be done automatically when the Debian package is upgraded. Or
-   use ikiwiki-mass-rebuild to force a rebuild.
+Now you can include customised versions of templates in the source
+of your wiki. (For example, templates/page.tmpl.) When these templates
+are changed, ikiwiki will automatically rebuild pages that use them.
+
+Allowing untrusted users to upload attachments with the ".tmpl"
+extension is not recommended, as that allows anyone to change
+a wiki's templates.
+
+The --getctime switch is renamed to --gettimes, and it also gets the 
+file modification time. And it's a lot faster (when using git). But
+the really important change is, you don't have to remember to use this
+switch. Now ikiwiki will do it when it needs to.
+
+At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
+If your wiki accidentially relied on the old, buggy behavior, you might
+need to change its pagespecs to use "link()".
+
+Many of your wishes have been answered: Now tag pages can automatically be
+created when new tags are used. This feature is enabled by default if you
+have configured a tagbase. It can be turned on or off using the
+`tag_autocreate` setting.
+
+These changes may also affect some users:
+
+* The `title_natural` sort method (as used by the inline directive, etc)
+  has been moved to the new sortnaturally plugin, which is not enabled
+  by default since it requires the Sort::Naturally perl module.
+
+* `TMPL_INCLUDE` is no longer supported in any template used by ikiwiki.
+  It used to be allowed in certian templates, but not in others.
+
+* The `add_templates` option has been removed from the underlay plugin.
+  If you used this option, you can instead use templates/ subdirectories
+  inside underlay directories added by the `add_underlays` option.
+
+Due to the above and other changes, all wikis need to be rebuilt on
+upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
+this will be done automatically when the Debian package is upgraded. Or
+use ikiwiki-mass-rebuild to force a rebuild.
 
 ikiwiki 3.20100427 released with [[!toggle text="these changes"]]
 [[!toggleable text="""
@@ -108,4 +116,4 @@ ikiwiki 3.20100427 released with [[!toggle text="these changes"]]
      rebuild on upgrade to this version.
    * Fix removal of rendered files in rebuild mode.
    * Add page() PageSpec, which is like glob() but matches only pages,
-     not other files."""]]
\ No newline at end of file
+     not other files."""]]
-- 
cgit v1.2.3


From 0e7a3640aec280eb19330285308af6ad7535627f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Apr 2010 12:10:58 -0400
Subject: template: Fix typo.

---
 IkiWiki/Plugin/template.pm | 2 +-
 debian/changelog           | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 52c482c38..b8c2f05b2 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -53,7 +53,7 @@ sub preprocess (@) {
 
 	foreach my $param (keys %params) {
 		my $value=IkiWiki::preprocess($params{page}, $params{destpage},
-		          IkiWiki::filter($params{page}, $params{destpagea},
+		          IkiWiki::filter($params{page}, $params{destpage},
 		          $params{$param}), $scan);
 		if ($template->query(name => $param)) {
 			my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage},
diff --git a/debian/changelog b/debian/changelog
index 411f67bd1..b19840865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100428) UNRELEASED; urgency=low
+
+  * template: Fix typo.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
+
 ikiwiki (3.20100427) unstable; urgency=low
 
   [ Joey Hess ]
-- 
cgit v1.2.3


From 67e8edc59712cfc3dbd24fd7f3aae0fa734983be Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 28 Apr 2010 03:22:37 +0000
Subject: question about TMPL_INCLUDE

---
 doc/news/version_3.20100427/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/news/version_3.20100427/discussion.mdwn

diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn
new file mode 100644
index 000000000..4daf8085f
--- /dev/null
+++ b/doc/news/version_3.20100427/discussion.mdwn
@@ -0,0 +1,3 @@
+*TMPL_INCLUDE is no longer supported in any template used by ikiwiki. It used to be allowed in certian templates, but not in others.*
+
+Would it be possible to make that a config option?  Because I do use includes in my templates, and I don't allow users to edit templates, so it isn't a security loophole for me. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From a6e6f604bd8e9a8f90000163f8b00299829729d5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 28 Apr 2010 12:39:13 -0400
Subject: TMPL_INCLUDE re-enabled for templates read from the templatedir. (But
 not in-wiki templates.)

---
 IkiWiki.pm                                  | 18 +++++++++++-------
 debian/changelog                            |  2 ++
 doc/news/version_3.20100427/discussion.mdwn |  4 ++++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 623396c9c..dcee376ee 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1661,7 +1661,11 @@ sub template_file ($) {
 	}
 
 	my $template=srcfile($tpage, 1);
-	if (! defined $template) {
+	if (defined $template) {
+		return $template, $tpage, 1 if wantarray;
+		return $template;
+	}
+	else {
 		$name=~s:/::; # avoid path traversal
 		foreach my $dir ($config{templatedir},
 		                 "$installdir/share/ikiwiki/templates") {
@@ -1670,12 +1674,12 @@ sub template_file ($) {
 				last;
 			}
 		}
+		if (defined $template) {	
+			return $template, $tpage if wantarray;
+			return $template;
+		}
 	}
 
-	if (defined $template) {	
-		return $template, $tpage if wantarray;
-		return $template;
-	}
 	return;
 }
 
@@ -1683,7 +1687,7 @@ sub template_depends ($$;@) {
 	my $name=shift;
 	my $page=shift;
 	
-	my ($filename, $tpage)=template_file($name);
+	my ($filename, $tpage, $untrusted)=template_file($name);
 	if (defined $page && defined $tpage) {
 		add_depends($page, $tpage);
 	}
@@ -1699,7 +1703,7 @@ sub template_depends ($$;@) {
 		die_on_bad_params => 0,
 		filename => $filename,
 		@_,
-		no_includes => 1,
+		($untrusted ? (no_includes => 1) : ()),
 	);
 	return @opts if wantarray;
 
diff --git a/debian/changelog b/debian/changelog
index b19840865..0a70dc6ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100428) UNRELEASED; urgency=low
 
   * template: Fix typo.
+  * TMPL_INCLUDE re-enabled for templates read from the templatedir.
+    (But not in-wiki templates.)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn
index 4daf8085f..726f9a0d2 100644
--- a/doc/news/version_3.20100427/discussion.mdwn
+++ b/doc/news/version_3.20100427/discussion.mdwn
@@ -1,3 +1,7 @@
 *TMPL_INCLUDE is no longer supported in any template used by ikiwiki. It used to be allowed in certian templates, but not in others.*
 
 Would it be possible to make that a config option?  Because I do use includes in my templates, and I don't allow users to edit templates, so it isn't a security loophole for me. --[[KathrynAndersen]]
+
+> I don't like config options that make wikis unsafe, but I should have
+> revisted enabling includes for templates read from the templatedir --
+> it's easy to do, and I've done it now. --[[Joey]] 
-- 
cgit v1.2.3


From b61dc50dabaa76025cfcac1e139a80894abc3953 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 28 Apr 2010 12:42:14 -0400
Subject: remove obsolete NEWS

---
 debian/NEWS | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 6a410866d..c9b8f3d09 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -30,9 +30,6 @@ ikiwiki (3.20100427) unstable; urgency=low
     has been moved to the new sortnaturally plugin, which is not enabled
     by default since it requires the Sort::Naturally perl module.
 
-  * TMPL_INCLUDE is no longer supported in any template used by ikiwiki.
-    It used to be allowed in certian templates, but not in others.
-
   * The add_templates option has been removed from the underlay plugin.
     If you used this option, you can instead use templates/ subdirectories
     inside underlay directories added by the add_underlays option.
-- 
cgit v1.2.3


From a5923e39995165bd75d4048d646a226a88be920b Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 29 Apr 2010 00:27:03 +0000
Subject: reply

---
 doc/news/version_3.20100427/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn
index 726f9a0d2..011f3d88f 100644
--- a/doc/news/version_3.20100427/discussion.mdwn
+++ b/doc/news/version_3.20100427/discussion.mdwn
@@ -5,3 +5,5 @@ Would it be possible to make that a config option?  Because I do use includes in
 > I don't like config options that make wikis unsafe, but I should have
 > revisted enabling includes for templates read from the templatedir --
 > it's easy to do, and I've done it now. --[[Joey]] 
+
+>> Thank you! --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 0c7d2cf9b2773bd17c0ec549ed1ba833ff1913e1 Mon Sep 17 00:00:00 2001
From: albertlash <albertlash@web>
Date: Thu, 29 Apr 2010 03:44:27 +0000
Subject:

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 683a3f8ac..31110f3c6 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -1,3 +1,11 @@
+20100428 - I just wrote a simple ruby script which will connect to a mysql server and then recreate the pages and their revision histories with Grit. It also does one simple conversion of equals titles to pounds. Enjoy! 
+
+http://github.com/docunext/mediawiki2gitikiwiki
+
+-- [[users/Albert]]
+
+----
+
 The u32 page is excellent, but I wonder if documenting the procedure here
 would be worthwhile. Who knows, the remote site might disappear. But also
 there are some variations on the approach that might be useful:
-- 
cgit v1.2.3


From ebde1ee2fd814e45e0e108bb1a9ba81499d86c87 Mon Sep 17 00:00:00 2001
From: albertlash <albertlash@web>
Date: Thu, 29 Apr 2010 03:44:52 +0000
Subject:

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 31110f3c6..592a06a5b 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -1,6 +1,6 @@
 20100428 - I just wrote a simple ruby script which will connect to a mysql server and then recreate the pages and their revision histories with Grit. It also does one simple conversion of equals titles to pounds. Enjoy! 
 
-http://github.com/docunext/mediawiki2gitikiwiki
+<http://github.com/docunext/mediawiki2gitikiwiki>
 
 -- [[users/Albert]]
 
-- 
cgit v1.2.3


From 8d7dba2fb274b024e7a8b5d8ce4414d3e5bf7420 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Thu, 29 Apr 2010 15:35:59 +0000
Subject: wl rcs

---
 doc/rcs/svn.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/rcs/svn.mdwn b/doc/rcs/svn.mdwn
index f8c44b6eb..7aa682978 100644
--- a/doc/rcs/svn.mdwn
+++ b/doc/rcs/svn.mdwn
@@ -1,4 +1,4 @@
-[Subversion](http://subversion.tigris.org/) is a revision control system. While ikiwiki is relatively
+[Subversion](http://subversion.tigris.org/) is a [[revision control system|rcs]]. While ikiwiki is relatively
 independent of the underlying revision control system, and can easily be
 used without one, using it with Subversion or another revision control
 system is recommended.
-- 
cgit v1.2.3


From d57d2ecca722cb7c43d2b14ed31f38c3e204079c Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Thu, 29 Apr 2010 16:18:15 +0000
Subject: YA URI to another mediawiki to git project

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 592a06a5b..8a2261543 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -657,3 +657,6 @@ page.--[[users/Chadius]]
 > on mediawiki in general. It seems to produce output that could be
 > used by the [[plugins/contrib/mediawiki]] plugin, if the filenames
 > were fixed to use the right extension.  --[[Joey]] 
+
+>> Here's another I found while browsing around starting from the link you gave Joey<br />
+>> <http://github.com/scy/levitation>
-- 
cgit v1.2.3


From f7f1dd3a3852ef158a577387faee2c34c4f9cfad Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Thu, 29 Apr 2010 16:24:23 +0000
Subject: more to add on my comment

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 8a2261543..d67a9131b 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -659,4 +659,7 @@ page.--[[users/Chadius]]
 > were fixed to use the right extension.  --[[Joey]] 
 
 >> Here's another I found while browsing around starting from the link you gave Joey<br />
->> <http://github.com/scy/levitation>
+>> <http://github.com/scy/levitation><br />
+>> As I don't run mediawiki anymore, but I still have my xz/gzip-compressed XML dumps,
+>> it's certainly easier for me to do it this way; also a file or a set of files is easier to lug
+>> around on some medium than a full mysqld or postgres master and relevant databases.
-- 
cgit v1.2.3


From 9fb15ec9fec8903776be0be01eaed0e7bb7d5009 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Fri, 30 Apr 2010 16:48:19 +0100
Subject: new bug: svn commit failures...

---
 ...vn_commit_failures_interpreted_as_merge_conflicts.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn

diff --git a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
new file mode 100644
index 000000000..09753b4ee
--- /dev/null
+++ b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
@@ -0,0 +1,15 @@
+I'm attempting a merge with the SVN plugin via the web interface
+with ikiwiki-3.20100403 and subversion 1.6.11.
+
+The web interface says
+
+    Your changes conflict with other changes made to the page.
+    
+    Conflict markers have been inserted into the page content. Reconcile the conflict and commit again to save your changes.
+
+However there are no merge conflict markers in the page. My apache error log says:
+
+    [Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Commit failed (details follow):, referer: https://unixwiki.ncl.ac.uk/ikiwiki.cgi
+    [Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Authorization failed, referer: https://unixwiki.ncl.ac.uk/ikiwiki.cgi
+
+-- [[Jon]]
-- 
cgit v1.2.3


From 8ce5c7773884504c3936cb6e91e5a05ac4c1073d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 30 Apr 2010 13:06:52 -0400
Subject: Version dependency on liburi-perl to >= 1.36; previous versions did
 not support building urls from utf-8 strings. Closes: #579713

---
 Bundle/IkiWiki.pm | 2 +-
 debian/changelog  | 2 ++
 debian/control    | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bundle/IkiWiki.pm b/Bundle/IkiWiki.pm
index 769791d30..d6c344d6a 100644
--- a/Bundle/IkiWiki.pm
+++ b/Bundle/IkiWiki.pm
@@ -20,7 +20,7 @@ Text::Markdown
 HTML::Scrubber
 HTML::Template
 HTML::Parser
-URI
+URI 1.36
 XML::Simple
 Date::Parse
 CGI::FormBuilder
diff --git a/debian/changelog b/debian/changelog
index 0a70dc6ee..a1bd85bfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * template: Fix typo.
   * TMPL_INCLUDE re-enabled for templates read from the templatedir.
     (But not in-wiki templates.)
+  * Version dependency on liburi-perl to >= 1.36; previous versions
+    did not support building urls from utf-8 strings. Closes: #579713
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/debian/control b/debian/control
index ae06f32b0..bba89d82e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libtext-markdown-perl | markdown, 
   libtimedate-perl, libhtml-template-perl,
   libhtml-scrubber-perl, wdg-html-validator,
-  libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34),
+  libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34),
   libfile-chdir-perl,
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
@@ -20,7 +20,7 @@ Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, 
   libtext-markdown-perl | markdown,
   libhtml-scrubber-perl, libhtml-template-perl,
-  libhtml-parser-perl, liburi-perl
+  libhtml-parser-perl, liburi-perl (>= 1.36)
 Recommends: gcc | c-compiler, 
   libc6-dev | libc-dev,
   subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
-- 
cgit v1.2.3


From dd75b61d9332e50364f97fc04179ab895bfc2ef8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 30 Apr 2010 14:15:58 -0400
Subject: response

---
 doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
index 09753b4ee..0c9bce4b9 100644
--- a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
+++ b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
@@ -13,3 +13,9 @@ However there are no merge conflict markers in the page. My apache error log say
     [Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Authorization failed, referer: https://unixwiki.ncl.ac.uk/ikiwiki.cgi
 
 -- [[Jon]]
+
+> Only way for this to be improved would be for the svn plugin to
+> explicitly check the file for conflict markers. I guess it could
+> change the error message then, but the actual behavior of putting the
+> changed file back in the editor so the user can recommit is about right
+> as far as error recovery goes. --[[Joey]] 
-- 
cgit v1.2.3


From 6293c62cac02fdc604f12db71462ee3f1af18f1d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 30 Apr 2010 17:26:41 -0400
Subject: no need to use HTML::Entities

That module is unused now. Long long ago, it used to be used to encode data in
the index. Checked all modules, and every module that uses it imports it.
---
 IkiWiki.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index dcee376ee..5ff1a5ae6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -5,7 +5,6 @@ package IkiWiki;
 use warnings;
 use strict;
 use Encode;
-use HTML::Entities;
 use URI::Escape q{uri_escape_utf8};
 use POSIX ();
 use Storable;
-- 
cgit v1.2.3


From 3252df4aa8a35495bbaa8280ca13a545285e6192 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 15:27:32 -0400
Subject: comments, branch review, questions

---
 doc/bugs/html5_support.mdwn | 63 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 239474275..5d2a41303 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -9,10 +9,67 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 * [ikiwiki instance with HTML5 templates](http://natalian.org)
 * [HTML5 outliner tool](http://gsnedders.html5.org/outliner/) -- to check you have the structure of your markup correct
 
+> Kai, thanks enormously for working on this. I switched a page to 
+> the html5 doctype today, and was rather pleasently suprised that it
+> validated, except for the new Cache-Control meta tag. Now I see you're
+> well ahead of me. --[[Joey]] 
+> 
+> So, how should ikiwiki support html5? There are basically 3 approaches:
+> 
+> 1. Allow users to add html5 tags to their existing xhtml pages.
+>    What has been done so far, can be extended. Basically works 
+>    in browsers, if you don't care about standards. A good prerequisite
+>    for anything else, anyway.
+> 2. Switch to html5 in eg, ikiwiki 4; users have to deal with
+>    any custom markup on their pages/templates that breaks then.
+> 3. Have both a html5 and a xhtml mode, allow user to select.
+>
+> The third option seems fairly tractable from what I see here and in 
+> your branch. You made only relatively minor changes to 10 templates.
+> It would probably not be too dreadful to put them in ifdefs.
+> 
+> Some of your changes are obvious, like using the new `time` and
+> and `article` elements. Others less so, and I'm particularly
+> puzzled by these:
+> 
+> * Removing the value="Submit" from the button on the 
+>   commentmoderation form.
+> * Removing feedlink.tmpl. What?!
+> * Using a `h2` for the header of inlinepage.tmpl and page.tmpl, rather
+>   than the styled span. Ikiwiki has
+>   [[a_reason|todo/Option_to_make_title_an_h1?]] for not
+>   using real `hN` for the header atop a page and here.
+>   AFAICS, html5 does not invalidate that.
+> * Removing Editurl from inlinepage.tmpl actions. I assume 
+>   this is your own preference, needs to be removed from branch
+>   before I can use it.
+> * Removing the pageheader, content, and footer divs
+>   which are all used by style.css.
+>   Perhaps, the style sheet needs to be updated to use
+>   the new elements, like the `footer` and `header`.
+> * Removal of the favicon from page.tmpl. Surely html5 supports?
+> * Removal of BASEURL from page.tmpl, apparently a mistake.
+> * Removal of the `/` between wiki title and page title.
+>   Personal preference.
+> * Removal of `comments` div, which is there to be styled.
+> * Why use a `p` rather than the `div` for `addcomments`?
+> * Moving the action bar to the bottom of the page.
+>   Personal preference.
+> * Clearly searchquery.tmpl has no business using bad old `center`
+>   tag, but something should still be done to replace it.
+> 
+> (BTW, it would be helpful if you could re-merge master into your branch
+> as it is a bit diverged now.) --[[Joey]] 
+
 # htmlscrubber.pm needs to not scrub new HTML5 elements
 
 * [new elements](http://www.w3.org/TR/html5-diff/#new-elements)
 
+> Most of these can be supported trivially, since they are just semantic
+> markup. Make a list of these, and their attributes (and which attributes
+> can contain urls or other javascript injection mechanisms), and I can add
+> them. Others, like `embed`, and `canvas` are *scary*. --[[Joey]]
+
 # HTML5 Validation and t/html.t
 
 [validator.nu](http://validator.nu/) is the authorative HTML5 validator,
@@ -25,6 +82,9 @@ In the future, hopefully ikiwiki can test for valid HTML5 using [Relax NG
 schema](http://syntax.whattf.org/) using a Debian package tool
 [rnv](http://packages.qa.debian.org/r/rnv.html).
 
+> Validation in the test suite is nice, but I am willing to lose those
+> tests for a while. --[[Joey]] 
+
 # HTML5 migration issues
 
 # [article](http://www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#the-article-element) element
@@ -45,3 +105,6 @@ As a workaround:
 
 	au:~% grep timeformat natalian.setup
 	timeformat => '%Y-%m-%d',
+
+> Also, the [[plugins/relativedate]] plugin needs to be updated to 
+> support relatatizing the contents of time elements. --[[Joey]] 
-- 
cgit v1.2.3


From 91c57b03c93a0b86f09cf8b066eadd7cecb73b65 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 15:32:30 -0400
Subject: limit feeds for tag pages to including ten posts

With archive=yes, feeds default to including all, but that is expensive
for automatically created tag pages.
---
 templates/autotag.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl
index f670982b6..6bc809d22 100644
--- a/templates/autotag.tmpl
+++ b/templates/autotag.tmpl
@@ -1,3 +1,4 @@
 [[!meta title="tag <TMPL_VAR TAGNAME>"]]
 
-[[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"]]
+[[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"
+feedshow=10]]
-- 
cgit v1.2.3


From a034716009e29b1ef4bd44e0cddb7f7cf2fd93a2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 15:35:52 -0400
Subject: update example tag pages to match autotag.tmpl

---
 doc/examples/blog/tags/life.mdwn | 6 +++---
 doc/examples/blog/tags/tech.mdwn | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
index 719f2b192..e1614dbdc 100644
--- a/doc/examples/blog/tags/life.mdwn
+++ b/doc/examples/blog/tags/life.mdwn
@@ -1,4 +1,4 @@
-This feed contains pages in the "life" category.
+[[!meta title="tag life"]]
 
-[[!inline pages="link(tags/life) and !*/Discussion"
-show="10" actions=yes]]
+[[!inline pages="tagged(tags/life)" actions="no" archive="yes"
+feedshow=10]]
diff --git a/doc/examples/blog/tags/tech.mdwn b/doc/examples/blog/tags/tech.mdwn
index e811cac34..398146cdb 100644
--- a/doc/examples/blog/tags/tech.mdwn
+++ b/doc/examples/blog/tags/tech.mdwn
@@ -1,3 +1,4 @@
-This feed contains pages in the "tech" category.
+[[!meta title="tag tech"]]
 
-[[!inline pages="link(tags/tech) and !*/Discussion" show=10 actions=yes]]
+[[!inline pages="tagged(tags/tech)" actions="no" archive="yes"
+feedshow=10]]
-- 
cgit v1.2.3


From 80f2042464f9d14bcaed999e9769c71618bf5252 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 16:34:47 -0400
Subject: htmlscrubber: Allow html5 semantic tags: section nav article aside
 hgroup header footer time mark

---
 IkiWiki/Plugin/htmlscrubber.pm |  9 ++++++---
 debian/changelog               |  2 ++
 doc/bugs/html5_support.mdwn    | 10 ++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 9f40c752f..1604d776a 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -72,7 +72,7 @@ sub scrubber {
 	eval q{use HTML::Scrubber};
 	error($@) if $@;
 	# Lists based on http://feedparser.org/docs/html-sanitization.html
-	# With html 5 video and audio tags added.
+	# With html5 tags added.
 	$_scrubber = HTML::Scrubber->new(
 		allow => [qw{
 			a abbr acronym address area b big blockquote br br/
@@ -82,7 +82,9 @@ sub scrubber {
 			menu ol optgroup option p p/ pre q s samp select small
 			span strike strong sub sup table tbody td textarea
 			tfoot th thead tr tt u ul var
-			video audio
+
+			video audio section nav article aside hgroup header
+			footer time mark
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -98,8 +100,9 @@ sub scrubber {
 				selected shape size span start summary
 				tabindex target title type valign
 				value vspace width
+
 				autoplay loopstart loopend end
-				playcount controls 
+				playcount controls pubdate
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index a1bd85bfa..9a6cf68e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     (But not in-wiki templates.)
   * Version dependency on liburi-perl to >= 1.36; previous versions
     did not support building urls from utf-8 strings. Closes: #579713
+  * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
+    header footer time mark
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 5d2a41303..a330d3ae6 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -59,7 +59,13 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 >   tag, but something should still be done to replace it.
 > 
 > (BTW, it would be helpful if you could re-merge master into your branch
-> as it is a bit diverged now.) --[[Joey]] 
+> as it is a bit diverged now.) 
+> 
+> Other ideas:
+> 
+> * Add pubdate attribute to time elements as appropriate.
+> * Use aside for the sidebar? Or for the [[templates/note]] template?
+> --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
 
@@ -68,7 +74,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > Most of these can be supported trivially, since they are just semantic
 > markup. Make a list of these, and their attributes (and which attributes
 > can contain urls or other javascript injection mechanisms), and I can add
-> them. Others, like `embed`, and `canvas` are *scary*. --[[Joey]]
+> them. (Added several now.) Others, like `embed`, and `canvas` are *scary*. --[[Joey]]
 
 # HTML5 Validation and t/html.t
 
-- 
cgit v1.2.3


From 73c8209484ac730c82f7c7b749d08a1b3d895ee0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 17:56:35 -0400
Subject: more html5

* htmlscrubber: Also allow html5 canvas tags.
* htmlscrubber: Round out html5 video support with the preload
  attribute and the source tag.
---
 IkiWiki/Plugin/htmlscrubber.pm | 6 +++---
 debian/changelog               | 3 +++
 doc/bugs/html5_support.mdwn    | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 1604d776a..cc00fd5ff 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -83,8 +83,8 @@ sub scrubber {
 			span strike strong sub sup table tbody td textarea
 			tfoot th thead tr tt u ul var
 
-			video audio section nav article aside hgroup header
-			footer time mark
+			video audio source section nav article aside hgroup
+			header footer time mark canvas
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -101,7 +101,7 @@ sub scrubber {
 				tabindex target title type valign
 				value vspace width
 
-				autoplay loopstart loopend end
+				autoplay preload loopstart loopend end
 				playcount controls pubdate
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
diff --git a/debian/changelog b/debian/changelog
index 9a6cf68e3..9613d8b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     did not support building urls from utf-8 strings. Closes: #579713
   * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
     header footer time mark
+  * htmlscrubber: Also allow html5 canvas tags.
+  * htmlscrubber: Round out html5 video support with the preload
+    attribute and the source tag.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index a330d3ae6..c05208fbf 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -65,6 +65,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > 
 > * Add pubdate attribute to time elements as appropriate.
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
+> * Use nav for the actionbar
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
@@ -74,7 +75,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > Most of these can be supported trivially, since they are just semantic
 > markup. Make a list of these, and their attributes (and which attributes
 > can contain urls or other javascript injection mechanisms), and I can add
-> them. (Added several now.) Others, like `embed`, and `canvas` are *scary*. --[[Joey]]
+> them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]]
 
 # HTML5 Validation and t/html.t
 
-- 
cgit v1.2.3


From 442bc59a15301941613d62f4b1d846c57557ca8f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 18:14:50 -0400
Subject: htmlscrubber: Allow the placeholder attribute.

---
 IkiWiki/Plugin/htmlscrubber.pm | 2 +-
 debian/changelog               | 1 +
 doc/bugs/html5_support.mdwn    | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index cc00fd5ff..b3f659f73 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -102,7 +102,7 @@ sub scrubber {
 				value vspace width
 
 				autoplay preload loopstart loopend end
-				playcount controls pubdate
+				playcount controls pubdate placeholder
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index 9613d8b6d..951caab9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * htmlscrubber: Also allow html5 canvas tags.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
+  * htmlscrubber: Allow the placeholder attribute.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index c05208fbf..9c077a2d3 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -66,6 +66,8 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > * Add pubdate attribute to time elements as appropriate.
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
 > * Use nav for the actionbar
+> * Use placeholder in the search box. Allows closing
+>   [[this_todo|Add_label_to_search_form_input_field]]
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
-- 
cgit v1.2.3


From 0a139aba823ece3166d29ff2daee0b5c9507b52f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 18:27:53 -0400
Subject: htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
 min, max, step.

---
 IkiWiki/Plugin/htmlscrubber.pm                     | 5 +++--
 debian/changelog                                   | 3 ++-
 doc/todo/Add_label_to_search_form_input_field.mdwn | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index b3f659f73..479e10e74 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -101,8 +101,9 @@ sub scrubber {
 				tabindex target title type valign
 				value vspace width
 
-				autoplay preload loopstart loopend end
-				playcount controls pubdate placeholder
+				autofocus autoplay preload loopstart
+				loopend end playcount controls pubdate
+				placeholder min max step
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index 951caab9e..12ef08a91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * htmlscrubber: Also allow html5 canvas tags.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
-  * htmlscrubber: Allow the placeholder attribute.
+  * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
+    min, max, step.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/todo/Add_label_to_search_form_input_field.mdwn b/doc/todo/Add_label_to_search_form_input_field.mdwn
index 51b34927d..281ab48e2 100644
--- a/doc/todo/Add_label_to_search_form_input_field.mdwn
+++ b/doc/todo/Add_label_to_search_form_input_field.mdwn
@@ -51,4 +51,4 @@ The patch below adds a label for the field to improve usability:
 > element. already works in eg, chromium. However, ikiwiki does not use
 > html5 yet. --[[Joey]] 
 
-[[!tag wishlist html5]]
+[[!tag wishlist bugs/html5_support]]
-- 
cgit v1.2.3


From 80f9a2a0879f74e86b2720ca7d1c88ee165100ea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 18:31:33 -0400
Subject: add figure and figcaption

---
 IkiWiki/Plugin/htmlscrubber.pm | 2 +-
 debian/changelog               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 479e10e74..0090b67b9 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -84,7 +84,7 @@ sub scrubber {
 			tfoot th thead tr tt u ul var
 
 			video audio source section nav article aside hgroup
-			header footer time mark canvas
+			header footer figure figcaption time mark canvas
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
diff --git a/debian/changelog b/debian/changelog
index 12ef08a91..108764c39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * Version dependency on liburi-perl to >= 1.36; previous versions
     did not support building urls from utf-8 strings. Closes: #579713
   * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
-    header footer time mark
+    header footer figure figcaption time mark
   * htmlscrubber: Also allow html5 canvas tags.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
-- 
cgit v1.2.3


From 78cee5140ac37f93cd2e87d8a03d71420303eb13 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 18:44:37 -0400
Subject: add rest of html5 form attributes

It's easy to imagine pattern being used to freeze or crash browsers, if
they implement it stupidly. Let's hope not..
---
 IkiWiki/Plugin/htmlscrubber.pm | 2 +-
 debian/changelog               | 2 +-
 doc/bugs/html5_support.mdwn    | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 0090b67b9..7517c82c6 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -103,7 +103,7 @@ sub scrubber {
 
 				autofocus autoplay preload loopstart
 				loopend end playcount controls pubdate
-				placeholder min max step
+				placeholder min max step form required
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index 108764c39..cdc79ae78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
   * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
-    min, max, step.
+    min, max, step, required, autocomplete, novalidate, pattern, and form.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 9c077a2d3..7d9dc9f79 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -79,6 +79,10 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > can contain urls or other javascript injection mechanisms), and I can add
 > them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]]
 
+> I have not added the new `ping` attribute, because parsing a
+> space-separeated list of urls to avoid javascript injection is annoying, 
+> and the attribute seems generally dubious. --[[Joey]] 
+
 # HTML5 Validation and t/html.t
 
 [validator.nu](http://validator.nu/) is the authorative HTML5 validator,
-- 
cgit v1.2.3


From f1e2d0af123352b692e8e4efdb208e370a00d3c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 19:11:03 -0400
Subject: more html5 attributes

---
 IkiWiki/Plugin/htmlscrubber.pm | 5 +++++
 debian/changelog               | 4 ++++
 doc/bugs/html5_support.mdwn    | 5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 7517c82c6..d52614a4d 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -85,6 +85,7 @@ sub scrubber {
 
 			video audio source section nav article aside hgroup
 			header footer figure figcaption time mark canvas
+			datalist
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -104,11 +105,15 @@ sub scrubber {
 				autofocus autoplay preload loopstart
 				loopend end playcount controls pubdate
 				placeholder min max step form required
+				autocomplete novalidate pattern list
+				formenctype formmethod formnovalidate
+				formtarget reversed
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
 			src => $safe_url_regexp,
 			action => $safe_url_regexp,
+			formaction => $safe_url_regexp,
 			cite => $safe_url_regexp,
 			longdesc => $safe_url_regexp,
 			poster => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index cdc79ae78..e0f506f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     attribute and the source tag.
   * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
     min, max, step, required, autocomplete, novalidate, pattern, and form.
+    (Also the form* override attributes for input and buttons.)
+  * htmlscrubber: Allow the html5 datalist element, and the form list
+    attribute.
+  * htmlscrubber: Allow the html5 reversed and spellcheck attributes.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 7d9dc9f79..1ca45f46d 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -81,7 +81,10 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 
 > I have not added the new `ping` attribute, because parsing a
 > space-separeated list of urls to avoid javascript injection is annoying, 
-> and the attribute seems generally dubious. --[[Joey]] 
+> and the attribute seems generally dubious.
+> 
+> Need to understand better the attributes contenteditabl, contextmenu,
+> data-*, draggable, hidden, role, aria-*. Have not added those. --[[Joey]] 
 
 # HTML5 Validation and t/html.t
 
-- 
cgit v1.2.3


From 790a339db18f1c697052446728641c9e6ef06bdb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 19:28:28 -0400
Subject: htmlscrubber: Also allow some other html5 tags: canvas, progress,
 meter, ruby, rt, rp, details, summary.

---
 IkiWiki/Plugin/htmlscrubber.pm | 10 +++++-----
 debian/changelog               |  3 ++-
 doc/bugs/html5_support.mdwn    | 22 ++++++++++++++--------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index d52614a4d..505a6f142 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -85,7 +85,7 @@ sub scrubber {
 
 			video audio source section nav article aside hgroup
 			header footer figure figcaption time mark canvas
-			datalist
+			datalist progress meter ruby rt rp details summary
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -104,10 +104,10 @@ sub scrubber {
 
 				autofocus autoplay preload loopstart
 				loopend end playcount controls pubdate
-				placeholder min max step form required
-				autocomplete novalidate pattern list
-				formenctype formmethod formnovalidate
-				formtarget reversed
+				placeholder min max step low high optimum
+				form required autocomplete novalidate pattern
+				list formenctype formmethod formnovalidate
+				formtarget reversed spellcheck open
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index e0f506f29..3d33f3bfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     did not support building urls from utf-8 strings. Closes: #579713
   * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
     header footer figure figcaption time mark
-  * htmlscrubber: Also allow html5 canvas tags.
+  * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
+    ruby, rt, rp, details, summary.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
   * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 1ca45f46d..48b63b29a 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -68,23 +68,29 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > * Use nav for the actionbar
 > * Use placeholder in the search box. Allows closing
 >   [[this_todo|Add_label_to_search_form_input_field]]
+> * Use details tag instead of the javascript in the toggle plugin. 
+>   (Need to wait on browser support probably.)
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
 
 * [new elements](http://www.w3.org/TR/html5-diff/#new-elements)
 
-> Most of these can be supported trivially, since they are just semantic
-> markup. Make a list of these, and their attributes (and which attributes
-> can contain urls or other javascript injection mechanisms), and I can add
-> them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]]
-
+> Many added now.
+>
+> Things I left out, too hard to understand today:
+> Attributes contenteditabl, contextmenu,
+> data-*, draggable, hidden, role, aria-*. Tags command, keygen,
+> output.
+> 
+> Clearly unsafe: embed.
+> 
+> Apparently cannot be used w/o javascript: menu.
+> 
 > I have not added the new `ping` attribute, because parsing a
 > space-separeated list of urls to avoid javascript injection is annoying, 
 > and the attribute seems generally dubious.
-> 
-> Need to understand better the attributes contenteditabl, contextmenu,
-> data-*, draggable, hidden, role, aria-*. Have not added those. --[[Joey]] 
+>  --[[Joey]] 
 
 # HTML5 Validation and t/html.t
 
-- 
cgit v1.2.3


From 704263534ab645d34bc58261eb8d488413f1d80e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 19:33:24 -0400
Subject: apply simonrvn patch to quote attributes

---
 templates/change.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/change.tmpl b/templates/change.tmpl
index c9f6ce42b..5f277a0fb 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -29,7 +29,7 @@
 <span class="desc"><br />Date:</span>
 <span class="changedate"><TMPL_VAR COMMITDATE></span>
 </div>
-<div class=changelog>
+<div class="changelog">
 <TMPL_LOOP NAME="MESSAGE">
 <TMPL_IF NAME="LINE">
 <TMPL_VAR NAME="LINE"><br />
@@ -37,7 +37,7 @@
 </TMPL_LOOP>
 </div>
 <TMPL_IF NAME="DIFF">
-<div class=diff>
+<div class="diff">
 <pre>
 <TMPL_VAR NAME="DIFF">
 </pre>
-- 
cgit v1.2.3


From 930a60ae1dfa6c376b4d4b43f6383967d37f7f17 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 19:37:27 -0400
Subject: apply simonrvn patch adding labels for radio buttons

and other minor html improvement
---
 templates/commentmoderation.tmpl | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl
index e91d3146d..297886407 100644
--- a/templates/commentmoderation.tmpl
+++ b/templates/commentmoderation.tmpl
@@ -4,23 +4,26 @@
 <input type="hidden" name="do" value="commentmoderation" />
 <input type="hidden" name="sid" value="<TMPL_VAR SID>" />
 <input type="submit" value="Submit" />
-<input type="checkbox" name="rejectalldefer" value="1" />Reject
-all comments marked <em>Defer</em>
-<br />  
+<input type="checkbox" name="rejectalldefer" value="1" />
+<label for="rejectalldefer">Reject all comments marked <em>Defer</em></label>
+<br />
 <TMPL_LOOP NAME="COMMENTS">
 <div>
 <div>
 <TMPL_VAR VIEW>
 </div>
-<input type="radio" value="Defer" name="<TMPL_VAR ID>" checked />Defer
-<input type="radio" value="Accept" name="<TMPL_VAR ID>" />Accept
-<input type="radio" value="Reject" name="<TMPL_VAR ID>" />Reject
+<input type="radio" value="Defer" name="<TMPL_VAR ID>" checked="checked" />
+<label for="Defer">Defer</label>
+<input type="radio" value="Accept" name="<TMPL_VAR ID>" />
+<label for="Accept">Accept</label>
+<input type="radio" value="Reject" name="<TMPL_VAR ID>" />
+<label for="Reject">Reject</label>
 </div>
 <br />
 </TMPL_LOOP>
 <input type="submit" value="Submit" />
-<input type="checkbox" name="rejectalldefer" value="1" />Reject
-all comments marked <em>Defer</em>
+<input type="checkbox" name="rejectalldefer" value="1" />
+<label for="rejectalldefer">Reject all comments marked <em>Defer</em></label>
 </form>
 <TMPL_ELSE>
 <p>
-- 
cgit v1.2.3


From ccafb10007731d04e0ff6aa36978690e6dfa6dec Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 19:59:16 -0400
Subject: enable hidden attribute

---
 IkiWiki/Plugin/htmlscrubber.pm |  2 +-
 debian/changelog               | 17 ++++++++---------
 doc/bugs/html5_support.mdwn    |  6 +++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 505a6f142..847518178 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -107,7 +107,7 @@ sub scrubber {
 				placeholder min max step low high optimum
 				form required autocomplete novalidate pattern
 				list formenctype formmethod formnovalidate
-				formtarget reversed spellcheck open
+				formtarget reversed spellcheck open hidden
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index 3d33f3bfc..8bf6f89b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,18 +5,17 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     (But not in-wiki templates.)
   * Version dependency on liburi-perl to >= 1.36; previous versions
     did not support building urls from utf-8 strings. Closes: #579713
-  * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
-    header footer figure figcaption time mark
+  * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside
+    hgroup, header, footer, figure, figcaption, time, mark
   * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
-    ruby, rt, rp, details, summary.
+    ruby, rt, rp, details, summary, datalist.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
-  * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
-    min, max, step, required, autocomplete, novalidate, pattern, and form.
-    (Also the form* override attributes for input and buttons.)
-  * htmlscrubber: Allow the html5 datalist element, and the form list
-    attribute.
-  * htmlscrubber: Allow the html5 reversed and spellcheck attributes.
+  * htmlscrubber: Allow the html5 form attributes: placeholder, autofocus,
+    min, max, step, required, autocomplete, novalidate, pattern, list,
+    and form. (Also the form* override attributes for input and buttons.)
+  * htmlscrubber: Allow additional misc html5 attributes: reversed,
+    spellcheck, and hidden.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 48b63b29a..2d27ac803 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -79,9 +79,9 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > Many added now.
 >
 > Things I left out, too hard to understand today:
-> Attributes contenteditabl, contextmenu,
-> data-*, draggable, hidden, role, aria-*. Tags command, keygen,
-> output.
+> Attributes contenteditable,
+> data-\*, draggable, role, aria-\*.
+> Tags command, keygen, output.
 > 
 > Clearly unsafe: embed.
 > 
-- 
cgit v1.2.3


From a547d2685866898665fad221939b0b820a42a088 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 20:40:31 -0400
Subject: html5 option

* Ikiwiki can be configured to generate html5 instead of the default xhtml
  1.0. The html5 output mode is experimental, not yet fully standards
  compliant, and will be subject to rapid change.
---
 IkiWiki.pm                  |  8 ++++++++
 IkiWiki/Render.pm           |  1 +
 debian/changelog            |  5 ++++-
 doc/bugs/html5_support.mdwn | 12 +++++++-----
 doc/roadmap.mdwn            |  1 +
 templates/misc.tmpl         |  5 ++++-
 templates/page.tmpl         |  5 ++++-
 7 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5ff1a5ae6..1e11d34e2 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -234,6 +234,13 @@ sub getsetup () {
 		safe => 1,
 		rebuild => 1,
 	},
+	html5 => {
+		type => "boolean",
+		default => 0,
+		description => "generate HTML5? (experimental)",
+		safe => 1,
+		rebuild => 1,
+	},
 	sslcookie => {
 		type => "boolean",
 		default => 0,
@@ -1725,6 +1732,7 @@ sub misctemplate ($$;@) {
 		wikiname => $config{wikiname},
 		pagebody => $pagebody,
 		baseurl => baseurl(),
+		html5 => $config{html5},
 		@_,
 	);
 	run_hooks(pagetemplate => sub {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7e3d78861..5923f5e74 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -138,6 +138,7 @@ sub genpage ($$) {
 		mtime => displaytime($pagemtime{$page}),
 		ctime => displaytime($pagectime{$page}),
 		baseurl => baseurl($page),
+		html5 => $config{html5},
 	);
 
 	run_hooks(pagetemplate => sub {
diff --git a/debian/changelog b/debian/changelog
index 8bf6f89b6..fc5a6124b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 ikiwiki (3.20100428) UNRELEASED; urgency=low
 
-  * template: Fix typo.
   * TMPL_INCLUDE re-enabled for templates read from the templatedir.
     (But not in-wiki templates.)
   * Version dependency on liburi-perl to >= 1.36; previous versions
     did not support building urls from utf-8 strings. Closes: #579713
+  * Ikiwiki can be configured to generate html5 instead of the default xhtml
+    1.0. The html5 output mode is experimental, not yet fully standards
+    compliant, and will be subject to rapid change.
   * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside
     hgroup, header, footer, figure, figcaption, time, mark
   * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
@@ -16,6 +18,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     and form. (Also the form* override attributes for input and buttons.)
   * htmlscrubber: Allow additional misc html5 attributes: reversed,
     spellcheck, and hidden.
+  * template: Fix typo.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 2d27ac803..bf782a3bf 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -20,13 +20,14 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 >    What has been done so far, can be extended. Basically works 
 >    in browsers, if you don't care about standards. A good prerequisite
 >    for anything else, anyway.
-> 2. Switch to html5 in eg, ikiwiki 4; users have to deal with
+> 2. Have both a html5 and a xhtml mode, allow user to select.
+> 3. Switch to html5 in eg, ikiwiki 4; users have to deal with
 >    any custom markup on their pages/templates that breaks then.
-> 3. Have both a html5 and a xhtml mode, allow user to select.
->
-> The third option seems fairly tractable from what I see here and in 
+> 
+> The second option seems fairly tractable from what I see here and in 
 > your branch. You made only relatively minor changes to 10 templates.
-> It would probably not be too dreadful to put them in ifdefs.
+> It would probably not be too dreadful to put them in ifdefs. I've made a
+> small start at doing that.
 > 
 > Some of your changes are obvious, like using the new `time` and
 > and `article` elements. Others less so, and I'm particularly
@@ -70,6 +71,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 >   [[this_todo|Add_label_to_search_form_input_field]]
 > * Use details tag instead of the javascript in the toggle plugin. 
 >   (Need to wait on browser support probably.)
+> 
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index c126fd585..4b5f01c45 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -80,6 +80,7 @@ Probably incomplete list:
 * YADA format setup files per default?
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
+* html5 on by default (some day..)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index 535a6f06b..0b7fefa08 100644
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -1,6 +1,9 @@
-<!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>
 <TMPL_IF NAME="FORCEBASEURL">
 <base href="<TMPL_VAR FORCEBASEURL>" />
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 7e850a56b..661d4a515 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -1,6 +1,9 @@
-<!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" />
 <meta http-equiv="Cache-Control" content="must-revalidate" />
-- 
cgit v1.2.3


From 8e4af6a8e2a8e8d9b7d9f4312c4216261ebd5a28 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 20:57:54 -0400
Subject: tidy plugin issue

---
 doc/bugs/html5_support.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index bf782a3bf..dca60d57e 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -132,3 +132,7 @@ As a workaround:
 
 > Also, the [[plugins/relativedate]] plugin needs to be updated to 
 > support relatatizing the contents of time elements. --[[Joey]] 
+
+## tidy plugin
+
+Will reformat html5 to html4.
-- 
cgit v1.2.3


From 1226269f683bce6bf3a0539f0374ee1844687b02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 21:00:06 -0400
Subject: mention html5

---
 doc/features.mdwn | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 07ce648ea..215c1cecd 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -71,8 +71,10 @@ you would care to syndicate.
 ## Valid html and [[css]]
 
 Ikiwiki aims to produce 
-[valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
-generates html using [[templates]], and uses [[css]], so you
+[valid XHTML 1.0](http://validator.w3.org/check?url=referer).
+(Experimental HTML5 support is also available.)
+
+Ikiwiki generates html using [[templates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
 
 ## [[Plugins]]
-- 
cgit v1.2.3


From 0ec1fe1944f88ed285bb467e143c4967af11ad5c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 21:04:14 -0400
Subject: set html5 option as advanced for now

---
 IkiWiki.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1e11d34e2..ed57710bb 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -238,6 +238,7 @@ sub getsetup () {
 		type => "boolean",
 		default => 0,
 		description => "generate HTML5? (experimental)",
+		advanced => 1,
 		safe => 1,
 		rebuild => 1,
 	},
-- 
cgit v1.2.3


From 0dc6235659b4638f148af2d570d470e47ce9eb76 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 21:14:05 -0400
Subject: use styled divs instead of center tags

More could be done to modernize this html, but I don't want to diverge
too far from the one in xapian.
---
 templates/searchquery.tmpl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/searchquery.tmpl b/templates/searchquery.tmpl
index 782b12cab..5b9fbbf7f 100644
--- a/templates/searchquery.tmpl
+++ b/templates/searchquery.tmpl
@@ -33,7 +33,7 @@ $def{NEXT,$if{$ne{$last,$msize},<INPUT TYPE=submit NAME="&gt;" VALUE="Next">}}
 
 <FORM NAME=P METHOD=GET 
 ACTION="$html{$env{CGIURL}}" TARGET="_top">
-<center>
+<div style="text-align:center">
 <INPUT NAME=P VALUE="$html{$query}" SIZE=65>
 <INPUT TYPE=SUBMIT VALUE="Search">
 $env{HELPLINK}
@@ -54,7 +54,7 @@ $if{$not{$msizeexact},
   $nice{$add{$topdoc,1}}$if{$ne{$add{$topdoc,1},$last},-$nice{$last}} of exactly $nice{$msize} matches}
 }
 <hr>
-</center>
+</div>
 $list{$map{$queryterms,$list{$html{$uniq{$unstem{$_}}},<b>,</b>/<b>,</b>}:&nbsp;$nice{$freq{$_}}},Term frequencies: ,$. ,}
 <br><small>Search took $time seconds</small>
 <table>
@@ -77,8 +77,9 @@ $percentage% relevant$. matching:
 <i>$list{$map{$terms,$html{$prettyterm{$_}}},$. ,</i> and <i>}</i></small>${for lynx:}<p></td></tr>}
 </table>
 
-<br><center>
+<br />
 
+<div style="text-align:center">
 ${suppress next, prev, and page links if there's only one page}
 $if{$ne{$lastpage,1},
 $set{a,$if{$opt{pagelink_height}, HEIGHT=$opt{pagelink_height}}$if{$opt{pagelink_width}, WIDTH=$opt{pagelink_width}}}
@@ -97,7 +98,7 @@ $if{$ne{$opt{y},$lastpage},...}
 $NEXT
 }
 }}
-</center><br>
+</div><br />
 $if{$dbname,<INPUT TYPE=hidden NAME=DB VALUE="$html{$dbname}">}
 $if{$ne{$topdoc,0},<INPUT TYPE=hidden NAME=TOPDOC VALUE=$topdoc>}
 $if{$ne{$hitsperpage,10},<INPUT TYPE=hidden NAME=HITSPERPAGE VALUE=$hitsperpage>}
-- 
cgit v1.2.3


From d9e22adb6639e3c6cb4fe46d146940fa2182db4f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 21:42:13 -0400
Subject: releasing version 3.20100501

---
 debian/changelog |   4 +-
 ikiwiki.spec     |   2 +-
 po/ikiwiki.pot   |  74 ++++++++---------
 po/tr.po         | 226 ++++++++++++++++++++++++++-------------------------
 po/vi.po         | 240 +++++++++++++++++++++++++++++--------------------------
 5 files changed, 282 insertions(+), 264 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc5a6124b..6962e5171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100428) UNRELEASED; urgency=low
+ikiwiki (3.20100501) unstable; urgency=low
 
   * TMPL_INCLUDE re-enabled for templates read from the templatedir.
     (But not in-wiki templates.)
@@ -20,7 +20,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     spellcheck, and hidden.
   * template: Fix typo.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 01 May 2010 20:49:28 -0400
 
 ikiwiki (3.20100427) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 8d871eb21..b107f28eb 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100427
+Version: 3.20100501
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 638e724d5..5e2f05b27 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-01 21:16-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1298
 msgid "Error"
 msgstr ""
 
@@ -487,7 +487,7 @@ msgstr ""
 msgid "redir cycle is not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:772
 #, perl-format
 msgid "building %s"
 msgstr ""
@@ -628,50 +628,50 @@ msgid ""
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:874
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:897
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:903
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:939
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:952
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1036
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1145
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1104
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1157
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -865,12 +865,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:188
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:225
 msgid "search"
 msgstr ""
 
@@ -1019,59 +1019,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:163
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:285
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:331
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:373
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:435
 #, perl-format
 msgid "removing obsolete %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:517
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:600 ../IkiWiki/Render.pm:682
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:695
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:824
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1164,43 +1164,43 @@ msgstr ""
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1280
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1944
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2021
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2042
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2178
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index b59f5e941..dca798e3e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-05-01 21:16-0400\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgstr "Tercihler kaydedildi."
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1298
 msgid "Error"
 msgstr "Hata"
 
@@ -132,7 +132,7 @@ msgstr "%s için yeni sayfa oluşturuluyor"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -202,55 +202,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -260,7 +260,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -290,14 +290,14 @@ msgstr ""
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -315,8 +315,9 @@ msgstr ""
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+msgid "failed to process template:"
 msgstr ""
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -345,18 +346,18 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -438,12 +439,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
+msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -470,18 +471,22 @@ msgstr ""
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr ""
 
+#: ../IkiWiki/Plugin/meta.pm:387
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr ""
@@ -498,10 +503,6 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr ""
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -518,39 +519,39 @@ msgstr ""
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -580,93 +581,93 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:772
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:874
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:897
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:903
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:939
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:952
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1036
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1145
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1104
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1157
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -808,44 +809,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -860,12 +861,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:188
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:225
 msgid "search"
 msgstr ""
 
@@ -943,18 +944,19 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "%s için yeni sayfa oluşturuluyor"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr ""
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr ""
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr ""
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "özet akışı bulunamadı"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1013,54 +1015,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:163
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:285
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:331
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:373
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:435
+#, perl-format
+msgid "removing obsolete %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:517
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:600 ../IkiWiki/Render.pm:682
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:695
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:824
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1133,62 +1140,63 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1280
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1944
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
+#: ../IkiWiki.pm:2021
+#, perl-format
+msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2042
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2178
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 5f968ccb3..b5596b926 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-05-01 21:16-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1298
 msgid "Error"
 msgstr "Lỗi"
 
@@ -137,7 +137,7 @@ msgstr "đang tạo trang mới %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "xong"
 
@@ -178,7 +178,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -210,55 +210,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -267,7 +267,7 @@ msgstr[0] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -297,14 +297,14 @@ msgstr "đang gỡ bỏ trang cũ %s"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
@@ -324,9 +324,10 @@ msgstr "chưa xác định tên tập tin bộ bao bọc"
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
-msgid "failed to process"
+msgid "failed to process template:"
 msgstr "mẫu không xử lý được:"
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -357,18 +358,18 @@ msgstr "không thể đọc %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -457,12 +458,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr ""
+msgid "template %s not found"
+msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
@@ -490,21 +491,25 @@ msgstr ""
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 #, fuzzy
 msgid "redir page not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "không tìm thấy mẫu %s"
 
+#: ../IkiWiki/Plugin/meta.pm:387
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Nhân bản"
@@ -521,10 +526,6 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "chưa thực hiện getctime"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -542,39 +543,39 @@ msgstr "Mọi trang được liên kết với trang khác."
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Gặp lỗi khi tạo tài khoản."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Lỗi gửi thư"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -605,94 +606,94 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:772
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:874
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:888
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:897
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:903
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:939
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:952
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1036
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1145
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1104
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1157
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -836,44 +837,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "đang vẽ %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "cập nhật %2$s của %1$s bởi %3$s"
@@ -888,12 +889,12 @@ msgstr "lỗi ghi %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:188
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:225
 msgid "search"
 msgstr ""
 
@@ -978,21 +979,21 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "đang tạo trang mới %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 #, fuzzy
 msgid "missing id parameter"
 msgstr "mẫu thiếu tham số id"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
+#, fuzzy, perl-format
+msgid "%s not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/template.pm:66
-#, fuzzy
-msgid "failed to process:"
-msgstr "mẫu không xử lý được:"
-
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
@@ -1051,54 +1052,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:163
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:285
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:331
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:373
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:435
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:508
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:517
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:600 ../IkiWiki/Render.pm:682
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:695
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:824
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
@@ -1171,62 +1177,63 @@ msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Thảo luận"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1280
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1944
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+#: ../IkiWiki.pm:2021
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2042
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2178
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
@@ -1251,6 +1258,13 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to process"
+#~ msgstr "mẫu không xử lý được:"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "chưa thực hiện getctime"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "lỗi ghi %s: %s"
@@ -1302,10 +1316,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo"
 
-#, fuzzy
-#~ msgid "%s not found"
-#~ msgstr "không tìm thấy mẫu %s"
-
 #~ msgid "What's this?"
 #~ msgstr "Cái này là gì?"
 
-- 
cgit v1.2.3


From f9e41d19b77f677a58bb22e1db47627cf9faa57f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 21:42:48 -0400
Subject: add news item for ikiwiki 3.20100501

---
 doc/news/version_3.20100212.mdwn | 26 --------------------------
 doc/news/version_3.20100302.mdwn | 12 ------------
 doc/news/version_3.20100501.mdwn | 21 +++++++++++++++++++++
 3 files changed, 21 insertions(+), 38 deletions(-)
 delete mode 100644 doc/news/version_3.20100212.mdwn
 delete mode 100644 doc/news/version_3.20100302.mdwn
 create mode 100644 doc/news/version_3.20100501.mdwn

diff --git a/doc/news/version_3.20100212.mdwn b/doc/news/version_3.20100212.mdwn
deleted file mode 100644
index 3dcfe5f84..000000000
--- a/doc/news/version_3.20100212.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-ikiwiki 3.20100212 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * template: Preprocess parameters before htmlizing.
-   * img: Fix a bug that could taint @links with undef values.
-   * setup automator: Configure Term::Readline to use bold for prompt, rather
-     than default underline. Closes: #[517656](http://bugs.debian.org/517656)
-   * Allow jumping directly into account registration process by going to
-     ikiwiki.cgi?do=register
-   * Improve display of openid in preferences page.
-   * Add link to userpage (or creation link) to top of preferences page.
-   * opendiscussion: This plugin will also now allow posting comments
-     to otherwise locked-down sites.
-   * auto-blog.setup: Lock all pages, so only admin can post to the blog
-     by default, and enable opendiscussion so others can comment.
-   * Fix color and format plugins to appear in the websetup interface.
-   * amazon\_s3: Fix to support the EU S3 datacenter, which is more picky
-     about attempts to create already existing buckets.
-   * httpauth: When cgiauthurl is configured, httpauth can now be used
-     alongside other authentication methods (like openid or anonok). Rather
-     than always redirect to the cgiauthurl for authentication, there is now
-     a button on the login form to use it.
-   * httpauth: Add httpauth\_pagespec setting that can be used to limit
-     pages to only being edited via users authed with httpauth.
-   * Allow globs to be used in user() pagespecs.
-   * Group related plugins into sections in the setup file, and drop
-     unused rcs plugins from the setup file."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100302.mdwn b/doc/news/version_3.20100302.mdwn
deleted file mode 100644
index f439b1b23..000000000
--- a/doc/news/version_3.20100302.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-ikiwiki 3.20100302 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * comments: Display number of comments in comment action link.
-   * Rebuild wikis on upgrade to this version to get the comment counts
-     added to existing pages.
-   * Loosen regexp, to allow empty quoted parameters in directives.
-   * Add force\_overwrite setting to make setup automator overwrite existing
-     files/directories.
-   * Fix admin openid detection in setup automator, and avoid prompting
-     for a password.
-   * Add new --clean option; this makes ikiwiki remove all built
-     files in the destdir, as well as wrappers and the .ikiwiki directory."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100501.mdwn b/doc/news/version_3.20100501.mdwn
new file mode 100644
index 000000000..0cf5e38be
--- /dev/null
+++ b/doc/news/version_3.20100501.mdwn
@@ -0,0 +1,21 @@
+ikiwiki 3.20100501 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * TMPL\_INCLUDE re-enabled for templates read from the templatedir.
+     (But not in-wiki templates.)
+   * Version dependency on liburi-perl to &gt;= 1.36; previous versions
+     did not support building urls from utf-8 strings. Closes: #[579713](http://bugs.debian.org/579713)
+   * Ikiwiki can be configured to generate html5 instead of the default xhtml
+     1.0. The html5 output mode is experimental, not yet fully standards
+     compliant, and will be subject to rapid change.
+   * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside
+     hgroup, header, footer, figure, figcaption, time, mark
+   * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
+     ruby, rt, rp, details, summary, datalist.
+   * htmlscrubber: Round out html5 video support with the preload
+     attribute and the source tag.
+   * htmlscrubber: Allow the html5 form attributes: placeholder, autofocus,
+     min, max, step, required, autocomplete, novalidate, pattern, list,
+     and form. (Also the form* override attributes for input and buttons.)
+   * htmlscrubber: Allow additional misc html5 attributes: reversed,
+     spellcheck, and hidden.
+   * template: Fix typo."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 970373548fda77223ebbeb6aadbdbe4884b67cef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 13:44:13 -0400
Subject: Add parameter to displaytime to specify that it is a pubdate, and in
 html5 mode, use time tag.

---
 IkiWiki.pm                     | 22 ++++++++++++++++++++--
 IkiWiki/Plugin/comments.pm     |  2 +-
 IkiWiki/Plugin/inline.pm       | 12 +-----------
 IkiWiki/Plugin/relativedate.pm | 15 ++++++++++++---
 IkiWiki/Render.pm              |  2 +-
 debian/changelog               |  7 +++++++
 doc/bugs/html5_support.mdwn    |  3 +++
 doc/plugins/write.mdwn         |  5 ++++-
 8 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ed57710bb..c428de77f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -998,10 +998,18 @@ sub abs2rel ($$) {
 	return $ret;
 }
 
-sub displaytime ($;$) {
+sub displaytime ($;$$) {
 	# Plugins can override this function to mark up the time to
 	# display.
-	return '<span class="date">'.formattime(@_).'</span>';
+	my $time=formattime($_[0], $_[1]);
+	if ($config{html5}) {
+		return '<time datetime="'.date_3339($_[0]).'"'.
+			($_[2] ? ' pubdate' : '').
+			'>'.$time.'</time>';
+	}
+	else {
+		return '<span class="date">'.$time.'</span>';
+	}
 }
 
 sub formattime ($;$) {
@@ -1017,6 +1025,16 @@ sub formattime ($;$) {
 	return decode_utf8(POSIX::strftime($format, localtime($time)));
 }
 
+sub date_3339 ($) {
+	my $time=shift;
+
+	my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
+	POSIX::setlocale(&POSIX::LC_TIME, "C");
+	my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
+	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
+	return $ret;
+}
+
 sub beautify_urlpath ($) {
 	my $url=shift;
 
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index f7dc99dca..02f1d9301 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -672,7 +672,7 @@ sub previewcomment ($$$) {
 
 	my $template = template("comment.tmpl");
 	$template->param(content => $preview);
-	$template->param(ctime => displaytime($time));
+	$template->param(ctime => displaytime($time, undef, 1));
 
 	IkiWiki::run_hooks(pagetemplate => sub {
 		shift->(page => $location,
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 95fe90312..2df59f414 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -358,7 +358,7 @@ sub preprocess_inline (@) {
 				$template->param(pageurl => urlto($page, $params{destpage}));
 				$template->param(inlinepage => $page);
 				$template->param(title => pagetitle(basename($page)));
-				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}, 1));
 				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
 				$template->param(first => 1) if $page eq $list[0];
 				$template->param(last => 1) if $page eq $list[$#list];
@@ -500,16 +500,6 @@ sub date_822 ($) {
 	return $ret;
 }
 
-sub date_3339 ($) {
-	my $time=shift;
-
-	my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
-	POSIX::setlocale(&POSIX::LC_TIME, "C");
-	my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
-	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
-	return $ret;
-}
-
 sub absolute_urls ($$) {
 	# sucky sub because rss sucks
 	my $content=shift;
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 7e615f7f1..fe8ef0901 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -43,9 +43,10 @@ sub include_javascript ($;$) {
 		'" type="text/javascript" charset="utf-8"></script>';
 }
 
-sub mydisplaytime ($;$) {
+sub mydisplaytime ($;$$) {
 	my $time=shift;
 	my $format=shift;
+	my $pubdate=shift;
 
 	# This needs to be in a form that can be parsed by javascript.
 	# Being fairly human readable is also nice, as it will be exposed
@@ -53,8 +54,16 @@ sub mydisplaytime ($;$) {
 	my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
 			localtime($time)));
 
-	return '<span class="relativedate" title="'.$gmtime.'">'.
-		IkiWiki::formattime($time, $format).'</span>';
+	my $mid=' class="relativedate" title="'.$gmtime.'">'.
+		IkiWiki::formattime($time, $format);
+
+	if ($config{html5}) {
+		return '<time datetime="'.IkiWiki::date_3339($time).'"'.
+			($pubdate ? ' pubdate' : '').$mid.'</time>';
+	}
+	else {
+		return '<span'.$mid.'</span>';
+	}
 }
 
 1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5923f5e74..cf6943e7d 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -136,7 +136,7 @@ sub genpage ($$) {
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,
 		mtime => displaytime($pagemtime{$page}),
-		ctime => displaytime($pagectime{$page}),
+		ctime => displaytime($pagectime{$page}, undef, 1),
 		baseurl => baseurl($page),
 		html5 => $config{html5},
 	);
diff --git a/debian/changelog b/debian/changelog
index 6962e5171..8158429a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100502) UNRELEASED; urgency=low
+
+  * Add parameter to displaytime to specify that it is a pubdate,
+    and in html5 mode, use time tag.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
+
 ikiwiki (3.20100501) unstable; urgency=low
 
   * TMPL_INCLUDE re-enabled for templates read from the templatedir.
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index dca60d57e..386a3094a 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -133,6 +133,9 @@ As a workaround:
 > Also, the [[plugins/relativedate]] plugin needs to be updated to 
 > support relatatizing the contents of time elements. --[[Joey]] 
 
+> Done and done; in html5 mode it uses the time tag, and even 
+> adds pubdate when displaying ctimes. --[[Joey]]
+
 ## tidy plugin
 
 Will reformat html5 to html4.
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index a9ea7db73..5e7042c3b 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -938,13 +938,16 @@ search for files.
 If the directory name is not absolute, ikiwiki will assume it is in
 the parent directory of the configured underlaydir.
 
-### `displaytime($;$)`
+### `displaytime($;$$)`
 
 Given a time, formats it for display.
 
 The optional second parameter is a strftime format to use to format the
 time.
 
+If the third parameter is true, this is the publication time of a page.
+(Ie, set the html5 pubdate attribute.)
+
 ### `gettext`
 
 This is the standard gettext function, although slightly optimised.
-- 
cgit v1.2.3


From b21df5029b94c5680d8a3e5f0c1ed40a660a1594 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 13:49:56 -0400
Subject: Add placeholder text in search form (in html5 mode only).

---
 IkiWiki/Plugin/google.pm                           | 1 +
 IkiWiki/Plugin/search.pm                           | 1 +
 debian/changelog                                   | 1 +
 doc/bugs/html5_support.mdwn                        | 3 ---
 doc/todo/Add_label_to_search_form_input_field.mdwn | 2 ++
 templates/googleform.tmpl                          | 3 ++-
 templates/searchform.tmpl                          | 3 ++-
 7 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 85467fa0b..68cde261c 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -42,6 +42,7 @@ sub pagetemplate (@) {
 		if (! defined $form) {
 			my $searchform = template("googleform.tmpl", blind_cache => 1);
 			$searchform->param(url => $config{url});
+			$searchform->param(html5 => $config{html5});
 			$form=$searchform->output;
 		}
 
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index be39fdf1e..9e875c79c 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -58,6 +58,7 @@ sub pagetemplate (@) {
 		if (! defined $form) {
 			my $searchform = template("searchform.tmpl", blind_cache => 1);
 			$searchform->param(searchaction => $config{cgiurl});
+			$searchform->param(html5 => $config{html5});
 			$form=$searchform->output;
 		}
 
diff --git a/debian/changelog b/debian/changelog
index 8158429a0..c9fc2e657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
 
   * Add parameter to displaytime to specify that it is a pubdate,
     and in html5 mode, use time tag.
+  * Add placeholder text in search form (in html5 mode only).
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 386a3094a..5530b29db 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -64,11 +64,8 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > 
 > Other ideas:
 > 
-> * Add pubdate attribute to time elements as appropriate.
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
 > * Use nav for the actionbar
-> * Use placeholder in the search box. Allows closing
->   [[this_todo|Add_label_to_search_form_input_field]]
 > * Use details tag instead of the javascript in the toggle plugin. 
 >   (Need to wait on browser support probably.)
 > 
diff --git a/doc/todo/Add_label_to_search_form_input_field.mdwn b/doc/todo/Add_label_to_search_form_input_field.mdwn
index 281ab48e2..514108fba 100644
--- a/doc/todo/Add_label_to_search_form_input_field.mdwn
+++ b/doc/todo/Add_label_to_search_form_input_field.mdwn
@@ -51,4 +51,6 @@ The patch below adds a label for the field to improve usability:
 > element. already works in eg, chromium. However, ikiwiki does not use
 > html5 yet. --[[Joey]] 
 
+>> [[Done]], placeholder added, in html5 mode only.
+
 [[!tag wishlist bugs/html5_support]]
diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl
index bcf1004a4..f39b46540 100644
--- a/templates/googleform.tmpl
+++ b/templates/googleform.tmpl
@@ -1,6 +1,7 @@
 <form method="get" action="http://www.google.com/search" id="searchform">
  <div>
   <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" />
-  <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text" />
+  <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text"
+  <TMPL_IF HTML5>placeholder="search"</TMPL_IF> />
  </div>
 </form>
diff --git a/templates/searchform.tmpl b/templates/searchform.tmpl
index afae2ebf5..cb65d124c 100644
--- a/templates/searchform.tmpl
+++ b/templates/searchform.tmpl
@@ -1,5 +1,6 @@
 <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
 <div>
-<input type="text" id="searchbox" name="P" value="" size="16" />
+<input type="text" id="searchbox" name="P" value="" size="16"
+<TMPL_IF HTML5>placeholder="search"</TMPL_IF> />
 </div>
 </form>
-- 
cgit v1.2.3


From 932fc0c25ffa1da6c6eb5d398752372ba7f80165 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 14:41:20 -0400
Subject: use a div, not a p .. and in html5, a nav

---
 IkiWiki/Plugin/mirrorlist.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index 92be7913e..f54d94ad5 100644
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -40,7 +40,7 @@ sub pagetemplate (@) {
 
 sub mirrorlist ($) {
 	my $page=shift;
-	return "<p>".
+	return ($config{html5} ? '<nav id="mirrorlist">' : '<div>').
 		(keys %{$config{mirrorlist}} > 1 ? gettext("Mirrors") : gettext("Mirror")).
 		": ".
 		join(", ",
@@ -50,7 +50,7 @@ sub mirrorlist ($) {
 				qq{">$_</a>}
 			} keys %{$config{mirrorlist}}
 		).
-		"</p>";
+		($config{html5} ? '</nav>' : '</div>');
 }
 
 1
-- 
cgit v1.2.3


From 7517d34da928bb9612c65fcde87cc434b7b7d653 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 15:09:15 -0400
Subject: update

---
 doc/bugs/html5_support.mdwn | 37 ++++---------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 5530b29db..ef0ec1e70 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -30,40 +30,11 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > small start at doing that.
 > 
 > Some of your changes are obvious, like using the new `time` and
-> and `article` elements. Others less so, and I'm particularly
-> puzzled by these:
-> 
-> * Removing the value="Submit" from the button on the 
->   commentmoderation form.
-> * Removing feedlink.tmpl. What?!
-> * Using a `h2` for the header of inlinepage.tmpl and page.tmpl, rather
->   than the styled span. Ikiwiki has
->   [[a_reason|todo/Option_to_make_title_an_h1?]] for not
->   using real `hN` for the header atop a page and here.
->   AFAICS, html5 does not invalidate that.
-> * Removing Editurl from inlinepage.tmpl actions. I assume 
->   this is your own preference, needs to be removed from branch
->   before I can use it.
-> * Removing the pageheader, content, and footer divs
->   which are all used by style.css.
->   Perhaps, the style sheet needs to be updated to use
->   the new elements, like the `footer` and `header`.
-> * Removal of the favicon from page.tmpl. Surely html5 supports?
-> * Removal of BASEURL from page.tmpl, apparently a mistake.
-> * Removal of the `/` between wiki title and page title.
->   Personal preference.
-> * Removal of `comments` div, which is there to be styled.
-> * Why use a `p` rather than the `div` for `addcomments`?
-> * Moving the action bar to the bottom of the page.
->   Personal preference.
-> * Clearly searchquery.tmpl has no business using bad old `center`
->   tag, but something should still be done to replace it.
-> 
-> (BTW, it would be helpful if you could re-merge master into your branch
-> as it is a bit diverged now.) 
-> 
+> and `article` elements. Looks like I can't merge it as-is though
+> due to other changes.
+>
 > Other ideas:
-> 
+>  
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
 > * Use nav for the actionbar
 > * Use details tag instead of the javascript in the toggle plugin. 
-- 
cgit v1.2.3


From d69f6057d1e1787fa3c19cc13c40eb3e9b822283 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 15:09:33 -0400
Subject: use html5 semantic markup in page.tmpl

This is a first pass, it avoids needing to change style.css
except where it refers to tag types.

This goes a bit off the rails at the pageheader with its nested header.
Semantically, there should be an article around the whole page
header, content, and footer. Just as there will be an article around a
whole comment or inlined page header, content, and footer.

But that will mean changing the css that currently refers to pageheader to
refer to the enclosing article instead.
---
 debian/changelog    |  3 +++
 doc/style.css       |  5 +----
 templates/page.tmpl | 49 +++++++++++++++++++++++++------------------------
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9fc2e657..789fda1ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
   * Add parameter to displaytime to specify that it is a pubdate,
     and in html5 mode, use time tag.
   * Add placeholder text in search form (in html5 mode only).
+  * In html5 mode, use all the nice new semantic tags. Care was taken
+    to not change the id/class named used in the CSS, so only CSS
+    that refers to tag types needed to be changed.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/style.css b/doc/style.css
index 7ffcf9fe2..69c7f80d8 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -60,15 +60,12 @@ div.inlinecontent {
 	clear: both;
 }
 
-.tags {
-}
-
 #pageinfo {
 	margin: 1em 0;
 	border-top: 1px solid #000;
 }
 
-div.tags {
+.tags {
 	margin-top: 1em;
 }
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 661d4a515..0176b0116 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 </TMPL_IF>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<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">
@@ -26,8 +26,8 @@
 </head>
 <body>
 
-<div class="pageheader">
-<div class="header">
+<TMPL_IF HTML5><article 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">
@@ -40,14 +40,14 @@
 &nbsp;(<TMPL_VAR NAME="PERCENTTRANSLATED">%)
 </TMPL_IF>
 </span>
-</span><!--.header-->
+</span>
 <TMPL_IF NAME="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 HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
 <TMPL_IF NAME="EDITURL">
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
@@ -72,11 +72,11 @@
 </TMPL_IF>
 </TMPL_IF>
 </ul>
-</div>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF NAME="OTHERLANGUAGES">
-<div id="otherlanguages">
+<TMPL_IF HTML5><nav class="otherlanguages"><TMPL_ELSE><div class="otherlanguages"></TMPL_IF>
 <ul>
 <TMPL_LOOP NAME="OTHERLANGUAGES">
 <li>
@@ -89,23 +89,22 @@
 </li>
 </TMPL_LOOP>
 </ul>
-</div> <!-- #otherlanguages -->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-</div> <!-- .pageheader -->
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF SIDEBAR>
-<div class="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><article id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
 <TMPL_VAR CONTENT>
-</div>
 
 <TMPL_IF COMMENTS>
-<div id="comments">
+<TMPL_IF HTML5><aside id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
 <TMPL_VAR COMMENTS>
 <TMPL_IF ADDCOMMENTURL>
 <div class="addcomment">
@@ -114,23 +113,25 @@
 <TMPL_ELSE>
 <div class="addcomment">Comments on this page are closed.</div>
 </TMPL_IF>
-</div>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<div id="footer" class="pagefooter">
-<div id="pageinfo">
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
+<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
 <TMPL_IF NAME="TAGS">
-<div class="tags">
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
 Tags:
 <TMPL_LOOP NAME="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 HTML5><nav id="backlinks"><TMPL_ELSE><div id="backlinks"></TMPL_IF>
 Links:
 <TMPL_LOOP NAME="BACKLINKS">
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
@@ -144,7 +145,7 @@ Links:
 </span>
 </span>
 </TMPL_IF>
-</div><!-- #backlinks -->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF COPYRIGHT>
@@ -166,10 +167,10 @@ 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>
 <!-- from <TMPL_VAR WIKINAME> -->
-</div><!-- .pagefooter #footer -->
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
 </body>
 </html>
-- 
cgit v1.2.3


From fa26c67b2a8842a57b551145d25c3719dcea2ccd Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Sun, 2 May 2010 19:19:33 +0000
Subject:

---
 doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
new file mode 100644
index 000000000..2bae57806
--- /dev/null
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -0,0 +1,12 @@
+Look at these two blogs:
+1) http://ciffer.net/~svend/blog/
+2) http://upsilon.cc/~zack/blog/
+
+Well, i set up successfully my blog /i am using inline function in a wiki page) but i have manually to insert blog pos titles and the result is that of blog #2.
+Instead i would like to have blog post titles automatically inserted like blog #1 (and they are links too! I want them that way).
+I looked in git repo of the two blogs but i couldn't find the answer.
+Any help wuold be appreciated.
+
+Thanks
+
+Raf
-- 
cgit v1.2.3


From 40aba87965a3d59f59ef2c6a0c6751036cd4a351 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Sun, 2 May 2010 19:20:37 +0000
Subject:

---
 doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 2bae57806..f5da168a5 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -1,5 +1,7 @@
 Look at these two blogs:
+
 1) http://ciffer.net/~svend/blog/
+
 2) http://upsilon.cc/~zack/blog/
 
 Well, i set up successfully my blog /i am using inline function in a wiki page) but i have manually to insert blog pos titles and the result is that of blog #2.
-- 
cgit v1.2.3


From 9480dc44277ad9301f1e1eba5b09990b459e7b26 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Sun, 2 May 2010 19:26:06 +0000
Subject:

---
 doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index f5da168a5..4b5e21979 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -4,11 +4,11 @@ Look at these two blogs:
 
 2) http://upsilon.cc/~zack/blog/
 
-Well, i set up successfully my blog /i am using inline function in a wiki page) but i have manually to insert blog pos titles and the result is that of blog #2.
+Well, i set up successfully my blog (i am using inline function in a wiki page) but i have manually to insert blog pos titles and the result is that of blog #2.
 Instead i would like to have blog post titles automatically inserted like blog #1 (and they are links too! I want them that way).
 I looked in git repo of the two blogs but i couldn't find the answer.
-Any help wuold be appreciated.
+Any help would be really appreciated.
 
-Thanks
+Thanks!
 
 Raf
-- 
cgit v1.2.3


From 0aad1794ad27da6ab41001e335eba952c2e0ac88 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 15:41:12 -0400
Subject: improve semantic markup

Now the toplevel layout is:

<article>
<section><header><nav></section>
<aside>sidebar</aside>
<section>content</section>
<section>comments</section>
<footer>
</article>

And I managed to preserve all CSS ids and names in their prior structure,
so CSS should not need changed.
---
 templates/page.tmpl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 0176b0116..195ce7886 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -26,7 +26,9 @@
 </head>
 <body>
 
-<TMPL_IF HTML5><article class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF>
+<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">
@@ -92,7 +94,7 @@
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF SIDEBAR>
 <TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
@@ -100,11 +102,12 @@
 <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF HTML5><article id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
+<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
 <TMPL_VAR CONTENT>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF COMMENTS>
-<TMPL_IF HTML5><aside id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
+<TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
 <TMPL_VAR COMMENTS>
 <TMPL_IF ADDCOMMENTURL>
 <div class="addcomment">
@@ -113,11 +116,9 @@
 <TMPL_ELSE>
 <div class="addcomment">Comments on this page are closed.</div>
 </TMPL_IF>
-<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
-
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
@@ -172,5 +173,7 @@ Last edited <TMPL_VAR MTIME>
 <!-- from <TMPL_VAR WIKINAME> -->
 <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
+
 </body>
 </html>
-- 
cgit v1.2.3


From 154732dc4235b7b31191975da50d780a2765fa02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 16:12:08 -0400
Subject: adapt comment.tmpl to html5

Note that I put comment-header in a <header> despite it being
below the comment. Using a <footer> would be confusing given
the class name. Also, the content is semantically closer to
a header than a footer.
---
 IkiWiki/Plugin/comments.pm |  1 +
 IkiWiki/Plugin/inline.pm   |  1 +
 doc/style.css              |  2 +-
 templates/comment.tmpl     | 29 ++++++++++++++---------------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 02f1d9301..89560c88b 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -673,6 +673,7 @@ sub previewcomment ($$$) {
 	my $template = template("comment.tmpl");
 	$template->param(content => $preview);
 	$template->param(ctime => displaytime($time, undef, 1));
+	$template->param(html5 => $config{html5});
 
 	IkiWiki::run_hooks(pagetemplate => sub {
 		shift->(page => $location,
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2df59f414..933e30646 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -362,6 +362,7 @@ sub preprocess_inline (@) {
 				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
 				$template->param(first => 1) if $page eq $list[0];
 				$template->param(last => 1) if $page eq $list[$#list];
+				$template->param(html5 => $config{html5});
 	
 				if ($actions) {
 					my $file = $pagesources{$page};
diff --git a/doc/style.css b/doc/style.css
index 69c7f80d8..c857157b6 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -49,7 +49,7 @@
 	border-bottom: 1px solid #000;
 }
 
-div.inlinecontent {
+.inlinecontent {
 	margin-top: .4em;
 }
 
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index fb76ea004..39cba0ff9 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,20 +1,20 @@
-<div class="comment" id="<TMPL_VAR NAME=COMMENTID>">
+<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR NAME=COMMENTID>">
+<TMPL_ELSE><div class="comment" id="<TMPL_VAR NAME=COMMENTID>"></TMPL_IF>
 
-<div class="comment-subject">
+<TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
 <TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <TMPL_VAR TITLE>
 </TMPL_IF>
-</div>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<div class="inlinecontent">
+<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
 <TMPL_VAR CONTENT>
-</div>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div class="comment-header">
+<TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
 Comment by
-
 <TMPL_IF NAME="COMMENTUSER">
 <TMPL_IF NAME="COMMENTOPENID">
 <span class="author" title="OpenID">
@@ -29,10 +29,10 @@ Comment by
 </TMPL_IF>
 </span>
 </TMPL_IF>
-<TMPL_ELSE><!-- !COMMENTUSER -->
+<TMPL_ELSE>
 <TMPL_IF NAME=COMMENTIP>
 <span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
-<TMPL_ELSE><!-- !COMMENTIP -->
+<TMPL_ELSE>
 <span class="author" title="Unauthenticated, from unknown IP address">
 </TMPL_IF>
 <TMPL_IF NAME="AUTHORURL">
@@ -41,19 +41,18 @@ Comment by
 <TMPL_VAR NAME=AUTHOR>
 </TMPL_IF>
 </span>
-</TMPL_IF><!-- !COMMENTUSER -->
-
+</TMPL_IF>
 &mdash; <TMPL_VAR CTIME>
-</div>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
 <TMPL_IF NAME="REMOVEURL">
 <li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
 </TMPL_IF>
 </ul>
-</div><!--.actions-->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-</div><!--.comment-->
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
-- 
cgit v1.2.3


From 677d2af18aaafdfa1532e9eaff3c39107ec169f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 16:36:10 -0400
Subject: adapt inlinepage.tmpl to html5

Needed to force tags to display inline, since <nav> is a block element.
---
 doc/style.css             |  4 ++++
 templates/inlinepage.tmpl | 30 ++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index c857157b6..ea18ca0c3 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -69,6 +69,10 @@
 	margin-top: 1em;
 }
 
+.inlinepage .tags {
+        display: inline;
+}
+
 .mapparent {
 	text-decoration: none;
 }
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 3c0b93315..b32a7e497 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,7 +1,6 @@
-<div class="inlinepage">
-
-<div class="inlineheader">
+<TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF>
 
+<TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF>
 <TMPL_IF NAME="AUTHOR">
 <span class="author">
 <TMPL_IF NAME="AUTHORURL">
@@ -11,33 +10,32 @@
 </TMPL_IF>
 </span>
 </TMPL_IF>
-<span class="header">
+<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
 <TMPL_IF NAME="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 HTML5></span><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-</div><!--.inlineheader-->
-
-<div class="inlinecontent">
+<TMPL_IF HTML5><section id="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
 <TMPL_VAR CONTENT>
-</div><!--.inlinecontent-->
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div class="inlinefooter">
+<TMPL_IF HTML5><footer id="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF>
 
 <span class="pagedate">
 Posted <TMPL_VAR CTIME>
 </span>
 
 <TMPL_IF NAME="TAGS">
-<span class="tags">
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
 Tags:
 <TMPL_LOOP NAME="TAGS">
 <TMPL_VAR LINK>
 </TMPL_LOOP>
-</span>
+<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF COPYRIGHT>
@@ -53,7 +51,7 @@ License: <TMPL_VAR LICENSE>
 </TMPL_IF>
 
 <TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
 <TMPL_IF NAME="EDITURL">
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
@@ -66,9 +64,9 @@ License: <TMPL_VAR LICENSE>
 </TMPL_IF>
 </TMPL_IF>
 </ul>
-</div><!--.actions-->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-</div><!--.inlinefooter-->
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
-</div><!--.inlinepage-->
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
-- 
cgit v1.2.3


From 36688de7c66bf0a1c252c04b6ee79da04232a742 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 16:45:13 -0400
Subject: adapt misc.tmpl to html5

---
 templates/misc.tmpl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index 0b7fefa08..5654cab61 100644
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -10,7 +10,7 @@
 <TMPL_ELSE>
 <base href="<TMPL_VAR BASEURL>" />
 </TMPL_IF>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
 <title><TMPL_VAR TITLE></title>
 <TMPL_IF NAME="FAVICON">
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
@@ -20,24 +20,24 @@
 </head>
 <body>
 
-<div class="pageheader">
-<div class="header">
+<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>
 <TMPL_VAR INDEXLINK>/
 <span class="title">
 <TMPL_VAR TITLE>
 </span>
 </span>
-</div>
-</div> <!-- .pageheader -->
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div id="content">
+<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
 <TMPL_VAR PAGEBODY>
-</div>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div id="footer" class="pagefooter">
+<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <!-- from <TMPL_VAR WIKINAME> -->
-</div><!-- .pagefooter #footer -->
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
 </body>
 </html>
-- 
cgit v1.2.3


From 28dcb52a6c5b60302db285a13bf84e5e90c39cbc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 16:54:31 -0400
Subject: force article and header to display as blocks

iceweasel 3.5.9 does not know to display these as blocks, resulting
in bad displays of blogs
---
 doc/bugs/html5_support.mdwn | 11 +++++------
 doc/style.css               |  7 +++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index ef0ec1e70..0b15e64f6 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -29,14 +29,11 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > It would probably not be too dreadful to put them in ifdefs. I've made a
 > small start at doing that.
 > 
-> Some of your changes are obvious, like using the new `time` and
-> and `article` elements. Looks like I can't merge it as-is though
-> due to other changes.
->
+> I've made ikiwiki use the time element and all the new semantic elements
+> in html5 mode.
+> 
 > Other ideas:
 >  
-> * Use aside for the sidebar? Or for the [[templates/note]] template?
-> * Use nav for the actionbar
 > * Use details tag instead of the javascript in the toggle plugin. 
 >   (Need to wait on browser support probably.)
 > 
@@ -89,6 +86,8 @@ This element is poorly supported by browsers. As a workaround, `style.css` needs
 
 Internet Explorer will display it as a block, though you can't seem to be able to further control the style.
 
+> done  (needed for header too) --[[Joey]] 
+
 ## Time element
 
 The [time element](http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#the-time-element) ideally needs the datatime= attribute set by a template variable with what [HTML5 defines as a valid datetime string](http://www.whatwg.org/specs/web-apps/current-work/multipage/infrastructure.html#valid-global-date-and-time-string).
diff --git a/doc/style.css b/doc/style.css
index ea18ca0c3..82de8fe6e 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -4,6 +4,13 @@
  * local.css and use it to override or change settings in this one.
  */
 
+article {
+	display: block;
+}
+header {
+	display: block;
+}
+
 .header {
 	margin: 0;
 	font-size: 22px;
-- 
cgit v1.2.3


From 43eef80b46e157ec32037d198f7341adef338c50 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 16:58:29 -0400
Subject: bugfix

---
 templates/inlinepage.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index b32a7e497..1e0a1674e 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -16,14 +16,14 @@
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
 </TMPL_IF>
-<TMPL_IF HTML5></span><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></header><TMPL_ELSE></span></TMPL_IF>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF HTML5><section id="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
+<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF HTML5><footer id="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF>
+<TMPL_IF HTML5><footer class="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF>
 
 <span class="pagedate">
 Posted <TMPL_VAR CTIME>
-- 
cgit v1.2.3


From d37ff8d29993ccea880e36eba620e1ecdf91b80f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 17:01:28 -0400
Subject: ff also needs footer and nav forced to block

---
 doc/style.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 82de8fe6e..f2f558497 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -4,10 +4,10 @@
  * local.css and use it to override or change settings in this one.
  */
 
-article {
-	display: block;
-}
-header {
+article,
+header,
+footer,
+nav {
 	display: block;
 }
 
-- 
cgit v1.2.3


From 34076e398cb7662e3bf0659d591faa4208679882 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 17:16:15 -0400
Subject: html5 bug closure, and documentation

---
 doc/bugs/html5_support.mdwn |  6 ++++++
 doc/features.mdwn           |  2 +-
 doc/roadmap.mdwn            |  2 +-
 doc/tips/html5.mdwn         | 25 +++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 doc/tips/html5.mdwn

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 0b15e64f6..3d1689301 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -106,3 +106,9 @@ As a workaround:
 ## tidy plugin
 
 Will reformat html5 to html4.
+
+----
+
+
+Ok, I consider this [[done]], at least as a first pass. Html5 mode
+is experimental, but complete enough. --[[Joey]] 
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 215c1cecd..1f8168703 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -72,7 +72,7 @@ you would care to syndicate.
 
 Ikiwiki aims to produce 
 [valid XHTML 1.0](http://validator.w3.org/check?url=referer).
-(Experimental HTML5 support is also available.)
+(Experimental [[tips/HTML5]] support is also available.)
 
 Ikiwiki generates html using [[templates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 4b5f01c45..e257c21a2 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -80,7 +80,7 @@ Probably incomplete list:
 * YADA format setup files per default?
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
-* html5 on by default (some day..)
+* [[tips/html5]] on by default (some day..)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn
new file mode 100644
index 000000000..9321aa401
--- /dev/null
+++ b/doc/tips/html5.mdwn
@@ -0,0 +1,25 @@
+First, if you just want to embed videos using the html5 `<video>` tag,
+you can do that without switching anything else to html5.
+However, if you want to fully enter the brave new world of html5, read on..
+
+Currently, ikiwiki does not use html5 by default. There is a `html5`
+setting that can be turned on, in your setup file. Rebuild with it set, and
+lots of fancy new semantic tags will be used all over the place.
+
+You may need to adapt your CSS for html5. While all the class and id names
+are the same, some of the `div` elements are changed to other things.
+Ikiwiki's default CSS will work in both modes.
+
+The html5 support is still experimental, and may break in some browsers.
+No care is taken to add backwards compatability hacks for browsers that
+are not html5 aware (like MSIE). If you want to include the javascript with
+those hacks, you can edit `page.tmpl` to do so. 
+[Dive Into HTML5](http://diveintohtml5.org/) is a good reference for
+current compatability issues and workarounds with html5.
+
+---
+
+Known ikiwiki-specific issues:
+
+* [[plugins/htmltidy]] uses `tidy`, which is not html5 aware, so if you
+  have that enabled, it will mangle it back to html4.
-- 
cgit v1.2.3


From 02a99875ff957f7acab6a1c6a14334a84f0ee9ea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 17:54:30 -0400
Subject: update

---
 doc/tips/html5.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn
index 9321aa401..945efc4bc 100644
--- a/doc/tips/html5.mdwn
+++ b/doc/tips/html5.mdwn
@@ -23,3 +23,4 @@ Known ikiwiki-specific issues:
 
 * [[plugins/htmltidy]] uses `tidy`, which is not html5 aware, so if you
   have that enabled, it will mangle it back to html4.
+* [[plugins/toc]] does not understand the html5 outline algorithm.
-- 
cgit v1.2.3


From bb70c15c598d1d35711369aa85cb39074beb64aa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 18:55:21 -0400
Subject: on img and figure

---
 doc/bugs/html5_support.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 3d1689301..ba67d532b 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -36,6 +36,9 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 >  
 > * Use details tag instead of the javascript in the toggle plugin. 
 >   (Need to wait on browser support probably.)
+> * Use figure and figcaption for captions in img. However, I have not 
+>   managed to style it to look as good as the current table+caption
+>   approach.
 > 
 > --[[Joey]] 
 
-- 
cgit v1.2.3


From cfca3a70740619dcb2ff94137fe61f71dede2619 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 18:59:37 -0400
Subject: response

---
 doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 4b5e21979..4a505925e 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -12,3 +12,11 @@ Any help would be really appreciated.
 Thanks!
 
 Raf
+
+> Either name the blog post files with the full title you want them to 
+> have, or use [[ikiwiki/directive/meta]] title to set the title of a blog post.
+> 
+>	\[[!meta title="this is my blog post"]]
+> 
+> Either way, the title will automatically be displayed, clickable, at the top.
+> (zack has hacked his templates not to do that). --[[Joey]] 
-- 
cgit v1.2.3


From 78962ddfe6f4dcae29fa50fd4eb2a381c02bde87 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 22:03:28 -0400
Subject: add bug

---
 doc/bugs/deletion_warnings.mdwn | 86 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 doc/bugs/deletion_warnings.mdwn

diff --git a/doc/bugs/deletion_warnings.mdwn b/doc/bugs/deletion_warnings.mdwn
new file mode 100644
index 000000000..c8879379b
--- /dev/null
+++ b/doc/bugs/deletion_warnings.mdwn
@@ -0,0 +1,86 @@
+Seen while deleting a blog's calendar pages:
+
+--[[Joey]] 
+
+<pre>
+   427250f..ff6c054  master     -> origin/master
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+</pre>
+
-- 
cgit v1.2.3


From adf182669dbb82b821216faf643ac5084f252a19 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 22:43:55 -0400
Subject: add a missing space

---
 IkiWiki/Plugin/websetup.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index d444c0a3d..3de8f4bf3 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -102,7 +102,7 @@ sub showfields ($$$@) {
 	}
 
 	my $section=defined $plugin
-		? sprintf(gettext("%s plugin:"), $plugininfo{section}).$plugin
+		? sprintf(gettext("%s plugin:"), $plugininfo{section})." ".$plugin
 		: "main";
 	my %enabledfields;
 	my $shownfields=0;
-- 
cgit v1.2.3


From 8784c08f6f0f785d9306f1cbd61cf7eac03660b5 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Mon, 3 May 2010 07:25:54 +0000
Subject:

---
 doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 4a505925e..804a122f8 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -20,3 +20,10 @@ Raf
 > 
 > Either way, the title will automatically be displayed, clickable, at the top.
 > (zack has hacked his templates not to do that). --[[Joey]] 
+
+>> Thanks for your answer.<br/>
+>> I looked in the [templates](http://git.upsilon.cc/cgi-bin/gitweb.cgi?p=zack-homepage.git;a=tree;f=templates;h=824100e62a06cee41b582ba84fcb9cdd982fe4be;hb=HEAD) folder of zack but couldn't see any hack of that kind.<br/>
+>> Anyway, I didn't hack my template...<br/>
+>> I will follow your suggestion of using [[ikiwiki/directive/meta]] title to set titles.<br/>
+>> Thanks a lot.<br/><br/>
+>> Raf<br/>
-- 
cgit v1.2.3


From 7606d3832d74f34d53d9f5e2ce1d00d8f816418c Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Mon, 3 May 2010 07:27:05 +0000
Subject:

---
 doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 804a122f8..3e9291320 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -24,6 +24,6 @@ Raf
 >> Thanks for your answer.<br/>
 >> I looked in the [templates](http://git.upsilon.cc/cgi-bin/gitweb.cgi?p=zack-homepage.git;a=tree;f=templates;h=824100e62a06cee41b582ba84fcb9cdd982fe4be;hb=HEAD) folder of zack but couldn't see any hack of that kind.<br/>
 >> Anyway, I didn't hack my template...<br/>
->> I will follow your suggestion of using [[ikiwiki/directive/meta]] title to set titles.<br/>
+>> I will follow your suggestion of using \[[ikiwiki/directive/meta]] title to set titles.<br/>
 >> Thanks a lot.<br/><br/>
 >> Raf<br/>
-- 
cgit v1.2.3


From 0f9c5697f86c065cb8835282ef67d05a0bb884b5 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Mon, 3 May 2010 07:27:35 +0000
Subject:

---
 doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 3e9291320..6e939f868 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -25,5 +25,4 @@ Raf
 >> I looked in the [templates](http://git.upsilon.cc/cgi-bin/gitweb.cgi?p=zack-homepage.git;a=tree;f=templates;h=824100e62a06cee41b582ba84fcb9cdd982fe4be;hb=HEAD) folder of zack but couldn't see any hack of that kind.<br/>
 >> Anyway, I didn't hack my template...<br/>
 >> I will follow your suggestion of using \[[ikiwiki/directive/meta]] title to set titles.<br/>
->> Thanks a lot.<br/><br/>
->> Raf<br/>
+>> Thanks a lot. ---Raf
-- 
cgit v1.2.3


From 4733a1a9cd2182bf052ba8545e3a61242f8b94a9 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Mon, 3 May 2010 07:28:40 +0000
Subject:

---
 doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 6e939f868..68eb06c4c 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -25,4 +25,4 @@ Raf
 >> I looked in the [templates](http://git.upsilon.cc/cgi-bin/gitweb.cgi?p=zack-homepage.git;a=tree;f=templates;h=824100e62a06cee41b582ba84fcb9cdd982fe4be;hb=HEAD) folder of zack but couldn't see any hack of that kind.<br/>
 >> Anyway, I didn't hack my template...<br/>
 >> I will follow your suggestion of using \[[ikiwiki/directive/meta]] title to set titles.<br/>
->> Thanks a lot. ---Raf
+>> Thanks a lot. --Raf
-- 
cgit v1.2.3


From 2f22ee85e547dfe408fc0ec520aed6a6e137e136 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 3 May 2010 12:15:40 -0400
Subject: Add ACTIONS variable to page.tmpl, which allows plugins to add
 arbitrary links to the action bar without modifying the template further.

(COMMENTSLINK and DISCUSSIONLINK could be folded into this, but are kept
separate for now to avoid breaking modified templates.)
---
 IkiWiki/Plugin/skeleton.pm.example | 9 +++++++++
 IkiWiki/Render.pm                  | 9 ++++++++-
 debian/changelog                   | 4 ++++
 doc/plugins/write.mdwn             | 9 +++++++++
 templates/page.tmpl                | 9 +++++++--
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index ddf2996d6..a404e24af 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -24,6 +24,7 @@ sub import {
 	hook(type => "format", id => "skeleton", call => \&format);
 	hook(type => "pagetemplate", id => "skeleton", call => \&pagetemplate);
 	hook(type => "templatefile", id => "skeleton", call => \&templatefile);
+	hook(type => "pageactions", id => "skeleton", call => \&pageactions);
 	hook(type => "delete", id => "skeleton", call => \&delete);
 	hook(type => "change", id => "skeleton", call => \&change);
 	hook(type => "cgi", id => "skeleton", call => \&cgi);
@@ -146,6 +147,14 @@ sub templatefile (@) {
 	debug("skeleton plugin running as a templatefile hook");
 }
 
+sub pageactions (@) {
+	my %params=@_;
+	my $page=$params{page};
+
+	debug("skeleton plugin running as a pageactions hook");
+	return ();
+}
+
 sub delete (@) {
 	my @files=@_;
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index cf6943e7d..a824ba539 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -112,7 +112,14 @@ sub genpage ($$) {
 		}
 	}
 
-	if ($actions) {
+	my @actions;
+	run_hooks(pageactions => sub {
+		push @actions, map { { action => $_ } } 
+			grep { defined } shift->(page => $page);
+	});
+	$template->param(actions => \@actions);
+
+	if ($actions || @actions) {
 		$template->param(have_actions => 1);
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 789fda1ce..e03375bd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
   * In html5 mode, use all the nice new semantic tags. Care was taken
     to not change the id/class named used in the CSS, so only CSS
     that refers to tag types needed to be changed.
+  * Add ACTIONS variable to page.tmpl, which allows plugins to add arbitrary
+    links to the action bar without modifying the template further.
+    (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
+    are kept separate for now to avoid breaking modified templates.)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 5e7042c3b..3b1d770eb 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -319,6 +319,15 @@ should return the name of the template file to use (relative to the
 template directory), or undef if it doesn't want to change the default
 ("page.tmpl").
 
+### pageactions
+
+	hook(type => "pageactions", id => "foo", call => \&pageactions);
+
+This hook allows plugins to add arbitrary actions to the action bar on a
+page (next to Edit, RecentChanges, etc). The hook is passed a "page"
+parameter, and can return a list of html fragments to add to the action
+bar.
+
 ### sanitize
 
 	hook(type => "sanitize", id => "foo", call => \&sanitize);
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 195ce7886..8a9911fae 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -66,11 +66,16 @@
 <TMPL_IF NAME="PREFSURL">
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
+<TMPL_IF NAME="ACTIONS">
+<TMPL_LOOP NAME="ACTIONS">
+<li><TMPL_VAR ACTION></li>
+</TMPL_LOOP>
+</TMPL_IF>
 <TMPL_IF NAME="COMMENTSLINK">
-<li><TMPL_VAR COMMENTSLINK><br /></li>
+<li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>
 <TMPL_IF NAME="DISCUSSIONLINK">
-<li><TMPL_VAR DISCUSSIONLINK><br /></li>
+<li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </TMPL_IF>
 </ul>
-- 
cgit v1.2.3


From 0fc32c8b2fa1fc23c0c2c654ad64de7f85a271d1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 3 May 2010 13:46:52 -0400
Subject: allow do=setup to log a user in if necessary

---
 IkiWiki/Plugin/websetup.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 3de8f4bf3..cb6a7e412 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -265,6 +265,8 @@ sub showform ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
+	IkiWiki::needsignin($cgi, $session);
+
 	if (! defined $session->param("name") || 
 	    ! IkiWiki::is_admin($session->param("name"))) {
 		error(gettext("you are not logged in as an admin"));
-- 
cgit v1.2.3


From 9699f16b5186237ca98ebfc90a8644b672485245 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 3 May 2010 13:59:43 -0400
Subject: websetup: Only display Setup button on admins' preferences page.

Renamed it from "Wiki Setup" to just "Setup" for good measure.
---
 IkiWiki/Plugin/websetup.pm                          | 7 ++++---
 debian/changelog                                    | 1 +
 doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn | 2 +-
 doc/plugins/websetup.mdwn                           | 2 +-
 doc/setup.mdwn                                      | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index cb6a7e412..4d2e611eb 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -503,9 +503,10 @@ sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
-	if ($form->title eq "preferences") {
-		push @{$params{buttons}}, "Wiki Setup";
-		if ($form->submitted && $form->submitted eq "Wiki Setup") {
+	if ($form->title eq "preferences" &&
+	    IkiWiki::is_admin($params{session}->param("name"))) {
+		push @{$params{buttons}}, "Setup";
+		if ($form->submitted && $form->submitted eq "Setup") {
 			showform($params{cgi}, $params{session});
 			exit;
 		}
diff --git a/debian/changelog b/debian/changelog
index e03375bd3..9fb9607a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
     links to the action bar without modifying the template further.
     (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
     are kept separate for now to avoid breaking modified templates.)
+  * websetup: Only display Setup button on admins' preferences page. 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn
index 7599e71e5..17c60c423 100644
--- a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn
+++ b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn
@@ -62,7 +62,7 @@ index 0bf100a..77b467a 100644
 
 >>>> So you can see if the two usernames/openids match. If the end is "0",
 >>>> they don't match. If nothing is logged, you have not enabled the websetup plugin.
->>>> If the end if "1" you should see the "Wiki Setup" button, if not the
+>>>> If the end if "1" you should see the "Setup" button, if not the
 >>>> problem is not in determining if you're an admin, but elsewhere..
 >>>> --[[Joey]]
 
diff --git a/doc/plugins/websetup.mdwn b/doc/plugins/websetup.mdwn
index b4d23ba9c..a20a32489 100644
--- a/doc/plugins/websetup.mdwn
+++ b/doc/plugins/websetup.mdwn
@@ -2,7 +2,7 @@
 [[!tag type/web]]
 
 This plugin allows wiki admins to configure the wiki using a web interface,
-rather than editing the setup file directly. A "Wiki Setup" button is added
+rather than editing the setup file directly. A "Setup" button is added
 to the admins' preferences page.
 
 Warning: This plugin rewrites your setup file. Any comments or unusual
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 2d4da5536..3ea0022cc 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -89,7 +89,7 @@ These range from changing the wiki's name, to enabling [[plugins]],
 to banning users and locking pages.
 
 If you log in as the admin user you configured earlier, and go to
-your Preferences page, you can click on "Wiki Setup" to customize many
+your Preferences page, you can click on "Setup" to customize many
 wiki settings and plugins.
 
 Some settings cannot be configured on the web, for security reasons or
-- 
cgit v1.2.3


From 6c0d2aa45608da7382289a34ac08e38b444ebe5b Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Mon, 3 May 2010 23:28:27 +0000
Subject: PERL5LIB setting question

---
 .../PERL5LIB__44___wrappers_and_homedir_install.mdwn    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn

diff --git a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
new file mode 100644
index 000000000..9dc539538
--- /dev/null
+++ b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
@@ -0,0 +1,17 @@
+What is the way to tell wrappers that PERL5LIB should include ~/bin directories?
+
+Having this in the wiki.setup doesn't help anymore:
+
+        # environment variables
+        ENV => {
+          PATH => '/home/user/bin/bin:/usr/local/bin:/usr/bin:/bin:/usr/games:/home/user/ikiwiki/usr/bin/:/home/user/ikiwiki/usr/sbin/:/home/user/bin/bin/:~/bin/bin/',
+          PERL5LIB => '/home/user/bin/share/perl/5.10.0:/home/user/bin/lib/perl/5.10.0'
+        },
+
+Or at least I get CGI errors and running ikiwiki.cgi manually fails too:
+
+        Use of uninitialized value $tainted in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 233.
+        Argument "" isn't numeric in umask at /usr/share/perl5/IkiWiki.pm line 139.
+        Undefined subroutine &IkiWiki::cgierror called at /home/user/bin/bin/ikiwiki line 199.
+
+Server has an older ikiwiki installed but I'd like to use a newer version from git, and I don't have root access.
-- 
cgit v1.2.3


From d5928778a89762b73ed6f4ddaec690d14d774537 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 4 May 2010 02:26:56 +0200
Subject: whishlist about two-way conversion.

---
 doc/todo/two-way_convert_of_wikis.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/todo/two-way_convert_of_wikis.mdwn

diff --git a/doc/todo/two-way_convert_of_wikis.mdwn b/doc/todo/two-way_convert_of_wikis.mdwn
new file mode 100644
index 000000000..61f02a30b
--- /dev/null
+++ b/doc/todo/two-way_convert_of_wikis.mdwn
@@ -0,0 +1,15 @@
+
+[[!tag wishlist]]
+
+Ok, the vision is this: Some of you will know git-svn. I want something like
+git-svn,, but for wikis. I want to be able to do the following:
+
+1. Convert a moinmoin (or whatever) wiki to a local ikiwiki on my laptop.
+2. Edit my local copy (offline).
+3. Preview the changes with my local ikiwki installation + browser.
+4. Push the changes back to moinmoin (or whatever) wiki.
+
+I know, I know, ikiwiki wasn't designed for that, but it would be really cool,
+and useful and people ask for that kind of thing too.
+
+--[[David_Riebenbauer]]
-- 
cgit v1.2.3


From bde13387daffaf5f1eb06ead1c0277fe616932f2 Mon Sep 17 00:00:00 2001
From: "http://www.clowersnet.net/~krc/" <http://www.clowersnet.net/~krc/@web>
Date: Tue, 4 May 2010 05:12:14 +0000
Subject: comment on html5

---
 doc/news/version_3.20100501/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/news/version_3.20100501/discussion.mdwn

diff --git a/doc/news/version_3.20100501/discussion.mdwn b/doc/news/version_3.20100501/discussion.mdwn
new file mode 100644
index 000000000..fbf767afb
--- /dev/null
+++ b/doc/news/version_3.20100501/discussion.mdwn
@@ -0,0 +1 @@
+Thanks a lot for the HTML5 support! I'll have to try it some time soon.
-- 
cgit v1.2.3


From 89e0669692eaf597596f1da36e8c385330c594ff Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Tue, 4 May 2010 16:39:50 +0100
Subject: split two graphviz bugs from one page; undo one of them

---
 doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn    | 23 +----------
 ...Problems_with_graphviz.pm_plug-in_previews.mdwn | 46 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 21 deletions(-)
 create mode 100644 doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn

diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
index c9f698158..bc80125ad 100644
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
@@ -9,31 +9,12 @@ The graphviz.pm plug-in currently attempts to read PNG data in UTF-8 mode, which
 
 It also generates image URLs relative to the page being rendered, which means the URLs wont work when previewing a graph from the CGI script.
 
+(preview bug split to [[Problems_with_graphviz.pm_plug-in_previews]])
+
 >> Here is an updated patch againt ikiwiki-2.5:
 
 >>> [[Applied|done]], thanks. --[[Joey]]
 
-    --- IkiWiki/Plugin/graphviz.pm.orig	2007-07-27 11:35:05.000000000 +0200
-    +++ IkiWiki/Plugin/graphviz.pm	2007-07-27 11:36:02.000000000 +0200
-    @@ -69,7 +69,12 @@ sub render_graph (\%) {
-     		}
-     	}
-     
-    -	return "<img src=\"".urlto($dest, $params{page})."\" />\n";
-    +	if ($params{preview}) {
-    +		return "<img src=\"".urlto($dest, "")."\" />\n";
-    +	}
-    +	else {
-    +		return "<img src=\"".urlto($dest, $params{page})."\" />\n";
-    +	}
-     }
-     
-     sub graph (@) {
-
-
->> --[[HenrikBrixAndersen]]
-
-
 The patch below fixes these two issues.
 
     --- graphviz.pm.orig	Thu Jun  7 15:45:16 2007
diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
new file mode 100644
index 000000000..3b77a48bb
--- /dev/null
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
@@ -0,0 +1,46 @@
+(split from [[Problems_with_graphviz.pm_plug-in]])
+
+[graphviz] generates image URLs relative to the page being rendered, which means the URLs wont work when previewing a graph from the CGI script.
+
+>> Here is an updated patch againt ikiwiki-2.5:
+
+>>> Applied, thanks. --[[Joey]]
+
+    --- IkiWiki/Plugin/graphviz.pm.orig	2007-07-27 11:35:05.000000000 +0200
+    +++ IkiWiki/Plugin/graphviz.pm	2007-07-27 11:36:02.000000000 +0200
+    @@ -69,7 +69,12 @@ sub render_graph (\%) {
+     		}
+     	}
+     
+    -	return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+    +	if ($params{preview}) {
+    +		return "<img src=\"".urlto($dest, "")."\" />\n";
+    +	}
+    +	else {
+    +		return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+    +	}
+     }
+     
+     sub graph (@) {
+
+
+>> --[[HenrikBrixAndersen]]
+
+>>> Despite this patch I am still experiencing the problem. Normal page source for a graph contains:
+
+    &lt;div id="content"&gt;
+    &lt;p&gt;&lt;img src="./graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+    
+    &lt;/div&gt;
+
+>>> preview contains
+
+    &lt;div id="preview"&gt;
+    &lt;p&gt;&lt;img src="./demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+    
+    &lt;/div&gt;
+
+>>> I don't quite understand why, this makes sense from the CGI path (in my
+>>> case from the root of the site). The browsers appear to be trying to fetch
+>>> `/demo/diagrams/demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png`
+>>> (i.e., prepending the required relpath twice). -- [[Jon]]
-- 
cgit v1.2.3


From 48b5b7feccb76f44c4eb2b21dbb049940331ef28 Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:41:56 +0000
Subject:

---
 ...ressing_output_of_pages_included_only_for_their_side_effects.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn

diff --git a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
new file mode 100644
index 000000000..1a454d37d
--- /dev/null
+++ b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
@@ -0,0 +1,5 @@
+In particular, it's kind of annoying that using the sidebar plugin results in the creation of a free-standing sidebar.html (which in the simplest case of course includes a copy of *its own content* as a sidebar in the simplest case).  It would be nice if there were a way to tell Ikiwiki to treat a file like sidebar.mdwn as "inline only": allow its content to be inlined but not to render it separately nor allow linking to it.
+
+In reading through the code and associated docs, it appears that the ideal method is for the file to be removed from the $changed array by plugin's "needsbuild" hook.  Either the sidebar plugin could define such a hook, or perhaps a more general solution is the creation of a meta variable or config file regexp that would handle it according to the user's wishes.
+
+I'm about ready to code up such a change but want to find out if I'm thinking along the right lines.  --[[blipvert]]
-- 
cgit v1.2.3


From bd5c5f1f487e21d658dc85badc4e6ee492119cfe Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:42:21 +0000
Subject:

---
 ...uppressing_output_of_pages_included_only_for_their_side_effects.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
index 1a454d37d..20139b140 100644
--- a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
+++ b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
@@ -1,4 +1,4 @@
-In particular, it's kind of annoying that using the sidebar plugin results in the creation of a free-standing sidebar.html (which in the simplest case of course includes a copy of *its own content* as a sidebar in the simplest case).  It would be nice if there were a way to tell Ikiwiki to treat a file like sidebar.mdwn as "inline only": allow its content to be inlined but not to render it separately nor allow linking to it.
+In particular, it's kind of annoying that using the sidebar plugin results in the creation of a free-standing sidebar.html (which in the simplest case of course includes a copy of *its own content* as a sidebar).  It would be nice if there were a way to tell Ikiwiki to treat a file like sidebar.mdwn as "inline only": allow its content to be inlined but not to render it separately nor allow linking to it.
 
 In reading through the code and associated docs, it appears that the ideal method is for the file to be removed from the $changed array by plugin's "needsbuild" hook.  Either the sidebar plugin could define such a hook, or perhaps a more general solution is the creation of a meta variable or config file regexp that would handle it according to the user's wishes.
 
-- 
cgit v1.2.3


From 7060a818c108de5b5e2b1c2aa617f5e926bd5f86 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Tue, 4 May 2010 16:43:22 +0100
Subject: un-escape escaped chevrons

---
 doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
index 3b77a48bb..283a6ef08 100644
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
@@ -28,17 +28,17 @@
 
 >>> Despite this patch I am still experiencing the problem. Normal page source for a graph contains:
 
-    &lt;div id="content"&gt;
-    &lt;p&gt;&lt;img src="./graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+    <div id="content">
+    <p><img src="./graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /></p>
     
-    &lt;/div&gt;
+    </div>
 
 >>> preview contains
 
-    &lt;div id="preview"&gt;
-    &lt;p&gt;&lt;img src="./demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+    <div id="preview">
+    <p><img src="./demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /></p>
     
-    &lt;/div&gt;
+    </div>
 
 >>> I don't quite understand why, this makes sense from the CGI path (in my
 >>> case from the root of the site). The browsers appear to be trying to fetch
-- 
cgit v1.2.3


From 821a8aba2f582e617d34e649509533c240f51a1c Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:43:23 +0000
Subject:

---
 doc/users/blipvert.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/blipvert.mdwn

diff --git a/doc/users/blipvert.mdwn b/doc/users/blipvert.mdwn
new file mode 100644
index 000000000..18249f335
--- /dev/null
+++ b/doc/users/blipvert.mdwn
@@ -0,0 +1 @@
+Hello world.
-- 
cgit v1.2.3


From a43bc68eb33de5264f6103d92a2243214259063b Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:46:40 +0000
Subject:

---
 doc/users/blipvert.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/blipvert.mdwn b/doc/users/blipvert.mdwn
index 18249f335..a0fb08da8 100644
--- a/doc/users/blipvert.mdwn
+++ b/doc/users/blipvert.mdwn
@@ -1 +1 @@
-Hello world.
+<img src="http://github.com/blipvert" />
-- 
cgit v1.2.3


From 28db9e38f78157edaefdc776913c8d85bc08ea6a Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:47:42 +0000
Subject:

---
 doc/users/blipvert.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/blipvert.mdwn b/doc/users/blipvert.mdwn
index a0fb08da8..7c4a24ba1 100644
--- a/doc/users/blipvert.mdwn
+++ b/doc/users/blipvert.mdwn
@@ -1 +1 @@
-<img src="http://github.com/blipvert" />
+<http://github.com/blipvert>
-- 
cgit v1.2.3


From 35bd43aea3e6694cb474fc2e784113194c6865ba Mon Sep 17 00:00:00 2001
From: "http://zwol.livejournal.com/" <http://zwol.livejournal.com/@web>
Date: Tue, 4 May 2010 17:09:27 +0000
Subject:

---
 doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn

diff --git a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
new file mode 100644
index 000000000..bbf8c7cd7
--- /dev/null
+++ b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
@@ -0,0 +1,17 @@
+I'm getting this error message when I refresh my wiki:
+
+    $ hg commit -u me -m "Minor corrections"
+    refreshing wiki..
+    scanning htmletc/moco-conf-rooms.mdwn
+    building htmletc/moco-conf-rooms.mdwn
+    Use of uninitialized value in concatenation (.) or string at /usr/local/lib/perl5/site_perl/5.8.9/Text/Typography.pm line 542.
+    building sidebar.mdwn, which depends on htmletc/moco-conf-rooms
+    building contact.mdwn, which depends on sidebar
+    building 500.mdwn, which depends on sidebar
+    Use of uninitialized value in concatenation (.) or string at /usr/local/lib/perl5/site_perl/5.8.9/Text/Typography.pm line 542.
+    building ceramics.mdwn, which depends on sidebar
+    building glossary.mdwn, which depends on sidebar
+    syntax error in pagespec "internal(glossary/comment_*)"
+    warning: post-commit hook exited with status 2
+
+But there is no error if I use `ikiwiki --rebuild` to regenerate the whole thing.
-- 
cgit v1.2.3


From ac2cc8f87d3dc0eefb5069fe1c9c189cd13fb33f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 16:22:27 -0400
Subject: response

---
 doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
index bbf8c7cd7..316ea7e9b 100644
--- a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
+++ b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
@@ -15,3 +15,14 @@ I'm getting this error message when I refresh my wiki:
     warning: post-commit hook exited with status 2
 
 But there is no error if I use `ikiwiki --rebuild` to regenerate the whole thing.
+
+> You neglect to say what version of ikiwiki this is,
+> or give any information to reproduce the bug.
+> 
+> My guess: A version older than 3.20100403, which  included
+> [this bugfix](http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=799b93d258bad917262ac160df74136f05d4a451),
+> which could lead to incorrect "syntax error in pagespec"
+> that only happened some of the time.
+> 
+> (The Text::Typography warning seems probably unrelated.)
+> --[[Joey]] 
-- 
cgit v1.2.3


From 74e0c83a951ea9d1b5b0a068374086f71a04b593 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 16:36:22 -0400
Subject: response

---
 .../PERL5LIB__44___wrappers_and_homedir_install.mdwn     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
index 9dc539538..988f261a7 100644
--- a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
+++ b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
@@ -15,3 +15,19 @@ Or at least I get CGI errors and running ikiwiki.cgi manually fails too:
         Undefined subroutine &IkiWiki::cgierror called at /home/user/bin/bin/ikiwiki line 199.
 
 Server has an older ikiwiki installed but I'd like to use a newer version from git, and I don't have root access.
+
+> You can't set `PERL5LIB` in `ENV` in a setup file, because ikiwiki is already
+> running before it reads that, and so it has little effect. Your error
+> messages do look like a new bin/ikiwiki is using an old version of
+> `IkiWiki.pm`.
+> 
+> The thing to do is set `INSTALL_BASE` when you're installing ikiwiki from
+> source. Like so:
+
+        cd ikiwiki
+        perl Makefile.PL INSTALL_BASE=$HOME PREFIX=
+	make install
+
+> Then `$HOME/bin/ikiwiki` will have hardcoded into it to look
+> for ikiwiki's perl modules in `$HOME/lib/perl5/`
+> (This is documented in the README file by the way.) --[[Joey]] 
-- 
cgit v1.2.3


From 59ff5cf553ed82b47323c584815f6bbc7c10d2f4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 16:37:20 -0400
Subject: version IkIWiki use, to help prevent wacky mismatch errors

---
 ikiwiki.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ikiwiki.in b/ikiwiki.in
index acd37f802..ac43044df 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -7,7 +7,7 @@ package IkiWiki;
 use warnings;
 use strict;
 use lib '.'; # For use in nonstandard directory, munged by Makefile.
-use IkiWiki;
+use IkiWiki 3.00;
 
 sub usage () {
 	die gettext("usage: ikiwiki [options] source dest"), "\n",
-- 
cgit v1.2.3


From ddd7a766e27128f971fceba900d73982c686afbd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 16:46:18 -0400
Subject: response

---
 ..._output_of_pages_included_only_for_their_side_effects.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
index 20139b140..99784cdd2 100644
--- a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
+++ b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
@@ -3,3 +3,14 @@ In particular, it's kind of annoying that using the sidebar plugin results in th
 In reading through the code and associated docs, it appears that the ideal method is for the file to be removed from the $changed array by plugin's "needsbuild" hook.  Either the sidebar plugin could define such a hook, or perhaps a more general solution is the creation of a meta variable or config file regexp that would handle it according to the user's wishes.
 
 I'm about ready to code up such a change but want to find out if I'm thinking along the right lines.  --[[blipvert]]
+
+> Internal pages should be able to be used for this, as they are used for
+> comments. So you'd have
+> `sidebar._mdwn`. However, mwdn would need to be changed to register a
+> htmlize hook for the `_mdwn` extension for that to really work.
+> 
+> But, if there's no rendered sidebar page, how can users easily edit the page
+> in the web interface? In the specific case of the sidebar, It seems
+> better to have the page display something different when built standalone
+> than when built as the sidebar.
+> --[[Joey]]
-- 
cgit v1.2.3


From ab575a4b6985d38969069757bb374aa8f1013019 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 16:54:58 -0400
Subject: graphviz: Fix display of preexisting images in preview mode.

---
 IkiWiki/Plugin/graphviz.pm                               | 7 +------
 debian/changelog                                         | 1 +
 doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn | 8 ++++++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index bec122076..c91c92fec 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -79,12 +79,7 @@ sub render_graph (\%) {
 		}
 	}
 
-	if ($params{preview}) {
-		return "<img src=\"".urlto($dest, "")."\" />\n";
-	}
-	else {
-		return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
-	}
+	return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
 }
 
 sub graph (@) {
diff --git a/debian/changelog b/debian/changelog
index 9fb9607a3..31deaf9aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
     (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
     are kept separate for now to avoid breaking modified templates.)
   * websetup: Only display Setup button on admins' preferences page. 
+  * graphviz: Fix display of preexisting images in preview mode.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
index 283a6ef08..c77bbeeaf 100644
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
@@ -44,3 +44,11 @@
 >>> case from the root of the site). The browsers appear to be trying to fetch
 >>> `/demo/diagrams/demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png`
 >>> (i.e., prepending the required relpath twice). -- [[Jon]]
+
+>>>> Yeah, that patch may have been right once, but it's wrong now;
+>>>> preview mode uses `<base>` to make urls work the same as they would
+>>>> when viewing the html page. 
+>>>>
+>>>> Perhaps this was not noticed for a while while because it only
+>>>> shows up if previewing an *unchanged* graph on a page that has already
+>>>> been built before. Fixed now. [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 73ebf2a9f258e1f83b5ba3ceba36233c0d6df817 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Tue, 4 May 2010 20:56:38 +0000
Subject:

---
 doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
index 988f261a7..b6bf14af8 100644
--- a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
+++ b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
@@ -26,7 +26,7 @@ Server has an older ikiwiki installed but I'd like to use a newer version from g
 
         cd ikiwiki
         perl Makefile.PL INSTALL_BASE=$HOME PREFIX=
-	make install
+        make install
 
 > Then `$HOME/bin/ikiwiki` will have hardcoded into it to look
 > for ikiwiki's perl modules in `$HOME/lib/perl5/`
-- 
cgit v1.2.3


From 93f8000d584312049fac6b52d8eac4206aa1bedc Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Tue, 4 May 2010 21:17:54 +0000
Subject: solved

---
 doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
index b6bf14af8..fba941efc 100644
--- a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
+++ b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
@@ -31,3 +31,8 @@ Server has an older ikiwiki installed but I'd like to use a newer version from g
 > Then `$HOME/bin/ikiwiki` will have hardcoded into it to look
 > for ikiwiki's perl modules in `$HOME/lib/perl5/`
 > (This is documented in the README file by the way.) --[[Joey]] 
+
+>> Ok, *perl Makefile.PL INSTALL_BASE=$HOME/bin PREFIX=* finally did it for me. I tried too many things with
+>> these paths so I wasn't sure which actually worked. After that I did 
+>> *$ ikiwiki --setup www.setup --wrappers --rebuild*. Somehow in this update mess I seem to have lost the user
+>> accounts, maybe the --rebuild was too much.
-- 
cgit v1.2.3


From 76a5dbe7cbc4e1f016752e4aa1445052c0b4a3ef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 18:41:55 -0400
Subject: note that tcc workaround is for bug fixed in tcc now

---
 IkiWiki/Wrapper.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 3f3e63ca6..73f0896e8 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -123,6 +123,7 @@ $envsave
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 
 #ifdef __TINYC__
+	/* old tcc versions do not support modifying environ directly */
 	if (clearenv() != 0) {
 		perror("clearenv");
 		exit(1);
-- 
cgit v1.2.3


From d0a5945000164327bfa649f5213b897b31839aee Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 20:26:17 -0400
Subject: Fixes a bug in skipping of illegal source files introduced in 
 3.20100427.

---
 IkiWiki/Render.pm | 1 +
 debian/changelog  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index a824ba539..e5ba0079b 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -321,6 +321,7 @@ sub find_src_files () {
 		my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 		if (! defined $f) {
 			warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+			return;
 		}
 	
 		if ($underlay) {
diff --git a/debian/changelog b/debian/changelog
index 31deaf9aa..049a3a898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
     are kept separate for now to avoid breaking modified templates.)
   * websetup: Only display Setup button on admins' preferences page. 
   * graphviz: Fix display of preexisting images in preview mode.
+  * Fixes a bug in skipping of illegal source files introduced in 
+    3.20100427.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
-- 
cgit v1.2.3


From 953c28a702202cb5a736765acb838ebfdd505c6a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 20:35:34 -0400
Subject: releasing version 3.20100504

---
 debian/changelog |  4 ++--
 ikiwiki.spec     |  2 +-
 po/ikiwiki.pot   | 66 ++++++++++++++++++++++++++++----------------------------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 049a3a898..43c907544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100502) UNRELEASED; urgency=low
+ikiwiki (3.20100504) unstable; urgency=low
 
   * Add parameter to displaytime to specify that it is a pubdate,
     and in html5 mode, use time tag.
@@ -15,7 +15,7 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
   * Fixes a bug in skipping of illegal source files introduced in 
     3.20100427.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 04 May 2010 20:26:20 -0400
 
 ikiwiki (3.20100501) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index b107f28eb..76398e9fb 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100501
+Version: 3.20100504
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 5e2f05b27..069af0995 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 21:16-0400\n"
+"POT-Creation-Date: 2010-05-04 20:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1298
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr ""
 
@@ -242,7 +242,7 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
@@ -254,7 +254,7 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:760
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -264,7 +264,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:770
 msgid "Comment"
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr ""
 msgid "failed to run graphviz"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -448,7 +448,7 @@ msgstr ""
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:626
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:772
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:780
 #, perl-format
 msgid "building %s"
 msgstr ""
@@ -865,12 +865,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:188
+#: ../IkiWiki/Plugin/search.pm:189
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:225
+#: ../IkiWiki/Plugin/search.pm:226
 msgid "search"
 msgstr ""
 
@@ -985,26 +985,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1019,59 +1019,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:163
+#: ../IkiWiki/Render.pm:170
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:292
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:316
+#: ../IkiWiki/Render.pm:323
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:331
+#: ../IkiWiki/Render.pm:339
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:373
+#: ../IkiWiki/Render.pm:381
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:435
+#: ../IkiWiki/Render.pm:443
 #, perl-format
 msgid "removing obsolete %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:508
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:517
+#: ../IkiWiki/Render.pm:525
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:600 ../IkiWiki/Render.pm:682
+#: ../IkiWiki/Render.pm:608 ../IkiWiki/Render.pm:690
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:695
+#: ../IkiWiki/Render.pm:703
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:824
+#: ../IkiWiki/Render.pm:832
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1125,13 +1125,13 @@ msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -1181,26 +1181,26 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1280
+#: ../IkiWiki.pm:1298
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:1962
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2021
+#: ../IkiWiki.pm:2039
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2042
+#: ../IkiWiki.pm:2060
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2178
+#: ../IkiWiki.pm:2196
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
-- 
cgit v1.2.3


From 3ebd04a33b498d9ae4a1d8535b022704a687dfff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 20:37:11 -0400
Subject: add news item for ikiwiki 3.20100504

---
 doc/news/version_3.20100312.mdwn | 16 ----------------
 doc/news/version_3.20100403.mdwn | 30 ------------------------------
 doc/news/version_3.20100504.mdwn | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 46 deletions(-)
 delete mode 100644 doc/news/version_3.20100312.mdwn
 delete mode 100644 doc/news/version_3.20100403.mdwn
 create mode 100644 doc/news/version_3.20100504.mdwn

diff --git a/doc/news/version_3.20100312.mdwn b/doc/news/version_3.20100312.mdwn
deleted file mode 100644
index 10c34425d..000000000
--- a/doc/news/version_3.20100312.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-ikiwiki 3.20100312 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Fix utf8 issues in calls to md5\_hex.
-   * moderatedcomments: Added moderate\_pagespec that can be used
-     to control which users or comment locations are moderated.
-     This can be used, just for example, to moderate "user(http://myopenid.com/*)"
-     if you're getting a lot of spammers from one particular openid
-     provider (who should perhaps answer your emails about them),
-     while not moderating other users.
-   * moderatedcomments: The moderate\_users setting is deprecated. Instead,
-     set moderate\_pagespec to "!admin()" or "user(*)".
-   * Fix missing span on recentchanges page template.
-   * search: Avoid '$' in the wikiname appearing unescaped on omega's
-     query template, where it might crash omega.
-   * htmlscrubber: Security fix: In data:image/* uris, only allow a few
-     whitelisted image types. No svg."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100403.mdwn b/doc/news/version_3.20100403.mdwn
deleted file mode 100644
index 3e9063028..000000000
--- a/doc/news/version_3.20100403.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-ikiwiki 3.20100403 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * websetup: Add websetup\_unsafe to allow marking other settings
-     as unsafe.
-   * Improve openid url munging; do not display anchors and cgi parameters,
-     as used by yahoo and google urls.
-   * Add complete German basewiki and directives translation done by
-     Sebastian Kuhnert.
-   * Add a include setting, which can be used to make ikiwiki process
-     wiki source files, such as .htaccess, that would normally be skipped
-     for security or other reasons. Closes: #[447267](http://bugs.debian.org/447267)
-     (Thanks to Aaron Wilson for the original patch.)
-   * Add support for setup files written in YAML.
-   * Add --set-yaml switch for setting more complex config file options.
-   * filecheck: Fix bugs that prevented the pagespecs from matching when
-     not called by attachment plugin.
-   * Fix incorrect influence info returned by a failing link() pagespec,
-     that could lead to bad dependency handling in certain situations.
-   * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
-     if necessary for unusual install.
-   * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
-   * Allow wrappers to be built using tcc. (Workaround #452876)
-   * openid: Use Openid Simple Registration or OpenID Attribute Exchange
-     to get the user's email address and username. (Neither is yet
-     used, but they are available in the session object now.)
-   * page.tmpl: Add Cache-Control must-revalidate to ensure that users
-     (especially of Firefox) see fresh page content.
-   * htmlscrubber: Allow colons in urls after '?'
-   * template: Search for templates in the templatedir, if they are not
-     found as pages in the wiki."""]]
diff --git a/doc/news/version_3.20100504.mdwn b/doc/news/version_3.20100504.mdwn
new file mode 100644
index 000000000..5ed6b6b4f
--- /dev/null
+++ b/doc/news/version_3.20100504.mdwn
@@ -0,0 +1,16 @@
+ikiwiki 3.20100504 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Add parameter to displaytime to specify that it is a pubdate,
+     and in html5 mode, use time tag.
+   * Add placeholder text in search form (in html5 mode only).
+   * In html5 mode, use all the nice new semantic tags. Care was taken
+     to not change the id/class named used in the CSS, so only CSS
+     that refers to tag types needed to be changed.
+   * Add ACTIONS variable to page.tmpl, which allows plugins to add arbitrary
+     links to the action bar without modifying the template further.
+     (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
+     are kept separate for now to avoid breaking modified templates.)
+   * websetup: Only display Setup button on admins' preferences page.
+   * graphviz: Fix display of preexisting images in preview mode.
+   * Fixes a bug in skipping of illegal source files introduced in
+     3.20100427."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 34afaf1015d58f1313a392e3f5f514d484dc7efa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 23:20:47 -0400
Subject: add test suite for find_src_files

---
 t/find_src_files.t | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100755 t/find_src_files.t

diff --git a/t/find_src_files.t b/t/find_src_files.t
new file mode 100755
index 000000000..4a995c2d3
--- /dev/null
+++ b/t/find_src_files.t
@@ -0,0 +1,97 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 19;
+
+BEGIN { use_ok("IkiWiki"); }
+BEGIN { use_ok("IkiWiki::Render"); }
+
+%config=IkiWiki::defaultconfig();
+$config{srcdir}="t/tmp/srcdir";
+$config{underlaydir}="t/tmp/underlaydir";
+IkiWiki::checkconfig();
+
+sub cleanup {
+	ok(! system("rm -rf t/tmp"));
+}
+
+sub setup_underlay {
+	foreach my $file (@_) {
+		writefile($file, $config{underlaydir}, "test content");
+	}
+	return @_;
+}
+
+sub setup_srcdir {
+	foreach my $file (@_) {
+		writefile($file, $config{srcdir}, "test content");
+	}
+	return @_;
+}
+
+sub test_src_files {
+	my %expected=map { $_ => 1 } @{shift()}; # the input list may have dups
+	my $desc=shift;
+
+	close STDERR; # find_src_files prints warnings about bad files
+
+	my ($files, $pages)=IkiWiki::find_src_files();
+	is_deeply([sort @$files], [sort keys %expected], $desc);
+}
+
+cleanup();
+
+my @list=setup_underlay(qw{index.mdwn sandbox.mdwn smiley.png ikiwiki.mdwn ikiwiki/directive.mdwn ikiwiki/directive/foo.mdwn});
+push @list, setup_srcdir(qw{index.mdwn foo.mwdn icon.jpeg blog/archive/1/2/3/foo.mdwn blog/archive/1/2/4/bar.mdwn blog/archive.mdwn});
+test_src_files(\@list, "simple test");
+
+setup_srcdir(".badfile");
+test_src_files(\@list, "srcdir dotfile is skipped");
+
+setup_underlay(".badfile");
+test_src_files(\@list, "underlay dotfile is skipped");
+
+setup_srcdir(".ikiwiki/index");
+test_src_files(\@list, "srcdir dotdir is skipped");
+
+setup_underlay(".ikiwiki/index");
+test_src_files(\@list, "underlay dotdir is skipped");
+
+setup_srcdir("foo>.mdwn");
+test_src_files(\@list, "illegal srcdir filename skipped");
+
+setup_underlay("foo>.mdwn");
+test_src_files(\@list, "illegal underlay filename skipped");
+
+system("mkdir -p $config{srcdir}/empty");
+test_src_files(\@list, "empty srcdir directory ignored");
+
+system("mkdir -p $config{underlaydir}/empty");
+test_src_files(\@list, "empty underlay directory ignored");
+
+setup_underlay("bad.mdwn");
+system("ln -sf /etc/passwd $config{srcdir}/bad.mdwn");
+test_src_files(\@list, "underlaydir override attack foiled");
+
+system("ln -sf /etc/passwd $config{srcdir}/symlink.mdwn");
+test_src_files(\@list, "file symlink in srcdir skipped");
+
+system("ln -sf /etc/passwd $config{underlaydir}/symlink.mdwn");
+test_src_files(\@list, "file symlink in underlaydir skipped");
+
+system("ln -sf /etc/ $config{srcdir}/symdir");
+test_src_files(\@list, "dir symlink in srcdir skipped");
+
+system("ln -sf /etc/ $config{underlaydir}/symdir");
+test_src_files(\@list, "dir symlink in underlaydir skipped");
+
+system("ln -sf /etc/ $config{srcdir}/blog/symdir");
+test_src_files(\@list, "deep dir symlink in srcdir skipped");
+
+system("ln -sf /etc/ $config{underlaydir}/ikiwiki/symdir");
+test_src_files(\@list, "deep dir symlink in underlaydir skipped");
+
+
+
+
+cleanup();
-- 
cgit v1.2.3


From 8aa5f2d23e3f6c88a22e19b41e7dac1df9d84a12 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:12:27 -0400
Subject: add ISPAGE variable to page.tmpl

Plugins will also be able to use this to tell if the template
is being used to generate a wiki page, when misctemplate starts
also using page.tmpl.
---
 IkiWiki/Render.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e5ba0079b..fc5d3953d 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -138,6 +138,7 @@ sub genpage ($$) {
 		title => $page eq 'index' 
 			? $config{wikiname} 
 			: pagetitle(basename($page)),
+		ispage => 1,
 		wikiname => $config{wikiname},
 		content => $content,
 		backlinks => $backlinks,
@@ -145,6 +146,7 @@ sub genpage ($$) {
 		mtime => displaytime($pagemtime{$page}),
 		ctime => displaytime($pagectime{$page}, undef, 1),
 		baseurl => baseurl($page),
+		have_footer => 1,
 		html5 => $config{html5},
 	);
 
-- 
cgit v1.2.3


From 2a2976f7ff281687b5e69a3963fc9c9fe03ef859 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:18:50 -0400
Subject: add the <base> setting as in misc.tmpl; only ever do it if not ispage

Also, add FOOTER, to allow disabling the footer.
---
 templates/misc.tmpl | 43 -------------------------------------------
 templates/page.tmpl | 11 +++++++++++
 2 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 templates/misc.tmpl

diff --git a/templates/misc.tmpl b/templates/misc.tmpl
deleted file mode 100644
index 5654cab61..000000000
--- a/templates/misc.tmpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<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>
-<TMPL_IF NAME="FORCEBASEURL">
-<base href="<TMPL_VAR FORCEBASEURL>" />
-<TMPL_ELSE>
-<base href="<TMPL_VAR BASEURL>" />
-</TMPL_IF>
-<TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
-<title><TMPL_VAR TITLE></title>
-<TMPL_IF NAME="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" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
-</head>
-<body>
-
-<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>
-<TMPL_VAR INDEXLINK>/
-<span class="title">
-<TMPL_VAR TITLE>
-</span>
-</span>
-<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
-<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-
-<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
-<TMPL_VAR PAGEBODY>
-<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-
-<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
-<!-- from <TMPL_VAR WIKINAME> -->
-<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
-
-</body>
-</html>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 8a9911fae..b6c751a3a 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -5,6 +5,15 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 </TMPL_IF>
 <head>
+<TMPL_UNLESS ISPAGE>
+<TMPL_IF NAME="FORCEBASEURL">
+<base href="<TMPL_VAR FORCEBASEURL>" />
+<TMPL_ELSE>
+<TMPL_IF BASEURL>
+<base href="<TMPL_VAR BASEURL>" />
+</TMPL_IF>
+</TMPL_IF>
+</TMPL_UNLESS>
 <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>
@@ -124,6 +133,7 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+<TMPL_IF HAVE_FOOTER>
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
@@ -177,6 +187,7 @@ Last edited <TMPL_VAR MTIME>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 <!-- from <TMPL_VAR WIKINAME> -->
 <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
 
 <TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
 
-- 
cgit v1.2.3


From 66cc23a591f25344072deb07b2ccc7a4d4c89047 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:22:47 -0400
Subject: no more misc.tmpl

* Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
  a single template, page.tmpl.
* misc.tmpl will, however, still be read if a locally modified version
  exists. This is to avoid forcing users to update page.tmpl right now.
---
 IkiWiki.pm         | 22 +++++++++++++++-------
 debian/changelog   |  9 +++++++++
 doc/roadmap.mdwn   |  3 +++
 doc/templates.mdwn |  2 --
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c428de77f..d20a3709c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1742,21 +1742,29 @@ sub template ($;@) {
 
 sub misctemplate ($$;@) {
 	my $title=shift;
-	my $pagebody=shift;
+	my $content=shift;
 	
-	my $template=template("misc.tmpl");
+	my $template=template("misc.tmpl") || template("page.tmpl");
+
+	run_hooks(pagetemplate => sub {
+		shift->(page => "", destpage => "", template => $template);
+	});
+
 	$template->param(
 		title => $title,
-		indexlink => indexlink(),
 		wikiname => $config{wikiname},
-		pagebody => $pagebody,
+		content => $content,
 		baseurl => baseurl(),
 		html5 => $config{html5},
+		have_actions => 0, # force off
+		searchform => 0,   # ditto
+		parentlinks => [{  # override
+			url => $config{url},
+			page => $config{wikiname},
+		}],
 		@_,
 	);
-	run_hooks(pagetemplate => sub {
-		shift->(page => "", destpage => "", template => $template);
-	});
+
 	return $template->output;
 }
 
diff --git a/debian/changelog b/debian/changelog
index 43c907544..0c3a99f0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ikiwiki (3.20100505) UNRELEASED; urgency=low
+
+  * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
+    a single template, page.tmpl.
+  * misc.tmpl will, however, still be read if a locally modified version
+    exists. This is to avoid forcing users to update page.tmpl right now.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
+
 ikiwiki (3.20100504) unstable; urgency=low
 
   * Add parameter to displaytime to specify that it is a pubdate,
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index e257c21a2..729d22fb8 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -81,6 +81,9 @@ Probably incomplete list:
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
 * [[tips/html5]] on by default (some day..)
+* stop reading misc.tmpl if it exists (only done in case users have a customized
+  version, or an outdated version of page.tmpl that cannot be used by
+  misctemplate)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 9208db0eb..2444cf14d 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -45,8 +45,6 @@ html out of ikiwiki and in the templates.
   key template to customize. [[!if test="enabled(pagetemplate)" then="""
   (The pagetemplate directive can be used to make a page use a
   different template than `page.tmpl`.)"""]]
-* `misc.tmpl` - Generic template used for any page that doesn't
-  have a custom template.
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
 * `atompage.tmpl` - Used for generating atom feeds for blogs.
-- 
cgit v1.2.3


From 58a07f9e5436ec815c0cb5736a9680096c977eed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:27:09 -0400
Subject: on second thought, remove FOOTER variable

We always want a footer, just not a pagefooter when doing misctemplate.
---
 templates/page.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/page.tmpl b/templates/page.tmpl
index b6c751a3a..f5257058c 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -133,8 +133,8 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF HAVE_FOOTER>
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
+<TMPL_IF ISPAGE>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
 <TMPL_IF NAME="TAGS">
@@ -184,10 +184,10 @@ Last edited <TMPL_VAR MTIME>
 </div>
 
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 <!-- from <TMPL_VAR WIKINAME> -->
 <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
 
 <TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
 
-- 
cgit v1.2.3


From 9257381e8d6e0ec18eac699e22aca63873859e32 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:32:48 -0400
Subject: fix test count

---
 t/find_src_files.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/find_src_files.t b/t/find_src_files.t
index 4a995c2d3..a3742db75 100755
--- a/t/find_src_files.t
+++ b/t/find_src_files.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 19;
+use Test::More tests => 20;
 
 BEGIN { use_ok("IkiWiki"); }
 BEGIN { use_ok("IkiWiki::Render"); }
-- 
cgit v1.2.3


From 5971a731e98b9b6543d78572c181ffc1bb7e1dd1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:42:18 -0400
Subject: allow search form visibility to be controlled on the template

hide extrafooter from misctemplate display per default
---
 IkiWiki.pm          | 1 -
 templates/page.tmpl | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d20a3709c..54271becc 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1757,7 +1757,6 @@ sub misctemplate ($$;@) {
 		baseurl => baseurl(),
 		html5 => $config{html5},
 		have_actions => 0, # force off
-		searchform => 0,   # ditto
 		parentlinks => [{  # override
 			url => $config{url},
 			page => $config{wikiname},
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f5257058c..eb76cafa6 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -52,9 +52,11 @@
 </TMPL_IF>
 </span>
 </span>
+<TMPL_IF ISPAGE>
 <TMPL_IF NAME="SEARCHFORM">
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
+</TMPL_IF>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF NAME="HAVE_ACTIONS">
@@ -184,8 +186,8 @@ Last edited <TMPL_VAR MTIME>
 </div>
 
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
+</TMPL_IF>
 <!-- from <TMPL_VAR WIKINAME> -->
 <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
-- 
cgit v1.2.3


From 83b907c35e3a03d097c004b0d66cc37f45a4410d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:43:49 -0400
Subject: remove misc.tmpl checking

Turns out that users with a modified page.tmpl need to modify it on
upgrade, at least to add the FORCEBASEURL (so edit preview works),
so there is no point in trying to retain compatability.
---
 IkiWiki.pm       | 2 +-
 debian/changelog | 4 ++--
 doc/roadmap.mdwn | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 54271becc..72f416489 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1744,7 +1744,7 @@ sub misctemplate ($$;@) {
 	my $title=shift;
 	my $content=shift;
 	
-	my $template=template("misc.tmpl") || template("page.tmpl");
+	my $template=template("page.tmpl");
 
 	run_hooks(pagetemplate => sub {
 		shift->(page => "", destpage => "", template => $template);
diff --git a/debian/changelog b/debian/changelog
index 0c3a99f0e..6b4ba7592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
 
   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
     a single template, page.tmpl.
-  * misc.tmpl will, however, still be read if a locally modified version
-    exists. This is to avoid forcing users to update page.tmpl right now.
+  * If you have a locally customised page.tmpl, it needs to be updated
+    to set <base> when BASEURL or FORCEBAREURL is set.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 729d22fb8..e257c21a2 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -81,9 +81,6 @@ Probably incomplete list:
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
 * [[tips/html5]] on by default (some day..)
-* stop reading misc.tmpl if it exists (only done in case users have a customized
-  version, or an outdated version of page.tmpl that cannot be used by
-  misctemplate)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From 66c787658e4e040e15a3c836514e5e80c453cc09 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:53:03 -0400
Subject: remove unused

---
 IkiWiki/Render.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fc5d3953d..7d66bf5ec 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -146,7 +146,6 @@ sub genpage ($$) {
 		mtime => displaytime($pagemtime{$page}),
 		ctime => displaytime($pagectime{$page}, undef, 1),
 		baseurl => baseurl($page),
-		have_footer => 1,
 		html5 => $config{html5},
 	);
 
-- 
cgit v1.2.3


From 11937595687df86aa93502d2e895f747a6262c4c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 20:42:56 -0400
Subject: remove unused indexlink function and template variable

---
 IkiWiki.pm                 | 4 ----
 IkiWiki/Plugin/editpage.pm | 1 -
 2 files changed, 5 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 72f416489..0da2c93c8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1401,10 +1401,6 @@ sub filter ($$$) {
 	return $content;
 }
 
-sub indexlink () {
-	return "<a href=\"$config{url}\">$config{wikiname}</a>";
-}
-
 sub check_canedit ($$$;$) {
 	my $page=shift;
 	my $q=shift;
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 7bb6eb07c..670eedfd9 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -148,7 +148,6 @@ sub cgi_editpage ($$) {
 	$form->field(name => "editcontent", type => "textarea", rows => 20,
 		cols => 80);
 	$form->tmpl_param("can_commit", $config{rcs});
-	$form->tmpl_param("indexlink", indexlink());
 	$form->tmpl_param("helponformattinglink",
 		htmllink($page, $page, "ikiwiki/formatting",
 			noimageinline => 1,
-- 
cgit v1.2.3


From f52f395437a946478da2a126015c05e3e0afdc1f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 21:08:41 -0400
Subject: consistently drop NAME= in templates

also add template syntax smoke test
---
 doc/ikiwiki/directive/template.mdwn |  8 ++---
 doc/templates.mdwn                  |  4 +--
 doc/templates/gitbranch.mdwn        |  2 +-
 doc/templates/note.mdwn             |  2 +-
 doc/templates/plugin.mdwn           |  2 +-
 doc/templates/popup.mdwn            |  2 +-
 templates/aggregatepost.tmpl        | 18 +++++------
 templates/archivepage.tmpl          |  6 ++--
 templates/atomitem.tmpl             | 24 +++++++-------
 templates/atompage.tmpl             | 10 +++---
 templates/blogpost.tmpl             |  8 ++---
 templates/change.tmpl               | 18 +++++------
 templates/comment.tmpl              | 30 ++++++++---------
 templates/commentmoderation.tmpl    |  4 +--
 templates/editcomment.tmpl          | 12 +++----
 templates/editpage.tmpl             | 12 +++----
 templates/feedlink.tmpl             |  8 ++---
 templates/googleform.tmpl           |  1 +
 templates/inlinepage.tmpl           | 18 +++++------
 templates/microblog.tmpl            |  4 +--
 templates/page.tmpl                 | 64 ++++++++++++++++++-------------------
 templates/pocreatepage.tmpl         |  4 +--
 templates/renamesummary.tmpl        |  4 +--
 templates/rssitem.tmpl              | 14 ++++----
 templates/titlepage.tmpl            |  2 +-
 25 files changed, 141 insertions(+), 140 deletions(-)

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index 052ca7873..6c50fa32e 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -53,21 +53,21 @@ few things:
 * To insert the raw value of a variable, with wiki markup not yet converted
   to html, use `<TMPL_VAR raw_variable>`.
 * To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+  `<TMPL_IF variable>text</TMPL_IF>`.
 * To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+  use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
 
 Here's a sample template:
 
         <span class="infobox">
         Name: \[[<TMPL_VAR raw_name>]]<br />
         Age: <TMPL_VAR age><br />
-        <TMPL_IF NAME="color">
+        <TMPL_IF color>
         Favorite color: <TMPL_VAR color><br />
         <TMPL_ELSE>
         No favorite color.<br />
         </TMPL_IF>
-        <TMPL_IF NAME="notes">
+        <TMPL_IF notes>
         <hr />
         <TMPL_VAR notes>
         </TMPL_IF>
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 2444cf14d..8f6561fcf 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -12,9 +12,9 @@ easy to learn. All you really need to know to modify templates is this:
 
 * To insert the value of a template variable, use `<TMPL_VAR variable>`.
 * To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+  `<TMPL_IF variable>text</TMPL_IF>`.
 * To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+  use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
 
 [[!if test="enabled(template)" then="""
 ## template pages
diff --git a/doc/templates/gitbranch.mdwn b/doc/templates/gitbranch.mdwn
index fcce925d9..962420940 100644
--- a/doc/templates/gitbranch.mdwn
+++ b/doc/templates/gitbranch.mdwn
@@ -3,7 +3,7 @@ Available in a [[!taglink /git]] repository.<br />
 Branch: <TMPL_VAR branch><br />
 Author: <TMPL_VAR author><br />
 </span>
-<TMPL_UNLESS NAME="branch">
+<TMPL_UNLESS branch>
 This template is used to create an infobox for a git branch. It uses
 these parameters:
 
diff --git a/doc/templates/note.mdwn b/doc/templates/note.mdwn
index 4cc323c0e..9ef5ad942 100644
--- a/doc/templates/note.mdwn
+++ b/doc/templates/note.mdwn
@@ -1,7 +1,7 @@
 <div class="notebox">
 <TMPL_VAR text>
 </div>
-<TMPL_UNLESS NAME="text">
+<TMPL_UNLESS text>
 Use this template to insert a note into a page. The note will be styled to
 float to the right of other text on the page. This template has one
 parameter:
diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn
index c1d1974d6..322c49445 100644
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@@ -8,7 +8,7 @@ Currently enabled: [[!if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<
 </span>
 [[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
 <TMPL_IF core>[[!tag plugins/type/core]]</TMPL_IF>
-<TMPL_UNLESS NAME="name">
+<TMPL_UNLESS name>
 This template is used to create an infobox for an ikiwiki plugin. It uses
 these parameters:
 <ul>
diff --git a/doc/templates/popup.mdwn b/doc/templates/popup.mdwn
index b355daa2e..92455eb21 100644
--- a/doc/templates/popup.mdwn
+++ b/doc/templates/popup.mdwn
@@ -1,4 +1,4 @@
-<TMPL_UNLESS NAME="mouseover">
+<TMPL_UNLESS mouseover>
 Use this template to create a popup window that is displayed when the mouse
 is over part of the page. This template has two parameters:
 <ul>
diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index 8b8936733..4e89efe32 100644
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -1,15 +1,15 @@
 <TMPL_VAR CONTENT>
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 [[!tag <TMPL_VAR TAG>]]
 </TMPL_LOOP>
-<TMPL_IF NAME="TITLE">
-[[!meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]]
+<TMPL_IF TITLE>
+[[!meta title="<TMPL_VAR TITLE ESCAPE=HTML>"]]
 </TMPL_IF>
-<TMPL_IF NAME="PERMALINK">
-[[!meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]]
+<TMPL_IF PERMALINK>
+[[!meta permalink="<TMPL_VAR PERMALINK ESCAPE=HTML>"]]
 </TMPL_IF>
-<TMPL_IF NAME="COPYRIGHT">
-[[!meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]]
+<TMPL_IF COPYRIGHT>
+[[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
 </TMPL_IF>
-[[!meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]]
-[[!meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]]
+[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
+[[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]]
diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 28800e763..93bdd9ce0 100644
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,14 +1,14 @@
 <p>
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
 </TMPL_IF>
 <i>
 Posted <TMPL_VAR CTIME>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 by <span class="author">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 87cbee9e0..4ed17bc62 100644
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,17 +1,17 @@
 <entry>
 	<title><TMPL_VAR TITLE></title>
-<TMPL_IF NAME="GUID">
+<TMPL_IF GUID>
 	<id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
 	<id><TMPL_VAR URL></id>
 </TMPL_IF>
 	<link href="<TMPL_VAR PERMALINK>"/>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 	<author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
 </TMPL_IF>
-<TMPL_IF NAME="COPYRIGHT">
+<TMPL_IF COPYRIGHT>
 	<rights type="html" xml:lang="en">
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 		<TMPL_VAR LICENSE ESCAPE=HTML>
 		<TMPL_VAR COPYRIGHT ESCAPE=HTML>
 <TMPL_ELSE>
@@ -19,30 +19,30 @@
 </TMPL_IF>
 	</rights>
 <TMPL_ELSE>
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 	<rights type="html" xml:lang="en">
 	<TMPL_VAR LICENSE ESCAPE=HTML>
 	</rights>
 </TMPL_IF>
 </TMPL_IF>
-<TMPL_IF NAME="CATEGORIES">
-<TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
 	<category term="<TMPL_VAR CATEGORY>" />
 </TMPL_LOOP>
 </TMPL_IF>
 	<updated><TMPL_VAR MDATE_3339></updated>
 	<published><TMPL_VAR CDATE_3339></published>
-<TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF ENCLOSURE>
 	<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
 <TMPL_ELSE>
 	<content type="html" xml:lang="en">
 	<TMPL_VAR CONTENT ESCAPE=HTML>
 	</content>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSURL">
-	<link rel="comments" href="<TMPL_VAR NAME="COMMENTSURL">" type="text/html" />
+<TMPL_IF COMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR COMMENTSURL>" type="text/html" />
 </TMPL_IF>
-<TMPL_IF NAME="ATOMCOMMENTSURL">
-	<link rel="comments" href="<TMPL_VAR NAME="ATOMCOMMENTSURL">" type="application/atom+xml" />
+<TMPL_IF ATOMCOMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR ATOMCOMMENTSURL>" type="application/atom+xml" />
 </TMPL_IF>
 </entry>
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index fc0088ae8..e82b59827 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -5,15 +5,15 @@
 <link href="<TMPL_VAR PAGEURL>"/>
 <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <author>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 <name><TMPL_VAR AUTHOR></name>
 <TMPL_ELSE>
 <name><TMPL_VAR WIKINAME></name>
 </TMPL_IF>
 </author>
-<TMPL_IF NAME="COPYRIGHT">
+<TMPL_IF COPYRIGHT>
 <rights type="html" xml:lang="en">
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 	<TMPL_VAR LICENSE>
 	<TMPL_VAR COPYRIGHT ESCAPE=HTML>
 <TMPL_ELSE>
@@ -21,13 +21,13 @@
 </TMPL_IF>
 </rights>
 <TMPL_ELSE>
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 <rights type="html">
 	<TMPL_VAR LICENSE ESCAPE=HTML>
 </rights>
 </TMPL_IF>
 </TMPL_IF>
-<TMPL_IF NAME="GUID">
+<TMPL_IF GUID>
 <id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
 <id><TMPL_VAR PAGEURL></id>
diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl
index 7eeede603..5a31e3f8a 100644
--- a/templates/blogpost.tmpl
+++ b/templates/blogpost.tmpl
@@ -1,10 +1,10 @@
 <form action="<TMPL_VAR CGIURL>" method="get">
 <div id="blogform">
-<TMPL_IF NAME="RSSURL">
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
+<TMPL_IF RSSURL>
+<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
 </TMPL_IF>
-<TMPL_IF NAME="ATOMURL">
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR NAME=ATOMURL>">Atom</a>
+<TMPL_IF ATOMURL>
+<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
 </TMPL_IF>
 <input type="hidden" name="do" value="blog" />
 <input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>" />
diff --git a/templates/change.tmpl b/templates/change.tmpl
index 5f277a0fb..671b9e483 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -2,15 +2,15 @@
 <TMPL_IF AUTHORURL>
 [[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>
-[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
+[[!meta title="""change to<TMPL_LOOP PAGES> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
 <TMPL_IF PERMALINK>
 [[!meta permalink="<TMPL_VAR PERMALINK>"]]
 </TMPL_IF>
 <div id="change-<TMPL_VAR REV>" class="metadata">
 <span class="desc"><br />Changed pages:</span>
 <span class="pagelinks">
-<TMPL_LOOP NAME="PAGES">
-<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
+<TMPL_LOOP PAGES>
+<TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
 <TMPL_ELSE>
 <TMPL_VAR LINK>
 </TMPL_IF>
@@ -18,7 +18,7 @@
 </span>
 <span class="desc"><br />Changed by:</span>
 <span class="committer">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
 <TMPL_ELSE>
 <TMPL_VAR USER>
@@ -30,16 +30,16 @@
 <span class="changedate"><TMPL_VAR COMMITDATE></span>
 </div>
 <div class="changelog">
-<TMPL_LOOP NAME="MESSAGE">
-<TMPL_IF NAME="LINE">
-<TMPL_VAR NAME="LINE"><br />
+<TMPL_LOOP MESSAGE>
+<TMPL_IF LINE>
+<TMPL_VAR LINE><br />
 </TMPL_IF>
 </TMPL_LOOP>
 </div>
-<TMPL_IF NAME="DIFF">
+<TMPL_IF DIFF>
 <div class="diff">
 <pre>
-<TMPL_VAR NAME="DIFF">
+<TMPL_VAR DIFF>
 </pre>
 </div>
 </TMPL_IF>
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 39cba0ff9..fa90e6d26 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,5 +1,5 @@
-<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR NAME=COMMENTID>">
-<TMPL_ELSE><div class="comment" id="<TMPL_VAR NAME=COMMENTID>"></TMPL_IF>
+<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>">
+<TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF>
 
 <TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
 <TMPL_IF PERMALINK>
@@ -15,40 +15,40 @@
 
 <TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
 Comment by
-<TMPL_IF NAME="COMMENTUSER">
-<TMPL_IF NAME="COMMENTOPENID">
+<TMPL_IF COMMENTUSER>
+<TMPL_IF COMMENTOPENID>
 <span class="author" title="OpenID">
-<a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>
 </span>
 <TMPL_ELSE>
 <span class="author" title="Signed in">
-<TMPL_IF NAME="COMMENTAUTHORURL">
-<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<TMPL_IF COMMENTAUTHORURL>
+<a href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=COMMENTAUTHOR>
+<TMPL_VAR COMMENTAUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
 <TMPL_ELSE>
-<TMPL_IF NAME=COMMENTIP>
-<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
+<TMPL_IF COMMENTIP>
+<span class="author" title="Unauthenticated, from <TMPL_VAR COMMENTIP>">
 <TMPL_ELSE>
 <span class="author" title="Unauthenticated, from unknown IP address">
 </TMPL_IF>
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
+<TMPL_VAR AUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
 &mdash; <TMPL_VAR CTIME>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
+<TMPL_IF HAVE_ACTIONS>
 <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="REMOVEURL">
+<TMPL_IF REMOVEURL>
 <li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
 </TMPL_IF>
 </ul>
diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl
index 297886407..10f2b36df 100644
--- a/templates/commentmoderation.tmpl
+++ b/templates/commentmoderation.tmpl
@@ -1,4 +1,4 @@
-<TMPL_IF NAME="COMMENTS">
+<TMPL_IF COMMENTS>
 <br />
 <form action="<TMPL_VAR CGIURL>" method="post">
 <input type="hidden" name="do" value="commentmoderation" />
@@ -7,7 +7,7 @@
 <input type="checkbox" name="rejectalldefer" value="1" />
 <label for="rejectalldefer">Reject all comments marked <em>Defer</em></label>
 <br />
-<TMPL_LOOP NAME="COMMENTS">
+<TMPL_LOOP COMMENTS>
 <div>
 <div>
 <TMPL_VAR VIEW>
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 32e8c392d..51ab10f2c 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -4,11 +4,11 @@
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
-<TMPL_UNLESS NAME=USERNAME>
-<TMPL_IF NAME=ALLOWAUTHOR>
-Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional, or
+<TMPL_UNLESS USERNAME>
+<TMPL_IF ALLOWAUTHOR>
+Name: <TMPL_VAR FIELD-AUTHOR> (optional, or
 <a href="<TMPL_VAR SIGNINURL>">signin</a>)<br />
-Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
+Website: <TMPL_VAR FIELD-URL> (optional)<br />
 <TMPL_ELSE>
 (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)<br />
 </TMPL_IF>
@@ -16,10 +16,10 @@ Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-EDITCONTENT><br />
 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
-<TMPL_VAR NAME="FORM-END">
+<TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF NAME="PAGE_PREVIEW">
+<TMPL_IF PAGE_PREVIEW>
 <hr />
 <div class="header">
 <span>Comment preview:</span>
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index b1cf015a2..6d8a902a2 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -7,7 +7,7 @@
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
-<TMPL_IF NAME="PAGE_SELECT">
+<TMPL_IF PAGE_SELECT>
 Page location: <TMPL_VAR FIELD-PAGE>
 Page type: <TMPL_VAR FIELD-TYPE>
 <TMPL_ELSE>
@@ -16,21 +16,21 @@ Page type: <TMPL_VAR FIELD-TYPE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <TMPL_VAR FIELD-EDITCONTENT><br />
-<TMPL_IF NAME="CAN_COMMIT">
+<TMPL_IF CAN_COMMIT>
 Optional comment about this change:<br />
 <TMPL_VAR FIELD-COMMENTS><br />
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
-<TMPL_IF NAME="FIELD-ATTACHMENT">
+<TMPL_IF FIELD-ATTACHMENT>
 <a class="toggle" href="#attachments">Attachments</a>
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <table>
 <tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
-<TMPL_LOOP NAME="ATTACHMENT_LIST">
+<TMPL_LOOP ATTACHMENT_LIST>
 <tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
 </TMPL_LOOP>
-<TMPL_IF NAME="ATTACHMENT_LIST">
+<TMPL_IF ATTACHMENT_LIST>
 <tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
 </TMPL_IF>
 </table>
@@ -39,7 +39,7 @@ Optional comment about this change:<br />
 <TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF NAME="PAGE_PREVIEW">
+<TMPL_IF PAGE_PREVIEW>
 <hr />
 <div class="header">
 <span>Page preview:</span>
diff --git a/templates/feedlink.tmpl b/templates/feedlink.tmpl
index 2963156c1..be8637f0f 100644
--- a/templates/feedlink.tmpl
+++ b/templates/feedlink.tmpl
@@ -1,8 +1,8 @@
 <div id="feedlink">
-<TMPL_IF NAME="RSSURL">
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
+<TMPL_IF RSSURL>
+<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
 </TMPL_IF>
-<TMPL_IF NAME="ATOMURL">
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR NAME=ATOMURL>">Atom</a>
+<TMPL_IF ATOMURL>
+<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
 </TMPL_IF>
 </div>
diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl
index f39b46540..9468e062a 100644
--- a/templates/googleform.tmpl
+++ b/templates/googleform.tmpl
@@ -1,3 +1,4 @@
+
 <form method="get" action="http://www.google.com/search" id="searchform">
  <div>
   <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" />
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 1e0a1674e..b0b53d041 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,9 +1,9 @@
 <TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF>
 
 <TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF>
-<TMPL_IF NAME="AUTHOR">
+<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>
@@ -11,7 +11,7 @@
 </span>
 </TMPL_IF>
 <TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
@@ -29,10 +29,10 @@
 Posted <TMPL_VAR CTIME>
 </span>
 
-<TMPL_IF NAME="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>
 <TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
@@ -50,16 +50,16 @@ License: <TMPL_VAR LICENSE>
 </div>
 </TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
+<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="COMMENTSLINK">
+<TMPL_IF COMMENTSLINK>
 <li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>
-<TMPL_IF NAME="DISCUSSIONLINK">
+<TMPL_IF DISCUSSIONLINK>
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </TMPL_IF>
diff --git a/templates/microblog.tmpl b/templates/microblog.tmpl
index 2e84441cc..e22d65cce 100644
--- a/templates/microblog.tmpl
+++ b/templates/microblog.tmpl
@@ -6,9 +6,9 @@
 
 <div class="microblog-header">
 
-<TMPL_IF NAME="AUTHOR">
+<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>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index eb76cafa6..9242ddfe3 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -6,7 +6,7 @@
 </TMPL_IF>
 <head>
 <TMPL_UNLESS ISPAGE>
-<TMPL_IF NAME="FORCEBASEURL">
+<TMPL_IF FORCEBASEURL>
 <base href="<TMPL_VAR FORCEBASEURL>" />
 <TMPL_ELSE>
 <TMPL_IF BASEURL>
@@ -17,21 +17,21 @@
 <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 NAME="LOCAL_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>
-<TMPL_IF NAME="EDITURL">
+<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>
 
@@ -41,51 +41,51 @@
 <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 NAME="ISTRANSLATION">
-&nbsp;(<TMPL_VAR NAME="PERCENTTRANSLATED">%)
+<TMPL_IF ISTRANSLATION>
+&nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)
 </TMPL_IF>
 </span>
 </span>
 <TMPL_IF ISPAGE>
-<TMPL_IF NAME="SEARCHFORM">
+<TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
 </TMPL_IF>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
+<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="RECENTCHANGESURL">
+<TMPL_IF RECENTCHANGESURL>
 <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</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="GETSOURCEURL">
+<TMPL_IF GETSOURCEURL>
 <li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="PREFSURL">
+<TMPL_IF PREFSURL>
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="ACTIONS">
-<TMPL_LOOP NAME="ACTIONS">
+<TMPL_IF ACTIONS>
+<TMPL_LOOP ACTIONS>
 <li><TMPL_VAR ACTION></li>
 </TMPL_LOOP>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSLINK">
+<TMPL_IF COMMENTSLINK>
 <li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>
-<TMPL_IF NAME="DISCUSSIONLINK">
+<TMPL_IF DISCUSSIONLINK>
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </TMPL_IF>
@@ -93,16 +93,16 @@
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF NAME="OTHERLANGUAGES">
+<TMPL_IF OTHERLANGUAGES>
 <TMPL_IF HTML5><nav class="otherlanguages"><TMPL_ELSE><div class="otherlanguages"></TMPL_IF>
 <ul>
-<TMPL_LOOP NAME="OTHERLANGUAGES">
+<TMPL_LOOP OTHERLANGUAGES>
 <li>
-<a href="<TMPL_VAR NAME="URL">"><TMPL_VAR NAME="LANGUAGE"></a>
-<TMPL_IF NAME="MASTER">
+<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+<TMPL_IF MASTER>
 (master)
 <TMPL_ELSE>
-&nbsp;(<TMPL_VAR NAME="PERCENT">%)
+&nbsp;(<TMPL_VAR PERCENT>%)
 </TMPL_IF>
 </li>
 </TMPL_LOOP>
@@ -139,25 +139,25 @@
 <TMPL_IF ISPAGE>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
-<TMPL_IF NAME="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>
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF NAME="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>
diff --git a/templates/pocreatepage.tmpl b/templates/pocreatepage.tmpl
index 96c8fdd78..f22ee5092 100644
--- a/templates/pocreatepage.tmpl
+++ b/templates/pocreatepage.tmpl
@@ -1,3 +1,3 @@
 <p>
-<b>WARNING</b> this page must be written in <TMPL_VAR NAME="LANG">.
-</p>
\ No newline at end of file
+<b>WARNING</b> this page must be written in <TMPL_VAR LANG>.
+</p>
diff --git a/templates/renamesummary.tmpl b/templates/renamesummary.tmpl
index 60f81b35b..7a8dc9229 100644
--- a/templates/renamesummary.tmpl
+++ b/templates/renamesummary.tmpl
@@ -11,14 +11,14 @@
 <TMPL_IF FIXEDLINKS>
 The following pages have been automatically modified to update their links to <TMPL_VAR DEST>:
 <ul>
-<TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
+<TMPL_LOOP FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
 </TMPL_IF>
 <TMPL_IF BROKENLINKS_CHECKED>
 <TMPL_IF BROKENLINKS>
 The following pages still link to <TMPL_VAR SRC>:
 <ul>
-<TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
+<TMPL_LOOP BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
 </TMPL_IF>
 </TMPL_IF>
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 069ae1997..a64a4ebd7 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,29 +1,29 @@
 <item>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 	<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
 	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
 <TMPL_ELSE>
 	<title><TMPL_VAR TITLE></title>
 </TMPL_IF>
-<TMPL_IF NAME="GUID">
+<TMPL_IF GUID>
 	<guid isPermaLink="no"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
 	<guid><TMPL_VAR URL></guid>
 </TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
-<TMPL_IF NAME="CATEGORIES">
-<TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
 	<category><TMPL_VAR CATEGORY></category>
 </TMPL_LOOP>
 </TMPL_IF>
 	<pubDate><TMPL_VAR CDATE_822></pubDate>
 	<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
-<TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF ENCLOSURE>
 	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
 <TMPL_ELSE>
 	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSURL">
-	<comments><TMPL_VAR NAME="COMMENTSURL"></comments>
+<TMPL_IF COMMENTSURL>
+	<comments><TMPL_VAR COMMENTSURL></comments>
 </TMPL_IF>
 </item>
diff --git a/templates/titlepage.tmpl b/templates/titlepage.tmpl
index 8a11e693e..6326bab72 100644
--- a/templates/titlepage.tmpl
+++ b/templates/titlepage.tmpl
@@ -1,5 +1,5 @@
 <p>
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
-- 
cgit v1.2.3


From fa2918f13f03a3d8dfd6f987a518695d7763fb01 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 21:51:03 -0400
Subject: add NEWS about template change

---
 debian/NEWS         | 13 +++++++++++++
 templates/page.tmpl |  8 ++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index c9b8f3d09..6074d6260 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,16 @@
+ikiwiki (3.20100505) UNRELEASED; urgency=low
+
+  There is a significant change to the page.tmpl template in this version.
+  If you have locally modified versions of that template, you will need
+  to update it to contain the following in the HTML <head>:
+
+    <TMPL_UNLESS ISPAGE>
+    <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+    <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
+    </TMPL_IF>
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 21:47:08 -0400
+
 ikiwiki (3.20100427) unstable; urgency=low
 
   This version of ikiwiki has a lot of changes that you need to know about.
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 9242ddfe3..4920d3cc8 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -6,12 +6,8 @@
 </TMPL_IF>
 <head>
 <TMPL_UNLESS ISPAGE>
-<TMPL_IF FORCEBASEURL>
-<base href="<TMPL_VAR FORCEBASEURL>" />
-<TMPL_ELSE>
-<TMPL_IF BASEURL>
-<base href="<TMPL_VAR BASEURL>" />
-</TMPL_IF>
+<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
 </TMPL_IF>
 </TMPL_UNLESS>
 <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
-- 
cgit v1.2.3


From 57405061f4176bfa3fdfa686101a726a439d67f9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 22:12:31 -0400
Subject: add test

---
 t/template_syntax.t | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 t/template_syntax.t

diff --git a/t/template_syntax.t b/t/template_syntax.t
new file mode 100755
index 000000000..1e156eed8
--- /dev/null
+++ b/t/template_syntax.t
@@ -0,0 +1,15 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More;
+
+my @templates=glob("templates/*.tmpl"), glob("doc/templates/*.mdwn");
+plan(tests => 2*@templates);
+
+use HTML::Template;
+
+foreach my $template (@templates) {
+	my $obj=eval {HTML::Template->new(filename => $template)};
+	ok(! $@, $template." $@");
+	ok($obj, $template);
+}
-- 
cgit v1.2.3


From ee9a4e06fcce53062b38814707a0b7d6946d4a36 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 22:36:50 -0400
Subject: rename ispage variable

---
 IkiWiki.pm          | 1 +
 IkiWiki/Render.pm   | 1 -
 debian/NEWS         | 2 +-
 templates/page.tmpl | 6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0da2c93c8..a79b66039 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1747,6 +1747,7 @@ sub misctemplate ($$;@) {
 	});
 
 	$template->param(
+		dynamic => 1,
 		title => $title,
 		wikiname => $config{wikiname},
 		content => $content,
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7d66bf5ec..e5ba0079b 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -138,7 +138,6 @@ sub genpage ($$) {
 		title => $page eq 'index' 
 			? $config{wikiname} 
 			: pagetitle(basename($page)),
-		ispage => 1,
 		wikiname => $config{wikiname},
 		content => $content,
 		backlinks => $backlinks,
diff --git a/debian/NEWS b/debian/NEWS
index 6074d6260..0f2c1f562 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,7 +4,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   If you have locally modified versions of that template, you will need
   to update it to contain the following in the HTML <head>:
 
-    <TMPL_UNLESS ISPAGE>
+    <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>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 4920d3cc8..41fffa263 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 </TMPL_IF>
 <head>
-<TMPL_UNLESS ISPAGE>
+<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>
@@ -48,7 +48,7 @@
 </TMPL_IF>
 </span>
 </span>
-<TMPL_IF ISPAGE>
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
@@ -132,7 +132,7 @@
 </TMPL_IF>
 
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
-<TMPL_IF ISPAGE>
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
 <TMPL_IF TAGS>
-- 
cgit v1.2.3


From cb2025af4501b4168440bb8583f95ca5836d72ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 22:41:23 -0400
Subject: refactor

---
 IkiWiki.pm                    |  6 +-----
 IkiWiki/Plugin/parentlinks.pm | 11 +++++++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a79b66039..ee1ecb58f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1748,16 +1748,12 @@ sub misctemplate ($$;@) {
 
 	$template->param(
 		dynamic => 1,
+		have_actions => 0, # force off
 		title => $title,
 		wikiname => $config{wikiname},
 		content => $content,
 		baseurl => baseurl(),
 		html5 => $config{html5},
-		have_actions => 0, # force off
-		parentlinks => [{  # override
-			url => $config{url},
-			page => $config{wikiname},
-		}],
 		@_,
 	);
 
diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index 728bbc399..432613ddf 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -23,6 +23,14 @@ sub getsetup () {
 sub parentlinks ($) {
 	my $page=shift;
 
+	if (! length $page) {
+		# dynamic page
+		return {
+			url => $config{url},
+			page => $config{wikiname},
+		};
+	}
+
 	my @ret;
 	my $path="";
 	my $title=$config{wikiname};
@@ -53,12 +61,11 @@ sub parentlinks ($) {
 
 sub pagetemplate (@) {
 	my %params=@_;
-        my $page=$params{page};
         my $template=$params{template};
 
 	if ($template->query(name => "parentlinks") ||
  	   $template->query(name => "has_parentlinks")) {
-		my @links=parentlinks($page);
+		my @links=parentlinks($params{page});
 		$template->param(parentlinks => \@links);
 		$template->param(has_parentlinks => (@links > 0));
 	}
-- 
cgit v1.2.3


From f8880cb670b0d1169559d04602fc543b1a6a061e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 22:44:08 -0400
Subject: bugfix

---
 templates/page.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 41fffa263..3bb7197f0 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -9,7 +9,7 @@
 <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
 <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
 </TMPL_IF>
-</TMPL_UNLESS>
+</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>
@@ -52,7 +52,7 @@
 <TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
-</TMPL_IF>
+</TMPL_UNLESS>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF HAVE_ACTIONS>
@@ -183,7 +183,7 @@ Last edited <TMPL_VAR MTIME>
 
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
-</TMPL_IF>
+</TMPL_UNLESS>
 <!-- from <TMPL_VAR WIKINAME> -->
 <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
-- 
cgit v1.2.3


From 81948abda76e2aba370533397e9e786ee9f71905 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 22:47:37 -0400
Subject: remove bogus test for empty page

---
 t/parentlinks.t | 1 -
 1 file changed, 1 deletion(-)

diff --git a/t/parentlinks.t b/t/parentlinks.t
index 593937a97..9b4654903 100755
--- a/t/parentlinks.t
+++ b/t/parentlinks.t
@@ -21,7 +21,6 @@ IkiWiki::checkconfig();
 # Test data
 $expected{'parentlinks'} =
   {
-   "" => [],
    "ikiwiki" => [],
    "ikiwiki/pagespec" =>
      [ {depth => 0, height => 2, },
-- 
cgit v1.2.3


From 511b9c85085768197f8f595c16747982125a4909 Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <http://ptecza.myopenid.com/@web>
Date: Thu, 6 May 2010 10:51:32 +0000
Subject: * Typo

---
 doc/news/version_3.20100427.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/version_3.20100427.mdwn b/doc/news/version_3.20100427.mdwn
index 1701fd670..61cf67141 100644
--- a/doc/news/version_3.20100427.mdwn
+++ b/doc/news/version_3.20100427.mdwn
@@ -8,7 +8,7 @@ Allowing untrusted users to upload attachments with the ".tmpl"
 extension is not recommended, as that allows anyone to change
 a wiki's templates.
 
-The --getctime switch is renamed to --gettimes, and it also gets the 
+The --getctime switch is renamed to --gettime, and it also gets the 
 file modification time. And it's a lot faster (when using git). But
 the really important change is, you don't have to remember to use this
 switch. Now ikiwiki will do it when it needs to.
-- 
cgit v1.2.3


From f69026667b523adaad8626fef549944f9d5b91e4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 13:55:32 -0400
Subject: typo

---
 debian/NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/NEWS b/debian/NEWS
index 0f2c1f562..4e0c7810b 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -23,7 +23,7 @@ ikiwiki (3.20100427) unstable; urgency=low
   extension is not recommended, as that allows anyone to change
   a wiki's templates.
 
-  The --getctime switch is renamed to --gettimes, and it also gets the 
+  The --getctime switch is renamed to --gettime, and it also gets the 
   file modification time. And it's a lot faster (when using git). But
   the really important change is, you don't have to remember to use this
   switch. Now ikiwiki will do it when it needs to.
-- 
cgit v1.2.3


From f0b83af9aadfb5c4755fe9079f1dc97112f49d95 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 17:18:08 -0400
Subject: add

---
 doc/bugs/comments_not_searchable.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/bugs/comments_not_searchable.mdwn

diff --git a/doc/bugs/comments_not_searchable.mdwn b/doc/bugs/comments_not_searchable.mdwn
new file mode 100644
index 000000000..72f7bf30f
--- /dev/null
+++ b/doc/bugs/comments_not_searchable.mdwn
@@ -0,0 +1,17 @@
+The text of comments (and other internal pages) does not get indexed by the
+search plugin.
+
+Search indexes content passed to the postscan hook.
+Comments are inlined, but inline's speed hack avoids adding inlined
+content to the page until the format hook.
+
+And hmm, that's somewhat desirable, because we don't want searches
+to find content that is inlined onto another page.
+
+That suggests that the fix could be to call the postscan hook
+for internal pages. 
+
+However, the search postscan hook tells xapian the page url,
+and uses `urlto($page)` to do it. And that won't work for
+an internal page. Guess it could be modified to tell xapian the
+permalink. --[[Joey]] 
-- 
cgit v1.2.3


From 3f925ac7351bcee9a8cbbcae881681e68087de50 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 17:28:47 -0400
Subject: new todo

---
 doc/todo/comment_moderation_feed.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/todo/comment_moderation_feed.mdwn

diff --git a/doc/todo/comment_moderation_feed.mdwn b/doc/todo/comment_moderation_feed.mdwn
new file mode 100644
index 000000000..267706b1b
--- /dev/null
+++ b/doc/todo/comment_moderation_feed.mdwn
@@ -0,0 +1,9 @@
+There should be a way to generate a feed that is updated whenever a new
+comment needs moderation. Otherwise, it can be hard to remember to check
+sites, which may rarely get comments.
+
+The feed should not include the comment subject or body, but could mention
+the author. It would be especially handy if it was generated statically.
+One way would be to generate internal pages corresponding to each comment
+that needs moderation; then the feed could be constructed via a usual
+inline.
-- 
cgit v1.2.3


From 7f64ff2ae0e2f2769cf0d0c0c9bc4b370a94b0b7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 17:32:19 -0400
Subject: url to myopenid affiliate program has changed

---
 doc/plugins/openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 91fc7cddc..cd05bb1ad 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -16,7 +16,7 @@ to the url of a third-party site where users can sign up for an OpenID. If
 it's set, the signin page will link to that site.
 
 This plugin supports the
-[myopenid.com affiliate program](http://myopenid.com/affiliate_welcome),
+[myopenid.com affiliate program](http://myopenid.com/affiliate),
 which can be used to help users sign up for an OpenID and log into your
 site in a single, unified process. When you create the affiliate, specify a
 login url like `http://example.com/ikiwiki.cgi?do=continue`. Once the
-- 
cgit v1.2.3


From 71b8d2ad4122b7cfe9eda52959e0b2c1f172439c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 19:04:56 -0400
Subject: move meat of type checking to match_page where it belongs

---
 IkiWiki.pm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ee1ecb58f..43995fc96 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2329,11 +2329,7 @@ sub match_glob ($$;@) {
 
 	my $regexp=IkiWiki::glob2re($glob);
 	if ($page=~/^$regexp$/i) {
-		if ($params{onlypage} &&
-		    ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
-			return IkiWiki::FailReason->new("$page is not a page");
-		}
-		elsif (! IkiWiki::isinternal($page) || $params{internal}) {
+		if (! IkiWiki::isinternal($page) || $params{internal}) {
 			return IkiWiki::SuccessReason->new("$glob matches $page");
 		}
 		else {
@@ -2350,7 +2346,14 @@ sub match_internal ($$;@) {
 }
 
 sub match_page ($$;@) {
-	return match_glob($_[0], $_[1], @_, onlypage => 1)
+	my $page=shift;
+	my $match=match_glob($page, $_[1], @_);
+	if ($match && ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
+		return IkiWiki::FailReason->new("$page is not a page");
+	}
+	else {
+		return $match;
+	}
 }
 
 sub match_link ($$;@) {
-- 
cgit v1.2.3


From d9d910f6765de6ba07508ab56a5a0f93edb4c8ad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 19:19:51 -0400
Subject: moved comments pending moderation

* comments: Comments pending moderation are now stored in the srcdir
  alongside accepted comments, but with a `._comment_pending` extension.
* This allows easier byhand moderation, as the "_pending" need
  only be stripped off and the comment be committed to version control.
* The `comment_pending()` pagespec can be used to match such unmoderated
  comments, which makes it easy to add a feed of them, or a counter
  indicating how many there are.
* Belatedly added a `comment()` pagespec.
---
 IkiWiki.pm                  |   4 +-
 IkiWiki/Plugin/comments.pm  | 130 +++++++++++++++++++++++++++++++-------------
 debian/NEWS                 |   6 ++
 debian/changelog            |   8 +++
 doc/ikiwiki/pagespec.mdwn   |   2 +
 doc/plugins/comments.mdwn   |   4 +-
 doc/tips/comments_feed.mdwn |   9 ++-
 ikiwiki.spec                |   2 +-
 8 files changed, 121 insertions(+), 44 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 43995fc96..11cfcdfd2 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2342,12 +2342,12 @@ sub match_glob ($$;@) {
 }
 
 sub match_internal ($$;@) {
-	return match_glob($_[0], $_[1], @_, internal => 1)
+	return match_glob(shift, shift, @_, internal => 1)
 }
 
 sub match_page ($$;@) {
 	my $page=shift;
-	my $match=match_glob($page, $_[1], @_);
+	my $match=match_glob($page, shift, @_);
 	if ($match && ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
 		return IkiWiki::FailReason->new("$page is not a page");
 	}
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 89560c88b..448ef02f7 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -26,8 +26,11 @@ sub import {
 	hook(type => "preprocess", id => '_comment', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
+	hook(type => "htmlize", id => "_comment_pending",
+		call => \&htmlize_pending);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
-	hook(type => "formbuilder_setup", id => "comments", call => \&formbuilder_setup);
+	hook(type => "formbuilder_setup", id => "comments",
+		call => \&formbuilder_setup);
 	# Load goto to fix up user page links for logged-in commenters
 	IkiWiki::loadplugin("goto");
 	IkiWiki::loadplugin("inline");
@@ -104,6 +107,14 @@ sub htmlize {
 	return $params{content};
 }
 
+sub htmlize_pending {
+	my %params = @_;
+	return sprintf(gettext("comment pending %s"),
+		'<a href="'.
+		IkiWiki::cgiurl(do => "commentmoderation").'">'.
+		gettext("moderation").'</a>');
+}
+
 # FIXME: copied verbatim from meta
 sub safeurl ($) {
 	my $url=shift;
@@ -462,9 +473,15 @@ sub editcomment ($$) {
 		$postcomment=0;
 
 		if (! $ok) {
-			my $penddir=$config{wikistatedir}."/comments_pending";
-			$location=unique_comment_location($page, $content, $penddir);
-			writefile("$location._comment", $penddir, $content);
+			$location=unique_comment_location($page, $content, $config{srcdir});
+			writefile("$location._comment_pending", $config{srcdir}, $content);
+
+			# Refresh so anything that deals with pending
+			# comments can be updated.
+			require IkiWiki::Render;
+			IkiWiki::refresh();
+			IkiWiki::saveindex();
+
 			IkiWiki::printheader($session);
 			print IkiWiki::misctemplate(gettext(gettext("comment stored for moderation")),
 				"<p>".
@@ -540,21 +557,24 @@ sub commentmoderation ($$) {
 		my %vars=$cgi->Vars;
 		my $added=0;
 		foreach my $id (keys %vars) {
-			if ($id =~ /(.*)\Q._comment\E$/) {
+			if ($id =~ /(.*)\Q._comment(?:_pending)?\E$/) {
 				my $action=$cgi->param($id);
 				next if $action eq 'Defer' && ! $rejectalldefer;
 
 				# Make sure that the id is of a legal
-				# pending comment before untainting.
-				my ($f)= $id =~ /$config{wiki_file_regexp}/;
+				# pending comment.
+				my ($f) = $id =~ /$config{wiki_file_regexp}/;
 				if (! defined $f || ! length $f ||
 				    IkiWiki::file_pruned($f)) {
 					error("illegal file");
 				}
 
-				my $page=IkiWiki::possibly_foolish_untaint(IkiWiki::dirname($1));
-				my $file="$config{wikistatedir}/comments_pending/".
-					IkiWiki::possibly_foolish_untaint($id);
+				my $page=IkiWiki::dirname($f);
+				my $file="$config{srcdir}/$f";
+				if (! -e $file) {
+					# old location
+					$file="$config{wikistatedir}/comments_pending/".$f;
+				}
 
 				if ($action eq 'Accept') {
 					my $content=eval { readfile($file) };
@@ -567,9 +587,6 @@ sub commentmoderation ($$) {
 					$added++;
 				}
 
-				# This removes empty subdirs, so the
-				# .ikiwiki/comments_pending dir will
-				# go away when all are moderated.
 				require IkiWiki::Render;
 				IkiWiki::prune($file);
 			}
@@ -596,15 +613,14 @@ sub commentmoderation ($$) {
 	}
 
 	my @comments=map {
-		my ($id, $ctime)=@{$_};
-		my $file="$config{wikistatedir}/comments_pending/$id";
-		my $content=readfile($file);
+		my ($id, $dir, $ctime)=@{$_};
+		my $content=readfile("$dir/$id");
 		my $preview=previewcomment($content, $id,
-			IkiWiki::dirname($_), $ctime);
+			$id, $ctime);
 		{
 			id => $id,
 			view => $preview,
-		} 
+		}
 	} sort { $b->[1] <=> $a->[1] } comments_pending();
 
 	my $template=template("commentmoderation.tmpl");
@@ -635,26 +651,35 @@ sub formbuilder_setup (@) {
 }
 
 sub comments_pending () {
-	my $dir="$config{wikistatedir}/comments_pending/";
-	return unless -d $dir;
-
 	my @ret;
+
 	eval q{use File::Find};
 	error($@) if $@;
-	find({
-		no_chdir => 1,
-		wanted => sub {
-			my $file=decode_utf8($_);
-			$file=~s/^\Q$dir\E\/?//;
-			return if ! length $file || IkiWiki::file_pruned($file)
-				|| -l $_ || -d _ || $file !~ /\Q._comment\E$/;
-			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-			if (defined $f) {
-				my $ctime=(stat($_))[10];
-				push @ret, [$f, $ctime];
+
+	my $find_comments=sub {
+		my $dir=shift;
+		my $extension=shift;
+		return unless -d $dir;
+		find({
+			no_chdir => 1,
+			wanted => sub {
+				my $file=decode_utf8($_);
+				$file=~s/^\Q$dir\E\/?//;
+				return if ! length $file || IkiWiki::file_pruned($file)
+					|| -l $_ || -d _ || $file !~ /\Q$extension\E$/;
+				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+				if (defined $f) {
+					my $ctime=(stat($_))[10];
+					push @ret, [$f, $dir, $ctime];
+				}
 			}
-		}
-	}, $dir);
+		}, $dir);
+	};
+	
+	$find_comments->($config{srcdir}, "._comment_pending");
+	# old location
+	$find_comments->("$config{wikistatedir}/comments_pending/",
+		"._comment");
 
 	return @ret;
 }
@@ -689,7 +714,7 @@ sub previewcomment ($$$) {
 sub commentsshown ($) {
 	my $page=shift;
 
-	return ! pagespec_match($page, "internal(*/$config{comments_pagename}*)",
+	return ! pagespec_match($page, "comment(*)",
 	                        location => $page) &&
 	       pagespec_match($page, $config{comments_pagespec},
 	                      location => $page);
@@ -719,7 +744,7 @@ sub pagetemplate (@) {
 		my $comments = undef;
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
-				pages => "internal($page/$config{comments_pagename}*)",
+				pages => "comment($page)",
 				template => 'comment',
 				show => 0,
 				reverse => 'yes',
@@ -847,7 +872,8 @@ sub unique_comment_location ($$$) {
 	do {
 		$i++;
 		$location = "$page/$config{comments_pagename}${i}_${content_md5}";
-	} while (-e "$dir/$location._comment");
+	} while (-e "$dir/$location._comment" ||
+	         -e "$dir/$location._comment_pending");
 
 	return $location;
 }
@@ -873,7 +899,35 @@ sub match_postcomment ($$;@) {
 	if (! $postcomment) {
 		return IkiWiki::FailReason->new("not posting a comment");
 	}
-	return match_glob($page, $glob);
+	return match_glob($page, $glob, @_);
+}
+
+sub match_comment ($$;@) {
+	my $page = shift;
+	my $glob = shift;
+
+	my $match=match_glob($page, "$glob/*", @_);
+	if ($match) {
+		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+		if ($type ne "_comment") {
+			return IkiWiki::FailReason->new("$page is not a comment");
+		}
+	}
+	return $match;
+}
+
+sub match_comment_pending ($$;@) {
+	my $page = shift;
+	my $glob = shift;
+
+	my $match=match_glob($page, "$glob/*", @_);
+	if ($match) {
+		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+		if ($type ne "_comment_pending") {
+			return IkiWiki::FailReason->new("$page is not a pending comment");
+		}
+	}
+	return $match;
 }
 
 1
diff --git a/debian/NEWS b/debian/NEWS
index 4e0c7810b..b751f1478 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,5 +1,11 @@
 ikiwiki (3.20100505) UNRELEASED; urgency=low
 
+  There is a new "comment()" pagespec, that can be used to match a comment
+  on a page. It is recommended it be used instead of the old
+  method of using a pagespec such as "internal(comment_*)" to match
+  things that looked like comments. The old pagespec will now also match
+  comments that are held for moderation; likely not what you want.
+
   There is a significant change to the page.tmpl template in this version.
   If you have locally modified versions of that template, you will need
   to update it to contain the following in the HTML <head>:
diff --git a/debian/changelog b/debian/changelog
index 6b4ba7592..5b51a74f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     a single template, page.tmpl.
   * If you have a locally customised page.tmpl, it needs to be updated
     to set <base> when BASEURL or FORCEBAREURL is set.
+  * comments: Comments pending moderation are now stored in the srcdir
+    alongside accepted comments, but with a `._comment_pending` extension.
+  * This allows easier byhand moderation, as the "_pending" need
+    only be stripped off and the comment be committed to version control.
+  * The `comment_pending()` pagespec can be used to match such unmoderated
+    comments, which makes it easy to add a feed of them, or a counter
+    indicating how many there are.
+  * Belatedly added a `comment()` pagespec.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 1c99aefac..c66395f84 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -51,6 +51,8 @@ Some more elaborate limits can be added to what matches using these functions:
   wiki admins.
 * "`ip(address)`" - tests whether a modification is being made from the
   specified IP address.
+* "`comment(glob)`" - matches comments to a page matching the glob.
+* "`comment_pending(glob)`" - matches unmoderated, pending comments.
 * "`postcomment(glob)`" - matches only when comments are being 
   posted to a page matching the specified glob
 
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index 775ef75a0..14bd28a04 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -49,5 +49,5 @@ held for moderation. (Or with the [[moderatedcomments]] plugin, all
 comments will be held.) Wiki admins can access the comment moderation queue
 via a button on their Preferences page.
 
-The comments are stored in `.ikiwiki/comments_pending/`, and can be
-deleted, or moved into the wiki's srcdir to be posted.
+The unmoderated comments are stored in the `srcdir` with a filename ending
+in "._comment_pending". They are not checked into revision control.
diff --git a/doc/tips/comments_feed.mdwn b/doc/tips/comments_feed.mdwn
index 6d4dbb803..3d6a8c449 100644
--- a/doc/tips/comments_feed.mdwn
+++ b/doc/tips/comments_feed.mdwn
@@ -3,8 +3,15 @@ blog can have comments added to them. Pages with comments even have special
 feeds that can be used to subscribe to those comments. But you'd like to
 add a feed that contains all the comments posted to any page. Here's how:
 
-	\[[!inline pages="internal(*/comment_*)" template=comment]]
+	\[[!inline pages="comment(*)" template=comment]]
 
 The special [[ikiwiki/PageSpec]] matches all comments. The
 [[template|templates]] causes the comments to be displayed formatted
 nicely.
+
+---
+
+It's also possible to make a feed of comments that are held pending
+moderation.
+
+	\[[!inline pages="comment_pending(*)" template=comment]]
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 76398e9fb..b2b5af3dc 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100504
+Version: 3.20100505
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
-- 
cgit v1.2.3


From 2e86b8df985067e101269bb4f8a41c5237af9f91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 20:46:58 -0400
Subject: fix param passing to match_glob

---
 IkiWiki.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 43995fc96..11cfcdfd2 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2342,12 +2342,12 @@ sub match_glob ($$;@) {
 }
 
 sub match_internal ($$;@) {
-	return match_glob($_[0], $_[1], @_, internal => 1)
+	return match_glob(shift, shift, @_, internal => 1)
 }
 
 sub match_page ($$;@) {
 	my $page=shift;
-	my $match=match_glob($page, $_[1], @_);
+	my $match=match_glob($page, shift, @_);
 	if ($match && ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
 		return IkiWiki::FailReason->new("$page is not a page");
 	}
-- 
cgit v1.2.3


From 931045301a3a5be917b775277f2a3088209a00f2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 21:45:17 -0400
Subject: Gave comment and page editing forms some CSS and accessability love.

In particular, added <label> tags.

(However, could not find a good way to add a label tag for the main
page edit textarea.)
---
 debian/changelog           |  1 +
 doc/style.css              | 14 ++++++++++++++
 templates/editcomment.tmpl | 33 ++++++++++++++++++++++++---------
 templates/editpage.tmpl    | 28 +++++++++++++++++-----------
 4 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b4ba7592..77fd13826 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     a single template, page.tmpl.
   * If you have a locally customised page.tmpl, it needs to be updated
     to set <base> when BASEURL or FORCEBAREURL is set.
+  * Gave comment and page editing forms some CSS and accessability love.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/style.css b/doc/style.css
index f2f558497..393f40135 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -419,6 +419,20 @@ span.color {
 	padding: 3px;
 }
 
+label.block {    
+	display: block;   
+}
+label.inline {    
+	display: inline;
+}
+ol.form {
+	list-style: none;
+	padding: 0;
+}
+li.form {
+	padding-bottom: 1em;
+}
+
 /* Used by the highlight plugin. */
 pre.hl { color:#000000; background-color:#ffffff; }
 .hl.num { color:#2928ff; }
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 51ab10f2c..f3a8e7395 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -4,22 +4,37 @@
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
-<TMPL_UNLESS USERNAME>
-<TMPL_IF ALLOWAUTHOR>
-Name: <TMPL_VAR FIELD-AUTHOR> (optional, or
-<a href="<TMPL_VAR SIGNINURL>">signin</a>)<br />
-Website: <TMPL_VAR FIELD-URL> (optional)<br />
+<ol class="form">
+<TMPL_UNLESS NAME=USERNAME>
+<TMPL_IF NAME=ALLOWAUTHOR>
+<li>
+<label for="author" class="block">Name:</label>
+<TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>)
+</li>
+<li>
+<label for="url" class="block">Website:</label>
+<TMPL_VAR NAME=FIELD-URL> (optional)
+</li>
 <TMPL_ELSE>
-(You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)<br />
+<li>
+(You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)
+</li>
 </TMPL_IF>
 </TMPL_UNLESS>
-Subject: <TMPL_VAR FIELD-SUBJECT><br />
+<li>
+<label for="subject" class="block">Subject:</label>
+<TMPL_VAR FIELD-SUBJECT><br />
+</li>
+<li>
+<label for="editcontent" class="block">Comment:</label>
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</li>
+</ol>
 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
-<TMPL_VAR FORM-END>
+<TMPL_VAR NAME="FORM-END">
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF PAGE_PREVIEW>
+<TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
 <div class="header">
 <span>Comment preview:</span>
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 6d8a902a2..1e2d070ed 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,30 +6,37 @@
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
-<TMPL_IF PAGE_SELECT>
-Page location: <TMPL_VAR FIELD-PAGE>
-Page type: <TMPL_VAR FIELD-TYPE>
+<ol class="form">
+<TMPL_IF NAME="PAGE_SELECT">
+<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 />
-<TMPL_IF CAN_COMMIT>
-Optional comment about this change:<br />
+</li>
+<TMPL_IF NAME="CAN_COMMIT">
+<li>
+<label for="comments" class="block">Optional comment about this change:</label>
 <TMPL_VAR FIELD-COMMENTS><br />
+</li>
 </TMPL_IF>
+</ol>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
-<TMPL_IF FIELD-ATTACHMENT>
+<TMPL_IF NAME="FIELD-ATTACHMENT">
 <a class="toggle" href="#attachments">Attachments</a>
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <table>
 <tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
-<TMPL_LOOP ATTACHMENT_LIST>
+<TMPL_LOOP NAME="ATTACHMENT_LIST">
 <tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
 </TMPL_LOOP>
-<TMPL_IF ATTACHMENT_LIST>
+<TMPL_IF NAME="ATTACHMENT_LIST">
 <tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
 </TMPL_IF>
 </table>
@@ -39,7 +45,7 @@ Optional comment about this change:<br />
 <TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF PAGE_PREVIEW>
+<TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
 <div class="header">
 <span>Page preview:</span>
-- 
cgit v1.2.3


From a47e835f3a97c9f490622f21562b32fbf527ef1b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 21:55:26 -0400
Subject: reordered some sections

---
 doc/style.css | 217 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 98 insertions(+), 119 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 393f40135..5f77037e4 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -4,6 +4,7 @@
  * local.css and use it to override or change settings in this one.
  */
 
+/* html5 compat */
 article,
 header,
 footer,
@@ -164,7 +165,6 @@ div.recentchanges {
 	width: 60%;
 }
 
-/* Used for adding a blog page. */
 #blogform {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
@@ -189,53 +189,6 @@ div.recentchanges {
 	color: #C00;
 }
 
-/* Used for invalid form fields. */
-.fb_invalid {
-	color: red;
-	background: white !important;
-}
-
-/* Used for required form fields. */
-.fb_required {
-	font-weight: bold;
-}
-
-/* Orange feed button. */
-.feedbutton {
-	background: #ff6600;
-	color: white !important;
-	border-left: 1px solid #cc9966;
-	border-top: 1px solid #ccaa99;
-	border-right: 1px solid #993300;
-	border-bottom: 1px solid #331100;
-	padding: 0px 0.5em 0px 0.5em;
-	font-family: sans-serif;
-	font-weight: bold;
-	font-size: small;
-	text-decoration: none;
-	margin-top: 1em;
-}
-.feedbutton:hover {
-	color: white !important;
-	background: #ff9900;
-}
-
-/* Tag cloud. */
-.pagecloud {
-	float: right;
-	width: 30%;
-	text-align: center;
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-	background: #eee;
-	color: black !important;
-}
-.smallestPC { font-size: 70%; }
-.smallPC { font-size: 85%; }
-.normalPC { font-size: 100%; }
-.bigPC { font-size: 115%; }
-.biggestPC { font-size: 130%; }
-
 .sidebar {
 	width: 30ex;
 	float: right;
@@ -248,32 +201,6 @@ div.recentchanges {
 	color: black !important;
 }
 
-/* outlines */
-li.L1 {
-	list-style: upper-roman;
-}
-li.L2 {
-	list-style: decimal;
-}
-li.L3 {
-	list-style: lower-alpha;
-}
-li.L4 {
-	list-style: disc;
-}
-li.L5 {
-	list-style: square;
-}
-li.L6 {
-	list-style: circle;
-}
-li.L7 {
-	list-style: lower-roman;
-}
-li.L8 {
-	list-style: upper-alpha;
-}
-
 hr.poll {
 	height: 10pt;
 	color: white !important;
@@ -287,6 +214,27 @@ div.poll {
 	border: 1px solid #aaa;
 }
 
+span.color {
+	padding: 2px;
+}
+
+.comment-header,
+.microblog-header {
+	font-style: italic;
+	margin-top: .3em;
+}
+.comment .author,
+.microblog .author {
+	font-weight: bold;
+}
+.comment-subject {
+	font-weight: bold;
+}
+.comment {
+	border: 1px solid #aaa;
+	padding: 3px;
+}
+
 div.progress {
 	margin-top: 1ex;
 	margin-bottom: 1ex;
@@ -303,23 +251,7 @@ div.progress-done {
 	padding: 1px;
 }
 
-input#openid_url {
-	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 0 50%;
-	color: #000;
-	padding-left: 18px;
-}
-
-input#searchbox {
-	background: url(wikiicons/search-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 100% 50%;
-	color: #000;
-	padding-right: 16px;
-}
-
-/* Things to hide in printouts. */
+/* things to hide in printouts */
 @media print {
 	.actions { display: none; }
 	.tags { display: none; }
@@ -329,7 +261,7 @@ input#searchbox {
 	#backlinks { display: none; }
 }
 
-/* Provided for use by template plugin for floating info boxes. */
+/* infobox template */
 .infobox {
 	float: right;
 	margin-left: 2ex;
@@ -341,7 +273,7 @@ input#searchbox {
 	color: black !important;
 }
 
-/* Provided for use by template plugin for floating note boxes. */
+/* notebox template */
 .notebox {
 	float: right;
 	margin-left: 2ex;
@@ -354,7 +286,7 @@ input#searchbox {
 	color: black !important;
 }
 
-/* Used by the popup template and for backlinks hiding. */
+/* popup template and backlinks hiding */
 .popup {
 	border-bottom: 1px dotted #366;
 	color: #366;
@@ -375,7 +307,7 @@ input#searchbox {
 	color: black;
 }
 
-/* Formbuilder styling */
+/* form styling */
 fieldset {
 	margin: 1ex 0;
 	border: 1px solid black;
@@ -397,28 +329,6 @@ legend {
 	background: #eee; 
 	color: black !important;
 }
-
-span.color {
-	padding: 2px;
-}
-
-.comment-header,
-.microblog-header {
-	font-style: italic;
-	margin-top: .3em;
-}
-.comment .author,
-.microblog .author {
-	font-weight: bold;
-}
-.comment-subject {
-	font-weight: bold;
-}
-.comment {
-	border: 1px solid #aaa;
-	padding: 3px;
-}
-
 label.block {    
 	display: block;   
 }
@@ -432,8 +342,31 @@ ol.form {
 li.form {
 	padding-bottom: 1em;
 }
+input#openid_url {
+	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 0 50%;
+	color: #000;
+	padding-left: 18px;
+}
+input#searchbox {
+	background: url(wikiicons/search-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 100% 50%;
+	color: #000;
+	padding-right: 16px;
+}
+/* invalid form fields */
+.fb_invalid {
+	color: red;
+	background: white !important;
+}
+/* required form fields */
+.fb_required {
+	font-weight: bold;
+}
 
-/* Used by the highlight plugin. */
+/* highlight plugin */
 pre.hl { color:#000000; background-color:#ffffff; }
 .hl.num { color:#2928ff; }
 .hl.esc { color:#ff00ff; }
@@ -450,7 +383,7 @@ pre.hl { color:#000000; background-color:#ffffff; }
 .hl.kwc { color:#000000; font-weight:bold; }
 .hl.kwd { color:#010181; }
 
-/* For the calendar plugin. */
+/* calendar plugin */
 .month-calendar-day-this-day { background-color: #eee; }
 .year-calendar-this-month { background-color: #eee; }
 .month-calendar-arrow A:link,
@@ -461,3 +394,49 @@ pre.hl { color:#000000; background-color:#ffffff; }
 	font-weight: normal;
 	font-size: 150%;
 }
+
+/* outlines */
+li.L1 { list-style: upper-roman; }
+li.L2 { list-style: decimal; }
+li.L3 { list-style: lower-alpha; }
+li.L4 { list-style: disc; }
+li.L5 { list-style: square; }
+li.L6 { list-style: circle; }
+li.L7 { list-style: lower-roman; }
+li.L8 { list-style: upper-alpha; }
+
+/* tag cloud */
+.pagecloud {
+	float: right;
+	width: 30%;
+	text-align: center;
+	padding: 10px 10px;
+	border: 1px solid #aaa;
+	background: #eee;
+	color: black !important;
+}
+.smallestPC { font-size: 70%; }
+.smallPC { font-size: 85%; }
+.normalPC { font-size: 100%; }
+.bigPC { font-size: 115%; }
+.biggestPC { font-size: 130%; }
+
+/* orange feed button */
+.feedbutton {
+	background: #ff6600;
+	color: white !important;
+	border-left: 1px solid #cc9966;
+	border-top: 1px solid #ccaa99;
+	border-right: 1px solid #993300;
+	border-bottom: 1px solid #331100;
+	padding: 0px 0.5em 0px 0.5em;
+	font-family: sans-serif;
+	font-weight: bold;
+	font-size: small;
+	text-decoration: none;
+	margin-top: 1em;
+}
+.feedbutton:hover {
+	color: white !important;
+	background: #ff9900;
+}
-- 
cgit v1.2.3


From d3aaf6e01fe7f90a530e640957b5908d5dba2f7f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 22:19:14 -0400
Subject: fix pagediff to not display as "preview"

I think originally, the page preview header was not displayed,
so diff was hacked in using it.
---
 IkiWiki/Plugin/editdiff.pm | 2 +-
 templates/editpage.tmpl    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index d8f53a42e..015ce9c14 100644
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -71,7 +71,7 @@ sub formbuilder_setup {
 		$content=~s/\r/\n/g;
 
 		my $diff = diff(srcfile($pagesources{$page}), $content);
-		$form->tmpl_param("page_preview", $diff);
+		$form->tmpl_param("page_diff", $diff);
 	}
 }
 
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 1e2d070ed..118ca4550 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -54,3 +54,12 @@
 <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>
-- 
cgit v1.2.3


From 4c320176c080038f95131f39ecaca3101b4b1745 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 22:27:12 -0400
Subject: simplify formbuilder stylesheet specification

Since all forms are wrapped in a template that defines the actual
stylesheets, formbuilder just has to be told to turn on stylesheet mode,
not what file is the style sheet.
---
 IkiWiki/CGI.pm             | 4 ++--
 IkiWiki/Plugin/remove.pm   | 2 +-
 IkiWiki/Plugin/rename.pm   | 2 +-
 IkiWiki/Plugin/websetup.pm | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 07369ac10..49a505514 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -108,7 +108,7 @@ sub cgi_signin ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		template => {type => 'div'},
-		stylesheet => baseurl()."style.css",
+		stylesheet => 1,
 	);
 	my $buttons=["Login"];
 	
@@ -187,7 +187,7 @@ sub cgi_prefs ($$) {
 		params => $q,
 		action => $config{cgiurl},
 		template => {type => 'div'},
-		stylesheet => baseurl()."style.css",
+		stylesheet => 1,
 		fieldsets => [
 			[login => gettext("Login")],
 			[preferences => gettext("Preferences")],
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 0fc180f69..a46294e78 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -103,7 +103,7 @@ sub confirmation_form ($$) {
 		javascript => 0,
 		params => $q,
 		action => $config{cgiurl},
-		stylesheet => IkiWiki::baseurl()."style.css",
+		stylesheet => 1,
 		fields => [qw{do page}],
 	);
 	
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 69e615ead..537e91317 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -126,7 +126,7 @@ sub rename_form ($$$) {
 		javascript => 0,
 		params => $q,
 		action => $config{cgiurl},
-		stylesheet => IkiWiki::baseurl()."style.css",
+		stylesheet => 1,
 		fields => [qw{do page new_name attachment}],
 	);
 	
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 4d2e611eb..9cb5eb13c 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -293,7 +293,7 @@ sub showform ($$) {
 		],
 		action => $config{cgiurl},
 		template => {type => 'div'},
-		stylesheet => IkiWiki::baseurl()."style.css",
+		stylesheet => 1,
 	);
 	
 	$form->field(name => "do", type => "hidden", value => "setup",
-- 
cgit v1.2.3


From 121e2ffc2f25bf264a68d35e80a9386995fa9e5a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 23:07:08 -0400
Subject: Renamed postscan hook to indexhtml, to reflect its changed position.

Probably only the search plugin uses it, so this seemed safe.
---
 IkiWiki/Plugin/search.pm                                      | 2 +-
 IkiWiki/Plugin/skeleton.pm.example                            | 6 +++---
 IkiWiki/Render.pm                                             | 2 +-
 debian/changelog                                              | 2 ++
 doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn | 2 +-
 doc/plugins/po/discussion.mdwn                                | 2 +-
 doc/plugins/write.mdwn                                        | 6 +++---
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 9e875c79c..b1f4747fe 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -10,7 +10,7 @@ sub import {
 	hook(type => "getsetup", id => "search", call => \&getsetup);
 	hook(type => "checkconfig", id => "search", call => \&checkconfig);
 	hook(type => "pagetemplate", id => "search", call => \&pagetemplate);
-	hook(type => "postscan", id => "search", call => \&index);
+	hook(type => "indexhtml", id => "search", call => \&index);
 	hook(type => "delete", id => "search", call => \&delete);
 	hook(type => "cgi", id => "search", call => \&cgi);
 }
diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index a404e24af..34713c73b 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -20,7 +20,7 @@ sub import {
 	hook(type => "scan", id => "skeleton", call => \&scan);
 	hook(type => "htmlize", id => "skeleton", call => \&htmlize);
 	hook(type => "sanitize", id => "skeleton", call => \&sanitize);
-	hook(type => "postscan", id => "skeleton", call => \&postscan);
+	hook(type => "indexhtml", id => "skeleton", call => \&indexhtml);
 	hook(type => "format", id => "skeleton", call => \&format);
 	hook(type => "pagetemplate", id => "skeleton", call => \&pagetemplate);
 	hook(type => "templatefile", id => "skeleton", call => \&templatefile);
@@ -118,10 +118,10 @@ sub sanitize (@) {
 	return $params{content};
 }
 
-sub postscan (@) {
+sub indexhtml (@) {
 	my %params=@_;
 	
-	debug("skeleton plugin running as postscan");
+	debug("skeleton plugin running as indexhtml");
 }
 
 sub format (@) {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e5ba0079b..30e3d4199 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -62,7 +62,7 @@ sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
 	
-	run_hooks(postscan => sub {
+	run_hooks(indexhtml => sub {
 		shift->(page => $page, content => $content);
 	});
 
diff --git a/debian/changelog b/debian/changelog
index 77fd13826..eb67c2bde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * If you have a locally customised page.tmpl, it needs to be updated
     to set <base> when BASEURL or FORCEBAREURL is set.
   * Gave comment and page editing forms some CSS and accessability love.
+  * Renamed postscan hook to indexhtml, to reflect its changed position,
+    and typical use.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
index be14e5126..c6e3cd4fd 100644
--- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
+++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
@@ -144,7 +144,7 @@ So, looking at your meta branch: --[[Joey]]
   has no title, then A will display the link as "B". Now page B is modified
   and a title is added. Nothing updates "A".
   The added overhead of rebuilding every page that links to B when B is
-  changed (as the `postscan` hook of the po plugin does) is IMHO a killer.
+  changed (as the `indexhtml` hook of the po plugin does) is IMHO a killer.
   That could be hundreds or thousands of pages, making interactive editing
   way slow. This is probably the main reason I had not attempted this whole
   thing myself. IMHO this calls for some kind of intellegent dependency
diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index ab822e76c..27683f1ea 100644
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -513,7 +513,7 @@ finish it at some point in the first quarter of 2009. --[[intrigeri]]
 >>>>
 >>>>> Done. --[[intrigeri]]
 >>> 
-> * I'm very fearful of the `add_depends` in `postscan`. 
+> * I'm very fearful of the `add_depends` in `indexhtml`. 
 >   Does this make every page depend on every page that links
 >   to it? Won't this absurdly bloat the dependency pagespecs
 >   and slow everything down? And since nicepagetitle is given
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 3b1d770eb..7180237a4 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -39,7 +39,7 @@ built.
 Now that it knows what pages it needs to build, ikiwiki runs two
 compile passes. First, it runs `scan` hooks, which collect metadata about
 the pages. Then it runs a page rendering pipeline, by calling in turn these
-hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`,
+hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `indexhtml`,
 `pagetemplate`, `sanitize`, `format`.
 
 After all necessary pages are built, it calls the `change` hook. Finally,
@@ -282,9 +282,9 @@ like `Makefile` that have no extension.
 If `hook` is passed an optional "longname" parameter, this value is used
 when prompting a user to choose a page type on the edit page form.
 
-### postscan
+### indexhtml
 
-	hook(type => "postscan", id => "foo", call => \&postscan);
+	hook(type => "indexhtml", id => "foo", call => \&indexhtml);
 
 This hook is called once the page has been converted to html (but before
 the generated html is put in a template). The most common use is to
-- 
cgit v1.2.3


From ea4967f184bf0a27eaa2dc81da1084780756156a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 23:20:48 -0400
Subject: inline: Call indexhtml when inlining internal pages, so their text
 can be indexed for searching.

---
 IkiWiki/Plugin/inline.pm | 7 +++++++
 IkiWiki/Plugin/search.pm | 6 +++---
 IkiWiki/Render.pm        | 2 +-
 debian/changelog         | 2 ++
 doc/plugins/write.mdwn   | 4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 933e30646..715a3d652 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -476,6 +476,13 @@ sub get_inline_content ($$) {
 		       filter($page, $destpage,
 		       readfile(srcfile($file))))));
 		$nested--;
+		if (isinternal($page)) {
+			# make inlined text of internal pages searchable
+			run_hooks(indexhtml => sub {
+				shift->(page => $page, destpage => $page,
+					content => $ret);
+			});
+		}
 	}
 	
 	if ($cached_destpage ne $destpage) {
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index b1f4747fe..c578b44ab 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -10,7 +10,7 @@ sub import {
 	hook(type => "getsetup", id => "search", call => \&getsetup);
 	hook(type => "checkconfig", id => "search", call => \&checkconfig);
 	hook(type => "pagetemplate", id => "search", call => \&pagetemplate);
-	hook(type => "indexhtml", id => "search", call => \&index);
+	hook(type => "indexhtml", id => "search", call => \&indexhtml);
 	hook(type => "delete", id => "search", call => \&delete);
 	hook(type => "cgi", id => "search", call => \&cgi);
 }
@@ -68,7 +68,7 @@ sub pagetemplate (@) {
 
 my $scrubber;
 my $stemmer;
-sub index (@) {
+sub indexhtml (@) {
 	my %params=@_;
 
 	setupfiles();
@@ -117,7 +117,7 @@ sub index (@) {
 	eval q{use HTML::Entities};
 	error $@ if $@;
 	$doc->set_data(
-		"url=".urlto($params{page}, "")."\n".
+		"url=".urlto($params{destpage}, "")."\n".
 		"sample=".decode_entities($sample)."\n".
 		"caption=".decode_entities($caption)."\n".
 		"modtime=$IkiWiki::pagemtime{$params{page}}\n".
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 30e3d4199..b0bd8dee0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -63,7 +63,7 @@ sub genpage ($$) {
 	my $content=shift;
 	
 	run_hooks(indexhtml => sub {
-		shift->(page => $page, content => $content);
+		shift->(page => $page, destpage => $page, content => $content);
 	});
 
 	my $templatefile;
diff --git a/debian/changelog b/debian/changelog
index eb67c2bde..10a4912af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * Gave comment and page editing forms some CSS and accessability love.
   * Renamed postscan hook to indexhtml, to reflect its changed position,
     and typical use.
+  * inline: Call indexhtml when inlining internal pages, so their
+    text can be indexed for searching.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 7180237a4..193005565 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -290,8 +290,8 @@ This hook is called once the page has been converted to html (but before
 the generated html is put in a template). The most common use is to
 update search indexes. Added in ikiwiki 2.54.
 
-The function is passed named parameters "page" and "content". Its return
-value is ignored.
+The function is passed named parameters "page", "destpage", and "content".
+Its return value is ignored.
 
 ### pagetemplate
 
-- 
cgit v1.2.3


From 14826ad92792b4870108dac3c28840abe1e00428 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 23:25:27 -0400
Subject: Delete hooks are passed deleted internal pages.

Necessary so search can remove its indexes for internal pages.
But also, it seems it was an omission not to pass the deleted
pages before.
---
 IkiWiki/Render.pm | 2 +-
 debian/changelog  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index b0bd8dee0..2bf2e336b 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -801,7 +801,7 @@ sub refresh () {
 	remove_unrendered();
 
 	if (@$del) {
-		run_hooks(delete => sub { shift->(@$del) });
+		run_hooks(delete => sub { shift->(@$del, @$internal_del) });
 	}
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });
diff --git a/debian/changelog b/debian/changelog
index 10a4912af..31d64e237 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     and typical use.
   * inline: Call indexhtml when inlining internal pages, so their
     text can be indexed for searching.
+  * Delete hooks are passed deleted internal pages. 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
-- 
cgit v1.2.3


From 575080d6ef114f24e23c17bd63cf406b22460657 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 23:28:40 -0400
Subject: respect permalinks

---
 IkiWiki/Plugin/search.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c578b44ab..cc26b7ac1 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -112,12 +112,17 @@ sub indexhtml (@) {
 	}
 	$sample=~s/\n/ /g;
 	
+	my $url=urlto($params{destpage}, "");
+	if (defined $pagestate{$params{page}}{meta}{permalink}) {
+		$url=$pagestate{$params{page}}{meta}{permalink}
+	}
+
 	# data used by omega
 	# Decode html entities in it, since omega re-encodes them.
 	eval q{use HTML::Entities};
 	error $@ if $@;
 	$doc->set_data(
-		"url=".urlto($params{destpage}, "")."\n".
+		"url=".$url."\n".
 		"sample=".decode_entities($sample)."\n".
 		"caption=".decode_entities($caption)."\n".
 		"modtime=$IkiWiki::pagemtime{$params{page}}\n".
-- 
cgit v1.2.3


From 300001184ea60895de9a63537951c41b21486f11 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 23:28:54 -0400
Subject: done

---
 doc/bugs/comments_not_searchable.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/comments_not_searchable.mdwn b/doc/bugs/comments_not_searchable.mdwn
index 72f7bf30f..6fda89bd2 100644
--- a/doc/bugs/comments_not_searchable.mdwn
+++ b/doc/bugs/comments_not_searchable.mdwn
@@ -15,3 +15,5 @@ However, the search postscan hook tells xapian the page url,
 and uses `urlto($page)` to do it. And that won't work for
 an internal page. Guess it could be modified to tell xapian the
 permalink. --[[Joey]] 
+
+> [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 1678604fe36e2a1397e13aa1b36e7807be8f2bc6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 00:22:05 -0400
Subject: avoid redir loop when going to an internal page that has no permalink

---
 IkiWiki/Plugin/goto.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 03bd682b3..669211691 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -41,14 +41,15 @@ sub cgi_goto ($;$) {
 
 	IkiWiki::loadindex();
 
-	# If the page is internal (like a comment), see if it has a
-	# permalink. Comments do.
-	if (IkiWiki::isinternal($page) &&
-	    defined $pagestate{$page}{meta}{permalink}) {
-	    	IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
+	my $link;
+	if (! IkiWiki::isinternal($page)) {
+		$link = bestlink("", $page);
+	}
+	elsif (defined $pagestate{$page}{meta}{permalink}) {
+		# Can only redirect to an internal page if it has a
+		# permalink.
+		IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
 	}
-
-	my $link = bestlink("", $page);
 
 	if (! length $link) {
 		IkiWiki::cgi_custom_failure(
-- 
cgit v1.2.3


From 915d9281dbfb3e93fad7a551a37e7ea3c695d794 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 00:26:59 -0400
Subject: call delete hook even if only internal pages are deleted

---
 IkiWiki/Render.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 2bf2e336b..c9ba95363 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -800,7 +800,7 @@ sub refresh () {
 	render_backlinks($backlinkchanged);
 	remove_unrendered();
 
-	if (@$del) {
+	if (@$del || @$internal_del) {
 		run_hooks(delete => sub { shift->(@$del, @$internal_del) });
 	}
 	if (%rendered) {
-- 
cgit v1.2.3


From da366390cdcf21aa4482bcc805e34049f104a8d3 Mon Sep 17 00:00:00 2001
From: markd <markd@web>
Date: Fri, 7 May 2010 10:48:39 +0000
Subject:

---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 06acc9cec..024a48272 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -25,4 +25,4 @@ The [[forum]] is open for discussions.
 can be submitted and tracked using this wiki.
 
 Ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]].
+and is [[FreeSoftware]]
-- 
cgit v1.2.3


From 43e27cc25140e4541509558b9c7a51afea58166c Mon Sep 17 00:00:00 2001
From: markd <markd@web>
Date: Fri, 7 May 2010 10:50:55 +0000
Subject:

---
 doc/consultants.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/consultants.mdwn b/doc/consultants.mdwn
index ee0915600..2ff769136 100644
--- a/doc/consultants.mdwn
+++ b/doc/consultants.mdwn
@@ -6,4 +6,4 @@ available to do consulting or other work on ikiwiki.
 
 * [[Joey]] wrote ikiwiki. He is available for consulting on a part-time basis.
 
-Feel free to add yourself to this list.
+Feel free to add yourself to this list
-- 
cgit v1.2.3


From c9f8fef594e3d820ce4251737e3152e4ffaae528 Mon Sep 17 00:00:00 2001
From: "http://peter-simons.myopenid.com/"
 <http://peter-simons.myopenid.com/@web>
Date: Fri, 7 May 2010 13:34:29 +0000
Subject:

---
 doc/users/KarlMW/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/users/KarlMW/discussion.mdwn b/doc/users/KarlMW/discussion.mdwn
index 9117abcab..4a111a3f9 100644
--- a/doc/users/KarlMW/discussion.mdwn
+++ b/doc/users/KarlMW/discussion.mdwn
@@ -23,3 +23,5 @@ things that need changing then I will probably need help/guidance.
 >> I suspect that asciidoc can't really be made to play nice to the extent that I would want casual users/abusers to have it as a markup option on a live wiki - it's fine for a personal site where you can look at the output before putting it online, but I think it would be a hideously gaping integrity hole for anything more than that.  However, for a personal site (as I am using it), it does seem to have its uses.
 
 >> I'll keep an eye on the format_escape plugin, and assuming it is accepted into ikiwiki, will see if I can apply it to asciidoc. --[[KarlMW]]
+
+Is there any way to enable latexmath rendering? It semes that ikiwiki strips the necessary javascript and/or style sheet information from the HTML page generated by asciidoc. --Peter
-- 
cgit v1.2.3


From 25033d91145d0f102c6f6889f04e80e31b218684 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 12:18:43 -0400
Subject: Revert markd changes

spammer testing?
---
 doc/consultants.mdwn | 2 +-
 doc/index.mdwn       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/consultants.mdwn b/doc/consultants.mdwn
index 2ff769136..ee0915600 100644
--- a/doc/consultants.mdwn
+++ b/doc/consultants.mdwn
@@ -6,4 +6,4 @@ available to do consulting or other work on ikiwiki.
 
 * [[Joey]] wrote ikiwiki. He is available for consulting on a part-time basis.
 
-Feel free to add yourself to this list
+Feel free to add yourself to this list.
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 024a48272..06acc9cec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -25,4 +25,4 @@ The [[forum]] is open for discussions.
 can be submitted and tracked using this wiki.
 
 Ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]]
+and is [[FreeSoftware]].
-- 
cgit v1.2.3


From 5e6ed105836e4b19b1773bfd9d7f1002b1da57bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 12:43:51 -0400
Subject: nasty update to ugly hack to allow comment() pagespecs to work

---
 IkiWiki/Render.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c9ba95363..8b1b9aef4 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -641,7 +641,7 @@ sub render_dependent ($$$$$$$) {
 				# only consider internal files
 				# if the page explicitly depends
 				# on such files
-				my $internal_dep=$dep =~ /internal\(/;
+				my $internal_dep=$dep =~ /(?:internal|comment|comment_pending)\(/;
 
 				my $in=sub {
 					my $list=shift;
-- 
cgit v1.2.3


From c2c57f0cfba182964359f0ee71f84fb1b935d10f Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 7 May 2010 17:46:21 +0100
Subject: gitremotes: don't fetch tags, other than from ikiwiki.info

Getting this change in an existing git clone requires removing or
reconfiguring the remotes.
---
 gitremotes | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gitremotes b/gitremotes
index f596c650f..6c03011a8 100755
--- a/gitremotes
+++ b/gitremotes
@@ -16,7 +16,9 @@ while (<IN>) {
 		my ($oldurl)=$info=~/URL: (.*)/m;
 		if ($oldurl ne $url) {
 			system("git remote rm $remote 2>/dev/null");
-			system("git", "remote", "add", "-f", $remote, $url)
+			system("git", "remote", "add", "-f", $remote, $url);
+			system("git", "config", "remote.$remote.tagopt",
+				"--no-tags");
 		}
 	}
 }
-- 
cgit v1.2.3


From db5cee6cb6b14367a4e3aa39e0ab3a1a21d25a21 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 12:55:24 -0400
Subject: reorder

---
 debian/NEWS | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index b751f1478..8f456bced 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,11 +1,5 @@
 ikiwiki (3.20100505) UNRELEASED; urgency=low
 
-  There is a new "comment()" pagespec, that can be used to match a comment
-  on a page. It is recommended it be used instead of the old
-  method of using a pagespec such as "internal(comment_*)" to match
-  things that looked like comments. The old pagespec will now also match
-  comments that are held for moderation; likely not what you want.
-
   There is a significant change to the page.tmpl template in this version.
   If you have locally modified versions of that template, you will need
   to update it to contain the following in the HTML <head>:
@@ -14,6 +8,12 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
     <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
     </TMPL_IF>
+  
+  Also, there is a new "comment()" pagespec, that can be used to match a
+  comment on a page. It is recommended it be used instead of the old
+  method of using a pagespec such as "internal(comment_*)" to match
+  things that looked like comments. The old pagespec will now also match
+  comments that are held for moderation; likely not what you want.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 21:47:08 -0400
 
-- 
cgit v1.2.3


From 8cd216d748961a18d373b8fea6e4346c0c372f6e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 12:55:34 -0400
Subject: fix match_comment

---
 IkiWiki/Plugin/comments.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 448ef02f7..0a808aaef 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -906,7 +906,7 @@ sub match_comment ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 
-	my $match=match_glob($page, "$glob/*", @_);
+	my $match=match_glob($page, "$glob/*", internal => 1, @_);
 	if ($match) {
 		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
 		if ($type ne "_comment") {
@@ -920,7 +920,7 @@ sub match_comment_pending ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 
-	my $match=match_glob($page, "$glob/*", @_);
+	my $match=match_glob($page, "$glob/*", internal => 1, @_);
 	if ($match) {
 		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
 		if ($type ne "_comment_pending") {
-- 
cgit v1.2.3


From f9553a06ab0a13140c62a90a59c566faeedfa9d6 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 7 May 2010 16:56:45 +0000
Subject: patch

---
 doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
new file mode 100644
index 000000000..96bdab9cd
--- /dev/null
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -0,0 +1,11 @@
+[[!tag patch]]
+[[!template id=gitbranch branch=smcv/ready/no-tags author="[[smcv]]"]]
+
+The `gitremotes` script picks up tags from any repository, including those
+used for local .debs that were never actually present in Debian:
+
+    smcv@reptile% git tag | grep -c nmu
+    52
+
+This can be avoided with the `tagopt = --no-tags` option in .git/config;
+see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/ready/no-tags>
-- 
cgit v1.2.3


From 5dfcaf1f7f3c2ae8304465bdc10bd82bb862fa09 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:04:00 -0400
Subject: applied

---
 doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index 96bdab9cd..eb37aee1b 100644
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -9,3 +9,5 @@ used for local .debs that were never actually present in Debian:
 
 This can be avoided with the `tagopt = --no-tags` option in .git/config;
 see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/ready/no-tags>
+
+> [[done]] thanks. Also cleared propigated tags out of origin. --[[Joey]] 
-- 
cgit v1.2.3


From 888ac35e11a22fe254127f2c39d71909038494c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:13:57 -0400
Subject: a bug?

---
 doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index eb37aee1b..32cf419e8 100644
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -10,4 +10,9 @@ used for local .debs that were never actually present in Debian:
 This can be avoided with the `tagopt = --no-tags` option in .git/config;
 see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/ready/no-tags>
 
-> [[done]] thanks. Also cleared propigated tags out of origin. --[[Joey]] 
+> [[done]] thanks. Also cleared propigated tags out of origin. 
+> 
+> Hmm, in testing I still see tags get pulled the first time a remote
+> is added. If those are then locally deleted, it doesn't pull them again
+> with the `--no-tags`.
+> --[[Joey]] 
-- 
cgit v1.2.3


From 4549a4aaa81fa9dbed87954def3eec5bca974157 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:22:20 +0000
Subject:

---
 doc/forum/how_to_login_as_admin.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/how_to_login_as_admin.mdwn

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
new file mode 100644
index 000000000..67ee9e377
--- /dev/null
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -0,0 +1 @@
+I even managed to set up ikiwiki so it works fine with git; but how on earth do I log in as an administrator? In the .setup file the admin user is set to 'zimek' but when I go and register 'zimek' on the web it appears as normal user not the administrator. What am I missing?
-- 
cgit v1.2.3


From b01a2274c3f96541b8b48f9ebb883ee8b7451fa3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:25:32 -0400
Subject: fix undef warning when page() tests a deleted file

---
 IkiWiki.pm                      | 3 ++-
 doc/bugs/deletion_warnings.mdwn | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 11cfcdfd2..d76b5edb4 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2348,7 +2348,8 @@ sub match_internal ($$;@) {
 sub match_page ($$;@) {
 	my $page=shift;
 	my $match=match_glob($page, shift, @_);
-	if ($match && ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
+	if ($match && ! (exists $IkiWiki::pagesources{$page}
+	    && defined IkiWiki::pagetype($IkiWiki::pagesources{$page}))) {
 		return IkiWiki::FailReason->new("$page is not a page");
 	}
 	else {
diff --git a/doc/bugs/deletion_warnings.mdwn b/doc/bugs/deletion_warnings.mdwn
index c8879379b..668626b49 100644
--- a/doc/bugs/deletion_warnings.mdwn
+++ b/doc/bugs/deletion_warnings.mdwn
@@ -2,6 +2,9 @@ Seen while deleting a blog's calendar pages:
 
 --[[Joey]] 
 
+[[done]] -- the new `page()` pagespec needed to check if there was a source
+file for the page, and was leaking undef.
+
 <pre>
    427250f..ff6c054  master     -> origin/master
 Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
-- 
cgit v1.2.3


From be0c2df6db1e30b4ee4213f402a1414e2e2abd85 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:28:14 -0400
Subject: check that pagesources exists before testing

---
 IkiWiki/Plugin/comments.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 0a808aaef..76f6551ae 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -907,9 +907,9 @@ sub match_comment ($$;@) {
 	my $glob = shift;
 
 	my $match=match_glob($page, "$glob/*", internal => 1, @_);
-	if ($match) {
+	if ($match && exists $IkiWiki::pagesources{$page}) {
 		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
-		if ($type ne "_comment") {
+		if (defined $type && $type ne "_comment") {
 			return IkiWiki::FailReason->new("$page is not a comment");
 		}
 	}
@@ -921,9 +921,9 @@ sub match_comment_pending ($$;@) {
 	my $glob = shift;
 
 	my $match=match_glob($page, "$glob/*", internal => 1, @_);
-	if ($match) {
+	if ($match && $IkiWiki::pagesources{$page}) {
 		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
-		if ($type ne "_comment_pending") {
+		if (defined $type && $type ne "_comment_pending") {
 			return IkiWiki::FailReason->new("$page is not a pending comment");
 		}
 	}
-- 
cgit v1.2.3


From c420e057f36b39b8ba4599cc95de7e90407e43ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:32:43 -0400
Subject: response

---
 doc/forum/how_to_login_as_admin.mdwn | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
index 67ee9e377..e960d66b3 100644
--- a/doc/forum/how_to_login_as_admin.mdwn
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -1 +1,14 @@
-I even managed to set up ikiwiki so it works fine with git; but how on earth do I log in as an administrator? In the .setup file the admin user is set to 'zimek' but when I go and register 'zimek' on the web it appears as normal user not the administrator. What am I missing?
+I even managed to set up ikiwiki so it works fine with git; but how on earth do
+I log in as an administrator? In the .setup file the admin user is set to
+'zimek' but when I go and register 'zimek' on the web it appears as normal user
+not the administrator. What am I missing?
+
+> That's really all there is to it. The [[automatic_setup|setup]] script
+> registers the admin user for you before the wiki goes live. If you didn't
+> use it, registering the right account name will get you the admin account.
+> 
+> The name is case sensative, perhaps you really spelled one of them `Zimek`?
+> 
+> Or maybe you're the admin, and don't know it? Everything looks the same for the admin,
+> except they can edit even locked pages, and can access the websetup interface from their
+> Preferences page, if you have that plugin enabled. --[[Joey]] 
-- 
cgit v1.2.3


From 682a6480d9dc0256c021fea7565e63c7372d5991 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:39:34 +0000
Subject:

---
 doc/forum/how_to_login_as_admin.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
index e960d66b3..0f32dc428 100644
--- a/doc/forum/how_to_login_as_admin.mdwn
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -12,3 +12,5 @@ not the administrator. What am I missing?
 > Or maybe you're the admin, and don't know it? Everything looks the same for the admin,
 > except they can edit even locked pages, and can access the websetup interface from their
 > Preferences page, if you have that plugin enabled. --[[Joey]] 
+
+>> Maybe I'm indeed. I know that I've disabled all the plugins while installing ikiwiki. Checking it now ;-)
-- 
cgit v1.2.3


From 8d3c89f0c75c31c5e17a661150662e3efd3a146e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:44:24 -0400
Subject: bugfixes

---
 IkiWiki/Plugin/comments.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 76f6551ae..93c8c4061 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -557,7 +557,7 @@ sub commentmoderation ($$) {
 		my %vars=$cgi->Vars;
 		my $added=0;
 		foreach my $id (keys %vars) {
-			if ($id =~ /(.*)\Q._comment(?:_pending)?\E$/) {
+			if ($id =~ /(.*)\._comment(?:_pending)?$/) {
 				my $action=$cgi->param($id);
 				next if $action eq 'Defer' && ! $rejectalldefer;
 
@@ -621,7 +621,7 @@ sub commentmoderation ($$) {
 			id => $id,
 			view => $preview,
 		}
-	} sort { $b->[1] <=> $a->[1] } comments_pending();
+	} sort { $b->[2] <=> $a->[2] } comments_pending();
 
 	my $template=template("commentmoderation.tmpl");
 	$template->param(
-- 
cgit v1.2.3


From 941782168040c00d46e9bdf7a1b5014972973ef5 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:46:39 +0000
Subject:

---
 doc/forum/how_to_login_as_admin.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
index 0f32dc428..b4e704a80 100644
--- a/doc/forum/how_to_login_as_admin.mdwn
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -14,3 +14,5 @@ not the administrator. What am I missing?
 > Preferences page, if you have that plugin enabled. --[[Joey]] 
 
 >> Maybe I'm indeed. I know that I've disabled all the plugins while installing ikiwiki. Checking it now ;-)
+
+>> Yup, I'm the God of my ikiwiki.
-- 
cgit v1.2.3


From 2dfdadf10cefea593508e85979a0dff8c1584f2f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:47:29 -0400
Subject: bugfix

---
 IkiWiki/Plugin/comments.pm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 93c8c4061..077c4776b 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -473,7 +473,7 @@ sub editcomment ($$) {
 		$postcomment=0;
 
 		if (! $ok) {
-			$location=unique_comment_location($page, $content, $config{srcdir});
+			$location=unique_comment_location($page, $content, $config{srcdir}, "._comment_pending");
 			writefile("$location._comment_pending", $config{srcdir}, $content);
 
 			# Refresh so anything that deals with pending
@@ -858,22 +858,20 @@ sub num_comments ($$) {
 	return @comments;
 }
 
-sub unique_comment_location ($$$) {
+sub unique_comment_location ($$$$) {
 	my $page=shift;
-
 	eval q{use Digest::MD5 'md5_hex'};
 	error($@) if $@;
 	my $content_md5=md5_hex(Encode::encode_utf8(shift));
-
 	my $dir=shift;
+	my $ext=shift || "._comment";
 
 	my $location;
 	my $i = num_comments($page, $dir);
 	do {
 		$i++;
 		$location = "$page/$config{comments_pagename}${i}_${content_md5}";
-	} while (-e "$dir/$location._comment" ||
-	         -e "$dir/$location._comment_pending");
+	} while (-e "$dir/$location$ext");
 
 	return $location;
 }
-- 
cgit v1.2.3


From 9b18bdf1e1b5176c100dc1cbee4853d0538c3a71 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:48:43 +0000
Subject:

---
 doc/forum/how_to_login_as_admin.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
index b4e704a80..807f82501 100644
--- a/doc/forum/how_to_login_as_admin.mdwn
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -15,4 +15,4 @@ not the administrator. What am I missing?
 
 >> Maybe I'm indeed. I know that I've disabled all the plugins while installing ikiwiki. Checking it now ;-)
 
->> Yup, I'm the God of my ikiwiki.
+>> Yup, I'm the God of my ikiwiki. (Thanks)
-- 
cgit v1.2.3


From 93ad589b463259916f3d1c2db4e6ff590b6ae9e2 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:51:53 +0000
Subject:

---
 ...double_forward_slash___39____47____47____39___in_the_address_bar.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn

diff --git a/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn b/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
new file mode 100644
index 000000000..38e486c73
--- /dev/null
+++ b/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
@@ -0,0 +1 @@
+Why do all the pages are preceded with a double forward slash in the address bar... ie. http://example.org//ikiwiki/pagespec/ .. maybe someone knows?
-- 
cgit v1.2.3


From fe8f4a77818f835aaaeb3784ca954e9ae96b4709 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:55:08 -0400
Subject: better wording

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 077c4776b..5d7176a8c 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -109,7 +109,7 @@ sub htmlize {
 
 sub htmlize_pending {
 	my %params = @_;
-	return sprintf(gettext("comment pending %s"),
+	return sprintf(gettext("this comment needs %s"),
 		'<a href="'.
 		IkiWiki::cgiurl(do => "commentmoderation").'">'.
 		gettext("moderation").'</a>');
-- 
cgit v1.2.3


From 6a83be26471ac6615bad48a1a365a7e62e972a7b Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:56:06 +0000
Subject:

---
 ...ouble_forward_slash___39____47____47____39___in_the_address_bar.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn b/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
index 38e486c73..b5fb2aa18 100644
--- a/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
+++ b/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
@@ -1 +1,3 @@
 Why do all the pages are preceded with a double forward slash in the address bar... ie. http://example.org//ikiwiki/pagespec/ .. maybe someone knows?
+
+> Sorted, base url in the .setup file had the unnecessary '/' suffix.
-- 
cgit v1.2.3


From b50b549cabc8695959628bee10e015d2dcbb2e95 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:59:08 -0400
Subject: fix comment matching pagespecs

test isinternal first, because match_glob with internal => 1 also returns
non-internal pages that match. This order should also be faster.

Remove test to see if pagesources is set. isinternal will not succeed if it
is not.
---
 IkiWiki/Plugin/comments.pm | 32 +++++++++++++++++---------------
 debian/changelog           |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 5d7176a8c..348d91fd8 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -904,28 +904,30 @@ sub match_comment ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 
-	my $match=match_glob($page, "$glob/*", internal => 1, @_);
-	if ($match && exists $IkiWiki::pagesources{$page}) {
-		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
-		if (defined $type && $type ne "_comment") {
-			return IkiWiki::FailReason->new("$page is not a comment");
-		}
+	if (! IkiWiki::isinternal($page)) {
+		return IkiWiki::FailReason->new("$page is not a comment");
+	}
+	my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+	if (defined $type && $type ne "_comment") {
+		return IkiWiki::FailReason->new("$page is not a comment");
 	}
-	return $match;
+
+	return match_glob($page, "$glob/*", internal => 1, @_);
 }
 
 sub match_comment_pending ($$;@) {
 	my $page = shift;
 	my $glob = shift;
-
-	my $match=match_glob($page, "$glob/*", internal => 1, @_);
-	if ($match && $IkiWiki::pagesources{$page}) {
-		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
-		if (defined $type && $type ne "_comment_pending") {
-			return IkiWiki::FailReason->new("$page is not a pending comment");
-		}
+	
+	if (! IkiWiki::isinternal($page)) {
+		return IkiWiki::FailReason->new("$page is not a pending comment");
 	}
-	return $match;
+	my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+	if (defined $type && $type ne "_comment_pending") {
+		return IkiWiki::FailReason->new("$page is not a pending comment");
+	}
+
+	return match_glob($page, "$glob/*", internal => 1, @_);
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index 7f024a84b..0851a975d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     to set <base> when BASEURL or FORCEBAREURL is set.
   * comments: Comments pending moderation are now stored in the srcdir
     alongside accepted comments, but with a `._comment_pending` extension.
-  * This allows easier byhand moderation, as the "_pending" need
+    This allows easier byhand moderation, as the "_pending" need
     only be stripped off and the comment be committed to version control.
   * The `comment_pending()` pagespec can be used to match such unmoderated
     comments, which makes it easy to add a feed of them, or a counter
-- 
cgit v1.2.3


From 70f121af025764bda665767d2566b9fa2f66ea91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 14:12:14 -0400
Subject: switch to use comments(), and add a count (and a feed) of comments
 pending moderation

---
 doc/examples/blog/comments.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 0b503ba01..32ffa5537 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,3 +1,7 @@
 This page will show recent comments made to posts in the [[blog|index]].
 
-[[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]]
+There are [[!pagecount pages="comment_pending(/posts/*)"]] comments
+in the moderation queue.
+[[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
+
+[[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
-- 
cgit v1.2.3


From be2669e1e1e51ccf1514ce60697e1ba7ed05497e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 15:00:45 -0400
Subject: todo

---
 doc/roadmap.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index e257c21a2..cdec6e7e8 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -81,6 +81,7 @@ Probably incomplete list:
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
 * [[tips/html5]] on by default (some day..)
+* Remove support for old `.ikiwiki/comments_pending` from comment plugin.
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From 2ee820dedd9ab80dd0f37c4169970485cb529c3b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 17:11:23 -0400
Subject: avoid linking directly to ikiwiki.cgi?do=signin

Instead, add a custom do=commentsignin, that calls cgi_signin.

This allows a plugin to inject a custom cgi_signin, that uses a different
do= parameter, and have it be used consitently. (This was the only
place to hardcode a link to do=signin.)
---
 IkiWiki/Plugin/comments.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 89560c88b..6d513cd2a 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -251,6 +251,10 @@ sub sessioncgi ($$) {
 	elsif ($do eq 'commentmoderation') {
 		commentmoderation($cgi, $session);
 	}
+	elsif ($do eq 'commentsignin') {
+		IkiWiki::cgi_signin($cgi, $session);
+		exit;
+	}
 }
 
 # Mostly cargo-culted from IkiWiki::plugin::editpage
@@ -328,7 +332,7 @@ sub editcomment ($$) {
 
 	if (! defined $session->param('name')) {
 		# Make signinurl work and return here.
-		$form->tmpl_param(signinurl => IkiWiki::cgiurl(do => 'signin'));
+		$form->tmpl_param(signinurl => IkiWiki::cgiurl(do => 'commentsignin'));
 		$session->param(postsignin => $ENV{QUERY_STRING});
 		IkiWiki::cgi_savesession($session);
 	}
-- 
cgit v1.2.3


From 79b309b3580a6a96aa11c8a59c9734912bec0156 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 21:56:56 +0000
Subject:

---
 doc/forum/debian_backports_update_someone_please.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/debian_backports_update_someone_please.mdwn

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
new file mode 100644
index 000000000..e5b3cf338
--- /dev/null
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -0,0 +1 @@
+I'm just in the process of deploying ikiwiki and I'd love to use it in the html5 mode instead of in XHTML. Any chance that the ikiwiki's .deb in debian backports will be updated any time soon?
-- 
cgit v1.2.3


From 9541defa69b967d50d3abd8e34e3d5d40e73b358 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 21:59:05 +0000
Subject:

---
 doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
new file mode 100644
index 000000000..a26bc9448
--- /dev/null
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -0,0 +1 @@
+Puzzled a bit :-/
-- 
cgit v1.2.3


From 7749350ecd8e760ff6f7808348e750f1feaac248 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 19:02:30 -0400
Subject: r21 from http://code.google.com/p/openid-selector/source/checkout

---
 .../ikiwiki/openid-selector/openid-jquery.js       | 240 +++++++++++++++++++++
 1 file changed, 240 insertions(+)
 create mode 100644 underlays/javascript/ikiwiki/openid-selector/openid-jquery.js

diff --git a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
new file mode 100644
index 000000000..eceaddef3
--- /dev/null
+++ b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
@@ -0,0 +1,240 @@
+/*
+Simple OpenID Plugin
+http://code.google.com/p/openid-selector/
+
+This code is licenced under the New BSD License.
+*/
+
+var providers_large = {
+    google: {
+        name: 'Google',
+        url: 'https://www.google.com/accounts/o8/id'
+    },
+    yahoo: {
+        name: 'Yahoo',      
+        url: 'http://yahoo.com/'
+    },    
+    aol: {
+        name: 'AOL',     
+        label: 'Enter your AOL screenname.',
+        url: 'http://openid.aol.com/{username}'
+    },
+    verisign: {
+        name: 'Verisign',
+        label: 'Your Verisign username',
+        url: 'http://{username}.pip.verisignlabs.com/'
+    },
+    openid: {
+        name: 'OpenID',     
+        label: 'Enter your OpenID.',
+        url: null
+    }
+};
+var providers_small = {
+    myopenid: {
+        name: 'MyOpenID',
+        label: 'Enter your MyOpenID username.',
+        url: 'http://{username}.myopenid.com/'
+    },
+    livejournal: {
+        name: 'LiveJournal',
+        label: 'Enter your Livejournal username.',
+        url: 'http://{username}.livejournal.com/'
+    },
+    flickr: {
+        name: 'Flickr',        
+        label: 'Enter your Flickr username.',
+        url: 'http://flickr.com/{username}/'
+    },
+    technorati: {
+        name: 'Technorati',
+        label: 'Enter your Technorati username.',
+        url: 'http://technorati.com/people/technorati/{username}/'
+    },
+    wordpress: {
+        name: 'Wordpress',
+        label: 'Enter your Wordpress.com username.',
+        url: 'http://{username}.wordpress.com/'
+    },
+    blogger: {
+        name: 'Blogger',
+        label: 'Your Blogger account',
+        url: 'http://{username}.blogspot.com/'
+    },
+    vidoop: {
+        name: 'Vidoop',
+        label: 'Your Vidoop username',
+        url: 'http://{username}.myvidoop.com/'
+    },
+    claimid: {
+        name: 'ClaimID',
+        label: 'Your ClaimID username',
+        url: 'http://claimid.com/{username}'
+    }
+};
+var providers = $.extend({}, providers_large, providers_small);
+
+var openid = {
+
+	demo: false,
+	ajaxHandler: null,
+	cookie_expires: 6*30,	// 6 months.
+	cookie_name: 'openid_provider',
+	cookie_path: '/',
+	
+	img_path: 'images/',
+	
+	input_id: null,
+	provider_url: null,
+	provider_id: null,
+	
+    init: function(input_id) {
+        
+        var openid_btns = $('#openid_btns');
+        
+        this.input_id = input_id;
+        
+        $('#openid_choice').show();
+        $('#openid_input_area').empty();
+        
+        // add box for each provider
+        for (id in providers_large) {
+        
+           	openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif'));
+        }
+        if (providers_small) {
+        	openid_btns.append('<br/>');
+        	
+	        for (id in providers_small) {
+	        
+	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico'));
+	        }
+        }
+        
+        $('#openid_form').submit(this.submit);
+        
+        var box_id = this.readCookie();
+        if (box_id) {
+        	this.signin(box_id, true);
+        }  
+    },
+    getBoxHTML: function(provider, box_size, image_ext) {
+            
+        var box_id = provider["name"].toLowerCase();
+        return '<a title="'+provider["name"]+'" href="javascript: openid.signin(\''+ box_id +'\');"' +
+        		' style="background: #FFF url(' + this.img_path + box_id + image_ext+') no-repeat center center" ' + 
+        		'class="' + box_id + ' openid_' + box_size + '_btn"></a>';    
+    
+    },
+    /* Provider image click */
+    signin: function(box_id, onload) {
+    
+    	var provider = providers[box_id];
+  		if (! provider) {
+  			return;
+  		}
+		
+		this.highlight(box_id);
+		this.setCookie(box_id);
+		
+		this.provider_id = box_id;
+		this.provider_url = provider['url'];
+		
+		// prompt user for input?
+		if (provider['label']) {
+			this.useInputBox(provider);
+		} else {
+			$('#openid_input_area').empty();
+			if (! onload) {
+				$('#openid_form').submit();
+			}
+		}
+    },
+    /* Sign-in button click */
+    submit: function() {
+        
+    	var url = openid.provider_url; 
+    	if (url) {
+    		url = url.replace('{username}', $('#openid_username').val());
+    		openid.setOpenIdUrl(url);
+    	}
+    	if(openid.ajaxHandler) {
+    		openid.ajaxHandler(openid.provider_id, document.getElementById(openid.input_id).value);
+    		return false;
+    	}
+    	if(openid.demo) {
+    		alert("In client demo mode. Normally would have submitted OpenID:\r\n" + document.getElementById(openid.input_id).value);
+    		return false;
+    	}
+    	return true;
+    },
+    setOpenIdUrl: function (url) {
+    
+    	var hidden = document.getElementById(this.input_id);
+    	if (hidden != null) {
+    		hidden.value = url;
+    	} else {
+    		$('#openid_form').append('<input type="hidden" id="' + this.input_id + '" name="' + this.input_id + '" value="'+url+'"/>');
+    	}
+    },
+    highlight: function (box_id) {
+    	
+    	// remove previous highlight.
+    	var highlight = $('#openid_highlight');
+    	if (highlight) {
+    		highlight.replaceWith($('#openid_highlight a')[0]);
+    	}
+    	// add new highlight.
+    	$('.'+box_id).wrap('<div id="openid_highlight"></div>');
+    },
+    setCookie: function (value) {
+    
+		var date = new Date();
+		date.setTime(date.getTime()+(this.cookie_expires*24*60*60*1000));
+		var expires = "; expires="+date.toGMTString();
+		
+		document.cookie = this.cookie_name+"="+value+expires+"; path=" + this.cookie_path;
+    },
+    readCookie: function () {
+		var nameEQ = this.cookie_name + "=";
+		var ca = document.cookie.split(';');
+		for(var i=0;i < ca.length;i++) {
+			var c = ca[i];
+			while (c.charAt(0)==' ') c = c.substring(1,c.length);
+			if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+		}
+		return null;
+    },
+    useInputBox: function (provider) {
+   	
+		var input_area = $('#openid_input_area');
+		
+		var html = '';
+		var id = 'openid_username';
+		var value = '';
+		var label = provider['label'];
+		var style = '';
+		
+		if (label) {
+			html = '<p>' + label + '</p>';
+		}
+		if (provider['name'] == 'OpenID') {
+			id = this.input_id;
+			value = 'http://';
+			style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;';
+		}
+		html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
+					'<input id="openid_submit" type="submit" value="Sign-In"/>';
+		
+		input_area.empty();
+		input_area.append(html);
+
+		$('#'+id).focus();
+    },
+    setDemoMode: function (demoMode) {
+    	this.demo = demoMode;
+    },
+    setAjaxHandler: function (ajaxFunction) {
+    	this.ajaxHandler = ajaxFunction;
+    }
+};
-- 
cgit v1.2.3


From 76f6ff5f6b437534f8778abf225e2c4398262489 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 19:02:55 -0400
Subject: use me.yahoo.com

Fixes http://code.google.com/p/openid-selector/issues/detail?id=10
---
 underlays/javascript/ikiwiki/openid-selector/openid-jquery.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
index eceaddef3..3b60827b6 100644
--- a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
+++ b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
@@ -12,7 +12,7 @@ var providers_large = {
     },
     yahoo: {
         name: 'Yahoo',      
-        url: 'http://yahoo.com/'
+        url: 'http://me.yahoo.com/'
     },    
     aol: {
         name: 'AOL',     
-- 
cgit v1.2.3


From 378c64776856ee1313c030375a921e8acb4ff1ef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 19:10:50 -0400
Subject: patch hidden field setting code

Fixes http://code.google.com/p/openid-selector/issues/detail?id=11#c3
---
 IkiWiki/Plugin/openid.pm                           | 82 ++++++++++++++++++----
 debian/changelog                                   |  2 +
 debian/copyright                                   |  7 ++
 doc/templates.mdwn                                 |  4 +-
 templates/openid-selector.tmpl                     | 30 ++++++++
 .../ikiwiki/openid-selector/openid-jquery.js       |  8 +--
 6 files changed, 114 insertions(+), 19 deletions(-)
 create mode 100644 templates/openid-selector.tmpl

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 7b1a17831..0ad8697d8 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
+	hook(type => "checkconfig", id => "openid", call => \&checkconfig);
 	hook(type => "getopt", id => "openid", call => \&getopt);
 	hook(type => "getsetup", id => "openid", call => \&getsetup);
 	hook(type => "auth", id => "openid", call => \&auth);
@@ -14,6 +15,18 @@ sub import {
 		call => \&formbuilder_setup, last => 1);
 }
 
+sub checkconfig () {
+	if ($config{cgi}) {
+		# Intercept normal signin form, so the openid selector
+		# can be displayed.
+		require IkiWiki::CGI;
+		my $real_cgi_signin=\&IkiWiki::cgi_signin;
+		inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
+				openid_selector($real_cgi_signin, @_);
+		});
+	}
+}
+
 sub getopt () {
 	eval q{use Getopt::Long};
 	error($@) if $@;
@@ -37,6 +50,39 @@ sub getsetup () {
 		},
 }
 
+sub openid_selector {
+	my $real_cgi_signin=shift;
+        my $q=shift;
+        my $session=shift;
+
+	my $openid_url=$q->param('openid_url');
+	my $openid_error;
+
+	if (defined $q->param("action") && $q->param("action") eq "verify") {
+		validate($q, $session, $openid_url, sub {
+			$openid_error=shift;
+		});
+	}
+	elsif ($q->param("do") eq "signin" || ! load_openid_module()) {
+		$real_cgi_signin->($q, $session);
+		exit;
+	}
+
+	my $template=IkiWiki::template("openid-selector.tmpl");
+	$template->param(
+		cgiurl => $config{cgiurl},
+		(defined $openid_error ? (openid_error => $openid_error) : ()),
+		(defined $openid_url ? (openid_url => $openid_url) : ()),
+		# TODO only if other auth methods are available
+		nonopenidurl => IkiWiki::cgiurl(do => "signin"),
+		loginlabel => loginlabel(),
+	);
+
+	IkiWiki::printheader($session);
+	print IkiWiki::misctemplate("signin", $template->output);
+	exit;
+}
+
 sub formbuilder_setup (@) {
 	my %params=@_;
 
@@ -45,13 +91,7 @@ sub formbuilder_setup (@) {
 	my $cgi=$params{cgi};
 	
 	if ($form->title eq "signin") {
-		# Give up if module is unavailable to avoid
-		# needing to depend on it.
-		eval q{use Net::OpenID::Consumer};
-		if ($@) {
-			debug("unable to load Net::OpenID::Consumer, not enabling OpenID login ($@)");
-			return;
-		}
+		return unless load_openid_module();
 
 		# This avoids it displaying a redundant label for the
 		# OpenID fieldset.
@@ -59,7 +99,7 @@ sub formbuilder_setup (@) {
 
 		$form->field(
 			name => "openid_url",
-			label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
+			label => loginlabel(),
 			fieldset => "OpenID",
 			size => 30,
 			comment => ($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
@@ -72,7 +112,10 @@ sub formbuilder_setup (@) {
 			$form->field(
 				name => "openid_url",
 				validate => sub {
-					validate($cgi, $session, shift, $form);
+					validate($cgi, $session, shift, sub {
+						# Display error in the form.
+						$form->field(name => "openid_url", comment => shift);
+					});
 				},
 			);
 			# Skip all other required fields in this case.
@@ -98,15 +141,14 @@ sub validate ($$$;$) {
 	my $q=shift;
 	my $session=shift;
 	my $openid_url=shift;
-	my $form=shift;
+	my $errhandler=shift;
 
 	my $csr=getobj($q, $session);
 
 	my $claimed_identity = $csr->claimed_identity($openid_url);
 	if (! $claimed_identity) {
-		if ($form) {
-			# Put the error in the form and fail validation.
-			$form->field(name => "openid_url", comment => $csr->err);
+		if ($errhandler) {
+			$errhandler->($csr->err);
 			return 0;
 		}
 		else {
@@ -230,4 +272,18 @@ sub getobj ($$) {
 	);
 }
 
+sub load_openid_module {
+	# Give up if module is unavailable to avoid needing to depend on it.
+	eval q{use Net::OpenID::Consumer};
+	if ($@) {
+		debug("unable to load Net::OpenID::Consumer, not enabling OpenID login ($@)");
+		return;
+	}
+	return 1;
+}
+
+sub loginlabel {
+	return gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1);
+}
+
 1
diff --git a/debian/changelog b/debian/changelog
index 31d64e237..c335030ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * inline: Call indexhtml when inlining internal pages, so their
     text can be indexed for searching.
   * Delete hooks are passed deleted internal pages. 
+  * openid: Incorporated a fancy openid-selector signin form
+    (http://code.google.com/p/openid-selector/).
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/debian/copyright b/debian/copyright
index d4bb1009f..b6dd3782b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -191,6 +191,13 @@ License: GPL-2+
 
 Files: cvs.pm
 Copyright: © 2009 Amitai Schlair
+License: BSD-C2
+
+Files: underlays/javascript/ikiwiki/openid-selector/*
+Copyright: © 2008-2010 andyjm, david.j.boden
+License: BSD-C2
+  From http://code.google.com/p/openid-selector/
+
 License: BSD-C2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 8f6561fcf..22b9345ef 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -71,7 +71,7 @@ html out of ikiwiki and in the templates.
 * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
   `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
   `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
-  `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not
-  normally need to be customised.
+  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user
+  interface; do not normally need to be customised.
 
 [[!meta robots="noindex, follow"]]
diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
new file mode 100644
index 000000000..76c4051ed
--- /dev/null
+++ b/templates/openid-selector.tmpl
@@ -0,0 +1,30 @@
+<script type="text/javascript" src="ikiwiki/openid-selector/jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/openid-selector/openid-jquery.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+	openid.init('openid_url');
+});
+</script>
+	
+<TMPL_IF OPENID_ERROR>
+<div class="error"><TMPL_VAR OPENID_ERROR></span>
+</TMPL_IF>
+</div>
+
+<form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
+	<input type="hidden" name="do" value="signin" />
+	<input type="hidden" name="action" value="verify" />
+ 	<div id="openid_choice">
+		<p><TMPL_VAR LOGINLABEL>:</p>
+		<div id="openid_btns">
+		</div>
+		<TMPL_IF NONOPENIDURL>
+		<a href="<TMPL_VAR NONOPENIDURL>">local account</a>
+		</TMPL_IF>
+	</div>
+	
+	<span id="openid_input_area">
+		<input id="openid_url" name="openid_url" type="text" value="<TMPL_VAR OPENID_URL>"/>
+		<input id="openid_submit" type="submit" value="Login"/>
+	</span>
+</form>
diff --git a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
index 3b60827b6..f39fff842 100644
--- a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
+++ b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
@@ -170,11 +170,11 @@ var openid = {
     },
     setOpenIdUrl: function (url) {
     
-    	var hidden = document.getElementById(this.input_id);
-    	if (hidden != null) {
-    		hidden.value = url;
+	var hidden = $('#'+this.input_id);
+	if (hidden.length > 0) {
+		hidden.value = url;
     	} else {
-    		$('#openid_form').append('<input type="hidden" id="' + this.input_id + '" name="' + this.input_id + '" value="'+url+'"/>');
+		$('#openid_form').append('<input style="display:none" id="' + this.input_id + '" name="' + this.input_id + '" value="'+url+'"/>');
     	}
     },
     highlight: function (box_id) {
-- 
cgit v1.2.3


From 1b8d2ce36b5d6098b318c5b2f75b0e2752b51ac6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 19:29:59 -0400
Subject: add minified jquery.js from openid-selector svn

---
 .../javascript/ikiwiki/openid-selector/jquery.js   | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 underlays/javascript/ikiwiki/openid-selector/jquery.js

diff --git a/underlays/javascript/ikiwiki/openid-selector/jquery.js b/underlays/javascript/ikiwiki/openid-selector/jquery.js
new file mode 100644
index 000000000..82b98e1d7
--- /dev/null
+++ b/underlays/javascript/ikiwiki/openid-selector/jquery.js
@@ -0,0 +1,32 @@
+/*
+ * jQuery 1.2.6 - New Wave Javascript
+ *
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
+ * $Rev: 5685 $
+ */
+(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
+return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
+return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
+selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
+return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
+this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
+return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
+jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
+script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
+for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
+for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
+jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
+ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
+while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
+while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
+for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
+jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
+xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
+jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
+for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
+s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
+e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
-- 
cgit v1.2.3


From 1fb9db21807d5136794e3d88bb3c453c03401b00 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Sat, 8 May 2010 00:02:04 +0000
Subject:

---
 doc/forum/debian_backports_update_someone_please.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index e5b3cf338..b3fbf1adc 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -1 +1,5 @@
 I'm just in the process of deploying ikiwiki and I'd love to use it in the html5 mode instead of in XHTML. Any chance that the ikiwiki's .deb in debian backports will be updated any time soon?
+
+> Formerer does a good job keeping the backport up-to-date with whatever is in Debian testing. 
+> Which is the policy of what Backports should contain. So, I just need to stop releasing ikiwiki
+> for 2 weeks. :) --[[Joey]]
-- 
cgit v1.2.3


From e196bd3f3a2b1b48fbd19f1014bf03b044c4e829 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Sat, 8 May 2010 00:02:59 +0000
Subject:

---
 doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index a26bc9448..a4644ff64 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -1 +1,3 @@
 Puzzled a bit :-/
+
+> There is no explicit interface for reverting edits. Most of us use `git revert`. --[[Joey]]
-- 
cgit v1.2.3


From f8c2a67b3cdbce81bbb661e05411a129b07414ce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 20:14:25 -0400
Subject: pretty openid login

* openid: Incorporated a fancy openid-selector signin form.
  (http://code.google.com/p/openid-selector/)
* openid: Use "openid_identifier" as the form field, as required
  by OpenID Authentication v2.0 spec.
---
 IkiWiki/Plugin/openid.pm                           |  68 ++----
 debian/changelog                                   |   6 +-
 debian/copyright                                   |   6 +-
 doc/style.css                                      |  57 +++--
 t/openiduser.t                                     |   2 +-
 t/permalink.t                                      |   2 +-
 templates/openid-selector.tmpl                     |  37 ++--
 .../javascript/ikiwiki/openid-selector/jquery.js   |  32 ---
 .../ikiwiki/openid-selector/openid-jquery.js       | 240 ---------------------
 underlays/openid-selector/ikiwiki/openid/jquery.js |  32 +++
 .../ikiwiki/openid/openid-jquery.js                | 240 +++++++++++++++++++++
 11 files changed, 363 insertions(+), 359 deletions(-)
 delete mode 100644 underlays/javascript/ikiwiki/openid-selector/jquery.js
 delete mode 100644 underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
 create mode 100644 underlays/openid-selector/ikiwiki/openid/jquery.js
 create mode 100644 underlays/openid-selector/ikiwiki/openid/openid-jquery.js

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 0ad8697d8..e722c68ba 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
+	add_underlay("openid-selector");
 	hook(type => "checkconfig", id => "openid", call => \&checkconfig);
 	hook(type => "getopt", id => "openid", call => \&getopt);
 	hook(type => "getsetup", id => "openid", call => \&getsetup);
@@ -19,10 +20,16 @@ sub checkconfig () {
 	if ($config{cgi}) {
 		# Intercept normal signin form, so the openid selector
 		# can be displayed.
-		require IkiWiki::CGI;
-		my $real_cgi_signin=\&IkiWiki::cgi_signin;
+		# 
+		# When other auth hooks are registered, give the selector
+		# a reference to the normal signin form.
+		my $real_cgi_signin;
+		if (keys %{$IkiWiki::hooks{auth}} > 1) {
+			require IkiWiki::CGI;
+			$real_cgi_signin=\&IkiWiki::cgi_signin;
+		}
 		inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
-				openid_selector($real_cgi_signin, @_);
+			openid_selector($real_cgi_signin, @_);
 		});
 	}
 }
@@ -55,15 +62,21 @@ sub openid_selector {
         my $q=shift;
         my $session=shift;
 
-	my $openid_url=$q->param('openid_url');
+	my $openid_url=$q->param('openid_identifier');
 	my $openid_error;
 
-	if (defined $q->param("action") && $q->param("action") eq "verify") {
+	if (! load_openid_module()) {
+		if ($real_cgi_signin) {
+			$real_cgi_signin->($q, $session);
+		}
+		error(sprintf(gettext("failed to load openid module: "), @_));
+	}
+	elsif (defined $q->param("action") && $q->param("action") eq "verify") {
 		validate($q, $session, $openid_url, sub {
 			$openid_error=shift;
 		});
 	}
-	elsif ($q->param("do") eq "signin" || ! load_openid_module()) {
+	elsif ($q->param("do") eq "signin" && $real_cgi_signin) {
 		$real_cgi_signin->($q, $session);
 		exit;
 	}
@@ -73,8 +86,7 @@ sub openid_selector {
 		cgiurl => $config{cgiurl},
 		(defined $openid_error ? (openid_error => $openid_error) : ()),
 		(defined $openid_url ? (openid_url => $openid_url) : ()),
-		# TODO only if other auth methods are available
-		nonopenidurl => IkiWiki::cgiurl(do => "signin"),
+		($real_cgi_signin ? (nonopenidurl => IkiWiki::cgiurl(do => "signin")) : ()),
 		loginlabel => loginlabel(),
 	);
 
@@ -90,45 +102,9 @@ sub formbuilder_setup (@) {
 	my $session=$params{session};
 	my $cgi=$params{cgi};
 	
-	if ($form->title eq "signin") {
-		return unless load_openid_module();
-
-		# This avoids it displaying a redundant label for the
-		# OpenID fieldset.
-		$form->fieldsets("OpenID");
-
-		$form->field(
-			name => "openid_url",
-			label => loginlabel(),
-			fieldset => "OpenID",
-			size => 30,
-			comment => ($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
-		);
-
-		# Handle submission of an OpenID as validation.
-		if ($form->submitted && $form->submitted eq "Login" &&
-		    defined $form->field("openid_url") && 
-		    length $form->field("openid_url")) {
-			$form->field(
-				name => "openid_url",
-				validate => sub {
-					validate($cgi, $session, shift, sub {
-						# Display error in the form.
-						$form->field(name => "openid_url", comment => shift);
-					});
-				},
-			);
-			# Skip all other required fields in this case.
-			foreach my $field ($form->field) {
-				next if $field eq "openid_url";
-				$form->field(name => $field, required => 0,
-					validate => '/.*/');
-			}
-		}
-	}
-	elsif ($form->title eq "preferences" &&
+	if ($form->title eq "preferences" &&
 	       IkiWiki::openiduser($session->param("name"))) {
-		$form->field(name => "openid_url", disabled => 1,
+		$form->field(name => "openid_identifier", disabled => 1,
 			label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
 			value => $session->param("name"), 
 			size => 50, force => 1,
diff --git a/debian/changelog b/debian/changelog
index c335030ed..3f20aec1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * inline: Call indexhtml when inlining internal pages, so their
     text can be indexed for searching.
   * Delete hooks are passed deleted internal pages. 
-  * openid: Incorporated a fancy openid-selector signin form
-    (http://code.google.com/p/openid-selector/).
+  * openid: Incorporated a fancy openid-selector signin form.
+    (http://code.google.com/p/openid-selector/)
+  * openid: Use "openid_identifier" as the form field, as required
+    by OpenID Authentication v2.0 spec.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/debian/copyright b/debian/copyright
index b6dd3782b..7ef266151 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -193,11 +193,15 @@ Files: cvs.pm
 Copyright: © 2009 Amitai Schlair
 License: BSD-C2
 
-Files: underlays/javascript/ikiwiki/openid-selector/*
+Files: underlays/openid-selector/ikiwiki/openid/*
 Copyright: © 2008-2010 andyjm, david.j.boden
 License: BSD-C2
   From http://code.google.com/p/openid-selector/
 
+Files: underlays/openid-selector/ikiwiki/openid/jquery.js
+Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer
+License: GPL-2
+
 License: BSD-C2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/doc/style.css b/doc/style.css
index 5f77037e4..75aa28407 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -319,16 +319,6 @@ legend {
 	float: left;
 	margin: 2px 0;
 }
-#signin_openid_url_label {
-	float: left;
-	margin-right: 1ex;
-}
-#signin_openid {
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-	background: #eee; 
-	color: black !important;
-}
 label.block {    
 	display: block;   
 }
@@ -342,13 +332,6 @@ ol.form {
 li.form {
 	padding-bottom: 1em;
 }
-input#openid_url {
-	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 0 50%;
-	color: #000;
-	padding-left: 18px;
-}
 input#searchbox {
 	background: url(wikiicons/search-bg.gif) no-repeat;
 	background-color: #fff;
@@ -440,3 +423,43 @@ li.L8 { list-style: upper-alpha; }
 	color: white !important;
 	background: #ff9900;
 }
+
+/* openid selector */
+#openid_choice {
+	display: none;
+}
+#openid_input_area {
+	clear: both;
+	padding: 10px;
+}
+#openid_btns, #openid_btns br {
+	clear: both;
+}
+#openid_highlight {
+	padding: 3px;
+	background-color: #FFFCC9;
+	float: left;
+}
+.openid_large_btn {
+	width: 100px;
+	height: 60px;
+	border: 1px solid #DDD;
+	margin: 3px;
+	float: left;
+}
+.openid_small_btn {
+	width: 24px;
+	height: 24px;
+	border: 1px solid #DDD;
+	margin: 3px;
+	float: left;
+}
+a.openid_large_btn:focus {
+	outline: none;
+}
+a.openid_large_btn:focus {
+	-moz-outline-style: none;
+}
+.openid_selected {
+	border: 4px solid #DDD;
+}
diff --git a/t/openiduser.t b/t/openiduser.t
index caabbcefc..746090103 100755
--- a/t/openiduser.t
+++ b/t/openiduser.t
@@ -12,7 +12,7 @@ BEGIN {
 	else {
 		eval q{use Test::More tests => 11};
 	}
-	use_ok("IkiWiki::Plugin::openid");
+	use_ok("IkiWiki");
 }
 
 # Some typical examples:
diff --git a/t/permalink.t b/t/permalink.t
index b49b98338..adb8648b4 100755
--- a/t/permalink.t
+++ b/t/permalink.t
@@ -5,7 +5,7 @@ use Test::More 'no_plan';
 
 ok(! system("mkdir t/tmp"));
 ok(! system("make -s ikiwiki.out"));
-ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -templatedir=templates t/tinyblog t/tmp/out"));
+ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates t/tinyblog t/tmp/out"));
 # This guid should never, ever change, for any reason whatsoever!
 my $guid="http://example.com/post/";
 ok(length `grep '<guid>$guid</guid>' t/tmp/out/index.rss`);
diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index 76c4051ed..393479865 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -1,30 +1,29 @@
-<script type="text/javascript" src="ikiwiki/openid-selector/jquery.js"></script>
-<script type="text/javascript" src="ikiwiki/openid-selector/openid-jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/openid/jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-	openid.init('openid_url');
+	openid.init('openid_identifier');
 });
 </script>
 	
-<TMPL_IF OPENID_ERROR>
-<div class="error"><TMPL_VAR OPENID_ERROR></span>
-</TMPL_IF>
-</div>
-
 <form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
 	<input type="hidden" name="do" value="signin" />
 	<input type="hidden" name="action" value="verify" />
- 	<div id="openid_choice">
-		<p><TMPL_VAR LOGINLABEL>:</p>
-		<div id="openid_btns">
+	<fieldset>
+		<legend><TMPL_VAR LOGINLABEL></legend>
+		<div id="openid_choice">
+			<div id="openid_btns">
+			</div>
+			<TMPL_IF NONOPENIDURL>
+			<a href="<TMPL_VAR NONOPENIDURL>">local account</a>
+			</TMPL_IF>
 		</div>
-		<TMPL_IF NONOPENIDURL>
-		<a href="<TMPL_VAR NONOPENIDURL>">local account</a>
+		<div id="openid_input_area">
+			<input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/>
+			<input id="openid_submit" type="submit" value="Login"/>
+		</div>
+		<TMPL_IF OPENID_ERROR>
+		<div class="error"><TMPL_VAR OPENID_ERROR></div>
 		</TMPL_IF>
-	</div>
-	
-	<span id="openid_input_area">
-		<input id="openid_url" name="openid_url" type="text" value="<TMPL_VAR OPENID_URL>"/>
-		<input id="openid_submit" type="submit" value="Login"/>
-	</span>
+	</fieldset>
 </form>
diff --git a/underlays/javascript/ikiwiki/openid-selector/jquery.js b/underlays/javascript/ikiwiki/openid-selector/jquery.js
deleted file mode 100644
index 82b98e1d7..000000000
--- a/underlays/javascript/ikiwiki/openid-selector/jquery.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * jQuery 1.2.6 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
- */
-(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
-return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
-return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
-selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
-return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
-this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
-return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
-jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
-script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
-for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
-for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
-jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
-ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
-while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
-while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
-for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
-jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
-xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
-jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
-for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
-s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
-e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
diff --git a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
deleted file mode 100644
index f39fff842..000000000
--- a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-Simple OpenID Plugin
-http://code.google.com/p/openid-selector/
-
-This code is licenced under the New BSD License.
-*/
-
-var providers_large = {
-    google: {
-        name: 'Google',
-        url: 'https://www.google.com/accounts/o8/id'
-    },
-    yahoo: {
-        name: 'Yahoo',      
-        url: 'http://me.yahoo.com/'
-    },    
-    aol: {
-        name: 'AOL',     
-        label: 'Enter your AOL screenname.',
-        url: 'http://openid.aol.com/{username}'
-    },
-    verisign: {
-        name: 'Verisign',
-        label: 'Your Verisign username',
-        url: 'http://{username}.pip.verisignlabs.com/'
-    },
-    openid: {
-        name: 'OpenID',     
-        label: 'Enter your OpenID.',
-        url: null
-    }
-};
-var providers_small = {
-    myopenid: {
-        name: 'MyOpenID',
-        label: 'Enter your MyOpenID username.',
-        url: 'http://{username}.myopenid.com/'
-    },
-    livejournal: {
-        name: 'LiveJournal',
-        label: 'Enter your Livejournal username.',
-        url: 'http://{username}.livejournal.com/'
-    },
-    flickr: {
-        name: 'Flickr',        
-        label: 'Enter your Flickr username.',
-        url: 'http://flickr.com/{username}/'
-    },
-    technorati: {
-        name: 'Technorati',
-        label: 'Enter your Technorati username.',
-        url: 'http://technorati.com/people/technorati/{username}/'
-    },
-    wordpress: {
-        name: 'Wordpress',
-        label: 'Enter your Wordpress.com username.',
-        url: 'http://{username}.wordpress.com/'
-    },
-    blogger: {
-        name: 'Blogger',
-        label: 'Your Blogger account',
-        url: 'http://{username}.blogspot.com/'
-    },
-    vidoop: {
-        name: 'Vidoop',
-        label: 'Your Vidoop username',
-        url: 'http://{username}.myvidoop.com/'
-    },
-    claimid: {
-        name: 'ClaimID',
-        label: 'Your ClaimID username',
-        url: 'http://claimid.com/{username}'
-    }
-};
-var providers = $.extend({}, providers_large, providers_small);
-
-var openid = {
-
-	demo: false,
-	ajaxHandler: null,
-	cookie_expires: 6*30,	// 6 months.
-	cookie_name: 'openid_provider',
-	cookie_path: '/',
-	
-	img_path: 'images/',
-	
-	input_id: null,
-	provider_url: null,
-	provider_id: null,
-	
-    init: function(input_id) {
-        
-        var openid_btns = $('#openid_btns');
-        
-        this.input_id = input_id;
-        
-        $('#openid_choice').show();
-        $('#openid_input_area').empty();
-        
-        // add box for each provider
-        for (id in providers_large) {
-        
-           	openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif'));
-        }
-        if (providers_small) {
-        	openid_btns.append('<br/>');
-        	
-	        for (id in providers_small) {
-	        
-	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico'));
-	        }
-        }
-        
-        $('#openid_form').submit(this.submit);
-        
-        var box_id = this.readCookie();
-        if (box_id) {
-        	this.signin(box_id, true);
-        }  
-    },
-    getBoxHTML: function(provider, box_size, image_ext) {
-            
-        var box_id = provider["name"].toLowerCase();
-        return '<a title="'+provider["name"]+'" href="javascript: openid.signin(\''+ box_id +'\');"' +
-        		' style="background: #FFF url(' + this.img_path + box_id + image_ext+') no-repeat center center" ' + 
-        		'class="' + box_id + ' openid_' + box_size + '_btn"></a>';    
-    
-    },
-    /* Provider image click */
-    signin: function(box_id, onload) {
-    
-    	var provider = providers[box_id];
-  		if (! provider) {
-  			return;
-  		}
-		
-		this.highlight(box_id);
-		this.setCookie(box_id);
-		
-		this.provider_id = box_id;
-		this.provider_url = provider['url'];
-		
-		// prompt user for input?
-		if (provider['label']) {
-			this.useInputBox(provider);
-		} else {
-			$('#openid_input_area').empty();
-			if (! onload) {
-				$('#openid_form').submit();
-			}
-		}
-    },
-    /* Sign-in button click */
-    submit: function() {
-        
-    	var url = openid.provider_url; 
-    	if (url) {
-    		url = url.replace('{username}', $('#openid_username').val());
-    		openid.setOpenIdUrl(url);
-    	}
-    	if(openid.ajaxHandler) {
-    		openid.ajaxHandler(openid.provider_id, document.getElementById(openid.input_id).value);
-    		return false;
-    	}
-    	if(openid.demo) {
-    		alert("In client demo mode. Normally would have submitted OpenID:\r\n" + document.getElementById(openid.input_id).value);
-    		return false;
-    	}
-    	return true;
-    },
-    setOpenIdUrl: function (url) {
-    
-	var hidden = $('#'+this.input_id);
-	if (hidden.length > 0) {
-		hidden.value = url;
-    	} else {
-		$('#openid_form').append('<input style="display:none" id="' + this.input_id + '" name="' + this.input_id + '" value="'+url+'"/>');
-    	}
-    },
-    highlight: function (box_id) {
-    	
-    	// remove previous highlight.
-    	var highlight = $('#openid_highlight');
-    	if (highlight) {
-    		highlight.replaceWith($('#openid_highlight a')[0]);
-    	}
-    	// add new highlight.
-    	$('.'+box_id).wrap('<div id="openid_highlight"></div>');
-    },
-    setCookie: function (value) {
-    
-		var date = new Date();
-		date.setTime(date.getTime()+(this.cookie_expires*24*60*60*1000));
-		var expires = "; expires="+date.toGMTString();
-		
-		document.cookie = this.cookie_name+"="+value+expires+"; path=" + this.cookie_path;
-    },
-    readCookie: function () {
-		var nameEQ = this.cookie_name + "=";
-		var ca = document.cookie.split(';');
-		for(var i=0;i < ca.length;i++) {
-			var c = ca[i];
-			while (c.charAt(0)==' ') c = c.substring(1,c.length);
-			if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
-		}
-		return null;
-    },
-    useInputBox: function (provider) {
-   	
-		var input_area = $('#openid_input_area');
-		
-		var html = '';
-		var id = 'openid_username';
-		var value = '';
-		var label = provider['label'];
-		var style = '';
-		
-		if (label) {
-			html = '<p>' + label + '</p>';
-		}
-		if (provider['name'] == 'OpenID') {
-			id = this.input_id;
-			value = 'http://';
-			style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;';
-		}
-		html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
-					'<input id="openid_submit" type="submit" value="Sign-In"/>';
-		
-		input_area.empty();
-		input_area.append(html);
-
-		$('#'+id).focus();
-    },
-    setDemoMode: function (demoMode) {
-    	this.demo = demoMode;
-    },
-    setAjaxHandler: function (ajaxFunction) {
-    	this.ajaxHandler = ajaxFunction;
-    }
-};
diff --git a/underlays/openid-selector/ikiwiki/openid/jquery.js b/underlays/openid-selector/ikiwiki/openid/jquery.js
new file mode 100644
index 000000000..82b98e1d7
--- /dev/null
+++ b/underlays/openid-selector/ikiwiki/openid/jquery.js
@@ -0,0 +1,32 @@
+/*
+ * jQuery 1.2.6 - New Wave Javascript
+ *
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
+ * $Rev: 5685 $
+ */
+(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
+return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
+return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
+selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
+return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
+this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
+return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
+jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
+script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
+for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
+for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
+jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
+ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
+while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
+while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
+for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
+jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
+xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
+jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
+for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
+s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
+e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
new file mode 100644
index 000000000..f39fff842
--- /dev/null
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -0,0 +1,240 @@
+/*
+Simple OpenID Plugin
+http://code.google.com/p/openid-selector/
+
+This code is licenced under the New BSD License.
+*/
+
+var providers_large = {
+    google: {
+        name: 'Google',
+        url: 'https://www.google.com/accounts/o8/id'
+    },
+    yahoo: {
+        name: 'Yahoo',      
+        url: 'http://me.yahoo.com/'
+    },    
+    aol: {
+        name: 'AOL',     
+        label: 'Enter your AOL screenname.',
+        url: 'http://openid.aol.com/{username}'
+    },
+    verisign: {
+        name: 'Verisign',
+        label: 'Your Verisign username',
+        url: 'http://{username}.pip.verisignlabs.com/'
+    },
+    openid: {
+        name: 'OpenID',     
+        label: 'Enter your OpenID.',
+        url: null
+    }
+};
+var providers_small = {
+    myopenid: {
+        name: 'MyOpenID',
+        label: 'Enter your MyOpenID username.',
+        url: 'http://{username}.myopenid.com/'
+    },
+    livejournal: {
+        name: 'LiveJournal',
+        label: 'Enter your Livejournal username.',
+        url: 'http://{username}.livejournal.com/'
+    },
+    flickr: {
+        name: 'Flickr',        
+        label: 'Enter your Flickr username.',
+        url: 'http://flickr.com/{username}/'
+    },
+    technorati: {
+        name: 'Technorati',
+        label: 'Enter your Technorati username.',
+        url: 'http://technorati.com/people/technorati/{username}/'
+    },
+    wordpress: {
+        name: 'Wordpress',
+        label: 'Enter your Wordpress.com username.',
+        url: 'http://{username}.wordpress.com/'
+    },
+    blogger: {
+        name: 'Blogger',
+        label: 'Your Blogger account',
+        url: 'http://{username}.blogspot.com/'
+    },
+    vidoop: {
+        name: 'Vidoop',
+        label: 'Your Vidoop username',
+        url: 'http://{username}.myvidoop.com/'
+    },
+    claimid: {
+        name: 'ClaimID',
+        label: 'Your ClaimID username',
+        url: 'http://claimid.com/{username}'
+    }
+};
+var providers = $.extend({}, providers_large, providers_small);
+
+var openid = {
+
+	demo: false,
+	ajaxHandler: null,
+	cookie_expires: 6*30,	// 6 months.
+	cookie_name: 'openid_provider',
+	cookie_path: '/',
+	
+	img_path: 'images/',
+	
+	input_id: null,
+	provider_url: null,
+	provider_id: null,
+	
+    init: function(input_id) {
+        
+        var openid_btns = $('#openid_btns');
+        
+        this.input_id = input_id;
+        
+        $('#openid_choice').show();
+        $('#openid_input_area').empty();
+        
+        // add box for each provider
+        for (id in providers_large) {
+        
+           	openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif'));
+        }
+        if (providers_small) {
+        	openid_btns.append('<br/>');
+        	
+	        for (id in providers_small) {
+	        
+	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico'));
+	        }
+        }
+        
+        $('#openid_form').submit(this.submit);
+        
+        var box_id = this.readCookie();
+        if (box_id) {
+        	this.signin(box_id, true);
+        }  
+    },
+    getBoxHTML: function(provider, box_size, image_ext) {
+            
+        var box_id = provider["name"].toLowerCase();
+        return '<a title="'+provider["name"]+'" href="javascript: openid.signin(\''+ box_id +'\');"' +
+        		' style="background: #FFF url(' + this.img_path + box_id + image_ext+') no-repeat center center" ' + 
+        		'class="' + box_id + ' openid_' + box_size + '_btn"></a>';    
+    
+    },
+    /* Provider image click */
+    signin: function(box_id, onload) {
+    
+    	var provider = providers[box_id];
+  		if (! provider) {
+  			return;
+  		}
+		
+		this.highlight(box_id);
+		this.setCookie(box_id);
+		
+		this.provider_id = box_id;
+		this.provider_url = provider['url'];
+		
+		// prompt user for input?
+		if (provider['label']) {
+			this.useInputBox(provider);
+		} else {
+			$('#openid_input_area').empty();
+			if (! onload) {
+				$('#openid_form').submit();
+			}
+		}
+    },
+    /* Sign-in button click */
+    submit: function() {
+        
+    	var url = openid.provider_url; 
+    	if (url) {
+    		url = url.replace('{username}', $('#openid_username').val());
+    		openid.setOpenIdUrl(url);
+    	}
+    	if(openid.ajaxHandler) {
+    		openid.ajaxHandler(openid.provider_id, document.getElementById(openid.input_id).value);
+    		return false;
+    	}
+    	if(openid.demo) {
+    		alert("In client demo mode. Normally would have submitted OpenID:\r\n" + document.getElementById(openid.input_id).value);
+    		return false;
+    	}
+    	return true;
+    },
+    setOpenIdUrl: function (url) {
+    
+	var hidden = $('#'+this.input_id);
+	if (hidden.length > 0) {
+		hidden.value = url;
+    	} else {
+		$('#openid_form').append('<input style="display:none" id="' + this.input_id + '" name="' + this.input_id + '" value="'+url+'"/>');
+    	}
+    },
+    highlight: function (box_id) {
+    	
+    	// remove previous highlight.
+    	var highlight = $('#openid_highlight');
+    	if (highlight) {
+    		highlight.replaceWith($('#openid_highlight a')[0]);
+    	}
+    	// add new highlight.
+    	$('.'+box_id).wrap('<div id="openid_highlight"></div>');
+    },
+    setCookie: function (value) {
+    
+		var date = new Date();
+		date.setTime(date.getTime()+(this.cookie_expires*24*60*60*1000));
+		var expires = "; expires="+date.toGMTString();
+		
+		document.cookie = this.cookie_name+"="+value+expires+"; path=" + this.cookie_path;
+    },
+    readCookie: function () {
+		var nameEQ = this.cookie_name + "=";
+		var ca = document.cookie.split(';');
+		for(var i=0;i < ca.length;i++) {
+			var c = ca[i];
+			while (c.charAt(0)==' ') c = c.substring(1,c.length);
+			if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+		}
+		return null;
+    },
+    useInputBox: function (provider) {
+   	
+		var input_area = $('#openid_input_area');
+		
+		var html = '';
+		var id = 'openid_username';
+		var value = '';
+		var label = provider['label'];
+		var style = '';
+		
+		if (label) {
+			html = '<p>' + label + '</p>';
+		}
+		if (provider['name'] == 'OpenID') {
+			id = this.input_id;
+			value = 'http://';
+			style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;';
+		}
+		html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
+					'<input id="openid_submit" type="submit" value="Sign-In"/>';
+		
+		input_area.empty();
+		input_area.append(html);
+
+		$('#'+id).focus();
+    },
+    setDemoMode: function (demoMode) {
+    	this.demo = demoMode;
+    },
+    setAjaxHandler: function (ajaxFunction) {
+    	this.ajaxHandler = ajaxFunction;
+    }
+};
-- 
cgit v1.2.3


From 7d152f5be5ab12ef17167c820bfc548ccc68cc80 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 20:17:31 -0400
Subject: modify openid selector to not default to http:// for openid

ikiwiki doesn't care if the http:// is there, and it seems cleaner and less
annoying this way
---
 underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index f39fff842..48054f79a 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -220,7 +220,7 @@ var openid = {
 		}
 		if (provider['name'] == 'OpenID') {
 			id = this.input_id;
-			value = 'http://';
+			value = '';
 			style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;';
 		}
 		html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
-- 
cgit v1.2.3


From 0f2bdbb9686d994ecf96b24be3f7be8295a572c4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 20:20:28 -0400
Subject: use ikiwiki's replacement openid logo in input box

---
 underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 48054f79a..37f305bc4 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -221,7 +221,7 @@ var openid = {
 		if (provider['name'] == 'OpenID') {
 			id = this.input_id;
 			value = '';
-			style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;';
+			style = 'background:#FFF url(wikiicons/openidlogin-bg.gif) no-repeat scroll 0 50%; padding-left:18px;';
 		}
 		html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
 					'<input id="openid_submit" type="submit" value="Sign-In"/>';
-- 
cgit v1.2.3


From 0800d25f10534005511f696ffefb4548045ef631 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 20:24:42 -0400
Subject: modify labels to input box for consistency

---
 .../ikiwiki/openid/openid-jquery.js                | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 37f305bc4..1d96555a8 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -16,59 +16,59 @@ var providers_large = {
     },    
     aol: {
         name: 'AOL',     
-        label: 'Enter your AOL screenname.',
+        label: 'Enter your AOL screenname:',
         url: 'http://openid.aol.com/{username}'
     },
     verisign: {
         name: 'Verisign',
-        label: 'Your Verisign username',
+        label: 'Enter your Verisign username:',
         url: 'http://{username}.pip.verisignlabs.com/'
     },
     openid: {
         name: 'OpenID',     
-        label: 'Enter your OpenID.',
+        label: 'Enter your OpenID:',
         url: null
     }
 };
 var providers_small = {
     myopenid: {
         name: 'MyOpenID',
-        label: 'Enter your MyOpenID username.',
+        label: 'Enter your MyOpenID username:',
         url: 'http://{username}.myopenid.com/'
     },
     livejournal: {
         name: 'LiveJournal',
-        label: 'Enter your Livejournal username.',
+        label: 'Enter your Livejournal username:',
         url: 'http://{username}.livejournal.com/'
     },
     flickr: {
         name: 'Flickr',        
-        label: 'Enter your Flickr username.',
+        label: 'Enter your Flickr username:',
         url: 'http://flickr.com/{username}/'
     },
     technorati: {
         name: 'Technorati',
-        label: 'Enter your Technorati username.',
+        label: 'Enter your Technorati username:',
         url: 'http://technorati.com/people/technorati/{username}/'
     },
     wordpress: {
         name: 'Wordpress',
-        label: 'Enter your Wordpress.com username.',
+        label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },
     blogger: {
         name: 'Blogger',
-        label: 'Your Blogger account',
+        label: 'Enter your Blogger account:',
         url: 'http://{username}.blogspot.com/'
     },
     vidoop: {
         name: 'Vidoop',
-        label: 'Your Vidoop username',
+        label: 'Enter your Vidoop username:',
         url: 'http://{username}.myvidoop.com/'
     },
     claimid: {
         name: 'ClaimID',
-        label: 'Your ClaimID username',
+        label: 'Enter your ClaimID username:',
         url: 'http://claimid.com/{username}'
     }
 };
-- 
cgit v1.2.3


From c1e365abdc8b89acc4d52b2bb3773b16ae722b8b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:20:21 -0400
Subject: remove loginlabel, not used

---
 IkiWiki/Plugin/openid.pm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index e722c68ba..0454a43fa 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -87,7 +87,6 @@ sub openid_selector {
 		(defined $openid_error ? (openid_error => $openid_error) : ()),
 		(defined $openid_url ? (openid_url => $openid_url) : ()),
 		($real_cgi_signin ? (nonopenidurl => IkiWiki::cgiurl(do => "signin")) : ()),
-		loginlabel => loginlabel(),
 	);
 
 	IkiWiki::printheader($session);
@@ -258,8 +257,4 @@ sub load_openid_module {
 	return 1;
 }
 
-sub loginlabel {
-	return gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1);
-}
-
 1
-- 
cgit v1.2.3


From 62b15f811f57cb6b915022e8a58d30b6e38a3f8a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:20:40 -0400
Subject: update

---
 templates/openid-selector.tmpl | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index 393479865..06eefebb9 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -2,21 +2,18 @@
 <script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-	openid.init('openid_identifier');
+	openid.init('openid_identifier', "<TMPL_VAR NONOPENIDURL>");
 });
 </script>
 	
 <form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
-	<input type="hidden" name="do" value="signin" />
-	<input type="hidden" name="action" value="verify" />
 	<fieldset>
-		<legend><TMPL_VAR LOGINLABEL></legend>
+		<legend>Select your account provider</legend>
+
+		<input type="hidden" name="do" value="signin" />
+		<input type="hidden" name="action" value="verify" />
 		<div id="openid_choice">
-			<div id="openid_btns">
-			</div>
-			<TMPL_IF NONOPENIDURL>
-			<a href="<TMPL_VAR NONOPENIDURL>">local account</a>
-			</TMPL_IF>
+			<div id="openid_btns"></div>
 		</div>
 		<div id="openid_input_area">
 			<input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/>
-- 
cgit v1.2.3


From 62edf97941860cd242c08fa8dede3625ee1acb8b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:20:50 -0400
Subject: openid signin style changes

---
 doc/style.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 75aa28407..5f1a8e63a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -441,15 +441,12 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_large_btn {
-	width: 100px;
-	height: 60px;
+	padding: 1em 1em;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
 }
 .openid_small_btn {
-	width: 24px;
-	height: 24px;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
-- 
cgit v1.2.3


From ede2d1b46de45122c5cc81cd6e7e1131007ce93d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:21:04 -0400
Subject: adapt to ikiwiki

Upstream ships a collection of icons, but the licences of them are very
unclear, since most seem to be taken from the various openid provider
websites. That can't be included in ikiwiki. So, instead hotlink to
favicons of sites, and for large display, include the site name.

Removed vidoop.com, which is gone.

If an url is passed to init as the second parameter, add a "Local Login"
provider, which just links to do=signin.
---
 .../ikiwiki/openid/openid-jquery.js                | 99 ++++++++++++++--------
 1 file changed, 63 insertions(+), 36 deletions(-)

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 1d96555a8..43d2ef668 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -8,69 +8,76 @@ This code is licenced under the New BSD License.
 var providers_large = {
     google: {
         name: 'Google',
+	icon: 'http://google.com/favicon.ico',
         url: 'https://www.google.com/accounts/o8/id'
     },
     yahoo: {
         name: 'Yahoo',      
+	icon: 'http://yahoo.com/favicon.ico',
         url: 'http://me.yahoo.com/'
     },    
-    aol: {
-        name: 'AOL',     
-        label: 'Enter your AOL screenname:',
-        url: 'http://openid.aol.com/{username}'
-    },
-    verisign: {
-        name: 'Verisign',
-        label: 'Enter your Verisign username:',
-        url: 'http://{username}.pip.verisignlabs.com/'
-    },
     openid: {
         name: 'OpenID',     
+	icon: 'wikiicons/openidlogin-bg.gif',
         label: 'Enter your OpenID:',
         url: null
-    }
+    },
 };
 var providers_small = {
-    myopenid: {
-        name: 'MyOpenID',
-        label: 'Enter your MyOpenID username:',
-        url: 'http://{username}.myopenid.com/'
-    },
     livejournal: {
         name: 'LiveJournal',
+	icon: 'http://livejournal.com/favicon.ico',
         label: 'Enter your Livejournal username:',
         url: 'http://{username}.livejournal.com/'
     },
     flickr: {
         name: 'Flickr',        
+	icon: 'http://flickr.com/favicon.ico',
         label: 'Enter your Flickr username:',
         url: 'http://flickr.com/{username}/'
     },
-    technorati: {
-        name: 'Technorati',
-        label: 'Enter your Technorati username:',
-        url: 'http://technorati.com/people/technorati/{username}/'
-    },
     wordpress: {
         name: 'Wordpress',
+	icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico',
         label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },
     blogger: {
         name: 'Blogger',
+	icon: 'http://blogger.com/favicon.ico',
         label: 'Enter your Blogger account:',
         url: 'http://{username}.blogspot.com/'
     },
-    vidoop: {
-        name: 'Vidoop',
-        label: 'Enter your Vidoop username:',
-        url: 'http://{username}.myvidoop.com/'
+    technorati: {
+        name: 'Technorati',
+	icon: 'http://technorati.com/favicon.ico',
+        label: 'Enter your Technorati username:',
+        url: 'http://technorati.com/people/technorati/{username}/'
+    },
+    myopenid: {
+        name: 'MyOpenID',
+	icon: 'http://myopenid.com/favicon.ico',
+        label: 'Enter your MyOpenID username:',
+        url: 'http://{username}.myopenid.com/'
     },
     claimid: {
         name: 'ClaimID',
+	icon: 'http://claimid.com/favicon.ico',
         label: 'Enter your ClaimID username:',
         url: 'http://claimid.com/{username}'
-    }
+    },
+    aol: {
+        name: 'AOL',     
+	icon: 'http://aol.com/favicon.ico',
+        label: 'Enter your AOL screenname:',
+        url: 'http://openid.aol.com/{username}'
+    },
+    verisign: {
+        name: 'Verisign',
+	icon: 'http://verisign.com/favicon.ico',
+        label: 'Enter your Verisign username:',
+        url: 'http://{username}.pip.verisignlabs.com/'
+    },
 };
 var providers = $.extend({}, providers_large, providers_small);
 
@@ -88,7 +95,7 @@ var openid = {
 	provider_url: null,
 	provider_id: null,
 	
-    init: function(input_id) {
+    init: function(input_id, localloginurl) {
         
         var openid_btns = $('#openid_btns');
         
@@ -99,15 +106,25 @@ var openid = {
         
         // add box for each provider
         for (id in providers_large) {
-        
-           	openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif'));
+           	openid_btns.append(this.getBoxHTML(providers_large[id], 'large'));
         }
+
+	if (localloginurl != "") {
+           	openid_btns.append(
+        		'<a href="' + localloginurl + '"' +
+        		' style="background: #FFF" ' +
+        		'class="openid_large_btn">' +
+			'<img alt="" width="24" height="24" src="favicon.ico" />' +
+			' Local Account' +
+			'</a>'
+		);
+	}
         if (providers_small) {
         	openid_btns.append('<br/>');
         	
 	        for (id in providers_small) {
 	        
-	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico'));
+	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
 	        }
         }
         
@@ -118,12 +135,22 @@ var openid = {
         	this.signin(box_id, true);
         }  
     },
-    getBoxHTML: function(provider, box_size, image_ext) {
-            
+    getBoxHTML: function(provider, box_size) {
+	var label="";
+	var title=""
+	if (box_size == 'large') {
+		label=' ' + provider["name"];
+	}
+	else {
+		title=' title="'+provider["name"]+'"';
+	}
         var box_id = provider["name"].toLowerCase();
-        return '<a title="'+provider["name"]+'" href="javascript: openid.signin(\''+ box_id +'\');"' +
-        		' style="background: #FFF url(' + this.img_path + box_id + image_ext+') no-repeat center center" ' + 
-        		'class="' + box_id + ' openid_' + box_size + '_btn"></a>';    
+        return '<a' + title +' href="javascript: openid.signin(\''+ box_id +'\');"' +
+        		' style="background: #FFF" ' + 
+        		'class="' + box_id + ' openid_' + box_size + '_btn">' +
+			'<img alt="" width="24" height="24" src="' + provider["icon"] + '" />' +
+			label +
+			'</a>';
     
     },
     /* Provider image click */
@@ -224,7 +251,7 @@ var openid = {
 			style = 'background:#FFF url(wikiicons/openidlogin-bg.gif) no-repeat scroll 0 50%; padding-left:18px;';
 		}
 		html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
-					'<input id="openid_submit" type="submit" value="Sign-In"/>';
+					'<input id="openid_submit" type="submit" value="Login"/>';
 		
 		input_area.empty();
 		input_area.append(html);
-- 
cgit v1.2.3


From dc0d48459cfc0dc53301b87c2fc98216f4dcca06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:27:02 -0400
Subject: bugfix

---
 IkiWiki/Plugin/openid.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 0454a43fa..427d61457 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -68,6 +68,7 @@ sub openid_selector {
 	if (! load_openid_module()) {
 		if ($real_cgi_signin) {
 			$real_cgi_signin->($q, $session);
+			exit;
 		}
 		error(sprintf(gettext("failed to load openid module: "), @_));
 	}
-- 
cgit v1.2.3


From 1e75389a856c8ab8e233b81fd3310169cbe8d57e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:28:59 -0400
Subject: bugfix

Always load IkiWiki::CGI so its cgi_signin is present, so we replace it.
---
 IkiWiki/Plugin/openid.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 427d61457..7e4d0844a 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -23,9 +23,9 @@ sub checkconfig () {
 		# 
 		# When other auth hooks are registered, give the selector
 		# a reference to the normal signin form.
+		require IkiWiki::CGI;
 		my $real_cgi_signin;
 		if (keys %{$IkiWiki::hooks{auth}} > 1) {
-			require IkiWiki::CGI;
 			$real_cgi_signin=\&IkiWiki::cgi_signin;
 		}
 		inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
-- 
cgit v1.2.3


From 8f6cfbfade6018732495addce11f6d5e93e0b723 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:33:27 -0400
Subject: Removed the openidsignup option.

---
 IkiWiki/Plugin/openid.pm | 15 ---------------
 debian/changelog         |  1 +
 doc/plugins/openid.mdwn  | 12 ------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 7e4d0844a..36002371a 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -9,7 +9,6 @@ use IkiWiki 3.00;
 sub import {
 	add_underlay("openid-selector");
 	hook(type => "checkconfig", id => "openid", call => \&checkconfig);
-	hook(type => "getopt", id => "openid", call => \&getopt);
 	hook(type => "getsetup", id => "openid", call => \&getsetup);
 	hook(type => "auth", id => "openid", call => \&auth);
 	hook(type => "formbuilder_setup", id => "openid",
@@ -34,13 +33,6 @@ sub checkconfig () {
 	}
 }
 
-sub getopt () {
-	eval q{use Getopt::Long};
-	error($@) if $@;
-	Getopt::Long::Configure('pass_through');
-	GetOptions("openidsignup=s" => \$config{openidsignup});
-}
-
 sub getsetup () {
 	return
 		plugin => {
@@ -48,13 +40,6 @@ sub getsetup () {
 			rebuild => 0,
 			section => "auth",
 		},
-		openidsignup => {
-			type => "string",
-			example => "http://myopenid.com/",
-			description => "an url where users can signup for an OpenID",
-			safe => 1,
-			rebuild => 0,
-		},
 }
 
 sub openid_selector {
diff --git a/debian/changelog b/debian/changelog
index 3f20aec1a..595b8a2b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     (http://code.google.com/p/openid-selector/)
   * openid: Use "openid_identifier" as the form field, as required
     by OpenID Authentication v2.0 spec.
+  * Removed the openidsignup option.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index cd05bb1ad..7da2f8575 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -11,17 +11,5 @@ The [[!cpan LWPx::ParanoidAgent]] perl module is used if available, for
 added security. Finally, the [[!cpan Crypt::SSLeay]] perl module is needed
 to support users entering "https" OpenID urls.
 
-This plugin has a configuration option. You can set `--openidsignup`
-to the url of a third-party site where users can sign up for an OpenID. If
-it's set, the signin page will link to that site.
-
-This plugin supports the
-[myopenid.com affiliate program](http://myopenid.com/affiliate),
-which can be used to help users sign up for an OpenID and log into your
-site in a single, unified process. When you create the affiliate, specify a
-login url like `http://example.com/ikiwiki.cgi?do=continue`. Once the
-affiliate is created, set `openidsignup` to point to the affiliate's signup
-url.
-
 This plugin is enabled by default, but can be turned off if you want to
 only use some other form of authentication, such as [[passwordauth]].
-- 
cgit v1.2.3


From bb7877707ef730c7fdab01509ac6a9cc9eb252d1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:35:47 -0400
Subject: mention style.css changes

---
 debian/NEWS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/NEWS b/debian/NEWS
index 4e0c7810b..e65a15457 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -9,6 +9,11 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
     </TMPL_IF>
 
+  There have also been some changes to the style.css in this version,
+  particularly to support the new openid selector. If you have a modified
+  version, of style.css, updating it (or moving it to local.css) is
+  recommended.
+
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 21:47:08 -0400
 
 ikiwiki (3.20100427) unstable; urgency=low
-- 
cgit v1.2.3


From e2a76696dd9d42c6ed66b831bfd441baadfb4893 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:39:42 -0400
Subject: advice

---
 debian/changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 595b8a2b1..050613706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,10 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     (http://code.google.com/p/openid-selector/)
   * openid: Use "openid_identifier" as the form field, as required
     by OpenID Authentication v2.0 spec.
-  * Removed the openidsignup option.
+  * Removed the openidsignup option. Instead, my recommendation is to
+    leave passwordauth enabled and let people who don't have an openid use it.
+    The openid selector form avoids the UI annoyance of having both openid
+    and passwordauth on one form.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
-- 
cgit v1.2.3


From 885ac1de47f001f6dcc2393ac8b14f717c2d1780 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:44:06 -0400
Subject: improve display w/noscript

---
 templates/openid-selector.tmpl | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index 06eefebb9..7e5ae9a01 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -10,6 +10,13 @@ $(document).ready(function() {
 	<fieldset>
 		<legend>Select your account provider</legend>
 
+		<noscript>
+		<ul>
+		<TMPL_IF NONOPENIDURL>
+		<li><a href="<TMPL_VAR NONOPENIDURL>">Local Account</a></li>
+		</TMPL_IF>
+		<li>OpenID:</div>
+		</noscript>
 		<input type="hidden" name="do" value="signin" />
 		<input type="hidden" name="action" value="verify" />
 		<div id="openid_choice">
@@ -22,5 +29,9 @@ $(document).ready(function() {
 		<TMPL_IF OPENID_ERROR>
 		<div class="error"><TMPL_VAR OPENID_ERROR></div>
 		</TMPL_IF>
+		<noscript>
+		</li>
+		</ul>
+		</noscript>
 	</fieldset>
 </form>
-- 
cgit v1.2.3


From b8dcaf91d02c1d8754032c60f8d713261dafffe4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:48:50 -0400
Subject: scale display form to match openid size

---
 IkiWiki/Plugin/openid.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 36002371a..d75099ce9 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -92,7 +92,7 @@ sub formbuilder_setup (@) {
 		$form->field(name => "openid_identifier", disabled => 1,
 			label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
 			value => $session->param("name"), 
-			size => 50, force => 1,
+			size => length($session->param("name")), force => 1,
 			fieldset => "login");
 		$form->field(name => "email", type => "hidden");
 	}
-- 
cgit v1.2.3


From 3a1d81bd9c5a866aed0dd7890a4174f0ff6b1e78 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:54:58 -0400
Subject: avoid scaling favicons

chromium's rather impressive jaggy-free scaling spoiled me, but in
iceweasel, scaled favicons look crap
---
 doc/style.css                                             | 1 +
 underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 5f1a8e63a..78756481e 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -447,6 +447,7 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_small_btn {
+	padding: 4px 4px;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 43d2ef668..8137f232f 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -114,7 +114,7 @@ var openid = {
         		'<a href="' + localloginurl + '"' +
         		' style="background: #FFF" ' +
         		'class="openid_large_btn">' +
-			'<img alt="" width="24" height="24" src="favicon.ico" />' +
+			'<img alt="" width="16" height="16" src="favicon.ico" />' +
 			' Local Account' +
 			'</a>'
 		);
@@ -148,7 +148,7 @@ var openid = {
         return '<a' + title +' href="javascript: openid.signin(\''+ box_id +'\');"' +
         		' style="background: #FFF" ' + 
         		'class="' + box_id + ' openid_' + box_size + '_btn">' +
-			'<img alt="" width="24" height="24" src="' + provider["icon"] + '" />' +
+			'<img alt="" width="16" height="16" src="' + provider["icon"] + '" />' +
 			label +
 			'</a>';
     
-- 
cgit v1.2.3


From f1f6973d2d05e2cfc7f463df8568de07314e1720 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 22:21:48 -0400
Subject: update

---
 doc/ikiwiki/openid.mdwn | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/doc/ikiwiki/openid.mdwn b/doc/ikiwiki/openid.mdwn
index 318928139..2fa972ede 100644
--- a/doc/ikiwiki/openid.mdwn
+++ b/doc/ikiwiki/openid.mdwn
@@ -9,15 +9,10 @@
 that allows you to have one login that you can use on a growing number of
 websites.
 
-To sign up for an OpenID, visit one of the following identity providers:
+If you have an account with some of the larger web service providers,
+you might already have an OpenID. 
+[Directory of OpenID providers](http://openiddirectory.com/openid-providers-c-1.html)
 
-* [MyOpenID](https://www.myopenid.com/)
-* [GetOpenID](https://getopenid.com/)
-* [LiveJournal](http://www.livejournal.com/openid/)
-* [TrustBearer](https://openid.trustbearer.com/)
-* or any of the [many others out there](http://openiddirectory.com/openid-providers-c-1.html)
-
-Your OpenID is the URL that you are given when you sign up.
 [[!if test="enabled(openid)" then="""
 To sign in to this wiki using OpenID, just enter it in the OpenID field in the
 signin form. You do not need to give this wiki a password or go through any
-- 
cgit v1.2.3


From d50de130e8f9c1183ae958a3dc902829ab72c3bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 00:00:03 -0400
Subject: conditionalize use of sidebar

---
 doc/examples/blog/index.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index a22c40c72..220c1b3e3 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,6 +1,11 @@
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
-[[!sidebar]]
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).
-- 
cgit v1.2.3


From f05043ed80e9cae38168e8824852835bc950e962 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 00:18:58 -0400
Subject: gardening openid provider list

- fix url to flickr profile
- remove blogger; google property and uses their openid system;
  wants to sign user up for a blogger blog
- remove technorati, which dropped openid provider support
- AOL seems to call it a username, not a screenname
---
 .../openid-selector/ikiwiki/openid/openid-jquery.js  | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 8137f232f..067d68f3f 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -31,10 +31,10 @@ var providers_small = {
         url: 'http://{username}.livejournal.com/'
     },
     flickr: {
-        name: 'Flickr',        
+	name: 'Flickr',        
 	icon: 'http://flickr.com/favicon.ico',
-        label: 'Enter your Flickr username:',
-        url: 'http://flickr.com/{username}/'
+	label: 'Enter your Flickr username:',
+	url: 'http://flickr.com/photos/{username}/'
     },
     wordpress: {
         name: 'Wordpress',
@@ -42,18 +42,6 @@ var providers_small = {
         label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },
-    blogger: {
-        name: 'Blogger',
-	icon: 'http://blogger.com/favicon.ico',
-        label: 'Enter your Blogger account:',
-        url: 'http://{username}.blogspot.com/'
-    },
-    technorati: {
-        name: 'Technorati',
-	icon: 'http://technorati.com/favicon.ico',
-        label: 'Enter your Technorati username:',
-        url: 'http://technorati.com/people/technorati/{username}/'
-    },
     myopenid: {
         name: 'MyOpenID',
 	icon: 'http://myopenid.com/favicon.ico',
@@ -69,7 +57,7 @@ var providers_small = {
     aol: {
         name: 'AOL',     
 	icon: 'http://aol.com/favicon.ico',
-        label: 'Enter your AOL screenname:',
+        label: 'Enter your AOL username:',
         url: 'http://openid.aol.com/{username}'
     },
     verisign: {
-- 
cgit v1.2.3


From ac8a91fe06808191b4eded829cf118d70be2c585 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 00:40:36 -0400
Subject: improve selector layout

---
 doc/style.css                                          |  2 +-
 .../openid-selector/ikiwiki/openid/openid-jquery.js    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 78756481e..d8b48bcd0 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -441,7 +441,7 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_large_btn {
-	padding: 1em 1em;
+	padding: 1em 1.5em;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 067d68f3f..4dfb7420b 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -97,24 +97,24 @@ var openid = {
            	openid_btns.append(this.getBoxHTML(providers_large[id], 'large'));
         }
 
+        if (providers_small) {
+        	openid_btns.append('<br/>');
+        	
+	        for (id in providers_small) {
+	        
+	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
+	        }
+        }
 	if (localloginurl != "") {
            	openid_btns.append(
         		'<a href="' + localloginurl + '"' +
         		' style="background: #FFF" ' +
-        		'class="openid_large_btn">' +
+        		'class="openid_small_btn">' +
 			'<img alt="" width="16" height="16" src="favicon.ico" />' +
 			' Local Account' +
 			'</a>'
 		);
 	}
-        if (providers_small) {
-        	openid_btns.append('<br/>');
-        	
-	        for (id in providers_small) {
-	        
-	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
-	        }
-        }
         
         $('#openid_form').submit(this.submit);
         
-- 
cgit v1.2.3


From 5570d144418267f910112fe8f26bd61e1cd0cd15 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 01:00:25 -0400
Subject: improve selector highlight

---
 doc/style.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index d8b48bcd0..6832194b2 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -436,8 +436,7 @@ li.L8 { list-style: upper-alpha; }
 	clear: both;
 }
 #openid_highlight {
-	padding: 3px;
-	background-color: #FFFCC9;
+	background-color: black;
 	float: left;
 }
 .openid_large_btn {
-- 
cgit v1.2.3


From 4298c809e540a7556d886f57341d3e5456a9c92f Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Sat, 8 May 2010 05:54:29 +0000
Subject: make an edit with the new login thinger

---
 doc/users/schmonz.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index 03c52b6aa..ed3332bf9 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -1,3 +1,5 @@
 [Amitai Schlair](http://www.netbsd.org/~schmonz/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing:
 
 [[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"]]
+
+In progress: a plugin for [WIND authentication](http://www.columbia.edu/acis/rad/authmethods/wind/).
-- 
cgit v1.2.3


From b945299706bf06b70415fa1c1a91fad30aa9f179 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 8 May 2010 06:01:27 +0000
Subject: edit using the fancy jquery login thingy, update user page

---
 doc/users/simonraven.mdwn | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/users/simonraven.mdwn b/doc/users/simonraven.mdwn
index 5fc24711e..13681a674 100644
--- a/doc/users/simonraven.mdwn
+++ b/doc/users/simonraven.mdwn
@@ -1,8 +1,7 @@
 ## personal/site info
 
-New ikiwiki site at my web site, blog, kisikew.org home site, for indigenews, and our indigenous-centric wiki (mostly East Coast/Woodlands area). Mediawiki stuff was imported successfully (as noted on this web site).
-
+Have several ikiwiki-based sites at my web site, blog, kisikew.org home site, for indigenews, and our indigenous-centric wiki (mostly East Coast/Woodlands area).
 ## ikiwiki branch at github
 
-Maintain my own branch, partly to learn about VCS, git, ikiwiki, Debian packaging, and Perl. I don't recommend anyone pull from it, as I use third-party plugins included on this site that people may not want in a default installation of ikiwiki. This is why I don't push to Joey's -- so it's nothing personal, I just don't want to mess things up for other people, from my mistakes and stumbles.
+Maintain my own branch, partly to learn about VCS, git, ikiwiki, Debian packaging, and Perl. Thinking of removing most 3rd-party plugins (found in contrib/). Have some custom plugins to support dual bottom-of-the-page "sidebars" and an attempt at supporting HTTPBL (see projecthoneypot.org).
 
-- 
cgit v1.2.3


From 541298e66892300f9d98d089c59b7ad837e49016 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 02:15:04 -0400
Subject: avoid setting cookie for promptless buttons

I think it is clearer to not have such a button appear pre-selected
when entering the signin page, because that may suggest to the user
they don't need to click on it, and yet they do.
---
 underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 4dfb7420b..59a59c084 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -150,15 +150,16 @@ var openid = {
   		}
 		
 		this.highlight(box_id);
-		this.setCookie(box_id);
 		
 		this.provider_id = box_id;
 		this.provider_url = provider['url'];
 		
 		// prompt user for input?
 		if (provider['label']) {
+			this.setCookie(box_id);
 			this.useInputBox(provider);
 		} else {
+			this.setCookie('');
 			$('#openid_input_area').empty();
 			if (! onload) {
 				$('#openid_form').submit();
-- 
cgit v1.2.3


From 32a79523bbb4051a9a528a148a6db82e9fdd20d6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 02:38:54 -0400
Subject: add gmail button

It uses the google profile openid url, which results in a nicer openid
than the o8/id url.
---
 doc/style.css                                         |  2 +-
 .../openid-selector/ikiwiki/openid/openid-jquery.js   | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 6832194b2..171a68474 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -440,7 +440,7 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_large_btn {
-	padding: 1em 1.5em;
+	padding: 1em 1.75em;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 59a59c084..544ba8936 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -30,18 +30,24 @@ var providers_small = {
         label: 'Enter your Livejournal username:',
         url: 'http://{username}.livejournal.com/'
     },
-    flickr: {
-	name: 'Flickr',        
-	icon: 'http://flickr.com/favicon.ico',
-	label: 'Enter your Flickr username:',
-	url: 'http://flickr.com/photos/{username}/'
-    },
     wordpress: {
         name: 'Wordpress',
 	icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico',
         label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },
+    gmail: {
+	name: 'Gmail',
+	icon: 'http://mail.google.com/favicon.ico',
+	label: 'Enter your Gmail address:',
+	url: 'http://google.com/profiles/{email_username}/'
+    },
+    flickr: {
+	name: 'Flickr',
+	icon: 'http://www.flickr.com/favicon.ico',
+	label: 'Enter your Flickr username:',
+	url: 'http://flickr.com/photos/{username}/'
+    },
     myopenid: {
         name: 'MyOpenID',
 	icon: 'http://myopenid.com/favicon.ico',
@@ -172,6 +178,7 @@ var openid = {
     	var url = openid.provider_url; 
     	if (url) {
     		url = url.replace('{username}', $('#openid_username').val());
+    		url = url.replace('{email_username}', $('#openid_username').val().split('@')[0]);
     		openid.setOpenIdUrl(url);
     	}
     	if(openid.ajaxHandler) {
-- 
cgit v1.2.3


From f0914b386b026035d0055812a43dbd4a6ae528f7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 02:53:18 -0400
Subject: Revert "add gmail button"

This reverts commit 32a79523bbb4051a9a528a148a6db82e9fdd20d6.

Buggy and I need sleep.
---
 doc/style.css                                         |  2 +-
 .../openid-selector/ikiwiki/openid/openid-jquery.js   | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 171a68474..6832194b2 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -440,7 +440,7 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_large_btn {
-	padding: 1em 1.75em;
+	padding: 1em 1.5em;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 544ba8936..59a59c084 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -30,24 +30,18 @@ var providers_small = {
         label: 'Enter your Livejournal username:',
         url: 'http://{username}.livejournal.com/'
     },
+    flickr: {
+	name: 'Flickr',        
+	icon: 'http://flickr.com/favicon.ico',
+	label: 'Enter your Flickr username:',
+	url: 'http://flickr.com/photos/{username}/'
+    },
     wordpress: {
         name: 'Wordpress',
 	icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico',
         label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },
-    gmail: {
-	name: 'Gmail',
-	icon: 'http://mail.google.com/favicon.ico',
-	label: 'Enter your Gmail address:',
-	url: 'http://google.com/profiles/{email_username}/'
-    },
-    flickr: {
-	name: 'Flickr',
-	icon: 'http://www.flickr.com/favicon.ico',
-	label: 'Enter your Flickr username:',
-	url: 'http://flickr.com/photos/{username}/'
-    },
     myopenid: {
         name: 'MyOpenID',
 	icon: 'http://myopenid.com/favicon.ico',
@@ -178,7 +172,6 @@ var openid = {
     	var url = openid.provider_url; 
     	if (url) {
     		url = url.replace('{username}', $('#openid_username').val());
-    		url = url.replace('{email_username}', $('#openid_username').val().split('@')[0]);
     		openid.setOpenIdUrl(url);
     	}
     	if(openid.ajaxHandler) {
-- 
cgit v1.2.3


From f4cfae1466558ab2163263f300d7f698182229b7 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sat, 8 May 2010 08:08:13 +0000
Subject:

---
 doc/forum/debian_backports_update_someone_please.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index b3fbf1adc..46b0aca6b 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -3,3 +3,5 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 > Formerer does a good job keeping the backport up-to-date with whatever is in Debian testing. 
 > Which is the policy of what Backports should contain. So, I just need to stop releasing ikiwiki
 > for 2 weeks. :) --[[Joey]]
+
+>> And are there any chances you doing it... or rather not doing it?
-- 
cgit v1.2.3


From 6578dc2c2b2bc8e1947ba50b914cacd48c30c860 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sat, 8 May 2010 08:15:41 +0000
Subject:

---
 doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index a4644ff64..c326b8205 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -1,3 +1,5 @@
 Puzzled a bit :-/
 
 > There is no explicit interface for reverting edits. Most of us use `git revert`. --[[Joey]]
+
+>> That's a blow; I was planning on appointing no techies to keep law and order on our pages :-/ Is there a plugin or at least a plan to add such a 'in demand' feature?
-- 
cgit v1.2.3


From 0f778849c6df237f2219de6e1fa237cf2bc9955f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 12:45:21 -0400
Subject: calendar: Allow negative month to be specified. -1 is last month,
 etc. (And also negaitve years.)

---
 IkiWiki/Plugin/calendar.pm           | 27 +++++++++++++++++++++++----
 debian/changelog                     |  2 ++
 doc/ikiwiki/directive/calendar.mdwn  |  6 +++---
 doc/plugins/calendar/discussion.mdwn | 11 ++++++++++-
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index aeb5f3d29..02f41070e 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -386,8 +386,19 @@ sub preprocess (@) {
 	$params{year}  = $thisyear	unless defined $params{year};
 	$params{month} = $thismonth	unless defined $params{month};
 
+	my $relativemonth=0;
+	if ($params{month} < 1) {
+		$params{month}=$thismonth+$params{month};
+		$relativemonth=1;
+	}
+	my $relativeyear=0;
+	if ($params{year} < 1) {
+		$params{year}=$thisyear+$params{year};
+		$relativeyear=1;
+	}
+	
 	$params{month} = sprintf("%02d", $params{month});
-			
+	
 	if ($params{type} eq 'month' && $params{year} == $thisyear
 	    && $params{month} == $thismonth) {
 		# calendar for current month, updates next midnight
@@ -404,8 +415,11 @@ sub preprocess (@) {
 		$pagestate{$params{destpage}}{calendar}{nextchange}=
 			timelocal(0, 0, 0, 1, $params{month}-1, $params{year});
 	}
-	elsif ($params{type} eq 'year' && $params{year} == $thisyear) {
-		# calendar for current year, updates 1st of next month
+	elsif (($params{type} eq 'year' && $params{year} == $thisyear) ||
+	       $relativemonth) {
+		# Calendar for current year updates 1st of next month.
+		# Any calendar relative to the current month also updates
+		# then.
 		if ($thismonth < 12) {
 			$pagestate{$params{destpage}}{calendar}{nextchange}=
 				timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year});
@@ -415,6 +429,12 @@ sub preprocess (@) {
 				timelocal(0, 0, 0, 1, 1-1, $params{year}+1);
 		}
 	}
+	elsif ($relativeyear) {
+		# Any calendar relative to the current year updates 1st
+		# of next year.
+		$pagestate{$params{destpage}}{calendar}{nextchange}=
+			timelocal(0, 0, 0, 1, 1-1, $thisyear+1);
+	}
 	elsif ($params{type} eq 'year' && $params{year} > $thisyear) {
 		# calendar for upcoming year, updates 1st of that year
 		$pagestate{$params{destpage}}{calendar}{nextchange}=
@@ -426,7 +446,6 @@ sub preprocess (@) {
 		delete $pagestate{$params{destpage}}{calendar};
 	}
 
-	# Calculate month names for next month, and previous months
 	my $calendar="";
 	if ($params{type} eq 'month') {
 		$calendar=format_month(%params);
diff --git a/debian/changelog b/debian/changelog
index f74e9929f..795f02822 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     leave passwordauth enabled and let people who don't have an openid use it.
     The openid selector form avoids the UI annoyance of having both openid
     and passwordauth on one form.
+  * calendar: Allow negative month to be specified. -1 is last month, etc.
+    (And also negaitve years.)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
index 198da9d51..e9216e11f 100644
--- a/doc/ikiwiki/directive/calendar.mdwn
+++ b/doc/ikiwiki/directive/calendar.mdwn
@@ -47,14 +47,14 @@ An example crontab:
   "2010". These pages can be automatically created using the
   `ikiwiki-calendar` program. 
 * `year` - The year for which the calendar is requested. Defaults to the
-  current year.
+  current year. Can also use -1 to refer to last year, and so on.
 * `month` - The numeric month for which the calendar is requested, in the
   range 1..12. Used only for the month view calendar, and defaults to the
-  current month.
+  current month. Can also use -1 to refer to last month, and so on.
 * `week_start_day` - A number, in the range 0..6, which represents the day
   of the week that the month calendar starts with. 0 is Sunday, 1 is Monday,
   and so on. Defaults to 0, which is Sunday.
-* `months_per_row` - In the annual calendar, number of months to place in
+* `months_per_row` - In the year calendar, number of months to place in
   each row. Defaults to 3.
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/calendar/discussion.mdwn b/doc/plugins/calendar/discussion.mdwn
index 9d57b7a1e..bb76a9d8b 100644
--- a/doc/plugins/calendar/discussion.mdwn
+++ b/doc/plugins/calendar/discussion.mdwn
@@ -1,6 +1,15 @@
 It would be nice if the "month" type calendar could collect all of the 
 matching pages on a given date in some inline type way. --[[DavidBremner]]
 
+> I agree, but I have not come up with good html to display them. Seems 
+> it might need some sort of popup.
+
 Is it possible to get the calendar to link to pages based not on their timestamp (as I understand that it does now, or have I misunderstood this?) and instead on for example their location in a directory hierarchy. That way the calendar could be used as a planning / timeline device which I think would be great. --[[Alexander]]
 
-I would like the ability to specify relative previous months. This way I could have a sidebar with the last three months by specifying no month, then 'month="-1"' and 'month="-2"'. Negative numbers for the month would otherwise be invalid, so this shouldn't produce any conflicts with expected behavior. (Right?) -- [[StevenBlack]]
+I would like the ability to specify relative previous months. This way I
+could have a sidebar with the last three months by specifying no month,
+then 'month="-1"' and 'month="-2"'. Negative numbers for the month would
+otherwise be invalid, so this shouldn't produce any conflicts with expected
+behavior. (Right?) -- [[StevenBlack]]
+
+> Great idea! Just implemented that and also relative years. --[[Joey]] 
-- 
cgit v1.2.3


From fd817f9ac3c074622fe7076516dca61199b09372 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 12:52:19 -0400
Subject: calendar: nextchange calculation bugfix

If a page had multiple calendars, the last one won and set nextchange.
That's wrong; the calendar that needs to next update soonest should win.
---
 IkiWiki/Plugin/calendar.pm | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 02f41070e..d43320cac 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -373,6 +373,16 @@ EOF
 	return $calendar;
 }
 
+sub setnextchange ($$) {
+	my $page=shift;
+	my $timestamp=shift;
+
+	if (! exists $pagestate{$page}{calendar}{nextchange} ||
+	    $pagestate{$page}{calendar}{nextchange} > $timestamp) {
+		$pagestate{$page}{calendar}{nextchange}=$timestamp;
+	}
+}
+
 sub preprocess (@) {
 	my %params=@_;
 
@@ -402,18 +412,18 @@ sub preprocess (@) {
 	if ($params{type} eq 'month' && $params{year} == $thisyear
 	    && $params{month} == $thismonth) {
 		# calendar for current month, updates next midnight
-		$pagestate{$params{destpage}}{calendar}{nextchange}=($time
+		setnextchange($params{destpage}, ($time
 			+ (60 - $now[0])		# seconds
 			+ (59 - $now[1]) * 60		# minutes
 			+ (23 - $now[2]) * 60 * 60	# hours
-		);
+		));
 	}
 	elsif ($params{type} eq 'month' &&
 	       (($params{year} == $thisyear && $params{month} > $thismonth) ||
 	        $params{year} > $thisyear)) {
 		# calendar for upcoming month, updates 1st of that month
-		$pagestate{$params{destpage}}{calendar}{nextchange}=
-			timelocal(0, 0, 0, 1, $params{month}-1, $params{year});
+		setnextchange($params{destpage},
+			timelocal(0, 0, 0, 1, $params{month}-1, $params{year}));
 	}
 	elsif (($params{type} eq 'year' && $params{year} == $thisyear) ||
 	       $relativemonth) {
@@ -421,24 +431,24 @@ sub preprocess (@) {
 		# Any calendar relative to the current month also updates
 		# then.
 		if ($thismonth < 12) {
-			$pagestate{$params{destpage}}{calendar}{nextchange}=
-				timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year});
+			setnextchange($params{destpage},
+				timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year}));
 		}
 		else {
-			$pagestate{$params{destpage}}{calendar}{nextchange}=
-				timelocal(0, 0, 0, 1, 1-1, $params{year}+1);
+			setnextchange($params{destpage},
+				timelocal(0, 0, 0, 1, 1-1, $params{year}+1));
 		}
 	}
 	elsif ($relativeyear) {
 		# Any calendar relative to the current year updates 1st
 		# of next year.
-		$pagestate{$params{destpage}}{calendar}{nextchange}=
-			timelocal(0, 0, 0, 1, 1-1, $thisyear+1);
+		setnextchange($params{destpage},
+			timelocal(0, 0, 0, 1, 1-1, $thisyear+1));
 	}
 	elsif ($params{type} eq 'year' && $params{year} > $thisyear) {
 		# calendar for upcoming year, updates 1st of that year
-		$pagestate{$params{destpage}}{calendar}{nextchange}=
-			timelocal(0, 0, 0, 1, 1-1, $params{year});
+		setnextchange($params{destpage},
+			timelocal(0, 0, 0, 1, 1-1, $params{year}));
 	}
 	else {
 		# calendar for past month or year, does not need
-- 
cgit v1.2.3


From d0c17a4a46b48d8513c0167271f2f2eb8b9bc081 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 13:51:05 -0400
Subject: calendar: Display year name in title of month calendar.

Also, fix relative month calculations.
---
 IkiWiki/Plugin/calendar.pm | 21 +++++++++++++--------
 debian/changelog           |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index d43320cac..0bf933dcd 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -132,12 +132,12 @@ sub format_month (@) {
 	$archivebase = $params{archivebase} if defined $params{archivebase};
   
 	# Calculate URL's for monthly archives.
-	my ($url, $purl, $nurl)=("$monthname",'','');
+	my ($url, $purl, $nurl)=("$monthname $params{year}",'','');
 	if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}/".$params{month},
 			noimageinline => 1,
-			linktext => $monthname,
+			linktext => "$monthname $params{year}",
 			title => $monthname);
 	}
 	add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
@@ -396,15 +396,20 @@ sub preprocess (@) {
 	$params{year}  = $thisyear	unless defined $params{year};
 	$params{month} = $thismonth	unless defined $params{month};
 
-	my $relativemonth=0;
-	if ($params{month} < 1) {
-		$params{month}=$thismonth+$params{month};
-		$relativemonth=1;
-	}
 	my $relativeyear=0;
 	if ($params{year} < 1) {
-		$params{year}=$thisyear+$params{year};
 		$relativeyear=1;
+		$params{year}=$thisyear+$params{year};
+	}
+	my $relativemonth=0;
+	if ($params{month} < 1) {
+		$relativemonth=1;
+		my $monthoff=$params{month};
+		$params{month}=($thismonth+$monthoff) % 12;
+		$params{month}=12 if $params{month}==0;
+		my $yearoff=POSIX::ceil(($thismonth-$params{month}) / -12)
+			- int($monthoff / 12);
+		$params{year}-=$yearoff;
 	}
 	
 	$params{month} = sprintf("%02d", $params{month});
diff --git a/debian/changelog b/debian/changelog
index 795f02822..f47793477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     and passwordauth on one form.
   * calendar: Allow negative month to be specified. -1 is last month, etc.
     (And also negaitve years.)
+  * calendar: Display year name in title of month calendar.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
-- 
cgit v1.2.3


From f735e2d1b3ced6dc1e246e61be0256302ff5eb14 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 14:03:20 -0400
Subject: fixups

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f47793477..a8527521f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     The openid selector form avoids the UI annoyance of having both openid
     and passwordauth on one form.
   * calendar: Allow negative month to be specified. -1 is last month, etc.
-    (And also negaitve years.)
-  * calendar: Display year name in title of month calendar.
+    (And also negative years.)
+  * calendar: Display year in title of month calendar.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
-- 
cgit v1.2.3


From c3e9215e1fcb604c3ee01119fdf7cf13724c3812 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 15:57:39 -0400
Subject: moved non-openid signin form into same page as openid selector;
 show/hide as buttons are pressed

---
 IkiWiki/CGI.pm                                     | 23 ++++++++++++----
 IkiWiki/Plugin/openid.pm                           |  6 +----
 templates/openid-selector.tmpl                     | 31 ++++++++++++----------
 .../ikiwiki/openid/openid-jquery.js                | 27 ++++++++++++++-----
 4 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 49a505514..b98e9e0a1 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -22,7 +22,7 @@ sub printheader ($) {
 	}
 }
 
-sub showform ($$$$;@) {
+sub prepform {
 	my $form=shift;
 	my $buttons=shift;
 	my $session=shift;
@@ -35,6 +35,16 @@ sub showform ($$$$;@) {
 		});
 	}
 
+	return $form;
+}
+
+sub showform ($$$$;@) {
+	my $form=prepform(@_);
+	shift;
+	my $buttons=shift;
+	my $session=shift;
+	my $cgi=shift;
+
 	printheader($session);
 	print misctemplate($form->title, $form->render(submit => $buttons), @_);
 }
@@ -90,9 +100,10 @@ sub needsignin ($$) {
 	}
 }
 
-sub cgi_signin ($$) {
+sub cgi_signin ($$;$) {
 	my $q=shift;
 	my $session=shift;
+	my $returnhtml=shift;
 
 	decode_cgi_utf8($q);
 	eval q{use CGI::FormBuilder};
@@ -112,9 +123,6 @@ sub cgi_signin ($$) {
 	);
 	my $buttons=["Login"];
 	
-	if ($q->param("do") ne "signin" && !$form->submitted) {
-		$form->text(gettext("You need to log in first."));
-	}
 	$form->field(name => "do", type => "hidden", value => "signin",
 		force => 1);
 	
@@ -129,6 +137,11 @@ sub cgi_signin ($$) {
 		$form->validate;
 	}
 
+	if ($returnhtml) {
+		$form=prepform($form, $buttons, $session, $q);
+		return $form->render(submit => $buttons);
+	}
+
 	showform($form, $buttons, $session, $q);
 }
 
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index d75099ce9..e10e21f4d 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -62,17 +62,13 @@ sub openid_selector {
 			$openid_error=shift;
 		});
 	}
-	elsif ($q->param("do") eq "signin" && $real_cgi_signin) {
-		$real_cgi_signin->($q, $session);
-		exit;
-	}
 
 	my $template=IkiWiki::template("openid-selector.tmpl");
 	$template->param(
 		cgiurl => $config{cgiurl},
 		(defined $openid_error ? (openid_error => $openid_error) : ()),
 		(defined $openid_url ? (openid_url => $openid_url) : ()),
-		($real_cgi_signin ? (nonopenidurl => IkiWiki::cgiurl(do => "signin")) : ()),
+		($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),
 	);
 
 	IkiWiki::printheader($session);
diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index 7e5ae9a01..b4d0e314f 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -2,21 +2,18 @@
 <script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-	openid.init('openid_identifier', "<TMPL_VAR NONOPENIDURL>");
+	openid.init('openid_identifier','<TMPL_IF NONOPENIDFORM>nonopenidform</TMPL_IF>');
 });
 </script>
-	
+
+<noscript>
+<h2>OpenID:</h2>
+</noscript>
+
 <form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
 	<fieldset>
 		<legend>Select your account provider</legend>
-
-		<noscript>
-		<ul>
-		<TMPL_IF NONOPENIDURL>
-		<li><a href="<TMPL_VAR NONOPENIDURL>">Local Account</a></li>
-		</TMPL_IF>
-		<li>OpenID:</div>
-		</noscript>
+		
 		<input type="hidden" name="do" value="signin" />
 		<input type="hidden" name="action" value="verify" />
 		<div id="openid_choice">
@@ -29,9 +26,15 @@ $(document).ready(function() {
 		<TMPL_IF OPENID_ERROR>
 		<div class="error"><TMPL_VAR OPENID_ERROR></div>
 		</TMPL_IF>
-		<noscript>
-		</li>
-		</ul>
-		</noscript>
 	</fieldset>
 </form>
+
+<div id="nonopenidform">
+<TMPL_IF NONOPENIDFORM>
+<br />
+<noscript>
+<h2>Local Account:</h2>
+</noscript>
+</TMPL_IF>
+<TMPL_VAR NONOPENIDFORM>
+</div>
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 59a59c084..bf14fd3d5 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -82,8 +82,9 @@ var openid = {
 	input_id: null,
 	provider_url: null,
 	provider_id: null,
+	localsignin_id: null,
 	
-    init: function(input_id, localloginurl) {
+    init: function(input_id, localsignin_id) {
         
         var openid_btns = $('#openid_btns');
         
@@ -105,13 +106,14 @@ var openid = {
 	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
 	        }
         }
-	if (localloginurl != "") {
+	if (localsignin_id != "") {
+		this.localsignin_id=localsignin_id;
            	openid_btns.append(
-        		'<a href="' + localloginurl + '"' +
+        		'<a href="javascript: openid.signin(\'localsignin\');"' +
         		' style="background: #FFF" ' +
-        		'class="openid_small_btn">' +
+        		'class="localsignin openid_small_btn">' +
 			'<img alt="" width="16" height="16" src="favicon.ico" />' +
-			' Local Account' +
+			' other' +
 			'</a>'
 		);
 	}
@@ -143,7 +145,20 @@ var openid = {
     },
     /* Provider image click */
     signin: function(box_id, onload) {
-    
+
+	if (box_id == 'localsignin') {
+	    	this.highlight(box_id);
+		$('#openid_input_area').empty();
+		$('#'+this.localsignin_id).show();
+		this.setCookie(box_id);
+		return;
+	}
+	else {
+		if (this.localsignin_id) {
+			$('#'+this.localsignin_id).hide();
+		}
+	}
+
     	var provider = providers[box_id];
   		if (! provider) {
   			return;
-- 
cgit v1.2.3


From 10a1c0feca18a0615358539771b5a58aacb72c0e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 16:04:18 -0400
Subject: update

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a8527521f..730cae1e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     text can be indexed for searching.
   * Delete hooks are passed deleted internal pages. 
   * openid: Incorporated a fancy openid-selector signin form.
-    (http://code.google.com/p/openid-selector/)
+    (Based on http://code.google.com/p/openid-selector/)
   * openid: Use "openid_identifier" as the form field, as required
     by OpenID Authentication v2.0 spec.
   * Removed the openidsignup option. Instead, my recommendation is to
-- 
cgit v1.2.3


From bf19c01f29a7e740f47354318629e61ad4ee5175 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 16:16:38 -0400
Subject: use labels

---
 templates/openid-selector.tmpl                            | 5 ++++-
 underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index b4d0e314f..c12df519f 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -12,7 +12,9 @@ $(document).ready(function() {
 
 <form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
 	<fieldset>
-		<legend>Select your account provider</legend>
+		<script>
+		$('fieldset').append("<legend>Select your account provider</legend>");
+		</script>
 		
 		<input type="hidden" name="do" value="signin" />
 		<input type="hidden" name="action" value="verify" />
@@ -20,6 +22,7 @@ $(document).ready(function() {
 			<div id="openid_btns"></div>
 		</div>
 		<div id="openid_input_area">
+			<label for="openid_identifier" class="block">Enter your OpenID:</label>
 			<input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/>
 			<input id="openid_submit" type="submit" value="Login"/>
 		</div>
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index bf14fd3d5..4eaa613d9 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -246,14 +246,14 @@ var openid = {
 		var label = provider['label'];
 		var style = '';
 		
-		if (label) {
-			html = '<p>' + label + '</p>';
-		}
 		if (provider['name'] == 'OpenID') {
 			id = this.input_id;
 			value = '';
 			style = 'background:#FFF url(wikiicons/openidlogin-bg.gif) no-repeat scroll 0 50%; padding-left:18px;';
 		}
+		if (label) {
+			html = '<label for="'+ id +'" class="block">' + label + '</label>';
+		}
 		html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
 					'<input id="openid_submit" type="submit" value="Login"/>';
 		
-- 
cgit v1.2.3


From 8d80ad0c173f8d0fbd888a25486ac3f919337d78 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 16:18:55 -0400
Subject: wording

---
 templates/openid-selector.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index c12df519f..0659ee583 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -36,7 +36,7 @@ $(document).ready(function() {
 <TMPL_IF NONOPENIDFORM>
 <br />
 <noscript>
-<h2>Local Account:</h2>
+<h2>Other:</h2>
 </noscript>
 </TMPL_IF>
 <TMPL_VAR NONOPENIDFORM>
-- 
cgit v1.2.3


From d238fd1b04b41b17cc9cb444d6dcee498d6a14c5 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 8 May 2010 23:38:35 +0000
Subject: bug with pubdate, in process of testing fix

---
 ...e_wrong_when_using_xhtml5___34__mode__34__.mdwn | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn

diff --git a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
new file mode 100644
index 000000000..c55b3f62d
--- /dev/null
+++ b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
@@ -0,0 +1,40 @@
+Hi,
+
+XML error:
+
+    Created <time datetime="2009-03-24T18:02:14Z" pubdate class="relativedate" title="Tue, 24 Mar 2009 14:02:14 -0400">2009-03-24</time>
+
+The pubdate REQUIRES a date, so e.g. `pubdate="2009-03-24T18:02:14Z"`
+
+Otherwise the XML parser chokes.
+
+<http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#attr-time-pubdate>
+
+<pre>
+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 1f2ab07..6ab5b56 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -1004,7 +1004,7 @@ sub displaytime ($;$$) {
+    my $time=formattime($_[0], $_[1]);
+    if ($config{html5}) {
+        return '<time datetime="'.date_3339($_[0]).'"'.
+-         ($_[2] ? ' pubdate' : '').
++           ($_[2] ? ' pubdate="'.date_3339($_[0]).'"' : '').
+            '>'.$time.'</time>';
+    }
+    else {
+diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
+index fe8ef09..8c4a1b4 100644
+--- a/IkiWiki/Plugin/relativedate.pm
++++ b/IkiWiki/Plugin/relativedate.pm
+@@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) {
+ 
+    if ($config{html5}) {
+        return '<time datetime="'.IkiWiki::date_3339($time).'"'.
+-         ($pubdate ? ' pubdate' : '').$mid.'</time>';
++           ($pubdate ? ' pubdate="'.IkiWiki::date_3339($time).'"' : '').$mid.'</time>';
+    }
+    else {
+        return '<span'.$mid.'</span>';
+</pre>
-- 
cgit v1.2.3


From 6512423f159a0917137b2caca3fa244147dd0131 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 8 May 2010 23:42:45 +0000
Subject: fixed patch display...

---
 ...e_wrong_when_using_xhtml5___34__mode__34__.mdwn | 54 +++++++++++-----------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
index c55b3f62d..2dd0d945f 100644
--- a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
+++ b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
@@ -10,31 +10,33 @@ Otherwise the XML parser chokes.
 
 <http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#attr-time-pubdate>
 
+(indented exactly 4 spaces)
+
 <pre>
-diff --git a/IkiWiki.pm b/IkiWiki.pm
-index 1f2ab07..6ab5b56 100644
---- a/IkiWiki.pm
-+++ b/IkiWiki.pm
-@@ -1004,7 +1004,7 @@ sub displaytime ($;$$) {
-    my $time=formattime($_[0], $_[1]);
-    if ($config{html5}) {
-        return '<time datetime="'.date_3339($_[0]).'"'.
--         ($_[2] ? ' pubdate' : '').
-+           ($_[2] ? ' pubdate="'.date_3339($_[0]).'"' : '').
-            '>'.$time.'</time>';
-    }
-    else {
-diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
-index fe8ef09..8c4a1b4 100644
---- a/IkiWiki/Plugin/relativedate.pm
-+++ b/IkiWiki/Plugin/relativedate.pm
-@@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) {
- 
-    if ($config{html5}) {
-        return '<time datetime="'.IkiWiki::date_3339($time).'"'.
--         ($pubdate ? ' pubdate' : '').$mid.'</time>';
-+           ($pubdate ? ' pubdate="'.IkiWiki::date_3339($time).'"' : '').$mid.'</time>';
-    }
-    else {
-        return '<span'.$mid.'</span>';
+    diff --git a/IkiWiki.pm b/IkiWiki.pm
+    index 1f2ab07..6ab5b56 100644
+    --- a/IkiWiki.pm
+    +++ b/IkiWiki.pm
+    @@ -1004,7 +1004,7 @@ sub displaytime ($;$$) {
+        my $time=formattime($_[0], $_[1]);
+        if ($config{html5}) {
+            return '&lt;time datetime="'.date_3339($_[0]).'"'.
+    -         ($_[2] ? ' pubdate' : '').
+    +           ($_[2] ? ' pubdate="'.date_3339($_[0]).'"' : '').
+                '>'.$time.'&lt;/time&gt;';
+        }
+        else {
+    diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
+    index fe8ef09..8c4a1b4 100644
+    --- a/IkiWiki/Plugin/relativedate.pm
+    +++ b/IkiWiki/Plugin/relativedate.pm
+    @@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) {
+     
+        if ($config{html5}) {
+            return '&lt;time datetime="'.IkiWiki::date_3339($time).'"'.
+    -         ($pubdate ? ' pubdate' : '').$mid.'&lt;/time&gt;';
+    +           ($pubdate ? ' pubdate="'.IkiWiki::date_3339($time).'"' : '').$mid.'&lt;/time&gt;';
+        }
+        else {
+            return '&lt;span'.$mid.'&lt;/span&gt;';
 </pre>
-- 
cgit v1.2.3


From bc0aa4d40e10238f6b83e285869caab3dfeca395 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 19:45:02 -0400
Subject: Use xhtml friendly pubdate setting.

---
 IkiWiki.pm                                                             | 2 +-
 IkiWiki/Plugin/relativedate.pm                                         | 2 +-
 debian/changelog                                                       | 1 +
 ...lement__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d76b5edb4..33e4e1d1f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1004,7 +1004,7 @@ sub displaytime ($;$$) {
 	my $time=formattime($_[0], $_[1]);
 	if ($config{html5}) {
 		return '<time datetime="'.date_3339($_[0]).'"'.
-			($_[2] ? ' pubdate' : '').
+			($_[2] ? ' pubdate="pubdate"' : '').
 			'>'.$time.'</time>';
 	}
 	else {
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index fe8ef0901..179f9238c 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) {
 
 	if ($config{html5}) {
 		return '<time datetime="'.IkiWiki::date_3339($time).'"'.
-			($pubdate ? ' pubdate' : '').$mid.'</time>';
+			($pubdate ? ' pubdate="pubdate"' : '').$mid.'</time>';
 	}
 	else {
 		return '<span'.$mid.'</span>';
diff --git a/debian/changelog b/debian/changelog
index 730cae1e2..e6c5e42ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * calendar: Allow negative month to be specified. -1 is last month, etc.
     (And also negative years.)
   * calendar: Display year in title of month calendar.
+  * Use xhtml friendly pubdate setting.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
index 2dd0d945f..1f6bdb333 100644
--- a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
+++ b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
@@ -6,6 +6,9 @@ XML error:
 
 The pubdate REQUIRES a date, so e.g. `pubdate="2009-03-24T18:02:14Z"`
 
+> No, `pubdate="pubdate"`. It's a boolean attribute. applied && [[done]]
+> --[[Joey]] 
+
 Otherwise the XML parser chokes.
 
 <http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#attr-time-pubdate>
-- 
cgit v1.2.3


From d379d8ab9dc999da6dcd3212634e9d2dc97d7a3e Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 8 May 2010 23:55:47 +0000
Subject:

---
 ..._element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
index 1f6bdb333..def5bcc2a 100644
--- a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
+++ b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
@@ -8,6 +8,7 @@ The pubdate REQUIRES a date, so e.g. `pubdate="2009-03-24T18:02:14Z"`
 
 > No, `pubdate="pubdate"`. It's a boolean attribute. applied && [[done]]
 > --[[Joey]] 
+>> awesome, thanks for fixing my fix ;) --[[simonraven]]
 
 Otherwise the XML parser chokes.
 
-- 
cgit v1.2.3


From 7cb31560a584cf8f62723e0a142fddafa637f09e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 23:07:15 -0400
Subject: dropped old html branch

---
 doc/git.mdwn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index a0b9c950f..c0f42a704 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -76,8 +76,6 @@ Some of the branches included in the main repository include:
 * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
   due to license issues.  Also some bits need to be tweaked to make it
   work with the current *master* branch again.
-* `html` is an unfinished attempt at making ikiwiki output HTML 4.01
-  instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
 * `debian-stable` is used for updates to the old version included in
-- 
cgit v1.2.3


From 2d60e55303fbabe70b42ee31703a8d4aca2d8460 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 9 May 2010 16:44:47 +0100
Subject: gitremotes: don't fetch the new remote until we've turned off tags

---
 gitremotes | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitremotes b/gitremotes
index 6c03011a8..5cafad1b8 100755
--- a/gitremotes
+++ b/gitremotes
@@ -16,9 +16,10 @@ while (<IN>) {
 		my ($oldurl)=$info=~/URL: (.*)/m;
 		if ($oldurl ne $url) {
 			system("git remote rm $remote 2>/dev/null");
-			system("git", "remote", "add", "-f", $remote, $url);
+			system("git", "remote", "add", $remote, $url);
 			system("git", "config", "remote.$remote.tagopt",
 				"--no-tags");
+			system("git", "fetch", $remote);
 		}
 	}
 }
-- 
cgit v1.2.3


From 0badce2ec03d9db1f6034546eabef097a5d7354d Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 9 May 2010 15:46:11 +0000
Subject: bugfix - only fetch after tags are disabled

---
 doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index 32cf419e8..f9f086793 100644
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -10,9 +10,11 @@ used for local .debs that were never actually present in Debian:
 This can be avoided with the `tagopt = --no-tags` option in .git/config;
 see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/ready/no-tags>
 
-> [[done]] thanks. Also cleared propigated tags out of origin. 
+> *done* thanks. Also cleared propigated tags out of origin. 
 > 
 > Hmm, in testing I still see tags get pulled the first time a remote
 > is added. If those are then locally deleted, it doesn't pull them again
 > with the `--no-tags`.
 > --[[Joey]] 
+
+>> Oh, I see why. Try the same branch again... --[[smcv]]
-- 
cgit v1.2.3


From b5aa42d3e0f54649c8e5d3842ad0025279ba38a5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 9 May 2010 12:56:42 -0400
Subject: remerged

---
 doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index f9f086793..9bd8938c5 100644
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -18,3 +18,5 @@ see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/read
 > --[[Joey]] 
 
 >> Oh, I see why. Try the same branch again... --[[smcv]]
+
+>>> [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 27cb77cd1919d5c61ba67333a349ab6e54ed5976 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 9 May 2010 18:11:51 +0000
Subject: updated branch, using add_autopage to spawn viewer pages

---
 doc/plugins/contrib/album.mdwn | 173 ++++++++++++++++++++++++++---------------
 1 file changed, 110 insertions(+), 63 deletions(-)

diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn
index 395c99bce..0393d26dc 100644
--- a/doc/plugins/contrib/album.mdwn
+++ b/doc/plugins/contrib/album.mdwn
@@ -9,9 +9,11 @@ thoughts about this plugin).
 This plugin formats a collection of images into a photo album,
 in the same way as many websites: good examples include the
 PHP application [Gallery](http://gallery.menalto.com/), Flickr,
-and Facebook's Photos "application". I've called it `album`
-to distinguish it from [[contrib/gallery|plugins/contrib/gallery]],
-although `gallery` might well be a better name for this functionality.
+and Facebook's Photos "application".
+
+I've called it `album` to distinguish it from
+[[contrib/gallery|plugins/contrib/gallery]], although `gallery` might well be
+a better name for this functionality.
 
 The web UI I'm trying to achieve consists of one
 [HTML page of thumbnails](http://www.pseudorandom.co.uk/2008/2008-03-08-panic-cell-gig/)
@@ -26,83 +28,128 @@ individual photos can't be bookmarked in a meaningful way, and
 the best it can do as a fallback for non-Javascript browsers
 is to provide a direct link to the image.)
 
-## Writing the viewers
+<h2 id="album"><code>album</code> directive</h2>
+
+Each page containing an `album` directive is treated as a photo album.
+
+Every image attached to an album or its subpages is considered to be part of
+the album. A "viewer" page, with the wiki's default page extension, will be
+generated to display the image, if there isn't already a page of the same
+name as the image: for instance, if `debconf` is an album and
+`debconf/tuesday/p100.jpg` exists, then `debconf/tuesday/p100.mdwn` might
+be created.
+
+There's currently a hard-coded list of extensions that are treated as images:
+`png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video types could
+be added in future. Videos aren't currently handled very well;
+ideally, something like totem-video-thumbnailer would be used.
+
+The `album` directive also produces an [[ikiwiki/directive/inline]] which
+automatically includes all the viewers for this album, except those that
+will appear in an <a href="#albumsection">albumsection</a> (if every image
+is in a section, then the `album` directive won't have any visible effect).
 
-    \[[!albumimage image=foo.jpg album=myalbum
-        title=...
-        caption=...
-        copyright=...
-        size=...
-        viewertemplate=...
-    ]]
+The `inline` is in `archive` and `quick` mode, but can include some
+extra information about the images, including file size and a thumbnail made
+using [[ikiwiki/directive/img]]). The default template is `albumitem.tmpl`,
+which takes advantage of these things.
 
-Each viewer contains one `\[[!albumimage]]` directive. This
-sets the `image` filename, the `album` in which this image appears,
-and an optional `caption`, and can override the `size` at which to
-display the image and the `viewertemplate` to use to display the
-image.
+<h2 id="albumsection"><code>albumsection</code> directive</h2>
 
-It can also have `title`, `copyright` and `date` parameters, which
-are short-cuts for [[ikiwiki/directive/meta]] directives.
+The `albumsection` directive is used to split an album into sections. It can
+only appear on a page that also has the <a href="#album">album</a> directive.
+
+The `filter` parameter is a [[ikiwiki/PageSpec]] against which viewer pages
+are matched. The `albumsection` directive displays all the images that match
+the filter, and the `album` directive displays any leftover images, like
+this:
+
+    # Holiday photos
+
+    \[[!album]]
+    <!-- replaced with a list of any uncategorized photos, which might be
+         empty -->
 
-The viewer can also have any other content, but typically the
-directive will be the only thing there.
+    ## People
 
-Eventually, there will be a specialized CGI user interface to
-edit all the photos of an album at once, upload a new photo
-(which will attach the photo but also write out a viewer page
-for it), or mark an already-uploaded photo as a member of an
-album (which is done by writing out a viewer page for it).
+    \[[!albumsection filter="tagged(people)"]]
+    <!-- replaced with a list of photos tagged 'people', including
+         any that are also tagged 'landscapes' -->
 
-The `\[[!albumimage]]` directive is replaced by an
+    ## Landscapes
+
+    \[[!albumsection filter="tagged(landscapes)"]]
+    <!-- replaced with a list of photos tagged 'landscapes', including
+         any that are also tagged 'people' -->
+
+<h2 id="albumimage"><code>albumimage</code> directive</h2>
+
+Each viewer page produced by the <a href="#album">album</a> directive
+contains an `albumimage` directive, which is replaced by an
 [[ikiwiki/directive/img]], wrapped in some formatting using a
-template (by default `albumviewer.tmpl`). The template can (and
-should) also include "next photo", "previous photo" and
-"up to gallery" links.
+template (by default it's `albumviewer.tmpl`). That template can also include
+links to the next photo, the previous photo and the album it's in; the default
+template has all of these.
 
-The next/previous links are themselves implemented by
-[[inlining|ikiwiki/directive/inline]] the next or previous
-photo, using a special template (by default `albumnext.tmpl`
-or `albumprev.tmpl`), in `archive`/`quick` mode.
+The next/previous links are themselves implemented by evaluating a template,
+either `albumnext.tmpl` or `albumprev.tmpl` by default.
 
-> With hindsight, using an inline here is wrong - I should just
-> run hooks and fill in the template within the album plugin.
-> inline has some specialized functionality that's overkill
-> here, and its delayed HTML substitution breaks the ability
-> to have previous/up/next links both above and below the
-> photo, for instance. --[[smcv]]
+The directive can also have parameters:
 
-## Writing the album
+* `title`, `copyright` and `date` are short-cuts for the corresponding
+  [[ikiwiki/directive/meta]] directives
 
-The album contains one `\[[!album]]` directive. It may also
-contain any number of `\[[!albumsection]]` directives, for
-example the demo album linked above could look like:
+* `caption` sets a caption which is displayed in the album and viewer
+  pages
 
-    \[[!album]]
-    <!-- replaced with one uncategorized photo -->
+The viewer page can also have other contents before or after the actual
+image viewer.
+
+## Bugs
+
+* The plugin doesn't do anything special to handle albums that are subpages
+  of each other. If, say, `debconf` and `debconf/monday` are both albums,
+  then `debconf/monday/p100.jpg` will currently be assigned to one or the
+  other, arbitrarily.
+
+* The plugin doesn't do anything special to handle photos with similar names.
+  If you have `p100.jpg` and `p100.png`, one will get a viewer page called
+  `p100` and the other will be ignored.
+
+* If there's no `albumimage` in a viewer page, one should probably be appended
+  automatically.
 
-    ## Gamarra
+## TODO
 
-    \[[!albumsection filter="link(gamarra)"]]
-    <!-- all the Gamarra photos -->
+* The documentation should mention how to replicate the appearance of
+  `album` and `albumsection` using an `inline` of viewer pages.
 
-    ## Smokescreen
+* The documentation should mention all the template variables and
+  all the parameters.
 
-    \[[!albumsection filter="link(smokescreen)"]]
-    <!-- all the Smokescreen photos -->
+* The generated viewer page should include most or all of the possible
+  parameters to the `albumimage` directive, with empty values, as a
+  template for editing.
 
-    ...
+* The generated viewer page should extract as much metadata as possible from
+  the photo's EXIF tags (creation/modification dates, author, title, caption,
+  copyright). [[smcv]] has a half-written implementation which runs
+  `scanimage` hooks, and has an `exiftool` plugin using [[!cpan Image::ExifTool]].
 
-The `\[[!album]]` directive is replaced by an
-[[ikiwiki/directive/inline]] which automatically includes every
-page that has an `\[[!albumimage]]` directive linking it to this
-album, except those that will appear in an `\[[!albumsection]]`.
+* There should be an option to reduce the size of photos and write them into
+  an underlay, for this workflow:
 
-The `inline` is in `archive`/`quick` mode, but includes some
-extra information about the images, including file size and a
-thumbnail (again, made using [[ikiwiki/directive/img]]). The
-default template is `albumitem.tmpl`, which takes advantage
-of these things.
+  * your laptop's local ikiwiki has two underlays, `photos` and `webphotos`
+  * `photos` contains full resolution photos with EXIF tags
+  * for each photo that exists in `photos` but not in `webphotos`, the album
+    plugin automatically resamples it down to a web-compatible resolution
+    ([[smcv]] uses up to 640x640), optimizes it with `jpegoptim`, strips out
+    all EXIF tags, and and writes it into the corresponding location
+    in `webphotos`
+  * `webphotos` is what you rsync to the web server
+  * the web server's ikiwiki only has `webphotos` as an underlay
 
-Each `\[[!albumsection]]` is replaced by a similar inline, which
-selects a subset of the photos in the album.
+* Eventually, there could be a specialized CGI user interface to batch-edit
+  all the photos of an album (so for each photo, you get an edit box each for
+  title, author, copyright etc.) - this would work by making programmatic
+  edits to all the `albumimage` directives.
-- 
cgit v1.2.3


From 0594ea04a811a59120ea7e91e94c3389ffcd33ca Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 9 May 2010 18:13:05 +0000
Subject: clarify

---
 doc/plugins/contrib/album.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn
index 0393d26dc..3cfcb68d4 100644
--- a/doc/plugins/contrib/album.mdwn
+++ b/doc/plugins/contrib/album.mdwn
@@ -134,7 +134,8 @@ image viewer.
 * The generated viewer page should extract as much metadata as possible from
   the photo's EXIF tags (creation/modification dates, author, title, caption,
   copyright). [[smcv]] has a half-written implementation which runs
-  `scanimage` hooks, and has an `exiftool` plugin using [[!cpan Image::ExifTool]].
+  `scanimage` hooks, and has an `exiftool` plugin using [[!cpan Image::ExifTool]]
+  as a reference implementation of that hook.
 
 * There should be an option to reduce the size of photos and write them into
   an underlay, for this workflow:
-- 
cgit v1.2.3


From 3f7ef01ca22963dc253d76a27a711dd18998606c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 9 May 2010 18:27:58 +0000
Subject: respond with better design

---
 doc/plugins/contrib/album/discussion.mdwn | 41 +++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index 9720589b4..0356860d8 100644
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -46,6 +46,10 @@ secondly: barring the CGI interface for editing the album, which would be great,
 >
 > --[[smcv]]
 
+>> In the current version of the branch, the viewer pages are
+>> generated automatically if you didn't generate them yourself,
+>> so `ikiwiki-album` is no longer needed. --[[smcv]]
+
 i'm new to ikiwiki, apologies if this is dealt with elsewhere.  -brush
 
 > This plugin is pretty ambitious, and is unfinished, so I'd recommend
@@ -80,6 +84,10 @@ code or tried it yet, but here goes. --[[Joey]]
 >> an image with a strange extension to a differing target filename
 >> with the normal extension, respectively). -s
 
+>>> Now that we have `add_autofile` I can just create viewer pages
+>>> whenever there's an image to view. The current version of the
+>>> branch does that. -s
+
 * With each viewer page having next/prev links, I can see how you
   were having the scalability issues with ikiwiki's data structures
   earlier! -J
@@ -94,6 +102,8 @@ code or tried it yet, but here goes. --[[Joey]]
 >> (Unless you use img to make the thumbnails for those links, then it
 >> would rebuild the thumbnails anyway. Have not looked at the code.) --[[Joey]]
 
+>>> I do use img. -s
+
 * And doesn't each viewer page really depend on every other page in the
   same albumsection? If a new page is added, the next/prev links
   may need to be updated, for example. If so, there will be much
@@ -142,13 +152,20 @@ code or tried it yet, but here goes. --[[Joey]]
 > one album: if they're subpages of 2+ nested albums then they're only
 > considered to be in the deepest-nested one (i.e. longest URL), and if
 > they're not in any album then that's a usage error. This would
-> also make prev/next links sane.
->
+> also make prev/next links sane. -s
+
+>> The current version constrains images to be in at most one album,
+>> choosing one arbitrarily (dependent on scan order) if albums are
+>> nested. -s
+
 > If you want to reference images from elsewhere in the wiki and display
 > them as if in an album, then you can use an ordinary inline with
 > the same template that the album would use, and I'll make sure the
-> templates are set up so this works.
->
+> templates are set up so this works. -s
+
+>> Still needs documenting, I've put it on the TODO list on the main
+>> page. -s
+
 > (Implementation detail: this means that an image X/Y/Z/W/V, where X and
 > Y are albums, Z does not exist and W exists but is not an album,
 > would have a content dependency on Y, a presence dependency on Z
@@ -158,6 +175,12 @@ code or tried it yet, but here goes. --[[Joey]]
 > subpages of the album, although that would mean breaking some URLs
 > on the existing website I'm doing all this work for... -s
 
+>> The current version of the branch doesn't have this restriction;
+>> perhaps it's a worthwhile simplification, or perhaps it's too
+>> restrictive? I fairly often use directory hierarchies like
+>> `a_festival/saturday/foo.jpg` within an album, which makes
+>> it very easy to write `albumsection` filters. -s
+
 * Putting a few of the above thoughts together, my ideal album system
   seems to be one where I can just drop the images into a directory and
   have them appear in the album index, as well as each generate their own wiki
@@ -195,6 +218,10 @@ code or tried it yet, but here goes. --[[Joey]]
 >> upload-and-rename.
 >> -s
 
+>>> I believe the current branch meets your requirements, by having
+>>> first-class wiki pages spring into existence using `add_autofile`
+>>> to be viewer pages for photos. -s
+
 > In a way, what you really want for metadata is to have it in the album
 > page, so you can batch-edit the whole lot by editing one file (this
 > does mean that editing the album necessarily causes each of its viewers
@@ -214,6 +241,9 @@ code or tried it yet, but here goes. --[[Joey]]
 >> (That's apparently good enough for Bugzilla, but not really
 >> for ikiwiki). -s
 
+>>> This is now in the main page's TODO list; if/when I implement this,
+>>> I intend to make it a specialized CGI interface. -s
+
 >> Yes, [all metadata in one file] would make some sense.. It also allows putting one image in
 >> two albums, with different caption etc. (Maybe for different audiences.)
 >> --[[Joey]]
@@ -229,7 +259,8 @@ code or tried it yet, but here goes. --[[Joey]]
 
 ----
 
-Trying to use the "special extension" design:
+'''I think the "special extension" design is a dead-end, but here's what
+happened when I tried to work out how it would work. --[[smcv]]'''
 
 Suppose that each viewer is a JPEG-or-GIF-or-something, with extension
 ".albumimage". We have a gallery "memes" with three images, badger,
-- 
cgit v1.2.3


From 28bba0c4bab95228343ecccb33d94e028858a9e3 Mon Sep 17 00:00:00 2001
From: ImRajja <ImRajja@web>
Date: Mon, 10 May 2010 14:25:25 +0000
Subject: dsf sdfvsd

---
 doc/Test_Post.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/Test_Post.mdwn

diff --git a/doc/Test_Post.mdwn b/doc/Test_Post.mdwn
new file mode 100644
index 000000000..e8dfce394
--- /dev/null
+++ b/doc/Test_Post.mdwn
@@ -0,0 +1 @@
+this is a test page..
-- 
cgit v1.2.3


From a855fa1d1846fd1c72254130e8cbcaa0f98bd200 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 10 May 2010 15:56:57 -0400
Subject: bring back input#openid_url styling

Still used on prefs page.
---
 doc/style.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/style.css b/doc/style.css
index 6832194b2..cb02f812a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -332,6 +332,13 @@ ol.form {
 li.form {
 	padding-bottom: 1em;
 }
+input#openid_url {
+	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 0 50%;
+	color: #000;
+	padding-left: 18px;
+}
 input#searchbox {
 	background: url(wikiicons/search-bg.gif) no-repeat;
 	background-color: #fff;
-- 
cgit v1.2.3


From c305303b42649bc0276ea43ef7dbb27117ba151b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 10 May 2010 16:04:28 -0400
Subject: hide local signin when nothing is selected

---
 underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 4eaa613d9..f22f5776a 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -116,6 +116,7 @@ var openid = {
 			' other' +
 			'</a>'
 		);
+		$('#'+this.localsignin_id).hide();
 	}
         
         $('#openid_form').submit(this.submit);
@@ -123,7 +124,7 @@ var openid = {
         var box_id = this.readCookie();
         if (box_id) {
         	this.signin(box_id, true);
-        }  
+        }
     },
     getBoxHTML: function(provider, box_size) {
 	var label="";
-- 
cgit v1.2.3


From 378cae14bbd540aa1cd6b165bee408c0add169c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 10 May 2010 16:12:55 -0400
Subject: openid_url was renamed to openid_identifier

---
 doc/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/style.css b/doc/style.css
index cb02f812a..4ea77573a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -332,7 +332,7 @@ ol.form {
 li.form {
 	padding-bottom: 1em;
 }
-input#openid_url {
+input#openid_identifier {
 	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
 	background-color: #fff;
 	background-position: 0 50%;
-- 
cgit v1.2.3


From 4ceae1761b6f190a6115c106713d28f0a94e9191 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawngPXAGrxk1pbqnum3O4I_VPRgNj_TZR1I"
 <https://www.google.com/accounts/o8/id?id=AItOawngPXAGrxk1pbqnum3O4I_VPRgNj_TZR1I@web>
Date: Tue, 11 May 2010 21:52:38 +0000
Subject:

---
 doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
index 316ea7e9b..e89545955 100644
--- a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
+++ b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
@@ -25,4 +25,8 @@ But there is no error if I use `ikiwiki --rebuild` to regenerate the whole thing
 > that only happened some of the time.
 > 
 > (The Text::Typography warning seems probably unrelated.)
-> --[[Joey]] 
+> --[[Joey]]
+
+>> I'm sorry, I don't know what I was thinking there.  It's ikiwiki 3.20100212, and manually applying the patch you linked to made the bug go away.  (Upgrading ikiwiki is a pain on nearlyfreespeech, especially if you don't want to keep the build directory around -- please consider making ikiwiki runnable directly from a git clone.)
+
+[[!meta link="done"]]
-- 
cgit v1.2.3


From 4c22562ec10bed4d8e499f226b2b3ba8a18a6489 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 11 May 2010 19:18:35 -0400
Subject: remove

---
 doc/Test_Post.mdwn | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 doc/Test_Post.mdwn

diff --git a/doc/Test_Post.mdwn b/doc/Test_Post.mdwn
deleted file mode 100644
index e8dfce394..000000000
--- a/doc/Test_Post.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-this is a test page..
-- 
cgit v1.2.3


From 978416a2e60edea6d3d2c9ede80b8f6ef27fcecc Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Tue, 11 May 2010 23:41:38 +0000
Subject:

---
 doc/users/BerndZeimetz.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/users/BerndZeimetz.mdwn

diff --git a/doc/users/BerndZeimetz.mdwn b/doc/users/BerndZeimetz.mdwn
new file mode 100644
index 000000000..cf21dc585
--- /dev/null
+++ b/doc/users/BerndZeimetz.mdwn
@@ -0,0 +1,8 @@
+See [wiki.debian.org/BerndZeimetz](http://wiki.debian.org/BerndZeimetz) for details.
+
+<pre>
+ Bernd Zeimetz                            Debian GNU/Linux Developer
+ http://bzed.de                                http://www.debian.org
+ GPG Fingerprints: 06C8 C9A2 EAAD E37E 5B2C BE93 067A AD04 C93B FF79
+                   ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
+</pre>
-- 
cgit v1.2.3


From 85dea5786a5fee835b9677e5267d487813104018 Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Tue, 11 May 2010 23:57:45 +0000
Subject: Add bzed's git repo to the list of repositories to pull from

---
 doc/git.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index c0f42a704..88608d4b5 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -64,6 +64,7 @@ think about merging them. This is recommended. :-)
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
 * [[privat]] `git://github.com/privat/ikiwiki.git`
 * [[blipvert]] `git://github.com/blipvert/ikiwiki.git`
+* [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 72d7b8dc54d4dccc3100fddc23b9a245f62d3521 Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Wed, 12 May 2010 09:20:31 +0000
Subject: Add short page about contrib / tracking plugin

---
 doc/plugins/contrib/tracking.mdwn | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 doc/plugins/contrib/tracking.mdwn

diff --git a/doc/plugins/contrib/tracking.mdwn b/doc/plugins/contrib/tracking.mdwn
new file mode 100644
index 000000000..ee01b261b
--- /dev/null
+++ b/doc/plugins/contrib/tracking.mdwn
@@ -0,0 +1,30 @@
+[[!template id=plugin name=ftemplate author="[[BerndZeimetz]]"]]
+[[!toc]]
+[[!tag plugins]] [[!tag patch]] [[!tag wishlist]]
+
+## NAME
+
+IkiWiki::Plugin::tracking - enable google/piwik visitor tracking
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff tracking ....}],
+
+    # to use Piwik:
+    piwik_id => '1',
+    piwik_https_url => "https://ssl.example.com/piwik/",
+    piwik_http_url => "http://www.example.com/piwik/",
+
+    # to use Google Analytics:
+    google_analytics_id => "UA-xxxxxx-x"
+
+## DESCRIPTION
+
+This plugin includes the necessary tracking codes for Piwik and/or Google Analytics on all pages. Tracking codes will only be included if the necessary config options are set. The plugin could be enhanced to support goals/profiles and similar things, but I do not plan to do so.
+
+## DOWNLOAD
+
+* single files: [tracking.pm](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob;f=IkiWiki/Plugin/tracking.pm;hb=refs/heads/tracking) [piwik.tmpl](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob;f=templates/piwik.tmpl;hb=refs/heads/tracking) [google_analytics.tmpl](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob;f=templates/google_analytics.tmpl;hb=refs/heads/tracking)
+* browse repository: <http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=shortlog;h=refs/heads/tracking>
+* git repo: `git://git.recluse.de/users/bzed/ikiwiki.git` or <http://git.recluse.de/repos/users/bzed/ikiwiki.git> (Use the tracking branch)
-- 
cgit v1.2.3


From 1805bfbb5dd24ed23418ceee00524f4dd658993e Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Wed, 12 May 2010 09:21:40 +0000
Subject: ... choose the right name....

---
 doc/plugins/contrib/tracking.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/tracking.mdwn b/doc/plugins/contrib/tracking.mdwn
index ee01b261b..06d4120cd 100644
--- a/doc/plugins/contrib/tracking.mdwn
+++ b/doc/plugins/contrib/tracking.mdwn
@@ -1,4 +1,4 @@
-[[!template id=plugin name=ftemplate author="[[BerndZeimetz]]"]]
+[[!template id=plugin name=tracking author="[[BerndZeimetz]]"]]
 [[!toc]]
 [[!tag plugins]] [[!tag patch]] [[!tag wishlist]]
 
-- 
cgit v1.2.3


From 7112da3ed10a95e170fb197d473444a92009c223 Mon Sep 17 00:00:00 2001
From: "http://blog.farnz.org.uk/" <http://blog.farnz.org.uk/@web>
Date: Wed, 12 May 2010 19:21:54 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index c323153c8..1c746c190 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -79,3 +79,4 @@ Hmm, can I dig it?
 Test
 test2
 
+I assume this triggers a checkin and recompile?
-- 
cgit v1.2.3


From 3f2f447cb57acbcf2bf767c19160426a5efe5d75 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 12 May 2010 15:42:28 -0400
Subject: responses

---
 .../debian_backports_update_someone_please.mdwn    |  5 +++++
 ...ow_do_I_revert_edits_in_the_web_mode__63__.mdwn | 24 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index 46b0aca6b..f1854762e 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -5,3 +5,8 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 > for 2 weeks. :) --[[Joey]]
 
 >> And are there any chances you doing it... or rather not doing it?
+
+>>> Sure, I'm busily not doing it right now. Should reach testing in 3
+>>> days. I generally schedule things so a new ikiwiki reaches testing
+>>> every 2 weeks to month. Getting important new features and bugfixes out
+>>> can take priority though. --[[Joey]] 
diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index c326b8205..eca572c70 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -3,3 +3,27 @@ Puzzled a bit :-/
 > There is no explicit interface for reverting edits. Most of us use `git revert`. --[[Joey]]
 
 >> That's a blow; I was planning on appointing no techies to keep law and order on our pages :-/ Is there a plugin or at least a plan to add such a 'in demand' feature?
+
+>>> A lot of things complicate adding that feature to the web interface.
+>>>
+>>> First, ikiwiki happily uses whatever the VCS's best of breed web
+>>> history interface is. (ie, viewvcs, gitweb). To allow reverting
+>>> past the bottom of the RecentChanges page, it would need to have its 
+>>> own history browser. Not sure I want to go there.
+>>>
+>>> And the mechanics of handling reverting can quickly get complex. 
+>>> Web reverting should only allow users to revert things they can edit,
+>>> but reverting a whole commit in git might touch multiple files.
+>>> Some files may not be editable over the web at all. (The
+>>> [[tips/untrusted_git_push]] also has to deal with those issues.)
+>>> Finally, a revert can fail with a conflict. The revert could touch 
+>>> multiple files, and multiple ones could conflict. The conflict may
+>>> involve non-page files that can't be diffed. So an interface for
+>>> resolving such a conflict could be hard.
+>>> 
+>>> Probably web-based reverting would need to be limited to reverting 
+>>> single file changes, not whole commits, and not having very good
+>>> conflict handling. And maybe only being accessible for changes
+>>> still visible on RecentChanges. With those limitations, it's certianly
+>>> doable (as a plugin even), but given how excellent `git revert` is in
+>>> comparison, I have not had a real desire to do so. --[[Joey]]
-- 
cgit v1.2.3


From 50c9851ddc834f6261da0df525374efd867f731d Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Thu, 13 May 2010 00:07:54 +0000
Subject: comments

---
 doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index eca572c70..510e93077 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -27,3 +27,7 @@ Puzzled a bit :-/
 >>> still visible on RecentChanges. With those limitations, it's certianly
 >>> doable (as a plugin even), but given how excellent `git revert` is in
 >>> comparison, I have not had a real desire to do so. --[[Joey]]
+
+>>>> Web edits are single-file anyway, so I wouldn't expect web reverts
+>>>> to handle the multi-file case. OTOH, I've sometimes wished ikiwiki
+>>>> had its own history browser (somewhere down my todo list). --[[schmonz]]
-- 
cgit v1.2.3


From 031da9c134fca2c6d689f343ac0b4a537b4cfd15 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 13 May 2010 16:28:09 -0400
Subject: po: guard against reimportation

If po is imported twice, bad things happen. Guard against that.

I'm not sure what causes the double import; I saw it when websetup did a
wiki rebuild. Carp failed to show a backtrace for the second call to
import.
---
 IkiWiki/Plugin/po.pm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 7c979ebca..990847b48 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -51,18 +51,20 @@ sub import {
 	hook(type => "formbuilder_setup", id => "po", call => \&formbuilder_setup, last => 1);
 	hook(type => "formbuilder", id => "po", call => \&formbuilder);
 
-	$origsubs{'bestlink'}=\&IkiWiki::bestlink;
-	inject(name => "IkiWiki::bestlink", call => \&mybestlink);
-	$origsubs{'beautify_urlpath'}=\&IkiWiki::beautify_urlpath;
-	inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
-	$origsubs{'targetpage'}=\&IkiWiki::targetpage;
-	inject(name => "IkiWiki::targetpage", call => \&mytargetpage);
-	$origsubs{'urlto'}=\&IkiWiki::urlto;
-	inject(name => "IkiWiki::urlto", call => \&myurlto);
-	$origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
-	inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
-	$origsubs{'rootpage'}=\&IkiWiki::rootpage;
-	inject(name => "IkiWiki::rootpage", call => \&myrootpage);
+	if (! %origsubs) {
+		$origsubs{'bestlink'}=\&IkiWiki::bestlink;
+		inject(name => "IkiWiki::bestlink", call => \&mybestlink);
+		$origsubs{'beautify_urlpath'}=\&IkiWiki::beautify_urlpath;
+		inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
+		$origsubs{'targetpage'}=\&IkiWiki::targetpage;
+		inject(name => "IkiWiki::targetpage", call => \&mytargetpage);
+		$origsubs{'urlto'}=\&IkiWiki::urlto;
+		inject(name => "IkiWiki::urlto", call => \&myurlto);
+		$origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
+		inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
+		$origsubs{'rootpage'}=\&IkiWiki::rootpage;
+		inject(name => "IkiWiki::rootpage", call => \&myrootpage);
+	}
 }
 
 
-- 
cgit v1.2.3


From 7edd9e7ef3aec48f2b5206d307781378521d16f0 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 14:00:39 +0000
Subject:

---
 doc/forum/debian_backports_update_someone_please.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index f1854762e..66f5eb0c5 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -10,3 +10,5 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 >>> days. I generally schedule things so a new ikiwiki reaches testing
 >>> every 2 weeks to month. Getting important new features and bugfixes out
 >>> can take priority though. --[[Joey]] 
+
+>>>> Great! Thanks.
-- 
cgit v1.2.3


From 4611c77696496287385f19301bcdf301393c6a61 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 14:02:25 +0000
Subject:

---
 doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index 510e93077..7686a7a08 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -31,3 +31,5 @@ Puzzled a bit :-/
 >>>> Web edits are single-file anyway, so I wouldn't expect web reverts
 >>>> to handle the multi-file case. OTOH, I've sometimes wished ikiwiki
 >>>> had its own history browser (somewhere down my todo list). --[[schmonz]]
+
+>>>> Yup, having a possibility to revert a single file would suffice.
-- 
cgit v1.2.3


From 01d28878d70b3a854fb683afaa81706f5b76b597 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 14:11:04 +0000
Subject:

---
 ...o_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn

diff --git a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
new file mode 100644
index 000000000..9f70bf442
--- /dev/null
+++ b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
@@ -0,0 +1 @@
+OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in <frameset> mode?
-- 
cgit v1.2.3


From f09cd4b7363b5ff8bdaf71fa6aad56747cf6c734 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 14:12:03 +0000
Subject:

---
 ..._load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
index 9f70bf442..0475d126f 100644
--- a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
+++ b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
@@ -1 +1 @@
-OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in <frameset> mode?
+OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in *frameset* mode?
-- 
cgit v1.2.3


From c9699ef0652bee261e03ff684dfe26b2bd791bd9 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 16:14:29 +0000
Subject:

---
 ...sallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn

diff --git a/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
new file mode 100644
index 000000000..c86c35da4
--- /dev/null
+++ b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
@@ -0,0 +1 @@
+As in title, I'd like to allow editing only some pages on my wiki. Rest by default is not editable by users except admin. Thanks
-- 
cgit v1.2.3


From 8ff761afa24febdb280c672b3b31d6145990f050 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 14:21:45 -0400
Subject: remove, rename: Add guards against XSRF attacks.

---
 IkiWiki/Plugin/remove.pm | 4 ++++
 IkiWiki/Plugin/rename.pm | 4 ++++
 debian/changelog         | 1 +
 3 files changed, 9 insertions(+)

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index a46294e78..d23b2cc10 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -107,6 +107,8 @@ sub confirmation_form ($$) {
 		fields => [qw{do page}],
 	);
 	
+	$f->field(name => "sid", type => "hidden", value => $session->id,
+		force => 1);
 	$f->field(name => "do", type => "hidden", value => "remove", force => 1);
 
 	return $f, ["Remove", "Cancel"];
@@ -188,6 +190,8 @@ sub sessioncgi ($$) {
 			postremove($session);
 		}
 		elsif ($form->submitted eq 'Remove' && $form->validate) {
+			IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
+
 			my @pages=$form->field("page");
 	
 			# Validate removal by checking that the page exists,
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 537e91317..0da90a538 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -131,6 +131,8 @@ sub rename_form ($$$) {
 	);
 	
 	$f->field(name => "do", type => "hidden", value => "rename", force => 1);
+	$f->field(name => "sid", type => "hidden", value => $session->id,
+		force => 1);
 	$f->field(name => "page", type => "hidden", value => $page, force => 1);
 	$f->field(name => "new_name", value => pagetitle($page, 1), size => 60);
 	if (!$q->param("attachment")) {
@@ -286,6 +288,8 @@ sub sessioncgi ($$) {
 			postrename($session);
 		}
 		elsif ($form->submitted eq 'Rename' && $form->validate) {
+			IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
+
 			# Queue of rename actions to perfom.
 			my @torename;
 
diff --git a/debian/changelog b/debian/changelog
index e6c5e42ae..a09c8e228 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     (And also negative years.)
   * calendar: Display year in title of month calendar.
   * Use xhtml friendly pubdate setting.
+  * remove, rename: Add guards against XSRF attacks.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
-- 
cgit v1.2.3


From 68b91528dd66c1e29147babc0647647cc0e0a958 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Fri, 14 May 2010 19:01:35 +0000
Subject: lockedit

---
 ...allow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
index c86c35da4..fbc5c58e2 100644
--- a/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
+++ b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
@@ -1 +1,3 @@
 As in title, I'd like to allow editing only some pages on my wiki. Rest by default is not editable by users except admin. Thanks
+
+> See [[plugins/lockedit]]. --[[schmonz]]
-- 
cgit v1.2.3


From 5a4c95cc352d6895c11542245981c62a5c003370 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 20:04:02 -0400
Subject: enable action bar on misctemplates

So RecentChanges shows on the action bar there,
convert recentchanges to use new pageactions hook,
with compatability code to avoid breaking old templates.
---
 IkiWiki.pm                      | 11 ++++++++++-
 IkiWiki/Plugin/recentchanges.pm | 18 ++++++++++++++++--
 templates/page.tmpl             |  3 ---
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 33e4e1d1f..46c29abe3 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1748,7 +1748,6 @@ sub misctemplate ($$;@) {
 
 	$template->param(
 		dynamic => 1,
-		have_actions => 0, # force off
 		title => $title,
 		wikiname => $config{wikiname},
 		content => $content,
@@ -1756,6 +1755,16 @@ sub misctemplate ($$;@) {
 		html5 => $config{html5},
 		@_,
 	);
+	
+	my @actions;
+	run_hooks(pageactions => sub {
+		push @actions, map { { action => $_ } } 
+			grep { defined } shift->(page => "");
+	});
+	$template->param(actions => \@actions);
+	if (@actions) {
+		$template->param(have_actions => 1);
+	}
 
 	return $template->output;
 }
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 5c7b71aaa..65044080f 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -11,6 +11,7 @@ sub import {
 	hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
 	hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
 	hook(type => "refresh", id => "recentchanges", call => \&refresh);
+	hook(type => "pageactions", id => "recentchanges", call => \&pageactions);
 	hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
 	hook(type => "htmlize", id => "_change", call => \&htmlize);
 	# Load goto to fix up links from recentchanges
@@ -61,14 +62,27 @@ sub refresh ($) {
 }
 
 # Enable the recentchanges link on wiki pages.
+sub pageactions (@) {
+	my %params=@_;
+	my $page=$params{page};
+
+	if (defined $config{recentchangespage} && $config{rcs} &&
+	    $page ne $config{recentchangespage}) {
+		return htmllink($page, $page, $config{recentchangespage},
+			gettext("RecentChanges"));
+	}
+}
+
+# Backwards compatability for templates still using
+# RECENTCHANGESURL.
 sub pagetemplate (@) {
 	my %params=@_;
 	my $template=$params{template};
 	my $page=$params{page};
 
 	if (defined $config{recentchangespage} && $config{rcs} &&
-	    $page ne $config{recentchangespage} &&
-	    $template->query(name => "recentchangesurl")) {
+	    $template->query(name => "recentchangesurl") &&
+	    $page ne $config{recentchangespage}) {
 		$template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
 		$template->param(have_actions => 1);
 	}
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 3bb7197f0..049d31ad5 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -61,9 +61,6 @@
 <TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
-<TMPL_IF RECENTCHANGESURL>
-<li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
-</TMPL_IF>
 <TMPL_IF HISTORYURL>
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
-- 
cgit v1.2.3


From 377e82b16c95833a37c1f87e57122e8b44c187cb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 20:10:18 -0400
Subject: we want the recentchanges link to be the first floating action

---
 IkiWiki/Plugin/recentchanges.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 65044080f..7eba931be 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -11,7 +11,8 @@ sub import {
 	hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
 	hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
 	hook(type => "refresh", id => "recentchanges", call => \&refresh);
-	hook(type => "pageactions", id => "recentchanges", call => \&pageactions);
+	hook(type => "pageactions", id => "recentchanges", call => \&pageactions,
+		first => 1);
 	hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
 	hook(type => "htmlize", id => "_change", call => \&htmlize);
 	# Load goto to fix up links from recentchanges
-- 
cgit v1.2.3


From bbe971881a7a3c03dfdb5312215c434e35eff94e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 20:20:41 -0400
Subject: refactor template actions

---
 IkiWiki.pm        | 22 ++++++++++++++++++----
 IkiWiki/Render.pm | 18 +++---------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 46c29abe3..a42f56bf0 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1755,18 +1755,32 @@ sub misctemplate ($$;@) {
 		html5 => $config{html5},
 		@_,
 	);
+
+	templateactions($template, "");
 	
+	return $template->output;
+}
+
+sub templateactions ($$) {
+	my $template=shift;
+	my $page=shift;
+
+	my $have_actions=0;
 	my @actions;
 	run_hooks(pageactions => sub {
 		push @actions, map { { action => $_ } } 
-			grep { defined } shift->(page => "");
+			grep { defined } shift->(page => $page);
 	});
 	$template->param(actions => \@actions);
-	if (@actions) {
-		$template->param(have_actions => 1);
+
+	if ($config{cgiurl} && exists $hooks{auth}) {
+		$template->param(prefsurl => cgiurl(do => "prefs"));
+		$have_actions=1;
 	}
 
-	return $template->output;
+	if ($have_actions || @actions) {
+		$template->param(have_actions => 1);
+	}
 }
 
 sub hook (@) {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8b1b9aef4..833fcaaff 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -84,19 +84,14 @@ sub genpage ($$) {
 		$template=template('page.tmpl', 
 			blind_cache => 1);
 	}
-	my $actions=0;
 
+	my $actions=0;
 	if (length $config{cgiurl}) {
 		if (IkiWiki->can("cgi_editpage")) {
 			$template->param(editurl => cgiurl(do => "edit", page => $page));
 			$actions++;
 		}
-		if (exists $hooks{auth}) {
-			$template->param(prefsurl => cgiurl(do => "prefs"));
-			$actions++;
-		}
 	}
-		
 	if (defined $config{historyurl} && length $config{historyurl}) {
 		my $u=$config{historyurl};
 		$u=~s/\[\[file\]\]/$pagesources{$page}/g;
@@ -111,17 +106,10 @@ sub genpage ($$) {
 			$actions++;
 		}
 	}
-
-	my @actions;
-	run_hooks(pageactions => sub {
-		push @actions, map { { action => $_ } } 
-			grep { defined } shift->(page => $page);
-	});
-	$template->param(actions => \@actions);
-
-	if ($actions || @actions) {
+	if ($actions) {
 		$template->param(have_actions => 1);
 	}
+	templateactions($template, $page);
 
 	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
 	my ($backlinks, $more_backlinks);
-- 
cgit v1.2.3


From d80a649073ecabe70870fbe01dfcdf6fc8735201 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 20:29:16 -0400
Subject: bugfix

---
 IkiWiki/Plugin/recentchanges.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 7eba931be..0ee8f0e66 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -70,7 +70,7 @@ sub pageactions (@) {
 	if (defined $config{recentchangespage} && $config{rcs} &&
 	    $page ne $config{recentchangespage}) {
 		return htmllink($page, $page, $config{recentchangespage},
-			gettext("RecentChanges"));
+			linktext => gettext("RecentChanges"));
 	}
 }
 
-- 
cgit v1.2.3


From ce731ec33fc4b30fae1f99be7476d9cb1c494fc9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 20:33:53 -0400
Subject: avoid warning

---
 po/underlay.setup | 1 +
 1 file changed, 1 insertion(+)

diff --git a/po/underlay.setup b/po/underlay.setup
index c34045981..8d3516cff 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -24,6 +24,7 @@ use IkiWiki::Setup::Standard {
 	# we don't want to pull in the normal underlays
 	underlaydirbase => "underlays/empty",
 	underlaydir => "underlays/empty",
+	disable_plugins => [qw{openid}], # needs special underlay
 	discussion => 0,
 	locale => '',
 	verbose => 1,
-- 
cgit v1.2.3


From 3dd98a3b3f66555ca3d83ec6940a9cd11cf8bec7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 20:38:08 -0400
Subject: put back recentchangesurl

On second thought, misctemplate can use pagetemplate hooks to provide
it, so it's better to keep back-compat, and allow full customisation
of how it's displayed via the template.
---
 IkiWiki/Plugin/recentchanges.pm | 17 +----------------
 templates/page.tmpl             |  3 +++
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 0ee8f0e66..e546e4702 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -11,8 +11,6 @@ sub import {
 	hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
 	hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
 	hook(type => "refresh", id => "recentchanges", call => \&refresh);
-	hook(type => "pageactions", id => "recentchanges", call => \&pageactions,
-		first => 1);
 	hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
 	hook(type => "htmlize", id => "_change", call => \&htmlize);
 	# Load goto to fix up links from recentchanges
@@ -62,20 +60,7 @@ sub refresh ($) {
 	}
 }
 
-# Enable the recentchanges link on wiki pages.
-sub pageactions (@) {
-	my %params=@_;
-	my $page=$params{page};
-
-	if (defined $config{recentchangespage} && $config{rcs} &&
-	    $page ne $config{recentchangespage}) {
-		return htmllink($page, $page, $config{recentchangespage},
-			linktext => gettext("RecentChanges"));
-	}
-}
-
-# Backwards compatability for templates still using
-# RECENTCHANGESURL.
+# Enable the recentchanges link.
 sub pagetemplate (@) {
 	my %params=@_;
 	my $template=$params{template};
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 049d31ad5..3bb7197f0 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -61,6 +61,9 @@
 <TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
+<TMPL_IF RECENTCHANGESURL>
+<li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
+</TMPL_IF>
 <TMPL_IF HISTORYURL>
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
-- 
cgit v1.2.3


From 827e092b58771e5c5efdbc1cf04a62a1d039a015 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 20:40:42 -0400
Subject: show search form on dynamic pages

---
 templates/page.tmpl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 3bb7197f0..f7944e40e 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -48,11 +48,9 @@
 </TMPL_IF>
 </span>
 </span>
-<TMPL_UNLESS DYNAMIC>
 <TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
-</TMPL_UNLESS>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF HAVE_ACTIONS>
-- 
cgit v1.2.3


From f69c072d8aad7ad68547f17bf60bd804542b064f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 21:40:30 -0400
Subject: better misctemplate splitting sequence

---
 IkiWiki/Plugin/websetup.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 9cb5eb13c..c4b75c4b3 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -450,8 +450,8 @@ sub showform ($$) {
 			IkiWiki::unlockwiki();
 
 			# Print the top part of a standard misctemplate,
-			# then show the rebuild or refresh.
-			my $divider="xxx";
+			# then show the rebuild or refresh, live.
+			my $divider="\0";
 			my $html=IkiWiki::misctemplate("setup", $divider);
 			IkiWiki::printheader($session);
 			my ($head, $tail)=split($divider, $html, 2);
-- 
cgit v1.2.3


From 4c6fa6413fc26ddbb1f8dc2c73f97a105c5002f8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 21:42:48 -0400
Subject: avoid showing redundant search box on search results page

---
 IkiWiki/Plugin/search.pm | 3 ++-
 templates/page.tmpl      | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index cc26b7ac1..a9089620b 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -228,7 +228,8 @@ sub setupfiles () {
 		
 		# Avoid omega interpreting anything in the misctemplate
 		# as an omegascript command.
-		my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0");
+		my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0",
+			searching => 1);
 		eval q{use HTML::Entities};
 		error $@ if $@;
 		$misctemplate=encode_entities($misctemplate, '\$');
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f7944e40e..a7d200466 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -48,9 +48,11 @@
 </TMPL_IF>
 </span>
 </span>
+<TMPL_UNLESS SEARCHING>
 <TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
+</TMPL_UNLESS>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF HAVE_ACTIONS>
-- 
cgit v1.2.3


From c8b34aa31c7d146adf4210c6171dfea2988a7688 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 21:45:22 -0400
Subject: allow misctemplate callers to pass params to suppress actions etc

Suppress disiplay of small search for on search results page, and of
Prefrences link on prefs page.
---
 IkiWiki.pm               | 3 +--
 IkiWiki/CGI.pm           | 4 +++-
 IkiWiki/Plugin/search.pm | 3 ++-
 templates/page.tmpl      | 2 --
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a42f56bf0..699ad13da 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1745,6 +1745,7 @@ sub misctemplate ($$;@) {
 	run_hooks(pagetemplate => sub {
 		shift->(page => "", destpage => "", template => $template);
 	});
+	templateactions($template, "");
 
 	$template->param(
 		dynamic => 1,
@@ -1755,8 +1756,6 @@ sub misctemplate ($$;@) {
 		html5 => $config{html5},
 		@_,
 	);
-
-	templateactions($template, "");
 	
 	return $template->output;
 }
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index b98e9e0a1..28020b500 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -247,7 +247,9 @@ sub cgi_prefs ($$) {
 		$form->text(gettext("Preferences saved."));
 	}
 	
-	showform($form, $buttons, $session, $q);
+	showform($form, $buttons, $session, $q,
+		prefsurl => "", # avoid showing the preferences link
+	);
 }
 
 sub cgi_custom_failure ($$$) {
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index a9089620b..ff5d0ccbe 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -229,7 +229,8 @@ sub setupfiles () {
 		# Avoid omega interpreting anything in the misctemplate
 		# as an omegascript command.
 		my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0",
-			searching => 1);
+			searchform => "", # avoid showing the small search form
+		);
 		eval q{use HTML::Entities};
 		error $@ if $@;
 		$misctemplate=encode_entities($misctemplate, '\$');
diff --git a/templates/page.tmpl b/templates/page.tmpl
index a7d200466..f7944e40e 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -48,11 +48,9 @@
 </TMPL_IF>
 </span>
 </span>
-<TMPL_UNLESS SEARCHING>
 <TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
-</TMPL_UNLESS>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF HAVE_ACTIONS>
-- 
cgit v1.2.3


From 5071347e2b08c21206ed3d0dc30eebb4f499efe5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 23:02:29 -0400
Subject: tweak actionvar

for visual consistentcy when there are no actions
---
 doc/style.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 4ea77573a..2cd7a9652 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -29,12 +29,13 @@ nav {
 
 .actions ul {
 	margin: 0;
-	padding: 6px;
+	padding: 6px .4em;
+	height: 1em;
 	list-style-type: none;
 }
 .actions li {
 	display: inline;
-	padding: .2em .4em;
+	padding: .2em;
 }
 .pageheader .actions ul {
 	border-bottom: 1px solid #000;
-- 
cgit v1.2.3


From e650b084a3651b4f49b60c6397501dea01723a51 Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Sat, 15 May 2010 09:53:32 +0000
Subject: Remove Banu

---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index edf36b5c6..94dc00b25 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -53,7 +53,6 @@ Projects & Organizations
 * [Debian Costa Rica](http://cr.debian.net/)
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
-* [Banu](https://www.banu.com/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 8c05fcde9ee5ae9da5de71e0c27d59aca106c877 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 21:09:38 -0400
Subject: relase finalised

---
 debian/changelog | 4 ++--
 ikiwiki.spec     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a09c8e228..50b1fddff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100505) UNRELEASED; urgency=low
+ikiwiki (3.20100515) unstable; urgency=low
 
   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
     a single template, page.tmpl.
@@ -32,7 +32,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * Use xhtml friendly pubdate setting.
   * remove, rename: Add guards against XSRF attacks.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 15 May 2010 21:00:45 -0400
 
 ikiwiki (3.20100504) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index b2b5af3dc..09f07c6ce 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100505
+Version: 3.20100515
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
-- 
cgit v1.2.3


From 083e491262b337296e28de2c9b2a53401ec780ef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 22:21:17 -0400
Subject: add missing closing tmpl_if

---
 debian/NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/NEWS b/debian/NEWS
index 68f0a207b..e8408edff 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (3.20100505) UNRELEASED; urgency=low
+ikiwiki (3.20100515) unstable; urgency=low
 
   There is a significant change to the page.tmpl template in this version.
   If you have locally modified versions of that template, you will need
@@ -8,6 +8,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
     <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
     </TMPL_IF>
+    </TMPL_IF>
   
   Also, there is a new "comment()" pagespec, that can be used to match a
   comment on a page. It is recommended it be used instead of the old
-- 
cgit v1.2.3


From 0287fe29ac7b2e38f8887ad0a5b0f6e98986809f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 22:23:44 -0400
Subject: reword comment count to avoid pluralisation issues

---
 doc/examples/blog/comments.mdwn | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 32ffa5537..f8569a549 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,7 +1,6 @@
-This page will show recent comments made to posts in the [[blog|index]].
-
-There are [[!pagecount pages="comment_pending(/posts/*)"]] comments
-in the moderation queue.
 [[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
+Comments in the moderation queue:
+[[!pagecount pages="comment_pending(/posts/*)"]]
 
+Recent comments on posts in the [[blog|index]]:
 [[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
-- 
cgit v1.2.3


From 4a6d5330e5b9554f1bd25b9025dd96200c6519c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 22:28:07 -0400
Subject: avoid showing comment post stuff on dynamic pages

If the site is configured to allow comments on *, then the comment post
interface was being added to cgi pages like signin and prefs. This fixes it
w/o requiring more page.tmpl changes. The pagetemplate hook is called by
misctemplate with an empty page name for dynamic pages.
---
 IkiWiki/Plugin/comments.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3cafcbe9c..af7e7eccd 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -742,6 +742,7 @@ sub pagetemplate (@) {
 	             $template->query(name => 'commentsurl') ||
 	             $template->query(name => 'atomcommentsurl') ||
 	             $template->query(name => 'comments')) &&
+	            length $page && # not dynamic
 	            commentsshown($page);
 
 	if ($template->query(name => 'comments')) {
-- 
cgit v1.2.3


From e2ad879932446ee25b61fa3b30f5233df59dad59 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 22:32:24 -0400
Subject: reword

---
 debian/NEWS | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index e8408edff..0a00ea6dd 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,8 +1,9 @@
 ikiwiki (3.20100515) unstable; urgency=low
 
-  There is a significant change to the page.tmpl template in this version.
-  If you have locally modified versions of that template, you will need
-  to update it to contain the following in the HTML <head>:
+  There is a significant change to the page.tmpl template in this version,
+  (and several less significant changes). If you have a locally modified
+  version of that template, you will need to update it at least to
+  contain the following in the HTML <head>:
 
     <TMPL_IF DYNAMIC>
     <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
-- 
cgit v1.2.3


From ff67a31db53dee296ef5f603cc6062d2191c7178 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 22:38:59 -0400
Subject: Revert "avoid showing comment post stuff on dynamic pages"

This reverts commit 4a6d5330e5b9554f1bd25b9025dd96200c6519c7.

That was too ugly, the DYNAMIC test on page.tmpl will avoid the problem
anyway -- just needs to be added.
---
 IkiWiki/Plugin/comments.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index af7e7eccd..3cafcbe9c 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -742,7 +742,6 @@ sub pagetemplate (@) {
 	             $template->query(name => 'commentsurl') ||
 	             $template->query(name => 'atomcommentsurl') ||
 	             $template->query(name => 'comments')) &&
-	            length $page && # not dynamic
 	            commentsshown($page);
 
 	if ($template->query(name => 'comments')) {
-- 
cgit v1.2.3


From e02c1bcf3df6b269ed7d5a29a97ea7f8f9464a3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 22:41:37 -0400
Subject: document needing to wrap footer in dynamic test

---
 debian/NEWS | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 0a00ea6dd..f73ac9c3d 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,17 +1,18 @@
 ikiwiki (3.20100515) unstable; urgency=low
 
-  There is a significant change to the page.tmpl template in this version,
-  (and several less significant changes). If you have a locally modified
-  version of that template, you will need to update it at least to
-  contain the following in the HTML <head>:
+  There are two significant changes to the page.tmpl template in this version.
+  If you have a locally modified version of that template, you will need to
+  update it at least to contain the following in the HTML <head>:
 
     <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>
+
+  Also, the footer should be wrapped in <TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>
   
-  Also, there is a new "comment()" pagespec, that can be used to match a
+  There is a new "comment()" pagespec, that can be used to match a
   comment on a page. It is recommended it be used instead of the old
   method of using a pagespec such as "internal(comment_*)" to match
   things that looked like comments. The old pagespec will now also match
-- 
cgit v1.2.3


From 758cd909e9cc7bf9b46679131808132a397c8770 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:01:40 -0400
Subject: move moderation info to sidebar

---
 doc/examples/blog/comments.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index f8569a549..1873fb9ac 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,6 +1,8 @@
+[[!sidebar content="""
 [[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
 Comments in the moderation queue:
 [[!pagecount pages="comment_pending(/posts/*)"]]
+"""]]
 
 Recent comments on posts in the [[blog|index]]:
 [[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
-- 
cgit v1.2.3


From 0ab4496237e42a0044116477d0358b2faaa95675 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:06:19 -0400
Subject: fix comment feed filename

---
 doc/examples/blog/comments.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 1873fb9ac..f600ae183 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,5 +1,6 @@
 [[!sidebar content="""
-[[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
+[[!inline pages="comment_pending(/posts/*)" feedfile=pendingmoderation
+description="comments pending moderation" show=-1]]
 Comments in the moderation queue:
 [[!pagecount pages="comment_pending(/posts/*)"]]
 """]]
-- 
cgit v1.2.3


From 0e13c97345a54269f25264a66a85e78f0748eca3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:24:57 -0400
Subject: disable openid when building doc dir

---
 docwiki.setup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docwiki.setup b/docwiki.setup
index 6bc200066..8b898f619 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -29,7 +29,8 @@ use IkiWiki::Setup::Standard {
 	usedirs => 0,
 	prefix_directives => 1,
 	add_plugins => [qw{goodstuff version haiku polygen fortune table}],
-	disable_plugins => [qw{recentchanges}], # not appropriate for doc dir
+	# not appropriate for doc dir
+	disable_plugins => [qw{recentchanges openid}],
 	rcs => $rcs,
 	gitorigin_branch => '', # don't pull during build
 }
-- 
cgit v1.2.3


From 405f5f09d0caaa2208a8da311df78911e01455dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:39:54 -0400
Subject: add news item for ikiwiki 3.20100515

---
 doc/news/version_3.20100515.mdwn | 54 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 doc/news/version_3.20100515.mdwn

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
new file mode 100644
index 000000000..de7145c8d
--- /dev/null
+++ b/doc/news/version_3.20100515.mdwn
@@ -0,0 +1,54 @@
+News for ikiwiki 3.20100515:
+
+   There are two significant changes to the page.tmpl template in this version.
+   If you have a locally modified version of that template, you will need to
+   update it at least to contain the following in the HTML &lt;head&gt;:
+     &lt;TMPL\_IF DYNAMIC&gt;
+     &lt;TMPL\_IF FORCEBASEURL&gt;&lt;base href="&lt;TMPL\_VAR FORCEBASEURL&gt;" /&gt;&lt;TMPL\_ELSE&gt;
+     &lt;TMPL\_IF BASEURL&gt;&lt;base href="&lt;TMPL\_VAR BASEURL&gt;" /&gt;&lt;/TMPL\_IF&gt;
+     &lt;/TMPL\_IF&gt;
+     &lt;/TMPL\_IF&gt;
+   Also, the footer should be wrapped in &lt;TMPL\_UNLESS DYNAMIC&gt; ... &lt;/TMPL\_UNLESS&gt;
+   There is a new "comment()" pagespec, that can be used to match a
+   comment on a page. It is recommended it be used instead of the old
+   method of using a pagespec such as "internal(comment\_*)" to match
+   things that looked like comments. The old pagespec will now also match
+   comments that are held for moderation; likely not what you want.
+   There have also been some changes to the style.css in this version,
+   particularly to support the new openid selector. If you have a modified
+   version, of style.css, updating it (or moving it to local.css) is
+   recommended.
+
+ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
+     a single template, page.tmpl.
+   * If you have a locally customised page.tmpl, it needs to be updated
+     to set &lt;base&gt; when BASEURL or FORCEBAREURL is set.
+   * comments: Comments pending moderation are now stored in the srcdir
+     alongside accepted comments, but with a `.\_comment\_pending` extension.
+     This allows easier byhand moderation, as the "\_pending" need
+     only be stripped off and the comment be committed to version control.
+   * The `comment\_pending()` pagespec can be used to match such unmoderated
+     comments, which makes it easy to add a feed of them, or a counter
+     indicating how many there are.
+   * Belatedly added a `comment()` pagespec.
+   * Gave comment and page editing forms some CSS and accessability love.
+   * Renamed postscan hook to indexhtml, to reflect its changed position,
+     and typical use.
+   * inline: Call indexhtml when inlining internal pages, so their
+     text can be indexed for searching.
+   * Delete hooks are passed deleted internal pages.
+   * openid: Incorporated a fancy openid-selector signin form.
+     (Based on http://code.google.com/p/openid-selector/)
+   * openid: Use "openid\_identifier" as the form field, as required
+     by OpenID Authentication v2.0 spec.
+   * Removed the openidsignup option. Instead, my recommendation is to
+     leave passwordauth enabled and let people who don't have an openid use it.
+     The openid selector form avoids the UI annoyance of having both openid
+     and passwordauth on one form.
+   * calendar: Allow negative month to be specified. -1 is last month, etc.
+     (And also negative years.)
+   * calendar: Display year in title of month calendar.
+   * Use xhtml friendly pubdate setting.
+   * remove, rename: Add guards against XSRF attacks."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 3d43768b52e0f435333a46fbbe948be9ef0ccd06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:41:59 -0400
Subject: formatting

---
 doc/news/version_3.20100515.mdwn | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index de7145c8d..172b45521 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -2,18 +2,22 @@ News for ikiwiki 3.20100515:
 
    There are two significant changes to the page.tmpl template in this version.
    If you have a locally modified version of that template, you will need to
-   update it at least to contain the following in the HTML &lt;head&gt;:
-     &lt;TMPL\_IF DYNAMIC&gt;
-     &lt;TMPL\_IF FORCEBASEURL&gt;&lt;base href="&lt;TMPL\_VAR FORCEBASEURL&gt;" /&gt;&lt;TMPL\_ELSE&gt;
-     &lt;TMPL\_IF BASEURL&gt;&lt;base href="&lt;TMPL\_VAR BASEURL&gt;" /&gt;&lt;/TMPL\_IF&gt;
-     &lt;/TMPL\_IF&gt;
-     &lt;/TMPL\_IF&gt;
-   Also, the footer should be wrapped in &lt;TMPL\_UNLESS DYNAMIC&gt; ... &lt;/TMPL\_UNLESS&gt;
+   update it at least to contain the following in the HTML `<head>`:
+
+	<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>
+
+   Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL\_UNLESS>
+
    There is a new "comment()" pagespec, that can be used to match a
    comment on a page. It is recommended it be used instead of the old
    method of using a pagespec such as "internal(comment\_*)" to match
    things that looked like comments. The old pagespec will now also match
    comments that are held for moderation; likely not what you want.
+
    There have also been some changes to the style.css in this version,
    particularly to support the new openid selector. If you have a modified
    version, of style.css, updating it (or moving it to local.css) is
@@ -51,4 +55,4 @@ ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
      (And also negative years.)
    * calendar: Display year in title of month calendar.
    * Use xhtml friendly pubdate setting.
-   * remove, rename: Add guards against XSRF attacks."""]]
\ No newline at end of file
+   * remove, rename: Add guards against XSRF attacks."""]]
-- 
cgit v1.2.3


From 1e36ed1fe8cc4dd79a9b1831aec9690769952d92 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:43:55 -0400
Subject: formatting

---
 doc/news/version_3.20100515.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index 172b45521..0405f0f3d 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -10,7 +10,7 @@ News for ikiwiki 3.20100515:
 	</TMPL_IF>
 	</TMPL_IF>
 
-   Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL\_UNLESS>
+   Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>`
 
    There is a new "comment()" pagespec, that can be used to match a
    comment on a page. It is recommended it be used instead of the old
-- 
cgit v1.2.3


From cf7c47dea3c97c4e674087f890754339163f7792 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:44:54 -0400
Subject: formatting

---
 doc/news/version_3.20100515.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index 0405f0f3d..7eafa0be0 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -30,10 +30,10 @@ ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
    * If you have a locally customised page.tmpl, it needs to be updated
      to set &lt;base&gt; when BASEURL or FORCEBAREURL is set.
    * comments: Comments pending moderation are now stored in the srcdir
-     alongside accepted comments, but with a `.\_comment\_pending` extension.
+     alongside accepted comments, but with a `._comment_pending` extension.
      This allows easier byhand moderation, as the "\_pending" need
      only be stripped off and the comment be committed to version control.
-   * The `comment\_pending()` pagespec can be used to match such unmoderated
+   * The `comment_pending()` pagespec can be used to match such unmoderated
      comments, which makes it easy to add a feed of them, or a counter
      indicating how many there are.
    * Belatedly added a `comment()` pagespec.
@@ -44,7 +44,7 @@ ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
      text can be indexed for searching.
    * Delete hooks are passed deleted internal pages.
    * openid: Incorporated a fancy openid-selector signin form.
-     (Based on http://code.google.com/p/openid-selector/)
+     (Based on <http://code.google.com/p/openid-selector/>)
    * openid: Use "openid\_identifier" as the form field, as required
      by OpenID Authentication v2.0 spec.
    * Removed the openidsignup option. Instead, my recommendation is to
-- 
cgit v1.2.3


From 595a783e56cc9bbade002baeff95c0e60d6b3572 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:47:55 -0400
Subject: fixup pagespecs to work relative too

---
 doc/examples/blog/comments.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index f600ae183..f59b44390 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,8 +1,8 @@
 [[!sidebar content="""
-[[!inline pages="comment_pending(/posts/*)" feedfile=pendingmoderation
+[[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation
 description="comments pending moderation" show=-1]]
 Comments in the moderation queue:
-[[!pagecount pages="comment_pending(/posts/*)"]]
+[[!pagecount pages="comment_pending(./posts/*)"]]
 """]]
 
 Recent comments on posts in the [[blog|index]]:
-- 
cgit v1.2.3


From 8e77dc1c9cda0777158b12025d6123452e090765 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:54:00 -0400
Subject: fix typo

---
 IkiWiki/Plugin/sidebar.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 0350f2b71..2d495db2c 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -22,7 +22,7 @@ sub getsetup () {
 		},
 		global_sidebars => {
 			type => "boolean",
-			examples => 1,
+			example => 1,
 			description => "show sidebar page on all pages?",
 			safe => 1,
 			rebuild => 1,
-- 
cgit v1.2.3


From ffcd2da8274b44663207bb866007ee3bc8d8a15f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 16 May 2010 00:03:35 -0400
Subject: page.tmpl: Accidentially broke po plugin's otherlanguages list
 styling when modifying for html5; now fixed.

---
 debian/changelog    | 7 +++++++
 templates/page.tmpl | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 50b1fddff..918970a3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100516) UNRELEASED; urgency=low
+
+  * page.tmpl: Accidentially broke po plugin's otherlanguages list styling
+    when modifying for html5; now fixed.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 16 May 2010 00:03:06 -0400
+
 ikiwiki (3.20100515) unstable; urgency=low
 
   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f7944e40e..235b693fe 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -88,7 +88,7 @@
 </TMPL_IF>
 
 <TMPL_IF OTHERLANGUAGES>
-<TMPL_IF HTML5><nav class="otherlanguages"><TMPL_ELSE><div class="otherlanguages"></TMPL_IF>
+<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
 <ul>
 <TMPL_LOOP OTHERLANGUAGES>
 <li>
-- 
cgit v1.2.3


From 3830a3868b5b3c0a3d840f228c3e85ce686d0705 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sun, 16 May 2010 11:02:31 +0000
Subject: formulation (Did not sound right. (But I am non-native English
 speaker. So please revert if my change is incorrect.)

---
 doc/news/version_3.20100515.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index 7eafa0be0..c6d08b6f0 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -13,7 +13,7 @@ News for ikiwiki 3.20100515:
    Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>`
 
    There is a new "comment()" pagespec, that can be used to match a
-   comment on a page. It is recommended it be used instead of the old
+   comment on a page. It is recommended to use it instead of the old
    method of using a pagespec such as "internal(comment\_*)" to match
    things that looked like comments. The old pagespec will now also match
    comments that are held for moderation; likely not what you want.
-- 
cgit v1.2.3


From 26cf8d386fbdd0c16b732ae6ed1a866eb133a0d2 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Sun, 16 May 2010 12:55:22 +0000
Subject: s/FORCEBAREURL/FORCEBASEURL/

---
 doc/news/version_3.20100515.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index c6d08b6f0..043346c88 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -28,7 +28,7 @@ ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
    * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
      a single template, page.tmpl.
    * If you have a locally customised page.tmpl, it needs to be updated
-     to set &lt;base&gt; when BASEURL or FORCEBAREURL is set.
+     to set &lt;base&gt; when BASEURL or FORCEBASEURL is set.
    * comments: Comments pending moderation are now stored in the srcdir
      alongside accepted comments, but with a `._comment_pending` extension.
      This allows easier byhand moderation, as the "\_pending" need
-- 
cgit v1.2.3


From 87c4b603c3095033f27a3bfadcafd385fb318d76 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sun, 16 May 2010 13:50:15 +0000
Subject:

---
 ..._load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
index 0475d126f..f245e3807 100644
--- a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
+++ b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
@@ -1 +1,3 @@
 OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in *frameset* mode?
+
+> I think I'll have to use [[pagetemplate]] and this <http://stackoverflow.com/questions/153152/resizing-an-iframe-based-on-content> solution
-- 
cgit v1.2.3


From cf559160fa3ee65a99b303d0b483ae9481e4a2c7 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sun, 16 May 2010 13:51:50 +0000
Subject:

---
 ..._load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
index f245e3807..a747911a5 100644
--- a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
+++ b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
@@ -1,3 +1,3 @@
 OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in *frameset* mode?
 
-> I think I'll have to use [[pagetemplate]] and this <http://stackoverflow.com/questions/153152/resizing-an-iframe-based-on-content> solution
+> I think I'll have to use [[ikiwiki/directive/pagetemplate]] and this <http://stackoverflow.com/questions/153152/resizing-an-iframe-based-on-content> solution
-- 
cgit v1.2.3


From c5495420bd78882b90869551a7f79e548eb500f0 Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Sun, 16 May 2010 17:05:09 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 94dc00b25..cd0550ea8 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -53,6 +53,7 @@ Projects & Organizations
 * [Debian Costa Rica](http://cr.debian.net/)
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
+* [Apua IT](http://apua.se/)
 
 Personal sites and blogs
 ========================
@@ -143,6 +144,7 @@ Personal sites and blogs
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
 * [Ertug Karamatli](http://pages.karamatli.com)
+* [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 19360c3c4952572dc89d4a4fa345e70ff72b3763 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 16 May 2010 16:58:32 -0400
Subject: typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 918970a3c..b8939f455 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ ikiwiki (3.20100515) unstable; urgency=low
   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
     a single template, page.tmpl.
   * If you have a locally customised page.tmpl, it needs to be updated
-    to set <base> when BASEURL or FORCEBAREURL is set.
+    to set <base> when BASEURL or FORCEBASEURL is set.
   * comments: Comments pending moderation are now stored in the srcdir
     alongside accepted comments, but with a `._comment_pending` extension.
     This allows easier byhand moderation, as the "_pending" need
-- 
cgit v1.2.3


From 2451d3927863534a863b84d9d90bf277e42711b2 Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Mon, 17 May 2010 04:03:03 +0000
Subject:

---
 doc/plugins/contrib/flattr.mdwn | 45 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 doc/plugins/contrib/flattr.mdwn

diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
new file mode 100644
index 000000000..d40465971
--- /dev/null
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -0,0 +1,45 @@
+[[!template id=plugin name=flattr author="[[jaywalk]]"]]
+
+[flattr.com](http://flattr.com/) is a flatrate micropayment service, which revolves around the idea of having flattr buttons everywhere that people visiting your site can use to "flattr" you.
+
+This plugin makes it easier to put flattr buttons in ikiwiki. It supports both the static kind as well as the counting dynamic javascript version. The dynamic version does not work if [[htmlscrubber|/plugins/htmlscrubber]] is active on the page.
+
+The dynamic button does not require creation of the page on flattr before being added to a page, the static one does.
+
+I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugins/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
+
+This plugin is licensed under CC0.
+
+# Usage #
+
+    # [[!flattr args]] where args are in the form of arg=value.
+    # Possible args:
+    # type - static or dynamic. Defaults to static.
+
+    # vars in static mode:
+    # --------------------
+    # Required:
+    # url - URL to flattr page,
+    # e.g. http://flattr.com/thing/1994/jaywalks-weblog
+    # Optional: 
+    # btn - Set to compact for compact button.
+
+    # vars in dynamic mode:
+    # ---------------------
+    # Required:
+    # None.
+    # Optional:
+    # uid - Set the default in the plugin, override if needed.
+    # tle - The title defaults to $wikiname/some/path (like on the top of
+    #   the wiki).
+    # dsc - A description of the content. Defaults to " ".
+    # cat - Category, this can be text, images, video, audio, software or
+    #   rest. Defaults to text.
+    # lng - Language, list of available choises is on
+    #   https://flattr.com/support/integrate/languages. Defaults to en_GB.
+    # tag - A list of comma separated tags. Empty per default.
+    # url - URL to thing to flattred,
+    #   e.g. http://jonatan.walck.se/weblog
+    # btn - Set it to compact to get the small button, big for any other
+    #   value including empty.
+    
-- 
cgit v1.2.3


From f2304367f6820813e699eaeafaad4804de033753 Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Mon, 17 May 2010 04:04:50 +0000
Subject:

---
 doc/plugins/contrib/flattr.mdwn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
index d40465971..76d4d7b1d 100644
--- a/doc/plugins/contrib/flattr.mdwn
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -22,7 +22,7 @@ This plugin is licensed under CC0.
     # url - URL to flattr page,
     # e.g. http://flattr.com/thing/1994/jaywalks-weblog
     # Optional: 
-    # btn - Set to compact for compact button.
+    # style - Set to compact for compact button.
 
     # vars in dynamic mode:
     # ---------------------
@@ -30,16 +30,16 @@ This plugin is licensed under CC0.
     # None.
     # Optional:
     # uid - Set the default in the plugin, override if needed.
-    # tle - The title defaults to $wikiname/some/path (like on the top of
+    # title - The title defaults to $wikiname/some/path (like on the top of
     #   the wiki).
-    # dsc - A description of the content. Defaults to " ".
+    # desc - A description of the content. Defaults to " ".
     # cat - Category, this can be text, images, video, audio, software or
     #   rest. Defaults to text.
-    # lng - Language, list of available choises is on
+    # lang - Language, list of available choises is on
     #   https://flattr.com/support/integrate/languages. Defaults to en_GB.
     # tag - A list of comma separated tags. Empty per default.
     # url - URL to thing to flattred,
     #   e.g. http://jonatan.walck.se/weblog
-    # btn - Set it to compact to get the small button, big for any other
+    # style - Set it to compact to get the small button, big for any other
     #   value including empty.
     
-- 
cgit v1.2.3


From 7cae2951248245cb8b4da69d0f28065c394b31a2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 00:42:52 -0400
Subject: on javascript, plugins, and htmlscrubber

---
 doc/plugins/contrib/flattr/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/plugins/contrib/flattr/discussion.mdwn

diff --git a/doc/plugins/contrib/flattr/discussion.mdwn b/doc/plugins/contrib/flattr/discussion.mdwn
new file mode 100644
index 000000000..98b7771c5
--- /dev/null
+++ b/doc/plugins/contrib/flattr/discussion.mdwn
@@ -0,0 +1,4 @@
+FWIW, it is possible for a plugin like this to add javascript to pages that
+are protected by htmlscrubber. Just return a token in your preprocess hook,
+and then have a format hook that replaces the token with the javascript.
+--[[Joey]] 
-- 
cgit v1.2.3


From 744919eba0448c2d7494f57b89afa2d27dde5fbd Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Mon, 17 May 2010 04:52:27 +0000
Subject:

---
 doc/plugins/contrib/flattr/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/plugins/contrib/flattr/discussion.mdwn b/doc/plugins/contrib/flattr/discussion.mdwn
index 98b7771c5..586139e9c 100644
--- a/doc/plugins/contrib/flattr/discussion.mdwn
+++ b/doc/plugins/contrib/flattr/discussion.mdwn
@@ -2,3 +2,8 @@ FWIW, it is possible for a plugin like this to add javascript to pages that
 are protected by htmlscrubber. Just return a token in your preprocess hook,
 and then have a format hook that replaces the token with the javascript.
 --[[Joey]] 
+
+> Thanks, That's good to know. I'll try to continue the development of this
+> plugin later, for now I just needed it to work. :) It will most likely
+> evolve as my page does too.
+> --[[jaywalk]]
-- 
cgit v1.2.3


From ddb4f2410486f46255c4909bbb43b75c4b08f308 Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Mon, 17 May 2010 04:56:44 +0000
Subject:

---
 doc/plugins/contrib/flattr/jaywalk.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/plugins/contrib/flattr/jaywalk.mdwn

diff --git a/doc/plugins/contrib/flattr/jaywalk.mdwn b/doc/plugins/contrib/flattr/jaywalk.mdwn
new file mode 100644
index 000000000..31b3e0c4d
--- /dev/null
+++ b/doc/plugins/contrib/flattr/jaywalk.mdwn
@@ -0,0 +1,5 @@
+Jonatan Walck. Home page: [jonatan.walck.se](http://jonatan.walck.se)
+
+## Contact ##
+* jonatan at walck dot se
+* [I2P-Bote key](http://jonatan.walck.i2p/docs/i2p-bote.txt) [what is this?](http://i2pbote.i2p.to/)
-- 
cgit v1.2.3


From 4bb245df90965898b3e572d67c4fda25b0be84c5 Mon Sep 17 00:00:00 2001
From: Changaco <Changaco@web>
Date: Mon, 17 May 2010 16:46:28 +0000
Subject:

---
 doc/todo/multiple_template_directories.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index c09a9595f..6d1632b4c 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -11,3 +11,5 @@ ought to do the trick.
 > global dir when it cannot find a template. For me, this is good enough.
 > And it is even documented in the man page. Sigh. I guess this could be 
 > considered [[done]].  
+
+I have a use case for this, a site composed of blogs and wikis, templates divided in three categories : common, blog and wiki. The only solution I found is maintaining hard links, being able to have multiple template dirs would obviously be better. -- Changaco
-- 
cgit v1.2.3


From b7777931e2ade5e71b7e1b82e5ab12138e63ec96 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 17 May 2010 17:12:22 +0000
Subject: fix link

---
 doc/plugins/contrib/flattr.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
index 76d4d7b1d..fb532f44c 100644
--- a/doc/plugins/contrib/flattr.mdwn
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -6,7 +6,7 @@ This plugin makes it easier to put flattr buttons in ikiwiki. It supports both t
 
 The dynamic button does not require creation of the page on flattr before being added to a page, the static one does.
 
-I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugins/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
+I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugin/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
 
 This plugin is licensed under CC0.
 
-- 
cgit v1.2.3


From 4de7cdf2aaa7f35a33178da23e793e79ff073225 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 13:13:11 -0400
Subject: fix location

---
 doc/plugins/contrib/flattr/jaywalk.mdwn | 5 -----
 doc/users/jaywalk.mdwn                  | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 doc/plugins/contrib/flattr/jaywalk.mdwn
 create mode 100644 doc/users/jaywalk.mdwn

diff --git a/doc/plugins/contrib/flattr/jaywalk.mdwn b/doc/plugins/contrib/flattr/jaywalk.mdwn
deleted file mode 100644
index 31b3e0c4d..000000000
--- a/doc/plugins/contrib/flattr/jaywalk.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Jonatan Walck. Home page: [jonatan.walck.se](http://jonatan.walck.se)
-
-## Contact ##
-* jonatan at walck dot se
-* [I2P-Bote key](http://jonatan.walck.i2p/docs/i2p-bote.txt) [what is this?](http://i2pbote.i2p.to/)
diff --git a/doc/users/jaywalk.mdwn b/doc/users/jaywalk.mdwn
new file mode 100644
index 000000000..31b3e0c4d
--- /dev/null
+++ b/doc/users/jaywalk.mdwn
@@ -0,0 +1,5 @@
+Jonatan Walck. Home page: [jonatan.walck.se](http://jonatan.walck.se)
+
+## Contact ##
+* jonatan at walck dot se
+* [I2P-Bote key](http://jonatan.walck.i2p/docs/i2p-bote.txt) [what is this?](http://i2pbote.i2p.to/)
-- 
cgit v1.2.3


From 4518fbe1c101ed3a4a70d6c569ee0b5e0573835e Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 17 May 2010 17:13:17 +0000
Subject: link CC0 (I'd never heard of it)

---
 doc/plugins/contrib/flattr.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
index fb532f44c..f8f005c31 100644
--- a/doc/plugins/contrib/flattr.mdwn
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -8,7 +8,7 @@ The dynamic button does not require creation of the page on flattr before being
 
 I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugin/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
 
-This plugin is licensed under CC0.
+This plugin is licensed under [CC0](http://creativecommons.org/publicdomain/zero/1.0/) (public domain).
 
 # Usage #
 
-- 
cgit v1.2.3


From eb28db2ad5d38110e7678012aaabce22f89063a2 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 17 May 2010 17:18:58 +0000
Subject: how do people like to hack on ikiwiki?

---
 doc/forum/ikiwiki_development_environment_tips.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/forum/ikiwiki_development_environment_tips.mdwn

diff --git a/doc/forum/ikiwiki_development_environment_tips.mdwn b/doc/forum/ikiwiki_development_environment_tips.mdwn
new file mode 100644
index 000000000..d0dd01425
--- /dev/null
+++ b/doc/forum/ikiwiki_development_environment_tips.mdwn
@@ -0,0 +1,3 @@
+I haven't settled on a comfortable/flexible/quick development environment for hacking on ikiwiki.  The VM I host my web pages on is not fast enough to use for RAD and ikiwiki. For developing plugins, it seems a bit heavy-weight to clone the entire ikiwiki repository. I haven't managed to get into a habit of running a cloned version of ikiwiki from it's own dir, rather than installing it (If that's even possible).  The ikiwiki site source (source ./doc) is quite large and not a great testbed for hacking (e.g. if you are working on a plugin you need a tailored test suite for that plugin).
+
+Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]]
-- 
cgit v1.2.3


From d63553b39b4afb18a5b3ee32131095699582529c Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Mon, 17 May 2010 17:31:55 +0000
Subject: response

---
 doc/forum/ikiwiki_development_environment_tips.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/ikiwiki_development_environment_tips.mdwn b/doc/forum/ikiwiki_development_environment_tips.mdwn
index d0dd01425..9fa3595ed 100644
--- a/doc/forum/ikiwiki_development_environment_tips.mdwn
+++ b/doc/forum/ikiwiki_development_environment_tips.mdwn
@@ -1,3 +1,5 @@
 I haven't settled on a comfortable/flexible/quick development environment for hacking on ikiwiki.  The VM I host my web pages on is not fast enough to use for RAD and ikiwiki. For developing plugins, it seems a bit heavy-weight to clone the entire ikiwiki repository. I haven't managed to get into a habit of running a cloned version of ikiwiki from it's own dir, rather than installing it (If that's even possible).  The ikiwiki site source (source ./doc) is quite large and not a great testbed for hacking (e.g. if you are working on a plugin you need a tailored test suite for that plugin).
 
 Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]]
+
+> I've just been setting `libdir` in an existing wiki's setup file. When the plugin's in a decent state, I copy it over to a git checkout and commit. For the plugins I've been working on (auth and VCS), this has been just fine. Are you looking for something more? --[[schmonz]]
-- 
cgit v1.2.3


From f864b74859d8b0197f59d7dfe7d45063dc887cd1 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 17 May 2010 17:34:40 +0000
Subject: an example of somewhere where the old functionality is actually
 needed

---
 doc/todo/multiple_template_directories.mdwn | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index 6d1632b4c..0f8f5c880 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -13,3 +13,35 @@ ought to do the trick.
 > considered [[done]].  
 
 I have a use case for this, a site composed of blogs and wikis, templates divided in three categories : common, blog and wiki. The only solution I found is maintaining hard links, being able to have multiple template dirs would obviously be better. -- Changaco
+
+> [[plugins/underlay]] used to allow adding extra templatedirs, but Joey
+> removed that functionality when he made templates search the wiki's
+> own `templates` directory.
+>
+> You can get a 3-level hierarchy like this:
+>
+> * instance-specific overrides: $srcdir/templates
+> * common to the entire site: a directory that is the value of all
+>   instances' `templatedir` parameters
+> * common to every ikiwiki in the world: /usr/share/ikiwiki/templates
+>   (implicitly searched)
+>
+> (by "instance" I mean an instance of ikiwiki - a .setup file, basically.)
+>
+> For a more complex hierarchy you'd need the old [[plugins/underlay]]
+> functionality, i.e. you'd need to (ask Joey to) revert the patch that
+> removed it. For instance, if anyone has a hierarchy like this, then
+> they need the old functionality back in order to split the template
+> search path for the things marked `(???)`:
+>
+>     every ikiwiki in the world (/usr/share/ikiwiki/templates)
+>     \--- your site (???)
+>         \--- your blogs (???)
+>              \--- travel blog ($srcdir/templates)
+>              \--- code blog ($srcdir/templates)
+>         \--- your wikis (???)
+>              \--- travel wiki ($srcdir/templates)
+>              \--- code wiki ($srcdir/templates)
+>
+> This looks pretty hypothetical to me, though...
+> --[[smcv]]
-- 
cgit v1.2.3


From 5e515605749684f5867857885043b4e25378a374 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 15:42:20 -0400
Subject: new todo

---
 doc/todo/anon_push_of_comments.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/todo/anon_push_of_comments.mdwn

diff --git a/doc/todo/anon_push_of_comments.mdwn b/doc/todo/anon_push_of_comments.mdwn
new file mode 100644
index 000000000..bb5d04670
--- /dev/null
+++ b/doc/todo/anon_push_of_comments.mdwn
@@ -0,0 +1,6 @@
+It should be possible to use anonymous git push to post comments
+(created, say, by a ikiwiki-comment program). Currently, that is not
+allowed, because users cannot edit, or create internal page files.
+But, comments in allowed locations are an exception to that rule, and 
+that exception should be communicated somehow to `IkiWiki::Receive`.
+--[[Joey]] 
-- 
cgit v1.2.3


From 3298902443128f68e21f4ad349a7a3a9e0f03bce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 15:46:07 -0400
Subject: response

---
 doc/todo/multiple_template_directories.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index 0f8f5c880..fe1951d51 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -45,3 +45,8 @@ I have a use case for this, a site composed of blogs and wikis, templates divide
 >
 > This looks pretty hypothetical to me, though...
 > --[[smcv]]
+
+>> The reason I removed it is because the same functionality of having
+>> multiple template directories is still present. Just put them in 
+>> the templates/ subdirectory of multiple underlay directories instead.
+>> --[[Joey]]
-- 
cgit v1.2.3


From 533c8e62c5043e8e10dbd6203bb1a5ebe8a0d87e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 15:55:17 -0400
Subject: why this is hard..

---
 doc/todo/anon_push_of_comments.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/todo/anon_push_of_comments.mdwn b/doc/todo/anon_push_of_comments.mdwn
index bb5d04670..b472ea13f 100644
--- a/doc/todo/anon_push_of_comments.mdwn
+++ b/doc/todo/anon_push_of_comments.mdwn
@@ -4,3 +4,11 @@ allowed, because users cannot edit, or create internal page files.
 But, comments in allowed locations are an exception to that rule, and 
 that exception should be communicated somehow to `IkiWiki::Receive`.
 --[[Joey]] 
+
+> Complications include: 
+> 
+> * Hard to see a way to prevent users from committing a comment that
+>   claims to be written by someone else.
+> * `checkcontent` hooks need to be run, but can't accept a comment
+>   for later moderation, since it's coming in as part of a commit.
+>   Best they could do is reject the commit.
-- 
cgit v1.2.3


From 47bc6105326ce76327f2accb6d6ae34d2cb1429e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 17 May 2010 22:46:23 +0200
Subject: please pull

---
 doc/todo/allow_displaying_number_of_comments.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/todo/allow_displaying_number_of_comments.mdwn

diff --git a/doc/todo/allow_displaying_number_of_comments.mdwn b/doc/todo/allow_displaying_number_of_comments.mdwn
new file mode 100644
index 000000000..8e479bc85
--- /dev/null
+++ b/doc/todo/allow_displaying_number_of_comments.mdwn
@@ -0,0 +1,9 @@
+My `numcomments` Git branch adds a `NUMCOMMENTS` `TMPL_VAR`, which is
+useful to add to the `forumpage.tmpl` template to emulate (the nice
+bits of) a more usual webforum.
+
+Please review... and pull :)
+
+-- [[intrigeri]]
+
+[[patch]]
-- 
cgit v1.2.3


From facc77e10925301575b46d26e031c9f6914edafb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 17:06:13 -0400
Subject: force scalar context

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3cafcbe9c..eb861d74f 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -859,7 +859,7 @@ sub num_comments ($$) {
 	my $dir=shift;
 
 	my @comments=glob("$dir/$page/$config{comments_pagename}*._comment");
-	return @comments;
+	return int @comments;
 }
 
 sub unique_comment_location ($$$$) {
-- 
cgit v1.2.3


From 2b1bc9c7297dc4bf36f4fc91205ad13eaf1513ca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 17:13:53 -0400
Subject: review

---
 doc/todo/allow_displaying_number_of_comments.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/todo/allow_displaying_number_of_comments.mdwn b/doc/todo/allow_displaying_number_of_comments.mdwn
index 8e479bc85..7e8802210 100644
--- a/doc/todo/allow_displaying_number_of_comments.mdwn
+++ b/doc/todo/allow_displaying_number_of_comments.mdwn
@@ -5,5 +5,23 @@ bits of) a more usual webforum.
 Please review... and pull :)
 
 -- [[intrigeri]]
+ 
+> How is having this variable for showing a count of the comments 
+> better (or more forum-ish) than the COMMENTSLINK variable which
+> includes a count and a link to the comments, and is already displayed
+> in inlinepage.tmpl?
+> 
+> `num_comments` will never return undef.
+> 
+> I see no need to add a second pagetemplate hook.
+> The existing one can be added to. Probably inside its `if ($shown)`
+> block.
+> 
+> It may also be a good idea to either combine the calls to `num_comments`
+> used for this and for the commentslink, 
+> or to memoize it. I'm thinking generally memoizing it may be a good idea
+> since the comments for a page will typically be counted twice when it's
+> inlined.
+> --[[Joey]] 
 
 [[patch]]
-- 
cgit v1.2.3


From 1f974b3517b3601e5014fcb0a383f980b4953a8c Mon Sep 17 00:00:00 2001
From: Changaco <Changaco@web>
Date: Mon, 17 May 2010 23:36:16 +0000
Subject: problem solved

---
 doc/todo/multiple_template_directories.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index fe1951d51..b8b9651b9 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -50,3 +50,5 @@ I have a use case for this, a site composed of blogs and wikis, templates divide
 >> multiple template directories is still present. Just put them in 
 >> the templates/ subdirectory of multiple underlay directories instead.
 >> --[[Joey]]
+
+>>>Thanks, I didn't realize this was possible. Problem solved. -- Changaco
-- 
cgit v1.2.3


From 284038fbbf09a55ae23ebeca03f8ff4487ce7ef6 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 18 May 2010 09:23:23 +0000
Subject: tag as done

---
 doc/todo/multiple_template_directories.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index b8b9651b9..6a474b4f3 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -52,3 +52,22 @@ I have a use case for this, a site composed of blogs and wikis, templates divide
 >> --[[Joey]]
 
 >>>Thanks, I didn't realize this was possible. Problem solved. -- Changaco
+
+>>>> We can consider this [[done]], then. For reference, the solution
+>>>> to the hierarchy I mentioned above would be:
+>>>>
+>>>>     all your sites have $your_underlay as an underlay
+>>>>
+>>>>     the blogs and wikis all have $blog_underlay or $wiki_underlay
+>>>>     (as appropriate) as a higher priority underlay
+>>>>
+>>>>     every ikiwiki in the world (/usr/share/ikiwiki/templates)
+>>>>     \--- your site ($your_underlay/templates, or templatedir)
+>>>>         \--- your blogs ($blog_underlay/templates)
+>>>>              \--- travel blog ($srcdir/templates)
+>>>>              \--- code blog ($srcdir/templates)
+>>>>         \--- your wikis ($wiki_underlay/templates)
+>>>>              \--- travel wiki ($srcdir/templates)
+>>>>              \--- code wiki ($srcdir/templates)
+>>>>
+>>>> --[[smcv]]
-- 
cgit v1.2.3


From c71ea2337d56b7fe7fde7a4b2fb43a510fb5f05f Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Tue, 18 May 2010 11:47:28 +0100
Subject: response: shortcomings

---
 doc/forum/ikiwiki_development_environment_tips.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/forum/ikiwiki_development_environment_tips.mdwn b/doc/forum/ikiwiki_development_environment_tips.mdwn
index 9fa3595ed..32da4a1cd 100644
--- a/doc/forum/ikiwiki_development_environment_tips.mdwn
+++ b/doc/forum/ikiwiki_development_environment_tips.mdwn
@@ -3,3 +3,17 @@ I haven't settled on a comfortable/flexible/quick development environment for ha
 Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]]
 
 > I've just been setting `libdir` in an existing wiki's setup file. When the plugin's in a decent state, I copy it over to a git checkout and commit. For the plugins I've been working on (auth and VCS), this has been just fine. Are you looking for something more? --[[schmonz]]
+
+>> I think this suffers from two problems. Firstly, unless you are tracking git
+>> master in your existing wiki, there's the possibility that your plugin will
+>> not work with a more modern version of ikiwiki (or that it would benefit
+>> from using a newly added utility subroutine or similar). Second, sometimes I
+>> find that even writing a plugin can involve making minor changes outside of
+>> the plugin code (bug fixes, or moving functionality about). So, I think
+>> having some kind of environment built around a git checkout is best.
+>> 
+>> However, this does not address the issue of the tedium writing/maintaining a
+>> setup file for testing things.
+>>
+>> I think I might personally benefit from a more consistent environment (I
+>> move from machine-to-machine frequently). -- [[Jon]]
-- 
cgit v1.2.3


From 529141779fe8492defbfa3e879c15bc81b3907dd Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 18 May 2010 16:11:45 +0200
Subject: response

---
 doc/todo/allow_displaying_number_of_comments.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/allow_displaying_number_of_comments.mdwn b/doc/todo/allow_displaying_number_of_comments.mdwn
index 7e8802210..02d55fc9b 100644
--- a/doc/todo/allow_displaying_number_of_comments.mdwn
+++ b/doc/todo/allow_displaying_number_of_comments.mdwn
@@ -25,3 +25,6 @@ Please review... and pull :)
 > --[[Joey]] 
 
 [[patch]]
+
+>> Well, the COMMENTSLINK variable fits my needs. Sorry for
+>> the disturbance. [[done]] --[[intrigeri]]
-- 
cgit v1.2.3


From 7aa209f1ce882372590ff032a1a94ad2b977544d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 13:28:35 -0400
Subject: Fix a bug that prevented matching deleted comments, and so did not
 update pages that had contained them.

Problem is that by the time rendering calls render_dependent, %pagesources
has had deleted files removed from it. So match_comment's lookup of
files in there to see if they had the _comment extension failed.

I had to introduce a hash that temporarily holds filenames of deleted pages
to fix this.

Note that unlike comment(), internal() had avoided this pitfall by being
defined to match both internal and non-internal pages.
---
 IkiWiki.pm                 |  6 +++---
 IkiWiki/Plugin/comments.pm | 18 ++++++++++--------
 IkiWiki/Render.pm          |  1 +
 debian/changelog           |  2 ++
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 699ad13da..0f28801a6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -12,9 +12,9 @@ use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	%pagestate %wikistate %renderedfiles %oldrenderedfiles
-	%pagesources %destsources %depends %depends_simple @mass_depends 
-	%hooks %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
-	%autofiles};
+	%pagesources %delpagesources %destsources %depends %depends_simple
+	@mass_depends %hooks %forcerebuild %loaded_plugins %typedlinks
+	%oldtypedlinks %autofiles};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error htmlpage template template_depends
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index eb861d74f..de193bd12 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -908,10 +908,12 @@ sub match_comment ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 
-	if (! IkiWiki::isinternal($page)) {
-		return IkiWiki::FailReason->new("$page is not a comment");
-	}
-	my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+	# To see if it's a comment, check the source file type.
+	# Deal with comments that were just deleted.
+	my $source=exists $IkiWiki::pagesources{$page} ?
+		$IkiWiki::pagesources{$page} :
+		$IkiWiki::delpagesources{$page};
+	my $type=IkiWiki::pagetype($source);
 	if (defined $type && $type ne "_comment") {
 		return IkiWiki::FailReason->new("$page is not a comment");
 	}
@@ -923,10 +925,10 @@ sub match_comment_pending ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 	
-	if (! IkiWiki::isinternal($page)) {
-		return IkiWiki::FailReason->new("$page is not a pending comment");
-	}
-	my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+	my $source=exists $IkiWiki::pagesources{$page} ?
+		$IkiWiki::pagesources{$page} :
+		$IkiWiki::delpagesources{$page};
+	my $type=IkiWiki::pagetype($source);
 	if (defined $type && $type ne "_comment_pending") {
 		return IkiWiki::FailReason->new("$page is not a pending comment");
 	}
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 833fcaaff..f9fbc801f 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -442,6 +442,7 @@ sub remove_del (@) {
 		}
 	
 		delete $pagecase{lc $page};
+		$delpagesources{$page}=$pagesources{$page};
 		delete $pagesources{$page};
 	}
 }
diff --git a/debian/changelog b/debian/changelog
index b8939f455..8b5389e88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20100516) UNRELEASED; urgency=low
 
   * page.tmpl: Accidentially broke po plugin's otherlanguages list styling
     when modifying for html5; now fixed.
+  * Fix a bug that prevented matching deleted comments, and so did not update
+    pages that had contained them.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 16 May 2010 00:03:06 -0400
 
-- 
cgit v1.2.3


From baaa176b9b8138429f607ddf5ec9f3725e169486 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 13:36:51 -0400
Subject: simplify example

I've seen user(http://*) confuse someone who didn't know pagespecs to think
that just http://* would moderate all comments to every page, or something
like that.
---
 IkiWiki/Plugin/moderatedcomments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index b0a328a06..ff2c2b160 100644
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -19,7 +19,7 @@ sub getsetup () {
 		},
 		moderate_pagespec => {
 			type => 'pagespec',
-			example => 'user(http://*)',
+			example => '*',
 			description => 'PageSpec matching users or comment locations to moderate',
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
-- 
cgit v1.2.3


From bf579ca8ef08a199ebefe82308eca17a78489266 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 13:42:04 -0400
Subject: releasing version 3.20100518

---
 debian/changelog |   4 +-
 ikiwiki.spec     |   2 +-
 po/bg.po         | 214 ++++++++++++++++++++++++++++--------------------------
 po/cs.po         | 218 +++++++++++++++++++++++++++++--------------------------
 po/da.po         | 218 +++++++++++++++++++++++++++++--------------------------
 po/de.po         | 218 +++++++++++++++++++++++++++++--------------------------
 po/es.po         | 218 +++++++++++++++++++++++++++++--------------------------
 po/fr.po         | 218 +++++++++++++++++++++++++++++--------------------------
 po/gu.po         | 214 ++++++++++++++++++++++++++++--------------------------
 po/ikiwiki.pot   | 178 +++++++++++++++++++++++----------------------
 po/it.po         | 218 +++++++++++++++++++++++++++++--------------------------
 po/pl.po         | 214 ++++++++++++++++++++++++++++--------------------------
 po/sv.po         | 214 ++++++++++++++++++++++++++++--------------------------
 po/tr.po         | 199 +++++++++++++++++++++++++-------------------------
 po/vi.po         | 204 ++++++++++++++++++++++++++-------------------------
 15 files changed, 1435 insertions(+), 1316 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b5389e88..c829f2f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-ikiwiki (3.20100516) UNRELEASED; urgency=low
+ikiwiki (3.20100518) unstable; urgency=low
 
   * page.tmpl: Accidentially broke po plugin's otherlanguages list styling
     when modifying for html5; now fixed.
   * Fix a bug that prevented matching deleted comments, and so did not update
     pages that had contained them.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 16 May 2010 00:03:06 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 18 May 2010 13:37:39 -0400
 
 ikiwiki (3.20100515) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 09f07c6ce..a3a109c9f 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100515
+Version: 3.20100518
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index f85323ea3..a399a8c77 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -16,46 +16,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Първо трябва да влезете."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 #, fuzzy
 msgid "Preferences"
 msgstr "Предпочитанията са запазени."
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Предпочитанията са запазени."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Грешка"
 
@@ -197,68 +193,77 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Няма „счупени” връзки!"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "създаване на %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+msgid "moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -268,7 +273,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 msgid "Comment"
 msgstr ""
 
@@ -298,14 +303,14 @@ msgstr "премахване на старата страница „%s”"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
@@ -339,12 +344,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "грешшка в приставката „fortune”"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 #, fuzzy
 msgid "missing page"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -374,7 +379,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -385,7 +390,7 @@ msgstr "При използване на приеставката „search” 
 msgid "failed to run graphviz"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -464,7 +469,7 @@ msgstr ""
 msgid "template %s not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
@@ -510,7 +515,7 @@ msgstr "шаблонът „%s” не е намерен"
 msgid "redir cycle is not allowed"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -530,13 +535,10 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr ""
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Получаване на OpenID номер"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "крешка при компилиране на файла %s"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
@@ -610,94 +612,94 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -819,16 +821,16 @@ msgstr ""
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr ""
 
@@ -862,24 +864,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "обновяване на страницата „%s”"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”"
@@ -894,12 +896,12 @@ msgstr "грешка при запис на файла „%s”: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr ""
 
@@ -1023,26 +1025,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1057,59 +1059,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1163,13 +1165,13 @@ msgid "wrapper filename not specified"
 msgstr "не е указан файл на обвивката"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "крешка при компилиране на файла %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "успешно генериране на %s"
@@ -1202,45 +1204,45 @@ msgstr "обновяване на уики..."
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Дискусия"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
@@ -1265,6 +1267,12 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "You need to log in first."
+#~ msgstr "Първо трябва да влезете."
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Получаване на OpenID номер"
+
 #, fuzzy
 #~ msgid "failed to process"
 #~ msgstr "грешка при обработване на шаблона"
diff --git a/po/cs.po b/po/cs.po
index 71195bae2..5e3d8abac 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -15,11 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Nejprve se musíte přihlásit."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -27,35 +23,35 @@ msgstr ""
 "pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale "
 "Ezkoušíte se přihlásit přes http a ne přes https"
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "přihlášení selhalo; možná si musíte povolit cookies?"
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr "Vaše sezení expirovalo."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr "Přihlášení"
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr "Správce"
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Nastavení uloženo."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Chyba"
 
@@ -195,68 +191,78 @@ msgstr "%s z %s"
 msgid "There are no broken links!"
 msgstr "Žádné porušené odkazy!"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "komentář k %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+#, fuzzy
+msgid "moderation"
+msgstr "Schvalování komentářů"
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nepodporovaný formát stránky %s"
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr "komentář musí mít obsah"
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "chybný název stránky"
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, perl-format
 msgid "commenting on %s"
 msgstr "komentář k %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat"
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "komentáře na stránce „%s“ jsou uzamčeny"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr "komentář uložen pro schválení"
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr "Váš komentář bude zobrazen po schválení moderátorem"
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr "Přidán komentář"
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Přidán komentář: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr "nejste přihlášeni jako správce"
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr "Schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr "schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -266,7 +272,7 @@ msgstr[1] "Komentáře"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 #, fuzzy
 msgid "Comment"
 msgstr "Komentáře"
@@ -297,14 +303,14 @@ msgstr "odstraňuji starý náhled %s"
 msgid "%s is not an editable page"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
@@ -336,11 +342,11 @@ msgstr "musíte zadat formát a text"
 msgid "fortune failed"
 msgstr "fortune selhal"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 msgid "missing page"
 msgstr "chybějící stránka"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Stránka %s neexistuje."
@@ -369,7 +375,7 @@ msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -379,7 +385,7 @@ msgstr "%s musíte zadat při každém použití modulu %s"
 msgid "failed to run graphviz"
 msgstr "nepodařilo se spustit graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr "program není platným programem graphviz"
 
@@ -452,7 +458,7 @@ msgstr "Přidat nový příspěvek nazvaný:"
 msgid "template %s not found"
 msgstr "šablona %s nebyla nalezena"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
@@ -492,7 +498,7 @@ msgstr "stránka, na kterou vede přesměrování, nebyla nalezena"
 msgid "redir cycle is not allowed"
 msgstr "cykly nejsou v přesměrování povoleny"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "vyžaduje parametry „from“ a „to“"
@@ -514,13 +520,10 @@ msgstr "schvalování komentářů"
 msgid "more"
 msgstr "více"
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr "Přihlásit pomocí"
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Získat OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "nelze zkompilovat %s"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
@@ -592,40 +595,40 @@ msgstr "LWP nebyl nalezen, nepinkám"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není platným kódem jazyka"
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, perl-format
 msgid "building %s"
 msgstr "sestavuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr "aktualizovány PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -633,7 +636,7 @@ msgstr ""
 "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
 "budou odstraněny také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -641,50 +644,50 @@ msgstr ""
 "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
 "budou přejmenovány také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT soubor (%s) neexistuje"
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nepodařilo se zkopírovat PO soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to update %s"
 msgstr "nepodařilo se aktualizovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nepodařilo se zkopírovat POT soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, perl-format
 msgid "failed to translate %s"
 msgstr "nepodařilo se přeložit %s"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr "odstraněny zastaralé PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, perl-format
 msgid "failed to write %s"
 msgstr "nepodařilo se zapsat %s"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "překlad se nezdařil"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
@@ -806,16 +809,16 @@ msgstr "%s není ve zdrojovém adresáři a proto nelze smazat"
 msgid "%s is not a file"
 msgstr "%s není souborem"
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "potvrďte odstranění %s"
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr "Vyberte prosím přílohy, které se mají odstranit."
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr "odstraněno"
 
@@ -848,24 +851,24 @@ msgstr "%s již na disku existuje"
 msgid "rename %s"
 msgstr "přejmenování %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr "Také přejmenovat podstránky a přílohy"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr "Najednou lze přejmenovat pouze jednu přílohu."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr "Vyberte přílohu, kterou chcete přejmenovat."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr "přejmenování %s na %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizace pro přejmenování %s na %s"
@@ -880,12 +883,12 @@ msgstr "nepodařilo se přečíst %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "pro indexování %s je potřeba Digest::SHA1"
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr "hledání"
 
@@ -1000,20 +1003,20 @@ msgstr "moduly"
 msgid "enable %s?"
 msgstr "povolit %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr "konfigurační soubor této wiki je neznámý"
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr "hlavní"
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1021,7 +1024,7 @@ msgstr ""
 "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset "
 "znovusestavit wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1038,12 +1041,12 @@ msgstr "nemohu určit identitu nedůvěryhodného uživatele %s"
 msgid "bad file name %s"
 msgstr "chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1052,47 +1055,47 @@ msgstr ""
 "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-"
 "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s má několik možných zdrojových stránek"
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "sestavuji %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "odstraňuji %s, již není sestavována pomocí %s"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "sestavuji %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze sestavit %s"
@@ -1146,13 +1149,13 @@ msgid "wrapper filename not specified"
 msgstr "jméno souboru s obalem nebylo zadáno"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "nelze zkompilovat %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s byl úspěšně vytvořen"
@@ -1186,43 +1189,43 @@ msgstr "znovusestavuji wiki..."
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Diskuse"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr "nelze použít několik rcs modulů"
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
@@ -1247,6 +1250,15 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?"
 msgid "What is the domain name of the web server?"
 msgstr "Jaké je doménové jméno webového serveru?"
 
+#~ msgid "You need to log in first."
+#~ msgstr "Nejprve se musíte přihlásit."
+
+#~ msgid "Log in with"
+#~ msgstr "Přihlásit pomocí"
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Získat OpenID"
+
 #~ msgid "failed to process"
 #~ msgstr "nepodařilo se zpracovat"
 
diff --git a/po/da.po b/po/da.po
index f830d667d..81f40ea52 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -19,11 +19,7 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Du skal først logge på."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -31,35 +27,35 @@ msgstr ""
 "mulig opsætningsfejl: sslcookie er sat, men du forsøger at logge på via "
 "http, ikke https"
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?"
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr "Din kørsel (login session) er udløbet"
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr "Pålogning"
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr "Admin"
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Indstillinger gemt"
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Fejl"
 
@@ -202,68 +198,78 @@ msgstr "%s fra %s"
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "kommenterer på %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+#, fuzzy
+msgid "moderation"
+msgstr "Kommentarmoderering"
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Ikke-understøttet sideformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr "kommentar skal have indhold"
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "dårligt sidenavn"
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommenterer på %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere"
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "kommentarer på side '%s' er lukket"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr "kommentar gemt for moderering"
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn"
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr "Tilføjede en kommentar"
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr "Kommentarmoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr "kommentarkoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -273,7 +279,7 @@ msgstr[1] "Kommentarer"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 #, fuzzy
 msgid "Comment"
 msgstr "Kommentarer"
@@ -304,14 +310,14 @@ msgstr "fjerner gammelt smugkig %s"
 msgid "%s is not an editable page"
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "redigerer %s"
@@ -343,11 +349,11 @@ msgstr "skal angive format og tekst"
 msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 msgid "missing page"
 msgstr "manglende side"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Siden %s eksisterer ikke."
@@ -377,7 +383,7 @@ msgstr "du kan ikke påvirke en fil med modus %s"
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -387,7 +393,7 @@ msgstr "Skal angive %s når udvidelsen %s bruges"
 msgid "failed to run graphviz"
 msgstr "graphviz-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr "prog er ikke et gyldigt graphviz-program"
 
@@ -463,7 +469,7 @@ msgstr "Tilføj nyt indlæg med følgende titel:"
 msgid "template %s not found"
 msgstr "skabelon %s ikke fundet"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 
@@ -505,7 +511,7 @@ msgstr "henvisningsside ikke fundet"
 msgid "redir cycle is not allowed"
 msgstr "ring af henvisninger er ikke tilladt"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "kræver 'from'- og 'to'-parametre"
@@ -527,13 +533,10 @@ msgstr "kommentarkoderering"
 msgid "more"
 msgstr "mere"
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr "Log på med"
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Skaf en OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "kompilering af %s mislykkedes"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
@@ -606,12 +609,12 @@ msgstr "LWP ikke fundet, pinger ikke"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -619,7 +622,7 @@ msgstr ""
 "%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -627,21 +630,21 @@ msgstr ""
 "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -649,7 +652,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -657,50 +660,50 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -821,16 +824,16 @@ msgstr "%s er ikke i srcdir, så kan ikke blive slettet"
 msgid "%s is not a file"
 msgstr "%s er ikke en fil"
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "bekræft at %s bliver fjernet"
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr "Vælg vedhæftning der skal slettes."
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr "fjernet"
 
@@ -863,24 +866,24 @@ msgstr "%s eksisterer allerede på disken"
 msgid "rename %s"
 msgstr "omdøb %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr "Omdøb også UnderSider og vedhæftninger"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr "Kun en vedhæftning kan blive omdøbt ad gangen."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr "Vælg vedhæftningen som skal omdøbes."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr "omdøb %s til %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "opdatering til omdøbning af %s til %s"
@@ -895,12 +898,12 @@ msgstr "læsning af %s mislykkedes"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "behøver Digest::SHA1 til indeks %s"
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr "søg"
 
@@ -1015,22 +1018,22 @@ msgstr "udvidelser"
 msgid "enable %s?"
 msgstr "aktivér %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr "opsætningsfilen for denne wiki er ukendt"
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr "primær"
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i "
 "kraft."
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1038,7 +1041,7 @@ msgstr ""
 "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du "
 "muligvis genopbygge wikien."
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
@@ -1053,12 +1056,12 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "gennemlæser %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1067,47 +1070,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1161,13 +1164,13 @@ msgid "wrapper filename not specified"
 msgstr "wrapper-navn ikke angivet"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "kompilering af %s mislykkedes"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "Korrekt bygget %s"
@@ -1201,44 +1204,44 @@ msgstr "genopbygger wiki..."
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
@@ -1263,6 +1266,15 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er webserverens domænenavn?"
 
+#~ msgid "You need to log in first."
+#~ msgstr "Du skal først logge på."
+
+#~ msgid "Log in with"
+#~ msgstr "Log på med"
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Skaf en OpenID"
+
 #~ msgid "failed to process"
 #~ msgstr "dannelsen mislykkedes"
 
diff --git a/po/de.po b/po/de.po
index 2452c8d21..a6241388e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2010-03-14 16:09+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -15,11 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Sie müssen sich zuerst anmelden."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -27,36 +23,36 @@ msgstr ""
 "vermutliche Fehlkonfiguration: sslcookie ist gesetzt, aber Sie versuchen "
 "sich via http anzumelden, nicht https"
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?"
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr "Ihre Anmeldezeit ist abgelaufen."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr "Administrator"
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Einstellungen gespeichert."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Fehler"
 
@@ -197,69 +193,79 @@ msgstr "%s von %s"
 msgid "There are no broken links!"
 msgstr "Es gibt keine ungültigen Verweise!"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "kommentiere %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+#, fuzzy
+msgid "moderation"
+msgstr "Kommentar-Moderation"
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nicht unterstütztes Seitenformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr "ein Kommentar sollte Inhalt haben"
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "fehlerhafter Seitenname"
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommentiere %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 "Seite %s existiert nicht, Sie können sie deshalb auch nicht kommentieren"
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Kommentare zur Seite %s sind gesperrt"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr "Der Kommentar wurde zur Moderation gespeichert"
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr "Ihr Kommentar wird nach Moderation verschickt"
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr "Kommentar hinzugefügt"
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Kommentar hinzugefügt: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr "Sie sind nicht als Administrator angemeldet"
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -269,7 +275,7 @@ msgstr[1] "%i Kommentare"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 msgid "Comment"
 msgstr "Kommentieren"
 
@@ -299,14 +305,14 @@ msgstr "entferne alte Vorschau %s"
 msgid "%s is not an editable page"
 msgstr "Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "erstelle %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "bearbeite %s"
@@ -338,11 +344,11 @@ msgstr "Format und Text müssen spezifiziert werden"
 msgid "fortune failed"
 msgstr "fortune fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 msgid "missing page"
 msgstr "fehlende Seite"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Die Seite %s existiert nicht."
@@ -371,7 +377,7 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -381,7 +387,7 @@ msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird"
 msgid "failed to run graphviz"
 msgstr "graphviz konnte nicht ausgeführt werden"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr "prog ist kein gültiges graphviz-Programm"
 
@@ -458,7 +464,7 @@ msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 msgid "template %s not found"
 msgstr "Vorlage %s nicht gefunden"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
@@ -501,7 +507,7 @@ msgstr "Umleitungsseite nicht gefunden"
 msgid "redir cycle is not allowed"
 msgstr "Zyklische Umleitungen sind nicht erlaubt"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "erfordert die Parameter 'from' und 'to'"
@@ -522,13 +528,10 @@ msgstr "Kommentar muss moderiert werden"
 msgid "more"
 msgstr "mehr"
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr "Anmelden mit"
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Eine OpenID anfordern"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "erzeugen von %s fehlgeschlagen"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
@@ -602,12 +605,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35"
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist keine gültige Sprachkodierung"
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -615,7 +618,7 @@ msgstr ""
 "%s ist kein gültiger Wert für po_link_to, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -623,21 +626,21 @@ msgstr ""
 "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -645,7 +648,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -653,50 +656,50 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -820,16 +823,16 @@ msgstr "%s ist nicht im srcdir und kann deshalb nicht gelöscht werden"
 msgid "%s is not a file"
 msgstr "%s ist keine Datei"
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "bestätigen Sie die Entfernung von %s"
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus."
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr "entfernt"
 
@@ -862,24 +865,24 @@ msgstr "%s existiert bereits auf der Festplatte"
 msgid "rename %s"
 msgstr "benenne %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr "benenne %s in %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualisiert zum Umbenennen von %s nach %s"
@@ -894,12 +897,12 @@ msgstr "konnte das rsync_command nicht ausführen: %s"
 msgid "rsync_command exited %d"
 msgstr "rsync_command gibt Fehler %d zurück"
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen"
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr "suchen"
 
@@ -1014,22 +1017,22 @@ msgstr "%s-Erweiterungen"
 msgid "enable %s?"
 msgstr "%s aktivieren?"
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt"
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr "Hauptseite"
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des "
 "Wikis, um wirksam zu werden."
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1037,7 +1040,7 @@ msgstr ""
 "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam "
 "werden, kann es notwendig sein, das Wikis neu zu bauen."
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1055,12 +1058,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "durchsuche %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1069,47 +1072,47 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1166,13 +1169,13 @@ msgid "wrapper filename not specified"
 msgstr "Dateiname des Wrappers nicht angegeben"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "erzeugen von %s fehlgeschlagen"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s wurde erfolgreich erstellt"
@@ -1206,46 +1209,46 @@ msgstr "erzeuge Wiki neu.."
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
@@ -1270,6 +1273,15 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?"
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
 
+#~ msgid "You need to log in first."
+#~ msgstr "Sie müssen sich zuerst anmelden."
+
+#~ msgid "Log in with"
+#~ msgstr "Anmelden mit"
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Eine OpenID anfordern"
+
 #~ msgid "failed to process"
 #~ msgstr "Ablauf fehlgeschlagen"
 
diff --git a/po/es.po b/po/es.po
index a6f3a2c6b..2f0b83813 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -18,11 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Antes es necesario identificarse."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -31,36 +27,36 @@ msgstr ""
 "activa, pero está intentando registrarse en el sistema vía el protocolo "
 "'http' y no 'https'"
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr "Su registro en el sistema ha expirado."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr "Identificación"
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr "Administración"
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Las preferencias se han guardado."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Error"
 
@@ -204,68 +200,78 @@ msgstr "%s desde la página %s"
 msgid "There are no broken links!"
 msgstr "¡ No hay enlaces rotos !"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "creando comentarios en la página %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+#, fuzzy
+msgid "moderation"
+msgstr "Aprobación de comentarios"
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato de página %s no soportado"
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr "Un comentario debe tener algún contenido"
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nombre de página erróneo"
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, perl-format
 msgid "commenting on %s"
 msgstr "creando comentarios en la página %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "la página '%s' no existe, así que no se puede comentar sobre ella"
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "los comentarios para la página '%s' están cerrados"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr "comentario guardado a la espera de aprobación"
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr "Su comentario será publicado después de que el moderador lo revise"
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr "Añadir un comentario"
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr "No está registrado como un administrador"
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr "Aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr "aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -275,7 +281,7 @@ msgstr[1] "Comentarios"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 #, fuzzy
 msgid "Comment"
 msgstr "Comentarios"
@@ -306,14 +312,14 @@ msgstr "eliminando la antigua previsualización %s"
 msgid "%s is not an editable page"
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
@@ -345,11 +351,11 @@ msgstr "se deben especificar tanto el formato como el texto"
 msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 msgid "missing page"
 msgstr "página no encontrada"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "No existe la página %s."
@@ -379,7 +385,7 @@ msgstr "no puede actuar sobre un archivo con permisos %s"
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -389,7 +395,7 @@ msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda"
 msgid "failed to run graphviz"
 msgstr "no he podido ejecutar el programa graphviz "
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr "prog no es un programa graphviz válido "
 
@@ -467,7 +473,7 @@ msgstr "Añadir una entrada nueva titulada:"
 msgid "template %s not found"
 msgstr "no he encontrado la plantilla %s"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
@@ -509,7 +515,7 @@ msgstr "falta la página a donde redirigir"
 msgid "redir cycle is not allowed"
 msgstr "ciclo de redirección no permitido"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "los parámetros 'from' y 'to' son obligatorios"
@@ -531,13 +537,10 @@ msgstr "aprobación de comentarios"
 msgid "more"
 msgstr "ver más"
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr "Identificarse mediante "
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Consiga un identificador OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "ha fallado la compilación del programa %s"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
@@ -614,94 +617,94 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -821,16 +824,16 @@ msgstr "%s no está en el directorio fuente por lo que no puede ser borrada"
 msgid "%s is not a file"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "confirme el borrado de %s"
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr "Por favor seleccione los adjuntos que serán borrados."
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr "borrado"
 
@@ -863,24 +866,24 @@ msgstr "%s ya existe en el disco"
 msgid "rename %s"
 msgstr "cambiando de nombre %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr "También cambia de nombre las subpáginas y los adjuntos"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr "Únicamente un adjunto puede ser renombrado a la vez."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr "Por favor, seleccione el adjunto al que cambiar el nombre."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr "%s cambia de nombre a %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "actualizado el cambio de nombre de %s a %s"
@@ -895,12 +898,12 @@ msgstr "no puedo leer de %s: %s "
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "se necesita la instalación de Digest::SHA1 para indexar %s"
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr "buscar"
 
@@ -1019,22 +1022,22 @@ msgstr "complementos"
 msgid "enable %s?"
 msgstr "¿ activar %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr "El archivo de configuración para este wiki es desconocido"
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr "principal"
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Los cambios en la configuración que se muestran más abajo precisan una "
 "reconstrucción del wiki para tener efecto."
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1042,7 +1045,7 @@ msgstr ""
 "Para que los cambios en la configuración mostrados más abajo tengan efecto, "
 "es posible que necesite reconstruir el wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1059,12 +1062,12 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1073,49 +1076,49 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1171,13 +1174,13 @@ msgid "wrapper filename not specified"
 msgstr "el programa envoltorio no ha sido especificado"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "ha fallado la compilación del programa %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "creado con éxito el programa envoltorio %s"
@@ -1211,47 +1214,47 @@ msgstr "reconstruyendo el wiki.."
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
@@ -1279,6 +1282,15 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "You need to log in first."
+#~ msgstr "Antes es necesario identificarse."
+
+#~ msgid "Log in with"
+#~ msgstr "Identificarse mediante "
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Consiga un identificador OpenID"
+
 #~ msgid "failed to process"
 #~ msgstr "fallo en el proceso"
 
diff --git a/po/fr.po b/po/fr.po
index b98a498c0..e1cee2e80 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -17,11 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Vous devez d'abord vous identifier."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -29,35 +25,35 @@ msgstr ""
 "Erreur de configuration probable : sslcookie est positionné mais vous tentez "
 "de vous connecter avec http au lieu de https"
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Échec de l'identification, vous devez autoriser les cookies."
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr "Session d'authentification expirée."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr "S’identifier"
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr "Administrateur"
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Les préférences ont été enregistrées."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Erreur"
 
@@ -197,68 +193,78 @@ msgstr "%s sur %s"
 msgid "There are no broken links!"
 msgstr "Aucun lien cassé !"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "Faire un commentaire sur %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+#, fuzzy
+msgid "moderation"
+msgstr "Modération du commentaire"
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Format de page non reconnu %s"
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr "Un commentaire doit avoir un contenu."
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "Nom de page incorrect"
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, perl-format
 msgid "commenting on %s"
 msgstr "Faire un commentaire sur %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "La page '%s' n'existe pas, commentaire impossible."
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Le commentaire pour la page '%s' est terminé."
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr "Le commentaire a été enregistré, en attente de « modération »"
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr "Votre commentaire sera publié après vérification par le modérateur"
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr "Commentaire ajouté"
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr "Vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr "Modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr "modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -268,7 +274,7 @@ msgstr[1] "Commentaires"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 #, fuzzy
 msgid "Comment"
 msgstr "Commentaires"
@@ -299,14 +305,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s"
 msgid "%s is not an editable page"
 msgstr "%s n'est pas une page éditable"
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "Édition de %s"
@@ -338,11 +344,11 @@ msgstr "le format et le texte doivent être indiqués"
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 msgid "missing page"
 msgstr "Page manquante"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La page %s n'existe pas."
@@ -371,7 +377,7 @@ msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -381,7 +387,7 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s."
 msgid "failed to run graphviz"
 msgstr "Échec du lancement de graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr "Ce programme n'est pas un programme graphviz valable"
 
@@ -459,7 +465,7 @@ msgstr "Ajouter un nouvel article dont le titre est :"
 msgid "template %s not found"
 msgstr "Modèle de page %s introuvable"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -500,7 +506,7 @@ msgstr "Page de redirection introuvable"
 msgid "redir cycle is not allowed"
 msgstr "Redirection cyclique non autorisée"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "les paramètres « from » et « to » sont nécessaires."
@@ -522,13 +528,10 @@ msgstr "modération du commentaire"
 msgid "more"
 msgstr "lire la suite"
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr "S'identifier en tant que"
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Obtenir un compte OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "Échec de la compilation de %s"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
@@ -606,12 +609,12 @@ msgstr ""
 "Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
 "version 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un code de langue valable"
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -619,7 +622,7 @@ msgstr ""
 "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
 "défaut."
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -627,23 +630,23 @@ msgstr ""
 "po_link_to=negotiated nécessite que usedirs soit activé, retour à "
 "po_link_to=default."
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -651,7 +654,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -659,50 +662,50 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -825,16 +828,16 @@ msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé"
 msgid "%s is not a file"
 msgstr "%s n'est pas un fichier"
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "Suppression de %s confirmée"
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr "Veuillez choisir la pièce jointe à supprimer"
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr "supprimé"
 
@@ -867,24 +870,24 @@ msgstr "%s existe déjà sur le disque"
 msgid "rename %s"
 msgstr "%s renommé"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr "« SubPages » et attachements renommés."
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr "Modification de pièce jointe : une seule à la fois"
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr "Veuillez sélectionner la pièce jointe à renommer"
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr "Renomme %s en %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "mise à jour, suite au changement de %s en %s"
@@ -899,12 +902,12 @@ msgstr "Impossible de lire %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "Digest::SHA1 est nécessaire pour indexer %s"
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr "recherche"
 
@@ -1019,22 +1022,22 @@ msgstr "Greffons"
 msgid "enable %s?"
 msgstr "activer %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr "Le fichier de configuration de ce wiki n'est pas connu"
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr "Partie principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Les changements de configuration ci-dessous nécessitent une recompilation du "
 "wiki pour prendre effet"
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1042,7 +1045,7 @@ msgstr ""
 "Pour que les changements de configuration ci-dessous prennent effet vous "
 "devez recompiler le wiki"
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées."
@@ -1058,12 +1061,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1072,47 +1075,47 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1171,13 +1174,13 @@ msgid "wrapper filename not specified"
 msgstr "Le nom du fichier CGI n'a pas été indiqué"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Échec de la compilation de %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s a été créé avec succès"
@@ -1211,44 +1214,44 @@ msgstr "Reconstruction du wiki..."
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
@@ -1273,6 +1276,15 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "You need to log in first."
+#~ msgstr "Vous devez d'abord vous identifier."
+
+#~ msgid "Log in with"
+#~ msgstr "S'identifier en tant que"
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Obtenir un compte OpenID"
+
 #~ msgid "failed to process"
 #~ msgstr "Échec du traitement"
 
diff --git a/po/gu.po b/po/gu.po
index 4f652358d..0100e9f74 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -15,46 +15,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?"
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 #, fuzzy
 msgid "Preferences"
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -195,68 +191,77 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "અહીં કોઇ તૂટેલ કડી નથી!"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "%s બનાવે છે"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+msgid "moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -266,7 +271,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 msgid "Comment"
 msgstr ""
 
@@ -296,14 +301,14 @@ msgstr "જુનાં પાનાં દૂર કરે છે %s"
 msgid "%s is not an editable page"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
@@ -337,12 +342,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 #, fuzzy
 msgid "missing page"
 msgstr "ખોવાયેલ કિંમતો"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -372,7 +377,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -382,7 +387,7 @@ msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કર
 msgid "failed to run graphviz"
 msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી"
 
@@ -459,7 +464,7 @@ msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેર
 msgid "template %s not found"
 msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
@@ -500,7 +505,7 @@ msgstr "ફીડ મળ્યું નહી"
 msgid "redir cycle is not allowed"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -520,13 +525,10 @@ msgstr ""
 msgid "more"
 msgstr "વધુ"
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr ""
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "ઓપનઆઇડી મેળવો"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
@@ -600,94 +602,94 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -809,16 +811,16 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે 
 msgid "%s is not a file"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr ""
 
@@ -852,24 +854,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "રેન્ડર કરે છે %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "%s નો સુધારો %s નાં %s વડે"
@@ -884,12 +886,12 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr ""
 
@@ -1010,26 +1012,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1044,59 +1046,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1150,13 +1152,13 @@ msgid "wrapper filename not specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
@@ -1189,43 +1191,43 @@ msgstr "વીકી ફરીથી બનાવે છે.."
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
@@ -1250,6 +1252,12 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "You need to log in first."
+#~ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે."
+
+#~ msgid "Get an OpenID"
+#~ msgstr "ઓપનઆઇડી મેળવો"
+
 #, fuzzy
 #~ msgid "failed to process"
 #~ msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 069af0995..9e017ac9c 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 20:27-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,45 +17,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr ""
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 msgid "Preferences"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr ""
 
@@ -193,68 +189,77 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, perl-format
+msgid "this comment needs %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:115
+msgid "moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:760
+#: ../IkiWiki/Plugin/comments.pm:789
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -264,7 +269,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:770
+#: ../IkiWiki/Plugin/comments.pm:799
 msgid "Comment"
 msgstr ""
 
@@ -294,14 +299,14 @@ msgstr ""
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -332,11 +337,11 @@ msgstr ""
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -365,7 +370,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -448,7 +453,7 @@ msgstr ""
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:626
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -507,12 +512,9 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr ""
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, perl-format
+msgid "failed to load openid module: "
 msgstr ""
 
 #: ../IkiWiki/Plugin/orphans.pm:56
@@ -585,93 +587,93 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:780
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:874
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:890
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:897
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:905
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:939
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:952
+#: ../IkiWiki/Plugin/po.pm:954
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1036
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1106
-#: ../IkiWiki/Plugin/po.pm:1145
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1104
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1157
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -791,16 +793,16 @@ msgstr ""
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr ""
 
@@ -833,24 +835,24 @@ msgstr ""
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -865,12 +867,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:189
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:226
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr ""
 
@@ -1019,59 +1021,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:170
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:323
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:339
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:381
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:443
+#: ../IkiWiki/Render.pm:431
 #, perl-format
 msgid "removing obsolete %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:505
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:525
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:608 ../IkiWiki/Render.pm:690
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:703
+#: ../IkiWiki/Render.pm:692
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:832
+#: ../IkiWiki/Render.pm:821
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1186,21 +1188,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1962
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2039
+#: ../IkiWiki.pm:2061
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2060
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2196
+#: ../IkiWiki.pm:2218
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 45efc2d3f..a8a80b0c8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -13,11 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Occorre prima effettuare l'accesso."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -25,35 +21,35 @@ msgstr ""
 "possibile errore di configurazione: sslcookie è impostato, ma si sta "
 "tentando un accesso via http, non https"
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?"
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr "La sessione è scaduta."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr "Entra"
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr "Amministrazione"
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Errore"
 
@@ -194,68 +190,78 @@ msgstr "%s da %s"
 msgid "There are no broken links!"
 msgstr "Non ci sono collegamenti rotti."
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "commento su %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+#, fuzzy
+msgid "moderation"
+msgstr "Moderazione commenti"
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato pagina %s non supportato"
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr "i commenti devono avere un contenuto"
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nome pagina non valido"
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, perl-format
 msgid "commenting on %s"
 msgstr "commento su %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "la pagina «%s» non esiste, impossibile commentarla"
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "i commenti per la pagina «%s» sono chiusi"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr "commento trattenuto per moderazione"
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr "Il commento sarà pubblicato dopo la verifica del moderatore"
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr "Aggiunto commento"
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Aggiunto commento: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr "non siete autenticati come amministratore"
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr "Moderazione commenti"
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr "moderazione commento"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -265,7 +271,7 @@ msgstr[1] "Commenti"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 #, fuzzy
 msgid "Comment"
 msgstr "Commenti"
@@ -296,14 +302,14 @@ msgstr "rimozione vecchia anteprima %s"
 msgid "%s is not an editable page"
 msgstr "%s non è una pagina modificabile"
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "creazione %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "modifica %s"
@@ -335,11 +341,11 @@ msgstr "occorre specificare formato e testo"
 msgid "fortune failed"
 msgstr "errore nel fortune"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 msgid "missing page"
 msgstr "pagina mancante"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La pagina %s non esiste."
@@ -368,7 +374,7 @@ msgstr "non è permesso lavorare su un file in modalità %s"
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -378,7 +384,7 @@ msgstr "Occorre specificare %s quando si usa il plugin %s"
 msgid "failed to run graphviz"
 msgstr "errore nell'eseguire graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr "prog non è un programma graphviz valido"
 
@@ -454,7 +460,7 @@ msgstr "Aggiungere un nuovo articolo dal titolo:"
 msgid "template %s not found"
 msgstr "modello %s non trovato"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
 
@@ -495,7 +501,7 @@ msgstr "pagina di reindirizzamento non trovata"
 msgid "redir cycle is not allowed"
 msgstr "ciclo di reindirizzamento non ammesso"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "sono richiesti i parametri \"to\" e \"from\""
@@ -517,13 +523,10 @@ msgstr "moderazione commento"
 msgid "more"
 msgstr "altro"
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr "Accedi tramite"
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Ottieni un OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "errore nel compilare %s"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
@@ -600,19 +603,19 @@ msgstr ""
 "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno "
 "alla versione 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s non è una codifica di lingua valida"
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -620,21 +623,21 @@ msgstr ""
 "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr "file PO aggiornati"
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -642,7 +645,7 @@ msgstr ""
 "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
 "stata eliminata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -650,50 +653,50 @@ msgstr ""
 "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
 "stata rinominata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Il file POT (%s) non esiste"
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "impossibile copiare il file PO di underlay in %s"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "impossibile copiare il file POT in %s"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr "N/D"
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, perl-format
 msgid "failed to translate %s"
 msgstr "impossibile tradurre %s"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
@@ -817,16 +820,16 @@ msgstr "%s non è in src, quindi non può essere eliminato"
 msgid "%s is not a file"
 msgstr "%s non è un file"
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "conferma rimozione di %s"
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr "Selezionare l'allegato da rimuovere."
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr "rimosso"
 
@@ -859,24 +862,24 @@ msgstr "%s già presente su disco"
 msgid "rename %s"
 msgstr "rinomina di %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr "Rinomina anche SottoPagine e allegati"
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr "Si può rinominare un solo allegato alla volta."
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr "Selezionare l'allegato da rinominare."
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr "rinomina %s in %s"
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aggiornamento per rinomina di %s in %s"
@@ -891,12 +894,12 @@ msgstr "impossibile leggere %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "è necessario Digest::SHA1 per l'indice di %s"
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr "cerca"
 
@@ -1011,22 +1014,22 @@ msgstr "plugin"
 msgid "enable %s?"
 msgstr "abilitare %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr "il file di setup di questo wiki non è noto"
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr "principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Le sottostanti modifiche alla configurazione richiedono la ricompilazione "
 "del wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1034,7 +1037,7 @@ msgstr ""
 "Affinché le sottostanti modifiche alla configurazione abbiano effetto, "
 "occorre ricostruire il wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
@@ -1049,12 +1052,12 @@ msgstr "impossibile determinare l'id del committer non fidato %s"
 msgid "bad file name %s"
 msgstr "nome file %s scorretto"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "scansione %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1063,47 +1066,47 @@ msgstr ""
 "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare "
 "allow_symlinks_before_srcdir per abilitare questa configurazione"
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorato il file dal nome scorretto %s"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s ha diverse pagine sorgenti possibili"
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "rimozione della vecchia pagina %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "compilazione di %s, che è collegato a %s"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "rimozione di %s, non più richiesto da %s"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "compilazione di %s, che dipende da %s"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1158,13 +1161,13 @@ msgid "wrapper filename not specified"
 msgstr "nome del file del contenitore non specificato"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "errore nel compilare %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s generato con successo"
@@ -1198,43 +1201,43 @@ msgstr "ricostruzione wiki..."
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Discussione"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr "impossibile usare più plugin rcs"
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
@@ -1259,6 +1262,15 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
 msgid "What is the domain name of the web server?"
 msgstr "Qual è il nome del dominio del server web?"
 
+#~ msgid "You need to log in first."
+#~ msgstr "Occorre prima effettuare l'accesso."
+
+#~ msgid "Log in with"
+#~ msgstr "Accedi tramite"
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Ottieni un OpenID"
+
 #~ msgid "failed to process"
 #~ msgstr "errore nell'elaborazione"
 
diff --git a/po/pl.po b/po/pl.po
index 837c5acd2..e09336b0e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -16,48 +16,44 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Proszę najpierw zalogować się."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są "
 "ciasteczka (ang. cookies)"
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 #, fuzzy
 msgid "Preferences"
 msgstr "Preferencje zapisane."
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Preferencje zapisane."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Błąd"
 
@@ -199,68 +195,77 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Wszystkie odnośniki są aktualne!"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "tworzenie %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+msgid "moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -270,7 +275,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 msgid "Comment"
 msgstr ""
 
@@ -300,14 +305,14 @@ msgstr "usuwanie starej strony %s"
 msgid "%s is not an editable page"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "edycja %s"
@@ -341,12 +346,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "awaria fortunki"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 #, fuzzy
 msgid "missing page"
 msgstr "brakujące wartości"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -376,7 +381,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -387,7 +392,7 @@ msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
 msgid "failed to run graphviz"
 msgstr "awaria w trakcie uruchamiania wtyczki graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr "prog nie jest poprawnym programem graphviz"
 
@@ -466,7 +471,7 @@ msgstr "Tytuł nowego wpisu"
 msgid "template %s not found"
 msgstr "nieznaleziony szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
@@ -513,7 +518,7 @@ msgstr "nieznaleziony kanał RSS"
 msgid "redir cycle is not allowed"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -533,13 +538,10 @@ msgstr ""
 msgid "more"
 msgstr "więcej"
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr ""
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Pobierz OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "awaria w trakcie kompilowania %s"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
@@ -613,94 +615,94 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -824,16 +826,16 @@ msgstr ""
 msgid "%s is not a file"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr ""
 
@@ -867,24 +869,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "renderowanie %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s"
@@ -899,12 +901,12 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr ""
 
@@ -1031,26 +1033,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1065,59 +1067,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "skanowanie %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1171,13 +1173,13 @@ msgid "wrapper filename not specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "awaria w trakcie kompilowania %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "pomyślnie utworzono %s"
@@ -1210,45 +1212,45 @@ msgstr "przebudowywanie wiki..."
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Dyskusja"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
@@ -1273,6 +1275,12 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "You need to log in first."
+#~ msgstr "Proszę najpierw zalogować się."
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Pobierz OpenID"
+
 #, fuzzy
 #~ msgid "failed to process"
 #~ msgstr "awaria w trakcie przetwarzania:"
diff --git a/po/sv.po b/po/sv.po
index 2cba1cc2e..f87bc3fd8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 16:15-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -15,46 +15,42 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Du måste logga in först."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 #, fuzzy
 msgid "Preferences"
 msgstr "Inställningar sparades."
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Inställningar sparades."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Fel"
 
@@ -196,68 +192,77 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Det finns inga trasiga länkar!"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "skapar %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+msgid "moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -267,7 +272,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 msgid "Comment"
 msgstr ""
 
@@ -297,14 +302,14 @@ msgstr "tar bort gammal sida %s"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
@@ -338,12 +343,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "fortune misslyckades"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 #, fuzzy
 msgid "missing page"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -373,7 +378,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -384,7 +389,7 @@ msgstr "Måste ange %s när sökinsticket används"
 msgid "failed to run graphviz"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -461,7 +466,7 @@ msgstr ""
 msgid "template %s not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
@@ -506,7 +511,7 @@ msgstr "mallen %s hittades inte"
 msgid "redir cycle is not allowed"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:383
+#: ../IkiWiki/Plugin/meta.pm:387
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -526,13 +531,10 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr ""
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Skaffa ett OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "misslyckades med att kompilera %s"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
@@ -606,94 +608,94 @@ msgstr "RPC::XML::Client hittades inte, pingar inte"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:873
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:887
+#: ../IkiWiki/Plugin/po.pm:890
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:896
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:905
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:954
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
-#: ../IkiWiki/Plugin/po.pm:1144
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -814,16 +816,16 @@ msgstr "%s är låst av %s och kan inte redigeras"
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr ""
 
@@ -857,24 +859,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "ritar upp %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "uppdatering av %s, %s av %s"
@@ -889,12 +891,12 @@ msgstr "misslyckades med att skriva %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:184
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:221
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr ""
 
@@ -1018,26 +1020,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1052,59 +1054,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:162
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:315
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:434
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:507
+#: ../IkiWiki/Render.pm:505
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:516
+#: ../IkiWiki/Render.pm:514
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:684
+#: ../IkiWiki/Render.pm:692
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:819
+#: ../IkiWiki/Render.pm:821
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1158,13 +1160,13 @@ msgid "wrapper filename not specified"
 msgstr "filnamn för wrapper har inte angivits"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "misslyckades med att kompilera %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "generering av %s lyckades"
@@ -1197,43 +1199,43 @@ msgstr "bygger om wiki.."
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
-#: ../IkiWiki.pm:233
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:524
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:570
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:599
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1273
+#: ../IkiWiki.pm:1298
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1932
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2009
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2030
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2166
+#: ../IkiWiki.pm:2218
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
@@ -1258,6 +1260,12 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "You need to log in first."
+#~ msgstr "Du måste logga in först."
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Skaffa ett OpenID"
+
 #, fuzzy
 #~ msgid "failed to process"
 #~ msgstr "misslyckades med att behandla mall:"
diff --git a/po/tr.po b/po/tr.po
index dca798e3e..90c1b0de5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 21:16-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -13,45 +13,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Önce sisteme giriş yapmanız gerekiyor."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr "Giriş"
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr "Yönet"
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1298
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Hata"
 
@@ -189,68 +185,77 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, perl-format
+msgid "this comment needs %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:115
+msgid "moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -260,7 +265,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 msgid "Comment"
 msgstr ""
 
@@ -290,14 +295,14 @@ msgstr ""
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -328,11 +333,11 @@ msgstr ""
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -361,7 +366,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -371,7 +376,7 @@ msgstr ""
 msgid "failed to run graphviz"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -444,7 +449,7 @@ msgstr ""
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -503,12 +508,9 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr ""
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, perl-format
+msgid "failed to load openid module: "
 msgstr ""
 
 #: ../IkiWiki/Plugin/orphans.pm:56
@@ -581,93 +583,93 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:772
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:874
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:890
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:897
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:905
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:939
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:952
+#: ../IkiWiki/Plugin/po.pm:954
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1036
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1106
-#: ../IkiWiki/Plugin/po.pm:1145
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1104
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1157
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -787,16 +789,16 @@ msgstr ""
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr ""
 
@@ -829,24 +831,24 @@ msgstr ""
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -861,12 +863,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:188
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:225
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr ""
 
@@ -981,26 +983,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1015,59 +1017,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:163
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:316
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:331
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:373
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:435
+#: ../IkiWiki/Render.pm:431
 #, perl-format
 msgid "removing obsolete %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:508
+#: ../IkiWiki/Render.pm:505
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:517
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:600 ../IkiWiki/Render.pm:682
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:695
+#: ../IkiWiki/Render.pm:692
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:824
+#: ../IkiWiki/Render.pm:821
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1121,13 +1123,13 @@ msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -1177,26 +1179,26 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1280
+#: ../IkiWiki.pm:1298
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2021
+#: ../IkiWiki.pm:2061
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2042
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2178
+#: ../IkiWiki.pm:2218
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
@@ -1220,3 +1222,6 @@ msgstr ""
 #: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""
+
+#~ msgid "You need to log in first."
+#~ msgstr "Önce sisteme giriş yapmanız gerekiyor."
diff --git a/po/vi.po b/po/vi.po
index b5596b926..182f9ccbe 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 21:16-0400\n"
+"POT-Creation-Date: 2010-05-18 13:38-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -16,46 +16,42 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.6fc1\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Trước tiên bạn cần phải đăng nhập."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 #, fuzzy
 msgid "Preferences"
 msgstr "Tùy thích đã được lưu."
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Tùy thích đã được lưu."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1298
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Lỗi"
 
@@ -197,68 +193,77 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:112
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "đang tạo %s"
+
+#: ../IkiWiki/Plugin/comments.pm:115
+msgid "moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:347
+#: ../IkiWiki/Plugin/comments.pm:362
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/comments.pm:365
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:372
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:471
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:484
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:488
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:581
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:620
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:789
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -267,7 +272,7 @@ msgstr[0] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:769
+#: ../IkiWiki/Plugin/comments.pm:799
 msgid "Comment"
 msgstr ""
 
@@ -297,14 +302,14 @@ msgstr "đang gỡ bỏ trang cũ %s"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:295
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
-#: ../IkiWiki/Plugin/editpage.pm:425
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
@@ -338,12 +343,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "fortune bị lỗi"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 #, fuzzy
 msgid "missing page"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -373,7 +378,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -384,7 +389,7 @@ msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
 msgid "failed to run graphviz"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -463,7 +468,7 @@ msgstr ""
 msgid "template %s not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/inline.pm:635
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
@@ -526,13 +531,10 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr ""
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Lấy OpenID"
+#: ../IkiWiki/Plugin/openid.pm:58
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "lỗi biên dịch %s"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
@@ -606,94 +608,94 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:140
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:152
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:157
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:388
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:772
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:430
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:454
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:474
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:874
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:890
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:897
+#: ../IkiWiki/Plugin/po.pm:899
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:903
+#: ../IkiWiki/Plugin/po.pm:905
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:939
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:952
+#: ../IkiWiki/Plugin/po.pm:954
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1036
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1106
-#: ../IkiWiki/Plugin/po.pm:1145
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1104
+#: ../IkiWiki/Plugin/po.pm:1106
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1157
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -814,16 +816,16 @@ msgstr "%s bị %s khoá nên không thể sửa được"
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr ""
 
@@ -857,24 +859,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "đang vẽ %s"
 
-#: ../IkiWiki/Plugin/rename.pm:161
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:248
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:251
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:348
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:572
+#: ../IkiWiki/Plugin/rename.pm:576
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "cập nhật %2$s của %1$s bởi %3$s"
@@ -889,12 +891,12 @@ msgstr "lỗi ghi %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:188
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:225
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr ""
 
@@ -1018,26 +1020,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:274
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:290
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:437
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:474
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1052,59 +1054,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:163
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:316
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:331
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:373
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:435
+#: ../IkiWiki/Render.pm:431
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:508
+#: ../IkiWiki/Render.pm:505
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:517
+#: ../IkiWiki/Render.pm:514
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
-#: ../IkiWiki/Render.pm:600 ../IkiWiki/Render.pm:682
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:695
+#: ../IkiWiki/Render.pm:692
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:824
+#: ../IkiWiki/Render.pm:821
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
@@ -1158,13 +1160,13 @@ msgid "wrapper filename not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:159
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "lỗi biên dịch %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:179
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s đã được tạo ra"
@@ -1214,26 +1216,26 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1280
+#: ../IkiWiki.pm:1298
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1944
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2021
+#: ../IkiWiki.pm:2061
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2042
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2178
+#: ../IkiWiki.pm:2218
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
@@ -1258,6 +1260,12 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "You need to log in first."
+#~ msgstr "Trước tiên bạn cần phải đăng nhập."
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Lấy OpenID"
+
 #, fuzzy
 #~ msgid "failed to process"
 #~ msgstr "mẫu không xử lý được:"
-- 
cgit v1.2.3


From a35d8caf276ddfdc268c9d0e8b546db32d3bf43b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 13:42:37 -0400
Subject: add news item for ikiwiki 3.20100518

---
 doc/news/version_3.20100427.mdwn | 119 ---------------------------------------
 doc/news/version_3.20100518.mdwn |   6 ++
 2 files changed, 6 insertions(+), 119 deletions(-)
 delete mode 100644 doc/news/version_3.20100427.mdwn
 create mode 100644 doc/news/version_3.20100518.mdwn

diff --git a/doc/news/version_3.20100427.mdwn b/doc/news/version_3.20100427.mdwn
deleted file mode 100644
index 61cf67141..000000000
--- a/doc/news/version_3.20100427.mdwn
+++ /dev/null
@@ -1,119 +0,0 @@
-This version of ikiwiki has a lot of changes that you need to know about.
-
-Now you can include customised versions of templates in the source
-of your wiki. (For example, templates/page.tmpl.) When these templates
-are changed, ikiwiki will automatically rebuild pages that use them.
-
-Allowing untrusted users to upload attachments with the ".tmpl"
-extension is not recommended, as that allows anyone to change
-a wiki's templates.
-
-The --getctime switch is renamed to --gettime, and it also gets the 
-file modification time. And it's a lot faster (when using git). But
-the really important change is, you don't have to remember to use this
-switch. Now ikiwiki will do it when it needs to.
-
-At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
-If your wiki accidentially relied on the old, buggy behavior, you might
-need to change its pagespecs to use "link()".
-
-Many of your wishes have been answered: Now tag pages can automatically be
-created when new tags are used. This feature is enabled by default if you
-have configured a tagbase. It can be turned on or off using the
-`tag_autocreate` setting.
-
-These changes may also affect some users:
-
-* The `title_natural` sort method (as used by the inline directive, etc)
-  has been moved to the new sortnaturally plugin, which is not enabled
-  by default since it requires the Sort::Naturally perl module.
-
-* `TMPL_INCLUDE` is no longer supported in any template used by ikiwiki.
-  It used to be allowed in certian templates, but not in others.
-
-* The `add_templates` option has been removed from the underlay plugin.
-  If you used this option, you can instead use templates/ subdirectories
-  inside underlay directories added by the `add_underlays` option.
-
-Due to the above and other changes, all wikis need to be rebuilt on
-upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
-this will be done automatically when the Debian package is upgraded. Or
-use ikiwiki-mass-rebuild to force a rebuild.
-
-ikiwiki 3.20100427 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * [ Joey Hess ]
-   * tag: Automatic creation of tag pages can now be enabled using
-     the tag\_autocreate setting. (David Riebenbauer)
-   * Customised templates can now be included in the source of wikis
-     (and also in underlays), and dependencies on them are tracked.
-   * TMPL\_INCLUDE is no longer supported in any template.
-   * underlay: Removed the add\_templates option.
-   * Add template\_depends function to plugin API.
-   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
-   * comments: Fix missing entity encoding in title.
-   * txt: Add a special case for robots.txt.
- * [ Simon McVittie ]
-   * Add support for link types, and make the the tagged() pagespec only
-     match tags, not regular links (a bugfix).
-   * Rebuild wikis on upgrade to this version to get tag link types recorded
-     correctly.
-   * Revamp sorting system; allow new sort methods to be added by plugins,
-     and add a "sortspec" syntax that can combine, reverse, etc sort methods.
-   * meta: Add `meta(author)`, `meta(title)` etc sortspecs to allow sorting
-     by metadata.
-   * meta: Add optional sortas parameter to author and title meta directives.
-     This can be used to get names sorted by last name without displaying
-     them last name first.
-   * sortnaturally: New plugin; the title\_natural sort method has moved here.
-   * meta: store fields consistently unescaped, and escape on use.
-     (A wiki rebuild is also needed due to this change.)
- * [ Joey Hess ]
-   * Update dependency for git-core to git transition.
-   * po: Check that translated underlay directories exist before using them
-     for master language.
-   * po: Configuring the same language as master and slave confuses processing;
-     so filter out such a misconfiguration.
-   * calendar: Add archive\_pagespec, which is used by ikiwiki-calendar to
-     specify which pages to include on the calendar archive pages.
-     (The pagespec can still also be specified on the ikiwiki-calendar command
-     line.)
-   * pagestats: Class parameter can be used to override default class for
-     custom styling.
-   * pagestats: Use style=list to get a list of tags, scaled by use like
-     in a tag cloud. This is useful to put in a sidebar.
-   * Rework example blog front page.
-   * CSS and templates for sidebar changed to use a class, not an id.
-   * sidebar: Now a sidebar directive can be used to override the sidebar
-     shown on a page.
-   * Enable calendar and sidebar in auto-blog.setup.
-   * sidebar: Add global\_sidebars setting.
-   * conditional: Fix bug that forced "all" mode off by default.
-   * calendarmonth.tmpl: The month calendar is now put in a sidebar.
-   * calendar: Improved display of arrows.
-   * Rename --getctime to --gettime. (The old name still works for
-     backwards compatibility.)
-   * --gettime now also looks up last modification time.
-   * Automatically run --gettime the first time ikiwiki is run on
-     a given srcdir. (Use --no-gettime to disable.)
-   * Add rcs\_getmtime to plugin API; currently only implemented
-     for git and svn.
-   * Optimise --gettime for git, so it's appropriately screamingly
-     fast. (This could be done for most other backends too.)
-   * However, --gettime for git no longer follows renames. That would
-     be slow, and whether a renamed wiki page is the same page is really
-     an iffy thing.
-   * Use above to fix up timestamps on docwiki, as well as ensure that
-     timestamps on basewiki files shipped in the deb are sane.
-   * autoindex: Switch to using %wikistate instead of abusing
-     $pagestate{index}.
-   * bzr: Support rcs\_getmtime, and fix rcs\_getctime implementation
-     (Jelmer Vernooij)
-   * Quite a lot of new optimisations, and one major fix to a recent
-     performance regression.
-   * Moved javascript files under the ikiwiki/ directory, to avoid cluttering
-     the top of the web root. This is another things that requires a wiki
-     rebuild on upgrade to this version.
-   * Fix removal of rendered files in rebuild mode.
-   * Add page() PageSpec, which is like glob() but matches only pages,
-     not other files."""]]
diff --git a/doc/news/version_3.20100518.mdwn b/doc/news/version_3.20100518.mdwn
new file mode 100644
index 000000000..f622a4be9
--- /dev/null
+++ b/doc/news/version_3.20100518.mdwn
@@ -0,0 +1,6 @@
+ikiwiki 3.20100518 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * page.tmpl: Accidentially broke po plugin's otherlanguages list styling
+     when modifying for html5; now fixed.
+   * Fix a bug that prevented matching deleted comments, and so did not update
+     pages that had contained them."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From fa354167bb9addab130e6a89eb845d5bc798c35e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 14:11:11 -0400
Subject: response

---
 .../ikiwiki_development_environment_tips.mdwn      | 27 +++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/doc/forum/ikiwiki_development_environment_tips.mdwn b/doc/forum/ikiwiki_development_environment_tips.mdwn
index 32da4a1cd..91ccc6d6e 100644
--- a/doc/forum/ikiwiki_development_environment_tips.mdwn
+++ b/doc/forum/ikiwiki_development_environment_tips.mdwn
@@ -7,7 +7,13 @@ Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]
 >> I think this suffers from two problems. Firstly, unless you are tracking git
 >> master in your existing wiki, there's the possibility that your plugin will
 >> not work with a more modern version of ikiwiki (or that it would benefit
->> from using a newly added utility subroutine or similar). Second, sometimes I
+>> from using a newly added utility subroutine or similar). 
+
+>>> Unlikely. I don't make changes to the plugin interface that break
+>>> existing plugins. (Might change non-exported `IkiWiki::` things
+>>> from time to time.) --[[Joey]] 
+
+>> Second, sometimes I
 >> find that even writing a plugin can involve making minor changes outside of
 >> the plugin code (bug fixes, or moving functionality about). So, I think
 >> having some kind of environment built around a git checkout is best.
@@ -17,3 +23,22 @@ Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]
 >>
 >> I think I might personally benefit from a more consistent environment (I
 >> move from machine-to-machine frequently). -- [[Jon]]
+
+> If you set `libdir` to point to a checkout of ikiwiki's git repository,
+> it will override use of the installed version of ikiwiki, so ikiwiki will
+> immediatly use any changed or new `.pm` files (with the exception of
+> IkiWiki.pm), and you can use git to manage it all without an installation
+> step. If I am modifying IkiWiki.pm, I generally symlink it from
+> `/usr/share/perl5/IkiWiki.pm` to my git reporisitory. Granted, not ideal.
+> 
+> I often use my laptop's local version of my personal wiki for testing.
+> It has enough stuff that I can easily test most things, and if I need
+> a test page I just dump test cases on the sandbox. I can make
+> any changes necessary during testing and then `git reset --hard
+> origin/master` to avoid publishing them.
+> 
+> If the thing I'm testing involves templates, or underlays, 
+> I will instead use ikiwiki's `docwiki.setup` for testing, modifying it as
+> needed, since it is preconfigured to use the templates and underlays
+> from ikiwiki's source repository.
+> --[[Joey]]
-- 
cgit v1.2.3


From 14de1d87eff9b3a28435103f1efed2cb0972ec3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 14:16:58 -0400
Subject: Fix a typo in the last release.

---
 IkiWiki/Plugin/comments.pm | 4 ++--
 debian/changelog           | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index de193bd12..f2cd8f90a 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -914,7 +914,7 @@ sub match_comment ($$;@) {
 		$IkiWiki::pagesources{$page} :
 		$IkiWiki::delpagesources{$page};
 	my $type=IkiWiki::pagetype($source);
-	if (defined $type && $type ne "_comment") {
+	if (! defined $type || $type ne "_comment") {
 		return IkiWiki::FailReason->new("$page is not a comment");
 	}
 
@@ -929,7 +929,7 @@ sub match_comment_pending ($$;@) {
 		$IkiWiki::pagesources{$page} :
 		$IkiWiki::delpagesources{$page};
 	my $type=IkiWiki::pagetype($source);
-	if (defined $type && $type ne "_comment_pending") {
+	if (! defined $type || $type ne "_comment_pending") {
 		return IkiWiki::FailReason->new("$page is not a pending comment");
 	}
 
diff --git a/debian/changelog b/debian/changelog
index c829f2f06..da4851d5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100518.2) unstable; urgency=low
+
+  * Fix a typo in the last release.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 18 May 2010 14:16:30 -0400
+
 ikiwiki (3.20100518) unstable; urgency=low
 
   * page.tmpl: Accidentially broke po plugin's otherlanguages list styling
-- 
cgit v1.2.3


From 8b7fb8d396b5cfa9b91ca01318c9a9fa048c8b88 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 14:21:52 -0400
Subject: releasing version 3.20100518.2

---
 debian/changelog | 2 +-
 ikiwiki.spec     | 2 +-
 po/ikiwiki.pot   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da4851d5b..28dc1b176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ ikiwiki (3.20100518.2) unstable; urgency=low
 
   * Fix a typo in the last release.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 18 May 2010 14:16:30 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 18 May 2010 14:17:01 -0400
 
 ikiwiki (3.20100518) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index a3a109c9f..fb8b777fe 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100518
+Version: 3.20100518.2
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 9e017ac9c..bec239401 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
cgit v1.2.3


From 29cd4616fbdf25b7a4042376483f58d658c78140 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 14:22:12 -0400
Subject: add news item for ikiwiki 3.20100518.2

---
 doc/news/version_3.20100518.2.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/news/version_3.20100518.2.mdwn

diff --git a/doc/news/version_3.20100518.2.mdwn b/doc/news/version_3.20100518.2.mdwn
new file mode 100644
index 000000000..64ce3f863
--- /dev/null
+++ b/doc/news/version_3.20100518.2.mdwn
@@ -0,0 +1,3 @@
+ikiwiki 3.20100518.2 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix a typo in the last release."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From f463cde12eb814945cdce798dfdf675d4945fb11 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:18:35 +0000
Subject: new version

---
 doc/plugins/contrib/field.mdwn | 127 +++++++++++++++++++++++++++++++++--------
 1 file changed, 104 insertions(+), 23 deletions(-)

diff --git a/doc/plugins/contrib/field.mdwn b/doc/plugins/contrib/field.mdwn
index 09646d28a..dce2d891c 100644
--- a/doc/plugins/contrib/field.mdwn
+++ b/doc/plugins/contrib/field.mdwn
@@ -13,9 +13,22 @@ IkiWiki::Plugin::field - front-end for per-page record fields.
     # simple registration
     field_register => [qw{meta}],
 
+    # simple registration with priority
+    field_register => {
+	meta => 'last'
+	foo => 'DD'
+    },
+
     # allow the config to be queried as a field
     field_allow_config => 1,
 
+    # flag certain fields as "tags"
+    field_tags => {
+	BookAuthor => '/books/authors',
+	BookGenre => '/books/genres',
+	MovieGenre => '/movies/genres',
+    }
+
 ## DESCRIPTION
 
 This plugin is meant to be used in conjunction with other plugins
@@ -25,13 +38,14 @@ are fields in that record.  This can include the meta-data for that page,
 such as the page title.
 
 Plugins can register a function which will return the value of a "field" for
-a given page.  This can be used in three ways:
+a given page.  This can be used in a few ways:
 
 * In page templates; all registered fields will be passed to the page template in the "pagetemplate" processing.
 * In PageSpecs; the "field" function can be used to match the value of a field in a page.
+* In SortSpecs; the "field" function can be used for sorting pages by the value of a field in a page.
 * By other plugins, using the field_get_value function, to get the value of a field for a page, and do with it what they will.
 
-## OPTIONS
+## CONFIGURATION OPTIONS
 
 The following options can be set in the ikiwiki setup file.
 
@@ -46,28 +60,77 @@ keys of the config hash are the field names.
 
     field_register => [qw{meta}],
 
-A list of plugin-IDs to register.  This assumes that the plugins in
-question store data in the %pagestatus hash using the ID of that plugin,
-and thus the field values are looked for there.
+    field_register => {
+	meta => 'last'
+	foo => 'DD'
+    },
+
+A hash of plugin-IDs to register.  The keys of the hash are the names of the
+plugins, and the values of the hash give the order of lookup of the field
+values.  The order can be 'first', 'last', 'middle', or an explicit order
+sequence between 'AA' and 'ZZ'.  If the simpler type of registration is used,
+then the order will be 'middle'.
+
+This assumes that the plugins in question store data in the %pagestatus hash
+using the ID of that plugin, and thus the field values are looked for there.
 
 This is the simplest form of registration, but the advantage is that it
 doesn't require the plugin to be modified in order for it to be
 registered with the "field" plugin.
 
-## PageSpec
+**field_tags**
+
+    field_tags => {
+	BookAuthor => '/books/authors',
+	BookGenre => '/books/genres',
+	MovieGenre => '/movies/genres',
+    }
 
-The "field" PageSpec function can be used to match the value of a field for a page.
+A hash of fields and their associated pages.  This provides a faceted
+tagging system.
 
-**field(*name* *glob*)**
+The way this works is that a given field-name will be associated with a given
+page, and the values of that field will be linked to sub-pages of that page.
 
 For example:
 
-field(bar Foo*) will match if the "bar" field starts with "Foo".
+	BookGenre: SF
+
+will link to "/books/genres/SF", with a link-type of "bookgenre".
 
-**destfield(*name* *glob*)**
+## PageSpec
+
+The `field` plugin provides a few PageSpec functions to match values
+of fields for pages.
+
+* field
+  * **field(*name* *glob*)**
+  * field(bar Foo\*) will match if the "bar" field starts with "Foo".
+* destfield
+  * **destfield(*name* *glob*)**
+  * as for "field" but matches against the destination page (i.e when the source page is being included in another page).
+* field_item
+  * **field_item(*name* *glob*)**
+  * field_item(bar Foo) will match if one of the values of the "bar" field is "Foo".
+* destfield_item
+  * **destfield_item(*name* *glob*)**
+  * as for "field_item" but matches against the destination page.
+* field_tagged
+  * **field_tagged(*name* *glob*)**
+  * like `tagged`, but this uses the tag-bases and link-types defined in the `field_tags` configuration option.
+* destfield_tagged
+  * **destfield_tagged(*name* *glob*)**
+  * as for "field_tagged" but matches against the destination page.
+
+## SortSpec
+
+The "field" SortSpec function can be used to sort a page depending on the value of a field for that page.  This is used for directives that take sort parameters, such as **inline** or **report**.
+
+field(*name*)
 
-is the same, except that it tests the destination page (that is, in cases
-when the source page is being included in another page).
+For example:
+
+sort="field(bar)" will sort by the value og the "bar" field.
 
 ## FUNCTIONS
 
@@ -75,16 +138,18 @@ when the source page is being included in another page).
 
 field_register(id=>$id);
 
-Register a plugin as having field data.  The above form is the simplest, where the field value
-is looked up in the %pagestatus hash under the plugin-id.
+Register a plugin as having field data.  The above form is the simplest, where
+the field value is looked up in the %pagestatus hash under the plugin-id.
 
 Additional Options:
 
 **call=>&myfunc**
 
-A reference to a function to call rather than just looking up the value in the %pagestatus hash.
-It takes two arguments: the name of the field, and the name of the page.  It is expected to return
-the value of that field, or undef if there is no field by that name.
+A reference to a function to call rather than just looking up the value in the
+%pagestatus hash.  It takes two arguments: the name of the field, and the name
+of the page.  It is expected to return (a) an array of the values of that field
+if "wantarray" is true, or (b) a concatenation of the values of that field
+if "wantarray" is not true, or (c) undef if there is no field by that name.
 
     sub myfunc ($$) {
 	my $field = shift;
@@ -92,22 +157,38 @@ the value of that field, or undef if there is no field by that name.
 
 	...
 
-	return $value;
+	return (wantarray ? @values : $value);
     }
 
 **first=>1**
 
-Set this to be called first in the sequence of calls looking for values.  Since the first found
-value is the one which is returned, ordering is significant.
+Set this to be called first in the sequence of calls looking for values.  Since
+the first found value is the one which is returned, ordering is significant.
+This is equivalent to "order=>'first'".
 
 **last=>1**
 
-Set this to be called last in the sequence of calls looking for values.  Since the first found
-value is the one which is returned, ordering is significant.
+Set this to be called last in the sequence of calls looking for values.  Since
+the first found value is the one which is returned, ordering is significant.
+This is equivalent to "order=>'last'".
+
+**order=>$order**
+
+Set the explicit ordering in the sequence of calls looking for values.  Since
+the first found value is the one which is returned, ordering is significant.
+
+The values allowed for this are "first", "last", "middle", or a two-character
+ordering-sequence between 'AA' and 'ZZ'.
 
 ### field_get_value($field, $page)
 
-Returns the value of the field for that page, or undef if none is found.
+    my @values = field_get_value($field, $page);
+
+    my $value = field_get_value($field, $page);
+
+Returns the values of the field for that page, or undef if none is found.
+Note that it will return an array of values if you ask for an array,
+and a scalar value if you ask for a scalar.
 
 ## DOWNLOAD
 
-- 
cgit v1.2.3


From 9b45264c1c3e83b991d74de6df652a2f2e8749d8 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:20:44 +0000
Subject: new version

---
 doc/plugins/contrib/ftemplate.mdwn | 83 ++++----------------------------------
 1 file changed, 7 insertions(+), 76 deletions(-)

diff --git a/doc/plugins/contrib/ftemplate.mdwn b/doc/plugins/contrib/ftemplate.mdwn
index fba51e1c2..d82867f94 100644
--- a/doc/plugins/contrib/ftemplate.mdwn
+++ b/doc/plugins/contrib/ftemplate.mdwn
@@ -1,85 +1,16 @@
 [[!template id=plugin name=ftemplate author="[[rubykat]]"]]
 [[!tag type/meta type/format]]
-[[!toc]]
-## NAME
 
-IkiWiki::Plugin::ftemplate - field-aware structured template plugin
+This plugin provides the [[ikiwiki/directive/ftemplate]] directive.
 
-## SYNOPSIS
+This is like the [[ikiwiki/directive/template]] directive, with the addition
+that one does not have to provide all the values in the call to the template,
+because ftemplate can query structured data ("fields") using the [[field]]
+plugin.
 
-    # activate the plugin
-    add_plugins => [qw{goodstuff ftemplate ....}],
-
-## DESCRIPTION
-
-This plugin provides the **ftemplate** directive.  This is like
-the [[ikiwiki/directive/template]] directive, with the addition that one does not
-have to provide all the values in the call to the template,
-because ftemplate can query structured data ("fields") using
-the [[field]] plugin.
-
-Templates are files that can be filled out and inserted into pages in
-the wiki, by using the ftemplate directive. The directive has an id
-parameter that identifies the template to use.
-
-Additional parameters can be used to fill out the template, in
-addition to the "field" values.  Passed-in values override the
-"field" values.
-
-There are two places where template files can live.  One is, as with the
-[[plugins/template]] plugin, in the /templates directory on the wiki.  These
-templates are wiki pages, and can be edited from the web like other wiki
-pages.
-
-The second place where template files can live is in the global
-templates directory (the same place where the page.tmpl template lives).
-This is a useful place to put template files if you want to prevent
-them being edited from the web, and you don't want to have to make
-them work as wiki pages.
-
-### EXAMPLES
-
-#### Example 1
-
-PageA:
-
-    \[[!meta title="I Am Page A"]]
-    \[[!meta description="A is for Apple."]]
-    \[[!meta author="Fred Nurk"]]
-    \[[!ftemplate id="mytemplate"]]
-
-Template "mytemplate":
+## Activate the plugin
 
-    # <TMPL_VAR NAME="TITLE">
-    by <TMPL_VAR NAME="AUTHOR">
-
-    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
-
-This will give:
-
-    <h1>I Am Page A</h1>
-    <p>by Fred Nurk</p>
-    <p><strong>Summary:</strong> A is for Apple.
-
-#### Example 2: Overriding values
-
-PageB:
-
-    \[[!meta title="I Am Page B"]]
-    \[[!meta description="B is for Banana."]]
-    \[[!meta author="Fred Nurk"]]
-    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
-
-This will give:
-
-    <h1>Bananananananas</h1>
-    <p>by Fred Nurk</p>
-    <p><strong>Summary:</strong> B is for Banana.
-
-### LIMITATIONS
-
-One cannot query the values of fields on pages other than the current
-page.
+    add_plugins => [qw{goodstuff ftemplate ....}],
 
 ## PREREQUISITES
 
-- 
cgit v1.2.3


From 824a1a1599035d45e5428e1203bb02373a8ac3b3 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:22:13 +0000
Subject: put ftemplate directive info under directives; new version of
 ftemplate, with LOOPS!

---
 doc/ikiwiki/directive/ftemplate.mdwn | 106 +++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 doc/ikiwiki/directive/ftemplate.mdwn

diff --git a/doc/ikiwiki/directive/ftemplate.mdwn b/doc/ikiwiki/directive/ftemplate.mdwn
new file mode 100644
index 000000000..3009fc830
--- /dev/null
+++ b/doc/ikiwiki/directive/ftemplate.mdwn
@@ -0,0 +1,106 @@
+The `ftemplate` directive is supplied by the [[!iki plugins/contrib/ftemplate desc=ftemplate]] plugin.
+
+This is like the [[ikiwiki/directive/template]] directive, with the addition
+that one does not have to provide all the values in the call to the template,
+because ftemplate can query structured data ("fields") using the
+[[plugins/contrib/field]] plugin.
+
+Templates are files that can be filled out and inserted into pages in
+the wiki, by using the ftemplate directive. The directive has an id
+parameter that identifies the template to use.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is in the /templates
+directory on the wiki.  These templates are wiki pages, and can be edited from
+the web like other wiki pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+### EXAMPLES
+
+#### Example 1
+
+PageA:
+
+    \[[!meta title="I Am Page A"]]
+    \[[!meta description="A is for Apple."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate"]]
+
+Template "mytemplate":
+
+    # <TMPL_VAR NAME="TITLE">
+    by <TMPL_VAR NAME="AUTHOR">
+
+    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
+
+This will give:
+
+    <h1>I Am Page A</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> A is for Apple.
+
+#### Example 2: Overriding values
+
+PageB:
+
+    \[[!meta title="I Am Page B"]]
+    \[[!meta description="B is for Banana."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
+
+This will give:
+
+    <h1>Bananananananas</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> B is for Banana.
+
+#### Example 3: Loops
+
+(this example uses the [[plugins/contrib/ymlfront]] plugin)
+
+Page C:
+
+    ---
+    BookAuthor: Georgette Heyer
+    BookTitle: Black Sheep
+    BookGenre:
+      - Historical
+      - Romance
+    ---
+    \[[ftemplate id="footemplate"]]
+
+    I like this book.
+
+Template "footemplate":
+
+    # <TMPL_VAR BOOKTITLE>
+    by <TMPL_VAR BOOKAUTHOR>
+
+    <TMPL_IF BOOKGENRE>(
+    <TMPL_LOOP GENRE_LOOP><TMPL_VAR BOOKGENRE>
+    <TMPL_UNLESS __last__>, </TMPL_UNLESS>
+    </TMPL_LOOP>
+    )</TMPL_IF>
+
+This will give:
+
+    <h1>Black Sheep</h1>
+    <p>by Georgette Heyer</p>
+
+    <p>(Historical, Romance)</p>
+
+    <p>I like this book.</p>
+
+### LIMITATIONS
+
+One cannot query the values of fields on pages other than the current
+page.  If you want to do that, check out the [[plugins/contrib/report]]
+plugin.
-- 
cgit v1.2.3


From cc84a2dacdc85e3ca8e5e652464bfd5ce4f0c725 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:25:43 +0000
Subject: new version; splitting docs between plugin and directive pages

---
 doc/plugins/contrib/report.mdwn | 154 ++--------------------------------------
 1 file changed, 7 insertions(+), 147 deletions(-)

diff --git a/doc/plugins/contrib/report.mdwn b/doc/plugins/contrib/report.mdwn
index c364d4a3a..0bd5392c6 100644
--- a/doc/plugins/contrib/report.mdwn
+++ b/doc/plugins/contrib/report.mdwn
@@ -1,157 +1,17 @@
 [[!template id=plugin name=report author="[[rubykat]]"]]
 [[!tag type/meta type/format]]
-[[!toc]]
-## NAME
-
 IkiWiki::Plugin::report - Produce templated reports from page field data.
 
-## SYNOPSIS
-
-    # activate the plugin
-    add_plugins => [qw{goodstuff report ....}],
-
-    \[[!report template="blog_summary"
-    pages="blog/*"
-    sort="mtime"]]
-
-## DESCRIPTION
-
-This plugin provides the **report** directive.  This enables one to report on
-the structured data ("field" values) of multiple pages; the output is formatted
-via a template.  This depends on the [[plugins/contrib/field]] plugin.
-
-The pages to report on are selected by a PageSpec given by the "pages"
-parameter.  The template is given by the "template" parameter.
-The template expects the data from a single page; it is applied
-to each matching page separately, one after the other.
-
-Additional parameters can be used to fill out the template, in
-addition to the "field" values.  Passed-in values override the
-"field" values.
-
-There are two places where template files can live.  One, as with the
-[[plugins/template]] plugin, is in the /templates directory on the wiki.  These
-templates are wiki pages, and can be edited from the web like other wiki
-pages.
-
-The second place where template files can live is in the global
-templates directory (the same place where the page.tmpl template lives).
-This is a useful place to put template files if you want to prevent
-them being edited from the web, and you don't want to have to make
-them work as wiki pages.
-
-## OPTIONS
-
-**template**: The template to use for the report.
-
-**pages**: A PageSpec to determine the pages to report on.
-
-**sort**: How the matching pages should be sorted.  Sorting criteria are separated by spaces.
-
-The possible values for sorting are:
-
-* **page**: Sort by the full page ID.
-* **pagename**: Sort by the base page name.
-* **pagename_natural**: Sort by the base page name, using Sort::Naturally if it is installed.
-* **mtime**: Sort by the page modification time.
-* **age**: Sort by the page creation time, newest first.
-
-Any other value is taken to be a field name to sort by.
-If a sort value begins with a minus (-) then the order for that field is reversed.
-
-### Headers
-
-An additional option is the "headers" option.  This is a space-separated
-list of field names which are to be used as headers in the report.  This
-is a way of getting around one of the limitations of HTML::Template, that
-is, not being able to do tests such as
-"if this-header is not equal to previous-header".
-
-Instead, that logic is performed inside the plugin.  The template is
-given parameters "HEADER1", "HEADER2" and so on, for each header.
-If the value of a header field is the same as the previous value,
-then HEADER**N** is set to be empty, but if the value of the header
-field is new, then HEADER**N** is given that value.
-
-#### Example
+This plugin provides the [[ikiwiki/directive/report]] directive.  This enables
+one to report on the structured data ("field" values) of multiple pages; the
+output is formatted via a template.  This depends on the
+[[plugins/contrib/field]] plugin.
 
-Suppose you're writing a blog in which you record "moods", and you
-want to display your blog posts by mood.
 
-    \[[!report template="mood_summary"
-    pages="blog/*"
-    sort="Mood Date title"
-    headers="Mood"]]
+## Activate the plugin
 
-The "mood_summary" template might be like this:
-
-    <TMPL_IF NAME="HEADER1">
-    ## <TMPL_VAR NAME="HEADER1">
-    </TMPL_IF>
-    ### <TMPL_VAR NAME="TITLE">
-    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
-    <TMPL_VAR NAME="DESCRIPTION">
-    
-### Advanced Options
-
-The following options are used to improve efficiency when dealing
-with large numbers of pages; most people probably won't need them.
-
-**trail**:
-
-A page or pages to use as a "trail" page.  When a trail page is used,
-the matching pages are limited to (a subset of) the pages which that
-page links to; the "pages" pagespec in this case, rather than selecting
-pages from the entire wiki, will select pages from within the set of pages
-given by the trail page.
-
-**doscan**:
-
-Whether this report should be called in "scan" mode; if it is, then
-the pages which match the pagespec are added to the list of links from
-this page.  This can be used by *another* report by setting this
-page to be a "trail" page in *that* report.
-It is not possible to use "trail" and "doscan" at the same time.
-By default, "doscan" is false.
-
-## TEMPLATE PARAMETERS
-
-The templates are in HTML::Template format, just as [[plugins/template]] and
-[[ftemplate]] are.  The parameters passed in to the template are as follows:
-
-***fields***:
-
-The structured data from the current matching page.  This includes
-"title" and "description" if they are defined.
-
-***common values***:
-
-Values known for all pages: "page", "destpage".  Also "basename" (the base name of the page).
-
-***passed-in values***:
-
-Any additional parameters to the report directive are passed to the
-template; a parameter will override the matching "field" value.
-For example, if you have a "Mood" field, and you pass Mood="bad" to
-the report, then that will be the Mood which is given for the whole
-report.
-
-Generally this is useful if one wishes to make a more generic
-template and hide or show portions of it depending on what
-values are passed in the report directive call.
-
-For example, one could have a "hide_mood" parameter which would hide
-the "Mood" section of your template when it is true, which one could
-use when the Mood is one of the headers.
-
-***headers***:
-
-See the section on Headers.
-
-***first and last***:
-
-If this is the first page-record in the report, then "first" is true.
-If this is the last page-record in the report, then "last" is true.
+    # activate the plugin
+    add_plugins => [qw{goodstuff report ....}],
 
 ## PREREQUISITES
 
-- 
cgit v1.2.3


From 136499da62f453f8eede16d564fae1e4788c63bf Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:27:19 +0000
Subject: new version; prev_, next_, here_only, and loops

---
 doc/ikiwiki/directive/report.mdwn | 148 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 doc/ikiwiki/directive/report.mdwn

diff --git a/doc/ikiwiki/directive/report.mdwn b/doc/ikiwiki/directive/report.mdwn
new file mode 100644
index 000000000..c6e70e960
--- /dev/null
+++ b/doc/ikiwiki/directive/report.mdwn
@@ -0,0 +1,148 @@
+The `report` directive is supplied by the [[!iki plugins/contrib/report desc=report]] plugin.
+
+This enables one to report on the structured data ("field" values) of
+multiple pages; the output is formatted via a template.  This depends
+on the [[plugins/contrib/field]] plugin.
+
+The pages to report on are selected by a PageSpec given by the "pages"
+parameter.  The template is given by the "template" parameter.
+The template expects the data from a single page; it is applied
+to each matching page separately, one after the other.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is in the
+/templates directory on the wiki.  These templates are wiki pages, and
+can be edited from the web like other wiki pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+## OPTIONS
+
+**template**: The template to use for the report.
+
+**pages**: A PageSpec to determine the pages to report on.
+
+**trail**: A page or pages to use as a "trail" page.
+
+When a trail page is used, the matching pages are limited to (a subset
+of) the pages which that page links to; the "pages" pagespec in this
+case, rather than selecting pages from the entire wiki, will select
+pages from within the set of pages given by the trail page.
+
+Additional space-separated trail pages can be given in this option.
+For example:
+
+    trail="animals/cats animals/dogs"
+
+This will take the links from both the "animals/cats" page and the
+"animals/dogs" page as the set of pages to apply the PageSpec to.
+
+**sort**: A SortSpec to determine how the matching pages should be sorted.
+
+**here_only**: Report on the current page only.
+
+This is useful in combination with "prev_" and "next_" variables to
+make a navigation trail.
+If the current page doesn't match the pagespec, then no pages will
+be reported on.
+
+### Headers
+
+An additional option is the "headers" option.  This is a space-separated
+list of field names which are to be used as headers in the report.  This
+is a way of getting around one of the limitations of HTML::Template, that
+is, not being able to do tests such as
+"if this-header is not equal to previous-header".
+
+Instead, that logic is performed inside the plugin.  The template is
+given parameters "HEADER1", "HEADER2" and so on, for each header.
+If the value of a header field is the same as the previous value,
+then HEADER**N** is set to be empty, but if the value of the header
+field is new, then HEADER**N** is given that value.
+
+#### Example
+
+Suppose you're writing a blog in which you record "moods", and you
+want to display your blog posts by mood.
+
+    \[[!report template="mood_summary"
+    pages="blog/*"
+    sort="Mood Date title"
+    headers="Mood"]]
+
+The "mood_summary" template might be like this:
+
+    <TMPL_IF NAME="HEADER1">
+    ## <TMPL_VAR NAME="HEADER1">
+    </TMPL_IF>
+    ### <TMPL_VAR NAME="TITLE">
+    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
+    <TMPL_VAR NAME="DESCRIPTION">
+    
+### Advanced Options
+
+The following options are used to improve efficiency when dealing
+with large numbers of pages; most people probably won't need them.
+
+**doscan**:
+
+Whether this report should be called in "scan" mode; if it is, then
+the pages which match the pagespec are added to the list of links from
+this page.  This can be used by *another* report by setting this
+page to be a "trail" page in *that* report.
+It is not possible to use "trail" and "doscan" at the same time.
+By default, "doscan" is false.
+
+## TEMPLATE PARAMETERS
+
+The templates are in HTML::Template format, just as [[plugins/template]] and
+[[ftemplate]] are.  The parameters passed in to the template are as follows:
+
+### Fields
+
+The structured data from the current matching page.  This includes
+"title" and "description" if they are defined.
+
+### Common values
+
+Values known for all pages: "page", "destpage".  Also "basename" (the
+base name of the page).
+
+### Passed-in values
+
+Any additional parameters to the report directive are passed to the
+template; a parameter will override the matching "field" value.
+For example, if you have a "Mood" field, and you pass Mood="bad" to
+the report, then that will be the Mood which is given for the whole
+report.
+
+Generally this is useful if one wishes to make a more generic
+template and hide or show portions of it depending on what
+values are passed in the report directive call.
+
+For example, one could have a "hide_mood" parameter which would hide
+the "Mood" section of your template when it is true, which one could
+use when the Mood is one of the headers.
+
+### Prev_ And Next_ Items
+
+Any of the above variables can be prefixed with "prev_" or "next_"
+and that will give the previous or next value of that variable; that is,
+the value from the previous or next page that this report is reporting on.
+This is mainly useful for a "here_only" report.
+
+### Headers
+
+See the section on Headers.
+
+### First and Last
+
+If this is the first page-record in the report, then "first" is true.
+If this is the last page-record in the report, then "last" is true.
-- 
cgit v1.2.3


From 3f5fce1091794521ea57f8ff7469441e4afb4a86 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:28:10 +0000
Subject: added toc

---
 doc/ikiwiki/directive/report.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwiki/directive/report.mdwn b/doc/ikiwiki/directive/report.mdwn
index c6e70e960..8f8e6b4e8 100644
--- a/doc/ikiwiki/directive/report.mdwn
+++ b/doc/ikiwiki/directive/report.mdwn
@@ -1,3 +1,4 @@
+[[!toc]]
 The `report` directive is supplied by the [[!iki plugins/contrib/report desc=report]] plugin.
 
 This enables one to report on the structured data ("field" values) of
-- 
cgit v1.2.3


From 2f7a909bbc0b58714bd2effd03f15d41ded77fcf Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:29:45 +0000
Subject: new version to go with new version of field

---
 doc/plugins/contrib/ymlfront.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/contrib/ymlfront.mdwn b/doc/plugins/contrib/ymlfront.mdwn
index f4438f23c..6dd8ed532 100644
--- a/doc/plugins/contrib/ymlfront.mdwn
+++ b/doc/plugins/contrib/ymlfront.mdwn
@@ -42,7 +42,7 @@ That will be htmlized using the page-type of the page-file.
 
 ### Accessing the Data
 
-There are three ways to access the data given in the YAML section.
+There are a few ways to access the data given in the YAML section.
 
 * [[getfield]] plugin
 
@@ -83,6 +83,10 @@ There are three ways to access the data given in the YAML section.
 
     	When running on the Sprongle system, the Foo function returns incorrect data.
 
+* [[report]] plugin
+
+  The **report** plugin is like the [[ftemplate]] plugin, but it reports on multiple pages, rather than just the current page.
+
 * write your own plugin
 
   In conjunction with the [[field]] plugin, you can write your own plugin to access the data.
-- 
cgit v1.2.3


From c1f68a8cff3217fb81052043d897b25aae677513 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:30:35 +0000
Subject: reply

---
 doc/plugins/contrib/ymlfront/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index 3ad02af29..b5c08fedd 100644
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -9,3 +9,5 @@ Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
 >> Sorry, I accidentally removed `field-etc` by pushing with `--mirror` from a
 >> different checkout. I've put it back; it's a branch from your `ikiplugins.git`,
 >> so yes, the code should be in `IkiWiki/Plugin`. --[[smcv]]
+
+>>> Done a while back, but now I've actually pushed to my repo. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 1bce0656755344977e020a985c4c06479f035f77 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:36:30 +0000
Subject: new versions which address some of these issues

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index a8ee6755c..3e9f8feaa 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -91,3 +91,13 @@ Where this approach is limiting is on the kind of data that is passed to (templa
 
 One possibility could be to have the `queries` configuration allow a hash mapping query names to functions that would transform the data. Lacking that possibility, we might have to leave some predefined fields to have custom Perl-side treatment and leave custom fields to be untransformable.
 
+-----
+
+I've now updated the [[plugins/contrib/field]] plugin to have:
+
+* arrays (multi-valued fields)
+* the "linkbase" option as mentioned above (called field_tags), where the linktype is the field name.
+
+I've also updated [[plugins/contrib/ftemplate]] and [[plugins/contrib/report]] to be able to use multi-valued fields, and [[plugins/contrib/ymlfront]] to correctly return multi-valued fields when they are requested.
+
+--[[KathrynAndersen]]
-- 
cgit v1.2.3


From 1fdab877d8233c0c49e78369a98e0f18147386ec Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Wed, 19 May 2010 21:04:34 +0000
Subject:

---
 doc/forum/debian_backports_update_someone_please.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index 66f5eb0c5..a1366872f 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -12,3 +12,5 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 >>> can take priority though. --[[Joey]] 
 
 >>>> Great! Thanks.
+
+>>>> Still not available in the backports; did you break the silence on the wire and got back to work [[Joey]]? 
-- 
cgit v1.2.3


From 70fca0592e08ac63a0c59e35aa43e0ae91b4ec75 Mon Sep 17 00:00:00 2001
From: tupyakov_vladimr <tupyakov_vladimr@web>
Date: Thu, 20 May 2010 09:33:51 +0000
Subject:

---
 doc/__126__tupyakov__95__vladimir.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/__126__tupyakov__95__vladimir.mdwn

diff --git a/doc/__126__tupyakov__95__vladimir.mdwn b/doc/__126__tupyakov__95__vladimir.mdwn
new file mode 100644
index 000000000..39ea90873
--- /dev/null
+++ b/doc/__126__tupyakov__95__vladimir.mdwn
@@ -0,0 +1 @@
+Dctv ghbdtn
-- 
cgit v1.2.3


From 04b83cf38c11d9947b0c452c586a58482163beba Mon Sep 17 00:00:00 2001
From: tupyakov_vladimr <tupyakov_vladimr@web>
Date: Thu, 20 May 2010 09:34:29 +0000
Subject:

---
 doc/tupyakov_vladimir.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/tupyakov_vladimir.mdwn

diff --git a/doc/tupyakov_vladimir.mdwn b/doc/tupyakov_vladimir.mdwn
new file mode 100644
index 000000000..95f85adc2
--- /dev/null
+++ b/doc/tupyakov_vladimir.mdwn
@@ -0,0 +1 @@
+всем привет!
-- 
cgit v1.2.3


From febfb1751c2cb3fb0826b76b55d86fb956d62466 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Thu, 20 May 2010 15:26:55 +0100
Subject: move tupyakov's page under users/ (says 'hello' in Russian), remove
 surplus page

---
 doc/__126__tupyakov__95__vladimir.mdwn | 1 -
 doc/tupyakov_vladimir.mdwn             | 1 -
 doc/users/tupyakov_vladimir.mdwn       | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 doc/__126__tupyakov__95__vladimir.mdwn
 delete mode 100644 doc/tupyakov_vladimir.mdwn
 create mode 100644 doc/users/tupyakov_vladimir.mdwn

diff --git a/doc/__126__tupyakov__95__vladimir.mdwn b/doc/__126__tupyakov__95__vladimir.mdwn
deleted file mode 100644
index 39ea90873..000000000
--- a/doc/__126__tupyakov__95__vladimir.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Dctv ghbdtn
diff --git a/doc/tupyakov_vladimir.mdwn b/doc/tupyakov_vladimir.mdwn
deleted file mode 100644
index 95f85adc2..000000000
--- a/doc/tupyakov_vladimir.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-всем привет!
diff --git a/doc/users/tupyakov_vladimir.mdwn b/doc/users/tupyakov_vladimir.mdwn
new file mode 100644
index 000000000..95f85adc2
--- /dev/null
+++ b/doc/users/tupyakov_vladimir.mdwn
@@ -0,0 +1 @@
+всем привет!
-- 
cgit v1.2.3


From 93385347a94c92fd74083e63f4b5aa5637580606 Mon Sep 17 00:00:00 2001
From: "http://jblevins.org/" <http://jblevins.org/@web>
Date: Fri, 21 May 2010 16:56:31 +0000
Subject: Revise/archive user page

---
 doc/users/jasonblevins.mdwn | 68 ++++++++++++++++-----------------------------
 1 file changed, 24 insertions(+), 44 deletions(-)

diff --git a/doc/users/jasonblevins.mdwn b/doc/users/jasonblevins.mdwn
index b50e4844a..e4a459e30 100644
--- a/doc/users/jasonblevins.mdwn
+++ b/doc/users/jasonblevins.mdwn
@@ -1,66 +1,46 @@
 [[!meta title="Jason Blevins"]]
 
-I'm currently hosting a private ikiwiki for keeping research notes
-which, with some patches and a plugin (below), will
-convert inline [[todo/LaTeX]] expressions to [[MathML]].  I'm working towards a
-patchset and instructions for others to do the same.
-
-I've setup a test ikiwiki [here](http://xbeta.org/colab/) where I've
-started keeping a few notes on my progress.  There is an example of
-inline [[todo/SVG]] on the homepage (note that the logo scales along with the
-font size).  There are a few example mathematical expressions in the
-[sandbox](http://xbeta.org/colab/sandbox/).  The MathML is generated
-automatically from inline LaTeX expressions using an experimental
-plugin I'm working on.
-
-My (also MathML-enabled) homepage: <http://jblevins.org/> (still using
-Blosxom...maybe one day I'll convert it to ikiwiki...)
-
-Current ikiwki issues of interest:
-
- * [[bugs/recentchanges_feed_links]]
- * [[bugs/HTML_inlined_into_Atom_not_necessarily_well-formed]]
- * [[plugins/toc/discussion]]
- * [[todo/BibTeX]]
- * [[todo/svg]]
- * [[todo/Option_to_make_title_an_h1?]]
- * [[bugs/SVG_files_not_recognized_as_images]]
+I am a former Ikiwiki user who wrote several plugins and patches
+related to MathML, [[SVG|todo/svg]], and [[todo/syntax highlighting]].
+Some related links and notes are archived below.
+
+Homepage: <http://jblevins.org/>
 
 ## Plugins
 
-These plugins are experimental.  Use them at your own risk.  Read the
-perldoc documentation for more details.  Patches and suggestions are
-welcome.
+The following [plugins](http://jblevins.org/projects/ikiwiki/)
+are no longer maintained, but please feel free to use, modify, and
+redistribute them.  Read the corresponding perldoc documentation for
+more details.
 
- * [mdwn_itex][] - Works with the [[`mdwn`|plugins/mdwn]] plugin to convert inline [[todo/LaTeX]]
-   expressions to [[MathML]] using `itex2MML`.
+ * [mdwn_itex][] - Works with the [[`mdwn`|plugins/mdwn]] plugin to convert
+   inline [[todo/LaTeX]] expressions to MathML using `itex2MML`.
 
  * [h1title][] - If present, use the leading level 1 Markdown header to
    set the page title and remove it from the page body.
 
  * [code][] - Whole file and inline code snippet [[todo/syntax highlighting]]
    via GNU Source-highlight.  The list of supported file extensions is
-   configurable.  There is also some preliminary [documentation][code-doc].
-   See the [FortranWiki](http://fortranwiki.org) for examples.
+   configurable.
 
- * [metamail][] - a plugin for loading metadata from [[email]]-style
+ * [metamail][] - a plugin for loading metadata from email-style
    headers at top of a file (e.g., `title: Page Title` or
    `date: November 2, 2008 11:14 EST`).
 
- * [pandoc][] - [[ikiwiki/Markdown]] page processing via [Pandoc](http://johnmacfarlane.net/pandoc/) (a Haskell library for converting from one markup format to another).  [[todo/LaTeX]] and
+ * [pandoc][] - [[ikiwiki/Markdown]] page processing via
+   [Pandoc](http://johnmacfarlane.net/pandoc/) (a Haskell library for
+   converting from one markup format to another).  [[todo/LaTeX]] and
    [[reStructuredText|plugins/rst]] are optional.
 
  * [path][] - Provides path-specific template conditionals such as
    `IS_HOMEPAGE` and `IN_DIR_SUBDIR`.
 
- [mdwn_itex]: http://code.jblevins.org/ikiwiki/plugins.git/plain/mdwn_itex.pm
- [h1title]: http://code.jblevins.org/ikiwiki/plugins.git/plain/h1title.pm
- [code]: http://code.jblevins.org/ikiwiki/plugins.git/plain/code.pm
- [code-doc]: http://code.jblevins.org/ikiwiki/plugins.git/plain/code.text
- [metamail]: http://code.jblevins.org/ikiwiki/plugins.git/plain/metamail.pm
- [pandoc]: http://code.jblevins.org/ikiwiki/plugins.git/plain/pandoc.pm
- [path]: http://code.jblevins.org/ikiwiki/plugins.git/plain/path.pm
-
+ [mdwn_itex]: http://jblevins.org/git/ikiwiki/plugins.git/plain/mdwn_itex.pm
+ [h1title]: http://jblevins.org/git/ikiwiki/plugins.git/plain/h1title.pm
+ [code]: http://jblevins.org/projects/ikiwiki/code
+ [metamail]: http://jblevins.org/git/ikiwiki/plugins.git/plain/metamail.pm
+ [pandoc]: http://jblevins.org/git/ikiwiki/plugins.git/plain/pandoc.pm
+ [path]: http://jblevins.org/git/ikiwiki/plugins.git/plain/path.pm
 
 ## MathML and SVG support
 
@@ -105,5 +85,5 @@ optimal solution is to force users to preview the page before saving.
 That way if someone introduces invalid XHTML then they can't save the
 page in the first place (unless they post directly to the right URL).
 
- [template-patch]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blobdiff;f=templates/page.tmpl;h=380ef699fa72223744eb5c1ee655fb79aa6bce5b;hp=9084ba7e11e92a10528b2ab12c9b73cf7b0f40a7;hb=416d5d1b15b94e604442e4e209a30dee4b77b684;hpb=ececf4fb8766a4ff7eff943b3ef600be81a0df49
- [cgi-patch]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=commitdiff;h=fa538c375250ab08f396634135f7d79fce2a9d36
+ [template-patch]: http://jblevins.org/git/ikiwiki.git/commit/?h=xbeta&id=416d5d1b15b94e604442e4e209a30dee4b77b684
+ [cgi-patch]: http://jblevins.org/git/ikiwiki.git/commit/?id=fa538c375250ab08f396634135f7d79fce2a9d36
-- 
cgit v1.2.3


From 6472302b8dc1fd0edd76ab3ac6d2e1f224e3cc40 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 21 May 2010 13:39:07 -0400
Subject: disable warnings when evaling setup files

In particular, perl warns if a qw{} contains a #, but openids can.

If the setup file has 'use warnings', it will turn warning messages back
on, so it seems reasonable to squelch them by default.
---
 IkiWiki/Setup.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 06102058b..ee5be95d2 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -33,6 +33,7 @@ sub load ($;$) {
 		if ($1) {
 			error sprintf(gettext("cannot load %s in safe mode"), $file)
 				if $safemode;
+			no warnings;
 			eval IkiWiki::possibly_foolish_untaint($content);
 			error("$file: ".$@) if $@;
 		}
-- 
cgit v1.2.3


From 9467b2176a31e6162ef76321278320eaeda0999c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 21 May 2010 13:53:20 -0400
Subject: yaml setup files

---
 doc/roadmap.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index cdec6e7e8..134ebcb7b 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -82,6 +82,8 @@ Probably incomplete list:
   Note that this is already done for wikis created by `auto-blog.setup`.
 * [[tips/html5]] on by default (some day..)
 * Remove support for old `.ikiwiki/comments_pending` from comment plugin.
+* Use yaml formatted setup files by default. (Not too compatability breaking
+  really.)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From 3d769f784983604fbf1acda472908c21473c0dfa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 21 May 2010 18:03:21 -0400
Subject: fix uninitalized value warning

---
 IkiWiki/Plugin/comments.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index f2cd8f90a..86b60a2b2 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -913,7 +913,7 @@ sub match_comment ($$;@) {
 	my $source=exists $IkiWiki::pagesources{$page} ?
 		$IkiWiki::pagesources{$page} :
 		$IkiWiki::delpagesources{$page};
-	my $type=IkiWiki::pagetype($source);
+	my $type=defined $source ? IkiWiki::pagetype($source) : undef;
 	if (! defined $type || $type ne "_comment") {
 		return IkiWiki::FailReason->new("$page is not a comment");
 	}
@@ -928,7 +928,7 @@ sub match_comment_pending ($$;@) {
 	my $source=exists $IkiWiki::pagesources{$page} ?
 		$IkiWiki::pagesources{$page} :
 		$IkiWiki::delpagesources{$page};
-	my $type=IkiWiki::pagetype($source);
+	my $type=defined $source ? IkiWiki::pagetype($source) : undef;
 	if (! defined $type || $type ne "_comment_pending") {
 		return IkiWiki::FailReason->new("$page is not a pending comment");
 	}
-- 
cgit v1.2.3


From 8f6f75204e4cc16183872fe4f0ae05097f5d43dc Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sat, 22 May 2010 07:05:28 +0000
Subject:

---
 doc/forum/debian_backports_update_someone_please.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index a1366872f..7102d12a1 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -14,3 +14,5 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 >>>> Great! Thanks.
 
 >>>> Still not available in the backports; did you break the silence on the wire and got back to work [[Joey]]? 
+
+>>>> I was blinded by my stupidity... thanks!
-- 
cgit v1.2.3


From 70d507bb81a49b49a6fe939d038923fbab8c8fb5 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jrojasr@integracionsocial.gov.co>
Date: Mon, 24 May 2010 20:10:32 -0500
Subject: new post - link completion in vim

---
 doc/forum/link_autocompletion_in_vim.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/forum/link_autocompletion_in_vim.mdwn

diff --git a/doc/forum/link_autocompletion_in_vim.mdwn b/doc/forum/link_autocompletion_in_vim.mdwn
new file mode 100644
index 000000000..e7caca745
--- /dev/null
+++ b/doc/forum/link_autocompletion_in_vim.mdwn
@@ -0,0 +1,17 @@
+I extended the functionality of the [ikiwiki-nav plugin](TODO)
+(see [[here|tips/follow_wikilinks_from_inside_vim]]) to allow completion of
+wikilinks from inside vim, through the omnicompletion mechanism.
+
+It still has some bugs, but is usable, and will not destroy your data. It can
+only complete links whose definition (text) is on a single line, and still can't
+handle "named links" (`[[text|link]]`).
+
+I'd love to hear suggestions for improvement for it, and bug reports ;) For
+example, regarding how are sorted and presented the available completions
+(dates, alphabetically, etc).
+
+You can find a tarball for it
+[here](http://devnull.li/~jerojasro/ikiwiki-nav-dev.tar.gz). To install it,
+extract the tarball contents in your `.vim` directory.
+
+--[[jerojasro]]
-- 
cgit v1.2.3


From 09793a2aafe3cdb153d5a202c09d8b6fedfab406 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jrojasr@integracionsocial.gov.co>
Date: Mon, 24 May 2010 20:14:05 -0500
Subject: typos  and missing link

---
 doc/forum/link_autocompletion_in_vim.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/forum/link_autocompletion_in_vim.mdwn b/doc/forum/link_autocompletion_in_vim.mdwn
index e7caca745..7d3ed8b02 100644
--- a/doc/forum/link_autocompletion_in_vim.mdwn
+++ b/doc/forum/link_autocompletion_in_vim.mdwn
@@ -1,10 +1,10 @@
-I extended the functionality of the [ikiwiki-nav plugin](TODO)
+I extended the functionality of the [ikiwiki-nav plugin](http://www.vim.org/scripts/script.php?script_id=2968)
 (see [[here|tips/follow_wikilinks_from_inside_vim]]) to allow completion of
 wikilinks from inside vim, through the omnicompletion mechanism.
 
 It still has some bugs, but is usable, and will not destroy your data. It can
 only complete links whose definition (text) is on a single line, and still can't
-handle "named links" (`[[text|link]]`).
+handle "named links" (`\[\[text|link\]\]`).
 
 I'd love to hear suggestions for improvement for it, and bug reports ;) For
 example, regarding how are sorted and presented the available completions
-- 
cgit v1.2.3


From 73d7635bcbf4fe48527697e61481e32b8ac99a5e Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 12:12:57 +0000
Subject: Removed redundant "configure'

---
 doc/setup.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 3ea0022cc..03fed3aa9 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -47,7 +47,7 @@ Now you can go to the url it told you, and edit pages in your new wiki
 using the web interface.
 
 (If the web interface doesn't seem to allow editing or login, you may
-need to configure [[configure_the_web_server|tips/dot_cgi]].)
+need to [[configure_the_web_server|tips/dot_cgi]].)
 
 ## Checkout and edit wiki source
 
-- 
cgit v1.2.3


From a3ae4ebe55ec4cc0a46aa159e5b2447d888a1bf9 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 15:24:08 +0000
Subject: Added example.

---
 doc/ikiwiki-makerepo.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn
index 9e742c211..d21beb2e5 100644
--- a/doc/ikiwiki-makerepo.mdwn
+++ b/doc/ikiwiki-makerepo.mdwn
@@ -24,6 +24,14 @@ ikiwiki wrapper.
 Note that for monotone, you are assumed to already have run "mtn genkey"
 to generate a key.
 
+
+# EXAMPLE 
+
+ikiwiki-makerepo git /var/www/wiki /home/user/wiki/
+
+The above command creates a new git repo in /home/user/wiki as well as a new git repo in the /var/www/wiki directory. 
+It then initializes the /home/user/wiki git repo and makes the /var/www/wiki a clone. 
+
 # AUTHOR
 
 Joey Hess <joey@ikiwiki.info>
-- 
cgit v1.2.3


From de7197d9923fa789896be735ce0da40cba3adaea Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 15:24:54 +0000
Subject: Code formatting.

---
 doc/ikiwiki-makerepo.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn
index d21beb2e5..acb1211de 100644
--- a/doc/ikiwiki-makerepo.mdwn
+++ b/doc/ikiwiki-makerepo.mdwn
@@ -27,7 +27,7 @@ to generate a key.
 
 # EXAMPLE 
 
-ikiwiki-makerepo git /var/www/wiki /home/user/wiki/
+`ikiwiki-makerepo git /var/www/wiki /home/user/wiki/`
 
 The above command creates a new git repo in /home/user/wiki as well as a new git repo in the /var/www/wiki directory. 
 It then initializes the /home/user/wiki git repo and makes the /var/www/wiki a clone. 
-- 
cgit v1.2.3


From 37a4cf13744ee6e96338409fe1e35debeee91f4d Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 15:26:13 +0000
Subject:

---
 doc/ikiwiki-makerepo/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/ikiwiki-makerepo/discussion.mdwn

diff --git a/doc/ikiwiki-makerepo/discussion.mdwn b/doc/ikiwiki-makerepo/discussion.mdwn
new file mode 100644
index 000000000..0b844adb5
--- /dev/null
+++ b/doc/ikiwiki-makerepo/discussion.mdwn
@@ -0,0 +1 @@
+Not sure how well I described. :-/ -- Jeremiah
-- 
cgit v1.2.3


From 3a868b6e7a53b8d6830cc0e51c967d3fb1045f81 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 15:26:34 +0000
Subject:

---
 doc/ikiwiki-makerepo/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki-makerepo/discussion.mdwn b/doc/ikiwiki-makerepo/discussion.mdwn
index 0b844adb5..660823fbb 100644
--- a/doc/ikiwiki-makerepo/discussion.mdwn
+++ b/doc/ikiwiki-makerepo/discussion.mdwn
@@ -1 +1 @@
-Not sure how well I described. :-/ -- Jeremiah
+Not sure how well I described the example. :-/ -- Jeremiah
-- 
cgit v1.2.3


From c5b3ea0dd418dc1f9bb313a2e9be9d3a1b5c379e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 27 May 2010 23:57:00 -0400
Subject: avoid insane use of javascript "array"

---
 underlays/javascript/ikiwiki/relativedate.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/underlays/javascript/ikiwiki/relativedate.js b/underlays/javascript/ikiwiki/relativedate.js
index 5142332f1..2a270d627 100644
--- a/underlays/javascript/ikiwiki/relativedate.js
+++ b/underlays/javascript/ikiwiki/relativedate.js
@@ -32,13 +32,13 @@ function showDates() {
 	setTimeout(showDates,30000); // keep updating every 30s
 }
 
-var timeUnits = new Array;
-timeUnits['minute'] = 60;
-timeUnits['hour'] = timeUnits['minute'] * 60;
-timeUnits['day'] = timeUnits['hour'] * 24;
-timeUnits['month'] = timeUnits['day'] * 30;
-timeUnits['year'] = timeUnits['day'] * 364;
-var timeUnitOrder = ['year', 'month', 'day', 'hour', 'minute'];
+var timeUnits = [
+	{ unit: 'year',		seconds: 60 * 60 * 24 * 364 },
+	{ unit: 'month',	seconds: 60 * 60 * 24 * 30 },
+	{ unit: 'day',		seconds: 60 * 60 * 24 },
+	{ unit: 'hour',		seconds: 60 * 60 },
+	{ unit: 'minute',	seconds: 60 },
+];
 
 function relativeDate(date) {
 	var now = new Date();
@@ -47,20 +47,19 @@ function relativeDate(date) {
 
 	// hack to avoid reading just in the future if there is a minor
 	// amount of clock slip
-	if (offset >= 0 && seconds < 30 * timeUnits['minute']) {
+	if (offset >= 0 && seconds < 30 * 60 * 60) {
 		return "just now";
 	}
 
 	var ret = "";
 	var shown = 0;
-	for (i = 0; i < timeUnitOrder.length; i++) {
-		var unit = timeUnitOrder[i];
-		if (seconds >= timeUnits[unit]) {
-			var num = Math.floor(seconds / timeUnits[unit]);
-			seconds -= num * timeUnits[unit];
+	for (i = 0; i < timeUnits.length; i++) {
+		if (seconds >= timeUnits[i].seconds) {
+			var num = Math.floor(seconds / timeUnits[i].seconds);
+			seconds -= num * timeUnits[i].seconds;
 			if (ret)
 				ret += "and ";
-			ret += num + " " + unit + (num > 1 ? "s" : "") + " ";
+			ret += num + " " + timeUnits[i].unit + (num > 1 ? "s" : "") + " ";
 
 			if (++shown == 2)
 				break;
-- 
cgit v1.2.3


From c9a6b91c5528882be6574e46b2f9eee937fe0616 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmC_nMjWfriv8nVMOwnvYhgmzwvVP4OVjU"
 <https://www.google.com/accounts/o8/id?id=AItOawmC_nMjWfriv8nVMOwnvYhgmzwvVP4OVjU@web>
Date: Fri, 28 May 2010 09:01:29 +0000
Subject: delete me

---
 ...267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 "doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"

diff --git "a/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" "b/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
new file mode 100644
index 000000000..05f17c8f3
--- /dev/null
+++ "b/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
@@ -0,0 +1 @@
+主要看看url如何显示。
-- 
cgit v1.2.3


From 052887296570bd8e4750862293fd36424f153fbd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 28 May 2010 06:17:57 -0400
Subject: Revert "delete me"

---
 ...267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 "doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"

diff --git "a/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" "b/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
deleted file mode 100644
index 05f17c8f3..000000000
--- "a/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
+++ /dev/null
@@ -1 +0,0 @@
-主要看看url如何显示。
-- 
cgit v1.2.3


From 1cac22523718596a272ecf39c1ba309306f0177b Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawkyQYf6i3PckNGm2TOHxWCr_xTfcjhMRlA"
 <https://www.google.com/accounts/o8/id?id=AItOawkyQYf6i3PckNGm2TOHxWCr_xTfcjhMRlA@web>
Date: Sat, 29 May 2010 17:20:15 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index cd0550ea8..fc66bcef9 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -134,6 +134,7 @@ Personal sites and blogs
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 * [Nico Schottelius' homepage](http://www.nico.schottelius.org)
 * [Andreas Zwinkaus homepage](http://beza1e1.tuxen.de)
+* [Salient Dream](http://salient.dre.am)
 * [Walden Effect](http://waldeneffect.org)
 * [Avian Aqua Miser](http://www.avianaquamiser.com/)
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
-- 
cgit v1.2.3


From 1b6aa2276e22be2fa7adbca07545f87e248eaf2d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 31 May 2010 20:46:12 -0400
Subject: creation_day() etc use local time, not gmtime.

To match calendars, which use local time. Particularly important at
the end of the month.

I checked the history, and there seemed no good rationalle for the
pagespecs to use gmtime.
---
 IkiWiki.pm       | 6 +++---
 debian/changelog | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0f28801a6..e2a3d216f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2463,7 +2463,7 @@ sub match_created_after ($$;@) {
 }
 
 sub match_creation_day ($$;@) {
-	if ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift) {
+	if ((localtime($IkiWiki::pagectime{shift()}))[3] == shift) {
 		return IkiWiki::SuccessReason->new('creation_day matched');
 	}
 	else {
@@ -2472,7 +2472,7 @@ sub match_creation_day ($$;@) {
 }
 
 sub match_creation_month ($$;@) {
-	if ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
+	if ((localtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
 		return IkiWiki::SuccessReason->new('creation_month matched');
 	}
 	else {
@@ -2481,7 +2481,7 @@ sub match_creation_month ($$;@) {
 }
 
 sub match_creation_year ($$;@) {
-	if ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
+	if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
 		return IkiWiki::SuccessReason->new('creation_year matched');
 	}
 	else {
diff --git a/debian/changelog b/debian/changelog
index 28dc1b176..0a7d17eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100518.3) UNRELEASED; urgency=low
+
+  * creation_day() etc use local time, not gmtime. To match calendars, which
+    use local time.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
+
 ikiwiki (3.20100518.2) unstable; urgency=low
 
   * Fix a typo in the last release.
-- 
cgit v1.2.3


From 8a86537e74cd4a8cdfaf4eb8dd7eeb7262b37c98 Mon Sep 17 00:00:00 2001
From: "https://me.yahoo.com/a/GW5gpVY2rtV75mSWRhA0MUVlKe.y846L#d4eeb"
 <https://me.yahoo.com/a/GW5gpVY2rtV75mSWRhA0MUVlKe.y846L#d4eeb@web>
Date: Wed, 2 Jun 2010 05:26:09 +0000
Subject: Just trying an edit.

---
 doc/sandbox.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1c746c190..de0eaa692 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -16,6 +16,8 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 >
 > Back to the first level.
 
+"I'm sitting in the middle of a rather muddy puddle."
+
 Numbered list 
 
 1. First item.
-- 
cgit v1.2.3


From dd10c2fddda92762070abadcdce923c0affa6bb3 Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <http://weakish.myopenid.com/@web>
Date: Thu, 3 Jun 2010 10:21:36 +0000
Subject: The script uses the [BeautifulSoup][] module.

---
 doc/tips/Importing_posts_from_Wordpress.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn
index ecc6ae505..af8e4005d 100644
--- a/doc/tips/Importing_posts_from_Wordpress.mdwn
+++ b/doc/tips/Importing_posts_from_Wordpress.mdwn
@@ -4,6 +4,10 @@ Use case: You want to move away from Wordpress to Ikiwiki as your blogging/websi
 
 WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned.
 
+The script uses the [BeautifulSoup][] module.
+
+[BeautifulSoup]: http://www.crummy.com/software/BeautifulSoup/
+
 -----
 
 I include a modified version of this script. This version includes the ability to write \[[!tag foo]] directives, which the original intended, but didn't actually do.
-- 
cgit v1.2.3


From f0f4073a17cf8a860cf7b04a2157a89e72ae0be2 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0"
 <https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0@web>
Date: Mon, 7 Jun 2010 03:34:34 +0000
Subject: add bug about locale dependance of plugins/relativedate

---
 .../plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn     | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn

diff --git a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
new file mode 100644
index 000000000..1f4dc8e2d
--- /dev/null
+++ b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
@@ -0,0 +1,3 @@
+[[plugins/relativedate]] does not works when russian locale defined at setup file (locale => 'ru_RU.UTF-8'). This is happen because javascript for this plugin takes either elements title or content itself. If russian locale is turned on then title generated on russian language and JS can't convert it into Date object. innerHTML is language independent (YYYY-MM-DD HH:mm) always.
+
+If I switch locale to en_US.UTF-8 then this plugin correctly parses text date and print relative date. But when I mouseover on date I see unusual formating of the date (it uses AM/PM format while russians use 24-h notation).
-- 
cgit v1.2.3


From 75cae954cf4c244d9f7a8c5c9ef20d57fee10a2f Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0"
 <https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0@web>
Date: Mon, 7 Jun 2010 03:39:14 +0000
Subject: Add note about date formating

---
 doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
index 1f4dc8e2d..db009fa19 100644
--- a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
+++ b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
@@ -1,3 +1,5 @@
 [[plugins/relativedate]] does not works when russian locale defined at setup file (locale => 'ru_RU.UTF-8'). This is happen because javascript for this plugin takes either elements title or content itself. If russian locale is turned on then title generated on russian language and JS can't convert it into Date object. innerHTML is language independent (YYYY-MM-DD HH:mm) always.
 
 If I switch locale to en_US.UTF-8 then this plugin correctly parses text date and print relative date. But when I mouseover on date I see unusual formating of the date (it uses AM/PM format while russians use 24-h notation).
+
+P.S. All pages but RecentChanges show well-formated date. RecentChanges show date formated using locale. Anyway, plugin does not work without en_US locale.
-- 
cgit v1.2.3


From 3fb80f3900ce116d8c2c240afb5d70151b5cfbd6 Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Mon, 7 Jun 2010 13:32:45 +0000
Subject:

---
 doc/templates/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn
index 220d36455..96e6ea25f 100644
--- a/doc/templates/discussion.mdwn
+++ b/doc/templates/discussion.mdwn
@@ -6,3 +6,11 @@ note and popups are templates? But they're not in the templates directory, and i
 > your personal wiki sources. The note and popup template pages are
 > installed there, typically in `/usr/share/ikiwiki/basewiki/templates/`
 > --[[Joey]]
+
+
+Is there a list of the TMPL_VAR-Variables that are defined by ikiwiki?
+
+What I'm trying to achieve is to print the URL of every page on the page itself and therefore I would need the corresponding value in the Template.
+
+Am I missing something?  --[[jwalzer]]
+
-- 
cgit v1.2.3


From 8496dd9fb405eda149995615ead0a94a83298b91 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 7 Jun 2010 13:40:55 +0000
Subject:

---
 doc/templates/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn
index 96e6ea25f..4ddc48ac3 100644
--- a/doc/templates/discussion.mdwn
+++ b/doc/templates/discussion.mdwn
@@ -14,3 +14,6 @@ What I'm trying to achieve is to print the URL of every page on the page itself
 
 Am I missing something?  --[[jwalzer]]
 
+> If there isn't a suitable variable (I don't think there is a list at
+> the moment), a [[plugin|plugins/write]] to add one would be about 10
+> lines of perl - you'd just need to define a `pagetemplate` hook. --[[smcv]]
-- 
cgit v1.2.3


From 1567fbe4eedeedebe129d76ddcd656c733ba7cf4 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Mon, 7 Jun 2010 15:10:04 +0000
Subject:

---
 doc/sandbox/sidebar.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/sandbox/sidebar.mdwn

diff --git a/doc/sandbox/sidebar.mdwn b/doc/sandbox/sidebar.mdwn
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/doc/sandbox/sidebar.mdwn
@@ -0,0 +1 @@
+test
-- 
cgit v1.2.3


From a93db71eb66aa486d22de6f0271d693550d438f0 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Mon, 7 Jun 2010 15:13:43 +0000
Subject: test sidebar content

---
 doc/sandbox.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index de0eaa692..230152fc9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,3 +1,10 @@
+[[!sidebar  content="""
+This is my custom sidebar for this page.
+
+\[[!calendar pages="posts/*"]]
+"""]]
+
+
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
 [[Testing 1 2 3| test]]
-- 
cgit v1.2.3


From f40c6f6557e5d37c433e3398e68dcf1428d23070 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Mon, 7 Jun 2010 15:23:58 +0000
Subject:

---
 doc/sandbox.mdwn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 230152fc9..6e9cfe48e 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,8 +1,4 @@
-[[!sidebar  content="""
-This is my custom sidebar for this page.
-
-\[[!calendar pages="posts/*"]]
-"""]]
+[[!sidebar]]
 
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
-- 
cgit v1.2.3


From b10d353490197b576ef7bf2e8bf8016039efbd2d Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Tue, 8 Jun 2010 00:09:20 +0000
Subject:

---
 doc/forum/formating:_how_to_align_text_to_the_right.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/formating:_how_to_align_text_to_the_right.mdwn

diff --git a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
new file mode 100644
index 000000000..832a8cea3
--- /dev/null
+++ b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
@@ -0,0 +1 @@
+as in title, how to align text to the right?
-- 
cgit v1.2.3


From 9dd91b393da6fa4aa48eb8e7d722afcd28de4690 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Tue, 8 Jun 2010 09:21:43 +0000
Subject: File issue.

---
 .../Git:_changed_behavior_w.r.t._timestamps.mdwn   | 180 +++++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn

diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
new file mode 100644
index 000000000..5d5b9fc23
--- /dev/null
+++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
@@ -0,0 +1,180 @@
+After some months, I just updated my local ikiwiki sources, and rebuilt
+the Hurd web pages, <http://git.savannah.gnu.org/cgit/hurd/web.git/>.
+
+I was confused, having switched to the new automatic (thanks!) --gettime
+mechanism, why on some pages the timestamps had changed compared to my
+previous use of --getctime and setting files' mtimes (using a script)
+according to the last Git commit.  For example:
+
+community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.html
+
+old:
+
+    Last edited <span class="date">2008-09-11 18:11:53 UTC</span>
+    <!-- Created <span class="date">2008-09-11 17:47:08 UTC</span> -->
+
+new:
+
+    Last edited <span class="date">2008-09-11 18:12:22 UTC</span>
+    <!-- Created <span class="date">2008-09-11 17:47:50 UTC</span> -->
+
+
+I had a look at what git.pm is doing, and began to manually replay /
+investigate:
+
+    $ git log --pretty=fuller --name-only --relative -- community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    commit 8f1b97bfe45b2f173e3a7d55dee226a9e289a695
+    Author:     arnebab <arne_bab@web.de>
+    AuthorDate: Thu Sep 11 20:11:53 2008 +0200
+    Commit:     arnebab <arne_bab@web.de>
+    CommitDate: Thu Sep 11 20:11:53 2008 +0200
+    
+        Added a link to the X.org guide in this wiki.
+    
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    commit 3ef8b7d80d80572c436c4c60c71879bc74409816
+    Author:     arnebab <arne_bab@web.de>
+    AuthorDate: Thu Sep 11 19:47:08 2008 +0200
+    Commit:     arnebab <arne_bab@web.de>
+    CommitDate: Thu Sep 11 19:47:08 2008 +0200
+    
+        Minor update on the enty trying to get X working -> 'watch this place for updates'
+    
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+
+OK, these are my old dates.
+
+    $ git log --pretty=format:%ci --name-only --relative -- community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn 
+    2008-09-11 20:11:53 +0200
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    2008-09-11 19:47:08 +0200
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    $ git log --pretty=format:%ct --name-only --relative -- community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn 
+    1221156713
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    1221155228
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    $ date -d @1221156713
+    Thu Sep 11 18:11:53 UTC 2008
+    $ date -d @1221155228
+    Thu Sep 11 17:47:08 UTC 2008
+
+That's all consistent.
+
+
+But:
+
+    $ perl -le 'use Storable; my $index=Storable::retrieve("indexdb"); use Data::Dumper; print Dumper $index'
+    [...]
+                          'community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn' => {
+                                                                                        'ctime' => '1221155270',
+                                                                                        'dest' => [
+                                                                                                    'community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.html'
+                                                                                                  ],
+                                                                                        'typedlinks' => {
+                                                                                                          'tag' => {}
+                                                                                                        },
+                                                                                        'mtime' => 1221156742,
+                                                                                        'depends_simple' => {
+                                                                                                              'sidebar' => 1
+                                                                                                            },
+                                                                                        'links' => [
+                                                                                                     'community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x/discussion',
+                                                                                                     'Hurd/DebianXorg'
+                                                                                                   ],
+                                                                                        'state' => {
+    [...]
+
+    $ date -d @1221156742
+    Thu Sep 11 18:12:22 UTC 2008
+    $ date -d @1221155270
+    Thu Sep 11 17:47:50 UTC 2008
+
+That's different, and it matches what the new ikiwiki writes into the
+HTML file.
+
+
+Back to Git again, this time without specifying the file:
+
+    $ git log --pretty=format:%ct --name-only --relative
+    [...]
+    1221255713
+    1221255655
+    unsorted/PortingIssues.mdwn
+    
+    1221156742 [Thu Sep 11 18:12:22 UTC 2008]
+    1221156713 [Thu Sep 11 18:11:53 UTC 2008]
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    1221156267
+    1221156235
+    index.mdwn
+    
+    1221156122
+    1221156091
+    index.mdwn
+    
+    1221155942
+    1221155910
+    index.mdwn
+    
+    1221155270 [Thu Sep 11 17:47:50 UTC 2008]
+    1221155228 [Thu Sep 11 17:47:08 UTC 2008]
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    1221154986
+    community/gsoc.mdwn
+    community/gsoc/project_ideas.mdwn
+    
+    1221147244
+    whatsnew.html
+    [...]
+
+Aha!
+
+... and some more detail:
+
+    $ git log --pretty=fuller --name-only --relative
+    [...]
+    commit e4e89e1683012c879012522105a3471a00714613
+    Author:     Samuel Thibault <samuel.thibault@ens-lyon.org>
+    AuthorDate: Fri Sep 12 23:40:55 2008 +0200
+    Commit:     Samuel Thibault <samuel.thibault@ens-lyon.org>
+    CommitDate: Fri Sep 12 23:40:55 2008 +0200
+    
+        MSG_NOSIGNAL and IPV6_PKTINFO got fixed
+    
+    unsorted/PortingIssues.mdwn
+    
+    commit c389fae98dff86527be62f895ff7272e4ab1932c
+    Merge: 0339e3e 8f1b97b
+    Author:     GNU Hurd wiki engine <web-hurd@gnu.org>
+    AuthorDate: Thu Sep 11 18:12:22 2008 +0000
+    Commit:     GNU Hurd wiki engine <web-hurd@gnu.org>
+    CommitDate: Thu Sep 11 18:12:22 2008 +0000
+    
+        Merge branch 'master' of wiki@192.168.10.50:wiki
+    
+    commit 8f1b97bfe45b2f173e3a7d55dee226a9e289a695
+    Author:     arnebab <arne_bab@web.de>
+    AuthorDate: Thu Sep 11 20:11:53 2008 +0200
+    Commit:     arnebab <arne_bab@web.de>
+    CommitDate: Thu Sep 11 20:11:53 2008 +0200
+    
+        Added a link to the X.org guide in this wiki.
+    
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    [...]
+
+So, merges are involved there.
+
+What (the new) ikiwiki code does, is use the timestamp when the merge was
+done instead of the timestamp when the commit was done.  Is this
+intentional?  Otherwise I could supply a patch.
+
+--[[tschwinge]]
-- 
cgit v1.2.3


From 2513f0ea6b65e1b866c01647454062ceb6bbfb7d Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Tue, 8 Jun 2010 09:23:05 +0000
Subject: File issue.

---
 doc/bugs/pagemtime_in_refresh_mode.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 doc/bugs/pagemtime_in_refresh_mode.mdwn

diff --git a/doc/bugs/pagemtime_in_refresh_mode.mdwn b/doc/bugs/pagemtime_in_refresh_mode.mdwn
new file mode 100644
index 000000000..97146f805
--- /dev/null
+++ b/doc/bugs/pagemtime_in_refresh_mode.mdwn
@@ -0,0 +1,14 @@
+I'd like a way to always ask the RCS (Git) to update a file's mtime in
+refresh mode.  This is currently only done on the first build, and later
+for `--gettime --rebuild`.  But always rebuilding is too heavy-weight for
+this use-case.  My options are to either manually set the mtime before
+refreshing, or to have ikiwiki do it at command.  I used to do the
+former, but would now like the latter, as ikiwiki now generally does this
+timestamp handling.
+
+From a quick look, the code in `IkiWiki/Render.pm:find_new_files` is
+relevant: `if (! $pagemtime{$page}) { [...]`.
+
+How would you like to tackle this?
+
+--[[tschwinge]]
-- 
cgit v1.2.3


From 9a18ea18e3ee0b5bbc0a20a075862af14f5860ad Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Tue, 8 Jun 2010 10:06:47 +0000
Subject: File issue.

---
 doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn

diff --git a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
new file mode 100644
index 000000000..8678249bb
--- /dev/null
+++ b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
@@ -0,0 +1,3 @@
+The autotag functionality of the tag plugin committed (when doing its
+first commit) all changes that have been staged (in Git).  I suggest it
+should be restricted to the specific file only.  --[[tschwinge]]
-- 
cgit v1.2.3


From cc6ead1d81eacc75914eedb49c8773d6624cca33 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Tue, 8 Jun 2010 14:04:00 +0000
Subject: File issue.

---
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn

diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
new file mode 100644
index 000000000..c29eb994f
--- /dev/null
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -0,0 +1,10 @@
+With the current HEAD (b10d353490197b576ef7bf2e8bf8016039efbd2d),
+globbing in `tagged()` pagespecs doesn't work for me.  For example,
+`tagged(*)` doesn't match any pages.  (It does in this wiki installation
+here, though.)
+
+I did not yet do any testing to figure out when this broke.
+
+--[[tschwinge]]
+
+[[!map pages="*/a* and tagged(*ose)"]]
-- 
cgit v1.2.3


From 2be6660a8f3f523905e7c0ba4c36f579ed0d2493 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 14:43:21 -0400
Subject: response

---
 doc/bugs/pagemtime_in_refresh_mode.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/bugs/pagemtime_in_refresh_mode.mdwn b/doc/bugs/pagemtime_in_refresh_mode.mdwn
index 97146f805..f926ec86c 100644
--- a/doc/bugs/pagemtime_in_refresh_mode.mdwn
+++ b/doc/bugs/pagemtime_in_refresh_mode.mdwn
@@ -12,3 +12,17 @@ relevant: `if (! $pagemtime{$page}) { [...]`.
 How would you like to tackle this?
 
 --[[tschwinge]]
+
+> This could be done via a `needsbuild` hook. The hook is passed 
+> the list of changed files, and it should be safe to call `rcs_getmtime`
+> and update the `pagemtime` for each.
+> 
+> That lets the feature be done by a plugin, which seems good, since
+> `rcs_getmtime` varies between very slow and not very fast, depending on 
+> VCS.
+> 
+> AFAICS, the only use case for doing this is if you commit changes and
+> then delay pushing them to a DVCS repo. Since then the file mtime will
+> be when the change was pushed, not when it was committed. But I've
+> generally felt that recording when a change was published to the repo
+> of a wiki as its mtime is good enough. --[[Joey]] 
-- 
cgit v1.2.3


From c911b4b998992a69b5eea167658fb00c52a064a1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 14:46:54 -0400
Subject: response

---
 doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
index 5d5b9fc23..6abe203a3 100644
--- a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
+++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
@@ -178,3 +178,12 @@ done instead of the timestamp when the commit was done.  Is this
 intentional?  Otherwise I could supply a patch.
 
 --[[tschwinge]]
+
+> In order to be nice and fast, the git backend runs git log once
+> and records data for all files. Rather than looking at the log for a
+> given file. So amoung other things, it does not follow renames.
+> 
+> AFAICS, git log only shows merges modifying files if it was a conflicted
+> merge. As the file is then actually modified to resolve the merge
+> I think it makes sense to count the merge as the last modification in
+> that case. --[[Joey]] 
-- 
cgit v1.2.3


From 868f5a94bfdf03ccb720d561cf99185d7182cb77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 14:50:24 -0400
Subject: response

---
 doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
index 8678249bb..2419cf75f 100644
--- a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
+++ b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
@@ -1,3 +1,14 @@
 The autotag functionality of the tag plugin committed (when doing its
 first commit) all changes that have been staged (in Git).  I suggest it
 should be restricted to the specific file only.  --[[tschwinge]]
+
+> This is not specific to the tag plugin. Same can happen
+> if you rename a file, or post a comment, or remove a file
+> via web interface. All of these use `rcs_commit_staged`.
+> 
+> This is why ikiwiki is supposed to have a checkout of 
+> the repository that it uses for its own purposes, and nobody else
+> should mess with. There are various notes about that being needed here
+> and there; you're free to not give ikiwiki its own repo, but you have to
+> be aware that it can fight with you if you're making changes to the same
+> repo. [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 73bb42ccf0e3240f8fecc9a543bfff435bb27a02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 14:53:22 -0400
Subject: response

---
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index c29eb994f..76bf740fb 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -8,3 +8,9 @@ I did not yet do any testing to figure out when this broke.
 --[[tschwinge]]
 
 [[!map pages="*/a* and tagged(*ose)"]]
+
+> Are you sure that `tagged()` ever matches pages there? Take globbing
+> out of the equasion.
+> 
+> This could be as simple as you having not rebuilt the wiki 
+> on upgrade to the version that tracks tagged links. --[[Joey]]
-- 
cgit v1.2.3


From 7f3c809fe8c9691a54cb065f0e331c7d041ed611 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 15:00:58 -0400
Subject: response

---
 doc/forum/formating:_how_to_align_text_to_the_right.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
index 832a8cea3..0b3343649 100644
--- a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
+++ b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
@@ -1 +1,13 @@
 as in title, how to align text to the right?
+
+> Add to your local.css a class that aligns text to the right:
+
+	.alignright { text-align: right; }
+
+> And then you just just use `<span class="alignright">` around
+> other html.
+> 
+> You can refine that, and allow right-aligning markdowned text
+> by using the [[ikiwiki/directive/template]]
+> directive, with a template that contains the html. The 
+> [[templates/note]] template does something similar. --[[Joey]]
-- 
cgit v1.2.3


From ee11d4ca8f7ba9bf9c5d5d0cb4bca60a52b0272e Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Tue, 8 Jun 2010 23:23:32 +0000
Subject:

---
 doc/forum/formating:_how_to_align_text_to_the_right.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
index 0b3343649..2b56bd70b 100644
--- a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
+++ b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
@@ -11,3 +11,5 @@ as in title, how to align text to the right?
 > by using the [[ikiwiki/directive/template]]
 > directive, with a template that contains the html. The 
 > [[templates/note]] template does something similar. --[[Joey]]
+
+>> Thanks!
-- 
cgit v1.2.3


From 8028a900302fe5cf73a1f11ab372ed07d88f01c9 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Tue, 8 Jun 2010 23:30:28 +0000
Subject:

---
 doc/forum/img_plugin_and_missing_heigth_value.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/img_plugin_and_missing_heigth_value.mdwn

diff --git a/doc/forum/img_plugin_and_missing_heigth_value.mdwn b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
new file mode 100644
index 000000000..5fbae6272
--- /dev/null
+++ b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
@@ -0,0 +1 @@
+When I set up my picture page with `[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
-- 
cgit v1.2.3


From 3da443396accdc3996a6601b3059ea7c9ad0d780 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Tue, 8 Jun 2010 23:31:22 +0000
Subject:

---
 doc/forum/img_plugin_and_missing_heigth_value.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/img_plugin_and_missing_heigth_value.mdwn b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
index 5fbae6272..7da4625ae 100644
--- a/doc/forum/img_plugin_and_missing_heigth_value.mdwn
+++ b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
@@ -1 +1 @@
-When I set up my picture page with `[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
+When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
-- 
cgit v1.2.3


From 8423a8bb9cb9e8b971bef8ab5da05a70f58bae21 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 21:07:38 -0400
Subject: isabug

---
 doc/forum/img_plugin_and_missing_heigth_value.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/img_plugin_and_missing_heigth_value.mdwn b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
index 7da4625ae..a82e2a7d7 100644
--- a/doc/forum/img_plugin_and_missing_heigth_value.mdwn
+++ b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
@@ -1 +1,3 @@
 When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
+
+> This is a bug. --[[Joey]]
-- 
cgit v1.2.3


From eff7fac985b41d038b071ab68cfe8bc0f428441b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 21:07:45 -0400
Subject: move bug to bugs

---
 doc/bugs/img_plugin_and_missing_heigth_value.mdwn  | 3 +++
 doc/forum/img_plugin_and_missing_heigth_value.mdwn | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 doc/bugs/img_plugin_and_missing_heigth_value.mdwn
 delete mode 100644 doc/forum/img_plugin_and_missing_heigth_value.mdwn

diff --git a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
new file mode 100644
index 000000000..a82e2a7d7
--- /dev/null
+++ b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
@@ -0,0 +1,3 @@
+When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
+
+> This is a bug. --[[Joey]]
diff --git a/doc/forum/img_plugin_and_missing_heigth_value.mdwn b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
deleted file mode 100644
index a82e2a7d7..000000000
--- a/doc/forum/img_plugin_and_missing_heigth_value.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
-
-> This is a bug. --[[Joey]]
-- 
cgit v1.2.3


From 0ccf21daafa76fd182df5e6bc156f22873fe062d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 21:13:37 -0400
Subject: img: Fill in missing height or width when scaling image.

---
 IkiWiki/Plugin/img.pm                             | 6 +++---
 debian/changelog                                  | 1 +
 doc/bugs/img_plugin_and_missing_heigth_value.mdwn | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index f06121578..63dfa9019 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -115,9 +115,6 @@ sub preprocess (@) {
 				$im = Image::Magick->new;
 				$r = $im->Read($outfile);
 				error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
-		
-				$dwidth = $im->Get("width");
-				$dheight = $im->Get("height");
 			}
 			else {
 				($dwidth, $dheight)=($w, $h);
@@ -133,6 +130,9 @@ sub preprocess (@) {
 					$imglink = $file;
 				}
 			}
+			
+			$dwidth = $im->Get("width") unless defined $dwidth;
+			$dheight = $im->Get("height") unless defined $dheight;
 		}
 	}
 	else {
diff --git a/debian/changelog b/debian/changelog
index 0a7d17eb7..9a10332ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20100518.3) UNRELEASED; urgency=low
 
   * creation_day() etc use local time, not gmtime. To match calendars, which
     use local time.
+  * img: Fill in missing height or width when scaling image.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
index a82e2a7d7..bcb17c330 100644
--- a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
+++ b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
@@ -1,3 +1,5 @@
 When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
 
 > This is a bug. --[[Joey]]
+
+> And .. [[fixed|done]] --[[Joey]] 
-- 
cgit v1.2.3


From f3dacd82341477dd41d6c97e7381f8cdf889738b Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Wed, 9 Jun 2010 06:17:56 +0000
Subject: Ack.

---
 doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
index 2419cf75f..e5526bedf 100644
--- a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
+++ b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
@@ -12,3 +12,6 @@ should be restricted to the specific file only.  --[[tschwinge]]
 > and there; you're free to not give ikiwiki its own repo, but you have to
 > be aware that it can fight with you if you're making changes to the same
 > repo. [[done]] --[[Joey]] 
+
+>> Ack, that is reasonable.  (And it's only been a very minor problem
+>> during manual testing.)  --[[tschwinge]]
-- 
cgit v1.2.3


From 215538aa58801a6a136029ff9ef4c632b72cf12e Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Wed, 9 Jun 2010 06:39:26 +0000
Subject: Yes, is a globbing issue.

---
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index 76bf740fb..55669e5c8 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -14,3 +14,16 @@ I did not yet do any testing to figure out when this broke.
 > 
 > This could be as simple as you having not rebuilt the wiki 
 > on upgrade to the version that tracks tagged links. --[[Joey]]
+
+>> Yes, it is a globbing issue:
+
+>>     \[[!map pages="tagged(open_i*ue_gdb)" show=title]]
+
+>> ... doesn't show anything.
+
+>>     \[[!map pages="tagged(open_issue_gdb)" show=title]]
+
+>> ... does show a map of eight pages.  Also, it's working fine on the
+>> autotags pages.
+
+>> --[[tschwinge]]
-- 
cgit v1.2.3


From 651acf8b1490ebdfe15c11fde3792c13fb118f31 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 9 Jun 2010 11:55:11 +0000
Subject: Started discussion

---
 doc/setup/byhand/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/setup/byhand/discussion.mdwn

diff --git a/doc/setup/byhand/discussion.mdwn b/doc/setup/byhand/discussion.mdwn
new file mode 100644
index 000000000..97ae40438
--- /dev/null
+++ b/doc/setup/byhand/discussion.mdwn
@@ -0,0 +1 @@
+What directory is the 'working copy'? There can be two interpretations: the current dir and the .git dir.
-- 
cgit v1.2.3


From 4eb82e7d4161114c6a2194f8f887629ab86162c8 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Wed, 9 Jun 2010 13:47:35 +0000
Subject: Comment and done.

---
 doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
index 6abe203a3..4ce7cc3df 100644
--- a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
+++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
@@ -187,3 +187,19 @@ intentional?  Otherwise I could supply a patch.
 > merge. As the file is then actually modified to resolve the merge
 > I think it makes sense to count the merge as the last modification in
 > that case. --[[Joey]] 
+
+>> That'd be reasonable, but `git log` will also show merges that are not
+>> conflicting (as in my case).
+
+>> Yet, I'm not totally disagreeing with your choice.  With this `git
+>> log` invocation, you're not able to tell from its output whether a
+>> conflict was resolved or not.
+
+>> Also, it's a bit like the *should we use the **author timestamp** or
+>> **commit timestamp*** discussion.  Your code will always use the
+>> latest timestamp.
+
+>> I guess I'll get my head wrapped around that, and it's fine, so this is
+>> [[done]].
+
+>> --[[tschwinge]]
-- 
cgit v1.2.3


From 0da7b1a9c33b3ff67fade15c395672f02bfe6a45 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 13:42:13 -0400
Subject: clarification

---
 doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
index 4ce7cc3df..164e62075 100644
--- a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
+++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
@@ -191,6 +191,15 @@ intentional?  Otherwise I could supply a patch.
 >> That'd be reasonable, but `git log` will also show merges that are not
 >> conflicting (as in my case).
 
+>>> Actually when displaying a merge, `git log --stat` only lists files that
+>>> were actually modified in a new way as part of the merge resolution.
+>>> Ie, if the merge resolution only joins together some of the parent
+>>> hunks, the file is not listed as having been modified.
+>>>
+>>> So, no, ikiwiki's use of git log will not show files modified in
+>>> non-conflicting merges.
+>>> --[[Joey]]
+
 >> Yet, I'm not totally disagreeing with your choice.  With this `git
 >> log` invocation, you're not able to tell from its output whether a
 >> conflict was resolved or not.
-- 
cgit v1.2.3


From bd59179e090d8443f4fbaa0f4c0ac586fc8dbbb3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 13:45:18 -0400
Subject: response

---
 doc/setup/byhand/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/setup/byhand/discussion.mdwn b/doc/setup/byhand/discussion.mdwn
index 97ae40438..941976789 100644
--- a/doc/setup/byhand/discussion.mdwn
+++ b/doc/setup/byhand/discussion.mdwn
@@ -1 +1,7 @@
 What directory is the 'working copy'? There can be two interpretations: the current dir and the .git dir.
+
+> It is fairly common terminology amoung all version control systems to use
+> "working copy" to refer to a checkout from version control, including
+> copies of all the versioned files, and whatever VCS-specific cruft that
+> entails. So, a working copy is everything you get when you `git clone`
+> a repository. --[[Joey]]
-- 
cgit v1.2.3


From ba9b808c898a556541057ac9f524db2de2a33d77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:04:42 -0400
Subject: remove example blog tag pages

Autotag will create them as needed. Avoids some complexity.
---
 debian/changelog                                          | 2 ++
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 3 +++
 doc/examples/blog/tags/life.mdwn                          | 4 ----
 doc/examples/blog/tags/tech.mdwn                          | 4 ----
 4 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 doc/examples/blog/tags/life.mdwn
 delete mode 100644 doc/examples/blog/tags/tech.mdwn

diff --git a/debian/changelog b/debian/changelog
index 9a10332ea..a0ea9c156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100518.3) UNRELEASED; urgency=low
   * creation_day() etc use local time, not gmtime. To match calendars, which
     use local time.
   * img: Fill in missing height or width when scaling image.
+  * Remove example blog tag pages; allow autotag creation to create them
+    when used.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index 55669e5c8..9a55c0673 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -27,3 +27,6 @@ I did not yet do any testing to figure out when this broke.
 >> autotags pages.
 
 >> --[[tschwinge]]
+
+>>> Only way I can reproduce something like this is if tagbase is not set.
+>>> --[[Joey]]
diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
deleted file mode 100644
index e1614dbdc..000000000
--- a/doc/examples/blog/tags/life.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta title="tag life"]]
-
-[[!inline pages="tagged(tags/life)" actions="no" archive="yes"
-feedshow=10]]
diff --git a/doc/examples/blog/tags/tech.mdwn b/doc/examples/blog/tags/tech.mdwn
deleted file mode 100644
index 398146cdb..000000000
--- a/doc/examples/blog/tags/tech.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta title="tag tech"]]
-
-[[!inline pages="tagged(tags/tech)" actions="no" archive="yes"
-feedshow=10]]
-- 
cgit v1.2.3


From cdf4292846e6fe0fb877809ef0906ff6bddf6bf9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:33:49 -0400
Subject: Fix support for globbing in tagged() pagespecs.

The linktype check was being done on the relativised link target,
but %typedlinks uses the same link targets as %links, so that didn't work.

I think the bug only appeared when tagbase was not set.

This bugfix also let me factor out the common typedlink checking code.
---
 IkiWiki.pm                                                | 8 +++++---
 debian/changelog                                          | 1 +
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e2a3d216f..27fa4ca17 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2397,18 +2397,20 @@ sub match_link ($$;@) {
 		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
+		next unless (! defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p});
+
 		if (length $bestlink) {
-			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && $bestlink eq IkiWiki::bestlink($page, $p)) {
+			if ($bestlink eq IkiWiki::bestlink($page, $p)) {
 				return IkiWiki::SuccessReason->new("$page links to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 			}
 		}
 		else {
-			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && match_glob($p, $link, %params)) {
+			if (match_glob($p, $link, %params)) {
 				return IkiWiki::SuccessReason->new("$page links to page $p$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 			}
 			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p_rel}) && match_glob($p_rel, $link, %params)) {
+			if (match_glob($p_rel, $link, %params)) {
 				return IkiWiki::SuccessReason->new("$page links to page $p_rel$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 			}
 		}
diff --git a/debian/changelog b/debian/changelog
index a0ea9c156..38beca395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ikiwiki (3.20100518.3) UNRELEASED; urgency=low
   * img: Fill in missing height or width when scaling image.
   * Remove example blog tag pages; allow autotag creation to create them
     when used.
+  * Fix support for globbing in tagged() pagespecs.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index 9a55c0673..fba332949 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -29,4 +29,5 @@ I did not yet do any testing to figure out when this broke.
 >> --[[tschwinge]]
 
 >>> Only way I can reproduce something like this is if tagbase is not set.
+>>> I have fixed a bug there, see if it works for you?
 >>> --[[Joey]]
-- 
cgit v1.2.3


From 54c5baaa7c3882d32043c2875ac0324bf03fb956 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:44:38 -0400
Subject: note that setup is all done by auto-blog.setup

---
 doc/examples/blog.mdwn | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index 8775c01ab..b25601227 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -5,13 +5,15 @@ Or, run this command to set up a blog with ikiwiki.
 
 	% ikiwiki -setup /etc/ikiwiki/auto-blog.setup
 
-Some additional configuration you might want to do:
+Some additional configuration you might want to do, if not using
+`auto-blog.setup`:
 
 * Make sure to configure ikiwiki to generate RSS or Atom feeds.
 
-* Make sure you have the tag plugin enabled, and tag posts using it. An
-  example of how to tag a post is:
-	\[[!tag tags/life]]
+* Make sure you have the tag plugin enabled, and the `tagbase` set to
+  "tags". Tag pages will then automatically be created.
+  An example of how to tag a post is:
+	\[[!tag life]]
 
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].
-- 
cgit v1.2.3


From fad44c9d4d7e907b35d99a664f77cb617916f5df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:58:05 -0400
Subject: remove tag on first post

It's a broken link on ikiwiki.info.
---
 doc/examples/blog/posts/first_post.mdwn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index f2729fcef..343497d18 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,2 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
-
-[[!tag tech]]
-- 
cgit v1.2.3


From 3fbcd2c8d270b1282e3c457cd2eb7720f43726af Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:58:39 -0400
Subject: move contrib plugin directives out of ikiwiki/directive

Problem is that ikiwiki/directive is turned into an underlay and added to
all wikis. And the test suite checks it for broken links and turns some up.
So it's not appropriate for contrib plugin's directives to be documented
in there.
---
 doc/ikiwiki/directive/ftemplate.mdwn               | 106 ---------------
 doc/ikiwiki/directive/report.mdwn                  | 149 ---------------------
 .../ftemplate/ikiwiki/directive/ftemplate.mdwn     | 106 +++++++++++++++
 .../contrib/report/ikiwiki/directive/report.mdwn   | 149 +++++++++++++++++++++
 4 files changed, 255 insertions(+), 255 deletions(-)
 delete mode 100644 doc/ikiwiki/directive/ftemplate.mdwn
 delete mode 100644 doc/ikiwiki/directive/report.mdwn
 create mode 100644 doc/plugins/contrib/ftemplate/ikiwiki/directive/ftemplate.mdwn
 create mode 100644 doc/plugins/contrib/report/ikiwiki/directive/report.mdwn

diff --git a/doc/ikiwiki/directive/ftemplate.mdwn b/doc/ikiwiki/directive/ftemplate.mdwn
deleted file mode 100644
index 3009fc830..000000000
--- a/doc/ikiwiki/directive/ftemplate.mdwn
+++ /dev/null
@@ -1,106 +0,0 @@
-The `ftemplate` directive is supplied by the [[!iki plugins/contrib/ftemplate desc=ftemplate]] plugin.
-
-This is like the [[ikiwiki/directive/template]] directive, with the addition
-that one does not have to provide all the values in the call to the template,
-because ftemplate can query structured data ("fields") using the
-[[plugins/contrib/field]] plugin.
-
-Templates are files that can be filled out and inserted into pages in
-the wiki, by using the ftemplate directive. The directive has an id
-parameter that identifies the template to use.
-
-Additional parameters can be used to fill out the template, in
-addition to the "field" values.  Passed-in values override the
-"field" values.
-
-There are two places where template files can live.  One is in the /templates
-directory on the wiki.  These templates are wiki pages, and can be edited from
-the web like other wiki pages.
-
-The second place where template files can live is in the global
-templates directory (the same place where the page.tmpl template lives).
-This is a useful place to put template files if you want to prevent
-them being edited from the web, and you don't want to have to make
-them work as wiki pages.
-
-### EXAMPLES
-
-#### Example 1
-
-PageA:
-
-    \[[!meta title="I Am Page A"]]
-    \[[!meta description="A is for Apple."]]
-    \[[!meta author="Fred Nurk"]]
-    \[[!ftemplate id="mytemplate"]]
-
-Template "mytemplate":
-
-    # <TMPL_VAR NAME="TITLE">
-    by <TMPL_VAR NAME="AUTHOR">
-
-    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
-
-This will give:
-
-    <h1>I Am Page A</h1>
-    <p>by Fred Nurk</p>
-    <p><strong>Summary:</strong> A is for Apple.
-
-#### Example 2: Overriding values
-
-PageB:
-
-    \[[!meta title="I Am Page B"]]
-    \[[!meta description="B is for Banana."]]
-    \[[!meta author="Fred Nurk"]]
-    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
-
-This will give:
-
-    <h1>Bananananananas</h1>
-    <p>by Fred Nurk</p>
-    <p><strong>Summary:</strong> B is for Banana.
-
-#### Example 3: Loops
-
-(this example uses the [[plugins/contrib/ymlfront]] plugin)
-
-Page C:
-
-    ---
-    BookAuthor: Georgette Heyer
-    BookTitle: Black Sheep
-    BookGenre:
-      - Historical
-      - Romance
-    ---
-    \[[ftemplate id="footemplate"]]
-
-    I like this book.
-
-Template "footemplate":
-
-    # <TMPL_VAR BOOKTITLE>
-    by <TMPL_VAR BOOKAUTHOR>
-
-    <TMPL_IF BOOKGENRE>(
-    <TMPL_LOOP GENRE_LOOP><TMPL_VAR BOOKGENRE>
-    <TMPL_UNLESS __last__>, </TMPL_UNLESS>
-    </TMPL_LOOP>
-    )</TMPL_IF>
-
-This will give:
-
-    <h1>Black Sheep</h1>
-    <p>by Georgette Heyer</p>
-
-    <p>(Historical, Romance)</p>
-
-    <p>I like this book.</p>
-
-### LIMITATIONS
-
-One cannot query the values of fields on pages other than the current
-page.  If you want to do that, check out the [[plugins/contrib/report]]
-plugin.
diff --git a/doc/ikiwiki/directive/report.mdwn b/doc/ikiwiki/directive/report.mdwn
deleted file mode 100644
index 8f8e6b4e8..000000000
--- a/doc/ikiwiki/directive/report.mdwn
+++ /dev/null
@@ -1,149 +0,0 @@
-[[!toc]]
-The `report` directive is supplied by the [[!iki plugins/contrib/report desc=report]] plugin.
-
-This enables one to report on the structured data ("field" values) of
-multiple pages; the output is formatted via a template.  This depends
-on the [[plugins/contrib/field]] plugin.
-
-The pages to report on are selected by a PageSpec given by the "pages"
-parameter.  The template is given by the "template" parameter.
-The template expects the data from a single page; it is applied
-to each matching page separately, one after the other.
-
-Additional parameters can be used to fill out the template, in
-addition to the "field" values.  Passed-in values override the
-"field" values.
-
-There are two places where template files can live.  One is in the
-/templates directory on the wiki.  These templates are wiki pages, and
-can be edited from the web like other wiki pages.
-
-The second place where template files can live is in the global
-templates directory (the same place where the page.tmpl template lives).
-This is a useful place to put template files if you want to prevent
-them being edited from the web, and you don't want to have to make
-them work as wiki pages.
-
-## OPTIONS
-
-**template**: The template to use for the report.
-
-**pages**: A PageSpec to determine the pages to report on.
-
-**trail**: A page or pages to use as a "trail" page.
-
-When a trail page is used, the matching pages are limited to (a subset
-of) the pages which that page links to; the "pages" pagespec in this
-case, rather than selecting pages from the entire wiki, will select
-pages from within the set of pages given by the trail page.
-
-Additional space-separated trail pages can be given in this option.
-For example:
-
-    trail="animals/cats animals/dogs"
-
-This will take the links from both the "animals/cats" page and the
-"animals/dogs" page as the set of pages to apply the PageSpec to.
-
-**sort**: A SortSpec to determine how the matching pages should be sorted.
-
-**here_only**: Report on the current page only.
-
-This is useful in combination with "prev_" and "next_" variables to
-make a navigation trail.
-If the current page doesn't match the pagespec, then no pages will
-be reported on.
-
-### Headers
-
-An additional option is the "headers" option.  This is a space-separated
-list of field names which are to be used as headers in the report.  This
-is a way of getting around one of the limitations of HTML::Template, that
-is, not being able to do tests such as
-"if this-header is not equal to previous-header".
-
-Instead, that logic is performed inside the plugin.  The template is
-given parameters "HEADER1", "HEADER2" and so on, for each header.
-If the value of a header field is the same as the previous value,
-then HEADER**N** is set to be empty, but if the value of the header
-field is new, then HEADER**N** is given that value.
-
-#### Example
-
-Suppose you're writing a blog in which you record "moods", and you
-want to display your blog posts by mood.
-
-    \[[!report template="mood_summary"
-    pages="blog/*"
-    sort="Mood Date title"
-    headers="Mood"]]
-
-The "mood_summary" template might be like this:
-
-    <TMPL_IF NAME="HEADER1">
-    ## <TMPL_VAR NAME="HEADER1">
-    </TMPL_IF>
-    ### <TMPL_VAR NAME="TITLE">
-    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
-    <TMPL_VAR NAME="DESCRIPTION">
-    
-### Advanced Options
-
-The following options are used to improve efficiency when dealing
-with large numbers of pages; most people probably won't need them.
-
-**doscan**:
-
-Whether this report should be called in "scan" mode; if it is, then
-the pages which match the pagespec are added to the list of links from
-this page.  This can be used by *another* report by setting this
-page to be a "trail" page in *that* report.
-It is not possible to use "trail" and "doscan" at the same time.
-By default, "doscan" is false.
-
-## TEMPLATE PARAMETERS
-
-The templates are in HTML::Template format, just as [[plugins/template]] and
-[[ftemplate]] are.  The parameters passed in to the template are as follows:
-
-### Fields
-
-The structured data from the current matching page.  This includes
-"title" and "description" if they are defined.
-
-### Common values
-
-Values known for all pages: "page", "destpage".  Also "basename" (the
-base name of the page).
-
-### Passed-in values
-
-Any additional parameters to the report directive are passed to the
-template; a parameter will override the matching "field" value.
-For example, if you have a "Mood" field, and you pass Mood="bad" to
-the report, then that will be the Mood which is given for the whole
-report.
-
-Generally this is useful if one wishes to make a more generic
-template and hide or show portions of it depending on what
-values are passed in the report directive call.
-
-For example, one could have a "hide_mood" parameter which would hide
-the "Mood" section of your template when it is true, which one could
-use when the Mood is one of the headers.
-
-### Prev_ And Next_ Items
-
-Any of the above variables can be prefixed with "prev_" or "next_"
-and that will give the previous or next value of that variable; that is,
-the value from the previous or next page that this report is reporting on.
-This is mainly useful for a "here_only" report.
-
-### Headers
-
-See the section on Headers.
-
-### First and Last
-
-If this is the first page-record in the report, then "first" is true.
-If this is the last page-record in the report, then "last" is true.
diff --git a/doc/plugins/contrib/ftemplate/ikiwiki/directive/ftemplate.mdwn b/doc/plugins/contrib/ftemplate/ikiwiki/directive/ftemplate.mdwn
new file mode 100644
index 000000000..3009fc830
--- /dev/null
+++ b/doc/plugins/contrib/ftemplate/ikiwiki/directive/ftemplate.mdwn
@@ -0,0 +1,106 @@
+The `ftemplate` directive is supplied by the [[!iki plugins/contrib/ftemplate desc=ftemplate]] plugin.
+
+This is like the [[ikiwiki/directive/template]] directive, with the addition
+that one does not have to provide all the values in the call to the template,
+because ftemplate can query structured data ("fields") using the
+[[plugins/contrib/field]] plugin.
+
+Templates are files that can be filled out and inserted into pages in
+the wiki, by using the ftemplate directive. The directive has an id
+parameter that identifies the template to use.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is in the /templates
+directory on the wiki.  These templates are wiki pages, and can be edited from
+the web like other wiki pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+### EXAMPLES
+
+#### Example 1
+
+PageA:
+
+    \[[!meta title="I Am Page A"]]
+    \[[!meta description="A is for Apple."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate"]]
+
+Template "mytemplate":
+
+    # <TMPL_VAR NAME="TITLE">
+    by <TMPL_VAR NAME="AUTHOR">
+
+    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
+
+This will give:
+
+    <h1>I Am Page A</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> A is for Apple.
+
+#### Example 2: Overriding values
+
+PageB:
+
+    \[[!meta title="I Am Page B"]]
+    \[[!meta description="B is for Banana."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
+
+This will give:
+
+    <h1>Bananananananas</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> B is for Banana.
+
+#### Example 3: Loops
+
+(this example uses the [[plugins/contrib/ymlfront]] plugin)
+
+Page C:
+
+    ---
+    BookAuthor: Georgette Heyer
+    BookTitle: Black Sheep
+    BookGenre:
+      - Historical
+      - Romance
+    ---
+    \[[ftemplate id="footemplate"]]
+
+    I like this book.
+
+Template "footemplate":
+
+    # <TMPL_VAR BOOKTITLE>
+    by <TMPL_VAR BOOKAUTHOR>
+
+    <TMPL_IF BOOKGENRE>(
+    <TMPL_LOOP GENRE_LOOP><TMPL_VAR BOOKGENRE>
+    <TMPL_UNLESS __last__>, </TMPL_UNLESS>
+    </TMPL_LOOP>
+    )</TMPL_IF>
+
+This will give:
+
+    <h1>Black Sheep</h1>
+    <p>by Georgette Heyer</p>
+
+    <p>(Historical, Romance)</p>
+
+    <p>I like this book.</p>
+
+### LIMITATIONS
+
+One cannot query the values of fields on pages other than the current
+page.  If you want to do that, check out the [[plugins/contrib/report]]
+plugin.
diff --git a/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn b/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn
new file mode 100644
index 000000000..8f8e6b4e8
--- /dev/null
+++ b/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn
@@ -0,0 +1,149 @@
+[[!toc]]
+The `report` directive is supplied by the [[!iki plugins/contrib/report desc=report]] plugin.
+
+This enables one to report on the structured data ("field" values) of
+multiple pages; the output is formatted via a template.  This depends
+on the [[plugins/contrib/field]] plugin.
+
+The pages to report on are selected by a PageSpec given by the "pages"
+parameter.  The template is given by the "template" parameter.
+The template expects the data from a single page; it is applied
+to each matching page separately, one after the other.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is in the
+/templates directory on the wiki.  These templates are wiki pages, and
+can be edited from the web like other wiki pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+## OPTIONS
+
+**template**: The template to use for the report.
+
+**pages**: A PageSpec to determine the pages to report on.
+
+**trail**: A page or pages to use as a "trail" page.
+
+When a trail page is used, the matching pages are limited to (a subset
+of) the pages which that page links to; the "pages" pagespec in this
+case, rather than selecting pages from the entire wiki, will select
+pages from within the set of pages given by the trail page.
+
+Additional space-separated trail pages can be given in this option.
+For example:
+
+    trail="animals/cats animals/dogs"
+
+This will take the links from both the "animals/cats" page and the
+"animals/dogs" page as the set of pages to apply the PageSpec to.
+
+**sort**: A SortSpec to determine how the matching pages should be sorted.
+
+**here_only**: Report on the current page only.
+
+This is useful in combination with "prev_" and "next_" variables to
+make a navigation trail.
+If the current page doesn't match the pagespec, then no pages will
+be reported on.
+
+### Headers
+
+An additional option is the "headers" option.  This is a space-separated
+list of field names which are to be used as headers in the report.  This
+is a way of getting around one of the limitations of HTML::Template, that
+is, not being able to do tests such as
+"if this-header is not equal to previous-header".
+
+Instead, that logic is performed inside the plugin.  The template is
+given parameters "HEADER1", "HEADER2" and so on, for each header.
+If the value of a header field is the same as the previous value,
+then HEADER**N** is set to be empty, but if the value of the header
+field is new, then HEADER**N** is given that value.
+
+#### Example
+
+Suppose you're writing a blog in which you record "moods", and you
+want to display your blog posts by mood.
+
+    \[[!report template="mood_summary"
+    pages="blog/*"
+    sort="Mood Date title"
+    headers="Mood"]]
+
+The "mood_summary" template might be like this:
+
+    <TMPL_IF NAME="HEADER1">
+    ## <TMPL_VAR NAME="HEADER1">
+    </TMPL_IF>
+    ### <TMPL_VAR NAME="TITLE">
+    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
+    <TMPL_VAR NAME="DESCRIPTION">
+    
+### Advanced Options
+
+The following options are used to improve efficiency when dealing
+with large numbers of pages; most people probably won't need them.
+
+**doscan**:
+
+Whether this report should be called in "scan" mode; if it is, then
+the pages which match the pagespec are added to the list of links from
+this page.  This can be used by *another* report by setting this
+page to be a "trail" page in *that* report.
+It is not possible to use "trail" and "doscan" at the same time.
+By default, "doscan" is false.
+
+## TEMPLATE PARAMETERS
+
+The templates are in HTML::Template format, just as [[plugins/template]] and
+[[ftemplate]] are.  The parameters passed in to the template are as follows:
+
+### Fields
+
+The structured data from the current matching page.  This includes
+"title" and "description" if they are defined.
+
+### Common values
+
+Values known for all pages: "page", "destpage".  Also "basename" (the
+base name of the page).
+
+### Passed-in values
+
+Any additional parameters to the report directive are passed to the
+template; a parameter will override the matching "field" value.
+For example, if you have a "Mood" field, and you pass Mood="bad" to
+the report, then that will be the Mood which is given for the whole
+report.
+
+Generally this is useful if one wishes to make a more generic
+template and hide or show portions of it depending on what
+values are passed in the report directive call.
+
+For example, one could have a "hide_mood" parameter which would hide
+the "Mood" section of your template when it is true, which one could
+use when the Mood is one of the headers.
+
+### Prev_ And Next_ Items
+
+Any of the above variables can be prefixed with "prev_" or "next_"
+and that will give the previous or next value of that variable; that is,
+the value from the previous or next page that this report is reporting on.
+This is mainly useful for a "here_only" report.
+
+### Headers
+
+See the section on Headers.
+
+### First and Last
+
+If this is the first page-record in the report, then "first" is true.
+If this is the last page-record in the report, then "last" is true.
-- 
cgit v1.2.3


From 9f41b231088a6a3dbd560cc999ad5ee9549aa914 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:02:08 -0400
Subject: seems this was fixed a long time ago

---
 doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
index e43540c65..19aa94e7e 100644
--- a/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
+++ b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
@@ -25,3 +25,5 @@ types, ikiwiki should output a better error message.
 > It does allow including binary files right into a page, but nothing is
 > stopping you pasting binary data right into the edit form either, so
 > while annoying I don't think that will be a security problem. --[[Joey]] 
+
+[[done]]
-- 
cgit v1.2.3


From addedde0d64bc70b2dceac22886eec636f6b6e9a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:03:51 -0400
Subject: fixed by improved openid login form

---
 doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn b/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
index 9985c13a0..70266c49c 100644
--- a/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
+++ b/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
@@ -12,3 +12,5 @@ Followed by the "login" button underneath. It's not obvious to anyone unfamiliar
 > it visually distinct from the rest of the form. I'm sure the styling
 > could be improved, but the current form does not seem too non-obvious
 > to me, or to naive users in the field. --[[Joey]]
+
+>> [[done]], better fixed by new fancy openid login form. --[[Joey]] 
-- 
cgit v1.2.3


From 3cd4d1e31ba5d7b0a3705af08de2179a0dd07632 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:08:41 -0400
Subject: fixed

---
 doc/bugs/nested_raw_included_inlines.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/bugs/nested_raw_included_inlines.mdwn b/doc/bugs/nested_raw_included_inlines.mdwn
index 33433e235..92ea4c4ef 100644
--- a/doc/bugs/nested_raw_included_inlines.mdwn
+++ b/doc/bugs/nested_raw_included_inlines.mdwn
@@ -32,3 +32,20 @@ Am I missing something? Is this a bug or Ikiwiki not supposed to support this us
 > currently merges pagespecs, though - maybe the patches I suggested for
 > [[separating_and_uniquifying_pagespecs|todo/should_optimise_pagespecs]]
 > would help? --[[smcv]]
+
+>> That, or something seems to have helped in the meantime...
+>> Actually, I think it was the [[transitive_dependencies]] support
+>> that did it, though smcv's pagespec stuff was also a crucial improvement.
+>> 
+>> Anyhoo:
+
+	joey@gnu:~/tmp>touch testcase/page2.mdwn 
+	joey@gnu:~/tmp>ikiwiki -v testcase html 
+	refreshing wiki..
+	scanning page2.mdwn
+	building page2.mdwn
+	building page1.mdwn, which depends on page2
+	building page0.mdwn, which depends on page1
+	done
+
+>> I happily think this is [[done]] --[[Joey]]
-- 
cgit v1.2.3


From 34594fb89a78c26f934a03e06c1aebb097ad57d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:11:23 -0400
Subject: close

---
 doc/bugs/remove_orphaned_sparkline-php_from_Suggests.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/remove_orphaned_sparkline-php_from_Suggests.mdwn b/doc/bugs/remove_orphaned_sparkline-php_from_Suggests.mdwn
index b4e2a1501..ab08c0b26 100644
--- a/doc/bugs/remove_orphaned_sparkline-php_from_Suggests.mdwn
+++ b/doc/bugs/remove_orphaned_sparkline-php_from_Suggests.mdwn
@@ -18,3 +18,5 @@ Thanks
 > rewriting the ikiwiki code to use it, *and* packaging that alternative
 > and maintaining it in Debian. So your suggestion doesn't make a lot of
 > sense; Debian should just find a maintainer for sparkline-php. --[[Joey]]
+
+[[done]]
-- 
cgit v1.2.3


From b382625f9fbe860ca80baaac7c2b38baa0626bc0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:13:46 -0400
Subject: close

---
 doc/bugs/login_page_should_note_cookie_requirement.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/login_page_should_note_cookie_requirement.mdwn b/doc/bugs/login_page_should_note_cookie_requirement.mdwn
index 96686053c..17ac12b34 100644
--- a/doc/bugs/login_page_should_note_cookie_requirement.mdwn
+++ b/doc/bugs/login_page_should_note_cookie_requirement.mdwn
@@ -31,3 +31,9 @@ Best of all would be to use URL-based or hidden-field-based session tokens if co
 >> don't look static. Are they really? --[MJR](http://mjr.towers.org.uk)
 
 >>> As soon as you post an edit page, you are back to a static website.
+
+>>> It is impossible to get to an edit page w/o a cookie, unless
+>>> anonymous edits are allowed, in which case it will save. No data loss.
+>>> Since noone is working on this, and the nonsense above has pissed me
+>>> off to the point that I will certianly never work on it, I'm going to
+>>> close it. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 3638657f75a5cba68511acebd5e124f4b22179ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:15:18 -0400
Subject: closing; cannot reproduce and no followup for 1 year 9 months

---
 debian/changelog                                            |  2 +-
 doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn |  2 ++
 ikiwiki.spec                                                |  2 +-
 po/bg.po                                                    |  3 ++-
 po/cs.po                                                    |  3 ++-
 po/da.po                                                    |  3 ++-
 po/de.po                                                    |  3 ++-
 po/es.po                                                    |  3 ++-
 po/fr.po                                                    | 10 ++++++----
 9 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38beca395..36848d680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100518.3) UNRELEASED; urgency=low
+ikiwiki (3.20100609) unstable; urgency=low
 
   * creation_day() etc use local time, not gmtime. To match calendars, which
     use local time.
diff --git a/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn b/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn
index 7daf52f2a..3e1fe823e 100644
--- a/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn
+++ b/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn
@@ -3,3 +3,5 @@ page produces nothing.  It looks like the inline plugin is failing to do
 the translation from apostrophe to `_39_` that other parts of the system do, so although one can make wikilinks to such pages and have them detected as existing (for instance, by the conditional plugin), inline looks in the wrong place and doesn't see the page.
 
 > I can't reproduce that (btw, an apostrophe would be `__39__`) --[[Joey]]
+
+[[done]]
diff --git a/ikiwiki.spec b/ikiwiki.spec
index fb8b777fe..d373c5cf3 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100518.2
+Version: 3.20100609
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index a399a8c77..49dddee2b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/cs.po b/po/cs.po
index 5e3d8abac..c3fb1f832 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/da.po b/po/da.po
index 81f40ea52..fb0ec754d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de.po b/po/de.po
index a6241388e..1cfc57886 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2010-03-14 16:09+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/es.po b/po/es.po
index 2f0b83813..34c704238 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fr.po b/po/fr.po
index e1cee2e80..ec21d51ab 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -807,7 +808,8 @@ msgstr "pourcentage %s illégal"
 #: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
-"L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire."
+"L'un des paramètres « percent », « totalpages » ou « donepages » est "
+"nécessaire."
 
 #: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
@@ -1320,5 +1322,5 @@ msgstr "Nom de domaine du serveur HTTP :"
 
 #~ msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 #~ msgstr ""
-#~ "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero (%"
-#~ "s)"
+#~ "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero "
+#~ "(%s)"
-- 
cgit v1.2.3


From 2b716c47a7caa90338430d407fea2a0d07550429 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:19:46 -0400
Subject: close old bug, apparently worked around

---
 doc/bugs/2.45_Compilation_error.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/bugs/2.45_Compilation_error.mdwn b/doc/bugs/2.45_Compilation_error.mdwn
index c69c2fc25..63147b656 100644
--- a/doc/bugs/2.45_Compilation_error.mdwn
+++ b/doc/bugs/2.45_Compilation_error.mdwn
@@ -189,3 +189,10 @@ Would you suggest I try rebuilding perl without this patch? Debian has a huge pe
 it's not straightforward for me to see if they do something similar to Arch.
 
 > I think Debian has a similar patch.
+
+---
+
+[[done]] -- apparently this was a problem due to a distribution's
+customisation to perl, or something. Seems to late now to track down what,
+unfortunatly. And ikiwiki's Makefile no longer uses the "-libdir" switch
+that seemed to trigger the bug. --[[Joey]]
-- 
cgit v1.2.3


From 0b3d08665bf451d30bd9f355cfe31ed4072b407a Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Wed, 9 Jun 2010 19:26:40 +0000
Subject:

---
 ...espect_the_current_page___40__if_any__41__.mdwn | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn

diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
new file mode 100644
index 000000000..58cf9d737
--- /dev/null
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -0,0 +1,50 @@
+I really like the new approach to having only one main template "page.tmpl". For instance, it improves previews during edits.
+But it causes some nasty bugs for plugins that use the pagetemplate hook. It is especially visible with the [[plugins/sidebar]] plugin.
+
+## Some examples
+
+### A first example
+
+* activate sidebars globally and cgi
+* create "/sidebar.mdwn" with "[<span></span>[foo]]" inside
+* create "/foo.mdwn" with "hello!" inside
+* create "/bar.mdwn"
+* run ikiwiki
+* with the web browser, go to the page "bar"
+* notice the sidebar, click on "foo"
+* notice the page "foo" is now displayed (hello!)
+* return the the page "bar" and click "edit"
+* notice the sidebar is still here, click on the "foo"
+* -> Problem: 404, the browser goes to "/bar/foo" 
+* -> Was expected: the browser goes to "/foo"
+
+### A second example
+
+* create "/bar/sidebar.mdwn" with "world"
+* run ikiwiki
+* with the web browser, go to the page "bar"
+* notice the sidebar displays "world"
+* click "edit"
+* -> Problem: the sidebar now shows the foo link (it is the root sidebar!)
+* -> Was expecte : the sidebar displays "world"
+
+### A last example
+
+* with the web browser edit the page "bar"
+* type <code>[<span></span>[!sidebar content="goodby"]]</code>
+* click preview
+* -> Problem: the sidebar still displays the foo link
+* -> Was expected: the sidebar display "goodby"
+
+## Some superficial hacking
+
+With the following workaround hacks, I manage to solve the 3 examples shown above:
+
+1- edit IkiWiki/Plugin/editpage.pm and call showform with additional page and destpage parameters:
+<pre>showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl, page => $page, destpage => $page);</pre>
+
+2- edit /usr/share/perl5/IkiWiki.pm and modify the misctemplate function to use the given page and destpage:
+<pre>my %params=@_;
+shift->(page => $params{page}, destpage => $params{destpage}, template => $template);</pre>
+
+I do not guarantee (I do not even expect) that it is the proper way to solve this bug but it may help developers to find and solve the real problem. 
-- 
cgit v1.2.3


From b5978713f134f82ba4929df234a16c007d4acb79 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:29:20 -0400
Subject: close; use ENV in setup file

---
 doc/bugs/http_proxy_for_openid.mdwn | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn
index 3d0c99b83..dac4d2736 100644
--- a/doc/bugs/http_proxy_for_openid.mdwn
+++ b/doc/bugs/http_proxy_for_openid.mdwn
@@ -22,8 +22,7 @@ Note that using $ua->proxy(['https'], ...); won't work, you get a "Not Implement
 
 Also note that the proxy won't work with liblwpx-paranoidagent-perl, I had to remove liblwpx-paranoidagent-perl first.
 
-Please get the patch from the *.mdwn source.
-
+<pre>
 louie:/usr/share/perl5/IkiWiki/Plugin# diff -u openid.pm.old openid.pm
 --- openid.pm.old	2008-10-26 12:18:58.094489360 +1100
 +++ openid.pm	2008-10-26 12:40:05.763429880 +1100
@@ -42,6 +41,11 @@ louie:/usr/share/perl5/IkiWiki/Plugin# diff -u openid.pm.old openid.pm
  	# Store the secret in the session.
  	my $secret=$session->param("openid_secret");
  	if (! defined $secret) {
-
+</pre>
 
 Brian May
+
+> Rather than adding config file settings for every useful environment 
+> variable, there is a ENV config file setting that can be used to set
+> any environment variables you like. So, no changed needed. [[done]]
+> --[[Joey]] 
-- 
cgit v1.2.3


From e96cf38eccd219714140f221090d2e7751fd4ee0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 16:00:12 -0400
Subject: When editing a page, show that page's sidebar. (Thanks, privat)

---
 IkiWiki.pm                                            | 13 +++++++++++--
 IkiWiki/Plugin/editpage.pm                            | 13 ++++++++-----
 debian/changelog                                      |  1 +
 ...t_respect_the_current_page___40__if_any__41__.mdwn | 19 ++++++++++++++++++-
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 27fa4ca17..d2ed99923 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1739,11 +1739,20 @@ sub template ($;@) {
 sub misctemplate ($$;@) {
 	my $title=shift;
 	my $content=shift;
+	my %params=@_;
 	
 	my $template=template("page.tmpl");
 
+	my $page="";
+	if (exists $params{page}) {
+		$page=delete $params{page};
+	}
 	run_hooks(pagetemplate => sub {
-		shift->(page => "", destpage => "", template => $template);
+		shift->(
+			page => $page,
+			destpage => $page,
+			template => $template,
+		);
 	});
 	templateactions($template, "");
 
@@ -1754,7 +1763,7 @@ sub misctemplate ($$;@) {
 		content => $content,
 		baseurl => baseurl(),
 		html5 => $config{html5},
-		@_,
+		%params,
 	);
 	
 	return $template->output;
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 670eedfd9..aa73eb87d 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -312,7 +312,8 @@ sub cgi_editpage ($$) {
 			$form->title(sprintf(gettext("editing %s"), pagetitle($page)));
 		}
 		
-		showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
+		showform($form, \@buttons, $session, $q,
+			forcebaseurl => $baseurl, page => $page);
 	}
 	else {
 		# save page
@@ -329,7 +330,8 @@ sub cgi_editpage ($$) {
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
+			showform($form, \@buttons, $session, $q,
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 		elsif ($form->field("do") eq "create" && $exists) {
@@ -343,7 +345,8 @@ sub cgi_editpage ($$) {
 				value => readfile("$config{srcdir}/$file").
 				         "\n\n\n".$form->field("editcontent"),
 				force => 1);
-			showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
+			showform($form, \@buttons, $session, $q,
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 			
@@ -384,7 +387,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 		
@@ -423,7 +426,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 		}
 		else {
 			# The trailing question mark tries to avoid broken
diff --git a/debian/changelog b/debian/changelog
index 36848d680..66d525572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.20100609) unstable; urgency=low
   * Remove example blog tag pages; allow autotag creation to create them
     when used.
   * Fix support for globbing in tagged() pagespecs.
+  * When editing a page, show that page's sidebar. (Thanks, privat)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index 58cf9d737..2ef5cdba3 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -18,6 +18,12 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: 404, the browser goes to "/bar/foo" 
 * -> Was expected: the browser goes to "/foo"
 
+> You must have a locally modified `page.tmpl` that omits the "TMPL_IF DYNAMIC"
+> that adds a `<base>` tag. That is needed to make all links displayed by
+> cgis work reliably. Not just in this page editing case.
+> The [[version_3.20100515]] announcment mentions that you need to
+> update old `page.tmpl` files to include that on upgrade. --[[Joey]]
+
 ### A second example
 
 * create "/bar/sidebar.mdwn" with "world"
@@ -28,6 +34,10 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: the sidebar now shows the foo link (it is the root sidebar!)
 * -> Was expecte : the sidebar displays "world"
 
+> One could argue that the behavior here is right, or wrong. 
+> Is a page edit page really the same as the page being edited?
+> The next case is more clear.. --[[Joey]]
+
 ### A last example
 
 * with the web browser edit the page "bar"
@@ -36,6 +46,8 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: the sidebar still displays the foo link
 * -> Was expected: the sidebar display "goodby"
 
+> I think this is worth fixing. --[[Joey]]
+
 ## Some superficial hacking
 
 With the following workaround hacks, I manage to solve the 3 examples shown above:
@@ -47,4 +59,9 @@ With the following workaround hacks, I manage to solve the 3 examples shown abov
 <pre>my %params=@_;
 shift->(page => $params{page}, destpage => $params{destpage}, template => $template);</pre>
 
-I do not guarantee (I do not even expect) that it is the proper way to solve this bug but it may help developers to find and solve the real problem. 
+I do not guarantee (I do not even expect) that it is the proper way to solve
+this bug but it may help developers to find and solve the real problem. 
+
+> Oh, it's pretty reasonable. I don't think it breaks anything. :)
+> [[done]]
+> --[[Joey]] 
-- 
cgit v1.2.3


From 95b45864debe8070e8229cc7def21aef5447f541 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 16:16:48 -0400
Subject: relativedate: Fix problem with localised dates not working.

---
 IkiWiki/Plugin/relativedate.pm                                   | 7 +++++--
 debian/changelog                                                 | 1 +
 ...lugins__47__relativedate_depends_on_locale_at_setup_file.mdwn | 9 +++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 179f9238c..c9280ef14 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -49,10 +49,13 @@ sub mydisplaytime ($;$$) {
 	my $pubdate=shift;
 
 	# This needs to be in a form that can be parsed by javascript.
-	# Being fairly human readable is also nice, as it will be exposed
-	# as the title if javascript is not available.
+	# (Being fairly human readable is also nice, as it will be exposed
+	# as the title if javascript is not available.)
+	my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
+	POSIX::setlocale(&POSIX::LC_TIME, "C");
 	my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
 			localtime($time)));
+	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
 
 	my $mid=' class="relativedate" title="'.$gmtime.'">'.
 		IkiWiki::formattime($time, $format);
diff --git a/debian/changelog b/debian/changelog
index 66d525572..fdf111168 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20100609) unstable; urgency=low
     when used.
   * Fix support for globbing in tagged() pagespecs.
   * When editing a page, show that page's sidebar. (Thanks, privat)
+  * relativedate: Fix problem with localised dates not working.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
index db009fa19..e2ea3e4f6 100644
--- a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
+++ b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
@@ -3,3 +3,12 @@
 If I switch locale to en_US.UTF-8 then this plugin correctly parses text date and print relative date. But when I mouseover on date I see unusual formating of the date (it uses AM/PM format while russians use 24-h notation).
 
 P.S. All pages but RecentChanges show well-formated date. RecentChanges show date formated using locale. Anyway, plugin does not work without en_US locale.
+
+> [[Fixed|done]]. Now it uses C locale for the date put in the title,
+> that is used by relativedate. The mouseover will display the date in your
+> native locale. 
+> 
+> Only exception is that when javascript is disabled... then
+> relativedate can't work, so instead you will see your localized date
+> displayed; but on mouseover you will get shown the C locale date.
+> --[[Joey]] 
-- 
cgit v1.2.3


From e93cee33786da51d80f375cbeb8fb24db24bf0c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 16:59:17 -0400
Subject: Fix display of sidebar when previewing page edit. (Thanks, privat)

On second thought, only display a page's personal sidebar when previewing
it, not when editing normally.
---
 IkiWiki/Plugin/editpage.pm                              | 17 +++++++++++------
 debian/changelog                                        |  2 +-
 ...not_respect_the_current_page___40__if_any__41__.mdwn | 15 +++++++++++----
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index aa73eb87d..af2c5ff4e 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -153,6 +153,7 @@ sub cgi_editpage ($$) {
 			noimageinline => 1,
 			linktext => "FormattingHelp"));
 	
+	my $previewing=0;
 	if ($form->submitted eq "Cancel") {
 		if ($form->field("do") eq "create" && defined $from) {
 			redirect($q, urlto($from, undef, 1));
@@ -166,6 +167,8 @@ sub cgi_editpage ($$) {
 		exit;
 	}
 	elsif ($form->submitted eq "Preview") {
+		$previewing=1;
+
 		my $new=not exists $pagesources{$page};
 		if ($new) {
 			# temporarily record its type
@@ -255,7 +258,7 @@ sub cgi_editpage ($$) {
 			if (! @page_locs) {
 				# hmm, someone else made the page in the
 				# meantime?
-				if ($form->submitted eq "Preview") {
+				if ($previewing) {
 					# let them go ahead with the edit
 					# and resolve the conflict at save
 					# time
@@ -313,7 +316,9 @@ sub cgi_editpage ($$) {
 		}
 		
 		showform($form, \@buttons, $session, $q,
-			forcebaseurl => $baseurl, page => $page);
+			forcebaseurl => $baseurl,
+			($previewing ? (page => $page) : ()),
+		);
 	}
 	else {
 		# save page
@@ -331,7 +336,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl, page => $page);
+				forcebaseurl => $baseurl);
 			exit;
 		}
 		elsif ($form->field("do") eq "create" && $exists) {
@@ -346,7 +351,7 @@ sub cgi_editpage ($$) {
 				         "\n\n\n".$form->field("editcontent"),
 				force => 1);
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl, page => $page);
+				forcebaseurl => $baseurl);
 			exit;
 		}
 			
@@ -387,7 +392,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl, page => $page);
+				forcebaseurl => $baseurl);
 			exit;
 		}
 		
@@ -426,7 +431,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl, page => $page);
+				forcebaseurl => $baseurl);
 		}
 		else {
 			# The trailing question mark tries to avoid broken
diff --git a/debian/changelog b/debian/changelog
index fdf111168..5cfb9ce89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ ikiwiki (3.20100609) unstable; urgency=low
   * Remove example blog tag pages; allow autotag creation to create them
     when used.
   * Fix support for globbing in tagged() pagespecs.
-  * When editing a page, show that page's sidebar. (Thanks, privat)
+  * Fix display of sidebar when previewing page edit. (Thanks, privat)
   * relativedate: Fix problem with localised dates not working.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index 2ef5cdba3..f1e4649ff 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -34,9 +34,10 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: the sidebar now shows the foo link (it is the root sidebar!)
 * -> Was expecte : the sidebar displays "world"
 
-> One could argue that the behavior here is right, or wrong. 
-> Is a page edit page really the same as the page being edited?
-> The next case is more clear.. --[[Joey]]
+> I think it's a misconception to think that the page editing page is the same
+> as the page it's editing. If you were deleting that page, would you expect
+> the "are you sure" confirmation page to display the page's sidebar?
+> --[[Joey]]
 
 ### A last example
 
@@ -46,7 +47,12 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: the sidebar still displays the foo link
 * -> Was expected: the sidebar display "goodby"
 
-> I think this is worth fixing. --[[Joey]]
+> In the specific case of previewing, it is indeed a bug that the
+> right sidebar is not displayed. And replacing the regular sidebar 
+> with the one from the previewed page is probably the best we can do..
+> displaying 2 sidebars would be confusing, and the `page.tmpl` can
+> put the sidebar anywhere so we can't just display the preview sidebar
+> next to the rest of the page preview. --[[Joey]]
 
 ## Some superficial hacking
 
@@ -63,5 +69,6 @@ I do not guarantee (I do not even expect) that it is the proper way to solve
 this bug but it may help developers to find and solve the real problem. 
 
 > Oh, it's pretty reasonable. I don't think it breaks anything. :)
+> I modified it a bit, and explicitly made it *not* "fix" the second example.
 > [[done]]
 > --[[Joey]] 
-- 
cgit v1.2.3


From 118750658885fa64a03c8860d8a3fe2573221276 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 17:13:35 -0400
Subject: ugly bug

---
 doc/bugs/preview_pagestate.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/bugs/preview_pagestate.mdwn

diff --git a/doc/bugs/preview_pagestate.mdwn b/doc/bugs/preview_pagestate.mdwn
new file mode 100644
index 000000000..14973908b
--- /dev/null
+++ b/doc/bugs/preview_pagestate.mdwn
@@ -0,0 +1,11 @@
+If a change to a page is previewed, but not saved, `%pagestate` and
+`%wikistate` can be changed, and saved. Actually, it's not limited to
+those. Seems that spurious dependencies can be added, though existing
+dependencies will at least not be removed.
+
+It calls saveindex to record state about files created on disk for the
+preview. Those files will expire later. However, saveindex also
+saves other state changes.
+
+Seems like it needs to isolate all state changes when previewing... ugh.
+--[[Joey]] 
-- 
cgit v1.2.3


From b2327cfae4ac7da1df7bbf848f575b553f74eafb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 17:43:20 -0400
Subject: improve preview mode comments

---
 IkiWiki/Plugin/graphviz.pm  | 3 ++-
 IkiWiki/Plugin/img.pm       | 3 ++-
 IkiWiki/Plugin/sparkline.pm | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index c91c92fec..dfd66a03e 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -71,7 +71,8 @@ sub render_graph (\%) {
 			writefile($dest, $config{destdir}, $png, 1);
 		}
 		else {
-			# can't write the file, so embed it in a data uri
+			# in preview mode, embed the image in a data uri
+			# to avoid temp file clutter
 			eval q{use MIME::Base64};
 			error($@) if $@;
 			return "<img src=\"data:image/png;base64,".
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 63dfa9019..48211454e 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -121,7 +121,8 @@ sub preprocess (@) {
 				$r = $im->Resize(geometry => "${w}x${h}");
 				error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
-				# don't actually write file in preview mode
+				# don't actually write resized file in preview mode;
+				# rely on width and height settings
 				if (! $params{preview}) {
 					my @blob = $im->ImageToBlob();
 					writefile($imglink, $config{destdir}, $blob[0], 1);
diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 42665ac63..1b1d04cba 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -158,7 +158,8 @@ sub preprocess (@) {
 			writefile($fn, $config{destdir}, $png, 1);
 		}
 		else {
-			# can't write the file, so embed it in a data uri
+			# in preview mode, embed the image in a data uri
+			# to avoid temp file clutter
 			eval q{use MIME::Base64};
 		        error($@) if $@;
 			return "<img src=\"data:image/png;base64,".
-- 
cgit v1.2.3


From 24b59b3a9edb350ef0dc064b0a3f3cdee01f81be Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 17:44:40 -0400
Subject: editpage: Avoid storing accidental state changes when previewing
 pages.

This is a slow, safe, stupid approach. Could make deep copies of the data
structures as backups instead of re-loading the index from disk.
---
 IkiWiki/Plugin/editpage.pm                                | 15 ++++++---------
 debian/changelog                                          |  1 +
 .../comments_preview_unsafe_with_allowdirectives.mdwn     |  8 ++++++++
 doc/bugs/preview_pagestate.mdwn                           |  2 ++
 4 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index af2c5ff4e..3d731d399 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -170,10 +170,8 @@ sub cgi_editpage ($$) {
 		$previewing=1;
 
 		my $new=not exists $pagesources{$page};
-		if ($new) {
-			# temporarily record its type
-			$pagesources{$page}=$page.".".$type;
-		}
+		# temporarily record its type
+		$pagesources{$page}=$page.".".$type if $new;
 		my %wasrendered=map { $_ => 1 } @{$renderedfiles{$page}};
 
 		my $content=$form->field('editcontent');
@@ -198,18 +196,17 @@ sub cgi_editpage ($$) {
 		});
 		$form->tmpl_param("page_preview", $preview);
 		
-		if ($new) {
-			delete $pagesources{$page};
-		}
-
 		# Previewing may have created files on disk.
 		# Keep a list of these to be deleted later.
 		my %previews = map { $_ => 1 } @{$wikistate{editpage}{previews}};
 		foreach my $f (@{$renderedfiles{$page}}) {
 			$previews{$f}=1 unless $wasrendered{$f};
 		}
+
+		# Throw out any other state changes made during previewing,
+		# and save the previews list.
+		loadindex();
 		@{$wikistate{editpage}{previews}} = keys %previews;
-		$renderedfiles{$page}=[keys %wasrendered];
 		saveindex();
 	}
 	elsif ($form->submitted eq "Save Page") {
diff --git a/debian/changelog b/debian/changelog
index 5cfb9ce89..96188c093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.20100609) unstable; urgency=low
   * Fix support for globbing in tagged() pagespecs.
   * Fix display of sidebar when previewing page edit. (Thanks, privat)
   * relativedate: Fix problem with localised dates not working.
+  * editpage: Avoid storing accidental state changes when previewing pages.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn
new file mode 100644
index 000000000..7f9fb67e9
--- /dev/null
+++ b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn
@@ -0,0 +1,8 @@
+If `comments_allowdirectives` is set, previewing a comment can run
+directives that create files. (Eg, img.) Unlike editpage, it does not
+keep track of those files and expire them. So the files will linger in
+destdir forever.
+
+Probably when the user then tries to save the comment, ikiwiki will refuse
+to overwrite the unknown file, and will crash.
+--[[Joey]]
diff --git a/doc/bugs/preview_pagestate.mdwn b/doc/bugs/preview_pagestate.mdwn
index 14973908b..7f7ec0976 100644
--- a/doc/bugs/preview_pagestate.mdwn
+++ b/doc/bugs/preview_pagestate.mdwn
@@ -9,3 +9,5 @@ saves other state changes.
 
 Seems like it needs to isolate all state changes when previewing... ugh.
 --[[Joey]] 
+
+[[done]]
-- 
cgit v1.2.3


From 1bdf98a4a0b3a0bddbede8390df0930193d06a5a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 17:47:49 -0400
Subject: let's allow comments of "0"

---
 IkiWiki/Plugin/comments.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 86b60a2b2..b244a7431 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -433,7 +433,8 @@ sub editcomment ($$) {
 
 	$content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 
-	my $editcontent = $form->field('editcontent') || '';
+	my $editcontent = $form->field('editcontent');
+	$editcontent="" if ! defined $editcontent;
 	$editcontent =~ s/\r\n/\n/g;
 	$editcontent =~ s/\r/\n/g;
 	$editcontent =~ s/"/\\"/g;
-- 
cgit v1.2.3


From 31775762ba897246b8e837b070a9258fb5a3ec6c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 18:40:18 -0400
Subject: better autotag title

---
 templates/autotag.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl
index 6bc809d22..9162e9e8d 100644
--- a/templates/autotag.tmpl
+++ b/templates/autotag.tmpl
@@ -1,4 +1,4 @@
-[[!meta title="tag <TMPL_VAR TAGNAME>"]]
+[[!meta title="pages tagged <TMPL_VAR TAGNAME>"]]
 
 [[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"
 feedshow=10]]
-- 
cgit v1.2.3


From 04309536085b06a4121b8aad35adc53d91fcb3f2 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0"
 <https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0@web>
Date: Thu, 10 Jun 2010 03:29:22 +0000
Subject:

---
 doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
index e2ea3e4f6..a9a39ac47 100644
--- a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
+++ b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
@@ -12,3 +12,5 @@ P.S. All pages but RecentChanges show well-formated date. RecentChanges show dat
 > relativedate can't work, so instead you will see your localized date
 > displayed; but on mouseover you will get shown the C locale date.
 > --[[Joey]] 
+
+>> Thanks. 
-- 
cgit v1.2.3


From 0fbec10a42c0b6ae3111d5a5d5488cd5d573f554 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Thu, 10 Jun 2010 08:54:46 +0000
Subject: Fixed.

---
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index fba332949..f9cb37487 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -31,3 +31,6 @@ I did not yet do any testing to figure out when this broke.
 >>> Only way I can reproduce something like this is if tagbase is not set.
 >>> I have fixed a bug there, see if it works for you?
 >>> --[[Joey]]
+
+>>>> This is now indeed [[fixed|done]] (thanks!) -- even though I already
+>>>> did have tagbase set.
-- 
cgit v1.2.3


From 492c61f825ed792b2bd839b76777454d4102ca8c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 13:16:35 -0400
Subject: page.tmpl: Add a div around the sidebar, page content, and comments,
 to aide in styling.

http://bzed.de/posts/2010/05/new_css_for_bzed.de/

smcv: [10:59:01] is the logical thing you want a <div> whose meaning is "the bits the sidebar is allowed to accompany"?
bzed: [10:59:14] yeah
bzed: [10:59:58] then you could just ensure that this part is as high as the sidebar
smcv: [11:02:44] wrapping a <div> around the sidebar, content and comments seems like the way forward, then
---
 debian/changelog    | 2 ++
 templates/page.tmpl | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 96188c093..abf7a2d87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (3.20100609) unstable; urgency=low
   * Fix display of sidebar when previewing page edit. (Thanks, privat)
   * relativedate: Fix problem with localised dates not working.
   * editpage: Avoid storing accidental state changes when previewing pages.
+  * page.tmpl: Add a div around the sidebar, page content, and comments,
+    to aide in styling.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 235b693fe..24db9a594 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -106,6 +106,8 @@
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<div id="pagebody">
+
 <TMPL_IF SIDEBAR>
 <TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
 <TMPL_VAR SIDEBAR>
@@ -129,6 +131,8 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+</div>
+
 <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>
-- 
cgit v1.2.3


From 23aaa5ac45f389a741afdac6d87e077a2e44fe8b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 14:14:46 -0400
Subject: style.css: Improvements to make floating sidebar fit better on pages
 with inlines.

The key is using width: auto; overflow: auto; -- this allows the div(s) to the
left of the floating sidebar to be resized to fit next to it, and prevents
any clear: both from pushing the div down below the end of the sidebar.

Many thanks for the Hurd wiki's developers for originally figuring this out.

The edit page recently developed the same problem with its textarea, now
that a sidebar can appear on that page too. In editpage.tmpl I needed to
add a new div around the editcontent textarea, as the above styles cannot
be applied directly to textareas. The textarea's own width is reduced to
98% because at least in chromium this avoids it getting unnecessary
horizonatl scrollbars when a sidebar is displayed next to it.
---
 debian/changelog        |  2 ++
 doc/style.css           | 12 +++++++++---
 templates/editpage.tmpl |  2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index abf7a2d87..f7810c66f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.20100609) unstable; urgency=low
   * editpage: Avoid storing accidental state changes when previewing pages.
   * page.tmpl: Add a div around the sidebar, page content, and comments,
     to aide in styling.
+  * style.css: Improvements to make floating sidebar fit better on
+    pages with inlines.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/style.css b/doc/style.css
index 2cd7a9652..d88c93778 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -110,7 +110,12 @@ nav {
 }
 
 #editcontent {
-	width: 100%;
+	width: 98%;
+}
+
+.editcontentdiv {
+	width: auto;
+	overflow: auto;
 }
 
 img {
@@ -121,8 +126,8 @@ div.recentchanges {
 	border-style: solid;
 	border-width: 1px;
 	overflow: auto;
-	clear: both;
-	width: 100%;
+	width: auto;
+	clear: none;
 	background: #eee;
 	color: black !important;
 }
@@ -176,6 +181,7 @@ div.recentchanges {
 .inlinepage {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
+	overflow: auto;
 }
 
 .pagedate,
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 118ca4550..36076cb35 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -17,7 +17,9 @@
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <li>
+<div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</div>
 </li>
 <TMPL_IF NAME="CAN_COMMIT">
 <li>
-- 
cgit v1.2.3


From 685d10364fbebac69dfa925840528e695d37035f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 14:31:01 -0400
Subject: also set overflow: auto for blogform

This improves its display slighly when next to a sidebar or other floating
element.
---
 doc/style.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/style.css b/doc/style.css
index d88c93778..154729721 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -176,6 +176,8 @@ div.recentchanges {
 	border: 1px solid #aaa;
 	background: #eee;
 	color: black !important;
+	width: auto;
+	overflow: auto;
 }
 
 .inlinepage {
-- 
cgit v1.2.3


From 04ff998c51b578017edf369e0dfc2dc7c63d8071 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 15:01:10 -0400
Subject: calendar styling

* calendar: Shorten day names, and improve styling of month calendar.
* style.css: Reduced sidebar width back to 20ex from 30; the month calendar
  will now fit in the smaller width, and 30 was feeling too large.
---
 IkiWiki/Plugin/calendar.pm |  5 +++--
 debian/changelog           |  9 ++++++---
 doc/style.css              | 15 ++++++++++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 0bf933dcd..359c9b861 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -123,6 +123,7 @@ sub format_month (@) {
 	}
 
 	# Find out month names for this, next, and previous months
+	my $monthabbrev=POSIX::strftime("%b", @monthstart);
 	my $monthname=POSIX::strftime("%B", @monthstart);
 	my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
 	my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
@@ -137,7 +138,7 @@ sub format_month (@) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}/".$params{month},
 			noimageinline => 1,
-			linktext => "$monthname $params{year}",
+			linktext => "$monthabbrev $params{year}",
 			title => $monthname);
 	}
 	add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
@@ -182,7 +183,7 @@ EOF
 	for my $dow ($week_start_day..$week_start_day+6) {
 		my @day=localtime(timelocal(0,0,0,$start_day++,$params{month}-1,$params{year}-1900));
 		my $downame = POSIX::strftime("%A", @day);
-		my $dowabbr = POSIX::strftime("%a", @day);
+		my $dowabbr = substr($downame, 0, 1);
 		$downame{$dow % 7}=$downame;
 		$dowabbr{$dow % 7}=$dowabbr;
 		$calendar.= qq{\t\t<th class="month-calendar-day-head $downame" title="$downame">$dowabbr</th>\n};
diff --git a/debian/changelog b/debian/changelog
index f7810c66f..d66bcab20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100609) unstable; urgency=low
+ikiwiki (3.20100610) unstable; urgency=low
 
   * creation_day() etc use local time, not gmtime. To match calendars, which
     use local time.
@@ -11,10 +11,13 @@ ikiwiki (3.20100609) unstable; urgency=low
   * editpage: Avoid storing accidental state changes when previewing pages.
   * page.tmpl: Add a div around the sidebar, page content, and comments,
     to aide in styling.
-  * style.css: Improvements to make floating sidebar fit better on
+  * style.css: Improvements to make floating sidebar fit much better on
     pages with inlines.
+  * calendar: Shorten day names, and improve styling of month calendar.
+  * style.css: Reduced sidebar width back to 20ex from 30; the month calendar
+    will now fit in the smaller width, and 30 was feeling too large.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 10 Jun 2010 14:24:05 -0400
 
 ikiwiki (3.20100518.2) unstable; urgency=low
 
diff --git a/doc/style.css b/doc/style.css
index 154729721..2cc467b4f 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -199,7 +199,7 @@ div.recentchanges {
 }
 
 .sidebar {
-	width: 30ex;
+	width: 20ex;
 	float: right;
 	margin-left: 4px;
 	margin-bottom: 4px;
@@ -383,8 +383,17 @@ pre.hl { color:#000000; background-color:#ffffff; }
 .hl.kwd { color:#010181; }
 
 /* calendar plugin */
-.month-calendar-day-this-day { background-color: #eee; }
-.year-calendar-this-month { background-color: #eee; }
+.month-calendar-day-this-day,
+.year-calendar-this-month {
+	background-color: #eee;
+}
+.month-calendar-day-head,
+.month-calendar-day-nolink,
+.month-calendar-day-link,
+.month-calendar-day-this-day,
+.month-calendar-day-future {
+	text-align: right;
+}
 .month-calendar-arrow A:link,
 .year-calendar-arrow A:link,
 .month-calendar-arrow A:visited,
-- 
cgit v1.2.3


From 1609da8f00e29c580e92fd1d3c2b093cbc41d20e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 15:15:44 -0400
Subject: I'm told that the pagebody div should be after the sidebar.

---
 debian/changelog    | 4 ++--
 templates/page.tmpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d66bcab20..01307db55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,8 @@ ikiwiki (3.20100610) unstable; urgency=low
   * Fix display of sidebar when previewing page edit. (Thanks, privat)
   * relativedate: Fix problem with localised dates not working.
   * editpage: Avoid storing accidental state changes when previewing pages.
-  * page.tmpl: Add a div around the sidebar, page content, and comments,
-    to aide in styling.
+  * page.tmpl: Add a div around the page content, and comments, to aide in
+    sidebar styling.
   * style.css: Improvements to make floating sidebar fit much better on
     pages with inlines.
   * calendar: Shorten day names, and improve styling of month calendar.
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 24db9a594..da8c2940f 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -106,14 +106,14 @@
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div id="pagebody">
-
 <TMPL_IF SIDEBAR>
 <TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
 <TMPL_VAR SIDEBAR>
 <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+<div id="pagebody">
+
 <TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-- 
cgit v1.2.3


From b86ca0ef8adaac119841865a24e0648204102ab0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 16:05:29 -0400
Subject: add auto-scrolling pre's

let's see if anyone hates it :)
---
 doc/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/style.css b/doc/style.css
index 2cc467b4f..22c68bd7a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -122,6 +122,10 @@ img {
 	border-style: none;
 }
 
+pre {
+	overflow: auto;
+}
+
 div.recentchanges {
 	border-style: solid;
 	border-width: 1px;
-- 
cgit v1.2.3


From c8ce0e2e1c740fa5bdbf9791a460958562a7b728 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 16:15:22 -0400
Subject: releasing version 3.20100610

---
 ikiwiki.spec   |  2 +-
 po/gu.po       | 43 ++++++++++++++++++++++---------------------
 po/ikiwiki.pot | 43 ++++++++++++++++++++++---------------------
 po/it.po       | 43 ++++++++++++++++++++++---------------------
 po/pl.po       | 43 ++++++++++++++++++++++---------------------
 po/sv.po       | 43 ++++++++++++++++++++++---------------------
 po/tr.po       | 43 ++++++++++++++++++++++---------------------
 po/vi.po       | 50 ++++++++++++++++++++++++++------------------------
 8 files changed, 159 insertions(+), 151 deletions(-)

diff --git a/ikiwiki.spec b/ikiwiki.spec
index d373c5cf3..503019435 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100609
+Version: 3.20100610
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/gu.po b/po/gu.po
index 0100e9f74..c0dfb145b 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-06-10 15:02-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -232,36 +233,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:491
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:493
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:506
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:510
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:603
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:641
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:790
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -271,7 +272,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:800
 msgid "Comment"
 msgstr ""
 
@@ -306,9 +307,9 @@ msgstr "%s એ સુધારી શકાય તેવું પાનું 
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
+#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
+#: ../IkiWiki/Plugin/editpage.pm:429
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
@@ -387,7 +388,7 @@ msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કર
 msgid "failed to run graphviz"
 msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી"
 
@@ -426,12 +427,12 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
@@ -1115,7 +1116,7 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "cannot load %s in safe mode"
 msgstr "વાંચી શકાતી નથી %s: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
@@ -1213,21 +1214,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:1993
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2070
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2091
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2227
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index bec239401..437cdbdcc 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 14:18-0400\n"
+"POT-Creation-Date: 2010-06-10 15:02-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -230,36 +231,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:491
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:493
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:506
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:510
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:603
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:641
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:790
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -269,7 +270,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:800
 msgid "Comment"
 msgstr ""
 
@@ -304,9 +305,9 @@ msgstr ""
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
+#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
+#: ../IkiWiki/Plugin/editpage.pm:429
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -380,7 +381,7 @@ msgstr ""
 msgid "failed to run graphviz"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -417,12 +418,12 @@ msgstr ""
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
@@ -1090,7 +1091,7 @@ msgstr ""
 msgid "cannot load %s in safe mode"
 msgstr ""
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, perl-format
 msgid "failed to parse %s"
 msgstr ""
@@ -1188,21 +1189,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:1993
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2070
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2091
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2227
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index a8a80b0c8..e6fd4b42f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-06-10 15:02-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -232,36 +233,36 @@ msgstr "la pagina «%s» non esiste, impossibile commentarla"
 msgid "comments on page '%s' are closed"
 msgstr "i commenti per la pagina «%s» sono chiusi"
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:491
 msgid "comment stored for moderation"
 msgstr "commento trattenuto per moderazione"
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:493
 msgid "Your comment will be posted after moderator review"
 msgstr "Il commento sarà pubblicato dopo la verifica del moderatore"
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:506
 msgid "Added a comment"
 msgstr "Aggiunto commento"
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:510
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Aggiunto commento: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr "non siete autenticati come amministratore"
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:603
 msgid "Comment moderation"
 msgstr "Moderazione commenti"
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:641
 msgid "comment moderation"
 msgstr "moderazione commento"
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:790
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -271,7 +272,7 @@ msgstr[1] "Commenti"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:800
 #, fuzzy
 msgid "Comment"
 msgstr "Commenti"
@@ -307,9 +308,9 @@ msgstr "%s non è una pagina modificabile"
 msgid "creating %s"
 msgstr "creazione %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
+#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
+#: ../IkiWiki/Plugin/editpage.pm:429
 #, perl-format
 msgid "editing %s"
 msgstr "modifica %s"
@@ -384,7 +385,7 @@ msgstr "Occorre specificare %s quando si usa il plugin %s"
 msgid "failed to run graphviz"
 msgstr "errore nell'eseguire graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr "prog non è un programma graphviz valido"
 
@@ -423,12 +424,12 @@ msgstr "impossibile leggere %s: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)"
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "impossibile ridimensionare: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "impossibile determinare la dimensione dell'immagine %s"
@@ -1123,7 +1124,7 @@ msgstr "impossibile leggere %s: %s"
 msgid "cannot load %s in safe mode"
 msgstr "impossibile leggere %s: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "impossibile aggiornare %s"
@@ -1223,21 +1224,21 @@ msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:1993
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2070
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2091
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2227
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
diff --git a/po/pl.po b/po/pl.po
index e09336b0e..299c22e7f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-06-10 15:02-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -236,36 +237,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:491
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:493
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:506
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:510
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:603
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:641
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:790
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -275,7 +276,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:800
 msgid "Comment"
 msgstr ""
 
@@ -310,9 +311,9 @@ msgstr "Strona %s nie może być edytowana"
 msgid "creating %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
+#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
+#: ../IkiWiki/Plugin/editpage.pm:429
 #, perl-format
 msgid "editing %s"
 msgstr "edycja %s"
@@ -392,7 +393,7 @@ msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
 msgid "failed to run graphviz"
 msgstr "awaria w trakcie uruchamiania wtyczki graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr "prog nie jest poprawnym programem graphviz"
 
@@ -431,12 +432,12 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
@@ -1136,7 +1137,7 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "cannot load %s in safe mode"
 msgstr "awaria w trakcie odczytu %s: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "awaria w trakcie kompilowania %s"
@@ -1236,21 +1237,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:1993
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2070
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2091
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2227
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
diff --git a/po/sv.po b/po/sv.po
index f87bc3fd8..6288101e8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-06-10 15:02-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -233,36 +234,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:491
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:493
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:506
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:510
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:603
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:641
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:790
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -272,7 +273,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:800
 msgid "Comment"
 msgstr ""
 
@@ -307,9 +308,9 @@ msgstr ""
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
+#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
+#: ../IkiWiki/Plugin/editpage.pm:429
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
@@ -389,7 +390,7 @@ msgstr "Måste ange %s när sökinsticket används"
 msgid "failed to run graphviz"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -428,12 +429,12 @@ msgstr "misslyckades med att skriva %s: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "misslyckades med att skriva %s: %s"
@@ -1123,7 +1124,7 @@ msgstr "kan inte läsa %s: %s"
 msgid "cannot load %s in safe mode"
 msgstr "kan inte läsa %s: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "misslyckades med att kompilera %s"
@@ -1221,21 +1222,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:1993
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2070
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2091
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2227
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
diff --git a/po/tr.po b/po/tr.po
index 90c1b0de5..165dfc59f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-06-10 15:02-0400\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -226,36 +227,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:491
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:493
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:506
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:510
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:603
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:641
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:790
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -265,7 +266,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:800
 msgid "Comment"
 msgstr ""
 
@@ -300,9 +301,9 @@ msgstr ""
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
+#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
+#: ../IkiWiki/Plugin/editpage.pm:429
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -376,7 +377,7 @@ msgstr ""
 msgid "failed to run graphviz"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -413,12 +414,12 @@ msgstr ""
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
@@ -1086,7 +1087,7 @@ msgstr ""
 msgid "cannot load %s in safe mode"
 msgstr ""
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, perl-format
 msgid "failed to parse %s"
 msgstr ""
@@ -1184,21 +1185,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:1993
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2070
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2091
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2227
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 182f9ccbe..a1aa8db55 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-06-10 15:02-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -234,36 +235,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:491
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:493
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:506
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:510
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:603
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:641
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:790
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -272,7 +273,7 @@ msgstr[0] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:800
 msgid "Comment"
 msgstr ""
 
@@ -307,9 +308,9 @@ msgstr ""
 msgid "creating %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
+#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
+#: ../IkiWiki/Plugin/editpage.pm:429
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
@@ -389,7 +390,7 @@ msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
 msgid "failed to run graphviz"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -428,12 +429,12 @@ msgstr "lỗi ghi %s: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "lỗi ghi %s: %s"
@@ -441,8 +442,8 @@ msgstr "lỗi ghi %s: %s"
 #: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
-"Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay « --"
-"atom »"
+"Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay "
+"« --atom »"
 
 #: ../IkiWiki/Plugin/inline.pm:139
 #, fuzzy
@@ -1123,7 +1124,7 @@ msgstr "không thể đọc %s: %s"
 msgid "cannot load %s in safe mode"
 msgstr "không thể đọc %s: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "lỗi biên dịch %s"
@@ -1205,7 +1206,8 @@ msgstr "Thảo luận"
 
 #: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
-msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
+msgstr ""
+"Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
 #: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
@@ -1221,21 +1223,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:1993
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2070
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2091
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2227
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From a1e7e62c21dc424c7be00a3cb3a73dc0348f79a0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 16:15:43 -0400
Subject: add news item for ikiwiki 3.20100610

---
 doc/news/version_3.20100501.mdwn | 21 ---------------------
 doc/news/version_3.20100610.mdwn | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 doc/news/version_3.20100501.mdwn
 create mode 100644 doc/news/version_3.20100610.mdwn

diff --git a/doc/news/version_3.20100501.mdwn b/doc/news/version_3.20100501.mdwn
deleted file mode 100644
index 0cf5e38be..000000000
--- a/doc/news/version_3.20100501.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-ikiwiki 3.20100501 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * TMPL\_INCLUDE re-enabled for templates read from the templatedir.
-     (But not in-wiki templates.)
-   * Version dependency on liburi-perl to &gt;= 1.36; previous versions
-     did not support building urls from utf-8 strings. Closes: #[579713](http://bugs.debian.org/579713)
-   * Ikiwiki can be configured to generate html5 instead of the default xhtml
-     1.0. The html5 output mode is experimental, not yet fully standards
-     compliant, and will be subject to rapid change.
-   * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside
-     hgroup, header, footer, figure, figcaption, time, mark
-   * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
-     ruby, rt, rp, details, summary, datalist.
-   * htmlscrubber: Round out html5 video support with the preload
-     attribute and the source tag.
-   * htmlscrubber: Allow the html5 form attributes: placeholder, autofocus,
-     min, max, step, required, autocomplete, novalidate, pattern, list,
-     and form. (Also the form* override attributes for input and buttons.)
-   * htmlscrubber: Allow additional misc html5 attributes: reversed,
-     spellcheck, and hidden.
-   * template: Fix typo."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100610.mdwn b/doc/news/version_3.20100610.mdwn
new file mode 100644
index 000000000..ee7c86d72
--- /dev/null
+++ b/doc/news/version_3.20100610.mdwn
@@ -0,0 +1,18 @@
+ikiwiki 3.20100610 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * creation\_day() etc use local time, not gmtime. To match calendars, which
+     use local time.
+   * img: Fill in missing height or width when scaling image.
+   * Remove example blog tag pages; allow autotag creation to create them
+     when used.
+   * Fix support for globbing in tagged() pagespecs.
+   * Fix display of sidebar when previewing page edit. (Thanks, privat)
+   * relativedate: Fix problem with localised dates not working.
+   * editpage: Avoid storing accidental state changes when previewing pages.
+   * page.tmpl: Add a div around the page content, and comments, to aide in
+     sidebar styling.
+   * style.css: Improvements to make floating sidebar fit much better on
+     pages with inlines.
+   * calendar: Shorten day names, and improve styling of month calendar.
+   * style.css: Reduced sidebar width back to 20ex from 30; the month calendar
+     will now fit in the smaller width, and 30 was feeling too large."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From a31ce0e97d1e1c476a1fcdb52a2d78cadb845557 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 16:17:38 -0400
Subject: remove old

---
 doc/news/version_3.20100427/discussion.mdwn | 9 ---------
 doc/news/version_3.20100501/discussion.mdwn | 1 -
 2 files changed, 10 deletions(-)
 delete mode 100644 doc/news/version_3.20100427/discussion.mdwn
 delete mode 100644 doc/news/version_3.20100501/discussion.mdwn

diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn
deleted file mode 100644
index 011f3d88f..000000000
--- a/doc/news/version_3.20100427/discussion.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-*TMPL_INCLUDE is no longer supported in any template used by ikiwiki. It used to be allowed in certian templates, but not in others.*
-
-Would it be possible to make that a config option?  Because I do use includes in my templates, and I don't allow users to edit templates, so it isn't a security loophole for me. --[[KathrynAndersen]]
-
-> I don't like config options that make wikis unsafe, but I should have
-> revisted enabling includes for templates read from the templatedir --
-> it's easy to do, and I've done it now. --[[Joey]] 
-
->> Thank you! --[[KathrynAndersen]]
diff --git a/doc/news/version_3.20100501/discussion.mdwn b/doc/news/version_3.20100501/discussion.mdwn
deleted file mode 100644
index fbf767afb..000000000
--- a/doc/news/version_3.20100501/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Thanks a lot for the HTML5 support! I'll have to try it some time soon.
-- 
cgit v1.2.3


From 15ef976fd26062b340bdbcb020f2a64f9cc9a672 Mon Sep 17 00:00:00 2001
From: "http://jblevins.org/" <http://jblevins.org/@web>
Date: Thu, 10 Jun 2010 22:11:00 +0000
Subject: Update URL

---
 doc/forum/wiki_name_in_page_titles.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/wiki_name_in_page_titles.mdwn b/doc/forum/wiki_name_in_page_titles.mdwn
index 01ff8d817..88711e99a 100644
--- a/doc/forum/wiki_name_in_page_titles.mdwn
+++ b/doc/forum/wiki_name_in_page_titles.mdwn
@@ -23,4 +23,4 @@ that provides a `IS_HOMEPAGE` template variable? --[[JasonBlevins]]
 >> few other small plugins brewing so I'll try to put up some contrib
 >> pages for them soon. --[[JasonBlevins]]
 
-[path]: http://code.jblevins.org/ikiwiki/plugins.git/plain/path.pm
+[path]: http://jblevins.org/git/ikiwiki/plugins.git/plain/path.pm
-- 
cgit v1.2.3


From 48a1dce15d870134358dacd2c2839e5c843a79e8 Mon Sep 17 00:00:00 2001
From: "http://jblevins.org/" <http://jblevins.org/@web>
Date: Thu, 10 Jun 2010 22:16:55 +0000
Subject: Update URL

---
 doc/bugs/external_links_inside_headings_don__39__t_work.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/external_links_inside_headings_don__39__t_work.mdwn b/doc/bugs/external_links_inside_headings_don__39__t_work.mdwn
index 5bab283fd..51d6ad475 100644
--- a/doc/bugs/external_links_inside_headings_don__39__t_work.mdwn
+++ b/doc/bugs/external_links_inside_headings_don__39__t_work.mdwn
@@ -21,4 +21,4 @@ It works fine with h2 and deeper.  The square brackets also appear in the output
 
 > [[done]] --[[Joey]]
 
->> It works here but it definitely does *not* work on my wiki; but on further experimentation, I believe my problem is being caused by JasonBlevins' [h1title](http://code.jblevins.org/ikiwiki/plugins.git/plain/h1title.pm) plugin.
+>> It works here but it definitely does *not* work on my wiki; but on further experimentation, I believe my problem is being caused by JasonBlevins' [h1title](http://jblevins.org/git/ikiwiki/plugins.git/plain/h1title.pm) plugin.
-- 
cgit v1.2.3


From be0f52095b21b64d15eee408e630038aefbcae49 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Fri, 11 Jun 2010 01:03:43 +0000
Subject: use PARENTLINKS

---
 doc/forum/wiki_name_in_page_titles.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/forum/wiki_name_in_page_titles.mdwn b/doc/forum/wiki_name_in_page_titles.mdwn
index 88711e99a..4e9e51835 100644
--- a/doc/forum/wiki_name_in_page_titles.mdwn
+++ b/doc/forum/wiki_name_in_page_titles.mdwn
@@ -24,3 +24,9 @@ that provides a `IS_HOMEPAGE` template variable? --[[JasonBlevins]]
 >> pages for them soon. --[[JasonBlevins]]
 
 [path]: http://jblevins.org/git/ikiwiki/plugins.git/plain/path.pm
+
+> I used the following trick in some page.tmpl:
+>
+>     <title><TMPL_VAR WIKINAME><TMPL_IF NAME="PARENTLINKS">: <TMPL_VAR TITLE></TMPL_IF></title>
+>
+> --[[JeanPrivat]]
-- 
cgit v1.2.3


From b6d00070a556e68d8e79eb5d64fe7a5ad2dbda18 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Fri, 11 Jun 2010 02:45:14 +0000
Subject: use the ikiwiki userdb outside of the ikiwiki edition access control

---
 doc/todo/htpasswd_mirror_of_the_userdb.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/todo/htpasswd_mirror_of_the_userdb.mdwn

diff --git a/doc/todo/htpasswd_mirror_of_the_userdb.mdwn b/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
new file mode 100644
index 000000000..0582a6f7a
--- /dev/null
+++ b/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
@@ -0,0 +1,17 @@
+[[!tag wishlist]]
+
+Ikiwiki is static, so access control for viewing the wiki must be implemented on the web server side. Managing wiki users and access together, we can currently
+
+* use [[httpauth|plugins/httpauth/]], but some [[passwordauth|plugins/passwordauth]] functionnality [[is missing|todo/httpauth_feature_parity_with_passwordauth/]];
+* use [[passwordauth|plugins/passwordauth]] plus [[an Apache `mod_perl` authentication mechanism|plugins/passwordauth/discussion/]], but this is Apache-centric and enabling `mod_perl` just for auth seems overkill.
+
+Moreover, when ikiwiki is just a part of a wider web project, we may want to use the same userdb for the other parts of this project.
+
+I think an ikiwiki plugin which would (re)generate an htpasswd version of the user/passwd base (better, two htpasswd files, one with only the wiki admins and one with everyone) each time an user is added or modified would solve this problem:
+
+* access control can be managed from the web server
+* user management is handled by the passwordauth plugin
+* htpasswd format is understood by various servers (Apache, lighttpd, nginx, ...) and languages commonly used for web development (perl, python, ruby)
+* htpasswd files can be mirrored on other machines when the web site is distributed
+
+-- [[nil]] 
-- 
cgit v1.2.3


From f0f0ba7bace1a07072ef401c53b3a2aa2b751209 Mon Sep 17 00:00:00 2001
From: dwabot <dwabot@web>
Date: Fri, 11 Jun 2010 04:33:40 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index fc66bcef9..8fb348c3d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -146,6 +146,7 @@ Personal sites and blogs
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
 * [Ertug Karamatli](http://pages.karamatli.com)
 * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
+* [Daniel Wayne Armstrong](http://circuidipity.com/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 6ba1cf7c3dc81d4a9d3c92b1e319051d40bf8daa Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 11 Jun 2010 11:14:34 +0000
Subject:

---
 doc/bugs/img_plugin_and_missing_heigth_value.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
index bcb17c330..4bc070c95 100644
--- a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
+++ b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
@@ -3,3 +3,5 @@ When I set up my picture page with `\[[!img  defaults size=300x]]` then the html
 > This is a bug. --[[Joey]]
 
 > And .. [[fixed|done]] --[[Joey]] 
+
+>> Not quite; For some reason it requires me to update wiki pages twice before the height value shows up.
-- 
cgit v1.2.3


From 77a3585e92a947610b1b26cdd7ce499bfefc21f6 Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Fri, 11 Jun 2010 13:53:06 +0000
Subject:

---
 doc/bugs/img_vs_align.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
index 6eff46178..641d3ff76 100644
--- a/doc/bugs/img_vs_align.mdwn
+++ b/doc/bugs/img_vs_align.mdwn
@@ -29,3 +29,7 @@ almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
 >> scripts again...
 >> 
 >> --[[tschwinge]]
+
+>>> It seems, the 'align=right' parameter gets filtered in my installation
+>>> Are there other plugins, that could throw the parameter away?
+>>> --[[jwalzer]]
-- 
cgit v1.2.3


From 475b4199e1624350b928a002fe83033ee3389b31 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 11 Jun 2010 13:53:56 -0400
Subject: openid: Add openid_realm and openid_cgiurl configuration options,
 useful in a few edge case setups.

---
 IkiWiki/Plugin/openid.pm | 27 ++++++++++++++++++++++++---
 debian/changelog         |  7 +++++++
 doc/plugins/openid.mdwn  | 16 ++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index e10e21f4d..57cb139ca 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -40,6 +40,18 @@ sub getsetup () {
 			rebuild => 0,
 			section => "auth",
 		},
+		openid_realm => {
+			type => "string",
+			description => "url of openid realm (default is cgiurl)",
+			safe => 0,
+			rebuild => 0,
+		},
+		openid_cgiurl => {
+			type => "string",
+			description => "url to ikiwiki cgi to use for openid authentication (default is cgiurl)",
+			safe => 0,
+			rebuild => 0,
+		},
 }
 
 sub openid_selector {
@@ -135,9 +147,15 @@ sub validate ($$$;$) {
 		);
 	}
 
+	my $cgiurl=$config{openid_cgiurl};
+	$cgiurl=$config{cgiurl} if ! defined $cgiurl;
+
+	my $trust_root=$config{openid_realm};
+	$trust_root=$cgiurl if ! defined $trust_root;
+
 	my $check_url = $claimed_identity->check_url(
-		return_to => IkiWiki::cgiurl(do => "postsignin"),
-		trust_root => $config{cgiurl},
+		return_to => "$cgiurl?do=postsignin",
+		trust_root => $trust_root,
 		delayed_return => 1,
 	);
 	# Redirect the user to the OpenID server, which will
@@ -220,12 +238,15 @@ sub getobj ($$) {
 		$secret=rand;
 		$session->param(openid_secret => $secret);
 	}
+	
+	my $cgiurl=$config{openid_cgiurl};
+	$cgiurl=$config{cgiurl} if ! defined $cgiurl;
 
 	return Net::OpenID::Consumer->new(
 		ua => $ua,
 		args => $q,
 		consumer_secret => sub { return shift()+$secret },
-		required_root => $config{cgiurl},
+		required_root => $cgiurl,
 	);
 }
 
diff --git a/debian/changelog b/debian/changelog
index 01307db55..9a6b1361c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100611) UNRELEASED; urgency=low
+
+  * openid: Add openid_realm and openid_cgiurl configuration options,
+    useful in a few edge case setups.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
+
 ikiwiki (3.20100610) unstable; urgency=low
 
   * creation_day() etc use local time, not gmtime. To match calendars, which
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 7da2f8575..3fb4c26b8 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -13,3 +13,19 @@ to support users entering "https" OpenID urls.
 
 This plugin is enabled by default, but can be turned off if you want to
 only use some other form of authentication, such as [[passwordauth]].
+
+## options
+
+These options do not normally need to be set, but can be useful in
+certian setups.
+
+* `openid_realm` can be used to control the scope of the openid request.
+  It defaults to the `cgiurl` (or `openid_cgiurl` if set); only allowing
+  ikiwiki's [[CGI]] to authenticate. If you have multiple ikiwiki instances,
+  or other things using openid on the same site, you may choose to put them
+  all in the same realm to improve the user's openid experience.
+
+* `openid_cgiurl` can be used to cause a different than usual `cgiurl`
+  to be used when doing openid authentication. The `openid_cgiurl` must
+  point to an ikiwiki [[CGI]], and it will need to match the `openid_realm`
+  to work.
-- 
cgit v1.2.3


From d5181a197732f1c6bb80fdf8c508568b8c4225c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 11 Jun 2010 14:14:20 -0400
Subject: realm is an url pattern

---
 IkiWiki/Plugin/openid.pm | 2 +-
 doc/plugins/openid.mdwn  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 57cb139ca..f4ba8db18 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -42,7 +42,7 @@ sub getsetup () {
 		},
 		openid_realm => {
 			type => "string",
-			description => "url of openid realm (default is cgiurl)",
+			description => "url pattern of openid realm (default is cgiurl)",
 			safe => 0,
 			rebuild => 0,
 		},
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 3fb4c26b8..f3b3abfbb 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -23,7 +23,8 @@ certian setups.
   It defaults to the `cgiurl` (or `openid_cgiurl` if set); only allowing
   ikiwiki's [[CGI]] to authenticate. If you have multiple ikiwiki instances,
   or other things using openid on the same site, you may choose to put them
-  all in the same realm to improve the user's openid experience.
+  all in the same realm to improve the user's openid experience. It is an
+  url pattern, so can be set to eg "http://*.example.com/"
 
 * `openid_cgiurl` can be used to cause a different than usual `cgiurl`
   to be used when doing openid authentication. The `openid_cgiurl` must
-- 
cgit v1.2.3


From 9923f5db65f85485d10cb2b5a10c42bb36168de7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 14:29:56 -0400
Subject: attachment: Show files from underlay in attachments list.

While those files cannot be removed or renamed, this allows easy
downloading of them, and a new version can after all be uploaded.
---
 IkiWiki/Plugin/attachment.pm | 3 +--
 debian/changelog             | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 8c3ff887a..53a65236c 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -225,8 +225,7 @@ sub attachment_list ($) {
 	my @ret;
 	foreach my $f (values %pagesources) {
 		if (! defined pagetype($f) &&
-		    $f=~m/^\Q$loc\E[^\/]+$/ &&
-		    -e "$config{srcdir}/$f") {
+		    $f=~m/^\Q$loc\E[^\/]+$/) {
 			push @ret, {
 				"field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
 				link => htmllink($page, $page, $f, noimageinline => 1),
diff --git a/debian/changelog b/debian/changelog
index 9a6b1361c..4e120c622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
 
   * openid: Add openid_realm and openid_cgiurl configuration options,
     useful in a few edge case setups.
+  * attachment: Show files from underlay in attachments list.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From d7cfcef54a067221b801de17fafc1f05a13c2004 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 16:16:24 -0400
Subject: img: Support hspace and vspace attributes.

---
 IkiWiki/Plugin/img.pm          | 12 ++++++++----
 debian/changelog               |  1 +
 doc/ikiwiki/directive/img.mdwn |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 48211454e..a69175ba6 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -156,14 +156,18 @@ sub preprocess (@) {
 		$imgurl="$config{url}/$imglink";
 	}
 
+	my $attrs='';
+	foreach my $attr (qw{alt title class id hspace vspace}) {
+		if (exists $params{$attr}) {
+			$attrs.=" $attr=\"$params{$attr}\"";
+		}
+	}
+	
 	my $imgtag='<img src="'.$imgurl.
 		'" width="'.$dwidth.
 		'" height="'.$dheight.'"'.
-		(exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
-		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
-		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
+		$attrs.
 		(exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
-		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
 		' />';
 
 	my $link;
diff --git a/debian/changelog b/debian/changelog
index 4e120c622..dcf589861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * openid: Add openid_realm and openid_cgiurl configuration options,
     useful in a few edge case setups.
   * attachment: Show files from underlay in attachments list.
+  * img: Support hspace and vspace attributes.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/ikiwiki/directive/img.mdwn b/doc/ikiwiki/directive/img.mdwn
index 94cc754bd..cda62b58f 100644
--- a/doc/ikiwiki/directive/img.mdwn
+++ b/doc/ikiwiki/directive/img.mdwn
@@ -18,7 +18,8 @@ making the image smaller than the specified size. You can also specify only
 the width or the height, and the other value will be calculated based on
 it: "200x", "x200"
 
-You can also pass `alt`, `title`, `class`, `align` and `id` parameters.
+You can also pass `alt`, `title`, `class`, `align`, `id`, `hspace`, and
+`vspace` parameters.
 These are passed through unchanged to the html img tag. If you include a
 `caption` parameter, the caption will be displayed centered beneath the image.
 
-- 
cgit v1.2.3


From 31fa7714e7a3eba6e34b601426047f2aa2f8db01 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 18:10:33 -0400
Subject: editpage: Rename "comments" field to avoid CSS conflict with the
 comments div.

---
 IkiWiki/Plugin/editpage.pm | 10 +++++-----
 debian/changelog           |  2 ++
 templates/editpage.tmpl    |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 3d731d399..21f1f1824 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -64,7 +64,7 @@ sub cgi_editpage ($$) {
 
 	decode_cgi_utf8($q);
 
-	my @fields=qw(do rcsinfo subpage from page type editcontent comments);
+	my @fields=qw(do rcsinfo subpage from page type editcontent editmessage);
 	my @buttons=("Save Page", "Preview", "Cancel");
 	eval q{use CGI::FormBuilder};
 	error($@) if $@;
@@ -144,7 +144,7 @@ sub cgi_editpage ($$) {
 	$form->field(name => "subpage", type => 'hidden');
 	$form->field(name => "page", value => $page, force => 1);
 	$form->field(name => "type", value => $type, force => 1);
-	$form->field(name => "comments", type => "text", size => 80);
+	$form->field(name => "editmessage", type => "text", size => 80);
 	$form->field(name => "editcontent", type => "textarea", rows => 20,
 		cols => 80);
 	$form->tmpl_param("can_commit", $config{rcs});
@@ -353,9 +353,9 @@ sub cgi_editpage ($$) {
 		}
 			
 		my $message="";
-		if (defined $form->field('comments') &&
-		    length $form->field('comments')) {
-			$message=$form->field('comments');
+		if (defined $form->field('editmessage') &&
+		    length $form->field('editmessage')) {
+			$message=$form->field('editmessage');
 		}
 		
 		my $content=$form->field('editcontent');
diff --git a/debian/changelog b/debian/changelog
index dcf589861..1d849f558 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
     useful in a few edge case setups.
   * attachment: Show files from underlay in attachments list.
   * img: Support hspace and vspace attributes.
+  * editpage: Rename "comments" field to avoid CSS conflict with the
+    comments div.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 36076cb35..b4b0d05df 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -23,8 +23,8 @@
 </li>
 <TMPL_IF NAME="CAN_COMMIT">
 <li>
-<label for="comments" class="block">Optional comment about this change:</label>
-<TMPL_VAR FIELD-COMMENTS><br />
+<label for="editmessage" class="block">Optional comment about this change:</label>
+<TMPL_VAR FIELD-EDITMESSAGE><br />
 </li>
 </TMPL_IF>
 </ol>
-- 
cgit v1.2.3


From c225cdad2524a12b998e550b6c0ba7079d164cff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 22:20:22 -0400
Subject: edittemplate: Make silent mode not disable display when the template
 page does not exist, so it can be easily created.

---
 IkiWiki/Plugin/edittemplate.pm | 3 ++-
 debian/changelog               | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index d65072010..742413c94 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -59,8 +59,9 @@ sub preprocess (@) {
 	my $bestlink=bestlink($params{page}, $link);
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 
-	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
 	add_depends($params{page}, $link, deptype("presence"));
+	return "" if ($params{silent} && IkiWiki::yesno($params{silent})) &&
+		length $bestlink;
 	return sprintf(gettext("edittemplate %s registered for %s"),
 		htmllink($params{page}, $params{destpage}, $link),
 	       	$params{match});
diff --git a/debian/changelog b/debian/changelog
index 1d849f558..d607640c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * img: Support hspace and vspace attributes.
   * editpage: Rename "comments" field to avoid CSS conflict with the
     comments div.
+  * edittemplate: Make silent mode not disable display when the template
+    page does not exist, so it can be easily created.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From dccd76487151acc6adc93ec79f1808096bc41324 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 22:43:34 -0400
Subject: edittemplate: Look for template pages under templates/ like
 everything else (still looks in old location for backwards compatability).

---
 IkiWiki/Plugin/edittemplate.pm |  7 ++++++-
 debian/changelog               |  2 ++
 doc/plugins/edittemplate.mdwn  |  4 ++--
 doc/templates.mdwn             | 16 +++++++++-------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 742413c94..226f83bb4 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -56,10 +56,15 @@ sub preprocess (@) {
 	}
 
 	my $link=linkpage($params{template});
+	add_depends($params{page}, $link, deptype("presence"));
 	my $bestlink=bestlink($params{page}, $link);
+	if (! length $bestlink) {
+		add_depends($params{page}, "templates/$link", deptype("presence"));
+		$link="/templates/".$link;
+		$bestlink=bestlink($params{page}, $link);
+	}
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 
-	add_depends($params{page}, $link, deptype("presence"));
 	return "" if ($params{silent} && IkiWiki::yesno($params{silent})) &&
 		length $bestlink;
 	return sprintf(gettext("edittemplate %s registered for %s"),
diff --git a/debian/changelog b/debian/changelog
index d607640c4..07b349c57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
     comments div.
   * edittemplate: Make silent mode not disable display when the template
     page does not exist, so it can be easily created.
+  * edittemplate: Look for template pages under templates/ like everything
+    else (still looks in old location for backwards compatability).
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn
index 85dfdfc2d..c19ecd858 100644
--- a/doc/plugins/edittemplate.mdwn
+++ b/doc/plugins/edittemplate.mdwn
@@ -2,5 +2,5 @@
 [[!tag type/web]]
 
 This plugin provides the [[ikiwiki/directive/edittemplate]] [[ikiwiki/directive]].
-This directive allows registering template pages, that provide default
-content for new pages created using the web frontend.
+This directive allows registering [[template|templates]] pages, that
+provide default content for new pages created using the web frontend.
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 22b9345ef..d7480ee8f 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -22,20 +22,22 @@ easy to learn. All you really need to know to modify templates is this:
 The template directive allows wiki pages to be used as templates,
 filled out and inserted into other pages in the wiki.
 """]]
-[[!if test="enabled(template) and enabled(inline)" then="""
-[[!inline pages="templates/* and !*.tmpl and !*/discussion"
-feeds=no archive=yes sort=title template=titlepage
-rootpage=templates postformtext="Add a new template named:"]]
-"""]]
 
 [[!if test="enabled(edittemplate)" then="""
-## edit templates
+## default content for new pages
 
 The edittemplate directive can be used to make new pages default to
-containing text from a template, which can be filled as out the page is
+containing text from a template page, which can be filled as out the page is
 edited.
 """]]
 
+[[!if test="(enabled(template) or enabled(edittemplate)
+and enabled(inline)" then="""
+[[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
+feeds=no archive=yes sort=title template=titlepage
+rootpage=templates postformtext="Add a new template named:"]]
+"""]]
+
 ## wiki templates
 
 These templates are used to build the wiki. The aim is to keep almost all
-- 
cgit v1.2.3


From 35a0715b9a7a84b222523e648e815cbcc21301ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 22:59:46 -0400
Subject: avoid ugly warning if size="" is specified

---
 IkiWiki/Plugin/img.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index a69175ba6..eb1b68124 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -39,7 +39,7 @@ sub preprocess (@) {
 		}
 	}
 
-	if (! exists $params{size}) {
+	if (! exists $params{size} || ! length $params{size}) {
 		$params{size}='full';
 	}
 
-- 
cgit v1.2.3


From c65658eeb5cd83417f3ec1c69eff2ebcd6a481db Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 23:00:30 -0400
Subject: attachment: When inserting links, insert img directives for images,
 if that plugin is enabled.

---
 IkiWiki/Plugin/attachment.pm | 9 ++++++++-
 debian/changelog             | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 53a65236c..9c774557f 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -195,7 +195,14 @@ sub formbuilder (@) {
 		foreach my $f ($q->param("attachment_select")) {
 			$f=Encode::decode_utf8($f);
 			$f=~s/^$page\///;
-			$add.="[[$f]]\n";
+			if (IkiWiki::isinlinableimage($f) &&
+			    UNIVERSAL::can("IkiWiki::Plugin::img", "import")) {
+				$add.='[[!img '.$f.' align="right" size="" alt=""]]';
+			}
+			else {
+				$add.="[[$f]]";
+			}
+			$add.="\n";
 		}
 		$form->field(name => 'editcontent',
 			value => $form->field('editcontent')."\n\n".$add,
diff --git a/debian/changelog b/debian/changelog
index 07b349c57..fd7d1569e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
     page does not exist, so it can be easily created.
   * edittemplate: Look for template pages under templates/ like everything
     else (still looks in old location for backwards compatability).
+  * attachment: When inserting links, insert img directives for images,
+    if that plugin is enabled.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From ec06929316180aad5719c9e9e0554fa8b075e846 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 01:12:04 -0400
Subject: typo

---
 doc/templates.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index d7480ee8f..056e24c50 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -31,7 +31,7 @@ containing text from a template page, which can be filled as out the page is
 edited.
 """]]
 
-[[!if test="(enabled(template) or enabled(edittemplate)
+[[!if test="(enabled(template) or enabled(edittemplate))
 and enabled(inline)" then="""
 [[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
 feeds=no archive=yes sort=title template=titlepage
-- 
cgit v1.2.3


From bbdc69b6999a38e2e075a9b90636283b34956d61 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 01:14:24 -0400
Subject: speling

---
 doc/templates.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 056e24c50..861d0bcbe 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -3,7 +3,7 @@ you can fully customise this site.
 
 Templates are located in `/usr/share/ikiwiki/templates` by default;
 the `templatedir` setting can be used to make another directory be
-searched first. Customized templates can also be placed inside the
+searched first. Customised templates can also be placed inside the
 "templates/" directory in your wiki's source.
 
 Ikiwiki uses the HTML::Template module as its template engine. This
@@ -44,7 +44,7 @@ These templates are used to build the wiki. The aim is to keep almost all
 html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
-  key template to customize. [[!if test="enabled(pagetemplate)" then="""
+  key template to customise. [[!if test="enabled(pagetemplate)" then="""
   (The pagetemplate directive can be used to make a page use a
   different template than `page.tmpl`.)"""]]
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
-- 
cgit v1.2.3


From 85546d570e36b85fce27755590ec6e8b8e1fce81 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 01:21:32 -0400
Subject: wording

---
 doc/examples/blog/posts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn
index 4b2939120..fa2dbef0e 100644
--- a/doc/examples/blog/posts.mdwn
+++ b/doc/examples/blog/posts.mdwn
@@ -1,3 +1,3 @@
-Here is a full list of posts to my [[blog|index]].
+Here is a full list of posts to the [[blog|index]].
 
 [[!inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
-- 
cgit v1.2.3


From c8e5552f8440e960fa3ce68c18a4dd00edc41384 Mon Sep 17 00:00:00 2001
From: "http://abhidg.wordpress.com/" <http://abhidg.wordpress.com/@web>
Date: Sun, 13 Jun 2010 12:37:16 +0000
Subject:

---
 doc/forum/wiki_clones_on_dynamic_IPs.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/forum/wiki_clones_on_dynamic_IPs.mdwn

diff --git a/doc/forum/wiki_clones_on_dynamic_IPs.mdwn b/doc/forum/wiki_clones_on_dynamic_IPs.mdwn
new file mode 100644
index 000000000..f69f6501e
--- /dev/null
+++ b/doc/forum/wiki_clones_on_dynamic_IPs.mdwn
@@ -0,0 +1,10 @@
+OK, this is not really a ikiwiki problem... but ikiwiki makes wiki clones
+really easy to setup, and this is related to having a website cloned at
+different places and pulling from the servers which are online.
+
+My setup is like this: I have a server at home and another at my dorm
+which will serve as a wiki clone. Each of them has a dynamic IP with DynDNS
+set up. Now the problem lies in linking my domain to these two DynDNS addresses.
+Multiple CNAMEs are not supported, and I don't know if there's any utility
+which can update the A records on the DNS to point directly point to the
+two separate IPs.
-- 
cgit v1.2.3


From ec3cadb0659e747e66c1cfd48a0475ee8bbe5bcb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 08:47:21 -0400
Subject: remove obsolete ol class=form for editpage and editcomment

The styling of labels on the form largely obsoleted the special styled ol,
so just a few br's sufficed. Using an ol like that was not too semantically
right (probably?) and could cause problems with customized local.css.
---
 doc/style.css              |  7 -------
 templates/editcomment.tmpl | 16 ++++------------
 templates/editpage.tmpl    |  9 +--------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 22c68bd7a..7c97a518c 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -338,13 +338,6 @@ label.block {
 label.inline {    
 	display: inline;
 }
-ol.form {
-	list-style: none;
-	padding: 0;
-}
-li.form {
-	padding-bottom: 1em;
-}
 input#openid_identifier {
 	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
 	background-color: #fff;
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index f3a8e7395..a2edc691e 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -1,35 +1,27 @@
 <div class="editcomment">
 <TMPL_VAR MESSAGE>
+<br />
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
-<ol class="form">
 <TMPL_UNLESS NAME=USERNAME>
 <TMPL_IF NAME=ALLOWAUTHOR>
-<li>
 <label for="author" class="block">Name:</label>
 <TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>)
-</li>
-<li>
+<br/>
 <label for="url" class="block">Website:</label>
 <TMPL_VAR NAME=FIELD-URL> (optional)
-</li>
+<br />
 <TMPL_ELSE>
-<li>
 (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)
-</li>
+<br />
 </TMPL_IF>
 </TMPL_UNLESS>
-<li>
 <label for="subject" class="block">Subject:</label>
 <TMPL_VAR FIELD-SUBJECT><br />
-</li>
-<li>
 <label for="editcontent" class="block">Comment:</label>
 <TMPL_VAR FIELD-EDITCONTENT><br />
-</li>
-</ol>
 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
 <TMPL_VAR NAME="FORM-END">
 <TMPL_VAR WMD_PREVIEW>
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index b4b0d05df..d6ad80614 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,33 +1,26 @@
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
+<br />
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
-<ol class="form">
 <TMPL_IF NAME="PAGE_SELECT">
-<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>
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
-<li>
 <div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
 </div>
-</li>
 <TMPL_IF NAME="CAN_COMMIT">
-<li>
 <label for="editmessage" class="block">Optional comment about this change:</label>
 <TMPL_VAR FIELD-EDITMESSAGE><br />
-</li>
 </TMPL_IF>
-</ol>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_IF NAME="FIELD-ATTACHMENT">
-- 
cgit v1.2.3


From 89a970bd7d8cccf5362985ae293aba5626429095 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 09:11:59 -0400
Subject: response

---
 doc/bugs/img_vs_align.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
index 641d3ff76..c78465a37 100644
--- a/doc/bugs/img_vs_align.mdwn
+++ b/doc/bugs/img_vs_align.mdwn
@@ -33,3 +33,6 @@ almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
 >>> It seems, the 'align=right' parameter gets filtered in my installation
 >>> Are there other plugins, that could throw the parameter away?
 >>> --[[jwalzer]]
+
+>>>> Can't think of anything. htmlscrubber doesn't; tidy doesn't.
+>>>> --[[Joey]] 
-- 
cgit v1.2.3


From 17592a951bf06ede47f500af25308e9c68944279 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 10:21:19 -0400
Subject: websetup: Allow enabling plugins listed in disable_plugins.

The bug here was that disabling a plugin included thru goodstuff, like
htmlscrubber, caused it to be added to disable_plugins, and those plugins
were never loaded, so could not be re-enabled. Fix by allowing them to be
force loaded when appropriate. (Also that allows disabled plugins to still
record their setup options when dumping a setup file.)
---
 IkiWiki.pm       | 5 +++--
 IkiWiki/Setup.pm | 2 +-
 debian/changelog | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d2ed99923..203da3ba2 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -592,10 +592,11 @@ sub loadplugins () {
 	return 1;
 }
 
-sub loadplugin ($) {
+sub loadplugin ($;$) {
 	my $plugin=shift;
+	my $force=shift;
 
-	return if grep { $_ eq $plugin} @{$config{disable_plugins}};
+	return if ! $force && grep { $_ eq $plugin} @{$config{disable_plugins}};
 
 	foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
 	                 "$installdir/lib/ikiwiki") {
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index ee5be95d2..2b0259e2a 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -123,7 +123,7 @@ sub getsetup () {
 	# Load all plugins, so that all setup options are available.
 	my @plugins=IkiWiki::listplugins();
 	foreach my $plugin (@plugins) {
-		eval { IkiWiki::loadplugin($plugin) };
+		eval { IkiWiki::loadplugin($plugin, 1) };
 		if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
 			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
 		}
diff --git a/debian/changelog b/debian/changelog
index fd7d1569e..52b727440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
     else (still looks in old location for backwards compatability).
   * attachment: When inserting links, insert img directives for images,
     if that plugin is enabled.
+  * websetup: Allow enabling plugins listed in disable_plugins.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From 9f7a118ffc4c16c0810ce8f5ecaa0b6a577f523f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 10:23:05 -0400
Subject: more symetric enable/disable

Removing a plugin from add_plugins is not always enough to disable it.
It may have been redundantly added there and also pulled in via goodstuff.
Always add didabled plugins to disable_plugins.
---
 IkiWiki/Plugin/websetup.pm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index c4b75c4b3..11b4428e3 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -253,12 +253,8 @@ sub enable_plugin ($) {
 sub disable_plugin ($) {
 	my $plugin=shift;
 
-	if (grep { $_ eq $plugin } @{$config{add_plugins}}) {
-		$config{add_plugins}=[grep { $_ ne $plugin } @{$config{add_plugins}}];
-	}
-	else {
-		push @{$config{disable_plugins}}, $plugin;
-	}
+	$config{add_plugins}=[grep { $_ ne $plugin } @{$config{add_plugins}}];
+	push @{$config{disable_plugins}}, $plugin;
 }
 
 sub showform ($$) {
-- 
cgit v1.2.3


From 8746480c259a9d52b1661f6832428cfeeb3458bd Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Mon, 14 Jun 2010 13:54:43 +0000
Subject: Reopen the bug since it is not fixed

---
 ...espect_the_current_page___40__if_any__41__.mdwn | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index f1e4649ff..c6f1cef3d 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -24,6 +24,15 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 > The [[version_3.20100515]] announcment mentions that you need to
 > update old `page.tmpl` files to include that on upgrade. --[[Joey]]
 
+>> I followed the anouncment. I also disabled my custom page.tmpl to confirm the bug. I even produced a step-by-step example to reproduce the bug.
+>> In fact, the base tag work for the page links (the content part) but did not works for the sidebar links (the sidebar part) since the sidebar links are generated in the context of the root page.
+>> In the examble above:
+>>
+>> * base="http://www.example.com/bar" relative_link_in_bar=''something" -> absolute_link_in_bar = "http://www.example.com/bar/something" (that is fine)
+>> * base="http://www.example.com/bar" relative_link_in_sidebar="foo" (because generated in the context of the root page) -> absolute_link_in_sidebar = "http://www.example.com/bar/foo" (that is not fine)
+>>
+>> The fix commited work for previewing, but not in other cases : links are still broken. Please juste follow the example step-by-step to reproduce it (I just retried it with a "fixed" version: Debian 3.20100610). If you cannot reproduce, please say it explicitely instead of guessing about my innability to read changelogs. -- [[JeanPrivat]]
+
 ### A second example
 
 * create "/bar/sidebar.mdwn" with "world"
@@ -39,6 +48,13 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 > the "are you sure" confirmation page to display the page's sidebar?
 > --[[Joey]]
 
+>> It is a very good point and could be argued:
+>>
+>> * for dynamic page, is the root context more legitimate than the current page context?
+>> * when clicking the Edit link, does the user expect to remain in the "same page"?
+>>
+>> But, as far as something sensible is displayed and that the links work. I'm OK with any choice. -- [[JeanPrivat]]
+
 ### A last example
 
 * with the web browser edit the page "bar"
@@ -54,6 +70,13 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 > put the sidebar anywhere so we can't just display the preview sidebar
 > next to the rest of the page preview. --[[Joey]]
 
+>> The behavior is fine for me. However, some nitpicking (fell free to ingore) :
+>>
+>> * If the sidebar is replaced (making the previewing in-place), for consitency, should not the previewed content also shown in-place ? i.e. above the form part
+>> * there is no way to come back (without saving or canceling) to the root context (e.g. displaying the root sidebar) i.e. some sort of unpreviewing.
+>>
+>> -- [[JeanPrivat]]
+
 ## Some superficial hacking
 
 With the following workaround hacks, I manage to solve the 3 examples shown above:
@@ -70,5 +93,5 @@ this bug but it may help developers to find and solve the real problem.
 
 > Oh, it's pretty reasonable. I don't think it breaks anything. :)
 > I modified it a bit, and explicitly made it *not* "fix" the second example.
-> [[done]]
 > --[[Joey]] 
+>> I removed the done tag (I suspect it is the way to reopen bugs) -- [[JeanPrivat]]
-- 
cgit v1.2.3


From 5071a8eb734d090fd790ae1b9ceafe549c33cda2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 12:35:21 -0400
Subject: limit blog inlines to pages

This way images attached to blog posts don't show up as enclosures in the
blog by default.
---
 doc/examples/blog/index.mdwn | 2 +-
 doc/examples/blog/posts.mdwn | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 220c1b3e3..7914cd203 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -4,7 +4,7 @@
 [[!inline pages=sidebar raw=yes]]
 """]]
 
-[[!inline pages="./posts/* and !*/Discussion" show="10"
+[[!inline pages="page(./posts/*) and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
 
diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn
index fa2dbef0e..08e014838 100644
--- a/doc/examples/blog/posts.mdwn
+++ b/doc/examples/blog/posts.mdwn
@@ -1,3 +1,3 @@
 Here is a full list of posts to the [[blog|index]].
 
-[[!inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
+[[!inline pages="page(./posts/*) and !*/Discussion" archive=yes feedshow=10 quick=yes]]
-- 
cgit v1.2.3


From 88b080f8a40840c62abd76fbf0330cb580713f1f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 14:10:59 -0400
Subject: simplify, avoid confusing suggestions

Don't even talk about ACLs, and more strongly discourage directly
committing to ikiwiki's srcdir.
---
 doc/rcs/git.mdwn | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 000eb0b3c..c627792d7 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -28,12 +28,7 @@ updates the published  wiki itself.
 
 The other (optional) leaf node repositories are meant for you to work
 on, and commit to, changes should then be pushed to the bare root
-repository.  In theory, you could work on the same leaf node repository
-that ikiwiki uses to compile the wiki from, and the [[cgi]] commits
-to, as long as you ensure that permissions and ownership don't hinder
-the working of the [[cgi]]. This can be done, for example, by using
-ACL's, in practice, it is easier to just setup separate clones for
-yourself.
+repository.
 
 So, to reiterate, when using Git, you probably want to set up three
 repositories:
@@ -41,9 +36,9 @@ repositories:
 * The root repository. This should be a bare repository (meaning that
   it does not have a working tree checked out), which the other
   repositories will push to/pull from.  It is a bare repository, since
-  there are problems pushing to a repository that has a working
+  git does not support pushing to a repository that has a working
   directory. This is called _repository_ in [[ikiwiki-makerepo]]'s
-  manual page. Nominally, this bare repository has a `post-update` hook
+  manual page. This bare repository has a `post-update` hook
   that either is or calls ikiwiki's git wrapper, which changes to the
   working directory for ikiwiki, does a `git pull`, and refreshes ikiwiki
   to regenerate the wiki with any new content. The [[setup]] page describes
@@ -51,10 +46,11 @@ repositories:
 
 * The second repository is a clone of the bare root repository, and
   has a working tree which is used as ikiwiki's srcdir for compiling
-  the wiki. **Never** push to this repository. When running as a
-  [[cgi]], the changes are committed to this repository, and pushed to
-  the master repository above. This is called _srcdir_ in
-  [[ikiwiki-makerepo]]'s manual page.
+  the wiki. **Never** push to this repository. It is wise to not make
+  changes or commits directly to this repository, to avoid conflicting
+  with ikiwiki's own changes. When running as a [[cgi]], the changes
+  are committed to this repository, and pushed to the master repository
+  above. This is called _srcdir_ in [[ikiwiki-makerepo]]'s manual page.
 
 * The other (third, fourth, fifth, sixth -- however many pleases you)
   repositories are also clones of the bare root repository above --
@@ -87,8 +83,8 @@ It can be tricky to get the permissions right to allow multiple people to
 commit to an ikiwiki git repository. As the [[security]] page mentions,
 for a secure ikiwiki installation, only one person should be able to write
 to ikiwiki's srcdir. When other committers make commits, their commits
-should go to the bare repository, which has a `post-update` hook that uses
-ikiwiki to pull the changes to the srcdir.
+should be pushed to the bare repository, which has a `post-update` hook
+that uses ikiwiki to pull the changes to the srcdir.
 
 One setup that will work is to put all committers in a group (say,
 "ikiwiki"), and use permissions to allow that group to commit to the bare git
-- 
cgit v1.2.3


From f9dc2bf8598033c2bc74229073323d97fe83e50a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 14:14:43 -0400
Subject: good idea

---
 doc/todo/htpasswd_mirror_of_the_userdb.mdwn | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/doc/todo/htpasswd_mirror_of_the_userdb.mdwn b/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
index 0582a6f7a..e4a411780 100644
--- a/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
+++ b/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
@@ -1,13 +1,19 @@
 [[!tag wishlist]]
 
-Ikiwiki is static, so access control for viewing the wiki must be implemented on the web server side. Managing wiki users and access together, we can currently
+Ikiwiki is static, so access control for viewing the wiki must be
+implemented on the web server side. Managing wiki users and access
+together, we can currently
 
 * use [[httpauth|plugins/httpauth/]], but some [[passwordauth|plugins/passwordauth]] functionnality [[is missing|todo/httpauth_feature_parity_with_passwordauth/]];
 * use [[passwordauth|plugins/passwordauth]] plus [[an Apache `mod_perl` authentication mechanism|plugins/passwordauth/discussion/]], but this is Apache-centric and enabling `mod_perl` just for auth seems overkill.
 
-Moreover, when ikiwiki is just a part of a wider web project, we may want to use the same userdb for the other parts of this project.
+Moreover, when ikiwiki is just a part of a wider web project, we may want
+to use the same userdb for the other parts of this project.
 
-I think an ikiwiki plugin which would (re)generate an htpasswd version of the user/passwd base (better, two htpasswd files, one with only the wiki admins and one with everyone) each time an user is added or modified would solve this problem:
+I think an ikiwiki plugin which would (re)generate an htpasswd version of
+the user/passwd base (better, two htpasswd files, one with only the wiki
+admins and one with everyone) each time an user is added or modified would
+solve this problem:
 
 * access control can be managed from the web server
 * user management is handled by the passwordauth plugin
@@ -15,3 +21,9 @@ I think an ikiwiki plugin which would (re)generate an htpasswd version of the us
 * htpasswd files can be mirrored on other machines when the web site is distributed
 
 -- [[nil]] 
+
+> I think this is a good idea. Although unless the password hashes that
+> are stored in the userdb are compatible with htpasswd hashes, 
+> the htpasswd hashes will need to be stored in the userdb too. Then
+> any userdb change can just regenerate the htpasswd file, dumping out
+> the right kind of hashes. --[[Joey]] 
-- 
cgit v1.2.3


From c0bc2d08398ae5cfa6becba155a2127a481a4d5e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 14:34:52 -0400
Subject: editpage, comments: Fix broken links in sidebar (due to
 forcebaseurl). (Thanks, privat)

---
 IkiWiki/Plugin/comments.pm                                   |  2 +-
 IkiWiki/Plugin/editpage.pm                                   | 12 +++++-------
 debian/changelog                                             |  2 ++
 ...does_not_respect_the_current_page___40__if_any__41__.mdwn |  2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index b244a7431..d204a7737 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -537,7 +537,7 @@ sub editcomment ($$) {
 	}
 	else {
 		IkiWiki::showform ($form, \@buttons, $session, $cgi,
-			forcebaseurl => $baseurl);
+			forcebaseurl => $baseurl, page => $page);
 	}
 
 	exit;
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 21f1f1824..3ba6c519e 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -313,9 +313,7 @@ sub cgi_editpage ($$) {
 		}
 		
 		showform($form, \@buttons, $session, $q,
-			forcebaseurl => $baseurl,
-			($previewing ? (page => $page) : ()),
-		);
+			forcebaseurl => $baseurl, page => $page);
 	}
 	else {
 		# save page
@@ -333,7 +331,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 		elsif ($form->field("do") eq "create" && $exists) {
@@ -348,7 +346,7 @@ sub cgi_editpage ($$) {
 				         "\n\n\n".$form->field("editcontent"),
 				force => 1);
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 			
@@ -389,7 +387,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 		
@@ -428,7 +426,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 		}
 		else {
 			# The trailing question mark tries to avoid broken
diff --git a/debian/changelog b/debian/changelog
index 52b727440..32ba0cf08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * attachment: When inserting links, insert img directives for images,
     if that plugin is enabled.
   * websetup: Allow enabling plugins listed in disable_plugins.
+  * editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
+    (Thanks, privat)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index c6f1cef3d..adf0ec745 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -33,6 +33,8 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 >>
 >> The fix commited work for previewing, but not in other cases : links are still broken. Please juste follow the example step-by-step to reproduce it (I just retried it with a "fixed" version: Debian 3.20100610). If you cannot reproduce, please say it explicitely instead of guessing about my innability to read changelogs. -- [[JeanPrivat]]
 
+>>> Sorry if my not seeing the bug offended you. [[Fixed|done]] --[[Joey]] 
+
 ### A second example
 
 * create "/bar/sidebar.mdwn" with "world"
-- 
cgit v1.2.3


From ba00ff81c02680ff9f9ccf1ce74b10138e54fa62 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 16:35:12 -0400
Subject: add links to mentioned directives

Using the !iki shortcut, since the directive pages may not be included in
the basewiki.
---
 doc/templates.mdwn | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 861d0bcbe..5c8d9a99c 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -19,16 +19,17 @@ easy to learn. All you really need to know to modify templates is this:
 [[!if test="enabled(template)" then="""
 ## template pages
 
-The template directive allows wiki pages to be used as templates,
-filled out and inserted into other pages in the wiki.
+The [[!iki ikiwiki/directive/template desc="template directive"]] allows
+wiki pages to be used as templates, filled out and inserted into other
+pages in the wiki.
 """]]
 
 [[!if test="enabled(edittemplate)" then="""
 ## default content for new pages
 
-The edittemplate directive can be used to make new pages default to
-containing text from a template page, which can be filled as out the page is
-edited.
+The [[!iki ikiwiki/directive/template desc="edittemplate directive"]] can
+be used to make new pages default to containing text from a template
+page, which can be filled as out the page is edited.
 """]]
 
 [[!if test="(enabled(template) or enabled(edittemplate))
@@ -45,8 +46,8 @@ html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
   key template to customise. [[!if test="enabled(pagetemplate)" then="""
-  (The pagetemplate directive can be used to make a page use a
-  different template than `page.tmpl`.)"""]]
+  (The [[!iki ikiwiki/directive/template desc="pagetemplate directive"]]
+  can be used to make a page use a different template than `page.tmpl`.)"""]]
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
 * `atompage.tmpl` - Used for generating atom feeds for blogs.
-- 
cgit v1.2.3


From 4e18d4415b49bbcc4a43db22ee4473a8c99f0eb2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 16:36:54 -0400
Subject: fix links

---
 doc/templates.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 5c8d9a99c..9eb12e819 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -27,7 +27,7 @@ pages in the wiki.
 [[!if test="enabled(edittemplate)" then="""
 ## default content for new pages
 
-The [[!iki ikiwiki/directive/template desc="edittemplate directive"]] can
+The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can
 be used to make new pages default to containing text from a template
 page, which can be filled as out the page is edited.
 """]]
@@ -46,7 +46,7 @@ html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
   key template to customise. [[!if test="enabled(pagetemplate)" then="""
-  (The [[!iki ikiwiki/directive/template desc="pagetemplate directive"]]
+  (The [[!iki ikiwiki/directive/pagetemplate desc="pagetemplate directive"]]
   can be used to make a page use a different template than `page.tmpl`.)"""]]
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
-- 
cgit v1.2.3


From 696d54545a82e862fa9f87749f6f66b5bd141d7f Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Tue, 15 Jun 2010 03:41:34 +0000
Subject:

---
 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
new file mode 100644
index 000000000..d328f4c14
--- /dev/null
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -0,0 +1 @@
+I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesign for my wiki, I have changed the `autotag.tmpl` template, but IkiWiki refuses to rebuild existing tag pages using the updated template. I understand that existing tag pages are not rebuilt because they have been marked as "created" in `.ikiwiki/indexdb`. Is there a way purge all tag pages from `indexdb`? --dkobozev
-- 
cgit v1.2.3


From b1a7972ea0ee02851943552d1c9c96a84d35e83e Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Tue, 15 Jun 2010 03:43:48 +0000
Subject: typo

---
 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index d328f4c14..44833b11f 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -1 +1 @@
-I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesign for my wiki, I have changed the `autotag.tmpl` template, but IkiWiki refuses to rebuild existing tag pages using the updated template. I understand that existing tag pages are not rebuilt because they have been marked as "created" in `.ikiwiki/indexdb`. Is there a way purge all tag pages from `indexdb`? --dkobozev
+I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesign for my wiki, I have changed the `autotag.tmpl` template, but IkiWiki refuses to rebuild existing tag pages using the updated template. I understand that existing tag pages are not rebuilt because they have been marked as "created" in `.ikiwiki/indexdb`. Is there a way to purge all tag pages from `indexdb`? --dkobozev
-- 
cgit v1.2.3


From b39630c16cd663bd39f4fc787407928c44010a24 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Tue, 15 Jun 2010 13:33:16 +0000
Subject: Thanks

---
 ...sctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index adf0ec745..3b0347f5f 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -35,6 +35,8 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 
 >>> Sorry if my not seeing the bug offended you. [[Fixed|done]] --[[Joey]] 
 
+>>>> Thanks! --[[JeanPrivat]] (I'm not offended)
+
 ### A second example
 
 * create "/bar/sidebar.mdwn" with "world"
-- 
cgit v1.2.3


From 919df4ae9c0372506feebee41821e4de2c78cb91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 13:33:43 -0400
Subject: fix labels for form elements

The label for attribute must correspond to the element id (not name).
And it needs to be unique inside the loop.
---
 templates/commentmoderation.tmpl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl
index 10f2b36df..dfa63c20b 100644
--- a/templates/commentmoderation.tmpl
+++ b/templates/commentmoderation.tmpl
@@ -4,7 +4,7 @@
 <input type="hidden" name="do" value="commentmoderation" />
 <input type="hidden" name="sid" value="<TMPL_VAR SID>" />
 <input type="submit" value="Submit" />
-<input type="checkbox" name="rejectalldefer" value="1" />
+<input id="rejectalldefer" type="checkbox" name="rejectalldefer" value="1" />
 <label for="rejectalldefer">Reject all comments marked <em>Defer</em></label>
 <br />
 <TMPL_LOOP COMMENTS>
@@ -12,18 +12,18 @@
 <div>
 <TMPL_VAR VIEW>
 </div>
-<input type="radio" value="Defer" name="<TMPL_VAR ID>" checked="checked" />
-<label for="Defer">Defer</label>
-<input type="radio" value="Accept" name="<TMPL_VAR ID>" />
-<label for="Accept">Accept</label>
-<input type="radio" value="Reject" name="<TMPL_VAR ID>" />
-<label for="Reject">Reject</label>
+<input id="defer_<TMPL_VAR ID>" type="radio" value="Defer" name="<TMPL_VAR ID>" checked="checked" />
+<label for="defer_<TMPL_VAR ID>">Defer</label>
+<input id="dccept_<TMPL_VAR ID>" type="radio" value="Accept" name="<TMPL_VAR ID>" />
+<label for="dccept_<TMPL_VAR ID>">Accept</label>
+<input id="reject_<TMPL_VAR ID>" type="radio" value="Reject" name="<TMPL_VAR ID>" />
+<label for="reject_<TMPL_VAR ID>">Reject</label>
 </div>
 <br />
 </TMPL_LOOP>
 <input type="submit" value="Submit" />
-<input type="checkbox" name="rejectalldefer" value="1" />
-<label for="rejectalldefer">Reject all comments marked <em>Defer</em></label>
+<input id="rejectalldefer2" type="checkbox" name="rejectalldefer" value="1" />
+<label for="rejectalldefer2">Reject all comments marked <em>Defer</em></label>
 </form>
 <TMPL_ELSE>
 <p>
-- 
cgit v1.2.3


From d541cc854a6e610d2d9f5f7b950f4abb76e36954 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 13:38:19 -0400
Subject: calendar: Tune archive_pagespec to only match pages, not other files.

---
 IkiWiki/Plugin/calendar.pm | 2 +-
 auto-blog.setup            | 2 +-
 debian/changelog           | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 359c9b861..bb995d499 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -49,7 +49,7 @@ sub getsetup () {
 		},
 		archive_pagespec => {
 			type => "pagespec",
-			example => "posts/* and !*/Discussion",
+			example => "page(posts/*) and !*/Discussion",
 			description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command",
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
diff --git a/auto-blog.setup b/auto-blog.setup
index ef03295d6..980074ec3 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -46,7 +46,7 @@ IkiWiki::Setup::Automator->import(
 	example => "blog",
 	comments_pagespec => "posts/* and !*/Discussion",
 	blogspam_pagespec => "postcomment(*)",
-	archive_pagespec => "posts/* and !*/Discussion",
+	archive_pagespec => "page(posts/*) and !*/Discussion",
 	global_sidebars => 0,
 	discussion => 0,
 	locked_pages => "*",
diff --git a/debian/changelog b/debian/changelog
index 32ba0cf08..bddedeafa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * websetup: Allow enabling plugins listed in disable_plugins.
   * editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
     (Thanks, privat)
+  * calendar: Tune archive_pagespec to only match pages, not other files.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From 3adde7a38c014e836f93432f1da67ef3e2399769 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 13:44:42 -0400
Subject: clear floats before comments begin

---
 doc/style.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/style.css b/doc/style.css
index 7c97a518c..bf000dae1 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -62,10 +62,9 @@ nav {
 	margin-top: .4em;
 }
 
-.pagefooter {
-	clear: both;
-}
-.inlinefooter {
+.pagefooter,
+.inlinefooter,
+.comments {
 	clear: both;
 }
 
-- 
cgit v1.2.3


From ad858475e774672c8805cb91431f0b7cb5c2da8d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 14:17:23 -0400
Subject: match only pages in calendar

---
 doc/examples/blog/sidebar.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index 5c1f17723..e0895f63f 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -1,5 +1,5 @@
 [[!if test="enabled(calendar)" then="""
-[[!calendar pages="./posts/* and !*/Discussion"]]
+[[!calendar pages="page(./posts/*) and !*/Discussion"]]
 """]]
 
 [[Recent Comments|comments]]
-- 
cgit v1.2.3


From 17be286cc347bd6e48b174482ed10f3f46639961 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 15:15:39 -0400
Subject: note

---
 doc/tips/yaml_setup_files.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/tips/yaml_setup_files.mdwn b/doc/tips/yaml_setup_files.mdwn
index 4ae0de4aa..e8ab4f144 100644
--- a/doc/tips/yaml_setup_files.mdwn
+++ b/doc/tips/yaml_setup_files.mdwn
@@ -7,4 +7,6 @@ the new YAML format recently added to ikiwiki.
 
 The format of the YAML setup file should be fairly self-explanatory.
 
+(To convert the other way, use "setuptype=Standard" instead.)
+
 --[[Joey]]
-- 
cgit v1.2.3


From 69383fb6b0820360ad54122d79a3c64909d01a9d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 16:40:37 -0400
Subject: Fix issues with combining unicode srcdirs and source files.

A short story:

  Once there was a unicode string, let's call him Srcdir.

  Along came a crufy old File::Find, who went through a tree and pasted each
  of the leaves in turn onto Srcdir. But this 90's relic didn't decode the
  leaves -- despite some of them using unicode! Poor Srcdir, with these
  leaves stuck on him, tainted them with his nice unicode-ness. They didn't
  look like leaves at all, but instead garbage.

In other words, perl's unicode support sucks mightily, and drives
us all to drink and bad storytelling. But we knew that..

So, srcdir is not normally flagged as unicode, because typically it's pure
ascii. And in that case, things work ok; File::Find finds filenames, which
are not yet decoded to unicode, and appends them to the srcdir, and then
decode_utf8 happily converts the whole thing.

But, if the srcdir does contain utf8 characters, that breaks. Or, if a Yaml
setup file is used, Yaml::Syck's implicitunicode sets the unicode flag of
*all* strings, even those containing only ascii. In either case, srcdir
has the unicode flag set; a non-decoded filename is appended, and
decode_utf8 sees the flag and does *nothing*. The result is that the
filename is not decoded, so looks valid and gets skipped.

File::Find only sticks the directory and filenames together in no_chdir
mode .. but we need that mode for security. In order to retain the
security, and avoid the problem, I made it not pass srcdir to File::Find.
Instead, chdir to the srcdir, and pass ".". Since "." is ascii, the problem
is avoided.

Note that it takes care to chdir back to the starting location. Because
the user may have specified relative paths and so staying in the srcdir
might break. A relative path could even be specifed for an underlay dir, so
it chdirs back after each.
---
 IkiWiki/Render.pm | 19 ++++++++++++++-----
 debian/changelog  |  1 +
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index f9fbc801f..0e7aa9a48 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -292,12 +292,11 @@ sub find_src_files () {
 	eval q{use File::Find};
 	error($@) if $@;
 
-	my ($page, $dir, $underlay);
+	my ($page, $underlay);
 	my $helper=sub {
 		my $file=decode_utf8($_);
-
 		return if -l $file || -d _;
-		$file=~s/^\Q$dir\E\/?//;
+		$file=~s/^\Q.\/\E//;
 		return if ! length $file;
 		$page = pagename($file);
 		if (! exists $pagesources{$page} &&
@@ -330,17 +329,27 @@ sub find_src_files () {
 		}
 	};
 
+	eval q{use Cwd};
+	die $@ if $@;
+	my $origdir=getcwd();
+
+	chdir($config{srcdir}) || die "chdir: $!";
 	find({
 		no_chdir => 1,
 		wanted => $helper,
-	}, $dir=$config{srcdir});
+	}, '.');
+	chdir($origdir) || die "chdir: $!";
+
 	$underlay=1;
 	foreach (@{$config{underlaydirs}}, $config{underlaydir}) {
+		chdir($_) || die "chdir: $!";
 		find({
 			no_chdir => 1,
 			wanted => $helper,
-		}, $dir=$_);
+		}, '.');
+		chdir($origdir) || die "chdir: $!";
 	};
+
 	return \@files, \%pages;
 }
 
diff --git a/debian/changelog b/debian/changelog
index bddedeafa..16f14b3a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
     (Thanks, privat)
   * calendar: Tune archive_pagespec to only match pages, not other files.
+  * Fix issues with combining unicode srcdirs and source files.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From 86a43aefb4f4c79a2044caf847622d0a00cd5356 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 16:40:37 -0400
Subject: Fix issues with combining unicode srcdirs and source files.

A short story:

  Once there was a unicode string, let's call him Srcdir.

  Along came a crufy old File::Find, who went through a tree and pasted each
  of the leaves in turn onto Srcdir. But this 90's relic didn't decode the
  leaves -- despite some of them using unicode! Poor Srcdir, with these
  leaves stuck on him, tainted them with his nice unicode-ness. They didn't
  look like leaves at all, but instead garbage.

(In other words, perl's unicode support sucks mightily, and drives
us all to drink and bad storytelling. But we knew that..)

So, srcdir is not normally flagged as unicode, because typically it's pure
ascii. And in that case, things work ok; File::Find finds filenames, which
are not yet decoded to unicode, and appends them to the srcdir, and then
decode_utf8 happily converts the whole thing.

But, if the srcdir does contain utf8 characters, that breaks. Or, if a Yaml
setup file is used, Yaml::Syck's implicitunicode sets the unicode flag of
*all* strings, even those containing only ascii. In either case, srcdir
has the unicode flag set; a non-decoded filename is appended, and the flag
remains set; and decode_utf8 sees the flag and does *nothing*. The result
is that the filename is not decoded, so looks valid and gets skipped.

File::Find only sticks the directory and filenames together in no_chdir
mode .. but we need that mode for security. In order to retain the
security, and avoid the problem, I made it not pass srcdir to File::Find.
Instead, chdir to the srcdir, and pass ".". Since "." is ascii, the problem
is avoided.

Note that chdir srcdir is safe because we check for symlinks in the srcdir
path.

Note that it takes care to chdir back to the starting location. Because
the user may have specified relative paths and so staying in the srcdir
might break. A relative path could even be specifed for an underlay dir, so
it chdirs back after each.
---
 IkiWiki/Plugin/autoindex.pm | 15 +++++++++------
 IkiWiki/Plugin/comments.pm  | 12 ++++++++++--
 IkiWiki/Render.pm           | 21 ++++++++++++++++-----
 debian/changelog            |  1 +
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 0dd76259e..5e8a9e0a3 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -33,18 +33,19 @@ sub genindex ($) {
 sub refresh () {
 	eval q{use File::Find};
 	error($@) if $@;
+	eval q{use Cwd};
+	error($@) if $@;
+	my $origdir=getcwd();
 
 	my (%pages, %dirs);
 	foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {
-		require File::Spec;
-		$dir=File::Spec->canonpath($dir);
+		chdir($dir) || die "chdir: $!";
 
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				my $file=File::Spec->canonpath(decode_utf8($_));
-				return if $file eq $dir;
-				$file=~s/^\Q$dir\E\/?//;
+				my $file=decode_utf8($_);
+				$file=~s/^\.\/?//;
 				return unless length $file;
 				if (IkiWiki::file_pruned($file)) {
 					$File::Find::prune=1;
@@ -61,7 +62,9 @@ sub refresh () {
 					}
 				}
 			}
-		}, $dir);
+		}, '.');
+
+		chdir($origdir) || die "chdir: $!";
 	}
 	
 	my %deleted;
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d204a7737..17cd99c3b 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -660,16 +660,22 @@ sub comments_pending () {
 
 	eval q{use File::Find};
 	error($@) if $@;
+	eval q{use Cwd};
+	error($@) if $@;
+	my $origdir=getcwd();
 
 	my $find_comments=sub {
 		my $dir=shift;
 		my $extension=shift;
 		return unless -d $dir;
+
+		chdir($dir) || die "chdir: $!";
+
 		find({
 			no_chdir => 1,
 			wanted => sub {
 				my $file=decode_utf8($_);
-				$file=~s/^\Q$dir\E\/?//;
+				$file=~s/^\.\///;
 				return if ! length $file || IkiWiki::file_pruned($file)
 					|| -l $_ || -d _ || $file !~ /\Q$extension\E$/;
 				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
@@ -678,7 +684,9 @@ sub comments_pending () {
 					push @ret, [$f, $dir, $ctime];
 				}
 			}
-		}, $dir);
+		}, ".");
+
+		chdir($origdir) || die "chdir: $!";
 	};
 	
 	$find_comments->($config{srcdir}, "._comment_pending");
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index f9fbc801f..f81e373b7 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -292,12 +292,17 @@ sub find_src_files () {
 	eval q{use File::Find};
 	error($@) if $@;
 
-	my ($page, $dir, $underlay);
+	eval q{use Cwd};
+	die $@ if $@;
+	my $origdir=getcwd();
+	my $abssrcdir=Cwd::abs_path($config{srcdir});
+
+	my ($page, $underlay);
 	my $helper=sub {
 		my $file=decode_utf8($_);
 
 		return if -l $file || -d _;
-		$file=~s/^\Q$dir\E\/?//;
+		$file=~s/^\.\///;
 		return if ! length $file;
 		$page = pagename($file);
 		if (! exists $pagesources{$page} &&
@@ -314,7 +319,7 @@ sub find_src_files () {
 	
 		if ($underlay) {
 			# avoid underlaydir override attacks; see security.mdwn
-			if (! -l "$config{srcdir}/$f" && ! -e _) {
+			if (! -l "$abssrcdir/$f" && ! -e _) {
 				if (! $pages{$page}) {
 					push @files, $f;
 					$pages{$page}=1;
@@ -330,17 +335,23 @@ sub find_src_files () {
 		}
 	};
 
+	chdir($config{srcdir}) || die "chdir: $!";
 	find({
 		no_chdir => 1,
 		wanted => $helper,
-	}, $dir=$config{srcdir});
+	}, '.');
+	chdir($origdir) || die "chdir: $!";
+
 	$underlay=1;
 	foreach (@{$config{underlaydirs}}, $config{underlaydir}) {
+		chdir($_) || die "chdir: $!";
 		find({
 			no_chdir => 1,
 			wanted => $helper,
-		}, $dir=$_);
+		}, '.');
+		chdir($origdir) || die "chdir: $!";
 	};
+
 	return \@files, \%pages;
 }
 
diff --git a/debian/changelog b/debian/changelog
index bddedeafa..16f14b3a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
     (Thanks, privat)
   * calendar: Tune archive_pagespec to only match pages, not other files.
+  * Fix issues with combining unicode srcdirs and source files.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From f7d4904fee5fcc380196d9c6825676040270270f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 19:35:17 -0400
Subject: bugnum

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 16f14b3a1..c28120922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
     (Thanks, privat)
   * calendar: Tune archive_pagespec to only match pages, not other files.
   * Fix issues with combining unicode srcdirs and source files.
+    (Workaround bug #586045)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From 5f33532468fbd52b15ab599a3198749efcfc7710 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 22:56:06 -0400
Subject: Make --gettime be honored after initial setup.

Bugfix in passing: New files not treated as such when no rcs is used.
---
 IkiWiki/Render.pm | 58 +++++++++++++++++++++++++++++--------------------------
 debian/changelog  |  1 +
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 740bb52b0..c6167b437 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -300,6 +300,7 @@ sub find_src_files () {
 	my ($page, $underlay);
 	my $helper=sub {
 		my $file=decode_utf8($_);
+
 		return if -l $file || -d _;
 		$file=~s/^\.\///;
 		return if ! length $file;
@@ -363,6 +364,35 @@ sub find_new_files ($) {
 
 	foreach my $file (@$files) {
 		my $page=pagename($file);
+
+		if ($config{rcs} && $config{gettime} &&
+		    -e "$config{srcdir}/$file") {
+			if (! $times_noted) {
+				debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+				$times_noted=1;
+			}
+
+			eval {
+				my $ctime=rcs_getctime("$config{srcdir}/$file");
+				if ($ctime > 0) {
+					$pagectime{$page}=$ctime;
+				}
+			};
+			if ($@) {
+				print STDERR $@;
+			}
+			my $mtime;
+			eval {
+				$mtime=rcs_getmtime("$config{srcdir}/$file");
+			};
+			if ($@) {
+				print STDERR $@;
+			}
+			elsif ($mtime > 0) {
+				utime($mtime, $mtime, "$config{srcdir}/$file");
+			}
+		}
+
 		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
 			# the page has changed its type
 			$forcerebuild{$page}=1;
@@ -372,34 +402,8 @@ sub find_new_files ($) {
 			if (isinternal($page)) {
 				push @internal_new, $file;
 			}
-			elsif ($config{rcs}) {
+			else {
 				push @new, $file;
-				if ($config{gettime} && -e "$config{srcdir}/$file") {
-					if (! $times_noted) {
-						debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
-						$times_noted=1;
-					}
-
-					eval {
-						my $ctime=rcs_getctime("$config{srcdir}/$file");
-						if ($ctime > 0) {
-							$pagectime{$page}=$ctime;
-						}
-					};
-					if ($@) {
-						print STDERR $@;
-					}
-					my $mtime;
-					eval {
-						$mtime=rcs_getmtime("$config{srcdir}/$file");
-					};
-					if ($@) {
-						print STDERR $@;
-					}
-					elsif ($mtime > 0) {
-						utime($mtime, $mtime, "$config{srcdir}/$file");
-					}
-				}
 			}
 			$pagecase{lc $page}=$page;
 			if (! exists $pagectime{$page}) {
diff --git a/debian/changelog b/debian/changelog
index c28120922..cc128c46f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * calendar: Tune archive_pagespec to only match pages, not other files.
   * Fix issues with combining unicode srcdirs and source files.
     (Workaround bug #586045)
+  * Make --gettime be honored after initial setup.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From da2be6e85cc6d515e173597f88712386aa2a27f4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 23:21:55 -0400
Subject: git: Gix --gettime to properly support utf8 filenames.

In passing, fixed a bug where the srcdir was in a subdir of a repository
named "0".
---
 IkiWiki/Plugin/git.pm | 50 ++++++++++++++++++++++++++++++++++----------------
 debian/changelog      |  1 +
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index aa402c04f..bb3f89a82 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -280,11 +280,35 @@ sub merge_past ($$$) {
 	return $conflict;
 }
 
-sub parse_diff_tree ($@) {
+{
+my $prefix;
+sub decode_git_file ($) {
+	my $file=shift;
+
+	# git does not output utf-8 filenames, but instead
+	# double-quotes them with the utf-8 characters
+	# escaped as \nnn\nnn.
+	if ($file =~ m/^"(.*)"$/) {
+		($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
+	}
+
+	# strip prefix if in a subdir
+	if (! defined $prefix) {
+		$prefix = run_or_die('git', 'rev-parse', '--show-prefix');
+		if (! defined $prefix) {
+			$prefix="";
+		}
+	}
+	$file =~ s/^\Q$prefix\E//;
+
+	return decode("utf8", $file);
+}
+}
+
+sub parse_diff_tree ($) {
 	# Parse the raw diff tree chunk and return the info hash.
 	# See git-diff-tree(1) for the syntax.
-
-	my ($prefix, $dt_ref) = @_;
+	my $dt_ref = shift;
 
 	# End of stream?
 	return if !defined @{ $dt_ref } ||
@@ -367,16 +391,9 @@ sub parse_diff_tree ($@) {
 			my $sha1_to = shift(@tmp);
 			my $status = shift(@tmp);
 
-			# git does not output utf-8 filenames, but instead
-			# double-quotes them with the utf-8 characters
-			# escaped as \nnn\nnn.
-			if ($file =~ m/^"(.*)"$/) {
-				($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
-			}
-			$file =~ s/^\Q$prefix\E//;
 			if (length $file) {
 				push @{ $ci{'details'} }, {
-					'file'      => decode("utf8", $file),
+					'file'      => decode_git_file($file),
 					'sha1_from' => $sha1_from[0],
 					'sha1_to'   => $sha1_to,
 					'mode_from' => $mode_from[0],
@@ -403,10 +420,9 @@ sub git_commit_info ($;$) {
 	my @raw_lines = run_or_die('git', 'log', @opts,
 		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
 		'-r', $sha1, '--', '.');
-	my ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
 
 	my @ci;
-	while (my $parsed = parse_diff_tree(($prefix or ""), \@raw_lines)) {
+	while (my $parsed = parse_diff_tree(\@raw_lines)) {
 		push @ci, $parsed;
 	}
 
@@ -638,10 +654,12 @@ sub findtimes ($$) {
 				$date=undef;
 			}
 			else {
-				if (! $time_cache{$line}) {
-					$time_cache{$line}[0]=$date; # mtime
+				my $f=decode_git_file($line);
+
+				if (! $time_cache{$f}) {
+					$time_cache{$f}[0]=$date; # mtime
 				}
-				$time_cache{$line}[1]=$date; # ctime
+				$time_cache{$f}[1]=$date; # ctime
 			}
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index cc128c46f..aeb9dc0eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * Fix issues with combining unicode srcdirs and source files.
     (Workaround bug #586045)
   * Make --gettime be honored after initial setup.
+  * git: Gix --gettime to properly support utf8 filenames.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From 96c7e31c34b10e343afb3f17eb1ca7c34aaa4123 Mon Sep 17 00:00:00 2001
From: jhagg <jhagg@web>
Date: Wed, 16 Jun 2010 13:40:29 +0000
Subject:

---
 ...ment_upload_does_not_work_for_windows_clients.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn

diff --git a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
new file mode 100644
index 000000000..de57a1441
--- /dev/null
+++ b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
@@ -0,0 +1,19 @@
+It seems as if windows clients (IE) submit filenames with backslash as directory separator.
+(no surprise :-).
+
+But the attachment plugin translates these backslashes to underscore, making the
+whole path a filename.
+
+This little hack fixed the backslash problem, although I wonder if that
+really is the problem?
+(Everything works perfectly from linux clients of course. :-)
+
+	sub basename ($) {
+		my $file=shift;
+
+		$file=~s!.*/+!!;
+		$file=~s!.*\\+!!;
+		return $file;
+	}
+
+Should probably be `$file=~s!.*[/\\]+!!` :-)
-- 
cgit v1.2.3


From 69c22fa1ea143e3eb36692e087b167ae2171581e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 13:23:32 -0400
Subject: attachment: Support Windows paths when taking basename of
 client-supplied file name.

---
 IkiWiki/Plugin/attachment.pm                                      | 5 ++++-
 debian/changelog                                                  | 2 ++
 doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 9c774557f..ce688ca40 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -134,9 +134,12 @@ sub formbuilder (@) {
 			}
 		}
 
+		$filename=IkiWiki::basename($filename);
+		$filename=~s/.*\\+(.+)/$1/; # hello, windows
+
 		$filename=linkpage(IkiWiki::possibly_foolish_untaint(
 				attachment_location($form->field('page')).
-				IkiWiki::basename($filename)));
+				$filename));
 		if (IkiWiki::file_pruned($filename)) {
 			error(gettext("bad attachment filename"));
 		}
diff --git a/debian/changelog b/debian/changelog
index aeb9dc0eb..1f350912e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
     (Workaround bug #586045)
   * Make --gettime be honored after initial setup.
   * git: Gix --gettime to properly support utf8 filenames.
+  * attachment: Support Windows paths when taking basename of client-supplied
+    file name.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
index de57a1441..ad3aadbce 100644
--- a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
+++ b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
@@ -4,6 +4,13 @@ It seems as if windows clients (IE) submit filenames with backslash as directory
 But the attachment plugin translates these backslashes to underscore, making the
 whole path a filename.
 
+> As far as I can see, that just means that the file will be saved with
+> a filename something like `c:__92__My_Documents__92__somefile`.
+> I don't see any "does not work" here. Error message?
+> 
+> Still, I don't mind adding a special case, though obviously not in
+> `basename`. [[done]] --[[Joey]] 
+
 This little hack fixed the backslash problem, although I wonder if that
 really is the problem?
 (Everything works perfectly from linux clients of course. :-)
-- 
cgit v1.2.3


From 73e61221bd5e7326c59f329904bf1aa47ebf5b11 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 14:53:47 -0400
Subject: add copy of local.css from bzed.de

bzed says this is not quite ready, but I'm an impatient guy. Guess
I'll have to track his updates.
---
 debian/copyright                |   8 ++
 underlays/themes/bzed/style.css | 298 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 306 insertions(+)
 create mode 100644 underlays/themes/bzed/style.css

diff --git a/debian/copyright b/debian/copyright
index 7ef266151..9d35fc0df 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -202,6 +202,14 @@ Files: underlays/openid-selector/ikiwiki/openid/jquery.js
 Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer
 License: GPL-2
 
+Files: underlays/themes/bzed/*
+Copyright: 
+ © 2010 Bernd Zeimetz
+ © 2008 Yahoo! Inc.
+License: GPL-2+
+  Parts derived from BSD-C3 licensed YUI library.
+  http://developer.yahoo.com/yui/license.html
+
 License: BSD-C2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/underlays/themes/bzed/style.css b/underlays/themes/bzed/style.css
new file mode 100644
index 000000000..e239ff755
--- /dev/null
+++ b/underlays/themes/bzed/style.css
@@ -0,0 +1,298 @@
+/*    local.css for ikiwiki
+ *
+ *    Copyright (C) 2010 Bernd Zeimetz
+ *       Licensed under same license as ikiwiki: GPL v2 or later
+ *       
+ *     Parts of this file are based on the awesome YUI,
+ *     these parts will stay under the BSD license,
+ *     but you're free to apply the GPLv2 to them, of course.
+ */
+
+
+
+/* -------------------------------------------------------------------------------------------------
+Based on reset-fonts-grids.css from yui.
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.5.1
+*/
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}
+table{border-collapse:collapse;border-spacing:0;}
+fieldset,img{border:0;}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
+li{list-style:none;}
+caption,th{text-align:left;}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
+q:before,q:after{content:'';}
+abbr,acronym {border:0;font-variant:normal;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+input,textarea,select{font-family:inherit;font-size: 13px/1.23;font-weight:normal;}
+input,textarea,select{*font-size:100%;}
+legend{color:#000;}
+/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */
+body {font:13px/1.231 "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;*font-size:small;*font:x-small;}
+table {font-size:inherit;font:100%;}
+pre,code,kbd,samp,tt{font-family:monospace;}
+
+
+body{text-align:left;}
+.inlinefooter{clear:both;}
+
+/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */
+.page {margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;}
+
+/* #doc3{margin:auto 10px;width:auto;} */
+.page {margin:auto 10px;width:auto;}
+
+#pagebody, .sidebar{position:relative;}
+#pagebody, .sidebar{_position:static;}
+#pagebody {position:static;}
+.sidebar {float:right;width:16.5em;*width:16em;}
+#pagebody {margin-right:19em;*margin-right:18.5em;}
+/* #content {float:none;width:auto;} */
+#pagebody:after, .sidebar:after, .page:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.page f{zoom:1;}
+
+/* ------------------------------------------------------------------------------------------------
+ * Taken from base.css, part of YUI's CSS Foundation
+ * Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+ * Code licensed under the BSD License:
+ * http://developer.yahoo.net/yui/license.txt
+ * version: 2.5.1
+*/
+h1 {
+	/*18px via YUI Fonts CSS foundation*/
+	font-size:138.5%;  
+}
+h2 {
+	/*16px via YUI Fonts CSS foundation*/
+	font-size:123.1%; 
+}
+h3 {
+	/*14px via YUI Fonts CSS foundation*/
+	font-size:108%;  
+}
+h1,h2,h3 {
+	/* top & bottom margin based on font size */
+	margin:1em 0;
+}
+h1,h2,h3,h4,h5,h6,strong {
+	/*bringing boldness back to headers and the strong element*/
+	font-weight:bold; 
+}
+abbr,acronym {
+	/*indicating to users that more info is available */
+	border-bottom:1px dotted #000;
+	cursor:help;
+} 
+em {
+	/*bringing italics back to the em element*/
+	font-style:italic;
+}
+blockquote,ul,ol,dl {
+	/*giving blockquotes and lists room to breath*/
+	margin:1em;
+}
+ol,ul,dl {
+	/*bringing lists on to the page with breathing room */
+	margin-left:2em;
+}
+ol li {
+	/*giving OL's LIs generated numbers*/
+	list-style: decimal outside;	
+}
+ul li {
+	/*giving UL's LIs generated disc markers*/
+	list-style: disc outside;
+}
+dl dd {
+	/*giving UL's LIs generated numbers*/
+	margin-left:1em;
+}
+th,td {
+	/*borders and padding to make the table readable*/
+	border:1px solid #000;
+	padding:.5em;
+}
+th {
+	/*distinguishing table headers from data cells*/
+	font-weight:bold;
+	text-align:center;
+}
+caption {
+	/*coordinated margin to match cell's padding*/
+	margin-bottom:.5em;
+	/*centered so it doesn't blend in to other content*/
+	text-align:center;
+}
+p,fieldset,table,pre {
+	/*so things don't run into each other*/
+	margin-bottom:1em;
+}
+/* setting a consistent width, 160px; 
+   control of type=file still not possible */
+input[type=text],input[type=password],textarea {
+	width:21.5em;*width:21em;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * All CSS below is
+ * Copyright (C) 2010 Bernd Zeimetz
+ * Licensed under same license as ikiwiki: GPL v2 or later */
+
+.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody {
+	border: none;
+}
+
+html, body {
+	color:#000;
+	/* background-image: url('_images/body_background.png');
+	background-repeat: repeat; */
+	background-color: #8da1b8;
+}
+
+body {
+	padding-left: 5%;
+	padding-right: 5%;
+	padding-top: 1em;
+	padding-bottom: 1em;
+}
+
+.page {
+	background: #fff;
+	border: outset #ccc;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-top: 1em;
+}
+
+.pageheader {
+	background-image: url('_images/header_background.png');
+	background-repeat: repeat-x;
+	height: 100px;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-bottom: 1em;
+	padding-top: 1em;
+}
+
+.pageheader .header {
+	text-align: top;
+	clear: both;
+}
+
+.pageheader .header form {
+	padding: 0em 0em 0em 0em;
+	float: right;
+	margin-top: 0.5em;
+}
+
+.pageheader .header .title, .pageheader .header .parentlinks,
+ .inlinepage .inlineheader,
+ h1, h2, h3, h4, h5, h6 {
+	margin-top: 1em;
+	font-weight: bold;
+}
+
+.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span {
+	padding: 0.25em 0.25em 0.25em 0.25em;
+	background-image: url('_images/background_darkness.png');
+	background-repeat: repeat;
+	color: white;
+}
+
+.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
+	color: white;
+	text-decoration: none;
+}
+
+.pageheader .actions {
+	text-align: right;
+	vertical-align: bottom;
+	clear: both;
+}
+
+#pagebody {
+	padding-right: 1em;
+	padding-bottom: 2em;
+	border-right: ridge #eee;
+	clear: none;
+}
+
+#content a, #comments a, .sidebar a {
+	color: #315485;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+.sidebar h2 {
+/*	border-bottom: border-bottom-width, border-bottom-style, and border-bottom-color. */
+	border-bottom: ridge #eee;
+	padding-right: 0;
+}
+
+.sidebar .menu {
+	margin-left: 1em;
+}
+
+
+.inlinepage, .recentchanges, div.recentchanges {
+	clear: none !important;
+	margin-bottom: 2em;
+}
+
+.inlinecontent {
+	border-bottom: 1px dotted #315485;
+}
+
+.inlinefooter {
+	clear: none;
+}
+
+.inlinefooter .pagedate, .inlinefooter .tags {
+	display: inline;
+	clear: none;
+	margin-right: 2em;
+}
+
+.calendar .month-calendar th, .calendar .month-calendar td {
+	padding: 0.22em;
+}
+
+.curriculumvitae .noprint {
+	margin-bottom: 2em;
+}
+.curriculumvitae .floatright {
+	float: right;
+	clear: none;
+}
+
+pre {
+	overflow: auto;
+}
+
+@media print {
+	.curriculumvitae .noprint, .sidebar, .page .pageheader .header .parentlinks {
+		content:".";
+		display:block;
+		height:0;
+		visibility:hidden;
+	}
+	.page {
+		padding: 1em 1em 1em 1em;
+	}
+	.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
+		color #315485;
+	}
+	#content, #comments, #pagebody {
+		margin-right: 0;
+		*margin-right: 0;
+		border-right: none;
+	}
+
+}
+
-- 
cgit v1.2.3


From c5a47e2f992d592c2f03328bef12b67c8fac344c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 14:55:44 -0400
Subject: tweak bzed's theme

* move dotted border from bottom inlinecontent to top inlinefooter,
  and allow inlinefooter to clear floating content. This way, floating
  images do not hang down through the dotted border
* don't reset inputs and textareas, it makes buttons in forms
  all squash up together
* don't eliminate fieldsets, it makes the web setup page a
  mess
* only force the size of the search box. ikiwiki generally picks
  form field sizes with a reasonable good reason
* remove some custom css classes not used
* remove some trailing whitespace
---
 underlays/themes/bzed/style.css | 50 +++++++++++++----------------------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/underlays/themes/bzed/style.css b/underlays/themes/bzed/style.css
index e239ff755..8d7b2e017 100644
--- a/underlays/themes/bzed/style.css
+++ b/underlays/themes/bzed/style.css
@@ -2,7 +2,7 @@
  *
  *    Copyright (C) 2010 Bernd Zeimetz
  *       Licensed under same license as ikiwiki: GPL v2 or later
- *       
+ *
  *     Parts of this file are based on the awesome YUI,
  *     these parts will stay under the BSD license,
  *     but you're free to apply the GPLv2 to them, of course.
@@ -17,9 +17,9 @@ Code licensed under the BSD License:
 http://developer.yahoo.net/yui/license.txt
 version: 2.5.1
 */
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,legend,p,blockquote,th,td{margin:0;padding:0;}
 table{border-collapse:collapse;border-spacing:0;}
-fieldset,img{border:0;}
+img{border:0;}
 address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
 li{list-style:none;}
 caption,th{text-align:left;}
@@ -64,15 +64,15 @@ body{text-align:left;}
 */
 h1 {
 	/*18px via YUI Fonts CSS foundation*/
-	font-size:138.5%;  
+	font-size:138.5%;
 }
 h2 {
 	/*16px via YUI Fonts CSS foundation*/
-	font-size:123.1%; 
+	font-size:123.1%;
 }
 h3 {
 	/*14px via YUI Fonts CSS foundation*/
-	font-size:108%;  
+	font-size:108%;
 }
 h1,h2,h3 {
 	/* top & bottom margin based on font size */
@@ -80,13 +80,13 @@ h1,h2,h3 {
 }
 h1,h2,h3,h4,h5,h6,strong {
 	/*bringing boldness back to headers and the strong element*/
-	font-weight:bold; 
+	font-weight:bold;
 }
 abbr,acronym {
 	/*indicating to users that more info is available */
 	border-bottom:1px dotted #000;
 	cursor:help;
-} 
+}
 em {
 	/*bringing italics back to the em element*/
 	font-style:italic;
@@ -101,7 +101,7 @@ ol,ul,dl {
 }
 ol li {
 	/*giving OL's LIs generated numbers*/
-	list-style: decimal outside;	
+	list-style: decimal outside;
 }
 ul li {
 	/*giving UL's LIs generated disc markers*/
@@ -131,9 +131,8 @@ p,fieldset,table,pre {
 	/*so things don't run into each other*/
 	margin-bottom:1em;
 }
-/* setting a consistent width, 160px; 
-   control of type=file still not possible */
-input[type=text],input[type=password],textarea {
+
+#searchbox {
 	width:21.5em;*width:21em;
 }
 
@@ -150,7 +149,7 @@ input[type=text],input[type=password],textarea {
 
 html, body {
 	color:#000;
-	/* background-image: url('_images/body_background.png');
+	/* background-image: url('body_background.png');
 	background-repeat: repeat; */
 	background-color: #8da1b8;
 }
@@ -171,7 +170,7 @@ body {
 }
 
 .pageheader {
-	background-image: url('_images/header_background.png');
+	background-image: url('header_background.png');
 	background-repeat: repeat-x;
 	height: 100px;
 	padding-left: 1em;
@@ -200,7 +199,7 @@ body {
 
 .pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span {
 	padding: 0.25em 0.25em 0.25em 0.25em;
-	background-image: url('_images/background_darkness.png');
+	background-image: url('background_darkness.png');
 	background-repeat: repeat;
 	color: white;
 }
@@ -230,7 +229,6 @@ body {
 }
 
 .sidebar h2 {
-/*	border-bottom: border-bottom-width, border-bottom-style, and border-bottom-color. */
 	border-bottom: ridge #eee;
 	padding-right: 0;
 }
@@ -245,12 +243,8 @@ body {
 	margin-bottom: 2em;
 }
 
-.inlinecontent {
-	border-bottom: 1px dotted #315485;
-}
-
 .inlinefooter {
-	clear: none;
+	border-top: 1px dotted #315485;
 }
 
 .inlinefooter .pagedate, .inlinefooter .tags {
@@ -263,20 +257,8 @@ body {
 	padding: 0.22em;
 }
 
-.curriculumvitae .noprint {
-	margin-bottom: 2em;
-}
-.curriculumvitae .floatright {
-	float: right;
-	clear: none;
-}
-
-pre {
-	overflow: auto;
-}
-
 @media print {
-	.curriculumvitae .noprint, .sidebar, .page .pageheader .header .parentlinks {
+	.sidebar, .page .pageheader .header .parentlinks {
 		content:".";
 		display:block;
 		height:0;
-- 
cgit v1.2.3


From 8cf5fc1cff01d29f392f505377c9f1bdc5764453 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 15:00:26 -0400
Subject: copy from bzed

---
 underlays/themes/bzed/background_darkness.png | Bin 0 -> 165 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 underlays/themes/bzed/background_darkness.png

diff --git a/underlays/themes/bzed/background_darkness.png b/underlays/themes/bzed/background_darkness.png
new file mode 100644
index 000000000..0a1cb4e9e
Binary files /dev/null and b/underlays/themes/bzed/background_darkness.png differ
-- 
cgit v1.2.3


From 8cf7d0542d6856258ba91e1f8a265ce1994229e5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 15:02:14 -0400
Subject: copy from actiontabs.css in css_market

fixed a few indents
---
 underlays/themes/actiontabs/style.css | 122 ++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 underlays/themes/actiontabs/style.css

diff --git a/underlays/themes/actiontabs/style.css b/underlays/themes/actiontabs/style.css
new file mode 100644
index 000000000..4c88003f9
--- /dev/null
+++ b/underlays/themes/actiontabs/style.css
@@ -0,0 +1,122 @@
+/* ikiwiki local style sheet */
+
+/* Add local styling here, instead of modifying style.css. */
+
+a {
+	text-decoration: none;
+	color: #005a9c;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+
+hr {
+	border-style: none;
+	background-color: #999;
+	height: 1px;
+}
+
+code, pre {
+	background: #eee;
+}
+
+pre {
+	padding: .5em;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+	font-family: sans-serif;
+	color: black;
+	background: white;
+}
+
+.pageheader {
+	margin: 0;
+	padding: 1em 2em 0 2em;
+	background: #eee;
+	border-color: #999;
+	border-style: none none solid none;
+	border-width: 1px;
+}
+
+.header {
+	font-size: 100%;
+	font-weight: normal;
+}
+
+.title {
+	display: block;
+	margin-top: .2em;
+	font: 140% sans-serif;
+	text-transform: capitalize;
+}
+
+.actions {
+	text-align: right;
+	padding: 0;
+}
+
+#content, #comments, #footer {
+  	margin: 1em 2em;
+}
+
+#pageinfo {
+	border-color: #999;
+}
+
+.inlinepage {
+	margin: .4em 0;
+	padding: .4em 0;
+	border-style: none;
+	border-top: 1px solid #aaa;
+}
+
+.inlineheader {
+	font-size: 120%;
+	font-weight: normal;
+}
+
+h1 { font: 120% sans-serif }
+h2 { font: bold 100% sans-serif }
+h3 { font: italic 100% sans-serif }
+h4, h5, h6 { font: small-caps 100% sans-serif }
+
+/* Smaller headings for inline pages */
+.inlinepage h1 { font-size: 110% }
+.inlinepage h2 { font-size: 100% }
+.inlinepage h3 { font-size: 100% }
+
+.pageheader .actions ul {
+	border-style: none
+}
+
+.actions ul {
+	font-size: 75%;
+	padding: 0;
+	border-style: none;
+}
+
+.actions ul li a {
+	text-decoration: none;
+}
+
+.actions ul li {
+	margin: 0;
+	padding: .1em .5em 0 .5em;
+	background: white;
+	border-color: #999;
+	border-style: solid solid none solid;
+	border-width: 1px;
+}
+
+div.recentchanges {
+	border-style: none;
+}
+
+.pagecloud {
+	width: auto;
+}
-- 
cgit v1.2.3


From 2745b3ede7d301ad5ce85c232ae9a2f20809eb33 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 15:02:42 -0400
Subject: not local.css here

---
 underlays/themes/actiontabs/style.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/underlays/themes/actiontabs/style.css b/underlays/themes/actiontabs/style.css
index 4c88003f9..b0754c6e6 100644
--- a/underlays/themes/actiontabs/style.css
+++ b/underlays/themes/actiontabs/style.css
@@ -1,7 +1,3 @@
-/* ikiwiki local style sheet */
-
-/* Add local styling here, instead of modifying style.css. */
-
 a {
 	text-decoration: none;
 	color: #005a9c;
-- 
cgit v1.2.3


From 4a207d760c10c66d9108c93f073b08cc6d52246c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 15:03:38 -0400
Subject: comments

---
 underlays/themes/actiontabs/style.css | 5 +++++
 underlays/themes/bzed/style.css       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/underlays/themes/actiontabs/style.css b/underlays/themes/actiontabs/style.css
index b0754c6e6..f48448e2e 100644
--- a/underlays/themes/actiontabs/style.css
+++ b/underlays/themes/actiontabs/style.css
@@ -1,3 +1,8 @@
+/* actiontabs theme for ikiwiki
+ *
+ * by svend
+ */
+
 a {
 	text-decoration: none;
 	color: #005a9c;
diff --git a/underlays/themes/bzed/style.css b/underlays/themes/bzed/style.css
index 8d7b2e017..540cac415 100644
--- a/underlays/themes/bzed/style.css
+++ b/underlays/themes/bzed/style.css
@@ -1,4 +1,4 @@
-/*    local.css for ikiwiki
+/*    bzed theme for ikiwiki
  *
  *    Copyright (C) 2010 Bernd Zeimetz
  *       Licensed under same license as ikiwiki: GPL v2 or later
-- 
cgit v1.2.3


From a748f283ace7ff83ac4630674d58767fd2540d8a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 15:30:33 -0400
Subject: Encode not used

---
 IkiWiki/Plugin/wmd.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 99b136281..71d7c9d17 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -4,7 +4,6 @@ package IkiWiki::Plugin::wmd;
 use warnings;
 use strict;
 use IkiWiki 3.00;
-use Encode;
 
 sub import {
 	add_underlay("wmd");
-- 
cgit v1.2.3


From 062ed44f47d61c3bbbf2e8a7944a9b4e423b735a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 15:43:42 -0400
Subject: add theme plugin

---
 IkiWiki/Plugin/theme.pm                       |  37 ++++
 Makefile.PL                                   |  14 +-
 debian/changelog                              |   1 +
 doc/plugins/theme.pm                          |  11 +
 themes/actiontabs/style.css                   | 123 +++++++++++
 themes/bzed/background_darkness.png           | Bin 0 -> 165 bytes
 themes/bzed/style.css                         | 280 ++++++++++++++++++++++++++
 underlays/themes/actiontabs/style.css         | 123 -----------
 underlays/themes/bzed/background_darkness.png | Bin 165 -> 0 bytes
 underlays/themes/bzed/style.css               | 280 --------------------------
 10 files changed, 465 insertions(+), 404 deletions(-)
 create mode 100644 IkiWiki/Plugin/theme.pm
 create mode 100644 doc/plugins/theme.pm
 create mode 100644 themes/actiontabs/style.css
 create mode 100644 themes/bzed/background_darkness.png
 create mode 100644 themes/bzed/style.css
 delete mode 100644 underlays/themes/actiontabs/style.css
 delete mode 100644 underlays/themes/bzed/background_darkness.png
 delete mode 100644 underlays/themes/bzed/style.css

diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm
new file mode 100644
index 000000000..5e6e4b092
--- /dev/null
+++ b/IkiWiki/Plugin/theme.pm
@@ -0,0 +1,37 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::theme;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "theme", call => \&getsetup);
+	hook(type => "checkconfig", id => "theme", call => \&checkconfig);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+			section => "web",
+		},
+		theme => {
+			type => "string",
+			example => "actiontabs",
+			description => "name of theme to enable",
+			safe => 1,
+			rebuild => 0,
+		},
+}
+
+my $added=0;
+sub checkconfig () {
+	if (! $added && exists $config{theme} && $config{theme} =~ /^\w+$/) {
+		add_underlay("themes/".$config{theme});
+		$added=1;
+	}
+}
+
+1
diff --git a/Makefile.PL b/Makefile.PL
index 4001c841b..29ec9c209 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -78,7 +78,19 @@ underlay_install:
 			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
 		fi \
 	done
-	
+
+	# Themes have their style.css appended to the normal one.
+	for theme in themes/*; do \
+		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme; \
+		for file in $$theme/*; do \
+			if echo "$$file" | grep -q style.css; then \
+				(cat doc/style.css; cat $$file) >> $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
+			elif [ -f "$$file" ]; then \
+				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+			fi \
+		done; \
+	done
+
 extra_install: underlay_install
 	# Install example sites.
 	for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \
diff --git a/debian/changelog b/debian/changelog
index 1f350912e..0d49df676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * git: Gix --gettime to properly support utf8 filenames.
   * attachment: Support Windows paths when taking basename of client-supplied
     file name.
+  * theme: New plugin, allows easily theming a site via the underlay.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/plugins/theme.pm b/doc/plugins/theme.pm
new file mode 100644
index 000000000..7149cc163
--- /dev/null
+++ b/doc/plugins/theme.pm
@@ -0,0 +1,11 @@
+[[!template id=plugin name=theme author="[[Joey]]"]]
+[[!tag type/web]]
+
+The theme plugin allows easily applying a theme to your wiki, by
+configuring the `theme` setting in the setup file with the name of a theme
+to use. The themes you can choose from are all subdirectories, typically
+inside `/usr/share/ikiwiki/themes/`.
+
+A theme provides, via the underlay, an enhanced version of the regular
+[[style.css]]. This leaves [[local.css]] free for you to further
+customise. Themes can also provide header and background images.
diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css
new file mode 100644
index 000000000..f48448e2e
--- /dev/null
+++ b/themes/actiontabs/style.css
@@ -0,0 +1,123 @@
+/* actiontabs theme for ikiwiki
+ *
+ * by svend
+ */
+
+a {
+	text-decoration: none;
+	color: #005a9c;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+
+hr {
+	border-style: none;
+	background-color: #999;
+	height: 1px;
+}
+
+code, pre {
+	background: #eee;
+}
+
+pre {
+	padding: .5em;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+	font-family: sans-serif;
+	color: black;
+	background: white;
+}
+
+.pageheader {
+	margin: 0;
+	padding: 1em 2em 0 2em;
+	background: #eee;
+	border-color: #999;
+	border-style: none none solid none;
+	border-width: 1px;
+}
+
+.header {
+	font-size: 100%;
+	font-weight: normal;
+}
+
+.title {
+	display: block;
+	margin-top: .2em;
+	font: 140% sans-serif;
+	text-transform: capitalize;
+}
+
+.actions {
+	text-align: right;
+	padding: 0;
+}
+
+#content, #comments, #footer {
+  	margin: 1em 2em;
+}
+
+#pageinfo {
+	border-color: #999;
+}
+
+.inlinepage {
+	margin: .4em 0;
+	padding: .4em 0;
+	border-style: none;
+	border-top: 1px solid #aaa;
+}
+
+.inlineheader {
+	font-size: 120%;
+	font-weight: normal;
+}
+
+h1 { font: 120% sans-serif }
+h2 { font: bold 100% sans-serif }
+h3 { font: italic 100% sans-serif }
+h4, h5, h6 { font: small-caps 100% sans-serif }
+
+/* Smaller headings for inline pages */
+.inlinepage h1 { font-size: 110% }
+.inlinepage h2 { font-size: 100% }
+.inlinepage h3 { font-size: 100% }
+
+.pageheader .actions ul {
+	border-style: none
+}
+
+.actions ul {
+	font-size: 75%;
+	padding: 0;
+	border-style: none;
+}
+
+.actions ul li a {
+	text-decoration: none;
+}
+
+.actions ul li {
+	margin: 0;
+	padding: .1em .5em 0 .5em;
+	background: white;
+	border-color: #999;
+	border-style: solid solid none solid;
+	border-width: 1px;
+}
+
+div.recentchanges {
+	border-style: none;
+}
+
+.pagecloud {
+	width: auto;
+}
diff --git a/themes/bzed/background_darkness.png b/themes/bzed/background_darkness.png
new file mode 100644
index 000000000..0a1cb4e9e
Binary files /dev/null and b/themes/bzed/background_darkness.png differ
diff --git a/themes/bzed/style.css b/themes/bzed/style.css
new file mode 100644
index 000000000..540cac415
--- /dev/null
+++ b/themes/bzed/style.css
@@ -0,0 +1,280 @@
+/*    bzed theme for ikiwiki
+ *
+ *    Copyright (C) 2010 Bernd Zeimetz
+ *       Licensed under same license as ikiwiki: GPL v2 or later
+ *
+ *     Parts of this file are based on the awesome YUI,
+ *     these parts will stay under the BSD license,
+ *     but you're free to apply the GPLv2 to them, of course.
+ */
+
+
+
+/* -------------------------------------------------------------------------------------------------
+Based on reset-fonts-grids.css from yui.
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.5.1
+*/
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,legend,p,blockquote,th,td{margin:0;padding:0;}
+table{border-collapse:collapse;border-spacing:0;}
+img{border:0;}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
+li{list-style:none;}
+caption,th{text-align:left;}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
+q:before,q:after{content:'';}
+abbr,acronym {border:0;font-variant:normal;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+input,textarea,select{font-family:inherit;font-size: 13px/1.23;font-weight:normal;}
+input,textarea,select{*font-size:100%;}
+legend{color:#000;}
+/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */
+body {font:13px/1.231 "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;*font-size:small;*font:x-small;}
+table {font-size:inherit;font:100%;}
+pre,code,kbd,samp,tt{font-family:monospace;}
+
+
+body{text-align:left;}
+.inlinefooter{clear:both;}
+
+/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */
+.page {margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;}
+
+/* #doc3{margin:auto 10px;width:auto;} */
+.page {margin:auto 10px;width:auto;}
+
+#pagebody, .sidebar{position:relative;}
+#pagebody, .sidebar{_position:static;}
+#pagebody {position:static;}
+.sidebar {float:right;width:16.5em;*width:16em;}
+#pagebody {margin-right:19em;*margin-right:18.5em;}
+/* #content {float:none;width:auto;} */
+#pagebody:after, .sidebar:after, .page:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.page f{zoom:1;}
+
+/* ------------------------------------------------------------------------------------------------
+ * Taken from base.css, part of YUI's CSS Foundation
+ * Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+ * Code licensed under the BSD License:
+ * http://developer.yahoo.net/yui/license.txt
+ * version: 2.5.1
+*/
+h1 {
+	/*18px via YUI Fonts CSS foundation*/
+	font-size:138.5%;
+}
+h2 {
+	/*16px via YUI Fonts CSS foundation*/
+	font-size:123.1%;
+}
+h3 {
+	/*14px via YUI Fonts CSS foundation*/
+	font-size:108%;
+}
+h1,h2,h3 {
+	/* top & bottom margin based on font size */
+	margin:1em 0;
+}
+h1,h2,h3,h4,h5,h6,strong {
+	/*bringing boldness back to headers and the strong element*/
+	font-weight:bold;
+}
+abbr,acronym {
+	/*indicating to users that more info is available */
+	border-bottom:1px dotted #000;
+	cursor:help;
+}
+em {
+	/*bringing italics back to the em element*/
+	font-style:italic;
+}
+blockquote,ul,ol,dl {
+	/*giving blockquotes and lists room to breath*/
+	margin:1em;
+}
+ol,ul,dl {
+	/*bringing lists on to the page with breathing room */
+	margin-left:2em;
+}
+ol li {
+	/*giving OL's LIs generated numbers*/
+	list-style: decimal outside;
+}
+ul li {
+	/*giving UL's LIs generated disc markers*/
+	list-style: disc outside;
+}
+dl dd {
+	/*giving UL's LIs generated numbers*/
+	margin-left:1em;
+}
+th,td {
+	/*borders and padding to make the table readable*/
+	border:1px solid #000;
+	padding:.5em;
+}
+th {
+	/*distinguishing table headers from data cells*/
+	font-weight:bold;
+	text-align:center;
+}
+caption {
+	/*coordinated margin to match cell's padding*/
+	margin-bottom:.5em;
+	/*centered so it doesn't blend in to other content*/
+	text-align:center;
+}
+p,fieldset,table,pre {
+	/*so things don't run into each other*/
+	margin-bottom:1em;
+}
+
+#searchbox {
+	width:21.5em;*width:21em;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * All CSS below is
+ * Copyright (C) 2010 Bernd Zeimetz
+ * Licensed under same license as ikiwiki: GPL v2 or later */
+
+.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody {
+	border: none;
+}
+
+html, body {
+	color:#000;
+	/* background-image: url('body_background.png');
+	background-repeat: repeat; */
+	background-color: #8da1b8;
+}
+
+body {
+	padding-left: 5%;
+	padding-right: 5%;
+	padding-top: 1em;
+	padding-bottom: 1em;
+}
+
+.page {
+	background: #fff;
+	border: outset #ccc;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-top: 1em;
+}
+
+.pageheader {
+	background-image: url('header_background.png');
+	background-repeat: repeat-x;
+	height: 100px;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-bottom: 1em;
+	padding-top: 1em;
+}
+
+.pageheader .header {
+	text-align: top;
+	clear: both;
+}
+
+.pageheader .header form {
+	padding: 0em 0em 0em 0em;
+	float: right;
+	margin-top: 0.5em;
+}
+
+.pageheader .header .title, .pageheader .header .parentlinks,
+ .inlinepage .inlineheader,
+ h1, h2, h3, h4, h5, h6 {
+	margin-top: 1em;
+	font-weight: bold;
+}
+
+.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span {
+	padding: 0.25em 0.25em 0.25em 0.25em;
+	background-image: url('background_darkness.png');
+	background-repeat: repeat;
+	color: white;
+}
+
+.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
+	color: white;
+	text-decoration: none;
+}
+
+.pageheader .actions {
+	text-align: right;
+	vertical-align: bottom;
+	clear: both;
+}
+
+#pagebody {
+	padding-right: 1em;
+	padding-bottom: 2em;
+	border-right: ridge #eee;
+	clear: none;
+}
+
+#content a, #comments a, .sidebar a {
+	color: #315485;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+.sidebar h2 {
+	border-bottom: ridge #eee;
+	padding-right: 0;
+}
+
+.sidebar .menu {
+	margin-left: 1em;
+}
+
+
+.inlinepage, .recentchanges, div.recentchanges {
+	clear: none !important;
+	margin-bottom: 2em;
+}
+
+.inlinefooter {
+	border-top: 1px dotted #315485;
+}
+
+.inlinefooter .pagedate, .inlinefooter .tags {
+	display: inline;
+	clear: none;
+	margin-right: 2em;
+}
+
+.calendar .month-calendar th, .calendar .month-calendar td {
+	padding: 0.22em;
+}
+
+@media print {
+	.sidebar, .page .pageheader .header .parentlinks {
+		content:".";
+		display:block;
+		height:0;
+		visibility:hidden;
+	}
+	.page {
+		padding: 1em 1em 1em 1em;
+	}
+	.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
+		color #315485;
+	}
+	#content, #comments, #pagebody {
+		margin-right: 0;
+		*margin-right: 0;
+		border-right: none;
+	}
+
+}
+
diff --git a/underlays/themes/actiontabs/style.css b/underlays/themes/actiontabs/style.css
deleted file mode 100644
index f48448e2e..000000000
--- a/underlays/themes/actiontabs/style.css
+++ /dev/null
@@ -1,123 +0,0 @@
-/* actiontabs theme for ikiwiki
- *
- * by svend
- */
-
-a {
-	text-decoration: none;
-	color: #005a9c;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-
-hr {
-	border-style: none;
-	background-color: #999;
-	height: 1px;
-}
-
-code, pre {
-	background: #eee;
-}
-
-pre {
-	padding: .5em;
-}
-
-body {
-	margin: 0;
-	padding: 0;
-	font-family: sans-serif;
-	color: black;
-	background: white;
-}
-
-.pageheader {
-	margin: 0;
-	padding: 1em 2em 0 2em;
-	background: #eee;
-	border-color: #999;
-	border-style: none none solid none;
-	border-width: 1px;
-}
-
-.header {
-	font-size: 100%;
-	font-weight: normal;
-}
-
-.title {
-	display: block;
-	margin-top: .2em;
-	font: 140% sans-serif;
-	text-transform: capitalize;
-}
-
-.actions {
-	text-align: right;
-	padding: 0;
-}
-
-#content, #comments, #footer {
-  	margin: 1em 2em;
-}
-
-#pageinfo {
-	border-color: #999;
-}
-
-.inlinepage {
-	margin: .4em 0;
-	padding: .4em 0;
-	border-style: none;
-	border-top: 1px solid #aaa;
-}
-
-.inlineheader {
-	font-size: 120%;
-	font-weight: normal;
-}
-
-h1 { font: 120% sans-serif }
-h2 { font: bold 100% sans-serif }
-h3 { font: italic 100% sans-serif }
-h4, h5, h6 { font: small-caps 100% sans-serif }
-
-/* Smaller headings for inline pages */
-.inlinepage h1 { font-size: 110% }
-.inlinepage h2 { font-size: 100% }
-.inlinepage h3 { font-size: 100% }
-
-.pageheader .actions ul {
-	border-style: none
-}
-
-.actions ul {
-	font-size: 75%;
-	padding: 0;
-	border-style: none;
-}
-
-.actions ul li a {
-	text-decoration: none;
-}
-
-.actions ul li {
-	margin: 0;
-	padding: .1em .5em 0 .5em;
-	background: white;
-	border-color: #999;
-	border-style: solid solid none solid;
-	border-width: 1px;
-}
-
-div.recentchanges {
-	border-style: none;
-}
-
-.pagecloud {
-	width: auto;
-}
diff --git a/underlays/themes/bzed/background_darkness.png b/underlays/themes/bzed/background_darkness.png
deleted file mode 100644
index 0a1cb4e9e..000000000
Binary files a/underlays/themes/bzed/background_darkness.png and /dev/null differ
diff --git a/underlays/themes/bzed/style.css b/underlays/themes/bzed/style.css
deleted file mode 100644
index 540cac415..000000000
--- a/underlays/themes/bzed/style.css
+++ /dev/null
@@ -1,280 +0,0 @@
-/*    bzed theme for ikiwiki
- *
- *    Copyright (C) 2010 Bernd Zeimetz
- *       Licensed under same license as ikiwiki: GPL v2 or later
- *
- *     Parts of this file are based on the awesome YUI,
- *     these parts will stay under the BSD license,
- *     but you're free to apply the GPLv2 to them, of course.
- */
-
-
-
-/* -------------------------------------------------------------------------------------------------
-Based on reset-fonts-grids.css from yui.
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.5.1
-*/
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,legend,p,blockquote,th,td{margin:0;padding:0;}
-table{border-collapse:collapse;border-spacing:0;}
-img{border:0;}
-address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
-li{list-style:none;}
-caption,th{text-align:left;}
-h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
-q:before,q:after{content:'';}
-abbr,acronym {border:0;font-variant:normal;}
-sup {vertical-align:text-top;}
-sub {vertical-align:text-bottom;}
-input,textarea,select{font-family:inherit;font-size: 13px/1.23;font-weight:normal;}
-input,textarea,select{*font-size:100%;}
-legend{color:#000;}
-/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */
-body {font:13px/1.231 "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;*font-size:small;*font:x-small;}
-table {font-size:inherit;font:100%;}
-pre,code,kbd,samp,tt{font-family:monospace;}
-
-
-body{text-align:left;}
-.inlinefooter{clear:both;}
-
-/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */
-.page {margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;}
-
-/* #doc3{margin:auto 10px;width:auto;} */
-.page {margin:auto 10px;width:auto;}
-
-#pagebody, .sidebar{position:relative;}
-#pagebody, .sidebar{_position:static;}
-#pagebody {position:static;}
-.sidebar {float:right;width:16.5em;*width:16em;}
-#pagebody {margin-right:19em;*margin-right:18.5em;}
-/* #content {float:none;width:auto;} */
-#pagebody:after, .sidebar:after, .page:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
-.page f{zoom:1;}
-
-/* ------------------------------------------------------------------------------------------------
- * Taken from base.css, part of YUI's CSS Foundation
- * Copyright (c) 2008, Yahoo! Inc. All rights reserved.
- * Code licensed under the BSD License:
- * http://developer.yahoo.net/yui/license.txt
- * version: 2.5.1
-*/
-h1 {
-	/*18px via YUI Fonts CSS foundation*/
-	font-size:138.5%;
-}
-h2 {
-	/*16px via YUI Fonts CSS foundation*/
-	font-size:123.1%;
-}
-h3 {
-	/*14px via YUI Fonts CSS foundation*/
-	font-size:108%;
-}
-h1,h2,h3 {
-	/* top & bottom margin based on font size */
-	margin:1em 0;
-}
-h1,h2,h3,h4,h5,h6,strong {
-	/*bringing boldness back to headers and the strong element*/
-	font-weight:bold;
-}
-abbr,acronym {
-	/*indicating to users that more info is available */
-	border-bottom:1px dotted #000;
-	cursor:help;
-}
-em {
-	/*bringing italics back to the em element*/
-	font-style:italic;
-}
-blockquote,ul,ol,dl {
-	/*giving blockquotes and lists room to breath*/
-	margin:1em;
-}
-ol,ul,dl {
-	/*bringing lists on to the page with breathing room */
-	margin-left:2em;
-}
-ol li {
-	/*giving OL's LIs generated numbers*/
-	list-style: decimal outside;
-}
-ul li {
-	/*giving UL's LIs generated disc markers*/
-	list-style: disc outside;
-}
-dl dd {
-	/*giving UL's LIs generated numbers*/
-	margin-left:1em;
-}
-th,td {
-	/*borders and padding to make the table readable*/
-	border:1px solid #000;
-	padding:.5em;
-}
-th {
-	/*distinguishing table headers from data cells*/
-	font-weight:bold;
-	text-align:center;
-}
-caption {
-	/*coordinated margin to match cell's padding*/
-	margin-bottom:.5em;
-	/*centered so it doesn't blend in to other content*/
-	text-align:center;
-}
-p,fieldset,table,pre {
-	/*so things don't run into each other*/
-	margin-bottom:1em;
-}
-
-#searchbox {
-	width:21.5em;*width:21em;
-}
-
-
-
-/* ------------------------------------------------------------------------------------------------
- * All CSS below is
- * Copyright (C) 2010 Bernd Zeimetz
- * Licensed under same license as ikiwiki: GPL v2 or later */
-
-.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody {
-	border: none;
-}
-
-html, body {
-	color:#000;
-	/* background-image: url('body_background.png');
-	background-repeat: repeat; */
-	background-color: #8da1b8;
-}
-
-body {
-	padding-left: 5%;
-	padding-right: 5%;
-	padding-top: 1em;
-	padding-bottom: 1em;
-}
-
-.page {
-	background: #fff;
-	border: outset #ccc;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-top: 1em;
-}
-
-.pageheader {
-	background-image: url('header_background.png');
-	background-repeat: repeat-x;
-	height: 100px;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-bottom: 1em;
-	padding-top: 1em;
-}
-
-.pageheader .header {
-	text-align: top;
-	clear: both;
-}
-
-.pageheader .header form {
-	padding: 0em 0em 0em 0em;
-	float: right;
-	margin-top: 0.5em;
-}
-
-.pageheader .header .title, .pageheader .header .parentlinks,
- .inlinepage .inlineheader,
- h1, h2, h3, h4, h5, h6 {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span {
-	padding: 0.25em 0.25em 0.25em 0.25em;
-	background-image: url('background_darkness.png');
-	background-repeat: repeat;
-	color: white;
-}
-
-.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
-	color: white;
-	text-decoration: none;
-}
-
-.pageheader .actions {
-	text-align: right;
-	vertical-align: bottom;
-	clear: both;
-}
-
-#pagebody {
-	padding-right: 1em;
-	padding-bottom: 2em;
-	border-right: ridge #eee;
-	clear: none;
-}
-
-#content a, #comments a, .sidebar a {
-	color: #315485;
-	text-decoration: none;
-	font-weight: bold;
-}
-
-.sidebar h2 {
-	border-bottom: ridge #eee;
-	padding-right: 0;
-}
-
-.sidebar .menu {
-	margin-left: 1em;
-}
-
-
-.inlinepage, .recentchanges, div.recentchanges {
-	clear: none !important;
-	margin-bottom: 2em;
-}
-
-.inlinefooter {
-	border-top: 1px dotted #315485;
-}
-
-.inlinefooter .pagedate, .inlinefooter .tags {
-	display: inline;
-	clear: none;
-	margin-right: 2em;
-}
-
-.calendar .month-calendar th, .calendar .month-calendar td {
-	padding: 0.22em;
-}
-
-@media print {
-	.sidebar, .page .pageheader .header .parentlinks {
-		content:".";
-		display:block;
-		height:0;
-		visibility:hidden;
-	}
-	.page {
-		padding: 1em 1em 1em 1em;
-	}
-	.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
-		color #315485;
-	}
-	#content, #comments, #pagebody {
-		margin-right: 0;
-		*margin-right: 0;
-		border-right: none;
-	}
-
-}
-
-- 
cgit v1.2.3


From 2f3f826b5bf123886d4e65eb8bd709b12639ca8b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 15:44:21 -0400
Subject: force rebuild for theme change

For now, a rebuild is the only way to ensure the changed theme is used.
Ikiwiki normally will not realize style.css has changed, since themes
tend to have the same timestamp for the file.
---
 IkiWiki/Plugin/theme.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm
index 5e6e4b092..ba6966381 100644
--- a/IkiWiki/Plugin/theme.pm
+++ b/IkiWiki/Plugin/theme.pm
@@ -22,7 +22,7 @@ sub getsetup () {
 			example => "actiontabs",
 			description => "name of theme to enable",
 			safe => 1,
-			rebuild => 0,
+			rebuild => 1,
 		},
 }
 
-- 
cgit v1.2.3


From 3789bce105120b2571665c71b3bd20ec7dbf9c9c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 15:48:50 -0400
Subject: preserve timestamps for directive and theme underlays

---
 Makefile.PL | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.PL b/Makefile.PL
index 29ec9c209..4b2e28544 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -75,6 +75,7 @@ underlay_install:
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive
 	for file in doc/ikiwiki/directive/*; do \
 		if [ -f "$$file" ]; then \
+			cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \
 			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
 		fi \
 	done
@@ -86,6 +87,7 @@ underlay_install:
 			if echo "$$file" | grep -q style.css; then \
 				(cat doc/style.css; cat $$file) >> $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
 			elif [ -f "$$file" ]; then \
+				cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
 				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
 			fi \
 		done; \
-- 
cgit v1.2.3


From eff5e233a2a3bf5e965c17734a3ad765c5fe9df5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 16:07:41 -0400
Subject: force list context

run_or_die returns a status code in scalar context
---
 IkiWiki/Plugin/git.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index bb3f89a82..222692eda 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -294,7 +294,7 @@ sub decode_git_file ($) {
 
 	# strip prefix if in a subdir
 	if (! defined $prefix) {
-		$prefix = run_or_die('git', 'rev-parse', '--show-prefix');
+		($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
 		if (! defined $prefix) {
 			$prefix="";
 		}
-- 
cgit v1.2.3


From bc32754f1f1ca334078f788a346c27839e245cab Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 19:15:57 -0400
Subject: add background image, kindly gpl'd by bzed

---
 debian/copyright                  |   2 +-
 themes/bzed/header_background.png | Bin 0 -> 53693 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 themes/bzed/header_background.png

diff --git a/debian/copyright b/debian/copyright
index 9d35fc0df..72394eadc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -204,7 +204,7 @@ License: GPL-2
 
 Files: underlays/themes/bzed/*
 Copyright: 
- © 2010 Bernd Zeimetz
+ © 2009,2010 Bernd Zeimetz
  © 2008 Yahoo! Inc.
 License: GPL-2+
   Parts derived from BSD-C3 licensed YUI library.
diff --git a/themes/bzed/header_background.png b/themes/bzed/header_background.png
new file mode 100644
index 000000000..4712ffb8f
Binary files /dev/null and b/themes/bzed/header_background.png differ
-- 
cgit v1.2.3


From e35d728a3297c9caa9da696d35a8f3d51811f783 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 19:23:08 -0400
Subject: link to theme plugin

---
 doc/css.mdwn        | 3 +++
 doc/css_market.mdwn | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/css.mdwn b/doc/css.mdwn
index 29a335596..35db57b0c 100644
--- a/doc/css.mdwn
+++ b/doc/css.mdwn
@@ -9,6 +9,9 @@ defining brand new rendering rules.
 While ikiwiki's default use of stylesheets is intentionally quite plain and
 minimalistic, CSS allows creating any kind of look you can dream up.
 
+The [[theme_plugin|plugins/theme]] provides some prepackaged themes in an
+easy to use way.
+
 The [[css_market]] page is an attempt to collect user contributed local.css
 files.
 
diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index a0943547c..0e5a68740 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -5,7 +5,8 @@ these style sheets can be installed by copying them into your wiki's source
 dir with a filename of `local.css`.
 
 Feel free to add your own stylesheets here. (Upload as wiki pages; wiki
-gnomes will convert them to css files..)
+gnomes will convert them to css files..) Selected ones from here are
+included in the [[theme_plugin|plugins/theme]].
 
 * **[[css_market/zack.css]]**, contributed by [[StefanoZacchiroli]],
   customized mostly for *blogging purposes*, can be seen in action on 
-- 
cgit v1.2.3


From 653a8179cab9ca999a2c5fadfbb059d87da97b8e Mon Sep 17 00:00:00 2001
From: jeanm <jeanm@web>
Date: Thu, 17 Jun 2010 06:22:19 +0000
Subject:

---
 ...ean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
new file mode 100644
index 000000000..e998ef825
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
@@ -0,0 +1,5 @@
+Hi,
+Installed ikiwiki on my ubuntu (04.10) box; after creating a blog according to your setup instructions I cannot edit files on the web interface, and I get this errer «The requested URL /~jean/blog/ikiwiki.cgi was not found on this server.»
+I have no idea what to do (sorry for my ignorance)
+
+tia,
-- 
cgit v1.2.3


From 79ffede4a7224a26e1725296db2db1918d52667c Mon Sep 17 00:00:00 2001
From: jhagg <jhagg@web>
Date: Thu, 17 Jun 2010 08:30:38 +0000
Subject:

---
 doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
index ad3aadbce..4e8c7bdcf 100644
--- a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
+++ b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
@@ -11,6 +11,14 @@ whole path a filename.
 > Still, I don't mind adding a special case, though obviously not in
 > `basename`. [[done]] --[[Joey]] 
 
+>> Well, it's probably something else also, I get **bad attachment filename**.
+>> Now, that could really be a bad filename, problem is that it wasn't. I even
+>> tried applying the **wiki_file_prune_regexps** one by one to see what was
+>> causing it. No problem there. The strange thing is that the error shows up
+>> when using firefox on windows too. But the backslash hack fixes at least the
+>> incorrect filename from IE (firefox on windows gave me the correct filename.
+>> I'll do some more digging... :-)  /jh
+
 This little hack fixed the backslash problem, although I wonder if that
 really is the problem?
 (Everything works perfectly from linux clients of course. :-)
-- 
cgit v1.2.3


From 2e3f3ae89cfe66eb6be78003165cca1aff17ecb8 Mon Sep 17 00:00:00 2001
From: demo <demo@web>
Date: Thu, 17 Jun 2010 15:00:59 +0000
Subject: yeay ! \\o \o/ o//

---
 doc/sandbox.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 6e9cfe48e..cc2569e7c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -37,6 +37,8 @@ Bulleted list
 * item
 * one
   * footballs; runner; unices
+  * Cool !
+
 
 ----
 
@@ -85,3 +87,4 @@ Test
 test2
 
 I assume this triggers a checkin and recompile?
+
-- 
cgit v1.2.3


From cb4b99929757f970d5ae697f0d09514ad624ed46 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Jun 2010 16:54:03 -0400
Subject: avoid dying if cannot chdir to an underlaydir

---
 IkiWiki/Plugin/autoindex.pm |  4 ++--
 IkiWiki/Plugin/comments.pm  |  4 ++--
 IkiWiki/Render.pm           | 17 +++++++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 5e8a9e0a3..c3eb53300 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -39,7 +39,7 @@ sub refresh () {
 
 	my (%pages, %dirs);
 	foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {
-		chdir($dir) || die "chdir: $!";
+		chdir($dir) || next;
 
 		find({
 			no_chdir => 1,
@@ -64,7 +64,7 @@ sub refresh () {
 			}
 		}, '.');
 
-		chdir($origdir) || die "chdir: $!";
+		chdir($origdir) || die "chdir $origdir: $!";
 	}
 	
 	my %deleted;
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 17cd99c3b..d1558001a 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -669,7 +669,7 @@ sub comments_pending () {
 		my $extension=shift;
 		return unless -d $dir;
 
-		chdir($dir) || die "chdir: $!";
+		chdir($dir) || die "chdir $dir: $!";
 
 		find({
 			no_chdir => 1,
@@ -686,7 +686,7 @@ sub comments_pending () {
 			}
 		}, ".");
 
-		chdir($origdir) || die "chdir: $!";
+		chdir($origdir) || die "chdir $origdir: $!";
 	};
 	
 	$find_comments->($config{srcdir}, "._comment_pending");
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c6167b437..aae1f90b0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -335,21 +335,22 @@ sub find_src_files () {
 		}
 	};
 
-	chdir($config{srcdir}) || die "chdir: $!";
+	chdir($config{srcdir}) || die "chdir $config{srcdir}: $!";
 	find({
 		no_chdir => 1,
 		wanted => $helper,
 	}, '.');
-	chdir($origdir) || die "chdir: $!";
+	chdir($origdir) || die "chdir $origdir: $!";
 
 	$underlay=1;
 	foreach (@{$config{underlaydirs}}, $config{underlaydir}) {
-		chdir($_) || die "chdir: $!";
-		find({
-			no_chdir => 1,
-			wanted => $helper,
-		}, '.');
-		chdir($origdir) || die "chdir: $!";
+		if (chdir($_)) {
+			find({
+				no_chdir => 1,
+				wanted => $helper,
+			}, '.');
+			chdir($origdir) || die "chdir: $!";
+		}
 	};
 
 	return \@files, \%pages;
-- 
cgit v1.2.3


From c52d8d263efeffbc31c097fae371b8c572834077 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Fri, 18 Jun 2010 09:08:28 +0000
Subject: `themes.pm` instead of `themes.mdwn`

---
 doc/plugins/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/discussion.mdwn b/doc/plugins/discussion.mdwn
index 854307a98..49b76c662 100644
--- a/doc/plugins/discussion.mdwn
+++ b/doc/plugins/discussion.mdwn
@@ -34,3 +34,7 @@ Any objections to listing plugins alphabetically rather than by creation date?
 >> "recently changed" list with the 10 most recently changed plugins
 >> at the top.  That would allow what you suggested, but still allow
 >> the main list to be alphabetical. -- [[Will]]
+
+### `themes.pm` instead of `themes.mdwn`
+
+Could someone please change the filename. I cannot fix this using the Web interface. Somebody step in please. --[[PaulePanter]]
-- 
cgit v1.2.3


From 2797a659db82dd1a0021dacd005fa80212c41579 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 12:48:05 -0400
Subject: mercurial: Fix buggy getctime code.

The file passed to rcs_getctime is already absolute, and it was
trying to stick the srcdir on the front.

Also, eliminated potentially unsafe shelling.
---
 IkiWiki/Plugin/mercurial.pm | 10 ++++------
 debian/changelog            |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 34e009c7a..a80bb2da5 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -236,15 +236,13 @@ sub rcs_diff ($) {
 sub rcs_getctime ($) {
 	my ($file) = @_;
 
-	# XXX filename passes through the shell here, should try to avoid
-	# that just in case
 	my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v",
-		"--style", "default", "$config{srcdir}/$file");
-	open (my $out, "@cmdline |");
+		"--style", "default", $file);
+	open (my $out, "-|", @cmdline);
 
-	my @log = mercurial_log($out);
+	my @log = (mercurial_log($out));
 
-	if (length @log < 1) {
+	if (@log < 1) {
 		return 0;
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 0d49df676..516b84063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * attachment: Support Windows paths when taking basename of client-supplied
     file name.
   * theme: New plugin, allows easily theming a site via the underlay.
+  * mercurial: Fix buggy getctime code.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From d5199424c5625a816a2a3204708905e76bfb71aa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 12:50:31 -0400
Subject: avoid shelling

---
 IkiWiki/Plugin/bzr.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index e7c1b8d8e..9bee0c4b2 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -287,9 +287,7 @@ sub rcs_diff ($) {
 }
 
 sub extract_timestamp (@) {
-	# XXX filename passes through the shell here, should try to avoid
-	# that just in case
-	open (my $out, "@_ |");
+	open (my $out, "-|", @_);
 	my @log = bzr_log($out);
 
 	if (length @log < 1) {
-- 
cgit v1.2.3


From 9e4da76b5bc720bc3661bf15b0d7bffc704483f8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 12:52:26 -0400
Subject: bugnum

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 516b84063..1afc620ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * attachment: Support Windows paths when taking basename of client-supplied
     file name.
   * theme: New plugin, allows easily theming a site via the underlay.
-  * mercurial: Fix buggy getctime code.
+  * mercurial: Fix buggy getctime code. Closes: #586279
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
-- 
cgit v1.2.3


From fca54dc52a49fe50361cf6c4ab2b3c2e0450a2f8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 12:57:20 -0400
Subject: fix filename

---
 doc/plugins/discussion.mdwn |  2 ++
 doc/plugins/theme.mdwn      | 11 +++++++++++
 doc/plugins/theme.pm        | 11 -----------
 3 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 doc/plugins/theme.mdwn
 delete mode 100644 doc/plugins/theme.pm

diff --git a/doc/plugins/discussion.mdwn b/doc/plugins/discussion.mdwn
index 49b76c662..d47fa4718 100644
--- a/doc/plugins/discussion.mdwn
+++ b/doc/plugins/discussion.mdwn
@@ -38,3 +38,5 @@ Any objections to listing plugins alphabetically rather than by creation date?
 ### `themes.pm` instead of `themes.mdwn`
 
 Could someone please change the filename. I cannot fix this using the Web interface. Somebody step in please. --[[PaulePanter]]
+
+> Oops, not the first time I've made that mistake! --[[Joey]] 
diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn
new file mode 100644
index 000000000..7149cc163
--- /dev/null
+++ b/doc/plugins/theme.mdwn
@@ -0,0 +1,11 @@
+[[!template id=plugin name=theme author="[[Joey]]"]]
+[[!tag type/web]]
+
+The theme plugin allows easily applying a theme to your wiki, by
+configuring the `theme` setting in the setup file with the name of a theme
+to use. The themes you can choose from are all subdirectories, typically
+inside `/usr/share/ikiwiki/themes/`.
+
+A theme provides, via the underlay, an enhanced version of the regular
+[[style.css]]. This leaves [[local.css]] free for you to further
+customise. Themes can also provide header and background images.
diff --git a/doc/plugins/theme.pm b/doc/plugins/theme.pm
deleted file mode 100644
index 7149cc163..000000000
--- a/doc/plugins/theme.pm
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!template id=plugin name=theme author="[[Joey]]"]]
-[[!tag type/web]]
-
-The theme plugin allows easily applying a theme to your wiki, by
-configuring the `theme` setting in the setup file with the name of a theme
-to use. The themes you can choose from are all subdirectories, typically
-inside `/usr/share/ikiwiki/themes/`.
-
-A theme provides, via the underlay, an enhanced version of the regular
-[[style.css]]. This leaves [[local.css]] free for you to further
-customise. Themes can also provide header and background images.
-- 
cgit v1.2.3


From 17675c18a8619a3b8c3fb2db67ccab009a525091 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 12:59:03 -0400
Subject: avoid showing subpages of contrib plugins

---
 doc/plugins.mdwn         | 2 +-
 doc/plugins/contrib.mdwn | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn
index 697b4a219..0bea33592 100644
--- a/doc/plugins.mdwn
+++ b/doc/plugins.mdwn
@@ -14,4 +14,4 @@ will fit most uses of ikiwiki.
 ## Plugin directory
 
 [[!map pages="plugins/* and !plugins/type/* and !plugins/write and 
-!plugins/write/* and !plugins/contrib and !plugins/install and !*/Discussion"]]
+!plugins/write/* and !plugins/contrib and !plugins/contrib/*/* and !plugins/install and !*/Discussion"]]
diff --git a/doc/plugins/contrib.mdwn b/doc/plugins/contrib.mdwn
index ac6c1b751..d8199a756 100644
--- a/doc/plugins/contrib.mdwn
+++ b/doc/plugins/contrib.mdwn
@@ -1,4 +1,4 @@
 These plugins are provided by third parties and are not currently
 included in ikiwiki. See [[install]] for installation help.
 
-[[!map pages="plugins/contrib/* and !*/Discussion"]]
+[[!map pages="plugins/contrib/* and !plugins/contrib/*/* and !*/Discussion"]]
-- 
cgit v1.2.3


From 0aaaa9b3f90e6bfe5e4a7da85d78c510b510e8de Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 14:24:39 -0400
Subject: response

---
 ...an__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
index e998ef825..4061a7348 100644
--- a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
@@ -3,3 +3,9 @@ Installed ikiwiki on my ubuntu (04.10) box; after creating a blog according to y
 I have no idea what to do (sorry for my ignorance)
 
 tia,
+
+> Make sure you have a `~/public_html/ikiwiki.cgi`. Your setup
+> file should generate that via the `cgi_wrapper` option.
+> 
+> Maybe you need to follow the [[tips/dot_cgi]] tip to make apache see it.
+> --[[Joey]]
-- 
cgit v1.2.3


From 2035881f55119471d3d506be6b0e0b1a35305aea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 14:31:24 -0400
Subject: response

---
 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index 44833b11f..637790482 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -1 +1,6 @@
 I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesign for my wiki, I have changed the `autotag.tmpl` template, but IkiWiki refuses to rebuild existing tag pages using the updated template. I understand that existing tag pages are not rebuilt because they have been marked as "created" in `.ikiwiki/indexdb`. Is there a way to purge all tag pages from `indexdb`? --dkobozev
+
+> Well, you can delete the indexdb and rebuild, and that will do it.
+> The tag plugin is careful not to replace existing pages or even recreate
+> tag pages if you delete them, which does cause a problem if you need to
+> update them. --[[Joey]]
-- 
cgit v1.2.3


From 99c9d8c34f95fe62c575a78e28abdbb47310c230 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 14:39:08 -0400
Subject: also a problem for theme plugin

---
 doc/bugs/underlaydir_file_expose.mdwn | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/underlaydir_file_expose.mdwn b/doc/bugs/underlaydir_file_expose.mdwn
index c827c6dd8..ca492e396 100644
--- a/doc/bugs/underlaydir_file_expose.mdwn
+++ b/doc/bugs/underlaydir_file_expose.mdwn
@@ -1,4 +1,12 @@
 If a file in the srcdir is removed, exposing a file in the underlaydir,
-ikiwiki will notice the removal and delete the page from the destdir. The
+ikiwiki will not notice the removal, and the
 page from the underlay will not be built. (However, it will be if the wiki
 gets rebuilt.)
+
+> This problem is caused by ikiwiki storing only filenames relative to
+> the srcdir or underlay, and mtime comparison not handling this case.
+
+> A related problem occurs if changing a site's theme with the
+> [[plugins/theme]] plugin. The style.css of the old and new theme
+> often has the same mtime, so ikiwiki does not update it w/o a rebuild.
+> --[[Joey]]
-- 
cgit v1.2.3


From 22aa874aa74a795b45ae4225464505551a1e8b6b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 14:58:36 -0400
Subject: rename bzed theme to "blueview"

---
 debian/copyright                        |   6 +-
 themes/blueview/background_darkness.png | Bin 0 -> 165 bytes
 themes/blueview/header_background.png   | Bin 0 -> 53693 bytes
 themes/blueview/style.css               | 280 ++++++++++++++++++++++++++++++++
 themes/bzed/background_darkness.png     | Bin 165 -> 0 bytes
 themes/bzed/header_background.png       | Bin 53693 -> 0 bytes
 themes/bzed/style.css                   | 280 --------------------------------
 7 files changed, 285 insertions(+), 281 deletions(-)
 create mode 100644 themes/blueview/background_darkness.png
 create mode 100644 themes/blueview/header_background.png
 create mode 100644 themes/blueview/style.css
 delete mode 100644 themes/bzed/background_darkness.png
 delete mode 100644 themes/bzed/header_background.png
 delete mode 100644 themes/bzed/style.css

diff --git a/debian/copyright b/debian/copyright
index 72394eadc..74391e2cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -202,7 +202,7 @@ Files: underlays/openid-selector/ikiwiki/openid/jquery.js
 Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer
 License: GPL-2
 
-Files: underlays/themes/bzed/*
+Files: underlays/themes/blueview/style.css
 Copyright: 
  © 2009,2010 Bernd Zeimetz
  © 2008 Yahoo! Inc.
@@ -210,6 +210,10 @@ License: GPL-2+
   Parts derived from BSD-C3 licensed YUI library.
   http://developer.yahoo.com/yui/license.html
 
+Files: underlays/themes/blueview/*
+Copyright: © 2009,2010 Bernd Zeimetz
+License: GPL-2+
+
 License: BSD-C2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/themes/blueview/background_darkness.png b/themes/blueview/background_darkness.png
new file mode 100644
index 000000000..0a1cb4e9e
Binary files /dev/null and b/themes/blueview/background_darkness.png differ
diff --git a/themes/blueview/header_background.png b/themes/blueview/header_background.png
new file mode 100644
index 000000000..4712ffb8f
Binary files /dev/null and b/themes/blueview/header_background.png differ
diff --git a/themes/blueview/style.css b/themes/blueview/style.css
new file mode 100644
index 000000000..540cac415
--- /dev/null
+++ b/themes/blueview/style.css
@@ -0,0 +1,280 @@
+/*    bzed theme for ikiwiki
+ *
+ *    Copyright (C) 2010 Bernd Zeimetz
+ *       Licensed under same license as ikiwiki: GPL v2 or later
+ *
+ *     Parts of this file are based on the awesome YUI,
+ *     these parts will stay under the BSD license,
+ *     but you're free to apply the GPLv2 to them, of course.
+ */
+
+
+
+/* -------------------------------------------------------------------------------------------------
+Based on reset-fonts-grids.css from yui.
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.5.1
+*/
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,legend,p,blockquote,th,td{margin:0;padding:0;}
+table{border-collapse:collapse;border-spacing:0;}
+img{border:0;}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
+li{list-style:none;}
+caption,th{text-align:left;}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
+q:before,q:after{content:'';}
+abbr,acronym {border:0;font-variant:normal;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+input,textarea,select{font-family:inherit;font-size: 13px/1.23;font-weight:normal;}
+input,textarea,select{*font-size:100%;}
+legend{color:#000;}
+/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */
+body {font:13px/1.231 "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;*font-size:small;*font:x-small;}
+table {font-size:inherit;font:100%;}
+pre,code,kbd,samp,tt{font-family:monospace;}
+
+
+body{text-align:left;}
+.inlinefooter{clear:both;}
+
+/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */
+.page {margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;}
+
+/* #doc3{margin:auto 10px;width:auto;} */
+.page {margin:auto 10px;width:auto;}
+
+#pagebody, .sidebar{position:relative;}
+#pagebody, .sidebar{_position:static;}
+#pagebody {position:static;}
+.sidebar {float:right;width:16.5em;*width:16em;}
+#pagebody {margin-right:19em;*margin-right:18.5em;}
+/* #content {float:none;width:auto;} */
+#pagebody:after, .sidebar:after, .page:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.page f{zoom:1;}
+
+/* ------------------------------------------------------------------------------------------------
+ * Taken from base.css, part of YUI's CSS Foundation
+ * Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+ * Code licensed under the BSD License:
+ * http://developer.yahoo.net/yui/license.txt
+ * version: 2.5.1
+*/
+h1 {
+	/*18px via YUI Fonts CSS foundation*/
+	font-size:138.5%;
+}
+h2 {
+	/*16px via YUI Fonts CSS foundation*/
+	font-size:123.1%;
+}
+h3 {
+	/*14px via YUI Fonts CSS foundation*/
+	font-size:108%;
+}
+h1,h2,h3 {
+	/* top & bottom margin based on font size */
+	margin:1em 0;
+}
+h1,h2,h3,h4,h5,h6,strong {
+	/*bringing boldness back to headers and the strong element*/
+	font-weight:bold;
+}
+abbr,acronym {
+	/*indicating to users that more info is available */
+	border-bottom:1px dotted #000;
+	cursor:help;
+}
+em {
+	/*bringing italics back to the em element*/
+	font-style:italic;
+}
+blockquote,ul,ol,dl {
+	/*giving blockquotes and lists room to breath*/
+	margin:1em;
+}
+ol,ul,dl {
+	/*bringing lists on to the page with breathing room */
+	margin-left:2em;
+}
+ol li {
+	/*giving OL's LIs generated numbers*/
+	list-style: decimal outside;
+}
+ul li {
+	/*giving UL's LIs generated disc markers*/
+	list-style: disc outside;
+}
+dl dd {
+	/*giving UL's LIs generated numbers*/
+	margin-left:1em;
+}
+th,td {
+	/*borders and padding to make the table readable*/
+	border:1px solid #000;
+	padding:.5em;
+}
+th {
+	/*distinguishing table headers from data cells*/
+	font-weight:bold;
+	text-align:center;
+}
+caption {
+	/*coordinated margin to match cell's padding*/
+	margin-bottom:.5em;
+	/*centered so it doesn't blend in to other content*/
+	text-align:center;
+}
+p,fieldset,table,pre {
+	/*so things don't run into each other*/
+	margin-bottom:1em;
+}
+
+#searchbox {
+	width:21.5em;*width:21em;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * All CSS below is
+ * Copyright (C) 2010 Bernd Zeimetz
+ * Licensed under same license as ikiwiki: GPL v2 or later */
+
+.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody {
+	border: none;
+}
+
+html, body {
+	color:#000;
+	/* background-image: url('body_background.png');
+	background-repeat: repeat; */
+	background-color: #8da1b8;
+}
+
+body {
+	padding-left: 5%;
+	padding-right: 5%;
+	padding-top: 1em;
+	padding-bottom: 1em;
+}
+
+.page {
+	background: #fff;
+	border: outset #ccc;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-top: 1em;
+}
+
+.pageheader {
+	background-image: url('header_background.png');
+	background-repeat: repeat-x;
+	height: 100px;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-bottom: 1em;
+	padding-top: 1em;
+}
+
+.pageheader .header {
+	text-align: top;
+	clear: both;
+}
+
+.pageheader .header form {
+	padding: 0em 0em 0em 0em;
+	float: right;
+	margin-top: 0.5em;
+}
+
+.pageheader .header .title, .pageheader .header .parentlinks,
+ .inlinepage .inlineheader,
+ h1, h2, h3, h4, h5, h6 {
+	margin-top: 1em;
+	font-weight: bold;
+}
+
+.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span {
+	padding: 0.25em 0.25em 0.25em 0.25em;
+	background-image: url('background_darkness.png');
+	background-repeat: repeat;
+	color: white;
+}
+
+.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
+	color: white;
+	text-decoration: none;
+}
+
+.pageheader .actions {
+	text-align: right;
+	vertical-align: bottom;
+	clear: both;
+}
+
+#pagebody {
+	padding-right: 1em;
+	padding-bottom: 2em;
+	border-right: ridge #eee;
+	clear: none;
+}
+
+#content a, #comments a, .sidebar a {
+	color: #315485;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+.sidebar h2 {
+	border-bottom: ridge #eee;
+	padding-right: 0;
+}
+
+.sidebar .menu {
+	margin-left: 1em;
+}
+
+
+.inlinepage, .recentchanges, div.recentchanges {
+	clear: none !important;
+	margin-bottom: 2em;
+}
+
+.inlinefooter {
+	border-top: 1px dotted #315485;
+}
+
+.inlinefooter .pagedate, .inlinefooter .tags {
+	display: inline;
+	clear: none;
+	margin-right: 2em;
+}
+
+.calendar .month-calendar th, .calendar .month-calendar td {
+	padding: 0.22em;
+}
+
+@media print {
+	.sidebar, .page .pageheader .header .parentlinks {
+		content:".";
+		display:block;
+		height:0;
+		visibility:hidden;
+	}
+	.page {
+		padding: 1em 1em 1em 1em;
+	}
+	.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
+		color #315485;
+	}
+	#content, #comments, #pagebody {
+		margin-right: 0;
+		*margin-right: 0;
+		border-right: none;
+	}
+
+}
+
diff --git a/themes/bzed/background_darkness.png b/themes/bzed/background_darkness.png
deleted file mode 100644
index 0a1cb4e9e..000000000
Binary files a/themes/bzed/background_darkness.png and /dev/null differ
diff --git a/themes/bzed/header_background.png b/themes/bzed/header_background.png
deleted file mode 100644
index 4712ffb8f..000000000
Binary files a/themes/bzed/header_background.png and /dev/null differ
diff --git a/themes/bzed/style.css b/themes/bzed/style.css
deleted file mode 100644
index 540cac415..000000000
--- a/themes/bzed/style.css
+++ /dev/null
@@ -1,280 +0,0 @@
-/*    bzed theme for ikiwiki
- *
- *    Copyright (C) 2010 Bernd Zeimetz
- *       Licensed under same license as ikiwiki: GPL v2 or later
- *
- *     Parts of this file are based on the awesome YUI,
- *     these parts will stay under the BSD license,
- *     but you're free to apply the GPLv2 to them, of course.
- */
-
-
-
-/* -------------------------------------------------------------------------------------------------
-Based on reset-fonts-grids.css from yui.
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.5.1
-*/
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,legend,p,blockquote,th,td{margin:0;padding:0;}
-table{border-collapse:collapse;border-spacing:0;}
-img{border:0;}
-address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
-li{list-style:none;}
-caption,th{text-align:left;}
-h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
-q:before,q:after{content:'';}
-abbr,acronym {border:0;font-variant:normal;}
-sup {vertical-align:text-top;}
-sub {vertical-align:text-bottom;}
-input,textarea,select{font-family:inherit;font-size: 13px/1.23;font-weight:normal;}
-input,textarea,select{*font-size:100%;}
-legend{color:#000;}
-/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */
-body {font:13px/1.231 "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;*font-size:small;*font:x-small;}
-table {font-size:inherit;font:100%;}
-pre,code,kbd,samp,tt{font-family:monospace;}
-
-
-body{text-align:left;}
-.inlinefooter{clear:both;}
-
-/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */
-.page {margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;}
-
-/* #doc3{margin:auto 10px;width:auto;} */
-.page {margin:auto 10px;width:auto;}
-
-#pagebody, .sidebar{position:relative;}
-#pagebody, .sidebar{_position:static;}
-#pagebody {position:static;}
-.sidebar {float:right;width:16.5em;*width:16em;}
-#pagebody {margin-right:19em;*margin-right:18.5em;}
-/* #content {float:none;width:auto;} */
-#pagebody:after, .sidebar:after, .page:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
-.page f{zoom:1;}
-
-/* ------------------------------------------------------------------------------------------------
- * Taken from base.css, part of YUI's CSS Foundation
- * Copyright (c) 2008, Yahoo! Inc. All rights reserved.
- * Code licensed under the BSD License:
- * http://developer.yahoo.net/yui/license.txt
- * version: 2.5.1
-*/
-h1 {
-	/*18px via YUI Fonts CSS foundation*/
-	font-size:138.5%;
-}
-h2 {
-	/*16px via YUI Fonts CSS foundation*/
-	font-size:123.1%;
-}
-h3 {
-	/*14px via YUI Fonts CSS foundation*/
-	font-size:108%;
-}
-h1,h2,h3 {
-	/* top & bottom margin based on font size */
-	margin:1em 0;
-}
-h1,h2,h3,h4,h5,h6,strong {
-	/*bringing boldness back to headers and the strong element*/
-	font-weight:bold;
-}
-abbr,acronym {
-	/*indicating to users that more info is available */
-	border-bottom:1px dotted #000;
-	cursor:help;
-}
-em {
-	/*bringing italics back to the em element*/
-	font-style:italic;
-}
-blockquote,ul,ol,dl {
-	/*giving blockquotes and lists room to breath*/
-	margin:1em;
-}
-ol,ul,dl {
-	/*bringing lists on to the page with breathing room */
-	margin-left:2em;
-}
-ol li {
-	/*giving OL's LIs generated numbers*/
-	list-style: decimal outside;
-}
-ul li {
-	/*giving UL's LIs generated disc markers*/
-	list-style: disc outside;
-}
-dl dd {
-	/*giving UL's LIs generated numbers*/
-	margin-left:1em;
-}
-th,td {
-	/*borders and padding to make the table readable*/
-	border:1px solid #000;
-	padding:.5em;
-}
-th {
-	/*distinguishing table headers from data cells*/
-	font-weight:bold;
-	text-align:center;
-}
-caption {
-	/*coordinated margin to match cell's padding*/
-	margin-bottom:.5em;
-	/*centered so it doesn't blend in to other content*/
-	text-align:center;
-}
-p,fieldset,table,pre {
-	/*so things don't run into each other*/
-	margin-bottom:1em;
-}
-
-#searchbox {
-	width:21.5em;*width:21em;
-}
-
-
-
-/* ------------------------------------------------------------------------------------------------
- * All CSS below is
- * Copyright (C) 2010 Bernd Zeimetz
- * Licensed under same license as ikiwiki: GPL v2 or later */
-
-.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody {
-	border: none;
-}
-
-html, body {
-	color:#000;
-	/* background-image: url('body_background.png');
-	background-repeat: repeat; */
-	background-color: #8da1b8;
-}
-
-body {
-	padding-left: 5%;
-	padding-right: 5%;
-	padding-top: 1em;
-	padding-bottom: 1em;
-}
-
-.page {
-	background: #fff;
-	border: outset #ccc;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-top: 1em;
-}
-
-.pageheader {
-	background-image: url('header_background.png');
-	background-repeat: repeat-x;
-	height: 100px;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-bottom: 1em;
-	padding-top: 1em;
-}
-
-.pageheader .header {
-	text-align: top;
-	clear: both;
-}
-
-.pageheader .header form {
-	padding: 0em 0em 0em 0em;
-	float: right;
-	margin-top: 0.5em;
-}
-
-.pageheader .header .title, .pageheader .header .parentlinks,
- .inlinepage .inlineheader,
- h1, h2, h3, h4, h5, h6 {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span {
-	padding: 0.25em 0.25em 0.25em 0.25em;
-	background-image: url('background_darkness.png');
-	background-repeat: repeat;
-	color: white;
-}
-
-.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
-	color: white;
-	text-decoration: none;
-}
-
-.pageheader .actions {
-	text-align: right;
-	vertical-align: bottom;
-	clear: both;
-}
-
-#pagebody {
-	padding-right: 1em;
-	padding-bottom: 2em;
-	border-right: ridge #eee;
-	clear: none;
-}
-
-#content a, #comments a, .sidebar a {
-	color: #315485;
-	text-decoration: none;
-	font-weight: bold;
-}
-
-.sidebar h2 {
-	border-bottom: ridge #eee;
-	padding-right: 0;
-}
-
-.sidebar .menu {
-	margin-left: 1em;
-}
-
-
-.inlinepage, .recentchanges, div.recentchanges {
-	clear: none !important;
-	margin-bottom: 2em;
-}
-
-.inlinefooter {
-	border-top: 1px dotted #315485;
-}
-
-.inlinefooter .pagedate, .inlinefooter .tags {
-	display: inline;
-	clear: none;
-	margin-right: 2em;
-}
-
-.calendar .month-calendar th, .calendar .month-calendar td {
-	padding: 0.22em;
-}
-
-@media print {
-	.sidebar, .page .pageheader .header .parentlinks {
-		content:".";
-		display:block;
-		height:0;
-		visibility:hidden;
-	}
-	.page {
-		padding: 1em 1em 1em 1em;
-	}
-	.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
-		color #315485;
-	}
-	#content, #comments, #pagebody {
-		margin-right: 0;
-		*margin-right: 0;
-		border-right: none;
-	}
-
-}
-
-- 
cgit v1.2.3


From 41680ebd5b7cb6bec541e1722085342117ce6f3f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 14:59:45 -0400
Subject: mention added themes

---
 debian/changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1afc620ab..d23dfc601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,9 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * git: Gix --gettime to properly support utf8 filenames.
   * attachment: Support Windows paths when taking basename of client-supplied
     file name.
-  * theme: New plugin, allows easily theming a site via the underlay.
+  * theme: New plugin, allows easily themeing a site via the underlay.
+  * Added actiontabs theme by Svend Sorensen.
+  * Added blueview theme by Bernd Zeimetz.
   * mercurial: Fix buggy getctime code. Closes: #586279
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
-- 
cgit v1.2.3


From 2490296dbaa6429e4c73faf6c12a078514230afa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 15:06:15 -0400
Subject: typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d23dfc601..eddca6dfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * Fix issues with combining unicode srcdirs and source files.
     (Workaround bug #586045)
   * Make --gettime be honored after initial setup.
-  * git: Gix --gettime to properly support utf8 filenames.
+  * git: Fix --gettime to properly support utf8 filenames.
   * attachment: Support Windows paths when taking basename of client-supplied
     file name.
   * theme: New plugin, allows easily themeing a site via the underlay.
-- 
cgit v1.2.3


From cfcc79ed4c9f11ef8af2ae19e3bb402289e9ea39 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 16:15:57 -0400
Subject: needsbuild hook is passed an array ref

---
 IkiWiki/Plugin/skeleton.pm.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 34713c73b..adffc91c9 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -70,7 +70,7 @@ sub refresh () {
 	debug("skeleton plugin refresh");
 }
 
-sub needsbuild () {
+sub needsbuild ($) {
 	debug("skeleton plugin needsbuild");
 }
 
-- 
cgit v1.2.3


From 57e56828f5b03f8fb31631f36731f989d4335607 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 16:40:47 -0400
Subject: store state to avoid needing to rebuild when changing theme

---
 IkiWiki/Plugin/theme.pm               | 30 +++++++++++++++++++++++++++++-
 doc/bugs/underlaydir_file_expose.mdwn |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm
index ba6966381..03b0816ed 100644
--- a/IkiWiki/Plugin/theme.pm
+++ b/IkiWiki/Plugin/theme.pm
@@ -8,6 +8,7 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "theme", call => \&getsetup);
 	hook(type => "checkconfig", id => "theme", call => \&checkconfig);
+	hook(type => "needsbuild", id => "theme", call => \&needsbuild);
 }
 
 sub getsetup () {
@@ -22,7 +23,7 @@ sub getsetup () {
 			example => "actiontabs",
 			description => "name of theme to enable",
 			safe => 1,
-			rebuild => 1,
+			rebuild => 0,
 		},
 }
 
@@ -34,4 +35,31 @@ sub checkconfig () {
 	}
 }
 
+sub needsbuild ($) {
+	my $needsbuild=shift;
+	if (($config{theme} || '') ne ($wikistate{theme}{currenttheme} || '')) {
+		# theme changed; ensure all files in the theme are built
+		my %needsbuild=map { $_ => 1 } @$needsbuild;
+		if ($config{theme}) {
+			foreach my $file (glob("$config{underlaydirbase}/themes/$config{theme}/*")) {
+				if (-f $file) {
+					my $f=IkiWiki::basename($file);
+					push @$needsbuild, $f
+						unless $needsbuild{$f};
+				}
+			}
+		}
+		elsif ($wikistate{theme}{currenttheme}) {
+			foreach my $file (glob("$config{underlaydirbase}/themes/$wikistate{theme}{currenttheme}/*")) {
+				my $f=IkiWiki::basename($file);
+				if (-f $file && defined eval { srcfile($f) }) {
+					push @$needsbuild, $f;
+				}
+			}
+		}
+		
+		$wikistate{theme}{currenttheme}=$config{theme};
+	}
+}
+
 1
diff --git a/doc/bugs/underlaydir_file_expose.mdwn b/doc/bugs/underlaydir_file_expose.mdwn
index ca492e396..4ee30e39d 100644
--- a/doc/bugs/underlaydir_file_expose.mdwn
+++ b/doc/bugs/underlaydir_file_expose.mdwn
@@ -9,4 +9,5 @@ gets rebuilt.)
 > A related problem occurs if changing a site's theme with the
 > [[plugins/theme]] plugin. The style.css of the old and new theme
 > often has the same mtime, so ikiwiki does not update it w/o a rebuild.
+> This is worked around in theme.pm with a special-purpose needsbuild hook.
 > --[[Joey]]
-- 
cgit v1.2.3


From b3e8115c95c79859c2893ac73e9f0bab0db31594 Mon Sep 17 00:00:00 2001
From: "http://www.openid.albertlash.com/openid/"
 <http://www.openid.albertlash.com/openid/@web>
Date: Fri, 18 Jun 2010 20:47:31 +0000
Subject:

---
 doc/todo/Google_Sitemap_protocol.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 057a88b72..6657c9350 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -45,3 +45,13 @@ On [Google Webmaster tools](https://www.google.com/webmasters/tools) you can sub
 [Google should grok feeds as sitemaps.](http://www.google.com/support/webmasters/bin/answer.py?answer=34654) Or rather [[plugins/inline]] should be improved to support the [sitemap protocol](http://sitemaps.org/protocol.php) natively.
 
 -- [[Hendry]]
+
+
+Took me a minute to figure this out so I figured I'd share the steps I took:
+
+* Added rss=>1 and allowrss=>1 to my setup file
+* Created a new page where the RSS would be created with this content, replacing "first_page" with the page in my wiki with the earliest date:
+
+<pre>
+\[\[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
+</pre>
-- 
cgit v1.2.3


From 4833f486b6ca759e1bcd8acc19e13ef4a0a6063f Mon Sep 17 00:00:00 2001
From: "http://www.openid.albertlash.com/openid/"
 <http://www.openid.albertlash.com/openid/@web>
Date: Fri, 18 Jun 2010 20:48:10 +0000
Subject: don't need to escape the inline tag if its in pre tag

---
 doc/todo/Google_Sitemap_protocol.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 6657c9350..12ac8d036 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -53,5 +53,5 @@ Took me a minute to figure this out so I figured I'd share the steps I took:
 * Created a new page where the RSS would be created with this content, replacing "first_page" with the page in my wiki with the earliest date:
 
 <pre>
-\[\[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
+[[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
 </pre>
-- 
cgit v1.2.3


From 54719b80751fb802f6c18a216a8de5513fb90c9c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 18:03:19 -0400
Subject: update to newer version from svend's blog

---
 themes/actiontabs/style.css | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css
index f48448e2e..4f95c0b6a 100644
--- a/themes/actiontabs/style.css
+++ b/themes/actiontabs/style.css
@@ -37,15 +37,21 @@ body {
 
 .pageheader {
 	margin: 0;
-	padding: 1em 2em 0 2em;
+	padding: 1em 2em;
+	position: relative;
+	overflow: hidden;
 	background: #eee;
 	border-color: #999;
 	border-style: none none solid none;
 	border-width: 1px;
 }
 
+.pageheader .header {
+	float: left;
+	font-size: 120%;
+}
+
 .header {
-	font-size: 100%;
 	font-weight: normal;
 }
 
@@ -53,16 +59,25 @@ body {
 	display: block;
 	margin-top: .2em;
 	font: 140% sans-serif;
-	text-transform: capitalize;
+}
+
+#searchform {
+	position: absolute;
+	top: 1em;
+	right: 2em;
 }
 
 .actions {
+	position: absolute;
+	bottom: 0;
+	right: 2em;
+	width: 100%;
 	text-align: right;
 	padding: 0;
 }
 
 #content, #comments, #footer {
-  	margin: 1em 2em;
+	margin: 1em 2em;
 }
 
 #pageinfo {
@@ -78,7 +93,6 @@ body {
 
 .inlineheader {
 	font-size: 120%;
-	font-weight: normal;
 }
 
 h1 { font: 120% sans-serif }
@@ -96,7 +110,6 @@ h4, h5, h6 { font: small-caps 100% sans-serif }
 }
 
 .actions ul {
-	font-size: 75%;
 	padding: 0;
 	border-style: none;
 }
-- 
cgit v1.2.3


From aa0fe1aac9b393a7a214dedef4229560ab31a5df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 18:06:29 -0400
Subject: sidebar styling and fix actions for inlined pages

Styling the actions for inlined pages as tabs did not work well.
That still needs some work; for now just don't style the actions for
inlined pages.
---
 themes/actiontabs/style.css | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css
index 4f95c0b6a..261e95fa0 100644
--- a/themes/actiontabs/style.css
+++ b/themes/actiontabs/style.css
@@ -67,7 +67,7 @@ body {
 	right: 2em;
 }
 
-.actions {
+.pageheader .actions {
 	position: absolute;
 	bottom: 0;
 	right: 2em;
@@ -118,7 +118,7 @@ h4, h5, h6 { font: small-caps 100% sans-serif }
 	text-decoration: none;
 }
 
-.actions ul li {
+.pageheader .actions ul li {
 	margin: 0;
 	padding: .1em .5em 0 .5em;
 	background: white;
@@ -134,3 +134,12 @@ div.recentchanges {
 .pagecloud {
 	width: auto;
 }
+
+.sidebar {
+        border-bottom: 0;
+	border-right: 0;
+	border-top: 0;
+	margin-top: 0.5em;
+	padding: 0 0 0 2ex;
+	border-color: #999;
+}
-- 
cgit v1.2.3


From 929017406651deb50746ba435e5c95e38087b9ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 18:19:12 -0400
Subject: less tight positioning

the descenders in the tabs were cut off before
---
 themes/actiontabs/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css
index 261e95fa0..c5925cedd 100644
--- a/themes/actiontabs/style.css
+++ b/themes/actiontabs/style.css
@@ -63,13 +63,13 @@ body {
 
 #searchform {
 	position: absolute;
-	top: 1em;
+	top: 0.5em;
 	right: 2em;
 }
 
 .pageheader .actions {
 	position: absolute;
-	bottom: 0;
+	bottom: 5px;
 	right: 2em;
 	width: 100%;
 	text-align: right;
-- 
cgit v1.2.3


From 8b2b66655d5328a2eaaaaa5562e4047c31fbf077 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Sat, 19 Jun 2010 00:20:01 +0000
Subject: reply to Joey

---
 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index 637790482..f88b78f37 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -4,3 +4,5 @@ I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesi
 > The tag plugin is careful not to replace existing pages or even recreate
 > tag pages if you delete them, which does cause a problem if you need to
 > update them. --[[Joey]]
+
+>> Thanks. I thought about deleting `indexdb`, but hesitated to do that. According to [[tips/inside dot ikiwiki]], `indexdb` stores "all persistent state about pages". I didn't know if it's harmless to lose all persistent state.
-- 
cgit v1.2.3


From 99a4096397d9ee5ce65084ac80cc6ff3a0879df5 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Sat, 19 Jun 2010 00:20:50 +0000
Subject: forgotten signature

---
 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index f88b78f37..02138326d 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -5,4 +5,4 @@ I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesi
 > tag pages if you delete them, which does cause a problem if you need to
 > update them. --[[Joey]]
 
->> Thanks. I thought about deleting `indexdb`, but hesitated to do that. According to [[tips/inside dot ikiwiki]], `indexdb` stores "all persistent state about pages". I didn't know if it's harmless to lose all persistent state.
+>> Thanks. I thought about deleting `indexdb`, but hesitated to do that. According to [[tips/inside dot ikiwiki]], `indexdb` stores "all persistent state about pages". I didn't know if it's harmless to lose all persistent state. --dkobozev
-- 
cgit v1.2.3


From dd3274ce734e3af0ca6a7940f69201d8d4b84fda Mon Sep 17 00:00:00 2001
From: Bernd Zeimetz <bernd@bzed.de>
Date: Mon, 14 Jun 2010 01:18:33 +0200
Subject: Enhance the link plugin to handle external links.

The following ways to create a link are supported now:
[[url]]
[[text|url]]
url can be one of the following:
- an internal wikilink: will be handled as before
- any other kind of URL, including mailto: proper links will be created:
  <a href="url">url</a>
  <a href="url">text</a>
- an email address:
  <a href="mailto:url">url</a>
  <a href="mailto:url">text</a>
---
 IkiWiki/Plugin/link.pm | 89 +++++++++++++++++++++++++++++++++++++-------------
 doc/plugins/link.mdwn  |  2 +-
 2 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 3838aec09..d41965bd3 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -7,6 +7,9 @@ use IkiWiki 3.00;
 
 my $link_regexp;
 
+my $email_regexp = qr/^(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])$/i; 
+my $url_regexp = qr/^(?:[^:]+:\/\/|mailto:).*/i;
+
 sub import {
 	hook(type => "getsetup", id => "link", call => \&getsetup);
 	hook(type => "checkconfig", id => "link", call => \&checkconfig);
@@ -57,8 +60,42 @@ sub checkconfig () {
 			)?                      # optional
 
 			\]\]                    # end of link
-		}x,
+		}x;
+	}
+}
+
+sub is_externallink ($$) {
+	my $page = shift;
+	my $url = shift;
+	if ($url =~ /$email_regexp/) {
+		# url looks like an email address, so we assume it
+		# is supposed to be an external link if there is no
+		# page with that name.
+		$url =~ s/#.*//;
+		return (! (bestlink($page, linkpage($url))))
 	}
+	return ($url =~ /$url_regexp/)
+}
+
+sub externallink ($;@) {
+	my $url = shift;
+	my $pagetitle = shift;
+
+	# build pagetitle
+	if (!($pagetitle)) {
+		$pagetitle = $url;
+		# use only the email address as title for mailto: urls
+		if ($pagetitle =~ /^mailto:.*/) {
+			$pagetitle =~ s/^mailto:([^?]+).*/$1/;
+		}
+	}
+
+	# handle email-addresses (without mailto:):
+	if ($url =~ /$email_regexp/) {
+		$url = "mailto:" . $url;
+	}
+
+	return "<a href=\"$url\">$pagetitle</a>";
 }
 
 sub linkify (@) {
@@ -70,12 +107,16 @@ sub linkify (@) {
 		defined $2
 			? ( $1 
 				? "[[$2|$3".($4 ? "#$4" : "")."]]" 
-				: htmllink($page, $destpage, linkpage($3),
-					anchor => $4, linktext => pagetitle($2)))
+				: is_externallink($page, $3 . ($4 ? "#$4" : ""))
+					? externallink("$3" . ($4 ? "#$4" : ""), $2)
+					: htmllink($page, $destpage, linkpage($3),
+						anchor => $4, linktext => pagetitle($2)))
 			: ( $1 
 				? "[[$3".($4 ? "#$4" : "")."]]"
-				: htmllink($page, $destpage, linkpage($3),
-					anchor => $4))
+				: is_externallink($page, $3 . ($4 ? "#$4" : ""))
+					? externallink("$3" . ($4 ? "#$4" : ""))
+					: htmllink($page, $destpage, linkpage($3),
+						anchor => $4))
 	}eg;
 	
 	return $params{content};
@@ -87,7 +128,9 @@ sub scan (@) {
 	my $content=$params{content};
 
 	while ($content =~ /(?<!\\)$link_regexp/g) {
-		add_link($page, linkpage($2));
+		if (! is_externallink($page, $2 . ($3 ? "#$3" : ""))) {
+			add_link($page, linkpage($2));
+		}
 	}
 }
 
@@ -98,24 +141,26 @@ sub renamepage (@) {
 	my $new=$params{newpage};
 
 	$params{content} =~ s{(?<!\\)$link_regexp}{
-		my $linktext=$2;
-		my $link=$linktext;
-		if (bestlink($page, linkpage($linktext)) eq $old) {
-			$link=pagetitle($new, 1);
-			$link=~s/ /_/g;
-			if ($linktext =~ m/.*\/*?[A-Z]/) {
-				# preserve leading cap of last component
-				my @bits=split("/", $link);
-				$link=join("/", @bits[0..$#bits-1], ucfirst($bits[$#bits]));
-			}
-			if (index($linktext, "/") == 0) {
-				# absolute link
-				$link="/$link";
+		if (! is_externallink($page, $2 . ($3 ? "#$3" : ""))) {
+			my $linktext=$2;
+			my $link=$linktext;
+			if (bestlink($page, linkpage($linktext)) eq $old) {
+				$link=pagetitle($new, 1);
+				$link=~s/ /_/g;
+				if ($linktext =~ m/.*\/*?[A-Z]/) {
+					# preserve leading cap of last component
+					my @bits=split("/", $link);
+					$link=join("/", @bits[0..$#bits-1], ucfirst($bits[$#bits]));
+				}
+				if (index($linktext, "/") == 0) {
+					# absolute link
+					$link="/$link";
+				}
 			}
+			defined $1
+				? ( "[[$1|$link".($3 ? "#$3" : "")."]]" )
+				: ( "[[$link".   ($3 ? "#$3" : "")."]]" )
 		}
-		defined $1
-			? ( "[[$1|$link".($3 ? "#$3" : "")."]]" )
-			: ( "[[$link".   ($3 ? "#$3" : "")."]]" )
 	}eg;
 
 	return $params{content};
diff --git a/doc/plugins/link.mdwn b/doc/plugins/link.mdwn
index 6adbf3eae..5de4fe3cb 100644
--- a/doc/plugins/link.mdwn
+++ b/doc/plugins/link.mdwn
@@ -1,4 +1,4 @@
 [[!template id=plugin name=link core=1 author="[[Joey]]"]]
 [[!tag type/link]]
 
-This plugin implements standard [[WikiLinks|ikiwiki/wikilink]].
+This plugin implements standard [[WikiLinks|ikiwiki/wikilink]] and links to [[external pages|http://www.debian.org]].
-- 
cgit v1.2.3


From 02871721951f0cf48238542b98077d5e99523857 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sat, 19 Jun 2010 10:27:28 +0000
Subject: Test PageSpec with root page `/index.mdwn`.

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index cc2569e7c..1e5a890b3 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -88,3 +88,4 @@ test2
 
 I assume this triggers a checkin and recompile?
 
+[[!inline pages="/index"]]
-- 
cgit v1.2.3


From 14e1cccf1222232bd890c9eff1ea2c7fb0804b4f Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sat, 19 Jun 2010 10:35:32 +0000
Subject: Match start page `/index` does not work.

---
 doc/ikiwiki/pagespec/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn
index 4eed3722c..1aac47fa4 100644
--- a/doc/ikiwiki/pagespec/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/discussion.mdwn
@@ -92,3 +92,11 @@ does not seem suitable for this, as
 > \[[!map pages="./*"]]
 
 also lists the current page and all its siblings.
+
+---
+
+I am a little lost. I want to match the start page `/index.mdwn`. So I use
+
+    \[[!inline pages="/index"]]
+
+which does not work though. I also tried it in this Wiki. Just take a look at the end of the [[SandBox|sandbox]]. --[[PaulePanter]]
-- 
cgit v1.2.3


From 397f1cbc7625b76832e3a6d41ebd7cd871c8cbc9 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sat, 19 Jun 2010 10:47:30 +0000
Subject: What license for themes for distribution in ikiwiki?

---
 doc/plugins/theme/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/plugins/theme/discussion.mdwn

diff --git a/doc/plugins/theme/discussion.mdwn b/doc/plugins/theme/discussion.mdwn
new file mode 100644
index 000000000..8c834e701
--- /dev/null
+++ b/doc/plugins/theme/discussion.mdwn
@@ -0,0 +1,3 @@
+### What license do themes need to have for distribution?
+
+Could someone specify what license the themes need to have to get distributed in ikiwiki or Debian? The current included theme seem to be under the GPLv2. Does the [Creative Commons Attribution 3.0 Unported License](http://creativecommons.org/licenses/by/3.0/) also work. This way a lot of free CSS templates could be included, e. g. from [freecsstemplates.org](http://www.freecsstemplates.org/).
-- 
cgit v1.2.3


From 03947e706abcd8df9c5c5fba753a8a6ee56c59b2 Mon Sep 17 00:00:00 2001
From: jeanm <jeanm@web>
Date: Sat, 19 Jun 2010 13:35:37 +0000
Subject: Added a comment

---
 .../comment_1_d36ce6fab90e0a086ac84369af38d205._comment  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_1_d36ce6fab90e0a086ac84369af38d205._comment

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_1_d36ce6fab90e0a086ac84369af38d205._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_1_d36ce6fab90e0a086ac84369af38d205._comment
new file mode 100644
index 000000000..f95972c4f
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_1_d36ce6fab90e0a086ac84369af38d205._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="jeanm"
+ subject="comment 1"
+ date="2010-06-19T13:35:37Z"
+ content="""
+OK, I followed the dot cgi tip and this error diappears, thanks a lot! So ubuntu doesn't provide a \"working out of the box\" ikiwiki.
+
+But I get a new error message now when trying to edit a page:
+
+Error: \"do\" parameter missing
+
+My plugins now:
+add_plugins => [qw{goodstuff websetup comments blogspam 404 muse}],
+
+
+"""]]
-- 
cgit v1.2.3


From 22478de2cb9d843e3444e0f39bac850d372887f1 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Tue, 22 Jun 2010 13:30:50 +0000
Subject:

---
 doc/todo/auto_publish_expire.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/todo/auto_publish_expire.mdwn

diff --git a/doc/todo/auto_publish_expire.mdwn b/doc/todo/auto_publish_expire.mdwn
new file mode 100644
index 000000000..6f767a693
--- /dev/null
+++ b/doc/todo/auto_publish_expire.mdwn
@@ -0,0 +1,10 @@
+It could be nice to mark some page such that:
+
+* the page is automatically published on some date (i.e. build, linked, syndicated, inlined/mapped, etc.)
+* the page is automatically unpublished at some other date (i.e. removed)
+
+I know that ikiwiki is a wiki compiler so that something has to refresh the wiki periodically to enforce the rules (a cronjob for instance). It seems to me that the calendar plugin rely on something similar.
+
+The date for publishing and expiring could be set be using some new directives; an alternative could be to expand the [[plugin/meta]] plugin with [<span/>[!meta date="auto publish date"]] and [<span/>[!meta expires="auto expire date"]].
+
+--[[JeanPrivat]]
-- 
cgit v1.2.3


From cfc1c4e933b8ba77bc6c3adb60fcea40721c0a61 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Tue, 22 Jun 2010 15:10:59 +0000
Subject: ping

---
 doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index bb4339f88..8c689294a 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -17,6 +17,8 @@ those contents instead.
 
 >>> I made a [[git]] branch for it [[!template id=gitbranch branch="privat/multiple_sidebars" author="[[jeanprivat]]"]] --[[jeanprivat]]
 
+>>>> Ping for [[Joey]]. Do you have any comment? I could improve it if there is things you do not like. I prefer to have such a feature integrated upstream. --[[JeanPrivat]]
+
 <pre>
 --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
 +++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
-- 
cgit v1.2.3


From c0a99d24b150ba5a495290c75abb2516c924f0ab Mon Sep 17 00:00:00 2001
From: ikiwikiweb <ikiwikiweb@web>
Date: Tue, 22 Jun 2010 20:45:40 +0000
Subject: testing

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1e5a890b3..347fd9945 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -53,6 +53,7 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
+* [TVs](http://www.superstoresearch.com/shopping/categories/4326-1/electronics/home-cinema-audio/flat-panel-televisions.html)
 * [GNU](http://www.gnu.org/)
 
 -----
-- 
cgit v1.2.3


From 9372a40189f5ac04cc045a476c8a3e4e791678f2 Mon Sep 17 00:00:00 2001
From: ikiwikiweb <ikiwikiweb@web>
Date: Tue, 22 Jun 2010 20:46:57 +0000
Subject:

---
 doc/sandbox.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 347fd9945..c49a47cb6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -29,6 +29,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. cool
 
 Bulleted list
 
@@ -53,7 +54,7 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
-* [TVs](http://www.superstoresearch.com/shopping/categories/4326-1/electronics/home-cinema-audio/flat-panel-televisions.html)
+* [TVS](http://www.superstoresearch.com/shopping/categories/4326-1/electronics/home-cinema-audio/flat-panel-televisions.html)
 * [GNU](http://www.gnu.org/)
 
 -----
-- 
cgit v1.2.3


From 44e286de2eed96c223d07b53e8038c8a61d1cdec Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 12:51:50 -0400
Subject: response

---
 doc/plugins/theme/discussion.mdwn | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/theme/discussion.mdwn b/doc/plugins/theme/discussion.mdwn
index 8c834e701..091aa97c1 100644
--- a/doc/plugins/theme/discussion.mdwn
+++ b/doc/plugins/theme/discussion.mdwn
@@ -1,3 +1,18 @@
 ### What license do themes need to have for distribution?
 
-Could someone specify what license the themes need to have to get distributed in ikiwiki or Debian? The current included theme seem to be under the GPLv2. Does the [Creative Commons Attribution 3.0 Unported License](http://creativecommons.org/licenses/by/3.0/) also work. This way a lot of free CSS templates could be included, e. g. from [freecsstemplates.org](http://www.freecsstemplates.org/).
+Could someone specify what license the themes need to have to get
+distributed in ikiwiki or Debian? The current included theme seem to be
+under the GPLv2. Does the [Creative Commons Attribution 3.0 Unported
+License](http://creativecommons.org/licenses/by/3.0/) also work. This way a
+lot of free CSS templates could be included, e. g. from
+[freecsstemplates.org](http://www.freecsstemplates.org/). --PaulePanter
+
+> Paule, I'd love it if you did that! The only hard requirement on themes
+> included in ikiwiki is that they need to be licensed with a [DFSG
+> compatable license](https://wiki.debian.org/DFSGLicenses). CC-BY-SA 3.0
+> is DFSG; CC-BY is apparently being accepted by Debian too.
+> 
+> As a soft requirement, I may exersise some discretion about themes that
+> require obtrusive attributions links be included on every page of a
+> site using the theme. While probably DFSG, that adds a requirement
+> that ikiwiki itself does not require. --[[Joey]]
-- 
cgit v1.2.3


From c208ac5b2867fdf96268d928e48f1467391a0a10 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 12:53:01 -0400
Subject: despam

"ikiwikiweb" is banned
---
 doc/sandbox.mdwn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index c49a47cb6..7c32d0cfe 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -54,7 +54,6 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
-* [TVS](http://www.superstoresearch.com/shopping/categories/4326-1/electronics/home-cinema-audio/flat-panel-televisions.html)
 * [GNU](http://www.gnu.org/)
 
 -----
-- 
cgit v1.2.3


From 7d55ee1961d52cc79ab533e0cde7f53af21a075d Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Wed, 23 Jun 2010 17:03:12 +0000
Subject: Added a comment: do parameter missing

---
 .../comment_2_5836bba08172d2ddf6a43da87ebb0332._comment            | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_2_5836bba08172d2ddf6a43da87ebb0332._comment

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_2_5836bba08172d2ddf6a43da87ebb0332._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_2_5836bba08172d2ddf6a43da87ebb0332._comment
new file mode 100644
index 000000000..0a544eeb1
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_2_5836bba08172d2ddf6a43da87ebb0332._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ subject="do parameter missing"
+ date="2010-06-23T17:03:12Z"
+ content="""
+That's an unusual problem. Normally the url or form that calls ikiwiki.cgi includes a \"do\" parameter, like \"do=edit\". I'd have to see the site to debug why it is missing for you.
+"""]]
-- 
cgit v1.2.3


From 4048988576c4ad23293379751b438af0bdb4b310 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:04:56 -0400
Subject: response

---
 doc/ikiwiki/pagespec/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn
index 1aac47fa4..4c553925a 100644
--- a/doc/ikiwiki/pagespec/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/discussion.mdwn
@@ -100,3 +100,6 @@ I am a little lost. I want to match the start page `/index.mdwn`. So I use
     \[[!inline pages="/index"]]
 
 which does not work though. I also tried it in this Wiki. Just take a look at the end of the [[SandBox|sandbox]]. --[[PaulePanter]]
+
+> Unlike wikilinks, pagespecs match relative to the top of the wiki by
+> default. So lose the "/" and it will work. --[[Joey]]
-- 
cgit v1.2.3


From bbbbf04f76dc5eb6824e5efd5f0ca128e32430ce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:12:43 -0400
Subject: thoughts

---
 doc/todo/auto_publish_expire.mdwn | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/doc/todo/auto_publish_expire.mdwn b/doc/todo/auto_publish_expire.mdwn
index 6f767a693..7a5a17517 100644
--- a/doc/todo/auto_publish_expire.mdwn
+++ b/doc/todo/auto_publish_expire.mdwn
@@ -8,3 +8,26 @@ I know that ikiwiki is a wiki compiler so that something has to refresh the wiki
 The date for publishing and expiring could be set be using some new directives; an alternative could be to expand the [[plugin/meta]] plugin with [<span/>[!meta date="auto publish date"]] and [<span/>[!meta expires="auto expire date"]].
 
 --[[JeanPrivat]]
+
+> This is a duplicate, and expansion, of
+> [[todo/tagging_with_a_publication_date]].
+> There, I suggest using a branch to develop
+> prepublication versions of a site, and merge from it
+> when the thing is published. 
+> 
+> Another approach I've seen used is to keep such pages in a pending/
+> directory, and move them via cron job when their publication time comes.
+> But that requires some familiarity with, and access to, cron.
+> 
+> On [[todo/tagging_with_a_publication_date]], I also suggested using meta 
+> date to set a page's date into the future,
+> and adding a pagespec that matches only pages with dates in the past,
+> which would allow filtering out the unpublished ones.
+> Sounds like you are thinking along these lines, but possibly using
+> something other than the page's creation or modification date to do it.
+> 
+> I do think the general problem with that approach is that you have to be
+> careful to prevent the unpublished pages from leaking out in any
+> inlines, maps, etc. --[[Joey]] 
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From 0025798751dfc721aa81ce75f7baf87545bd1370 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:15:10 -0400
Subject: clarify indexdb is cached info, rebuildable

---
 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn | 3 +++
 doc/tips/inside_dot_ikiwiki.mdwn                        | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index 02138326d..114837031 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -6,3 +6,6 @@ I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesi
 > update them. --[[Joey]]
 
 >> Thanks. I thought about deleting `indexdb`, but hesitated to do that. According to [[tips/inside dot ikiwiki]], `indexdb` stores "all persistent state about pages". I didn't know if it's harmless to lose all persistent state. --dkobozev
+
+>>> The persistant state is best thought of as a cache,
+>>> so it's safe to delete it. --[[Joey]] 
diff --git a/doc/tips/inside_dot_ikiwiki.mdwn b/doc/tips/inside_dot_ikiwiki.mdwn
index b81ffae8d..a74d00f47 100644
--- a/doc/tips/inside_dot_ikiwiki.mdwn
+++ b/doc/tips/inside_dot_ikiwiki.mdwn
@@ -6,9 +6,10 @@ you need/want to.
 
 ## the index
 
-`.ikiwiki/indexdb` contains a cache of information about pages, as well
-as all persisitant state about pages. It used to be a (semi) human-readable
-text file, but is not anymore.
+`.ikiwiki/indexdb` contains a cache of information about pages.
+This information can always be recalculated by rebuilding the wiki.
+(So the file is safe to delete and need not be backed up.)
+It used to be a (semi) human-readable text file, but is not anymore.
 
 To dump the contents of the file, enter a perl command like this.
 
-- 
cgit v1.2.3


From 16ff593ab78409fc3c2482aeb2903e9a3d83b581 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:16:31 -0400
Subject: Revert "don't need to escape the inline tag if its in pre tag"

This reverts commit 4833f486b6ca759e1bcd8acc19e13ef4a0a6063f.

Being in a pre does not stop an inline directive from working.
---
 doc/todo/Google_Sitemap_protocol.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 12ac8d036..6657c9350 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -53,5 +53,5 @@ Took me a minute to figure this out so I figured I'd share the steps I took:
 * Created a new page where the RSS would be created with this content, replacing "first_page" with the page in my wiki with the earliest date:
 
 <pre>
-[[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
+\[\[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
 </pre>
-- 
cgit v1.2.3


From 9b845ea8132f5677c7466b8747333afba54017b9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:17:33 -0400
Subject: one slash is enough to escape

---
 doc/todo/Google_Sitemap_protocol.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 6657c9350..2cf7c61e3 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -53,5 +53,5 @@ Took me a minute to figure this out so I figured I'd share the steps I took:
 * Created a new page where the RSS would be created with this content, replacing "first_page" with the page in my wiki with the earliest date:
 
 <pre>
-\[\[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
+\[[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
 </pre>
-- 
cgit v1.2.3


From 6235167962e65733f8a120edba394a77d684278f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:29:46 -0400
Subject: response

---
 .../beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index 8c689294a..1f7b48764 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -19,6 +19,21 @@ those contents instead.
 
 >>>> Ping for [[Joey]]. Do you have any comment? I could improve it if there is things you do not like. I prefer to have such a feature integrated upstream. --[[JeanPrivat]]
 
+>>>>> The code is fine.
+>>>>>
+>>>>> I did think about having it examine
+>>>>> the `page.tmpl` for parameters with names like `FOO_SIDEBAR`
+>>>>> and automatically enable page `foo` as a sidebar in that case,
+>>>>> instead of using the setup file to enable. But I'm not sure about
+>>>>> that idea..
+>>>>> 
+>>>>> The full compliment of sidebars would be a header, a footer,
+>>>>> a left, and a right sidebar. It would make sense to go ahead
+>>>>> and add the parameters to `page.tmpl` so enabling each just works,
+>>>>> and add whatever basic CSS makes sense. Although I don't know
+>>>>> if I want to try to get a 3 column CSS going, so perhaps leave the
+>>>>> left sidebar out of that.
+
 <pre>
 --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
 +++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
-- 
cgit v1.2.3


From 383ad93f777f19a38036f88ff40972155d60a593 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:33:14 -0400
Subject: add changelog for externalink

remove debian.org linkspam ;)
---
 debian/changelog      | 1 +
 doc/plugins/link.mdwn | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eddca6dfc..0d169fb56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * Added actiontabs theme by Svend Sorensen.
   * Added blueview theme by Bernd Zeimetz.
   * mercurial: Fix buggy getctime code. Closes: #586279
+  * link: Enhanced to handle URLs and email addresses. (Bernd Zeimetz)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/plugins/link.mdwn b/doc/plugins/link.mdwn
index 5de4fe3cb..7dfa50de4 100644
--- a/doc/plugins/link.mdwn
+++ b/doc/plugins/link.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=link core=1 author="[[Joey]]"]]
 [[!tag type/link]]
 
-This plugin implements standard [[WikiLinks|ikiwiki/wikilink]] and links to [[external pages|http://www.debian.org]].
+This plugin implements standard [[WikiLinks|ikiwiki/wikilink]] and links to
+external pages.
-- 
cgit v1.2.3


From 07a08122d926ab6b7741c94bc6c0038ffe0113fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:35:31 -0400
Subject: document external links

---
 doc/ikiwiki/wikilink.mdwn | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index 0c30aafa2..cf3b89c76 100644
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -9,9 +9,6 @@ wikilink, just prefix it with a `\`, like `\\[[WikiLink]]`.
 There are some special [[SubPage/LinkingRules]] that come into play when
 linking between [[SubPages|SubPage]].
 
-Also, if the file linked to by a WikiLink looks like an image, it will
-be displayed inline on the page.
-
 WikiLinks are matched with page names in a case-insensitive manner, so you
 don't need to worry about getting the case the same, and can capitalise
 links at the start of a sentence, and so on.
@@ -22,3 +19,11 @@ page, but the link will appear like this: [[foo_bar|SandBox]].
 
 To link to an anchor inside a page, you can use something like
 `\[[WikiLink#foo]]` .
+
+If the file linked to by a WikiLink looks like an image, it will
+be displayed inline on the page.
+
+---
+
+You can also put an url in a WikiLink, to link to an external page.
+Email addresses can also be used to generate a mailto link.
-- 
cgit v1.2.3


From 19dcd50c8497eca4981f9a90cc3e014789a50f76 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:40:10 -0400
Subject: avoid needing full email regexp

Fully validating the email address is not necessary,
all that matters is not matching an url like http://foo@bar/
as an email address.
---
 IkiWiki/Plugin/link.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index d41965bd3..7d4692ef0 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -7,7 +7,7 @@ use IkiWiki 3.00;
 
 my $link_regexp;
 
-my $email_regexp = qr/^(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])$/i; 
+my $email_regexp = qr/^.+@.+$/;
 my $url_regexp = qr/^(?:[^:]+:\/\/|mailto:).*/i;
 
 sub import {
@@ -82,7 +82,7 @@ sub externallink ($;@) {
 	my $pagetitle = shift;
 
 	# build pagetitle
-	if (!($pagetitle)) {
+	if (! $pagetitle) {
 		$pagetitle = $url;
 		# use only the email address as title for mailto: urls
 		if ($pagetitle =~ /^mailto:.*/) {
@@ -90,8 +90,8 @@ sub externallink ($;@) {
 		}
 	}
 
-	# handle email-addresses (without mailto:):
-	if ($url =~ /$email_regexp/) {
+	if ($url !~ /$url_regexp/) {
+		# handle email addresses (without mailto:)
 		$url = "mailto:" . $url;
 	}
 
-- 
cgit v1.2.3


From 6e67219eff9ea599e9efa8a846a4c78c76c5b008 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:57:27 -0400
Subject: simplify anchor handling

At least two bugfixes in here. First, an old bug;
\[[foo#0]] was displayed as [[foo]], losing the anchor
as the anchor text was false. Secondly, a new bug;
an email like foo#bar@baz should not check bestlink("foo@baz").
---
 IkiWiki/Plugin/link.pm | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 7d4692ef0..87e06ca89 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -64,23 +64,33 @@ sub checkconfig () {
 	}
 }
 
-sub is_externallink ($$) {
+sub is_externallink ($$;$) {
 	my $page = shift;
 	my $url = shift;
+	my $anchor = shift;
+	
+	if (defined $anchor) {
+		$url.="#".$anchor;
+	}
+
 	if ($url =~ /$email_regexp/) {
 		# url looks like an email address, so we assume it
 		# is supposed to be an external link if there is no
 		# page with that name.
-		$url =~ s/#.*//;
 		return (! (bestlink($page, linkpage($url))))
 	}
 	return ($url =~ /$url_regexp/)
 }
 
-sub externallink ($;@) {
+sub externallink ($$;$) {
 	my $url = shift;
+	my $anchor = shift;
 	my $pagetitle = shift;
 
+	if (defined $anchor) {
+		$url.="#".$anchor;
+	}
+
 	# build pagetitle
 	if (! $pagetitle) {
 		$pagetitle = $url;
@@ -106,15 +116,15 @@ sub linkify (@) {
 	$params{content} =~ s{(\\?)$link_regexp}{
 		defined $2
 			? ( $1 
-				? "[[$2|$3".($4 ? "#$4" : "")."]]" 
-				: is_externallink($page, $3 . ($4 ? "#$4" : ""))
-					? externallink("$3" . ($4 ? "#$4" : ""), $2)
+				? "[[$2|$3".(defined $4 ? "#$4" : "")."]]" 
+				: is_externallink($page, $3, $4)
+					? externallink($3, $4, $2)
 					: htmllink($page, $destpage, linkpage($3),
 						anchor => $4, linktext => pagetitle($2)))
 			: ( $1 
-				? "[[$3".($4 ? "#$4" : "")."]]"
-				: is_externallink($page, $3 . ($4 ? "#$4" : ""))
-					? externallink("$3" . ($4 ? "#$4" : ""))
+				? "[[$3".(defined $4 ? "#$4" : "")."]]"
+				: is_externallink($page, $3, $4)
+					? externallink($3, $4)
 					: htmllink($page, $destpage, linkpage($3),
 						anchor => $4))
 	}eg;
@@ -128,7 +138,7 @@ sub scan (@) {
 	my $content=$params{content};
 
 	while ($content =~ /(?<!\\)$link_regexp/g) {
-		if (! is_externallink($page, $2 . ($3 ? "#$3" : ""))) {
+		if (! is_externallink($page, $2, $3)) {
 			add_link($page, linkpage($2));
 		}
 	}
@@ -141,7 +151,7 @@ sub renamepage (@) {
 	my $new=$params{newpage};
 
 	$params{content} =~ s{(?<!\\)$link_regexp}{
-		if (! is_externallink($page, $2 . ($3 ? "#$3" : ""))) {
+		if (! is_externallink($page, $2, $3)) {
 			my $linktext=$2;
 			my $link=$linktext;
 			if (bestlink($page, linkpage($linktext)) eq $old) {
-- 
cgit v1.2.3


From 82789e39aa75a15f3f9020a6f809150d4c8a00f8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 14:05:57 -0400
Subject: bugfix: record email-like links as page links

This way, an email-like link will be a mailto until a matching page
is created, then it will link to the page. And removing the page will
convert it back to a mailto.
---
 IkiWiki/Plugin/link.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 87e06ca89..f6c3573f7 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -64,21 +64,23 @@ sub checkconfig () {
 	}
 }
 
-sub is_externallink ($$;$) {
+sub is_externallink ($$;$$) {
 	my $page = shift;
 	my $url = shift;
 	my $anchor = shift;
+	my $force = shift;
 	
 	if (defined $anchor) {
 		$url.="#".$anchor;
 	}
 
-	if ($url =~ /$email_regexp/) {
+	if (! $force && $url =~ /$email_regexp/) {
 		# url looks like an email address, so we assume it
 		# is supposed to be an external link if there is no
 		# page with that name.
 		return (! (bestlink($page, linkpage($url))))
 	}
+
 	return ($url =~ /$url_regexp/)
 }
 
@@ -138,7 +140,7 @@ sub scan (@) {
 	my $content=$params{content};
 
 	while ($content =~ /(?<!\\)$link_regexp/g) {
-		if (! is_externallink($page, $2, $3)) {
+		if (! is_externallink($page, $2, $3, 1)) {
 			add_link($page, linkpage($2));
 		}
 	}
-- 
cgit v1.2.3


From d5c680e693def6d59fcb7c8831356d5acad14cae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 14:23:09 -0400
Subject: releasing version 3.20100623

---
 debian/changelog | 6 +++---
 ikiwiki.spec     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d169fb56..032041346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100611) UNRELEASED; urgency=low
+ikiwiki (3.20100623) unstable; urgency=low
 
   * openid: Add openid_realm and openid_cgiurl configuration options,
     useful in a few edge case setups.
@@ -9,7 +9,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * edittemplate: Make silent mode not disable display when the template
     page does not exist, so it can be easily created.
   * edittemplate: Look for template pages under templates/ like everything
-    else (still looks in old location for backwards compatability).
+    else (still looks in old location for backwards compatibility).
   * attachment: When inserting links, insert img directives for images,
     if that plugin is enabled.
   * websetup: Allow enabling plugins listed in disable_plugins.
@@ -28,7 +28,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * mercurial: Fix buggy getctime code. Closes: #586279
   * link: Enhanced to handle URLs and email addresses. (Bernd Zeimetz)
 
- -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 14:10:26 -0400
 
 ikiwiki (3.20100610) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 503019435..9a4bbf6bc 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100610
+Version: 3.20100623
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
-- 
cgit v1.2.3


From 609367933f07ff826a5c1bbbd093dfe2ddae1c04 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 14:23:51 -0400
Subject: add news item for ikiwiki 3.20100623

---
 doc/news/version_3.20100504.mdwn | 16 ----------------
 doc/news/version_3.20100623.mdwn | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 16 deletions(-)
 delete mode 100644 doc/news/version_3.20100504.mdwn
 create mode 100644 doc/news/version_3.20100623.mdwn

diff --git a/doc/news/version_3.20100504.mdwn b/doc/news/version_3.20100504.mdwn
deleted file mode 100644
index 5ed6b6b4f..000000000
--- a/doc/news/version_3.20100504.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-ikiwiki 3.20100504 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add parameter to displaytime to specify that it is a pubdate,
-     and in html5 mode, use time tag.
-   * Add placeholder text in search form (in html5 mode only).
-   * In html5 mode, use all the nice new semantic tags. Care was taken
-     to not change the id/class named used in the CSS, so only CSS
-     that refers to tag types needed to be changed.
-   * Add ACTIONS variable to page.tmpl, which allows plugins to add arbitrary
-     links to the action bar without modifying the template further.
-     (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
-     are kept separate for now to avoid breaking modified templates.)
-   * websetup: Only display Setup button on admins' preferences page.
-   * graphviz: Fix display of preexisting images in preview mode.
-   * Fixes a bug in skipping of illegal source files introduced in
-     3.20100427."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100623.mdwn b/doc/news/version_3.20100623.mdwn
new file mode 100644
index 000000000..684217e26
--- /dev/null
+++ b/doc/news/version_3.20100623.mdwn
@@ -0,0 +1,29 @@
+ikiwiki 3.20100623 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * openid: Add openid\_realm and openid\_cgiurl configuration options,
+     useful in a few edge case setups.
+   * attachment: Show files from underlay in attachments list.
+   * img: Support hspace and vspace attributes.
+   * editpage: Rename "comments" field to avoid CSS conflict with the
+     comments div.
+   * edittemplate: Make silent mode not disable display when the template
+     page does not exist, so it can be easily created.
+   * edittemplate: Look for template pages under templates/ like everything
+     else (still looks in old location for backwards compatibility).
+   * attachment: When inserting links, insert img directives for images,
+     if that plugin is enabled.
+   * websetup: Allow enabling plugins listed in disable\_plugins.
+   * editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
+     (Thanks, privat)
+   * calendar: Tune archive\_pagespec to only match pages, not other files.
+   * Fix issues with combining unicode srcdirs and source files.
+     (Workaround bug #586045)
+   * Make --gettime be honored after initial setup.
+   * git: Fix --gettime to properly support utf8 filenames.
+   * attachment: Support Windows paths when taking basename of client-supplied
+     file name.
+   * theme: New plugin, allows easily themeing a site via the underlay.
+   * Added actiontabs theme by Svend Sorensen.
+   * Added blueview theme by Bernd Zeimetz.
+   * mercurial: Fix buggy getctime code. Closes: #[586279](http://bugs.debian.org/586279)
+   * link: Enhanced to handle URLs and email addresses. (Bernd Zeimetz)"""]]
\ No newline at end of file
-- 
cgit v1.2.3


From e32bce464305fd8314d8324169a2079516548faf Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Wed, 23 Jun 2010 18:44:52 +0000
Subject: It is possible to use google-sitemapgen to create google sitemaps for
 ikiwiki.

---
 doc/todo/Google_Sitemap_protocol.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 2cf7c61e3..ea8ee7f03 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -34,6 +34,9 @@ for an example.  You will probably need to strip out the metadata variables I
 >>>[xtermin.us rather than localhost](http://xtermin.us/git/?p=website.git;a=blob;f=plugins/googlesitemap.pm) is 404 now.
 >>> -- weakish
 
+
+Although it is not able to read the meta-data from files, using google-sitemapgen [works well for me](http://bzed.de/posts/2010/06/creating_a_google_sitemap_for_ikiwiki/) to create a sitemap for my ikiwiki installation. -- [[bzed|BerndZeimetz]]
+
 There is a [sitemap XML standard](http://www.sitemaps.org/protocol.php) that ikiwiki needs to generate for. 
 
 # Google Webmaster tools and RSS
-- 
cgit v1.2.3


From 0580cbbf40873a2d20da96b41f4b14f642cb108d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 15:23:13 -0400
Subject: whitespace

---
 IkiWiki/Plugin/cvs.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 360d97249..18491d517 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -305,7 +305,7 @@ sub rcs_rename ($$) {
 	rcs_remove($src);
 }
 
-sub rcs_recentchanges($) {
+sub rcs_recentchanges ($) {
 	my $num = shift;
 	my @ret;
 
-- 
cgit v1.2.3


From c46bcb425af0948ac59581d6ba7b477826d83ae3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 15:32:27 -0400
Subject: Add new optional field usershort to rcs_recentchanges.

Now the git plugin supports commits with author fields that look like:
Author: http://my.openid/ <me@web>

Then in recentchanges, the short username will be displayed, linking
to the openid.

Particularly useful for the horrible google openids, of course.
---
 IkiWiki/Plugin/git.pm           | 15 +++++++++++----
 IkiWiki/Plugin/recentchanges.pm |  3 +--
 debian/changelog                |  6 ++++++
 doc/plugins/write.mdwn          |  4 +++-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 222692eda..a43b85920 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -342,8 +342,9 @@ sub parse_diff_tree ($) {
 			$ci{ "${who}_epoch" } = $epoch;
 			$ci{ "${who}_tz"    } = $tz;
 
-			if ($name =~ m/^[^<]+\s+<([^@>]+)/) {
-				$ci{"${who}_username"} = $1;
+			if ($name =~ m/^([^<]+)\s+<([^@>]+)/) {
+				$ci{"${who}_name"} = $1;
+				$ci{"${who}_username"} = $2;
 			}
 			elsif ($name =~ m/^([^<]+)\s+<>$/) {
 				$ci{"${who}_username"} = $1;
@@ -588,9 +589,14 @@ sub rcs_recentchanges ($) {
 			push @messages, { line => $line };
 		}
 
-		my $user=$ci->{'author_username'};
+		my $user=$ci->{'author_name'};
+		my $usershort=$ci->{'author_username'};
 		my $web_commit = ($ci->{'author'} =~ /\@web>/);
-		
+
+		if ($usershort =~ /:\/\//) {
+			$usershort=undef; # url; not really short
+		}
+
 		# compatability code for old web commit messages
 		if (! $web_commit &&
 		      defined $messages[0] &&
@@ -603,6 +609,7 @@ sub rcs_recentchanges ($) {
 		push @rets, {
 			rev        => $sha1,
 			user       => $user,
+			usershort  => $usershort,
 			committype => $web_commit ? "web" : "git",
 			when       => $when,
 			message    => [@messages],
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index e546e4702..9f188cbff 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -114,12 +114,11 @@ sub store ($$$) {
 	];
 	push @{$change->{pages}}, { link => '...' } if $is_excess;
 
-	# See if the committer is an openid.
 	$change->{author}=$change->{user};
 	my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
 	if (defined $oiduser) {
 		$change->{authorurl}=$change->{user};
-		$change->{user}=$oiduser;
+		$change->{user}=defined $change->{usershort} ? $change->{usershort} : $oiduser;
 	}
 	elsif (length $config{cgiurl}) {
 		$change->{authorurl} = IkiWiki::cgiurl(
diff --git a/debian/changelog b/debian/changelog
index 032041346..01d0abb47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100624) UNRELEASED; urgency=low
+
+  * Add new optional field usershort to rcs_recentchanges.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
+
 ikiwiki (3.20100623) unstable; urgency=low
 
   * openid: Add openid_realm and openid_cgiurl configuration options,
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 193005565..5f0e95a9f 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1103,7 +1103,9 @@ The data structure returned for each change is:
 
 	{
 		rev => # the RCSs id for this commit
-		user => # name of user who made the change,
+		user => # user who made the change (may be an openid),
+		usershort => # short name of user (optional; not an openid),
+		
 		committype => # either "web" or the name of the rcs,
 		when => # time when the change was made,
 		message => [
-- 
cgit v1.2.3


From b4a43406f61b7ff9ab77d242edf4d59369ac8596 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 16:05:49 -0400
Subject: API: rcs_commit and rcs_commit_staged are passed a new parameter that
 may contain the username component of the email address of the user making
 the commit.

---
 IkiWiki/Plugin/bzr.pm       |  8 ++++----
 IkiWiki/Plugin/cvs.pm       |  7 ++++---
 IkiWiki/Plugin/darcs.pm     |  8 ++++----
 IkiWiki/Plugin/git.pm       |  8 ++++----
 IkiWiki/Plugin/mercurial.pm |  8 ++++----
 IkiWiki/Plugin/monotone.pm  |  7 ++++---
 IkiWiki/Plugin/norcs.pm     |  8 ++++----
 IkiWiki/Plugin/svn.pm       |  7 ++++---
 IkiWiki/Plugin/tla.pm       |  7 ++++---
 debian/changelog            |  5 ++++-
 doc/plugins/write.mdwn      | 10 ++++++----
 11 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 9bee0c4b2..44ab9a86a 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -137,8 +137,8 @@ sub bzr_author ($$) {
 	}
 }
 
-sub rcs_commit ($$$;$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+sub rcs_commit ($$$;$$$) {
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 
 	$user = bzr_author($user, $ipaddr);
 
@@ -156,10 +156,10 @@ sub rcs_commit ($$$;$$) {
 	return undef; # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 
 	$user = bzr_author($user, $ipaddr);
 
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 18491d517..a9fe162a1 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -183,7 +183,7 @@ sub rcs_prepedit ($) {
 	return defined $rev ? $rev : "";
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
@@ -192,6 +192,7 @@ sub rcs_commit ($$$;$$) {
 	my $rcstoken=shift;
 	my $user=shift;
 	my $ipaddr=shift;
+	my $emailuser=shift;
 
 	return unless cvs_is_controlling;
 
@@ -224,10 +225,10 @@ sub rcs_commit ($$$;$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 
 	if (defined $user) {
 		$message="web commit by $user".(length $message ? ": $message" : "");
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index f17fadcb1..345456c01 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -140,11 +140,11 @@ sub rcs_prepedit ($) {
 	return $rev;
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Commit the page.  Returns 'undef' on success and a version of the page
 	# with conflict markers on failure.
 
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 
 	# Compute if the "revision" of $file changed.
 	my $changed = darcs_rev($file) ne $rcstoken;
@@ -239,8 +239,8 @@ sub rcs_commit ($$$;$$) {
 	}
 }
 
-sub rcs_commit_staged ($$$) {
-	my ($message, $user, $ipaddr) = @_;
+sub rcs_commit_staged ($$$;$) {
+	my ($message, $user, $ipaddr, $emailuser) = @_;
 
 	my $author;
 	if (defined $user) {
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index a43b85920..b56f229d7 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -464,12 +464,12 @@ sub rcs_prepedit ($) {
 	return git_sha1($file);
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Try to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on
 	# failure.
 
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 
 	# Check to see if the page has been changed by someone else since
 	# rcs_prepedit was called.
@@ -485,10 +485,10 @@ sub rcs_commit ($$$;$$) {
 	return rcs_commit_staged($message, $user, $ipaddr);
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 
 	# Set the commit author and email to the web committer.
 	my %env=%ENV;
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index a80bb2da5..1793ab4bb 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -126,8 +126,8 @@ sub rcs_prepedit ($) {
 	return "";
 }
 
-sub rcs_commit ($$$;$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+sub rcs_commit ($$$;$$$) {
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 
 	if (defined $user) {
 		$user = IkiWiki::possibly_foolish_untaint($user);
@@ -153,10 +153,10 @@ sub rcs_commit ($$$;$$) {
 	return undef; # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	
 	error("rcs_commit_staged not implemented for mercurial"); # TODO
 }
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 67d4abbaa..55d8039e0 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -293,7 +293,7 @@ sub rcs_prepedit ($) {
 	return get_rev();
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
@@ -302,6 +302,7 @@ sub rcs_commit ($$$;$$) {
 	my $rcstoken=shift;
 	my $user=shift;
 	my $ipaddr=shift;
+	my $emailuser=shift;
 	my $author;
 
 	if (defined $user) {
@@ -438,10 +439,10 @@ sub rcs_commit ($$$;$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	
 	# Note - this will also commit any spurious changes that happen to be
 	# lying around in the working copy.  There shouldn't be any, but...
diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm
index 053652a5f..5131a1502 100644
--- a/IkiWiki/Plugin/norcs.pm
+++ b/IkiWiki/Plugin/norcs.pm
@@ -38,13 +38,13 @@ sub rcs_prepedit ($) {
 	return ""
 }
 
-sub rcs_commit ($$$;$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+sub rcs_commit ($$$;$$$) {
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
-	my ($message, $user, $ipaddr)=@_;
+sub rcs_commit_staged ($$$;$) {
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	return undef # success
 }
 
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index d10b4888d..ffacb8cf9 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -144,7 +144,7 @@ sub rcs_prepedit ($) {
 	}
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
@@ -153,6 +153,7 @@ sub rcs_commit ($$$;$$) {
 	my $rcstoken=shift;
 	my $user=shift;
 	my $ipaddr=shift;
+	my $emailuser=shift;
 
 	if (defined $user) {
 		$message="web commit by $user".(length $message ? ": $message" : "");
@@ -189,10 +190,10 @@ sub rcs_commit ($$$;$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	
 	if (defined $user) {
 		$message="web commit by $user".(length $message ? ": $message" : "");
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index f5ad0cc96..80c015e3c 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -98,12 +98,13 @@ sub rcs_prepedit ($) {
 	}
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	my $file=shift;
 	my $message=shift;
 	my $rcstoken=shift;
 	my $user=shift;
 	my $ipaddr=shift;
+	my $emailuser=shift;
 
 	if (defined $user) {
 		$message="web commit by $user".(length $message ? ": $message" : "");
@@ -139,10 +140,10 @@ sub rcs_commit ($$$;$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	
 	error("rcs_commit_staged not implemented for tla"); # TODO
 }
diff --git a/debian/changelog b/debian/changelog
index 01d0abb47..2dfebd0b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 ikiwiki (3.20100624) UNRELEASED; urgency=low
 
-  * Add new optional field usershort to rcs_recentchanges.
+  * API: Add new optional field usershort to rcs_recentchanges.
+  * API: rcs_commit and rcs_commit_staged are passed a new parameter
+    that may contain the username component of the email address of
+    the user making the commit.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 5f0e95a9f..ab2934bf1 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1051,15 +1051,17 @@ token, that will be passed into `rcs_commit` when committing. For example,
 it might return the current revision ID of the file, and use that
 information later when merging changes.
 
-#### `rcs_commit($$$;$$)`
+#### `rcs_commit($$$;$$$)`
 
-Passed a file, message, token (from `rcs_prepedit`), user, and ip address.
+Passed a file, message, token (from `rcs_prepedit`), user, ip address,
+and optionally the username component of the committer's email address.
 Should try to commit the file. Returns `undef` on *success* and a version
 of the page with the rcs's conflict markers on failure.
 
-#### `rcs_commit_staged($$$)`
+#### `rcs_commit_staged($$$;$)`
 
-Passed a message, user, and ip address. Should commit all staged changes.
+Passed a message, user, ip address, and optionally the username component of
+the committer's email address. Should commit all staged changes.
 Returns undef on success, and an error message on failure.
 
 Changes can be staged by calls to `rcs_add`, `rcs_remove`, and
-- 
cgit v1.2.3


From 4292802ee5f93f7ec7644c5d0a30f7ffeb95e566 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 16:32:20 -0400
Subject: stop using REMOTE_ADDR

Everywhere that REMOTE_ADDR was used, a session object is available, so
instead use its remote_addr method.

In IkiWiki::Receive, stop setting a dummy REMOTE_ADDR.

Note that it's possible for a session cookie to be obtained using one IP
address, and then used from another IP. In this case, the first IP will now
be used. I think that should be ok.
---
 IkiWiki/CGI.pm                      |  2 +-
 IkiWiki/Plugin/attachment.pm        |  5 +++--
 IkiWiki/Plugin/blogspam.pm          |  3 ++-
 IkiWiki/Plugin/comments.pm          | 10 ++++++----
 IkiWiki/Plugin/editpage.pm          |  3 ++-
 IkiWiki/Plugin/lockedit.pm          |  2 +-
 IkiWiki/Plugin/moderatedcomments.pm |  4 ++--
 IkiWiki/Plugin/passwordauth.pm      |  2 +-
 IkiWiki/Plugin/poll.pm              |  3 ++-
 IkiWiki/Plugin/remove.pm            |  3 ++-
 IkiWiki/Plugin/rename.pm            |  8 +++++---
 IkiWiki/Receive.pm                  |  1 -
 12 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 28020b500..f2a32a958 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -283,7 +283,7 @@ sub check_banned ($$) {
 
 	foreach my $b (@{$config{banned_users}}) {
 		if (pagespec_match("", $b,
-			ip => $ENV{REMOTE_ADDR},
+			ip => $session->remote_addr(),
 			name => defined $name ? $name : "",
 		)) {
 			$banned=1;
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index ce688ca40..216e00b3d 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -58,7 +58,7 @@ sub check_canattach ($$;$) {
 			$config{allowed_attachments},
 			file => $file,
 			user => $session->param("name"),
-			ip => $ENV{REMOTE_ADDR},
+			ip => $session->remote_addr(),
 		);
 	}
 
@@ -185,7 +185,8 @@ sub formbuilder (@) {
 			IkiWiki::disable_commit_hook();
 			IkiWiki::rcs_commit($filename, gettext("attachment upload"),
 				IkiWiki::rcs_prepedit($filename),
-				$session->param("name"), $ENV{REMOTE_ADDR});
+				$session->param("name"),
+				$session->remote_addr());
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index c4e5cf390..8db3780e8 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -58,6 +58,7 @@ sub checkconfig () {
 
 sub checkcontent (@) {
 	my %params=@_;
+	my $session=$params{session};
 	
  	if (exists $config{blogspam_pagespec}) {
 		return undef
@@ -88,7 +89,7 @@ sub checkcontent (@) {
 	push @options, "exclude=stopwords";
 
 	my %req=(
-		ip => $ENV{REMOTE_ADDR},
+		ip => $session->remote_addr(),
 		comment => defined $params{diff} ? $params{diff} : $params{content},
 		subject => defined $params{subject} ? $params{subject} : "",
 		name => defined $params{author} ? $params{author} : "",
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d1558001a..4770209c9 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -402,8 +402,8 @@ sub editcomment ($$) {
 		$username =~ s/"/&quot;/g;
 		$content .= " username=\"$username\"\n";
 	}
-	elsif (defined $ENV{REMOTE_ADDR}) {
-		my $ip = $ENV{REMOTE_ADDR};
+	elsif (defined $session->remote_addr()) {
+		my $ip = $session->remote_addr();
 		if ($ip =~ m/^([.0-9]+)$/) {
 			$content .= " ip=\"$1\"\n";
 		}
@@ -514,7 +514,8 @@ sub editcomment ($$) {
 			IkiWiki::rcs_add($file);
 			IkiWiki::disable_commit_hook();
 			$conflict = IkiWiki::rcs_commit_staged($message,
-				$session->param('name'), $ENV{REMOTE_ADDR});
+				$session->param('name'),
+				$session->remote_addr());
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
@@ -603,7 +604,8 @@ sub commentmoderation ($$) {
 				my $message = gettext("Comment moderation");
 				IkiWiki::disable_commit_hook();
 				$conflict=IkiWiki::rcs_commit_staged($message,
-					$session->param('name'), $ENV{REMOTE_ADDR});
+					$session->param('name'),
+					$session->remote_addr());
 				IkiWiki::enable_commit_hook();
 				IkiWiki::rcs_update();
 			}
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 3ba6c519e..a8e75121f 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -403,7 +403,8 @@ sub cgi_editpage ($$) {
 			disable_commit_hook();
 			$conflict=rcs_commit($file, $message,
 				$form->field("rcsinfo"),
-				$session->param("name"), $ENV{REMOTE_ADDR});
+				$session->param("name"),
+				$session->remote_addr());
 			enable_commit_hook();
 			rcs_update();
 		}
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 1466e8337..5b50fd115 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -38,7 +38,7 @@ sub canedit ($$) {
 	if (defined $config{locked_pages} && length $config{locked_pages} &&
 	    pagespec_match($page, $config{locked_pages},
 		    user => $session->param("name"),
-		    ip => $ENV{REMOTE_ADDR},
+		    ip => $session->remote_addr(),
 	    )) {
 		if ((! defined $user ||
 		    ! IkiWiki::userinfo_get($session->param("name"), "regdate")) &&
diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index ff2c2b160..5957833fc 100644
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -48,11 +48,11 @@ sub checkcontent (@) {
 	}
 
 	my $session=$params{session};
-	my $user=$session->param("name") if $session;
+	my $user=$session->param("name");
 	if (pagespec_match($params{page}, $config{moderate_pagespec},
 			location => $params{page},
 			(defined $user ? (user => $user) : ()),
-			(defined $ENV{REMOTE_ADDR} ? (ip => $ENV{REMOTE_ADDR}) : ()),
+			(defined $session->remote_addr() ? (ip => $session->remote_addr()) : ()),
 	)) {
 		return gettext("comment needs moderation");
 	}
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index baddca093..35ebd961f 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -297,7 +297,7 @@ sub formbuilder (@) {
 					),
 					wikiurl => $config{url},
 					wikiname => $config{wikiname},
-					REMOTE_ADDR => $ENV{REMOTE_ADDR},
+					remote_addr => $session->remote_addr(),
 				);
 				
 				eval q{use Mail::Sendmail};
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 6bc4579c2..e50efa5e0 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -136,7 +136,8 @@ sub sessioncgi ($$) {
 			IkiWiki::disable_commit_hook();
 			IkiWiki::rcs_commit($pagesources{$page}, "poll vote ($choice)",
 				IkiWiki::rcs_prepedit($pagesources{$page}),
-				$session->param("name"), $ENV{REMOTE_ADDR});
+				$session->param("name"),
+				$session->remote_addr());
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index d23b2cc10..b664cbf74 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -214,7 +214,8 @@ sub sessioncgi ($$) {
 					IkiWiki::rcs_remove($file);
 				}
 				IkiWiki::rcs_commit_staged(gettext("removed"),
-					$session->param("name"), $ENV{REMOTE_ADDR});
+					$session->param("name"),
+					$session->remote_addr());
 				IkiWiki::enable_commit_hook();
 				IkiWiki::rcs_update();
 			}
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 0da90a538..977c09e67 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -350,7 +350,9 @@ sub sessioncgi ($$) {
 			}
 			IkiWiki::rcs_commit_staged(
 				sprintf(gettext("rename %s to %s"), $srcfile, $destfile),
-				$session->param("name"), $ENV{REMOTE_ADDR}) if $config{rcs};
+				$session->param("name"),
+				$session->remote_addr(),
+			) if $config{rcs};
 
 			# Then link fixups.
 			foreach my $rename (@torename) {
@@ -575,8 +577,8 @@ sub fixlinks ($$$) {
 					$file,
 					sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}),
 					$token,
-					$session->param("name"), 
-					$ENV{REMOTE_ADDR}
+					$session->param("name"),
+					$session->remote_addr(),
 				);
 				push @fixedlinks, $page if ! defined $conflict;
 			}
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index ae1bd8bef..fdd463025 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -57,7 +57,6 @@ sub test () {
 	eval q{use CGI};
 	error($@) if $@;
 	my $cgi=CGI->new;
-	$ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
 
 	# And dummy up a session object.
 	require IkiWiki::CGI;
-- 
cgit v1.2.3


From caf7bcdda38c1f2c31c70e36a95e4fa3f116f0d7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 16:56:50 -0400
Subject: update for new rcs_commit_staged API

In the process, lost the commits from special usernames
when committing changed po files. Instead of trying to dummy up a session
object for the special username, I just don't pass one, and the commit will
appear to be from whatever user ikiwiki runs as.
---
 IkiWiki/Plugin/po.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 990847b48..86d5087f4 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -429,8 +429,7 @@ sub change (@) {
 
 	if ($updated_po_files) {
 		commit_and_refresh(
-			gettext("updated PO files"),
-			"IkiWiki::Plugin::po::change");
+			gettext("updated PO files"));
 	}
 }
 
@@ -1035,17 +1034,18 @@ sub deletetranslations ($) {
 
 	if (@todelete) {
 		commit_and_refresh(
-			gettext("removed obsolete PO files"),
-			"IkiWiki::Plugin::po::deletetranslations");
+			gettext("removed obsolete PO files"));
 	}
 }
 
-sub commit_and_refresh ($$) {
-	my ($msg, $author) = (shift, shift);
+sub commit_and_refresh ($) {
+	my $msg = shift;
 
 	if ($config{rcs}) {
 		IkiWiki::disable_commit_hook();
-		IkiWiki::rcs_commit_staged($msg, $author, "127.0.0.1");
+		IkiWiki::rcs_commit_staged(
+			message => $msg,
+		);
 		IkiWiki::enable_commit_hook();
 		IkiWiki::rcs_update();
 	}
-- 
cgit v1.2.3


From ecdfd1b8644bc926db008054ab6192e18351afed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 17:35:21 -0400
Subject: rcs_commit and rcs_commit_staged api changes

Using named parameters for these is overdue. Passing the session in a
parameter instead of passing username and IP separately will later allow
storing other session info, like username or part of the email.

Note that these functions are not part of the exported API,
and the prototype change will catch (most) skew, so I am not changing
API versions. Any third-party plugins that call them will need updated
though.
---
 IkiWiki.pm                   |   4 +-
 IkiWiki/Plugin/attachment.pm |  10 ++--
 IkiWiki/Plugin/autoindex.pm  |   4 +-
 IkiWiki/Plugin/bzr.pm        |  43 +++++++++--------
 IkiWiki/Plugin/comments.pm   |  14 +++---
 IkiWiki/Plugin/cvs.pm        |  59 ++++++++++++-----------
 IkiWiki/Plugin/darcs.pm      |  75 +++++++++++++++---------------
 IkiWiki/Plugin/editpage.pm   |  10 ++--
 IkiWiki/Plugin/git.pm        |  52 +++++++++++++--------
 IkiWiki/Plugin/mercurial.pm  |  32 ++++++-------
 IkiWiki/Plugin/monotone.pm   |  85 +++++++++++++++-------------------
 IkiWiki/Plugin/norcs.pm      |   6 +--
 IkiWiki/Plugin/poll.pm       |  10 ++--
 IkiWiki/Plugin/remove.pm     |   7 +--
 IkiWiki/Plugin/rename.pm     |   5 +-
 IkiWiki/Plugin/svn.pm        |  59 ++++++++++++-----------
 IkiWiki/Plugin/tag.pm        |   2 +-
 IkiWiki/Plugin/tla.pm        |  34 ++++++++------
 debian/changelog             |   5 +-
 doc/plugins/write.mdwn       |  16 ++++---
 ikiwiki-calendar.in          |   2 +-
 ikiwiki.spec                 |   2 +-
 po/ikiwiki.pot               | 108 +++++++++++++++++++++----------------------
 t/bazaar.t                   |  25 ++++++++--
 t/cvs.t                      |   6 ++-
 t/git.t                      |  12 +++--
 t/mercurial.t                |  11 ++++-
 t/svn.t                      |   6 ++-
 28 files changed, 380 insertions(+), 324 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 203da3ba2..35b38df46 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1840,11 +1840,11 @@ sub rcs_prepedit ($) {
 	$hooks{rcs}{rcs_prepedit}{call}->(@_);
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit (@) {
 	$hooks{rcs}{rcs_commit}{call}->(@_);
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged (@) {
 	$hooks{rcs}{rcs_commit_staged}{call}->(@_);
 }
 
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 216e00b3d..ee105a170 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -183,10 +183,12 @@ sub formbuilder (@) {
 		if ($config{rcs}) {
 			IkiWiki::rcs_add($filename);
 			IkiWiki::disable_commit_hook();
-			IkiWiki::rcs_commit($filename, gettext("attachment upload"),
-				IkiWiki::rcs_prepedit($filename),
-				$session->param("name"),
-				$session->remote_addr());
+			IkiWiki::rcs_commit(
+				file => $filename,
+				message => gettext("attachment upload"),
+				token => IkiWiki::rcs_prepedit($filename),
+				session => $session,
+			);
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index c3eb53300..11595e217 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -117,8 +117,8 @@ sub refresh () {
 		}
 		if ($config{rcs}) {
 			IkiWiki::rcs_commit_staged(
-				gettext("automatic index generation"),
-				undef, undef);
+				message => gettext("automatic index generation"),
+			);
 			IkiWiki::enable_commit_hook();
 		}
 	}
diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 44ab9a86a..562d5d389 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -123,8 +123,13 @@ sub rcs_prepedit ($) {
 	return "";
 }
 
-sub bzr_author ($$) {
-	my ($user, $ipaddr) = @_;
+sub bzr_author ($) {
+	my $session=shift;
+
+	return unless defined $session;
+
+	my $user=$session->param("name");
+	my $ipaddr=$session->remote_addr();
 
 	if (defined $user) {
 		return IkiWiki::possibly_foolish_untaint($user);
@@ -137,18 +142,19 @@ sub bzr_author ($$) {
 	}
 }
 
-sub rcs_commit ($$$;$$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+sub rcs_commit (@) {
+	my %params=@_;
 
-	$user = bzr_author($user, $ipaddr);
+	my $user=bzr_author($params{session});
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
-	if (! length $message) {
-		$message = "no message given";
+	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
+	if (! length $params{message}) {
+		$params{message} = "no message given";
 	}
 
-	my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,
-	               $config{srcdir}."/".$file);
+	my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
+	               (defined $user ? ("--author", $user) : ()),
+	               $config{srcdir}."/".$params{file});
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
@@ -156,19 +162,18 @@ sub rcs_commit ($$$;$$$) {
 	return undef; # success
 }
 
-sub rcs_commit_staged ($$$;$) {
-	# Commits all staged changes. Changes can be staged using rcs_add,
-	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
+sub rcs_commit_staged (@) {
+	my %params=@_;
 
-	$user = bzr_author($user, $ipaddr);
+	my $user=bzr_author($params{session});
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
-	if (! length $message) {
-		$message = "no message given";
+	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
+	if (! length $params{message}) {
+		$params{message} = "no message given";
 	}
 
-	my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,
+	my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
+	               (defined $user ? ("--author", $user) : ()),
 	               $config{srcdir});
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 4770209c9..41c6948e8 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -513,9 +513,10 @@ sub editcomment ($$) {
 
 			IkiWiki::rcs_add($file);
 			IkiWiki::disable_commit_hook();
-			$conflict = IkiWiki::rcs_commit_staged($message,
-				$session->param('name'),
-				$session->remote_addr());
+			$conflict = IkiWiki::rcs_commit_staged(
+				message => $message,
+				session => $session,
+			);
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
@@ -603,9 +604,10 @@ sub commentmoderation ($$) {
 			if ($config{rcs} and $config{comments_commit}) {
 				my $message = gettext("Comment moderation");
 				IkiWiki::disable_commit_hook();
-				$conflict=IkiWiki::rcs_commit_staged($message,
-					$session->param('name'),
-					$session->remote_addr());
+				$conflict=IkiWiki::rcs_commit_staged(
+					message => $message,
+					session => $session,
+				);
 				IkiWiki::enable_commit_hook();
 				IkiWiki::rcs_update();
 			}
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index a9fe162a1..c6687d780 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -183,41 +183,47 @@ sub rcs_prepedit ($) {
 	return defined $rev ? $rev : "";
 }
 
-sub rcs_commit ($$$;$$$) {
+sub commitmessage (@) {
+	my %params=@_;
+	
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return "web commit by ".
+				$params{session}->param("name").
+				(length $params{message} ? ": $params{message}" : "");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return "web commit from ".
+				$params{session}->remote_addr().
+				(length $params{message} ? ": $params{message}" : "");
+		}
+	}
+	return $params{message};
+}
+
+sub rcs_commit (@) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
-	my $file=shift;
-	my $message=shift;
-	my $rcstoken=shift;
-	my $user=shift;
-	my $ipaddr=shift;
-	my $emailuser=shift;
+	my %params=@_;
 
 	return unless cvs_is_controlling;
 
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
-	}
-
 	# Check to see if the page has been changed by someone
 	# else since rcs_prepedit was called.
-	my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
-	my $rev=cvs_info("Repository revision", "$config{srcdir}/$file");
+	my ($oldrev)=$params{token}=~/^([0-9]+)$/; # untaint
+	my $rev=cvs_info("Repository revision", "$config{srcdir}/$params{file}");
 	if (defined $rev && defined $oldrev && $rev != $oldrev) {
 		# Merge their changes into the file that we've
 		# changed.
-		cvs_runcvs('update', $file) ||
+		cvs_runcvs('update', $params{file}) ||
 			warn("cvs merge from $oldrev to $rev failed\n");
 	}
 
 	if (! cvs_runcvs('commit', '-m',
-			 IkiWiki::possibly_foolish_untaint $message)) {
-		my $conflict=readfile("$config{srcdir}/$file");
-		cvs_runcvs('update', '-C', $file) ||
+			 IkiWiki::possibly_foolish_untaint(commitmessage(%params)))) {
+		my $conflict=readfile("$config{srcdir}/$params{file}");
+		cvs_runcvs('update', '-C', $params{file}) ||
 			warn("cvs revert failed\n");
 		return $conflict;
 	}
@@ -225,20 +231,13 @@ sub rcs_commit ($$$;$$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
-
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
-	}
+	my %params=@_;
 
 	if (! cvs_runcvs('commit', '-m',
-			 IkiWiki::possibly_foolish_untaint $message)) {
+			 IkiWiki::possibly_foolish_untaint(commitmessage(%params)))) {
 		warn "cvs staged commit failed\n";
 		return 1; # failure
 	}
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 345456c01..0dfc8708d 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -140,14 +140,31 @@ sub rcs_prepedit ($) {
 	return $rev;
 }
 
-sub rcs_commit ($$$;$$$) {
+sub commitauthor (@) {
+	my %params=@_;
+	
+	my $author="anon\@web";
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return $params{session}->param("name").'@web';
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return $params{session}->remote_addr().'@web';
+		}
+	}
+	return 'anon@web';
+}
+
+sub rcs_commit (@) {
 	# Commit the page.  Returns 'undef' on success and a version of the page
 	# with conflict markers on failure.
+	my %params=@_;
 
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+	my ($file, $message, $token) =
+		($params{file}, $params{message}, $params{token});
 
 	# Compute if the "revision" of $file changed.
-	my $changed = darcs_rev($file) ne $rcstoken;
+	my $changed = darcs_rev($file) ne $token;
 
 	# Yes, the following is a bit convoluted.
 	if ($changed) {
@@ -155,7 +172,7 @@ sub rcs_commit ($$$;$$$) {
 		rename("$config{srcdir}/$file", "$config{srcdir}/$file.save") or
 			error("failed to rename $file to $file.save: $!");
 
-		# Roll the repository back to $rcstoken.
+		# Roll the repository back to $token.
 
 		# TODO.  Can we be sure that no changes are lost?  I think that
 		# we can, if we make sure that the 'darcs push' below will always
@@ -166,37 +183,28 @@ sub rcs_commit ($$$;$$$) {
 		# TODO: 'yes | ...' needed?  Doesn't seem so.
 		silentsystem('darcs', "revert", "--repodir", $config{srcdir}, "--all") == 0 ||
 			error("'darcs revert' failed");
-		# Remove all patches starting at $rcstoken.
+		# Remove all patches starting at $token.
 		my $child = open(DARCS_OBLITERATE, "|-");
 		if (! $child) {
 			open(STDOUT, ">/dev/null");
 			exec('darcs', "obliterate", "--repodir", $config{srcdir},
-			   "--match", "hash " . $rcstoken) and
+			   "--match", "hash " . $token) and
 			   error("'darcs obliterate' failed");
 		}
 		1 while print DARCS_OBLITERATE "y";
 		close(DARCS_OBLITERATE);
-		# Restore the $rcstoken one.
+		# Restore the $token one.
 		silentsystem('darcs', "pull", "--quiet", "--repodir", $config{srcdir},
-			"--match", "hash " . $rcstoken, "--all") == 0 ||
+			"--match", "hash " . $token, "--all") == 0 ||
 			error("'darcs pull' failed");
 	
-		# We're back at $rcstoken.  Re-install the modified file.
+		# We're back at $token.  Re-install the modified file.
 		rename("$config{srcdir}/$file.save", "$config{srcdir}/$file") or
 			error("failed to rename $file.save to $file: $!");
 	}
 
 	# Record the changes.
-	my $author;
-	if (defined $user) {
-		$author = "$user\@web";
-	}
-	elsif (defined $ipaddr) {
-		$author = "$ipaddr\@web";
-	}
-	else {
-		$author = "anon\@web";
-	}
+	my $author=commitauthor(%params);
 	if (!defined $message || !length($message)) {
 		$message = "empty message";
 	}
@@ -211,13 +219,13 @@ sub rcs_commit ($$$;$$$) {
 
 	# If this updating yields any conflicts, we'll record them now to resolve
 	# them.  If nothing is recorded, there are no conflicts.
-	$rcstoken = darcs_rev($file);
+	$token = darcs_rev($file);
 	# TODO: Use only the first line here, i.e. only the patch name?
 	writefile("$file.log", $config{srcdir}, 'resolve conflicts: ' . $message);
 	silentsystem('darcs', 'record', '--repodir', $config{srcdir}, '--all',
 		'-m', 'resolve conflicts: ' . $message, '--author', $author, $file) == 0 ||
 		error("'darcs record' failed");
-	my $conflicts = darcs_rev($file) ne $rcstoken;
+	my $conflicts = darcs_rev($file) ne $token;
 	unlink("$config{srcdir}/$file.log") or
 		error("failed to remove '$file.log'");
 
@@ -239,25 +247,18 @@ sub rcs_commit ($$$;$$$) {
 	}
 }
 
-sub rcs_commit_staged ($$$;$) {
-	my ($message, $user, $ipaddr, $emailuser) = @_;
+sub rcs_commit_staged (@) {
+	my %params=@_;
 
-	my $author;
-	if (defined $user) {
-		$author = "$user\@web";
-	}
-	elsif (defined $ipaddr) {
-		$author = "$ipaddr\@web";
-	}
-	else {
-		$author = "anon\@web";
-	}
-	if (!defined $message || !length($message)) {
-		$message = "empty message";
+	my $author=commitauthor(%params);
+	if (!defined $params{message} || !length($params{message})) {
+		$params{message} = "empty message";
 	}
 
-	silentsystem('darcs', "record", "--repodir", $config{srcdir}, "-a", "-A", $author,
-		"-m", $message)	== 0 || error("'darcs record' failed");
+	silentsystem('darcs', "record", "--repodir", $config{srcdir},
+		"-a", "-A", $author,
+		"-m", $params{message},
+	) == 0 || error("'darcs record' failed");
 
 	# Push the changes to the main repository.
 	silentsystem('darcs', 'push', '--quiet', '--repodir', $config{srcdir}, '--all') == 0 ||
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a8e75121f..1a04a72b5 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -401,10 +401,12 @@ sub cgi_editpage ($$) {
 			# signaling to it that it should not try to
 			# do anything.
 			disable_commit_hook();
-			$conflict=rcs_commit($file, $message,
-				$form->field("rcsinfo"),
-				$session->param("name"),
-				$session->remote_addr());
+			$conflict=rcs_commit(
+				file => $file,
+				message => $message,
+				token => $form->field("rcsinfo"),
+				session => $session,
+			);
 			enable_commit_hook();
 			rcs_update();
 		}
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index b56f229d7..b02fc118d 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -464,43 +464,55 @@ sub rcs_prepedit ($) {
 	return git_sha1($file);
 }
 
-sub rcs_commit ($$$;$$$) {
+sub rcs_commit (@) {
 	# Try to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on
 	# failure.
-
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+	my %params=@_;
 
 	# Check to see if the page has been changed by someone else since
 	# rcs_prepedit was called.
-	my $cur    = git_sha1($file);
-	my ($prev) = $rcstoken =~ /^($sha1_pattern)$/; # untaint
+	my $cur    = git_sha1($params{file});
+	my ($prev) = $params{token} =~ /^($sha1_pattern)$/; # untaint
 
 	if (defined $cur && defined $prev && $cur ne $prev) {
-		my $conflict = merge_past($prev, $file, $dummy_commit_msg);
+		my $conflict = merge_past($prev, $params{file}, $dummy_commit_msg);
 		return $conflict if defined $conflict;
 	}
 
-	rcs_add($file);	
-	return rcs_commit_staged($message, $user, $ipaddr);
+	rcs_add($params{file});
+	return rcs_commit_staged(
+		message => $params{message},
+		session => $params{session},
+	);
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
-
-	# Set the commit author and email to the web committer.
+	my %params=@_;
+	
 	my %env=%ENV;
-	if (defined $user || defined $ipaddr) {
-		my $u=encode_utf8(defined $user ? $user : $ipaddr);
-		$ENV{GIT_AUTHOR_NAME}=$u;
-		$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
+
+	if (defined $params{session}) {
+		# Set the commit author and email based on web session info.
+		my $u;
+		if (defined $params{session}->param("name")) {
+			$u=$params{session}->param("name");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			$u=$params{session}->remote_addr();
+		}
+		if (defined $u) {
+			$u=encode_utf8($u);
+			$ENV{GIT_AUTHOR_NAME}=$u;
+			$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
+		}
 	}
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
+	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
 	my @opts;
-	if ($message !~ /\S/) {
+	if ($params{message} !~ /\S/) {
 		# Force git to allow empty commit messages.
 		# (If this version of git supports it.)
 		my ($version)=`git --version` =~ /git version (.*)/;
@@ -508,13 +520,13 @@ sub rcs_commit_staged ($$$;$) {
 			push @opts, '--cleanup=verbatim';
 		}
 		else {
-			$message.=".";
+			$params{message}.=".";
 		}
 	}
 	push @opts, '-q';
 	# git commit returns non-zero if file has not been really changed.
 	# so we should ignore its exit status (hence run_or_non).
-	if (run_or_non('git', 'commit', @opts, '-m', $message)) {
+	if (run_or_non('git', 'commit', @opts, '-m', $params{message})) {
 		if (length $config{gitorigin_branch}) {
 			run_or_cry('git', 'push', $config{gitorigin_branch});
 		}
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 1793ab4bb..edf915ae9 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -126,26 +126,26 @@ sub rcs_prepedit ($) {
 	return "";
 }
 
-sub rcs_commit ($$$;$$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+sub rcs_commit (@) {
+	my %params=@_;
 
-	if (defined $user) {
-		$user = IkiWiki::possibly_foolish_untaint($user);
-	}
-	elsif (defined $ipaddr) {
-		$user = "Anonymous from ".IkiWiki::possibly_foolish_untaint($ipaddr);
-	}
-	else {
-		$user = "Anonymous";
+	my $user="Anonymous";
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			$user = $params{session}->param("name");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			$user = "Anonymous from ".$params{session}->remote_addr();
+		}
 	}
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
-	if (! length $message) {
-		$message = "no message given";
+	if (! length $params{message}) {
+		$params{message} = "no message given";
 	}
 
 	my @cmdline = ("hg", "-q", "-R", $config{srcdir}, "commit", 
-	               "-m", $message, "-u", $user);
+	               "-m", IkiWiki::possibly_foolish_untaint($params{message}),
+	               "-u", IkiWiki::possibly_foolish_untaint($user));
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
@@ -153,10 +153,10 @@ sub rcs_commit ($$$;$$$) {
 	return undef; # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
+	my %params=@_;
 	
 	error("rcs_commit_staged not implemented for mercurial"); # TODO
 }
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 55d8039e0..95fbcee76 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -293,32 +293,33 @@ sub rcs_prepedit ($) {
 	return get_rev();
 }
 
-sub rcs_commit ($$$;$$$) {
+sub commitauthor (@) {
+	my %params=@_;
+
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return "Web user: " . $params{session}->param("name");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return "Web IP: " . $params{session}->remote_addr();
+		}
+	}
+	return "Web: Anonymous";
+}
+
+
+sub rcs_commit (@) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
-	my $file=shift;
-	my $message=shift;
-	my $rcstoken=shift;
-	my $user=shift;
-	my $ipaddr=shift;
-	my $emailuser=shift;
-	my $author;
+	my %params=@_;
 
-	if (defined $user) {
-		$author="Web user: " . $user;
-	}
-	elsif (defined $ipaddr) {
-		$author="Web IP: " . $ipaddr;
-	}
-	else {
-		$author="Web: Anonymous";
-	}
+	my $author=IkiWiki::possibly_foolish_untaint(commitauthor(%params)),
 
 	chdir $config{srcdir}
 	    or error("Cannot chdir to $config{srcdir}: $!");
 
-	my ($oldrev)= $rcstoken=~ m/^($sha1_pattern)$/; # untaint
+	my ($oldrev) = $params{token} =~ m/^($sha1_pattern)$/; # untaint
 	my $rev = get_rev();
 	if (defined $rev && defined $oldrev && $rev ne $oldrev) {
 		my $automator = Monotone->new();
@@ -327,8 +328,8 @@ sub rcs_commit ($$$;$$$) {
 		# Something has been committed, has this file changed?
 		my ($out, $err);
 		$automator->setOpts("r", $oldrev, "r", $rev);
-		($out, $err) = $automator->call("content_diff", $file);
-		debug("Problem committing $file") if ($err ne "");
+		($out, $err) = $automator->call("content_diff", $params{file});
+		debug("Problem committing $params{file}") if ($err ne "");
 		my $diff = $out;
 		
 		if ($diff) {
@@ -337,11 +338,11 @@ sub rcs_commit ($$$;$$$) {
 			#
 			# first get the contents
 			debug("File changed: forming branch");
-			my $newfile=readfile("$config{srcdir}/$file");
+			my $newfile=readfile("$config{srcdir}/$params{file}");
 			
 			# then get the old content ID from the diff
-			if ($diff !~ m/^---\s$file\s+($sha1_pattern)$/m) {
-				error("Unable to find previous file ID for $file");
+			if ($diff !~ m/^---\s$params{file}\s+($sha1_pattern)$/m) {
+				error("Unable to find previous file ID for $params{file}");
 			}
 			my $oldFileID = $1;
 
@@ -352,13 +353,13 @@ sub rcs_commit ($$$;$$$) {
 			my $branch = $1;
 
 			# then put the new content into the DB (and record the new content ID)
-			my $newRevID = commit_file_to_new_rev($automator, $file, $oldFileID, $newfile, $oldrev, $branch, $author, $message);
+			my $newRevID = commit_file_to_new_rev($automator, $params{file}, $oldFileID, $newfile, $oldrev, $branch, $author, $params{message});
 
 			$automator->close();
 
 			# if we made it to here then the file has been committed... revert the local copy
-			if (system("mtn", "--root=$config{mtnrootdir}", "revert", $file) != 0) {
-				debug("Unable to revert $file after merge on conflicted commit!");
+			if (system("mtn", "--root=$config{mtnrootdir}", "revert", $params{file}) != 0) {
+				debug("Unable to revert $params{file} after merge on conflicted commit!");
 			}
 			debug("Divergence created! Attempting auto-merge.");
 
@@ -407,7 +408,7 @@ sub rcs_commit ($$$;$$$) {
 				# for cleanup note, this relies on the fact
 				# that ikiwiki seems to call rcs_prepedit()
 				# again after we return
-				return readfile("$config{srcdir}/$file");
+				return readfile("$config{srcdir}/$params{file}");
 			}
 			return undef;
 		}
@@ -419,11 +420,12 @@ sub rcs_commit ($$$;$$$) {
 
 	if (system("mtn", "--root=$config{mtnrootdir}", "commit", "--quiet",
 	           "--author", $author, "--key", $config{mtnkey}, "-m",
-		   IkiWiki::possibly_foolish_untaint($message), $file) != 0) {
+	           IkiWiki::possibly_foolish_untaint($params{message}),
+	           $params{file}) != 0) {
 		debug("Traditional commit failed! Returning data as conflict.");
-		my $conflict=readfile("$config{srcdir}/$file");
+		my $conflict=readfile("$config{srcdir}/$params{file}");
 		if (system("mtn", "--root=$config{mtnrootdir}", "revert",
-		           "--quiet", $file) != 0) {
+		           "--quiet", $params{file}) != 0) {
 			debug("monotone revert failed");
 		}
 		return $conflict;
@@ -439,32 +441,21 @@ sub rcs_commit ($$$;$$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
-	
+	my %params=@_;
+
 	# Note - this will also commit any spurious changes that happen to be
 	# lying around in the working copy.  There shouldn't be any, but...
 	
 	chdir $config{srcdir}
 	    or error("Cannot chdir to $config{srcdir}: $!");
 
-	my $author;
-
-	if (defined $user) {
-		$author="Web user: " . $user;
-	}
-	elsif (defined $ipaddr) {
-		$author="Web IP: " . $ipaddr;
-	}
-	else {
-		$author="Web: Anonymous";
-	}
-
 	if (system("mtn", "--root=$config{mtnrootdir}", "commit", "--quiet",
-	           "--author", $author, "--key", $config{mtnkey}, "-m",
-		   IkiWiki::possibly_foolish_untaint($message)) != 0) {
+	           "--author", IkiWiki::possibly_foolish_untaint(commitauthor(%params)),
+	           "--key", $config{mtnkey}, "-m",
+		   IkiWiki::possibly_foolish_untaint($params{message})) != 0) {
 		error("Monotone commit failed");
 	}
 }
diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm
index 5131a1502..a3bb6240e 100644
--- a/IkiWiki/Plugin/norcs.pm
+++ b/IkiWiki/Plugin/norcs.pm
@@ -38,13 +38,11 @@ sub rcs_prepedit ($) {
 	return ""
 }
 
-sub rcs_commit ($$$;$$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+sub rcs_commit (@) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
-	my ($message, $user, $ipaddr, $emailuser)=@_;
+sub rcs_commit_staged (@) {
 	return undef # success
 }
 
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index e50efa5e0..b333e2cdc 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -134,10 +134,12 @@ sub sessioncgi ($$) {
 		$oldchoice=$session->param($choice_param);
 		if ($config{rcs}) {
 			IkiWiki::disable_commit_hook();
-			IkiWiki::rcs_commit($pagesources{$page}, "poll vote ($choice)",
-				IkiWiki::rcs_prepedit($pagesources{$page}),
-				$session->param("name"),
-				$session->remote_addr());
+			IkiWiki::rcs_commit(
+				file => $pagesources{$page},
+				message => "poll vote ($choice)",
+				token => IkiWiki::rcs_prepedit($pagesources{$page}),
+				session => $session,
+			);
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index b664cbf74..95f148183 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -213,9 +213,10 @@ sub sessioncgi ($$) {
 				foreach my $file (@files) {
 					IkiWiki::rcs_remove($file);
 				}
-				IkiWiki::rcs_commit_staged(gettext("removed"),
-					$session->param("name"),
-					$session->remote_addr());
+				IkiWiki::rcs_commit_staged(
+					message => gettext("removed"),
+					session => $session,
+				);
 				IkiWiki::enable_commit_hook();
 				IkiWiki::rcs_update();
 			}
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 977c09e67..61d39d4b5 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -349,9 +349,8 @@ sub sessioncgi ($$) {
 				$pagesources{$rename->{src}}=$rename->{destfile};
 			}
 			IkiWiki::rcs_commit_staged(
-				sprintf(gettext("rename %s to %s"), $srcfile, $destfile),
-				$session->param("name"),
-				$session->remote_addr(),
+				message => sprintf(gettext("rename %s to %s"), $srcfile, $destfile),
+				session => $session,
 			) if $config{rcs};
 
 			# Then link fixups.
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index ffacb8cf9..f1e608408 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -144,44 +144,50 @@ sub rcs_prepedit ($) {
 	}
 }
 
-sub rcs_commit ($$$;$$$) {
+sub commitmessage (@) {
+	my %params=@_;
+
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return "web commit by ".
+				$params{session}->param("name").
+				(length $params{message} ? ": $params{message}" : "");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return "web commit from ".
+				$params{session}->remote_addr().
+				(length $params{message} ? ": $params{message}" : "");
+		}
+	}
+	return $params{message};
+}
+
+sub rcs_commit (@) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
-	my $file=shift;
-	my $message=shift;
-	my $rcstoken=shift;
-	my $user=shift;
-	my $ipaddr=shift;
-	my $emailuser=shift;
-
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
-	}
+	my %params=@_;
 
 	if (-d "$config{srcdir}/.svn") {
 		# Check to see if the page has been changed by someone
 		# else since rcs_prepedit was called.
-		my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
-		my $rev=svn_info("Revision", "$config{srcdir}/$file");
+		my ($oldrev)=$params{token}=~/^([0-9]+)$/; # untaint
+		my $rev=svn_info("Revision", "$config{srcdir}/$params{file}");
 		if (defined $rev && defined $oldrev && $rev != $oldrev) {
 			# Merge their changes into the file that we've
 			# changed.
 			if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
-			           "$config{srcdir}/$file", "$config{srcdir}/$file") != 0) {
+			           "$config{srcdir}/$params{file}", "$config{srcdir}/$params{file}") != 0) {
 				warn("svn merge -r$oldrev:$rev failed\n");
 			}
 		}
 
 		if (system("svn", "commit", "--quiet", 
 		           "--encoding", "UTF-8", "-m",
-		           IkiWiki::possibly_foolish_untaint($message),
+		           IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
 			   $config{srcdir}) != 0) {
-			my $conflict=readfile("$config{srcdir}/$file");
-			if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
+			my $conflict=readfile("$config{srcdir}/$params{file}");
+			if (system("svn", "revert", "--quiet", "$config{srcdir}/$params{file}") != 0) {
 				warn("svn revert failed\n");
 			}
 			return $conflict;
@@ -190,21 +196,14 @@ sub rcs_commit ($$$;$$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
-	
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
-	}
+	my %params=@_;
 	
 	if (system("svn", "commit", "--quiet",
 	           "--encoding", "UTF-8", "-m",
-	           IkiWiki::possibly_foolish_untaint($message),
+	           IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
 		   $config{srcdir}) != 0) {
 		warn("svn commit failed\n");
 		return 1; # failure	
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 62f030f4e..55064a9a3 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -90,7 +90,7 @@ sub gentag ($) {
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
 				IkiWiki::rcs_add($tagfile);
-				IkiWiki::rcs_commit_staged($message, undef, undef);
+				IkiWiki::rcs_commit_staged(message => $message);
 				IkiWiki::enable_commit_hook();
 			}
 		});
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index 80c015e3c..da4385446 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -98,19 +98,23 @@ sub rcs_prepedit ($) {
 	}
 }
 
-sub rcs_commit ($$$;$$$) {
-	my $file=shift;
-	my $message=shift;
-	my $rcstoken=shift;
-	my $user=shift;
-	my $ipaddr=shift;
-	my $emailuser=shift;
-
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
+sub rcs_commit (@) {
+	my %params=@_;
+
+	my ($file, $message, $rcstoken)=
+		($params{file}, $params{message}, $params{token});
+
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			$message="web commit by ".
+				$params{session}->param("name").
+				(length $message ? ": $message" : "");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			$message="web commit from ".
+				$params{session}->remote_addr().
+				(length $message ? ": $message" : "");
+		}
 	}
 
 	if (-d "$config{srcdir}/{arch}") {
@@ -140,10 +144,10 @@ sub rcs_commit ($$$;$$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
+	my %params=@_;
 	
 	error("rcs_commit_staged not implemented for tla"); # TODO
 }
diff --git a/debian/changelog b/debian/changelog
index 2dfebd0b2..f7452a070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
 ikiwiki (3.20100624) UNRELEASED; urgency=low
 
   * API: Add new optional field usershort to rcs_recentchanges.
-  * API: rcs_commit and rcs_commit_staged are passed a new parameter
-    that may contain the username component of the email address of
-    the user making the commit.
+  * API: rcs_commit and rcs_commit_staged are now passed named
+    parameters.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index ab2934bf1..a2b954bd4 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1051,18 +1051,20 @@ token, that will be passed into `rcs_commit` when committing. For example,
 it might return the current revision ID of the file, and use that
 information later when merging changes.
 
-#### `rcs_commit($$$;$$$)`
+#### `rcs_commit(@)`
+
+Passed named parameters: `file`, `message`, `token` (from `rcs_prepedit`),
+and `session` (optional).
 
-Passed a file, message, token (from `rcs_prepedit`), user, ip address,
-and optionally the username component of the committer's email address.
 Should try to commit the file. Returns `undef` on *success* and a version
 of the page with the rcs's conflict markers on failure.
 
-#### `rcs_commit_staged($$$;$)`
+#### `rcs_commit_staged(@)`
+
+Passed named parameters: `message`, and `session` (optional).
 
-Passed a message, user, ip address, and optionally the username component of
-the committer's email address. Should commit all staged changes.
-Returns undef on success, and an error message on failure.
+Should commit all staged changes. Returns undef on success, and an
+error message on failure.
 
 Changes can be staged by calls to `rcs_add`, `rcs_remove`, and
 `rcs_rename`.
diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
index 04352b970..60df99855 100755
--- a/ikiwiki-calendar.in
+++ b/ikiwiki-calendar.in
@@ -59,7 +59,7 @@ foreach my $y ($startyear..$endyear) {
 	}
 }
 
-IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
+IkiWiki::rcs_commit_staged(message => gettext("calendar update"))
 	if $config{rcs};
 
 exec("ikiwiki", "-setup", $setup, "-refresh");
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 9a4bbf6bc..9644fd396 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100623
+Version: 3.20100624
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 437cdbdcc..e50fa0f68 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 15:02-0400\n"
+"POT-Creation-Date: 2010-06-23 17:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1317
 msgid "Error"
 msgstr ""
 
@@ -163,19 +163,19 @@ msgstr ""
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -248,19 +248,19 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:554 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:603
+#: ../IkiWiki/Plugin/comments.pm:605
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:641
+#: ../IkiWiki/Plugin/comments.pm:645
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:790
+#: ../IkiWiki/Plugin/comments.pm:802
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -270,7 +270,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:800
+#: ../IkiWiki/Plugin/comments.pm:812
 msgid "Comment"
 msgstr ""
 
@@ -305,9 +305,9 @@ msgstr ""
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
-#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
-#: ../IkiWiki/Plugin/editpage.pm:429
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -320,12 +320,12 @@ msgstr ""
 msgid "match not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 msgid "failed to process template:"
 msgstr ""
@@ -356,18 +356,18 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:724 ../IkiWiki/Plugin/git.pm:742
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:764
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:768
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -513,7 +513,7 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, perl-format
 msgid "failed to load openid module: "
 msgstr ""
@@ -610,7 +610,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr ""
@@ -619,48 +619,48 @@ msgstr ""
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:475
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:875
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:889
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:898
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:904
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:940
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:953
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1037
 msgid "removed obsolete PO files"
 msgstr ""
 
@@ -803,7 +803,7 @@ msgstr ""
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr ""
 
@@ -853,7 +853,7 @@ msgstr ""
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -988,26 +988,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1017,7 +1017,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, perl-format
 msgid "bad file name %s"
 msgstr ""
@@ -1034,47 +1034,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, perl-format
 msgid "removing obsolete %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1179,31 +1179,31 @@ msgstr ""
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:607
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1299
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1993
+#: ../IkiWiki.pm:1994
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2070
+#: ../IkiWiki.pm:2071
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2091
+#: ../IkiWiki.pm:2092
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2227
+#: ../IkiWiki.pm:2228
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/t/bazaar.t b/t/bazaar.t
index 0bdd883d5..3e54ec4dc 100755
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -24,11 +24,19 @@ IkiWiki::checkconfig();
 
 system "bzr init $config{srcdir}";
 
+use CGI::Session;
+my $session=CGI::Session->new;
+$session->param("name", "Joe User");
+
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo", "Joe User");
+IkiWiki::rcs_commit(
+	file => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo",
+	session => $session);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
@@ -66,7 +74,10 @@ ok($mtime >= time() - 20);
 writefile('test3.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test3.mdwn");
 IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");
-IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(
+	message => "Added the 4th page",
+	session => $session,
+);
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
@@ -75,7 +86,10 @@ is($changes[0]{pages}[0]{"page"}, "test4");
 
 ok(mkdir($config{srcdir}."/newdir"));
 IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");
-IkiWiki::rcs_commit_staged("Added the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(
+	message => "Added the 5th page",
+	session => $session,
+);
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
@@ -83,6 +97,9 @@ is($#changes, 3);
 is($changes[0]{pages}[0]{"page"}, "newdir/test5");
 
 IkiWiki::rcs_remove("newdir/test5.mdwn");
-IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(
+	message => "Remove the 5th page",
+	session => $session,
+);
 
 system "rm -rf $dir";
diff --git a/t/cvs.t b/t/cvs.t
index 2808973be..96359ab6e 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -46,7 +46,11 @@ system "cvs -d $cvsrepo co -d $config{srcdir} ikiwiki >/dev/null";
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
+IkiWiki::rcs_commit(
+	files => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo"
+);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
diff --git a/t/git.t b/t/git.t
index f1c24b359..ee778ebf0 100755
--- a/t/git.t
+++ b/t/git.t
@@ -38,7 +38,11 @@ is($changes[0]{pages}[0]{"page"}, ".gitignore");
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
+IkiWiki::rcs_commit(
+	file => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo",
+);
 
 @changes = IkiWiki::rcs_recentchanges(3);
 
@@ -68,7 +72,7 @@ is($changes[1]{pages}[0]{"page"}, "test1");
 writefile('test3.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test3.mdwn");
 IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");
-IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(message => "Added the 4th page");
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
@@ -77,7 +81,7 @@ is($changes[0]{pages}[0]{"page"}, "test4");
 
 ok(mkdir($config{srcdir}."/newdir"));
 IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");
-IkiWiki::rcs_commit_staged("Added the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(message => "Added the 5th page");
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
@@ -85,6 +89,6 @@ is($#changes, 3);
 is($changes[0]{pages}[0]{"page"}, "newdir/test5");
 
 IkiWiki::rcs_remove("newdir/test5.mdwn");
-IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(message => "Remove the 5th page");
 
 system "rm -rf $dir";
diff --git a/t/mercurial.t b/t/mercurial.t
index 954b17526..b64ea8e56 100755
--- a/t/mercurial.t
+++ b/t/mercurial.t
@@ -22,13 +22,22 @@ $config{srcdir} = "$dir/repo";
 IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
+use CGI::Session;
+my $session=CGI::Session->new;
+$session->param("name", "Joe User");
+
 system "hg init $config{srcdir}";
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo", "Joe User");
+IkiWiki::rcs_commit(
+	file => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo",
+	session => $session,
+);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
diff --git a/t/svn.t b/t/svn.t
index 5223b4409..82b71b5fc 100755
--- a/t/svn.t
+++ b/t/svn.t
@@ -36,7 +36,11 @@ system "svn co file://$svnrepo/trunk $config{srcdir} >/dev/null";
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
+IkiWiki::rcs_commit(
+	file => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo",
+);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
-- 
cgit v1.2.3


From d8e4b51a41a9507584d56946d0eae0e5cef6d6f5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 19:32:53 -0400
Subject: rcs_getctime and rcs_getmtime take relative filenames

There was some confusion about whether the filename was
relative to srcdir or not. Some test cases, and the bzr
plugin assumed it was relative to the srcdir. Most everything else
assumed it was absolute.

Changed it to relative, for consistency with the rest
of the rcs_ functions.
---
 IkiWiki/Plugin/cvs.pm       | 2 +-
 IkiWiki/Plugin/darcs.pm     | 9 +++------
 IkiWiki/Plugin/git.pm       | 3 ---
 IkiWiki/Plugin/mercurial.pm | 2 +-
 IkiWiki/Plugin/svn.pm       | 6 +++---
 IkiWiki/Render.pm           | 4 ++--
 debian/changelog            | 2 ++
 7 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index c6687d780..1a432c052 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -459,7 +459,7 @@ sub rcs_diff ($) {
 }
 
 sub rcs_getctime ($) {
-	my $file=shift;
+	my $file=$config{srcdir}."/".shift();
 
 	my $cvs_log_infoline=qr/^date: (.+);\s+author/;
 
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 0dfc8708d..0f63b8807 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -396,14 +396,11 @@ sub rcs_getctime ($) {
 	eval q{use XML::Simple};
 	local $/=undef;
 
-	my $filer=substr($file, length($config{srcdir}));
-	$filer =~ s:^[/]+::;
-
 	my $child = open(LOG, "-|");
 	if (! $child) {
 		exec("darcs", "changes", "--xml", "--reverse",
-			"--repodir", $config{srcdir}, $filer)
-		|| error("'darcs changes $filer' failed to run");
+			"--repodir", $config{srcdir}, $file)
+		|| error("'darcs changes $file' failed to run");
 	}
 
 	my $data;
@@ -418,7 +415,7 @@ sub rcs_getctime ($) {
 	my $datestr = $log->{patch}[0]->{local_date};
 
 	if (! defined $datestr) {
-		warn "failed to get ctime for $filer";
+		warn "failed to get ctime for $file";
 		return 0;
 	}
 
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index b02fc118d..85368606e 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -658,9 +658,6 @@ sub findtimes ($$) {
 	my $file=shift;
 	my $id=shift; # 0 = mtime ; 1 = ctime
 
-	# Remove srcdir prefix
-	$file =~ s/^\Q$config{srcdir}\E\/?//;
-
 	if (! keys %time_cache) {
 		my $date;
 		foreach my $line (run_or_die('git', 'log',
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index edf915ae9..59dc63b4e 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -237,7 +237,7 @@ sub rcs_getctime ($) {
 	my ($file) = @_;
 
 	my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v",
-		"--style", "default", $file);
+		"--style", "default", "$config{srcdir}/$file");
 	open (my $out, "-|", @cmdline);
 
 	my @log = (mercurial_log($out));
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index f1e608408..9cf82b5db 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -366,7 +366,7 @@ sub findtimes ($) {
 		
 	my $child = open(SVNLOG, "-|");
 	if (! $child) {
-		exec("svn", "log", $file) || error("svn log $file failed to run");
+		exec("svn", "log", "$config{srcdir}/$file") || error("svn log failed to run");
 	}
 
 	my ($cdate, $mdate);
@@ -376,10 +376,10 @@ sub findtimes ($) {
 			$mdate=$1 unless defined $mdate;
 	    	}
 	}
-	close SVNLOG || error "svn log $file exited $?";
+	close SVNLOG || error "svn log exited $?";
 
 	if (! defined $cdate) {
-		error "failed to parse svn log for $file\n";
+		error "failed to parse svn log for $file";
 	}
 		
 	eval q{use Date::Parse};
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index aae1f90b0..a653ab2da 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -374,7 +374,7 @@ sub find_new_files ($) {
 			}
 
 			eval {
-				my $ctime=rcs_getctime("$config{srcdir}/$file");
+				my $ctime=rcs_getctime($file);
 				if ($ctime > 0) {
 					$pagectime{$page}=$ctime;
 				}
@@ -384,7 +384,7 @@ sub find_new_files ($) {
 			}
 			my $mtime;
 			eval {
-				$mtime=rcs_getmtime("$config{srcdir}/$file");
+				$mtime=rcs_getmtime($file);
 			};
 			if ($@) {
 				print STDERR $@;
diff --git a/debian/changelog b/debian/changelog
index f7452a070..88ed3a90b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
   * API: Add new optional field usershort to rcs_recentchanges.
   * API: rcs_commit and rcs_commit_staged are now passed named
     parameters.
+  * Fixed some confusion and bugginess about whether
+    rcs_getctime/rcs_getmtime were passed absolute or relative filenames.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
-- 
cgit v1.2.3


From b38b9327a8f11b642e5f51f7ee537043e25ccff9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 19:36:23 -0400
Subject: take username from email address as fallback

---
 IkiWiki/Plugin/openid.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index f4ba8db18..f19a559a9 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -187,12 +187,17 @@ sub auth ($$) {
 					$vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
 				);
 			}
+			my $username;
 			foreach my $ext (@extensions) {
 				foreach my $field (qw{value.email email}) {
 					if (exists $ext->{$field} &&
 					    defined $ext->{$field} &&
 					    length $ext->{$field}) {
 						$session->param(email => $ext->{$field});
+						if (! defined $username &&
+						    $ext->{$field}=~/(.+)@.+/) {
+							$username = $1;
+						}
 						last;
 					}
 				}
@@ -200,11 +205,15 @@ sub auth ($$) {
 					if (exists $ext->{$field} &&
 					    defined $ext->{$field} &&
 					    length $ext->{$field}) {
-						$session->param(username => $ext->{$field});
+						$username=$ext->{$field};
 						last;
 					}
 				}
 			}
+			if (defined $username) {
+				$username=~s/\s+/_/g;
+				$session->param(username => $username);
+			}
 		}
 		else {
 			error("OpenID failure: ".$csr->err);
-- 
cgit v1.2.3


From a4f381ace837a032bc202cc6b2a98e922d4b7cfc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 19:44:41 -0400
Subject: git: Record the username from openid in the git author email. (This
 avoids display of ugly google openids.)

---
 IkiWiki/Plugin/git.pm                        |  5 +++++
 debian/changelog                             |  2 ++
 doc/rcs.mdwn                                 | 20 +++++++++++++-------
 doc/todo/Separate_OpenIDs_and_usernames.mdwn |  3 +++
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 85368606e..3e289e0c3 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -506,6 +506,11 @@ sub rcs_commit_staged (@) {
 		if (defined $u) {
 			$u=encode_utf8($u);
 			$ENV{GIT_AUTHOR_NAME}=$u;
+		}
+		if (defined $params{session}->param("username")) {
+			$u=encode_utf8($params{session}->param("username"));
+		}
+		if (defined $u) {
 			$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index 88ed3a90b..dfa862e5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
     parameters.
   * Fixed some confusion and bugginess about whether
     rcs_getctime/rcs_getmtime were passed absolute or relative filenames.
+  * git: Record the username from openid in the git author email.
+    (This avoids display of ugly google openids.)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index 248d93024..83c6910d0 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -10,13 +10,8 @@ generic that it can be adapted to work with many systems by writing a
 
 While all supported revision control systems work well enough for basic
 use, some advanced or special features are not supported in all of them.
-Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
-set up a wiki using that revision control system. The `rcs_commit_staged`
-hook is needed to use [[attachments|plugins/attachment]] or
-[[plugins/comments]]. `rcs_getctime` may be implemented in a fast way
-(ie, one log lookup for all files), or very slowly (one lookup per file).
-And so on. The table below summarises this for each revision control
-system and links to more information about each.
+The table below summarises this for each revision control system and
+links to more information about each.
 
 [[!table data="""
 feature             |[[git]]|[[svn]]|[[bzr]]   |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]]   |[[cvs]]
@@ -30,7 +25,18 @@ auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes
 `rcs_getmtime`      |fast   |slow   |slow      |no          |no           |no       |no        |no
 anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
 conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
+openid username     |yes    |no     |no        |no          |no           |no       |no        |no
 """]]
 
+Notes:
+
+* Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
+  set up a wiki using that revision control system.
+* The `rcs_commit_staged` hook is needed to use [[attachments|plugins/attachment]]
+  or [[plugins/comments]].
+* `rcs_getctime` and `rcs_getmtime` may be implemented in a fast way (ie, one log
+  lookup for all files), or very slowly (one lookup per file).
+* Openid username support allows avoiding display of Google's ugly openids.
+
 There is a page with [[details]] about how the different systems work with
 ikiwiki, for the curious.
diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index fcdb49f6d..60b7b6c61 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -38,10 +38,13 @@ A slightly more complex next step would be to request sreg from the provider and
 > * Change `rcs_commit` and `rcs_commit_staged` to take a session object,
 >   instead of just a userid. (For back-compat, if the parameter is 
 >   not an object, it's a userid.) Bump ikiwiki plugin interface version.
+>   (done)
 > * Modify all RCS plugins to include the session username somewhere
 >   in the commit, and parse it back out in `rcs_recentchanges`.
+>   (done for git only so far)
 > * Modify recentchanges plugin to display the username instead of the
 >   `openiduser`.
+>   (done)
 > * Modify comment plugin to put the session username in the comment
 >   template instead of the `openiduser`.
 
-- 
cgit v1.2.3


From 9a32451986c710d1f1ce71217c1f7ab3b84f72bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 20:12:26 -0400
Subject: finializing openid nickname support

Renamed usershort => nickname.

Note that this means existing user login sessions will not have the nickname
recorded, and so it won't be used for those.
---
 IkiWiki/Plugin/comments.pm         |  8 ++++++--
 IkiWiki/Plugin/git.pm              | 16 ++++++++++------
 IkiWiki/Plugin/openid.pm           | 14 +++++++-------
 IkiWiki/Plugin/recentchanges.pm    |  2 +-
 debian/changelog                   | 10 +++++++---
 doc/ikiwiki/directive/comment.mdwn |  2 ++
 doc/plugins/write.mdwn             |  2 +-
 7 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 41c6948e8..d34951570 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -177,7 +177,7 @@ sub preprocess {
 		if (defined $oiduser) {
 			# looks like an OpenID
 			$commentauthorurl = $commentuser;
-			$commentauthor = $oiduser;
+			$commentauthor = (defined $params{nickname} && length $params{nickname}) ? $params{nickname} : $oiduser;
 			$commentopenid = $commentuser;
 		}
 		else {
@@ -396,12 +396,16 @@ sub editcomment ($$) {
 
 	my $content = "[[!comment format=$type\n";
 
-	# FIXME: handling of double quotes probably wrong?
 	if (defined $session->param('name')) {
 		my $username = $session->param('name');
 		$username =~ s/"/&quot;/g;
 		$content .= " username=\"$username\"\n";
 	}
+	if (defined $session->param('nickname')) {
+		my $nickname = $session->param('nickname');
+		$nickname =~ s/"/&quot;/g;
+		$content .= " nickname=\"$nickname\"\n";
+	}
 	elsif (defined $session->remote_addr()) {
 		my $ip = $session->remote_addr();
 		if ($ip =~ m/^([.0-9]+)$/) {
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 3e289e0c3..8d210cb5d 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -606,12 +606,16 @@ sub rcs_recentchanges ($) {
 			push @messages, { line => $line };
 		}
 
-		my $user=$ci->{'author_name'};
-		my $usershort=$ci->{'author_username'};
+		my $user=$ci->{'author_username'};
 		my $web_commit = ($ci->{'author'} =~ /\@web>/);
-
-		if ($usershort =~ /:\/\//) {
-			$usershort=undef; # url; not really short
+		my $nickname;
+
+		# Set nickname only if a non-url author_username is available,
+		# and author_name is an url.
+		if ($user !~ /:\/\// && defined $ci->{'author_name'} &&
+		    $ci->{'author_name'} =~ /:\/\//) {
+			$nickname=$user;
+			$user=$ci->{'author_name'};
 		}
 
 		# compatability code for old web commit messages
@@ -626,7 +630,7 @@ sub rcs_recentchanges ($) {
 		push @rets, {
 			rev        => $sha1,
 			user       => $user,
-			usershort  => $usershort,
+			nickname   => $nickname,
 			committype => $web_commit ? "web" : "git",
 			when       => $when,
 			message    => [@messages],
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index f19a559a9..d393afd23 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -187,16 +187,16 @@ sub auth ($$) {
 					$vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
 				);
 			}
-			my $username;
+			my $nickname;
 			foreach my $ext (@extensions) {
 				foreach my $field (qw{value.email email}) {
 					if (exists $ext->{$field} &&
 					    defined $ext->{$field} &&
 					    length $ext->{$field}) {
 						$session->param(email => $ext->{$field});
-						if (! defined $username &&
+						if (! defined $nickname &&
 						    $ext->{$field}=~/(.+)@.+/) {
-							$username = $1;
+							$nickname = $1;
 						}
 						last;
 					}
@@ -205,14 +205,14 @@ sub auth ($$) {
 					if (exists $ext->{$field} &&
 					    defined $ext->{$field} &&
 					    length $ext->{$field}) {
-						$username=$ext->{$field};
+						$nickname=$ext->{$field};
 						last;
 					}
 				}
 			}
-			if (defined $username) {
-				$username=~s/\s+/_/g;
-				$session->param(username => $username);
+			if (defined $nickname) {
+				$nickname=~s/\s+/_/g;
+				$session->param(nickname => $nickname);
 			}
 		}
 		else {
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 9f188cbff..758b98348 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -118,7 +118,7 @@ sub store ($$$) {
 	my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
 	if (defined $oiduser) {
 		$change->{authorurl}=$change->{user};
-		$change->{user}=defined $change->{usershort} ? $change->{usershort} : $oiduser;
+		$change->{user}=defined $change->{nickname} ? $change->{nickname} : $oiduser;
 	}
 	elsif (length $config{cgiurl}) {
 		$change->{authorurl} = IkiWiki::cgiurl(
diff --git a/debian/changelog b/debian/changelog
index dfa862e5b..e41de638f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
 ikiwiki (3.20100624) UNRELEASED; urgency=low
 
-  * API: Add new optional field usershort to rcs_recentchanges.
+  * Changes to avoid display of ugly google openids, by displaying
+    a username taken from openid.
+  * API: Add new optional field nickname to rcs_recentchanges.
   * API: rcs_commit and rcs_commit_staged are now passed named
     parameters.
+  * openid: Store nickname based on username or email provided from
+    openid provider.
+  * git: Record the nickname from openid in the git author email.
+  * comment: Record the username from openid in the comment page.
   * Fixed some confusion and bugginess about whether
     rcs_getctime/rcs_getmtime were passed absolute or relative filenames.
-  * git: Record the username from openid in the git author email.
-    (This avoids display of ugly google openids.)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/ikiwiki/directive/comment.mdwn b/doc/ikiwiki/directive/comment.mdwn
index 693a92770..398130e2e 100644
--- a/doc/ikiwiki/directive/comment.mdwn
+++ b/doc/ikiwiki/directive/comment.mdwn
@@ -29,6 +29,8 @@ metadata of the comment.
   nearly any format, since it's parsed by [[!cpan TimeDate]]
 * `username` - Used to record the username (or OpenID)
   of a logged in commenter.
+* `nickname` - Name to display for a logged in commenter.
+  (Optional; used for OpenIDs.)
 * `ip` - Can be used to record the IP address of a commenter,
   if they posted anonymously.
 * `claimedauthor` - Records the name that the user entered,
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index a2b954bd4..a921b9a02 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1108,7 +1108,7 @@ The data structure returned for each change is:
 	{
 		rev => # the RCSs id for this commit
 		user => # user who made the change (may be an openid),
-		usershort => # short name of user (optional; not an openid),
+		nickname => # short name for user (optional; not an openid),
 		
 		committype => # either "web" or the name of the rcs,
 		when => # time when the change was made,
-- 
cgit v1.2.3


From f008caf4409fc9fc676021271706d9d6f0f25789 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 20:16:55 -0400
Subject: update

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index e41de638f..ae1d23479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
   * comment: Record the username from openid in the comment page.
   * Fixed some confusion and bugginess about whether
     rcs_getctime/rcs_getmtime were passed absolute or relative filenames.
+    (Make it relative like everything else.)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
-- 
cgit v1.2.3


From 9a2c56b748ec9cd9230abada56267bde1840ca39 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 20:21:44 -0400
Subject: openid nickname support finished; closing

---
 doc/todo/Separate_OpenIDs_and_usernames.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index 60b7b6c61..a4940220a 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -46,8 +46,8 @@ A slightly more complex next step would be to request sreg from the provider and
 >   `openiduser`.
 >   (done)
 > * Modify comment plugin to put the session username in the comment
->   template instead of the `openiduser`.
+>   template instead of the `openiduser`. (done)
 
 Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat.
 
-[[!tag wishlist]]
+[[!tag wishlist done]]
-- 
cgit v1.2.3


From 38bf2f6388d506e741395992617a900843e9ba0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 20:26:09 -0400
Subject: bugfix

---
 IkiWiki/Plugin/git.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 8d210cb5d..992c6226b 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -507,8 +507,8 @@ sub rcs_commit_staged (@) {
 			$u=encode_utf8($u);
 			$ENV{GIT_AUTHOR_NAME}=$u;
 		}
-		if (defined $params{session}->param("username")) {
-			$u=encode_utf8($params{session}->param("username"));
+		if (defined $params{session}->param("nickname")) {
+			$u=encode_utf8($params{session}->param("nickname"));
 		}
 		if (defined $u) {
 			$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
-- 
cgit v1.2.3


From cf5b767777bf922ef55cdc51adef024436d2171e Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawm0mAKbBvoYTeRz4lDv83cTfXsAns5CmDQ"
 <Joey@web>
Date: Thu, 24 Jun 2010 00:45:59 +0000
Subject: test from google openid

---
 doc/sandbox.mdwn | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 7c32d0cfe..8ecaf1cb9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,9 +1,5 @@
-[[!sidebar]]
-
-
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-[[Testing 1 2 3| test]]
 # Header
 
 ## Subheader2
@@ -19,8 +15,6 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 >
 > Back to the first level.
 
-"I'm sitting in the middle of a rather muddy puddle."
-
 Numbered list 
 
 1. First item.
@@ -29,7 +23,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
- 3. cool
 
 Bulleted list
 
@@ -56,37 +49,8 @@ Bulleted list
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 
------
-
-[[!progress percent=27]]
-
-[[!progress percent=78]]
-
------
+----
 
 This **SandBox** is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-
-----
-
-What about [relative urls](../setup/byhand)?
-
-[[!toggleable  id="foobar" text="""
-foo
-"""]]
-
-[[!toggleable  id="foobar" text="""
-bar
-"""]]
-
-[[!toggle  id="foobar" text="foo/bar"]]
-
-Hmm, can I dig it?
-
-Test
-test2
-
-I assume this triggers a checkin and recompile?
-
-[[!inline pages="/index"]]
-- 
cgit v1.2.3


From d8d057c356e0244585aa0eac075b39958c6c3f37 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 21:29:47 -0400
Subject: chdir to srcdir in rcs_getctime

---
 IkiWiki/Plugin/cvs.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 1a432c052..4972efb58 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -459,7 +459,9 @@ sub rcs_diff ($) {
 }
 
 sub rcs_getctime ($) {
-	my $file=$config{srcdir}."/".shift();
+	my $file=shift;
+
+	local $CWD = $config{srcdir};
 
 	my $cvs_log_infoline=qr/^date: (.+);\s+author/;
 
-- 
cgit v1.2.3


From 11899a031c64b3e9fb5fe792c8611f69fb14fd5e Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 25 Jun 2010 01:58:02 +0000
Subject: commenting on the link-text-from-title idea

---
 doc/ikiwiki/wikilink/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index d6df4cbf6..89affc502 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -84,3 +84,8 @@ Is it possible to refer to a page, say \[[foobar]], such that the link text is t
 > Not yet. :-) Any suggestion for a syntax for it? Maybe something like \[[|foobar]] ? --[[Joey]]
 
 I like your suggestion because it's short and conscise. However, it would be nice to be able to refer to more or less arbitrary meta tags in links, not just "title". To do that, the link needs two parameters: the page name and the tag name, i.e. \[[pagename!metatag]]. Any sufficiently weird separater can be used instead of '!', of course. I like \[[pagename->metatag]], too, because it reminds me of accessing a data member of a structure (which is what referencing a meta tag is, really). --Peter
+
+> I dislike \[[pagename->metatag]] because other wikis use that as their normal link/label syntax.
+> I'm not sure that it is a good idea to refer to arbitrary meta tags in links in the first place - what other meta tags would you really be interested in?  Description?  Author?  It makes sense to me to refer to the title, because that is a "label" for a page.
+> As for syntax, I do like the \[[|foobar]] idea, or perhaps something like what <a href="http://www.pmwiki.org">PmWiki</a> does - they have their links the other way around, so they go \[[page|label]] and for link-text-as-title, they have \[[page|+]].  So for IkiWiki, that would be \[[+|page]] I guess.
+> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 71950b2ae5ff6fd3b631c5504455cc07699b1c11 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 25 Jun 2010 02:40:25 +0000
Subject: sidebars defined by pagespec perhaps?

---
 ..._up_sidebar_to_allow_for_multiple_sidebars.mdwn | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index 1f7b48764..fdaa09f26 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -34,6 +34,8 @@ those contents instead.
 >>>>> if I want to try to get a 3 column CSS going, so perhaps leave the
 >>>>> left sidebar out of that.
 
+-------------------
+
 <pre>
 --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
 +++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
@@ -85,4 +87,39 @@ those contents instead.
  }
 </pre>
 
+----------------------------------------
+## Further thoughts about this
+
+(since the indentation level was getting rather high.)
+
+What about using pagespecs in the config to map pages and sidebar pages together?  Something like this:
+
+<pre>
+	sidebar_pagespec => {
+	    "foo/*" => 'sidebars/foo_sidebar',
+	    "bar/* and !bar/*/*' => 'bar/bar_top_sidebar',
+	    "* and !foo/* and !bar/*" => 'sidebars/general_sidebar',
+	},
+</pre>
+
+One could do something similar for *pageheader*, *pagefooter* and *rightbar* if desired.
+
+Another thing which I find compelling - but probably because I am using [[plugins/contrib/field]] - is to be able to treat the included page as if it were *part* of the page it was included into, rather than as an included page.  I mean things like \[[!if ...]] would test against the page name of the page it's included into rather than the name of the sidebar/header/footer page.  It's even more powerful if one combines this with field/getfield/ftemplate/report, since one could make "generic" headers and footers that could apply to a whole set of pages.
+
+Header example:
+<pre>
+#{{$title}}
+\[[!ftemplate id="nice_data_table"]]
+</pre>
+
+Footer example:
+<pre>
+------------
+\[[!report template="footer_trail" trail="trailpage" here_only=1]]
+</pre>
+
+(Yes, I am already doing something like this on my own site.  It's like the PmWiki concept of GroupHeader/GroupFooter)
+
+-- [[KathrynAndersen]]
+
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 1f6ea9a626d9983ce84343e6a73604d58aa1df09 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 25 Jun 2010 00:30:12 -0400
Subject: clean up messages about unavailable vcs programs

---
 t/bazaar.t    | 7 +++++--
 t/cvs.t       | 7 +++++--
 t/git.t       | 7 +++++--
 t/mercurial.t | 7 +++++--
 t/svn.t       | 7 +++++--
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/t/bazaar.t b/t/bazaar.t
index 3e54ec4dc..cd840fbe1 100755
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -6,11 +6,14 @@ BEGIN {
 	$dir = "/tmp/ikiwiki-test-bzr.$$";
 	my $bzr=`which bzr`;
 	chomp $bzr;
-	if (! -x $bzr || ! mkdir($dir)) {
+	if (! -x $bzr) {
 		eval q{
-			use Test::More skip_all => "bzr not available or could not make test dir"
+			use Test::More skip_all => "bzr not available"
 		}
 	}
+	if (! mkdir($dir)) {
+		die $@;
+	}
 }
 use Test::More tests => 17;
 
diff --git a/t/cvs.t b/t/cvs.t
index 96359ab6e..5ed377ed5 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -8,11 +8,14 @@ BEGIN {
 	chomp $cvs;
 	my $cvsps=`which cvsps`;
 	chomp $cvsps;
-	if (! -x $cvs || ! -x $cvsps || ! mkdir($dir)) {
+	if (! -x $cvs || ! -x $cvsps) {
 		eval q{
-			use Test::More skip_all => "cvs or cvsps not available or could not make test dir"
+			use Test::More skip_all => "cvs or cvsps not available"
 		}
 	}
+	if (! mkdir($dir)) {
+		die $@;
+	}
 	foreach my $module ('File::ReadBackwards', 'File::MimeInfo') {
 		eval qq{use $module};
 		if ($@) {
diff --git a/t/git.t b/t/git.t
index ee778ebf0..6d847dfb0 100755
--- a/t/git.t
+++ b/t/git.t
@@ -7,11 +7,14 @@ BEGIN {
 	$dir="/tmp/ikiwiki-test-git.$$";
 	my $git=`which git`;
 	chomp $git;
-	if (! -x $git || ! mkdir($dir)) {
+	if (! -x $git) {
 		eval q{
-			use Test::More skip_all => "git not available or could not make test dir"
+			use Test::More skip_all => "git not available"
 		}
 	}
+	if (! mkdir($dir)) {
+		die $@;
+	}
 }
 use Test::More tests => 18;
 
diff --git a/t/mercurial.t b/t/mercurial.t
index b64ea8e56..4918fc76e 100755
--- a/t/mercurial.t
+++ b/t/mercurial.t
@@ -6,11 +6,14 @@ BEGIN {
 	$dir = "/tmp/ikiwiki-test-hg.$$";
 	my $hg=`which hg`;
 	chomp $hg;
-	if (! -x $hg || ! mkdir($dir)) {
+	if (! -x $hg) {
 		eval q{
-			use Test::More skip_all => "hg not available or could not make test dir"
+			use Test::More skip_all => "hg not available"
 		}
 	}
+	if (! mkdir($dir)) {
+		die $@;
+	}
 }
 use Test::More tests => 11;
 
diff --git a/t/svn.t b/t/svn.t
index 82b71b5fc..cce8452a6 100755
--- a/t/svn.t
+++ b/t/svn.t
@@ -8,11 +8,14 @@ BEGIN {
 	chomp $svn;
 	my $svnadmin=`which svnadmin`;
 	chomp $svnadmin;
-	if (! -x $svn || ! -x $svnadmin || ! mkdir($dir)) {
+	if (! -x $svn || ! -x $svnadmin) {
 		eval q{
-			use Test::More skip_all => "svn not available or could not make test dir"
+			use Test::More skip_all => "svn or svnadmin not available"
 		}
 	}
+	if (! mkdir($dir)) {
+		die $@;
+	}
 }
 use Test::More tests => 12;
 
-- 
cgit v1.2.3


From d877b9644bcfbbfc5eaf3f7fc13cb96ecda946c9 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Jun 2010 17:14:13 +0200
Subject: po: fix bug with translated pages including templates

The protection against processing loops (i.e. the alreadyfiltered stuff) was
playing against us: the template plugin triggered a filter hooks run with the
very same ($page, $destpage) arguments pair that we use to identify a already
filtered page. Processing an included template could then mark the whole
translation page as already filtered, which prevented po_to_markup to be called
on the PO content.

This commit only runs the whole PO filter logic when our filter hook is run by
IkiWiki::render, which only happens when the full page needs to be filtered.
---
 IkiWiki/Plugin/po.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 3023fd7f9..0b48726ea 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -243,6 +243,10 @@ sub filter (@) {
 	my $page = $params{page};
 	my $destpage = $params{destpage};
 	my $content = $params{content};
+
+	my @caller = caller(4);
+        return $content unless $caller[3] ne "IkiWiki::render";
+
 	if (istranslation($page) && ! alreadyfiltered($page, $destpage)) {
 		$content = po_to_markup($page, $content);
 		setalreadyfiltered($page, $destpage);
-- 
cgit v1.2.3


From d4136aea8aa8968d2cd87b40e8d85301a3549323 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Jun 2010 17:43:25 +0200
Subject: po: also filter sidebar translation pages

---
 IkiWiki/Plugin/po.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 0b48726ea..6bf09b6d6 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -245,7 +245,10 @@ sub filter (@) {
 	my $content = $params{content};
 
 	my @caller = caller(4);
-        return $content unless $caller[3] ne "IkiWiki::render";
+        unless ($caller[3] eq "IkiWiki::render" ||
+                $caller[3] eq 'IkiWiki::Plugin::sidebar::sidebar_content') {
+		return $content;
+	}
 
 	if (istranslation($page) && ! alreadyfiltered($page, $destpage)) {
 		$content = po_to_markup($page, $content);
-- 
cgit v1.2.3


From 903a71c1b9d71bcd10442bee695da6efd4ec953d Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Jun 2010 17:45:08 +0200
Subject: TODO++

---
 IkiWiki/Plugin/po.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 6bf09b6d6..10a5ba467 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -245,6 +245,7 @@ sub filter (@) {
 	my $content = $params{content};
 
 	my @caller = caller(4);
+	# FIXME: need to whitelist inline as well?
         unless ($caller[3] eq "IkiWiki::render" ||
                 $caller[3] eq 'IkiWiki::Plugin::sidebar::sidebar_content') {
 		return $content;
-- 
cgit v1.2.3


From 47d1b3eac57f1b38bb7528fdc039a91680bc33a4 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Jun 2010 19:32:29 +0200
Subject: new bug report, patch provided

---
 doc/bugs/po_vs_templates.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/bugs/po_vs_templates.mdwn

diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
new file mode 100644
index 000000000..a0ccc5f53
--- /dev/null
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -0,0 +1,17 @@
+The po plugin's protection against processing loops (i.e. the
+alreadyfiltered stuff) is playing against us: the template plugin
+triggers a filter hooks run with the very same ($page, $destpage)
+arguments pair that is used to identify an already filtered page.
+
+Processing an included template can then mark the whole translation
+page as already filtered, which prevented `po_to_markup` to be called on
+the PO content.
+
+Symptoms: the unprocessed gettext file goes unfiltered to the
+generated HTML.
+
+This has been fixed in my po branch.
+
+-- [[intrigeri]]
+
+[[!tag patch]]
-- 
cgit v1.2.3


From 8f266d4d436be5cbb765ac81424687e764397d05 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Jun 2010 19:32:46 +0200
Subject: another bugreport with patch

---
 doc/todo/Fix_selflink_in_po_plugin.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index 87fa38911..b83d2814a 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -6,3 +6,5 @@ isn't. --[[intrigeri]]
 Fixed in my po branch. --[[intrigeri]]
 
 [[!tag patch]]
+
+> bump?
-- 
cgit v1.2.3


From 7399f56607d789b2152b9461397b93b8db88ccff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 25 Jun 2010 13:43:02 -0400
Subject: auto changelog merging

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..5d425843f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs
-- 
cgit v1.2.3


From a128c256a51392fcf752bf612d83a90e8c68027e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Jun 2010 23:18:34 +0200
Subject: po: added support for html pagetype

... after having audited the po4a Xml and Xhtml modules for security issues.

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 IkiWiki/Plugin/po.pm           | 47 +++++++++++++++++++++++++++++++++---------
 doc/plugins/po.mdwn            | 10 ++++-----
 doc/plugins/po/discussion.mdwn | 17 +++++++++++++++
 3 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 10a5ba467..ab1cc7ae6 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -869,8 +869,8 @@ sub refreshpot ($) {
 	my $masterfile=shift;
 
 	my $potfile=potfile($masterfile);
-	my %options = ("markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0);
-	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
+					   po4a_options($masterfile));
 	$doc->{TT}{utf_mode} = 1;
 	$doc->{TT}{file_in_charset} = 'utf-8';
 	$doc->{TT}{file_out_charset} = 'utf-8';
@@ -961,10 +961,8 @@ sub percenttranslated ($) {
 	return gettext("N/A") unless istranslation($page);
 	my $file=srcfile($pagesources{$page});
 	my $masterfile = srcfile($pagesources{masterpage($page)});
-	my %options = (
-		"markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
-	);
-	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
+					   po4a_options($masterfile));
 	$doc->process(
 		'po_in_name'	=> [ $file ],
 		'file_in_name'	=> [ $masterfile ],
@@ -1115,10 +1113,8 @@ sub po_to_markup ($$) {
 		or return $fail->(sprintf(gettext("failed to write %s"), $infile));
 
 	my $masterfile = srcfile($pagesources{masterpage($page)});
-	my %options = (
-		"markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
-	);
-	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
+					   po4a_options($masterfile));
 	$doc->process(
 		'po_in_name'	=> [ $infile ],
 		'file_in_name'	=> [ $masterfile ],
@@ -1181,6 +1177,37 @@ sub isvalidpo ($) {
 					"to previous page to continue edit"));
 }
 
+sub po4a_type ($) {
+	my $file = shift;
+
+	my $pagetype = pagetype($file);
+	if ($pagetype eq 'html') {
+		return 'xhtml';
+        }
+	return 'text';
+}
+
+sub po4a_options($) {
+	my $file = shift;
+
+	my %options;
+	my $pagetype = pagetype($file);
+
+	if ($pagetype eq 'html') {
+		# how to disable options is not consistent across po4a modules
+		$options{includessi} = '';
+		$options{includeexternal} = 0;
+        }
+	elsif ($pagetype eq 'mdwn') {
+		$options{markdown} = 1;
+        }
+        else {
+		$options{markdown} = 0;
+        }
+
+	return %options;
+}
+
 # ,----
 # | PageSpecs
 # `----
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 576d36ec1..585e14383 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -213,16 +213,16 @@ preferred `$EDITOR`, without needing to be online.
 Markup languages support
 ------------------------
 
-[[Markdown|mdwn]] is well supported. Some other markup languages supported
-by ikiwiki mostly work, but some pieces of syntax are not rendered
-correctly on the slave pages:
+[[Markdown|mdwn]] and [[html]] are well supported. Some other markup
+languages supported by ikiwiki mostly work, but some pieces of syntax
+are not rendered correctly on the slave pages:
 
 * [[reStructuredText|rst]]: anonymous hyperlinks and internal
   cross-references
 * [[wikitext]]: conversion of newlines to paragraphs
 * [[creole]]: verbatim text is wrapped, tables are broken
-* [[html]] and LaTeX: not supported yet; the dedicated po4a modules
-  could be used to support them, but they would need a security audit
+* LaTeX: not supported yet; the dedicated po4a module
+  could be used to support it, but it would need a security audit
 * other markup languages have not been tested.
 
 Security
diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index 27683f1ea..73858c818 100644
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -150,6 +150,23 @@ The following analysis was done with his help.
   variables; according to [[Joey]], this is "Freaky code, but seems ok
   due to use of `quotementa`".
 
+##### Locale::Po4a::Xhtml
+
+* does not run any external program
+* does not build regexp's from untrusted variables
+
+=> Seems safe as far as the `includessi` option is disabled; the po
+plugin explicitly disables it.
+
+Relies on Locale::Po4a::Xml` to do most of the work.
+
+##### Locale::Po4a::Xml
+
+* does not run any external program
+* the `includeexternal` option makes it able to read external files;
+  the po plugin explicitly disables it
+* untrusted variables are escaped when used to build regexp's
+
 ##### Text::WrapI18N
 
 `Text::WrapI18N` can cause DoS
-- 
cgit v1.2.3


From 4cf185e781a5f94373b30ec9a0e10dfb626b6d86 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 00:56:06 +0200
Subject: po_slave_languages can now be a hash, if order matters.

---
 IkiWiki/Plugin/po.pm | 95 +++++++++++++++++++++++++++++++++-------------------
 doc/plugins/po.mdwn  | 13 ++-----
 2 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index ab1cc7ae6..7d5dfee03 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -28,6 +28,7 @@ use UNIVERSAL;
 my %translations;
 my @origneedsbuild;
 my %origsubs;
+my @slavelanguages; # orderer as in config po_slave_languages
 
 memoize("istranslatable");
 memoize("_istranslation");
@@ -104,11 +105,11 @@ sub getsetup () {
 		},
 		po_slave_languages => {
 			type => "string",
-			example => {
+			example => [
 				'fr' => 'Français',
 				'es' => 'Español',
 				'de' => 'Deutsch'
-			},
+			],
 			description => "slave languages (PO files)",
 			safe => 1,
 			rebuild => 1,
@@ -137,6 +138,21 @@ sub checkconfig () {
 				      $field, 'po'));
 		}
 	}
+
+	if (ref $config{po_slave_languages} eq 'ARRAY') {
+		my %slaves;
+		for (my $i=0; $i<@{$config{po_slave_languages}}; $i = $i + 2) {
+			$slaves{$config{po_slave_languages}->[$i]} = $config{po_slave_languages}->[$i + 1];
+			push @slavelanguages, $config{po_slave_languages}->[$i];
+                }
+		$config{po_slave_languages} = \%slaves;
+        }
+	elsif (ref $config{po_slave_languages} eq 'HASH') {
+		@slavelanguages = sort {
+			$config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b};
+		} keys %{$config{po_slave_languages}};
+        }
+
 	delete $config{po_slave_languages}{$config{po_master_language}{code}};;
 
 	map {
@@ -197,7 +213,7 @@ sub needsbuild () {
 
 	# make existing translations depend on the corresponding master page
 	foreach my $master (keys %translations) {
-		map add_depends($_, $master), values %{otherlanguages($master)};
+		map add_depends($_, $master), values %{otherlanguages_pages($master)};
 	}
 }
 
@@ -229,7 +245,7 @@ sub scan (@) {
 				# make sure any destpage's translations has
 				# $page in its backlinks
 				push @{$links{$page}},
-					values %{otherlanguages($destpage)};
+					values %{otherlanguages_pages($destpage)};
 			}
 		}
 	}
@@ -295,7 +311,7 @@ sub pagetemplate (@) {
 	}
 	if ($template->query(name => "otherlanguages")) {
 		$template->param(otherlanguages => [otherlanguagesloop($page)]);
-		map add_depends($page, $_), (values %{otherlanguages($page)});
+		map add_depends($page, $_), (values %{otherlanguages_pages($page)});
 	}
 	if ($config{discussion} && istranslation($page)) {
 		if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
@@ -348,12 +364,12 @@ sub renamepages (@) {
 	return () unless istranslatable($torename{src});
 
 	my @ret;
-	my %otherpages=%{otherlanguages($torename{src})};
+	my %otherpages=%{otherlanguages_pages($torename{src})};
 	while (my ($lang, $otherpage) = each %otherpages) {
 		push @ret, {
 			src => $otherpage,
 			srcfile => $pagesources{$otherpage},
-			dest => otherlanguage($torename{dest}, $lang),
+			dest => otherlanguage_page($torename{dest}, $lang),
 			destfile => $torename{dest}.".".$lang.".po",
 			required => 0,
 		};
@@ -820,7 +836,7 @@ sub islanguagecode ($) {
 	return $code =~ /^[a-z]{2}$/;
 }
 
-sub otherlanguage ($$) {
+sub otherlanguage_page ($$) {
 	my $page=shift;
 	my $code=shift;
 
@@ -828,17 +844,31 @@ sub otherlanguage ($$) {
 	return masterpage($page) . '.' . $code;
 }
 
-sub otherlanguages ($) {
+# Returns the list of other languages codes: the master language comes first,
+# then the codes are ordered the same way as in po_slave_languages, if it is
+# an array, or in the language name lexical order, if it is a hash.
+sub otherlanguages_codes ($) {
 	my $page=shift;
 
-	my %ret;
-	return \%ret unless istranslation($page) || istranslatable($page);
+	my @ret;
+	return \@ret unless istranslation($page) || istranslatable($page);
 	my $curlang=lang($page);
 	foreach my $lang
-		($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) {
+		($config{po_master_language}{code}, @slavelanguages) {
 		next if $lang eq $curlang;
-		$ret{$lang}=otherlanguage($page, $lang);
+		push @ret, $lang;
 	}
+	return \@ret;
+}
+
+sub otherlanguages_pages ($) {
+	my $page=shift;
+
+        my %ret;
+	map {
+		$ret{$_} = otherlanguage_page($page, $_)
+	} otherlanguages_codes($page);
+
 	return \%ret;
 }
 
@@ -989,30 +1019,25 @@ sub otherlanguagesloop ($) {
 	my $page=shift;
 
 	my @ret;
-	my %otherpages=%{otherlanguages($page)};
-	while (my ($lang, $otherpage) = each %otherpages) {
-		if (istranslation($page) && masterpage($page) eq $otherpage) {
-			push @ret, {
-				url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
-				code => $lang,
-				language => languagename($lang),
-				master => 1,
-			};
-		}
-		elsif (istranslation($otherpage)) {
-			push @ret, {
-				url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
-				code => $lang,
-				language => languagename($lang),
-				percent => percenttranslated($otherpage),
-			}
+	if (istranslation($page)) {
+		push @ret, {
+			url => urlto_with_orig_beautiful_urlpath(masterpage($page), $page),
+			code => $config{po_master_language}{code},
+			language => $config{po_master_language}{name},
+			master => 1,
+		};
+	}
+	foreach my $lang (@{otherlanguages_codes($page)}) {
+		next if $lang eq $config{po_master_language}{code};
+		my $otherpage = otherlanguage_page($page, $lang);
+		push @ret, {
+			url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
+			code => $lang,
+			language => languagename($lang),
+			percent => percenttranslated($otherpage),
 		}
 	}
-	return sort {
-		return -1 if $a->{code} eq $config{po_master_language}{code};
-		return 1 if $b->{code} eq $config{po_master_language}{code};
-		return $a->{language} cmp $b->{language};
-	} @ret;
+	return @ret;
 }
 
 sub homepageurl (;$) {
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 585e14383..6b2a30786 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -54,10 +54,10 @@ Supported languages
 `po_slave_languages` is used to set the list of supported "slave"
 languages, such as:
 
-        po_slave_languages => { 'fr' => 'Français',
+        po_slave_languages => [ 'fr' => 'Français',
                                 'es' => 'Español',
                                 'de' => 'Deutsch',
-        }
+        ]
 
 Decide which pages are translatable
 -----------------------------------
@@ -254,15 +254,6 @@ once [[intrigeri]]'s `meta` branch is merged.
 An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
 and `meta` branches, and thus has this additional features.
 
-Language display order
-----------------------
-
-Jonas pointed out that one might want to control the order that links to
-other languages are listed, for various reasons. Currently, there is no
-order, as `po_slave_languages` is a hash. It would need to be converted
-to an array to support this. (If twere done, twere best done quickly.)
---[[Joey]] 
-
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From 924f559e5049a63488a5f2baca610299a7e02957 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 00:59:20 +0200
Subject: typo fix.

---
 doc/plugins/po.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 6b2a30786..dc0b638e2 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -130,7 +130,7 @@ lighttpd
 --------
 
 Recent versions of lighttpd should be able to use
-`$HTTP["language"]` to configure the translatted pages to be served.
+`$HTTP["language"]` to configure the translated pages to be served.
 
 See [Lighttpd Issue](http://redmine.lighttpd.net/issues/show/1119)
 
-- 
cgit v1.2.3


From 4f44534d72c9a9a947bc38a3cb4987705c25bea5 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 01:16:56 +0200
Subject: po: s/utf-8/UTF-8, to solve part of the double commit bug.

---
 IkiWiki/Plugin/po.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 7d5dfee03..ac4401e48 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -902,15 +902,15 @@ sub refreshpot ($) {
 	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
 					   po4a_options($masterfile));
 	$doc->{TT}{utf_mode} = 1;
-	$doc->{TT}{file_in_charset} = 'utf-8';
-	$doc->{TT}{file_out_charset} = 'utf-8';
+	$doc->{TT}{file_in_charset} = 'UTF-8';
+	$doc->{TT}{file_out_charset} = 'UTF-8';
 	$doc->read($masterfile);
 	# let's cheat a bit to force porefs option to be passed to
 	# Locale::Po4a::Po; this is undocument use of internal
 	# Locale::Po4a::TransTractor's data, compulsory since this module
 	# prevents us from using the porefs option.
 	$doc->{TT}{po_out}=Locale::Po4a::Po->new({ 'porefs' => 'none' });
-	$doc->{TT}{po_out}->set_charset('utf-8');
+	$doc->{TT}{po_out}->set_charset('UTF-8');
 	# do the actual work
 	$doc->parse;
 	IkiWiki::prep_writefile(basename($potfile),dirname($potfile));
@@ -996,8 +996,8 @@ sub percenttranslated ($) {
 	$doc->process(
 		'po_in_name'	=> [ $file ],
 		'file_in_name'	=> [ $masterfile ],
-		'file_in_charset'  => 'utf-8',
-		'file_out_charset' => 'utf-8',
+		'file_in_charset'  => 'UTF-8',
+		'file_out_charset' => 'UTF-8',
 	) or error("po(percenttranslated) ".
 		   sprintf(gettext("failed to translate %s"), $page));
 	my ($percent,$hit,$queries) = $doc->stats();
@@ -1143,8 +1143,8 @@ sub po_to_markup ($$) {
 	$doc->process(
 		'po_in_name'	=> [ $infile ],
 		'file_in_name'	=> [ $masterfile ],
-		'file_in_charset'  => 'utf-8',
-		'file_out_charset' => 'utf-8',
+		'file_in_charset'  => 'UTF-8',
+		'file_out_charset' => 'UTF-8',
 	) or return $fail->(gettext("failed to translate"));
 	$doc->write($outfile)
 		or return $fail->(sprintf(gettext("failed to write %s"), $outfile));
-- 
cgit v1.2.3


From c27ed8737d823c2abb7c3a814a847311f059d656 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <Amitai@web>
Date: Sat, 26 Jun 2010 01:48:53 +0000
Subject: windauth plugin exists (iPhone edit)

---
 doc/users/schmonz.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index ed3332bf9..ec282c990 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -2,4 +2,4 @@
 
 [[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"]]
 
-In progress: a plugin for [WIND authentication](http://www.columbia.edu/acis/rad/authmethods/wind/).
+I've also written a plugin for [WIND authentication](http://www.columbia.edu/acis/rad/authmethods/wind/), which may or may not be of general utility.
-- 
cgit v1.2.3


From 9b66a0cf0a5faf2da694b3cfb91eef6158167f4f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 00:57:58 +0200
Subject: done in my branch, please review.

---
 doc/plugins/po.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 576d36ec1..9b492c781 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -263,6 +263,9 @@ order, as `po_slave_languages` is a hash. It would need to be converted
 to an array to support this. (If twere done, twere best done quickly.)
 --[[Joey]] 
 
+> Done in my po branch, preserving backward compatibility. Please
+> review :) --[[intrigeri]]
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From e84287ec98f91e6622942f2bf0e7c5462c04b203 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 01:02:08 +0200
Subject: need more info to reproduce

---
 doc/plugins/po.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 9b492c781..ab83c91bc 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -293,6 +293,9 @@ Also, this may only happen if the page being linked to is coming from an
 underlay, and the underlays lack translation to a given language.
 --[[Joey]] 
 
+> Any simple testcase to reproduce it, please? I've never seen this
+> happen yet. --[[intrigeri]]
+
 Double commits of po files
 --------------------------
 
-- 
cgit v1.2.3


From 9b171de6dbe13a35383edce6ee7e5365f2d61175 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 01:29:20 +0200
Subject: yet another bug on good way to be fixed

---
 doc/plugins/po.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index ab83c91bc..892830ee5 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -310,6 +310,10 @@ and then committed again. The second commit makes this change:
 Same thing happens when a change to an existing page triggers a po file
 update. --[[Joey]] 
 
+> * The s/utf-8/UTF-8 part is fixed in my po branch.
+> * The ENCODING\n part is due to an inconsistency in po4a, which
+>   I've just send a patch for. --[[intrigeri]]
+
 Ugly messages with empty files
 ------------------------------
 
-- 
cgit v1.2.3


From 7e3672945f7f95d8ea68734c1fa2dfa1dfd2af7f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 01:43:00 +0200
Subject: another po4a patch has been sent.

---
 doc/plugins/po.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 892830ee5..dd85edf3d 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -319,6 +319,9 @@ Ugly messages with empty files
 
 If there are empty .mdwn files, the po plugin displays some ugly messages.
 
+> This is due to a bug in po4a (not checking definedness of a
+> variable). One-liner patch sent. --[[intrigeri]]
+
 Translation of directives
 -------------------------
 
-- 
cgit v1.2.3


From e6bba3b3b5c7a99a38f5ae489a8fb7353013debc Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <Amitai@web>
Date: Sat, 26 Jun 2010 18:13:08 +0000
Subject: s/the the/the/

---
 doc/setup/byhand.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
index afd1ac27f..86cff5af4 100644
--- a/doc/setup/byhand.mdwn
+++ b/doc/setup/byhand.mdwn
@@ -177,7 +177,7 @@ about using the git repositories.
 
 Once your wiki is checked in to the revision control system, you should
 configure ikiwiki to use revision control. Edit your ikiwiki.setup, set
-`rcs` to the the revision control system you chose to use.  Be careful, 
+`rcs` to the revision control system you chose to use.  Be careful, 
 you may need to use the 'fullname'.  For example, 'hg' doesn't work, you
 should use mercurial.  Be sure to set `svnrepo` to the directory for your
 repository, if using subversion. Uncomment the configuration for the wrapper
-- 
cgit v1.2.3


From 430a2308133a2733f20c5e2f75b1eb974b8fdfa0 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <Amitai@web>
Date: Sat, 26 Jun 2010 20:14:50 +0000
Subject: another reason to use NetBSD's commit_prep and log_accum for CVS

---
 doc/rcs/cvs.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/rcs/cvs.mdwn b/doc/rcs/cvs.mdwn
index f0bd0f6f0..9beb08ece 100644
--- a/doc/rcs/cvs.mdwn
+++ b/doc/rcs/cvs.mdwn
@@ -20,8 +20,9 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
  * creates a repository,
  * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
  * configures the post-commit hook in `CVSROOT/loginfo`.
-* CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below).
 
 ### To do
-* Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records.
+* Have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce commits into changesets. Reasons:
+    7. Obviates the need to scrape the repo's complete history to determine the last N changesets. (Repositories without such records can fall back on the `cvsps` and `File::ReadBackwards` code.)
+    7. Arranges for ikiwiki to be run once per changeset, rather than CVS's once per committed file (!), which is a waste at best and bug-inducing at worst. (Currently, on multi-directory commits, only the first directory's changes get mentioned in [[recentchanges|plugins/recentchanges]].)
 * Perhaps prevent web edits from attempting to create `.../CVS/foo.mdwn` (and `.../cvs/foo.mdwn` on case-insensitive filesystems); thanks to the CVS metadata directory, the attempt will fail anyway (and much more confusingly) if we don't.
-- 
cgit v1.2.3


From a39c6b6eac7059e4ed13dbf8a3750a79a5c9a5c8 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawnbe6oB_ecFtNYII1JN3zSggwUPUdOb8jI"
 <William@web>
Date: Sat, 26 Jun 2010 22:12:24 +0000
Subject: Add Microdata suggestion

---
 doc/plugins/contrib/field/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 103e061e5..5f4c9b942 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -324,3 +324,5 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >>> the side-effects, but use `field` as an interface to get the values of those special fields.
 
 >>> --[[KathrynAndersen]]
+
+I was just looking at HTML5 and wondered if the field plugin should generate the new Microdata tags (as well as the internal structures)? <http://slides.html5rocks.com/#slide19> -- [[Will]]
-- 
cgit v1.2.3


From 2c1c6ea48835913d53740acc375d7f0c8106b429 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 27 Jun 2010 00:12:40 +0200
Subject: Feature request, patch provided.

---
 doc/todo/Add_HTML_support_to_po_plugin.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/todo/Add_HTML_support_to_po_plugin.mdwn

diff --git a/doc/todo/Add_HTML_support_to_po_plugin.mdwn b/doc/todo/Add_HTML_support_to_po_plugin.mdwn
new file mode 100644
index 000000000..ec29e4f61
--- /dev/null
+++ b/doc/todo/Add_HTML_support_to_po_plugin.mdwn
@@ -0,0 +1,7 @@
+The HTML page type should be fully supported by the PO plugin: po4a's
+HTML support is able to extract translatable strings and to disregard
+the rest.
+
+This is implemented in my po branch, please review. --[[intrigeri]]
+
+[[!tag patch]]
-- 
cgit v1.2.3


From 52ad4a28769b711a8465283bd1471795e662b0d2 Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Sat, 26 Jun 2010 22:13:33 +0000
Subject: Add my website

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 8fb348c3d..e2465108a 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -147,6 +147,7 @@ Personal sites and blogs
 * [Ertug Karamatli](http://pages.karamatli.com)
 * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
 * [Daniel Wayne Armstrong](http://circuidipity.com/)
+* [Mukund](https://www.mukund.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 72ee9c720f3d99828728202c206c042727eac1b4 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawk3fIimitIcXPaVA5AHUW67Z9GVc-2wQJU"
 <Michael@web>
Date: Sun, 27 Jun 2010 17:21:45 +0000
Subject:

---
 doc/sandbox.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8ecaf1cb9..b8bcc62c4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,7 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
+Test conflict.
+
 # Header
 
 ## Subheader2
-- 
cgit v1.2.3


From 6e68a48b63a532369d97709dd189d233c5fd0298 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawk3fIimitIcXPaVA5AHUW67Z9GVc-2wQJU"
 <Michael@web>
Date: Sun, 27 Jun 2010 17:22:41 +0000
Subject:

---
 doc/sandbox.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b8bcc62c4..4c8621f1c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,10 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
+<<<<<<< HEAD
 Test conflict.
+=======
+Testing 123.
+>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
 
 # Header
 
-- 
cgit v1.2.3


From bb5193fde1dbe5ebffe84deddc6ed4aac80a36b0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 27 Jun 2010 13:49:51 -0400
Subject: hnb: Fixed broken use of mkstemp that had caused dangling temp files,
 and prevented actually rendering hnb files.

---
 IkiWiki/Plugin/hnb.pm | 4 ++--
 debian/changelog      | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/hnb.pm b/IkiWiki/Plugin/hnb.pm
index 32c9cf3ad..5157a6b93 100644
--- a/IkiWiki/Plugin/hnb.pm
+++ b/IkiWiki/Plugin/hnb.pm
@@ -33,8 +33,8 @@ sub htmlize (@) {
 	# hnb outputs version number etc. every time to STDOUT, so
 	# using files makes it easier to seprarate.
 
-	my $tmpin  = mkstemp( "/tmp/ikiwiki-hnbin.XXXXXXXXXX"  );
-	my $tmpout = mkstemp( "/tmp/ikiwiki-hnbout.XXXXXXXXXX" );
+	my ($infh, $tmpin)  = mkstemp( "/tmp/ikiwiki-hnbin.XXXXXXXXXX"  );
+	my ($outfh, $tmpout) = mkstemp( "/tmp/ikiwiki-hnbout.XXXXXXXXXX" );
 
 	open(TMP, '>', $tmpin) or die "Can't write to $tmpin: $!";
 	print TMP $params{content};
diff --git a/debian/changelog b/debian/changelog
index ae1d23479..15ae21a55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
   * Fixed some confusion and bugginess about whether
     rcs_getctime/rcs_getmtime were passed absolute or relative filenames.
     (Make it relative like everything else.)
+  * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
+    and prevented actually rendering hnb files.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
-- 
cgit v1.2.3


From dcd57dd5c9f3265bb7a78a5696b90976698c43aa Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jun 2010 15:13:23 +0200
Subject: Add a fullpage arg to filter.

Set it to true every time IkiWiki::filter is called on a full page's content.

This is a much nicer solution, for the po plugin, than previous whitelisting
using caller().
---
 IkiWiki.pm                 | 6 ++++--
 IkiWiki/Plugin/editpage.pm | 2 +-
 IkiWiki/Plugin/inline.pm   | 4 ++--
 IkiWiki/Plugin/po.pm       | 6 ++----
 IkiWiki/Plugin/sidebar.pm  | 2 +-
 IkiWiki/Render.pm          | 4 ++--
 doc/plugins/write.mdwn     | 4 +++-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0457a6c61..7b5fd283d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1396,14 +1396,16 @@ sub preprocess ($$$;$$) {
 	return $content;
 }
 
-sub filter ($$$) {
+sub filter ($$$;$) {
 	my $page=shift;
 	my $destpage=shift;
 	my $content=shift;
+	my $fullpage=shift;
+	$fullpage = 0 unless defined $fullpage;
 
 	run_hooks(filter => sub {
 		$content=shift->(page => $page, destpage => $destpage, 
-			content => $content);
+			content => $content, fullpage => $fullpage);
 	});
 
 	return $content;
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 1a04a72b5..706630203 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -187,7 +187,7 @@ sub cgi_editpage ($$) {
 		my $preview=htmlize($page, $page, $type,
 			linkify($page, $page,
 			preprocess($page, $page,
-			filter($page, $page, $content), 0, 1)));
+			filter($page, $page, $content, 'fullpage'), 0, 1)));
 		run_hooks(format => sub {
 			$preview=shift->(
 				page => $page,
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 715a3d652..a04dd6630 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -403,7 +403,7 @@ sub preprocess_inline (@) {
 					      linkify($page, $params{destpage},
 					      preprocess($page, $params{destpage},
 					      filter($page, $params{destpage},
-					      readfile(srcfile($file)))));
+					      readfile(srcfile($file)), 'fullpage')));
 				}
 				else {
 					$ret.="\n".
@@ -474,7 +474,7 @@ sub get_inline_content ($$) {
 		       linkify($page, $destpage,
 		       preprocess($page, $destpage,
 		       filter($page, $destpage,
-		       readfile(srcfile($file))))));
+		       readfile(srcfile($file)), 'fullpage'))));
 		$nested--;
 		if (isinternal($page)) {
 			# make inlined text of internal pages searchable
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index ac4401e48..93cf6bbdf 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -259,11 +259,9 @@ sub filter (@) {
 	my $page = $params{page};
 	my $destpage = $params{destpage};
 	my $content = $params{content};
+	my $fullpage = $params{fullpage};
 
-	my @caller = caller(4);
-	# FIXME: need to whitelist inline as well?
-        unless ($caller[3] eq "IkiWiki::render" ||
-                $caller[3] eq 'IkiWiki::Plugin::sidebar::sidebar_content') {
+	unless ($fullpage) {
 		return $content;
 	}
 
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 2d495db2c..100015cee 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -89,7 +89,7 @@ sub sidebar_content ($) {
 		return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type,
 		       IkiWiki::linkify($sidebar_page, $page,
 		       IkiWiki::preprocess($sidebar_page, $page,
-		       IkiWiki::filter($sidebar_page, $page, $content))));
+		       IkiWiki::filter($sidebar_page, $page, $content, 'fullpage'))));
 	}
 
 }
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index a653ab2da..233d093ed 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -232,7 +232,7 @@ sub render ($$) {
 			linkify($page, $page,
 			preprocess($page, $page,
 			filter($page, $page,
-			readfile($srcfile)))));
+			readfile($srcfile), 'fullpage'))));
 		
 		my $output=htmlpage($page);
 		writefile($output, $config{destdir}, genpage($page, $content));
@@ -837,7 +837,7 @@ sub commandline_render () {
 	my $content=readfile($srcfile);
 	my $page=pagename($file);
 	$pagesources{$page}=$file;
-	$content=filter($page, $page, $content);
+	$content=filter($page, $page, $content, 'fullpage');
 	$content=preprocess($page, $page, $content);
 	$content=linkify($page, $page, $content);
 	$content=htmlize($page, $page, $type, $content);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index a921b9a02..15ed08d82 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -200,7 +200,9 @@ value is ignored.
 
 Runs on the raw source of a page, before anything else touches it, and can
 make arbitrary changes. The function is passed named parameters "page",
-"destpage", and "content". It should return the filtered content.
+"destpage", "content" and "fullpage". "fullpage" is a true value if,
+and only if, a full page's content is being filtered, e.g. as opposed
+to a directive parameter. It should return the filtered content.
 
 ### preprocess
 
-- 
cgit v1.2.3


From b225fdc44d4b3d2853db622d59aed7b59788aeec Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jun 2010 15:45:34 +0200
Subject: po: added a needstranslation() pagespec

---
 IkiWiki/Plugin/po.pm         | 15 +++++++++++++++
 doc/ikiwiki/pagespec/po.mdwn |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 93cf6bbdf..552b6b51b 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -1291,4 +1291,19 @@ sub match_currentlang ($$;@) {
 	}
 }
 
+sub match_needstranslation ($$;@) {
+	my $page=shift;
+
+	my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
+	if ($percenttranslated eq 'N/A') {
+		return IkiWiki::FailReason->new("file is not a translation page");
+	}
+	elsif ($percenttranslated < 100) {
+		return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
+        }
+	else {
+		return IkiWiki::FailReason->new("file is fully translated");
+	}
+}
+
 1
diff --git a/doc/ikiwiki/pagespec/po.mdwn b/doc/ikiwiki/pagespec/po.mdwn
index 40ed9efb6..f8b398575 100644
--- a/doc/ikiwiki/pagespec/po.mdwn
+++ b/doc/ikiwiki/pagespec/po.mdwn
@@ -11,6 +11,8 @@ wiki:
   specified as a ISO639-1 (two-letter) language code.
 * "`currentlang()`" - tests whether a page is written in the same
   language as the current page.
+* "`needstranslation()`" - tests whether a page needs translation
+  work. Only slave pages match this PageSpec.
 
 Note that every non-po page is considered to be written in
 `po_master_language`, as specified in `ikiwiki.setup`.
-- 
cgit v1.2.3


From e694579d2729a8f771acc9e5789efc03e039ed56 Mon Sep 17 00:00:00 2001
From: jeanm <jeanm@web>
Date: Wed, 30 Jun 2010 07:30:08 +0000
Subject: Added a comment: do parameter missing

---
 .../comment_3_4eec15c8c383275db5401c8e3c2d9242._comment          | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_3_4eec15c8c383275db5401c8e3c2d9242._comment

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_3_4eec15c8c383275db5401c8e3c2d9242._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_3_4eec15c8c383275db5401c8e3c2d9242._comment
new file mode 100644
index 000000000..faf3ad31b
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_3_4eec15c8c383275db5401c8e3c2d9242._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="jeanm"
+ ip="81.56.145.104"
+ subject="do parameter missing"
+ date="2010-06-30T07:30:08Z"
+ content="""
+the site address is piaffer.org, with a link to blog just over the picture.
+tia,
+"""]]
-- 
cgit v1.2.3


From 1ffe0d97394bb9b1de29d9a3df914c97d89584cb Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jun 2010 15:50:05 +0200
Subject: cleaner bugfix in now available

---
 doc/bugs/po_vs_templates.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index a0ccc5f53..ce0ac3577 100644
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -12,6 +12,12 @@ generated HTML.
 
 This has been fixed in my po branch.
 
+> My commit dcd57dd5c9f3265bb7a78a5696b90976698c43aa updates the
+> bugfix in a much more elegant manner. Its main disadvantage is to
+> add an (optional) argument to IkiWiki::filter. Please review.
+
 -- [[intrigeri]]
 
+
+
 [[!tag patch]]
-- 
cgit v1.2.3


From e63ead1c13290f314579f90e8ae2a607f2b69e7a Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jun 2010 15:50:19 +0200
Subject: please review new po pagespec: needstranlation()

---
 doc/todo/po_needstranslation_pagespec.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/todo/po_needstranslation_pagespec.mdwn

diff --git a/doc/todo/po_needstranslation_pagespec.mdwn b/doc/todo/po_needstranslation_pagespec.mdwn
new file mode 100644
index 000000000..acc5641a4
--- /dev/null
+++ b/doc/todo/po_needstranslation_pagespec.mdwn
@@ -0,0 +1,5 @@
+Commit b225fdc44d4b3d in my po branch adds a `needstranslation()`
+PageSpec. It makes it easy to list pages that need translation work.
+Please review. --[[intrigeri]]
+
+[[!tag patch]]
-- 
cgit v1.2.3


From 91fde37f13a89b4593e128852c2f8927b478d881 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 1 Jul 2010 00:30:58 +0000
Subject: response to Microdata question

---
 doc/plugins/contrib/field/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 5f4c9b942..191f8b27d 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -325,4 +325,8 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 
 >>> --[[KathrynAndersen]]
 
+-----
+
 I was just looking at HTML5 and wondered if the field plugin should generate the new Microdata tags (as well as the internal structures)? <http://slides.html5rocks.com/#slide19> -- [[Will]]
+
+> This could just as easily be done as a separate plugin.  Feel free to do so. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 29fd100e9f4e71fb85505d932184ffd5e3f26242 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Jun 2010 20:53:58 -0400
Subject: Use comment template on comments page of example blog.

---
 debian/changelog                | 1 +
 doc/examples/blog/comments.mdwn | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 15ae21a55..0697efffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
     (Make it relative like everything else.)
   * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
     and prevented actually rendering hnb files.
+  * Use comment template on comments page of example blog.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index f59b44390..52c7d3132 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -6,4 +6,5 @@ Comments in the moderation queue:
 """]]
 
 Recent comments on posts in the [[blog|index]]:
-[[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
+[[!inline pages="./posts/*/Discussion or comment(./posts/*)"
+template="comment"]]
-- 
cgit v1.2.3


From 28cdf2c341fa633efbb3461acd2e1109f38b8da7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Jun 2010 21:07:31 -0400
Subject: comment.tmpl: Fix up display when inline uses it to display a
 non-comment page. (Such as a discussion page.)

---
 debian/changelog       | 2 ++
 templates/comment.tmpl | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0697efffd..4ce720ab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
   * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
     and prevented actually rendering hnb files.
   * Use comment template on comments page of example blog.
+  * comment.tmpl: Fix up display when inline uses it to display a non-comment
+    page. (Such as a discussion page.)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index fa90e6d26..c2ee5a371 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -14,8 +14,8 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
-Comment by
 <TMPL_IF COMMENTUSER>
+Comment by
 <TMPL_IF COMMENTOPENID>
 <span class="author" title="OpenID">
 <a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>
@@ -30,6 +30,8 @@ Comment by
 </span>
 </TMPL_IF>
 <TMPL_ELSE>
+<TMPL_IF AUTHOR>
+Comment by
 <TMPL_IF COMMENTIP>
 <span class="author" title="Unauthenticated, from <TMPL_VAR COMMENTIP>">
 <TMPL_ELSE>
@@ -40,6 +42,7 @@ Comment by
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
 </TMPL_IF>
+</TMPL_IF>
 </span>
 </TMPL_IF>
 &mdash; <TMPL_VAR CTIME>
-- 
cgit v1.2.3


From 824ad84e2b490e3aa9107e3a3d244bd8e041d918 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 1 Jul 2010 15:52:03 -0400
Subject: add note about genwrapper code running before wrapper sanitizes
 environment

(That is needed for the receive test code.)
---
 doc/plugins/write.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index a921b9a02..bb8012342 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -595,7 +595,10 @@ describes the plugin as a whole. For example:
 	hook(type => "genwrapper", id => "foo", call => \&genwrapper);
 
 This hook is used to inject C code (which it returns) into the `main`
-function of the ikiwiki wrapper when it is being generated.
+function of the ikiwiki wrapper when it is being generated. 
+
+The code runs before anything else -- in particular it runs before
+the suid wrapper has sanitized its environment.
 
 ## Exported variables
 
-- 
cgit v1.2.3


From 0eabe6f79498e3339205aeff2c79ae1e85498ab4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 1 Jul 2010 16:20:03 -0400
Subject: git: Added git_wrapper_background_command option. Can be used to eg, 
 make the git wrapper push to github in the background after ikiwiki runs.

---
 IkiWiki.pm            |  7 +++++++
 IkiWiki/Plugin/git.pm |  8 ++++++++
 IkiWiki/Wrapper.pm    | 52 ++++++++++++++++++++++++++++++++++++++++++++-------
 debian/changelog      |  3 +++
 4 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 35b38df46..701f7137d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -441,6 +441,13 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
+	wrapper_background_command => {
+		type => "internal",
+		default => '',
+		description => "background shell command to run",
+		safe => 0,
+		rebuild => 0,
+	},
 	gettime => {
 		type => "internal",
 		description => "running in gettime mode",
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 992c6226b..0f92476c9 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -41,6 +41,7 @@ sub checkconfig () {
 		push @{$config{wrappers}}, {
 			wrapper => $config{git_wrapper},
 			wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
+			wrapper_background_command => $config{git_wrapper_background_command},
 		};
 	}
 
@@ -78,6 +79,13 @@ sub getsetup () {
 			safe => 0, # file
 			rebuild => 0,
 		},
+		git_wrapper_background_command => {
+			type => "string",
+			example => "git push github",
+			description => "shell command for git_wrapper to run, in the background",
+			safe => 0, # command
+			rebuild => 0,
+		},
 		git_wrappermode => {
 			type => "string",
 			example => '06755',
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 73f0896e8..bd134c9a3 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -73,17 +73,23 @@ EOF
 		# otherwise. The fd of the lock is stored in
 		# IKIWIKI_CGILOCK_FD so unlockwiki can close it.
 		$pre_exec=<<"EOF";
-	{
-		int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
-		if (fd != -1 && flock(fd, LOCK_EX) == 0) {
-			char *fd_s=malloc(8);
-			sprintf(fd_s, "%i", fd);
-			setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
-		}
+	lockfd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
+	if (lockfd != -1 && flock(lockfd, LOCK_EX) == 0) {
+		char *fd_s=malloc(8);
+		sprintf(fd_s, "%i", lockfd);
+		setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
 	}
 EOF
 	}
 
+	my $set_background_command='';
+	if (defined $config{wrapper_background_command} &&
+	    length $config{wrapper_background_command}) {
+	    	my $background_command=delete $config{wrapper_background_command};
+		$set_background_command=~s/"/\\"/g;
+		$set_background_command='#define BACKGROUND_COMMAND "'.$background_command.'"';
+	}
+
 	$Data::Dumper::Indent=0; # no newlines
 	my $configstring=Data::Dumper->Dump([\%config], ['*config']);
 	$configstring=~s/\\/\\\\/g;
@@ -114,6 +120,7 @@ void addenv(char *var, char *val) {
 }
 
 int main (int argc, char **argv) {
+	int lockfd=-1;
 	char *s;
 
 $check_commit_hook
@@ -147,9 +154,40 @@ $envsave
 	}
 
 $pre_exec
+
+$set_background_command
+#ifdef BACKGROUND_COMMAND
+	if (lockfd != -1) {
+		close(lockfd);
+	}
+
+	pid_t pid=fork();
+	if (pid == -1) {
+		perror("fork");
+		exit(1);
+	}
+	else if (pid == 0) {
+		execl("$this", "$this", NULL);
+		perror("exec $this");
+		exit(1);		
+	}
+	else {
+		waitpid(pid, NULL, 0);
+
+		if (daemon(1, 0) == 0) {
+			system(BACKGROUND_COMMAND);
+			exit(0);
+		}
+		else {
+			perror("daemon");
+			exit(1);
+		}
+	}
+#else
 	execl("$this", "$this", NULL);
 	perror("exec $this");
 	exit(1);
+#endif
 }
 EOF
 
diff --git a/debian/changelog b/debian/changelog
index 4ce720ab6..7d857d9c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
   * Use comment template on comments page of example blog.
   * comment.tmpl: Fix up display when inline uses it to display a non-comment
     page. (Such as a discussion page.)
+  * git: Added git_wrapper_background_command option. Can be used to eg, 
+    make the git wrapper push to github in the background after ikiwiki
+    runs.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
-- 
cgit v1.2.3


From c9b1a4dd7d826b5e8e2d0a757ba5ecbba8d832b2 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 2 Jul 2010 11:46:49 +0200
Subject: bugfix

---
 IkiWiki/Plugin/po.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 552b6b51b..29945da33 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -865,7 +865,7 @@ sub otherlanguages_pages ($) {
         my %ret;
 	map {
 		$ret{$_} = otherlanguage_page($page, $_)
-	} otherlanguages_codes($page);
+	} @{otherlanguages_codes($page)};
 
 	return \%ret;
 }
-- 
cgit v1.2.3


From 14fb28ab54ed7effb698874c6e5968db9d6ddda1 Mon Sep 17 00:00:00 2001
From: "http://nicolas-schodet.myopenid.com/"
 <http://nicolas-schodet.myopenid.com/@web>
Date: Fri, 2 Jul 2010 20:18:26 +0000
Subject: add own site using ikiwiki

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index e2465108a..6a323ade0 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -148,6 +148,7 @@ Personal sites and blogs
 * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
 * [Daniel Wayne Armstrong](http://circuidipity.com/)
 * [Mukund](https://www.mukund.org/)
+* [Nicolas Schodet](http://ni.fr.eu.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 92ee5386acdff8cd0180be9397e7370f4ec25088 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <joey@web>
Date: Sun, 4 Jul 2010 18:16:27 +0000
Subject: Added a comment

---
 .../comment_4_43ac867621efb68affa6ae2b92740cad._comment        | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_4_43ac867621efb68affa6ae2b92740cad._comment

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_4_43ac867621efb68affa6ae2b92740cad._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_4_43ac867621efb68affa6ae2b92740cad._comment
new file mode 100644
index 000000000..d8b516f5f
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_4_43ac867621efb68affa6ae2b92740cad._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 4"
+ date="2010-07-04T18:16:26Z"
+ content="""
+What is the muse plugin that you have enabled? I am not familiar with it.
+
+Apparently your ikiwiki is not seeing cgi parameters that should be passed to it. This appears to be some kind of web server misconfiguration, or possibly a broken ikiwiki wrapper or broken CGI.pm. 
+"""]]
-- 
cgit v1.2.3


From be49679fe9235f0fe9a28dabf3d91c9ee173106f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jun 2010 15:45:34 +0200
Subject: po: added a needstranslation() pagespec (cherry picked from commit
 b225fdc44d4b3d2853db622d59aed7b59788aeec)

---
 IkiWiki/Plugin/po.pm         | 15 +++++++++++++++
 doc/ikiwiki/pagespec/po.mdwn |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 86d5087f4..f12c69d5f 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -1220,4 +1220,19 @@ sub match_currentlang ($$;@) {
 	}
 }
 
+sub match_needstranslation ($$;@) {
+	my $page=shift;
+
+	my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
+	if ($percenttranslated eq 'N/A') {
+		return IkiWiki::FailReason->new("file is not a translation page");
+	}
+	elsif ($percenttranslated < 100) {
+		return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
+        }
+	else {
+		return IkiWiki::FailReason->new("file is fully translated");
+	}
+}
+
 1
diff --git a/doc/ikiwiki/pagespec/po.mdwn b/doc/ikiwiki/pagespec/po.mdwn
index 40ed9efb6..f8b398575 100644
--- a/doc/ikiwiki/pagespec/po.mdwn
+++ b/doc/ikiwiki/pagespec/po.mdwn
@@ -11,6 +11,8 @@ wiki:
   specified as a ISO639-1 (two-letter) language code.
 * "`currentlang()`" - tests whether a page is written in the same
   language as the current page.
+* "`needstranslation()`" - tests whether a page needs translation
+  work. Only slave pages match this PageSpec.
 
 Note that every non-po page is considered to be written in
 `po_master_language`, as specified in `ikiwiki.setup`.
-- 
cgit v1.2.3


From 8a8914151cee44592dfdc3df3bb2c45b19b8c29c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 14:22:19 -0400
Subject: review of needstranslation() pagespec

Minor wording fix; changelog; etc.
---
 IkiWiki/Plugin/po.pm                       | 2 +-
 debian/changelog                           | 1 +
 doc/todo/po_needstranslation_pagespec.mdwn | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index f12c69d5f..0b2251668 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -1225,7 +1225,7 @@ sub match_needstranslation ($$;@) {
 
 	my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
 	if ($percenttranslated eq 'N/A') {
-		return IkiWiki::FailReason->new("file is not a translation page");
+		return IkiWiki::FailReason->new("file is not a translatable page");
 	}
 	elsif ($percenttranslated < 100) {
 		return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
diff --git a/debian/changelog b/debian/changelog
index 7d857d9c0..bdcf52884 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
   * git: Added git_wrapper_background_command option. Can be used to eg, 
     make the git wrapper push to github in the background after ikiwiki
     runs.
+  * po: Added needstranslation() pagespec. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/todo/po_needstranslation_pagespec.mdwn b/doc/todo/po_needstranslation_pagespec.mdwn
index acc5641a4..77449dc2b 100644
--- a/doc/todo/po_needstranslation_pagespec.mdwn
+++ b/doc/todo/po_needstranslation_pagespec.mdwn
@@ -2,4 +2,8 @@ Commit b225fdc44d4b3d in my po branch adds a `needstranslation()`
 PageSpec. It makes it easy to list pages that need translation work.
 Please review. --[[intrigeri]]
 
-[[!tag patch]]
+> Looks good, cherry-picked. The only improvment I can 
+> think of is that `needstranslation(50)` could match
+> only pages less than 50% translated. --[[Joey]] 
+
+[[!tag patch done]]
-- 
cgit v1.2.3


From 1b14a849fff50888e6a48d7299c23c7d5821572a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 14:27:57 -0400
Subject: example

---
 doc/plugins/po.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index dd85edf3d..2e16cc7c4 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -296,6 +296,12 @@ underlay, and the underlays lack translation to a given language.
 > Any simple testcase to reproduce it, please? I've never seen this
 > happen yet. --[[intrigeri]]
 
+>> Sure, go here <http://l10n.ikiwiki.info/smiley/smileys/index.sv.html>
+>> (Currently 0% translateed) and see the 'WikiLink' link at the bottom,
+>> which goes to <http://l10n.ikiwiki.info/ikiwiki.cgi?page=ikiwiki/wikilink&from=smiley/smileys&do=create>
+>> Compare with eg, the 100% translated Dansk version, where
+>> the WikiLink link links to the English WikiLink page. --[[Joey]] 
+
 Double commits of po files
 --------------------------
 
-- 
cgit v1.2.3


From 192ce7a238af9021b0fd6dd571f22409af81ebaf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 15:00:51 -0400
Subject: remove unnecessary and troublesome filter calls

This better defines what the filter hook is passed, to only be the raw,
complete text of a page. Not some snippet, or data read in from an
unrelated template.

Several plugins that filtered text that originates from an (already
filtered) page were modified not to do that. Note that this was not
done very consistently before; other plugins that receive text from a
page called preprocess on it w/o first calling filter.

The template plugin gets text from elsewhere, and was also changed not to
filter it. That leads to one known regression -- the embed plugin cannot
be used to embed stuff in templates now. But that plugin is deprecated
anyway.

Later we may want to increase the coverage of what is filtered. Perhaps
a good goal would be to allow writing a filter plugin that filters
out unwanted words, from any input. We're not there yet; not only
does the template plugin load unfiltered text from its templates now,
but so can the table plugin, and other plugins that use templates (like
inline!). I think we can cross that bridge when we come to it. If I wanted
such a censoring plugin, I'd probably make it use a sanitize hook instead,
for the better coverage.

For now I am concentrating on the needs of the two non-deprecated users
of filter. This should fix bugs/po_vs_templates, and it probably fixes
an obscure bug around txt's use of filter for robots.txt.
---
 IkiWiki/Plugin/color.pm       | 11 +++++------
 IkiWiki/Plugin/comments.pm    |  2 --
 IkiWiki/Plugin/conditional.pm |  3 +--
 IkiWiki/Plugin/cutpaste.pm    |  8 ++++----
 IkiWiki/Plugin/more.pm        |  6 +++---
 IkiWiki/Plugin/sidebar.pm     |  3 +--
 IkiWiki/Plugin/template.pm    |  6 ++----
 IkiWiki/Plugin/toggle.pm      |  3 +--
 doc/plugins/write.mdwn        |  4 ++--
 9 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index d550dd9f4..9bb2359ce 100644
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -61,12 +61,11 @@ sub replace_preserved_style ($) {
 sub preprocess (@) {
 	my %params = @_;
 
-	# Preprocess the text to expand any preprocessor directives
-	# embedded inside it.
-	$params{text} = IkiWiki::preprocess($params{page}, $params{destpage},
-				IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
-
-	return preserve_style($params{foreground}, $params{background}, $params{text});
+	return preserve_style($params{foreground}, $params{background},
+		# Preprocess the text to expand any preprocessor directives
+		# embedded inside it.
+		IkiWiki::preprocess($params{page}, $params{destpage},
+			$params{text}));
 }
 
 sub format (@) {
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d34951570..64eb7fb09 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -142,8 +142,6 @@ sub preprocess {
 	}
 	$content =~ s/\\"/"/g;
 
-	$content = IkiWiki::filter($page, $params{destpage}, $content);
-
 	if ($config{comments_allowdirectives}) {
 		$content = IkiWiki::preprocess($page, $params{destpage},
 			$content);
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 8a5796149..026078b3c 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -59,8 +59,7 @@ sub preprocess_if (@) {
 	else {
 		$ret="";
 	}
-	return IkiWiki::preprocess($params{page}, $params{destpage}, 
-		IkiWiki::filter($params{page}, $params{destpage}, $ret));
+	return IkiWiki::preprocess($params{page}, $params{destpage}, $ret);
 }
 
 package IkiWiki::PageSpec;
diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index 01e9ce043..4a8817168 100644
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -50,8 +50,8 @@ sub preprocess_copy (@) {
 	$savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
 	$savedtext{$params{page}}->{$params{id}} = $params{text};
 
-	return IkiWiki::preprocess($params{page}, $params{destpage}, 
-		IkiWiki::filter($params{page}, $params{destpage}, $params{text})) if defined wantarray;
+	return IkiWiki::preprocess($params{page}, $params{destpage}, $params{text})
+		if defined wantarray;
 }
 
 sub preprocess_paste (@) {
@@ -70,8 +70,8 @@ sub preprocess_paste (@) {
 		error sprintf(gettext('no text was copied in this page with id %s'), $params{id});
 	}
 
-	return IkiWiki::preprocess($params{page}, $params{destpage}, 
-		IkiWiki::filter($params{page}, $params{destpage}, $savedtext{$params{page}}->{$params{id}}));
+	return IkiWiki::preprocess($params{page}, $params{destpage},
+		$savedtext{$params{page}}->{$params{id}});
 }
 
 1;
diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
index 266c8e1d0..80e339a1b 100644
--- a/IkiWiki/Plugin/more.pm
+++ b/IkiWiki/Plugin/more.pm
@@ -33,9 +33,9 @@ sub preprocess (@) {
 				anchor => "more");
 	}
 	else {
-		$params{text}=IkiWiki::preprocess($params{page}, $params{destpage},
-			IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
-		return "<a name=\"more\"></a>\n\n".$params{text};
+		return "<a name=\"more\"></a>\n\n".
+			IkiWiki::preprocess($params{page}, $params{destpage},
+				$params{text});
 	}
 }
 
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 2d495db2c..c1146b7b4 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -47,8 +47,7 @@ sub preprocess (@) {
 		$pagesidebar{$page}=
 			IkiWiki::htmlize($page, $page, $type,
 			IkiWiki::linkify($page, $page,
-			IkiWiki::preprocess($page, $page,
-			IkiWiki::filter($page, $page, $params{content}))));
+			IkiWiki::preprocess($page, $page, $params{content})));
 	}
 
 	return "";
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index b8c2f05b2..db26bfe31 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -53,8 +53,7 @@ sub preprocess (@) {
 
 	foreach my $param (keys %params) {
 		my $value=IkiWiki::preprocess($params{page}, $params{destpage},
-		          IkiWiki::filter($params{page}, $params{destpage},
-		          $params{$param}), $scan);
+		          $params{$param}, $scan);
 		if ($template->query(name => $param)) {
 			my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage},
 					pagetype($pagesources{$params{page}}),
@@ -69,8 +68,7 @@ sub preprocess (@) {
 	}
 
 	return IkiWiki::preprocess($params{page}, $params{destpage},
-	       IkiWiki::filter($params{page}, $params{destpage},
-	       $template->output), $scan);
+	       $template->output, $scan);
 }
 
 1
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 3319421d9..20967d3fd 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -50,8 +50,7 @@ sub preprocess_toggleable (@) {
 
 	# Preprocess the text to expand any preprocessor directives
 	# embedded inside it.
-	$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
-		IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
+	$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
 	
 	my $id=genid($params{page}, $params{id});
 	my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open";
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index bb8012342..2e3902388 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -198,8 +198,8 @@ value is ignored.
 
 	hook(type => "filter", id => "foo", call => \&filter);
 
-Runs on the raw source of a page, before anything else touches it, and can
-make arbitrary changes. The function is passed named parameters "page",
+Runs on the full raw source of a page, before anything else touches it, and
+can make arbitrary changes. The function is passed named parameters "page",
 "destpage", and "content". It should return the filtered content.
 
 ### preprocess
-- 
cgit v1.2.3


From 6160238439c5df335944add13b00a0a80d1b663b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 15:15:34 -0400
Subject: comments; my filter-full branch should fix this

---
 doc/bugs/po_vs_templates.mdwn | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index ce0ac3577..7bc56676e 100644
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -18,6 +18,26 @@ This has been fixed in my po branch.
 
 -- [[intrigeri]]
 
-
+>> Hmm. Don't like adding a fourth positional parameter to that (or
+>> any really) function.
+>>
+>> I think it's quite possible that some of the directives that are
+>> calling filter do so unnecessarily. For example, conditional,
+>> cutpaste, more, and toggle each re-filter text that comes from the
+>> page and so has already been filtered. They could probably drop
+>> the filtering. template likewise does not need to filter the 
+>> parameters passed into it. Does it need to filter the template output?
+>> Well, it allows the (deprecated) embed plugin to work on template
+>> content, but that's about it.
+>>
+>> Note also that the only other plugin to provide a filter, txt,
+>> could also run into similar problems as po has, in theory (it looks at
+>> the page parameter and assumes the content is for the whole page).
+>>
+>> [[!template id=gitbranch branch=origin/filter-full author="[[joey]]"]]
+>> So, I've made a filter-full branch, where I attempt to fix this
+>> by avoiding unnecessary filtering. Can you check it and merge it into
+>> your po branch and remove your other workarounds so I can merge?
+>> --[[Joey]]
 
 [[!tag patch]]
-- 
cgit v1.2.3


From beabd511e2477b90c409ce63c3b8decb5769ef03 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 15:23:59 -0400
Subject: comment

---
 doc/todo/Fix_selflink_in_po_plugin.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index b83d2814a..791c6c055 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -8,3 +8,9 @@ Fixed in my po branch. --[[intrigeri]]
 [[!tag patch]]
 
 > bump?
+
+>> I know I've looked at 88c6e2891593fd508701d728602515e47284180c 
+>> before, and something about it just seemed wrong. Maybe it's
+>> the triviality of the sub, which it would seem to be easy to 
+>> decide to refactor back into its one caller (which would reintroduce the
+>> bug). --[[Joey]] 
-- 
cgit v1.2.3


From a6e629e5cf612e3c32c61c3fc0a9d859c1a7a5d9 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 01:16:56 +0200
Subject: po: s/utf-8/UTF-8, to solve part of the double commit bug. (cherry
 picked from commit 4f44534d72c9a9a947bc38a3cb4987705c25bea5)

---
 IkiWiki/Plugin/po.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 0b2251668..e85c9d760 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -851,15 +851,15 @@ sub refreshpot ($) {
 	my %options = ("markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0);
 	my $doc=Locale::Po4a::Chooser::new('text',%options);
 	$doc->{TT}{utf_mode} = 1;
-	$doc->{TT}{file_in_charset} = 'utf-8';
-	$doc->{TT}{file_out_charset} = 'utf-8';
+	$doc->{TT}{file_in_charset} = 'UTF-8';
+	$doc->{TT}{file_out_charset} = 'UTF-8';
 	$doc->read($masterfile);
 	# let's cheat a bit to force porefs option to be passed to
 	# Locale::Po4a::Po; this is undocument use of internal
 	# Locale::Po4a::TransTractor's data, compulsory since this module
 	# prevents us from using the porefs option.
 	$doc->{TT}{po_out}=Locale::Po4a::Po->new({ 'porefs' => 'none' });
-	$doc->{TT}{po_out}->set_charset('utf-8');
+	$doc->{TT}{po_out}->set_charset('UTF-8');
 	# do the actual work
 	$doc->parse;
 	IkiWiki::prep_writefile(basename($potfile),dirname($potfile));
@@ -947,8 +947,8 @@ sub percenttranslated ($) {
 	$doc->process(
 		'po_in_name'	=> [ $file ],
 		'file_in_name'	=> [ $masterfile ],
-		'file_in_charset'  => 'utf-8',
-		'file_out_charset' => 'utf-8',
+		'file_in_charset'  => 'UTF-8',
+		'file_out_charset' => 'UTF-8',
 	) or error("po(percenttranslated) ".
 		   sprintf(gettext("failed to translate %s"), $page));
 	my ($percent,$hit,$queries) = $doc->stats();
@@ -1101,8 +1101,8 @@ sub po_to_markup ($$) {
 	$doc->process(
 		'po_in_name'	=> [ $infile ],
 		'file_in_name'	=> [ $masterfile ],
-		'file_in_charset'  => 'utf-8',
-		'file_out_charset' => 'utf-8',
+		'file_in_charset'  => 'UTF-8',
+		'file_out_charset' => 'UTF-8',
 	) or return $fail->(gettext("failed to translate"));
 	$doc->write($outfile)
 		or return $fail->(sprintf(gettext("failed to write %s"), $outfile));
-- 
cgit v1.2.3


From 8fe277c2ab42393b754fc65d966bf4ec242719ab Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 00:59:20 +0200
Subject: typo fix. (cherry picked from commit
 924f559e5049a63488a5f2baca610299a7e02957)

---
 doc/plugins/po.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 2e16cc7c4..646d0cef3 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -130,7 +130,7 @@ lighttpd
 --------
 
 Recent versions of lighttpd should be able to use
-`$HTTP["language"]` to configure the translatted pages to be served.
+`$HTTP["language"]` to configure the translated pages to be served.
 
 See [Lighttpd Issue](http://redmine.lighttpd.net/issues/show/1119)
 
-- 
cgit v1.2.3


From cd03bd0b804cf4919a5d195c53bcea1f9730a51f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Jun 2010 23:18:34 +0200
Subject: po: added support for html pagetype

... after having audited the po4a Xml and Xhtml modules for security issues.

Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit a128c256a51392fcf752bf612d83a90e8c68027e)
---
 IkiWiki/Plugin/po.pm           | 47 +++++++++++++++++++++++++++++++++---------
 doc/plugins/po.mdwn            | 10 ++++-----
 doc/plugins/po/discussion.mdwn | 17 +++++++++++++++
 3 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index e85c9d760..4e6eff94f 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -848,8 +848,8 @@ sub refreshpot ($) {
 	my $masterfile=shift;
 
 	my $potfile=potfile($masterfile);
-	my %options = ("markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0);
-	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
+					   po4a_options($masterfile));
 	$doc->{TT}{utf_mode} = 1;
 	$doc->{TT}{file_in_charset} = 'UTF-8';
 	$doc->{TT}{file_out_charset} = 'UTF-8';
@@ -940,10 +940,8 @@ sub percenttranslated ($) {
 	return gettext("N/A") unless istranslation($page);
 	my $file=srcfile($pagesources{$page});
 	my $masterfile = srcfile($pagesources{masterpage($page)});
-	my %options = (
-		"markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
-	);
-	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
+					   po4a_options($masterfile));
 	$doc->process(
 		'po_in_name'	=> [ $file ],
 		'file_in_name'	=> [ $masterfile ],
@@ -1094,10 +1092,8 @@ sub po_to_markup ($$) {
 		or return $fail->(sprintf(gettext("failed to write %s"), $infile));
 
 	my $masterfile = srcfile($pagesources{masterpage($page)});
-	my %options = (
-		"markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
-	);
-	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
+					   po4a_options($masterfile));
 	$doc->process(
 		'po_in_name'	=> [ $infile ],
 		'file_in_name'	=> [ $masterfile ],
@@ -1160,6 +1156,37 @@ sub isvalidpo ($) {
 					"to previous page to continue edit"));
 }
 
+sub po4a_type ($) {
+	my $file = shift;
+
+	my $pagetype = pagetype($file);
+	if ($pagetype eq 'html') {
+		return 'xhtml';
+        }
+	return 'text';
+}
+
+sub po4a_options($) {
+	my $file = shift;
+
+	my %options;
+	my $pagetype = pagetype($file);
+
+	if ($pagetype eq 'html') {
+		# how to disable options is not consistent across po4a modules
+		$options{includessi} = '';
+		$options{includeexternal} = 0;
+        }
+	elsif ($pagetype eq 'mdwn') {
+		$options{markdown} = 1;
+        }
+        else {
+		$options{markdown} = 0;
+        }
+
+	return %options;
+}
+
 # ,----
 # | PageSpecs
 # `----
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 646d0cef3..fab6053b3 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -213,16 +213,16 @@ preferred `$EDITOR`, without needing to be online.
 Markup languages support
 ------------------------
 
-[[Markdown|mdwn]] is well supported. Some other markup languages supported
-by ikiwiki mostly work, but some pieces of syntax are not rendered
-correctly on the slave pages:
+[[Markdown|mdwn]] and [[html]] are well supported. Some other markup
+languages supported by ikiwiki mostly work, but some pieces of syntax
+are not rendered correctly on the slave pages:
 
 * [[reStructuredText|rst]]: anonymous hyperlinks and internal
   cross-references
 * [[wikitext]]: conversion of newlines to paragraphs
 * [[creole]]: verbatim text is wrapped, tables are broken
-* [[html]] and LaTeX: not supported yet; the dedicated po4a modules
-  could be used to support them, but they would need a security audit
+* LaTeX: not supported yet; the dedicated po4a module
+  could be used to support it, but it would need a security audit
 * other markup languages have not been tested.
 
 Security
diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index 27683f1ea..73858c818 100644
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -150,6 +150,23 @@ The following analysis was done with his help.
   variables; according to [[Joey]], this is "Freaky code, but seems ok
   due to use of `quotementa`".
 
+##### Locale::Po4a::Xhtml
+
+* does not run any external program
+* does not build regexp's from untrusted variables
+
+=> Seems safe as far as the `includessi` option is disabled; the po
+plugin explicitly disables it.
+
+Relies on Locale::Po4a::Xml` to do most of the work.
+
+##### Locale::Po4a::Xml
+
+* does not run any external program
+* the `includeexternal` option makes it able to read external files;
+  the po plugin explicitly disables it
+* untrusted variables are escaped when used to build regexp's
+
 ##### Text::WrapI18N
 
 `Text::WrapI18N` can cause DoS
-- 
cgit v1.2.3


From 35fd6f81f110a187135fd2bafe1341666ff5d5ac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 15:27:37 -0400
Subject: changelog

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index bdcf52884..1450e502e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
     make the git wrapper push to github in the background after ikiwiki
     runs.
   * po: Added needstranslation() pagespec. (intrigeri)
+  * po: Added support for .html source pages. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
-- 
cgit v1.2.3


From 472d3fba7db7184fee3c4122d8f628cd6436c6bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 16:08:54 -0400
Subject: comment

---
 doc/plugins/po.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index fab6053b3..fe4d75748 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -266,6 +266,14 @@ to an array to support this. (If twere done, twere best done quickly.)
 > Done in my po branch, preserving backward compatibility. Please
 > review :) --[[intrigeri]]
 
+>> Right, well my immediate concern is that using an array to hold
+>> hash-like pairs is not very clear to the user. It will be displayed
+>> in a confusing way by websetup; dumping a setup file will probably
+>> also cause it to be formatted in a confusing way. And the code
+>> seems to assume that the array length is even, and probably blows
+>> up if it is not.. and the value is marked safe so websetup can be
+>> used to modify it and break that way too. --[[Joey]] 
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From acde95751260e305da3d8d84b6b09dcd3b2d03b6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 16:12:50 -0400
Subject: further sanitize nickname characters

---
 IkiWiki/Plugin/openid.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index d393afd23..4727577f3 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -212,6 +212,7 @@ sub auth ($$) {
 			}
 			if (defined $nickname) {
 				$nickname=~s/\s+/_/g;
+				$nickname=~s/[^-_0-9[:alnum:]]+//g;
 				$session->param(nickname => $nickname);
 			}
 		}
-- 
cgit v1.2.3


From e72ef3b070b18f4cb0a667be915266b27d7d3071 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 16:19:22 -0400
Subject: comment: Fix problem moderating comments of certian pages with utf-8
 in their name.

---
 IkiWiki/Plugin/comments.pm | 1 +
 debian/changelog           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d34951570..30ade5634 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -569,6 +569,7 @@ sub commentmoderation ($$) {
 		my $added=0;
 		foreach my $id (keys %vars) {
 			if ($id =~ /(.*)\._comment(?:_pending)?$/) {
+				$id=decode_utf8($id);
 				my $action=$cgi->param($id);
 				next if $action eq 'Defer' && ! $rejectalldefer;
 
diff --git a/debian/changelog b/debian/changelog
index 1450e502e..baf7a6a35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
     runs.
   * po: Added needstranslation() pagespec. (intrigeri)
   * po: Added support for .html source pages. (intrigeri)
+  * comment: Fix problem moderating comments of certian pages with utf-8
+    in their name.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
-- 
cgit v1.2.3


From 7fdf1f1d007b5ef9a16f5c6d41200cadb25c1975 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 16:44:38 -0400
Subject: move nickname sanitization out

Probably best to store it unsanitized and sanitize as needed on use.
And it already was for comments, leaving only the need to sanitize the
nickname when git committing, to ensure the email address is legal.
---
 IkiWiki/Plugin/git.pm    | 2 ++
 IkiWiki/Plugin/openid.pm | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 0f92476c9..cb3437e18 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -517,6 +517,8 @@ sub rcs_commit_staged (@) {
 		}
 		if (defined $params{session}->param("nickname")) {
 			$u=encode_utf8($params{session}->param("nickname"));
+			$u=~s/\s+/_/g;
+			$u=~s/[^-_0-9[:alnum:]]+//g;
 		}
 		if (defined $u) {
 			$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 4727577f3..b1a9a7a15 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -211,8 +211,6 @@ sub auth ($$) {
 				}
 			}
 			if (defined $nickname) {
-				$nickname=~s/\s+/_/g;
-				$nickname=~s/[^-_0-9[:alnum:]]+//g;
 				$session->param(nickname => $nickname);
 			}
 		}
-- 
cgit v1.2.3


From 40c697e12de44aa9a6296d31f6706b79df306c59 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 17:11:16 -0400
Subject: releasing version 3.20100704

---
 debian/changelog |  4 ++--
 ikiwiki.spec     |  2 +-
 po/ikiwiki.pot   | 60 ++++++++++++++++++++++++++++----------------------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index baf7a6a35..9f1a33f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100624) UNRELEASED; urgency=low
+ikiwiki (3.20100704) unstable; urgency=low
 
   * Changes to avoid display of ugly google openids, by displaying
     a username taken from openid.
@@ -25,7 +25,7 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
   * comment: Fix problem moderating comments of certian pages with utf-8
     in their name.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 04 Jul 2010 16:19:43 -0400
 
 ikiwiki (3.20100623) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 9644fd396..7c2c94376 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100624
+Version: 3.20100704
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index e50fa0f68..bb0d6e526 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-23 17:10-0400\n"
+"POT-Creation-Date: 2010-07-04 16:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1317
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1324
 msgid "Error"
 msgstr ""
 
@@ -231,36 +231,36 @@ msgstr ""
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:491
+#: ../IkiWiki/Plugin/comments.pm:495
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:493
+#: ../IkiWiki/Plugin/comments.pm:497
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:506
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:510
+#: ../IkiWiki/Plugin/comments.pm:514
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:554 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:558 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:605
+#: ../IkiWiki/Plugin/comments.pm:610
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:645
+#: ../IkiWiki/Plugin/comments.pm:650
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:802
+#: ../IkiWiki/Plugin/comments.pm:807
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -270,7 +270,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:812
+#: ../IkiWiki/Plugin/comments.pm:817
 msgid "Comment"
 msgstr ""
 
@@ -356,18 +356,18 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:724 ../IkiWiki/Plugin/git.pm:742
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:764
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:768
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -655,26 +655,26 @@ msgstr ""
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1037
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1104
+#: ../IkiWiki/Plugin/po.pm:1143
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1102
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1155
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1128,13 +1128,13 @@ msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -1171,39 +1171,39 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:607
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1299
+#: ../IkiWiki.pm:1306
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1994
+#: ../IkiWiki.pm:2001
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2071
+#: ../IkiWiki.pm:2078
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2092
+#: ../IkiWiki.pm:2099
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2228
+#: ../IkiWiki.pm:2235
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
-- 
cgit v1.2.3


From 527c169ab2a6617138da2c4b817e452db65f80bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 17:11:30 -0400
Subject: add news item for ikiwiki 3.20100704

---
 doc/news/version_3.20100515.mdwn | 58 ----------------------------------------
 doc/news/version_3.20100704.mdwn | 26 ++++++++++++++++++
 2 files changed, 26 insertions(+), 58 deletions(-)
 delete mode 100644 doc/news/version_3.20100515.mdwn
 create mode 100644 doc/news/version_3.20100704.mdwn

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
deleted file mode 100644
index 043346c88..000000000
--- a/doc/news/version_3.20100515.mdwn
+++ /dev/null
@@ -1,58 +0,0 @@
-News for ikiwiki 3.20100515:
-
-   There are two significant changes to the page.tmpl template in this version.
-   If you have a locally modified version of that template, you will need to
-   update it at least to contain the following in the HTML `<head>`:
-
-	<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>
-
-   Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>`
-
-   There is a new "comment()" pagespec, that can be used to match a
-   comment on a page. It is recommended to use it instead of the old
-   method of using a pagespec such as "internal(comment\_*)" to match
-   things that looked like comments. The old pagespec will now also match
-   comments that are held for moderation; likely not what you want.
-
-   There have also been some changes to the style.css in this version,
-   particularly to support the new openid selector. If you have a modified
-   version, of style.css, updating it (or moving it to local.css) is
-   recommended.
-
-ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
-     a single template, page.tmpl.
-   * If you have a locally customised page.tmpl, it needs to be updated
-     to set &lt;base&gt; when BASEURL or FORCEBASEURL is set.
-   * comments: Comments pending moderation are now stored in the srcdir
-     alongside accepted comments, but with a `._comment_pending` extension.
-     This allows easier byhand moderation, as the "\_pending" need
-     only be stripped off and the comment be committed to version control.
-   * The `comment_pending()` pagespec can be used to match such unmoderated
-     comments, which makes it easy to add a feed of them, or a counter
-     indicating how many there are.
-   * Belatedly added a `comment()` pagespec.
-   * Gave comment and page editing forms some CSS and accessability love.
-   * Renamed postscan hook to indexhtml, to reflect its changed position,
-     and typical use.
-   * inline: Call indexhtml when inlining internal pages, so their
-     text can be indexed for searching.
-   * Delete hooks are passed deleted internal pages.
-   * openid: Incorporated a fancy openid-selector signin form.
-     (Based on <http://code.google.com/p/openid-selector/>)
-   * openid: Use "openid\_identifier" as the form field, as required
-     by OpenID Authentication v2.0 spec.
-   * Removed the openidsignup option. Instead, my recommendation is to
-     leave passwordauth enabled and let people who don't have an openid use it.
-     The openid selector form avoids the UI annoyance of having both openid
-     and passwordauth on one form.
-   * calendar: Allow negative month to be specified. -1 is last month, etc.
-     (And also negative years.)
-   * calendar: Display year in title of month calendar.
-   * Use xhtml friendly pubdate setting.
-   * remove, rename: Add guards against XSRF attacks."""]]
diff --git a/doc/news/version_3.20100704.mdwn b/doc/news/version_3.20100704.mdwn
new file mode 100644
index 000000000..9d2792ce6
--- /dev/null
+++ b/doc/news/version_3.20100704.mdwn
@@ -0,0 +1,26 @@
+ikiwiki 3.20100704 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Changes to avoid display of ugly google openids, by displaying
+     a username taken from openid.
+   * API: Add new optional field nickname to rcs\_recentchanges.
+   * API: rcs\_commit and rcs\_commit\_staged are now passed named
+     parameters.
+   * openid: Store nickname based on username or email provided from
+     openid provider.
+   * git: Record the nickname from openid in the git author email.
+   * comment: Record the username from openid in the comment page.
+   * Fixed some confusion and bugginess about whether
+     rcs\_getctime/rcs\_getmtime were passed absolute or relative filenames.
+     (Make it relative like everything else.)
+   * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
+     and prevented actually rendering hnb files.
+   * Use comment template on comments page of example blog.
+   * comment.tmpl: Fix up display when inline uses it to display a non-comment
+     page. (Such as a discussion page.)
+   * git: Added git\_wrapper\_background\_command option. Can be used to eg,
+     make the git wrapper push to github in the background after ikiwiki
+     runs.
+   * po: Added needstranslation() pagespec. (intrigeri)
+   * po: Added support for .html source pages. (intrigeri)
+   * comment: Fix problem moderating comments of certian pages with utf-8
+     in their name."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From bb216ff0ad183981b5f9be74ccaaf9ef72617922 Mon Sep 17 00:00:00 2001
From: "http://danieroux.com/" <danieroux@web>
Date: Mon, 5 Jul 2010 08:23:20 +0000
Subject:

---
 doc/sandbox.mdwn | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..59b1d7fd9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,15 +1,5 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
-
-# Header
-
-## Subheader2
-
 > This is a blockquote.
 >
 > This is the first level of quoting.
-- 
cgit v1.2.3


From ca818980147c875a29031e33495995856f06cc3d Mon Sep 17 00:00:00 2001
From: "http://danieroux.com/" <danieroux@web>
Date: Mon, 5 Jul 2010 08:23:48 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 59b1d7fd9..f386adec4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -19,6 +19,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list
 
-- 
cgit v1.2.3


From a3f7333496cbec14d4c6c0b6347c77e2390fe09e Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <ptecza@web>
Date: Mon, 5 Jul 2010 10:36:39 +0000
Subject: recentchanges dir should be under control of RCS?

---
 ...s_dir_should_be_under_control_of_RCS__63__.mdwn | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
new file mode 100644
index 000000000..e8b5d9290
--- /dev/null
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -0,0 +1,32 @@
+Hello Joey,
+
+I noticed that my Ikiwiki started to rebuild pages very slowly after my last changes
+when I upgraded Ikiwiki to version 3.20100623. Now I have the latest release 3.20100704,
+but it doesn't help me.
+
+I started to debug the problem and I found that I can see a lot of messages
+like below when I try to rebuild my wiki manually:
+
+    svn: '/path/to/ikiwiki/trunk/pages/ostatnie_zmiany' is not a working copy
+    svn: Can't open file '/path/to/ikiwiki/trunk/pages/ostatnie_zmiany/.svn/entries': No such file or directory
+    svn log exited 256
+
+"ostatnie_zmiany" is a value of `recentchangespage` parameter in my
+`ikiwiki.setup` file. It is not under control Subversion I use for Ikiwiki:
+
+    $ svn status pages/ostatnie_zmiany
+    ?      pages/ostatnie_zmiany
+
+    $ ls pages/ostatnie_zmiany/*._change |wc -l
+    100
+
+`recentchangesnum` parameter has value 100 for me and I noticed that my Ikiwiki
+takes a lot of time to parse all `._change` files.
+
+Do you think I should add `ostatnie_zmiany` directory under control of my
+Subversion repo? If it's not necessary, could you please give me any hint
+to find a reason of problem with my Ikiwiki?
+
+My best regards,
+Pawel
+
-- 
cgit v1.2.3


From cddb39cbf5d385273645f62f15bdf29b7607aac2 Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <ptecza@web>
Date: Mon, 5 Jul 2010 10:44:29 +0000
Subject: Forgotten notice about /ostatnie_zmiany.html page

---
 doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index e8b5d9290..69af04fe9 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -21,7 +21,8 @@ like below when I try to rebuild my wiki manually:
     100
 
 `recentchangesnum` parameter has value 100 for me and I noticed that my Ikiwiki
-takes a lot of time to parse all `._change` files.
+takes a lot of time to parse all `._change` files. Finally it doesn't refresh
+/ostatnie_zmiany.html page.
 
 Do you think I should add `ostatnie_zmiany` directory under control of my
 Subversion repo? If it's not necessary, could you please give me any hint
-- 
cgit v1.2.3


From f6db10df21f04df83e109924647b07672050dbf3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Jul 2010 14:04:49 -0400
Subject: img: Add a margin around images displayed by this directive.

Particularly important for floating images, which could before be placed
uncomfortably close to text.
---
 IkiWiki/Plugin/img.pm | 7 +++++++
 debian/changelog      | 6 ++++++
 doc/style.css         | 4 ++++
 3 files changed, 17 insertions(+)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index eb1b68124..2375ead89 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -156,6 +156,13 @@ sub preprocess (@) {
 		$imgurl="$config{url}/$imglink";
 	}
 
+	if (exists $params{class}) {
+		$params{class}.=" img";
+	}
+	else {
+		$params{class}="img";
+	}
+
 	my $attrs='';
 	foreach my $attr (qw{alt title class id hspace vspace}) {
 		if (exists $params{$attr}) {
diff --git a/debian/changelog b/debian/changelog
index 9f1a33f2f..d426be019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100705) UNRELEASED; urgency=low
+
+  * img: Add a margin around images displayed by this directive.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
+
 ikiwiki (3.20100704) unstable; urgency=low
 
   * Changes to avoid display of ugly google openids, by displaying
diff --git a/doc/style.css b/doc/style.css
index bf000dae1..8dd3b1c15 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -91,6 +91,10 @@ nav {
 	text-align: center;
 }
 
+img.img {
+	margin: 0.5ex;
+}
+
 .align-left {
 	float:left;
 }
-- 
cgit v1.2.3


From d89e2be91d79fca0a062744ff1dee630962cba7d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Jul 2010 14:16:36 -0400
Subject: response

---
 ...changes_dir_should_be_under_control_of_RCS__63__.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index 69af04fe9..bef79335f 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -31,3 +31,19 @@ to find a reason of problem with my Ikiwiki?
 My best regards,
 Pawel
 
+> No, the recentchanges pages are automatically generated and should not
+> themselves be in revision control.
+> 
+> Ikiwiki has recently started automatically enabing `--gettime`, but
+> it should not do it every time, but only on the initial build
+> of a wiki. It will print "querying svn for file creation and modification
+> times.." when it does this. If it's doing it every time, something
+> is wrong. (Specifically, `.ikiwiki/indexdb` must be missing somehow.)
+> 
+> The support for svn with --gettime is rather poor. (While with git it is
+> quite fast.) But as it's only supposed to happen on the first build,
+> I haven't tried to speed it up. It would be hard to do it fast with svn.
+> It would be possible to avoid the warning message above, or even skip
+> processing files in directories not checked into svn -- but I'd much
+> rather understand why you are seeing this happen on repeated builds.
+> --[[Joey]]
-- 
cgit v1.2.3


From 7e3fb8b8a230a725df7814c15745c6fee9ddd5b1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Jul 2010 20:19:31 -0400
Subject: comments: Added commentmoderation directive for easy linking to the
 comment moderation queue.

---
 IkiWiki/Plugin/comments.pm                   | 17 +++++++++++++++++
 debian/changelog                             |  2 ++
 doc/examples/blog/comments.mdwn              |  2 +-
 doc/ikiwiki/directive/commentmoderation.mdwn |  9 +++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 doc/ikiwiki/directive/commentmoderation.mdwn

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 30ade5634..f0eec9ace 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -22,6 +22,7 @@ sub import {
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
 	hook(type => "preprocess", id => 'comment', call => \&preprocess);
+	hook(type => "preprocess", id => 'commentmoderation', call => \&preprocess_moderation);
 	# here for backwards compatability with old comments
 	hook(type => "preprocess", id => '_comment', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
@@ -251,6 +252,22 @@ sub preprocess {
 	return $content;
 }
 
+sub preprocess_moderation {
+	my %params = @_;
+
+	$params{desc}=gettext("Comment Moderation")
+		unless defined $params{desc};
+
+	if (length $config{cgiurl}) {
+		return '<a href="'.
+			IkiWiki::cgiurl(do => 'commentmoderation').
+			'">'.$params{desc}.'</a>';
+	}
+	else {
+		return $params{desc};
+	}
+}
+
 sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
diff --git a/debian/changelog b/debian/changelog
index d426be019..18db7c0c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100705) UNRELEASED; urgency=low
 
   * img: Add a margin around images displayed by this directive.
+  * comments: Added commentmoderation directive for easy linking to the
+    comment moderation queue.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 52c7d3132..e22b50a34 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,7 +1,7 @@
 [[!sidebar content="""
 [[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation
 description="comments pending moderation" show=-1]]
-Comments in the moderation queue:
+Comments in the [[!commentmoderation desc="moderation queue"]]:
 [[!pagecount pages="comment_pending(./posts/*)"]]
 """]]
 
diff --git a/doc/ikiwiki/directive/commentmoderation.mdwn b/doc/ikiwiki/directive/commentmoderation.mdwn
new file mode 100644
index 000000000..8553b5b17
--- /dev/null
+++ b/doc/ikiwiki/directive/commentmoderation.mdwn
@@ -0,0 +1,9 @@
+The `commentmoderation` directive is supplied by the
+[[!iki plugins/comments desc=comments]] plugin, and is used to link
+to the comment moderation queue.
+
+Example:
+
+	\[[!commentmoderation desc="here is the comment moderation queue"]]
+
+[[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From b5085a01ce325e5ae55080cca4860cdcc1885165 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 5 Jul 2010 23:34:47 -0500
Subject: new forum post - ikiwiki vim syntax

---
 doc/forum/ikiwiki_vim_syntaxfile.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 doc/forum/ikiwiki_vim_syntaxfile.mdwn

diff --git a/doc/forum/ikiwiki_vim_syntaxfile.mdwn b/doc/forum/ikiwiki_vim_syntaxfile.mdwn
new file mode 100644
index 000000000..d0f8d259e
--- /dev/null
+++ b/doc/forum/ikiwiki_vim_syntaxfile.mdwn
@@ -0,0 +1,21 @@
+Hi all,
+
+I'm teaching myself how to write syntax files for vim by fixing several issues
+(and up to certain extent, taking over the maintenance) of the vim syntax
+(highlighting) file for ikiwiki.
+
+I'd like you to document here which problems you have found, so I can hunt them
+and see if I can fix them.
+
+## Problems Found
+
+  * Arguments of directives with a value of length 1 cause the following text to
+  be highlighted incorrectly. Example:
+
+        [[!directive param1="val1" param2="1"]] more text ...
+
+  * A named wikilink in a line, followed by text, and then another wikilink,
+  makes the text in between the links to be incorrectly highlighted. Example:
+
+        \[[a link|alink]] text that appears incorrectly .... \[[link]]
+
-- 
cgit v1.2.3


From 9edab06b186e7e0b3d7cef84e92509cdb05ddb7d Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <ptecza@web>
Date: Tue, 6 Jul 2010 10:36:02 +0000
Subject: Reply

---
 ...s_dir_should_be_under_control_of_RCS__63__.mdwn | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index bef79335f..b58c2c28e 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -47,3 +47,34 @@ Pawel
 > processing files in directories not checked into svn -- but I'd much
 > rather understand why you are seeing this happen on repeated builds.
 > --[[Joey]]
+
+>> Thanks a lot for your reply! I've just checked my `rebuild-pages.sh`
+>> script and discovered that it contains
+>> `/usr/bin/ikiwiki --setup ikiwiki.setup --gettime` command... :D
+>> The warnings disappeared when I removed `--gettime` parameter.
+>> Sorry for confusing! :)
+>>
+>> I have `.ikiwiki/indexdb` file here, but I noticed that it has been
+>> modified about 1 minute **after** last Subversion commit:
+>>
+>>     $ LANG=C svn up
+>>     At revision 5951.
+>>    
+>>     $ LANG=C svn log -r 5951
+>>     ------------------------------------------------------------------------
+>>     r5951 | svn | 2010-07-06 09:02:30 +0200 (Tue, 06 Jul 2010) | 1 line
+>>     
+>>     web commit by xahil
+>>     ------------------------------------------------------------------------
+>>    
+>>     $ LANG=C stat pages/.ikiwiki/indexdb 
+>>       File: `pages/.ikiwiki/indexdb'
+>>       Size: 184520    	Blocks: 368        IO Block: 131072 regular file
+>>     Device: 2bh/43d	Inode: 1931145     Links: 1
+>>     Access: (0644/-rw-r--r--)  Uid: ( 1005/     svn)   Gid: ( 1005/     svn)
+>>     Access: 2010-07-06 12:06:24.000000000 +0200
+>>     Modify: 2010-07-06 09:03:38.000000000 +0200
+>>     Change: 2010-07-06 09:03:38.000000000 +0200
+>>
+>> I believe it's the time I have to wait to see that my wiki page has been rebuilt.
+>> Do you have any idea how to find a reason of that delay? --[[Paweł|ptecza]]
-- 
cgit v1.2.3


From 2dd0c177a6b33488dfcfff9041a3749b44484f34 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 6 Jul 2010 13:57:17 -0400
Subject: aggregate: Write timestamp next aggregation can happen to
 .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.

---
 IkiWiki/Plugin/aggregate.pm | 18 ++++++++++++++++--
 debian/changelog            |  2 ++
 doc/plugins/aggregate.mdwn  | 15 ++++++++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 5a9eb433d..7789c4c2a 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -298,7 +298,7 @@ sub loadstate () {
 	return if $state_loaded;
 	$state_loaded=1;
 	if (-e "$config{wikistatedir}/aggregate") {
-		open(IN, "$config{wikistatedir}/aggregate") ||
+		open(IN, "<", "$config{wikistatedir}/aggregate") ||
 			die "$config{wikistatedir}/aggregate: $!";
 		while (<IN>) {
 			$_=IkiWiki::possibly_foolish_untaint($_);
@@ -335,7 +335,7 @@ sub savestate () {
 	garbage_collect();
 	my $newfile="$config{wikistatedir}/aggregate.new";
 	my $cleanup = sub { unlink($newfile) };
-	open (OUT, ">$newfile") || error("open $newfile: $!", $cleanup);
+	open (OUT, ">", $newfile) || error("open $newfile: $!", $cleanup);
 	foreach my $data (values %feeds, values %guids) {
 		my @line;
 		foreach my $field (keys %$data) {
@@ -356,6 +356,20 @@ sub savestate () {
 	close OUT || error("save $newfile: $!", $cleanup);
 	rename($newfile, "$config{wikistatedir}/aggregate") ||
 		error("rename $newfile: $!", $cleanup);
+
+	my $timestamp=undef;
+	foreach my $feed (keys %feeds) {
+		my $t=$feeds{$feed}->{lastupdate}+$feeds{$feed}->{updateinterval};
+		if (! defined $timestamp || $timestamp > $t) {
+			$timestamp=$t;
+		}
+	}
+	$newfile=~s/\.new$/time/;
+	open (OUT, ">", $newfile) || error("open $newfile: $!", $cleanup);
+	if (defined $timestamp) {
+		print OUT $timestamp."\n";
+	}
+	close OUT || error("save $newfile: $!", $cleanup);
 }
 
 sub garbage_collect () {
diff --git a/debian/changelog b/debian/changelog
index 18db7c0c2..9d88b5c9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * img: Add a margin around images displayed by this directive.
   * comments: Added commentmoderation directive for easy linking to the
     comment moderation queue.
+  * aggregate: Write timestamp next aggregation can happen to
+    .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn
index bb828b05c..2925b6fba 100644
--- a/doc/plugins/aggregate.mdwn
+++ b/doc/plugins/aggregate.mdwn
@@ -5,9 +5,13 @@ This plugin allows content from other feeds to be aggregated into the
 wiki. To specify feeds to aggregate, use the
 [[ikiwiki/directive/aggregate]] [[ikiwiki/directive]].
 
-The [[meta]] and [[tag]] plugins are also recommended. Either the
-[[htmltidy]] or [[htmlbalance]] plugin is suggested, since feeds can easily
-contain html problems, some of which these plugins can fix.
+## requirements
+
+The [[meta]] and [[tag]] plugins are also recommended to be used with this
+one. Either the [[htmltidy]] or [[htmlbalance]] plugin is suggested, since
+feeds can easily contain html problems, some of which these plugins can fix.
+
+## triggering aggregation
 
 You will need to run ikiwiki periodically from a cron job, passing it the
 --aggregate parameter, to make it check for new posts. Here's an example
@@ -15,6 +19,11 @@ crontab entry:
 
 	*/15 * * * * ikiwiki --setup my.wiki --aggregate --refresh
 
+The plugin updates a file `.ikiwiki/aggregatetime` with the unix time stamp
+when the next aggregation run could occur. (The file may be empty, if no
+aggregation is required.) This can be integrated into more complex cron
+jobs or systems to trigger aggregation only when needed.
+
 Alternatively, you can allow `ikiwiki.cgi` to trigger the aggregation. You
 should only need this if for some reason you cannot use cron, and instead
 want to use a service such as [WebCron](http://webcron.org). To enable
-- 
cgit v1.2.3


From 45a5e8e972b3f56fbc2b32aa7b9c218c076da7e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 6 Jul 2010 15:59:08 -0400
Subject: bugfix

---
 IkiWiki/Plugin/aggregate.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 7789c4c2a..e473fc643 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -359,9 +359,14 @@ sub savestate () {
 
 	my $timestamp=undef;
 	foreach my $feed (keys %feeds) {
-		my $t=$feeds{$feed}->{lastupdate}+$feeds{$feed}->{updateinterval};
-		if (! defined $timestamp || $timestamp > $t) {
-			$timestamp=$t;
+		if (defined $feeds{$feed}->{lastupdate}) {
+			my $t=$feeds{$feed}->{lastupdate}+$feeds{$feed}->{updateinterval};
+			if (! defined $timestamp || $timestamp > $t) {
+				$timestamp=$t;
+			}
+		}
+		else {
+			$timestamp=0;
 		}
 	}
 	$newfile=~s/\.new$/time/;
-- 
cgit v1.2.3


From c23cb312b457c1ac2e0682649fc7ef7035103681 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 6 Jul 2010 16:02:41 -0400
Subject: revert bugfix

Not needed; lastupdate will be 0 for new feeds.
---
 IkiWiki/Plugin/aggregate.pm | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index e473fc643..7789c4c2a 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -359,14 +359,9 @@ sub savestate () {
 
 	my $timestamp=undef;
 	foreach my $feed (keys %feeds) {
-		if (defined $feeds{$feed}->{lastupdate}) {
-			my $t=$feeds{$feed}->{lastupdate}+$feeds{$feed}->{updateinterval};
-			if (! defined $timestamp || $timestamp > $t) {
-				$timestamp=$t;
-			}
-		}
-		else {
-			$timestamp=0;
+		my $t=$feeds{$feed}->{lastupdate}+$feeds{$feed}->{updateinterval};
+		if (! defined $timestamp || $timestamp > $t) {
+			$timestamp=$t;
 		}
 	}
 	$newfile=~s/\.new$/time/;
-- 
cgit v1.2.3


From 87890d19cca9c051f4e0de1acf0a5c337e93a92e Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmbuZI4n1RsTe3Yeaqb5F-yhtR7a8BWEIE"
 <Kai@web>
Date: Wed, 7 Jul 2010 09:01:29 +0000
Subject: quick fix

---
 doc/bugs/support_for_openid2_logins.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn
index 139a53760..a71ed7ba9 100644
--- a/doc/bugs/support_for_openid2_logins.mdwn
+++ b/doc/bugs/support_for_openid2_logins.mdwn
@@ -20,3 +20,5 @@ However both Perl OpenID 2.x implementations have not been released and are inco
 
 > I've tested with yahoo, and it works with the updated module. Sweet and
 > [[done]] --[[Joey]] 
+
+## A quick fix for the impatient running stable is simply `sudo apt-get install libnet-openid-consumer-perl -t unstable`
-- 
cgit v1.2.3


From c34e4823268183eac476072a8aa87a2756529a29 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmbuZI4n1RsTe3Yeaqb5F-yhtR7a8BWEIE"
 <Kai@web>
Date: Wed, 7 Jul 2010 10:48:36 +0000
Subject:

---
 doc/tips/howto_limit_to_admin_users.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/tips/howto_limit_to_admin_users.mdwn

diff --git a/doc/tips/howto_limit_to_admin_users.mdwn b/doc/tips/howto_limit_to_admin_users.mdwn
new file mode 100644
index 000000000..4d579327a
--- /dev/null
+++ b/doc/tips/howto_limit_to_admin_users.mdwn
@@ -0,0 +1,9 @@
+Enable [[plugins/lockedit]] in your setup file.
+
+For example:
+
+    add_plugins => [qw{goodstuff table rawhtml template embed typography sidebar img remove lockedit}],
+
+And to only allow admin users to edit the page, simply specify a pagespec for everything in the .setup:
+
+    locked_pages => '*',
-- 
cgit v1.2.3


From ee279518878fc3225f138d06a16406b418858b2e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 7 Jul 2010 13:55:46 -0400
Subject: another tip

---
 doc/tips/optimising_ikiwiki.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index 14d619ff8..caed75ba6 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -38,6 +38,14 @@ If your version of ikiwiki is not [[!version]], try upgrading. New
 optimisations are frequently added to ikiwiki, some of them yielding
 *enormous* speed increases.
 
+## run ikiwiki in verbose mode
+
+Try changing a page, and run ikiwiki with `-v` so it will tell you
+everything it does to deal with that changed page. Take note of
+which other pages are rebuilt, and which parts of the build take a long
+time. This can help you zero in on individual pages that contain some of
+the expensive things listed below. 
+
 ## expensive inlines
 
 Do you have an archive page for your blog that shows all posts, 
-- 
cgit v1.2.3


From b1f7aac8ec81490415d487b7db09d03675a7890b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 7 Jul 2010 13:57:34 -0400
Subject: response

---
 ...centchanges_dir_should_be_under_control_of_RCS__63__.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index b58c2c28e..c49baca3e 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -78,3 +78,15 @@ Pawel
 >>
 >> I believe it's the time I have to wait to see that my wiki page has been rebuilt.
 >> Do you have any idea how to find a reason of that delay? --[[Paweł|ptecza]]
+
+>>> Well, I hope that your svn post-commit hook is not running your
+>>> `rebuild-pages.sh`. That script rebuilds everything, rather than just
+>>> refreshing what's been changed.
+>>>
+>>> Using subversion is not asking for speed. Especially if your svn
+>>> repository is on a remote host. You might try disabling
+>>> recentchanges and see if that speeds up the refreshes (it will avoid
+>>> one `svn log`).
+>>>
+>>> Otherwise, take a look at [[tips/optimising_ikiwiki]]
+>>> for some advice on things that can make ikiwiki run slowly. --[[Joey]]
-- 
cgit v1.2.3


From 366b24a0f980b677dcb615fd7964953230f47dec Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <joey@web>
Date: Thu, 8 Jul 2010 06:04:44 +0000
Subject: Added a comment: do parameter missing

---
 .../comment_5_e098723bb12adfb91ab561cae21b492b._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_5_e098723bb12adfb91ab561cae21b492b._comment

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_5_e098723bb12adfb91ab561cae21b492b._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_5_e098723bb12adfb91ab561cae21b492b._comment
new file mode 100644
index 000000000..b832d64f4
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_5_e098723bb12adfb91ab561cae21b492b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="do parameter missing"
+ date="2010-07-08T06:04:44Z"
+ content="""
+I just debugged this problem with someone else who was using ngix-fcgi. There was a problem with it not passing CGI environment variables properly. If you're using that, it might explain your problem.
+"""]]
-- 
cgit v1.2.3


From 39b0c2d04b20c902769037352a81fe080e324b17 Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <ptecza@web>
Date: Thu, 8 Jul 2010 12:25:45 +0000
Subject: Reply

---
 ...entchanges_dir_should_be_under_control_of_RCS__63__.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index c49baca3e..2fe97366b 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -90,3 +90,16 @@ Pawel
 >>>
 >>> Otherwise, take a look at [[tips/optimising_ikiwiki]]
 >>> for some advice on things that can make ikiwiki run slowly. --[[Joey]]
+
+>>>> Thanks for the hints! I don't understand it, but it seems that refreshing
+>>>> all pages has resolved the problem and now my wiki works well again :)
+>>>>
+>>>> No, I use `rebuild-pages.sh` script only when I want to rebuild
+>>>> my wiki manually, for example when you release new Ikiwiki version
+>>>> then I need to update my templates. Some of them have been translated
+>>>> to Polish by me.
+>>>>
+>>>> Fortunately my wiki and its Subversion repo are located on the same host.
+>>>> We have a lot of Subversion repos for our projects and I don't want to
+>>>> change only wiki repo for better performance. I'm rather satisfied with
+>>>> its speed. --[[Paweł|ptecza]]
-- 
cgit v1.2.3


From 4e9d62a2d75c79f3450781037e24b549dbd3eda6 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <jeremiah@web>
Date: Thu, 8 Jul 2010 16:09:32 +0000
Subject:

---
 doc/plugins/goodstuff/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/plugins/goodstuff/discussion.mdwn

diff --git a/doc/plugins/goodstuff/discussion.mdwn b/doc/plugins/goodstuff/discussion.mdwn
new file mode 100644
index 000000000..0ad95c00a
--- /dev/null
+++ b/doc/plugins/goodstuff/discussion.mdwn
@@ -0,0 +1 @@
+What is the syntax for enabling plugins in the setup file?
-- 
cgit v1.2.3


From d4c11466bad0e0aa3ac3c6f0bfc7577633d0d744 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 8 Jul 2010 13:55:30 -0400
Subject: fork a child to run dumpsetup

---
 IkiWiki/Setup.pm | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 2b0259e2a..5b77a6471 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -50,10 +50,8 @@ sub load ($;$) {
 
 sub dump ($) {
 	my $file=IkiWiki::possibly_foolish_untaint(shift);
-	
-	eval qq{require IkiWiki::Setup::$config{setuptype}};
-	error $@ if $@;
-	my @dump="IkiWiki::Setup::$config{setuptype}"->gendump(
+
+	my @header=(
 		"Setup file for ikiwiki.",
 		"",
 		"Passing this to ikiwiki --setup will make ikiwiki generate",
@@ -62,9 +60,23 @@ sub dump ($) {
 		"Remember to re-run ikiwiki --setup any time you edit this file.",
 	);
 
-	open (OUT, ">", $file) || die "$file: $!";
-	print OUT "$_\n" foreach @dump;
-	close OUT;
+	# Fork because dumping setup requires loading all plugins.
+	my $pid=fork();
+	if ($pid == 0) {
+		eval qq{require IkiWiki::Setup::$config{setuptype}};
+		error $@ if $@;
+		my @dump="IkiWiki::Setup::$config{setuptype}"->gendump(@header);
+	
+		open (OUT, ">", $file) || die "$file: $!";
+		print OUT "$_\n" foreach @dump;
+		close OUT;
+
+		exit 0;
+	}
+	else {
+		waitpid $pid, 0;
+		exit $? if $?;
+	}
 }
 
 sub merge ($) {
-- 
cgit v1.2.3


From 7dbad39bbe93ebcc05f278965906fd1c77d2bc34 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 8 Jul 2010 14:01:52 -0400
Subject: Add --changesetup mode that allows easily changing options in a setup
 file.

---
 debian/changelog |  2 ++
 doc/setup.mdwn   |  6 ++++++
 doc/usage.mdwn   | 14 +++++++++++---
 ikiwiki.in       | 38 ++++++++++++++++++++++++++------------
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d88b5c9c..c340f8901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
     comment moderation queue.
   * aggregate: Write timestamp next aggregation can happen to
     .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
+  * Add --changesetup mode that allows easily changing options in a
+    setup file.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 03fed3aa9..266222cc3 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -102,6 +102,12 @@ After making changes to this file, you need to tell ikiwiki to use it:
 
 	% ikiwiki -setup foo.setup
 
+Alternatively, you can ask ikiwiki to change settings in the file for you:
+
+	% ikiwiki -changesetup foo.setup -plugin goodstuff
+
+See [[usage]] for more options.
+
 ## Customizing file locations
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 2f87d60d5..840d105d2 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -32,14 +32,22 @@ These options control the mode that ikiwiki operates in.
 
 * --setup setupfile
 
-  In setup mode, ikiwiki reads the config file, which is really a perl
-  program that can call ikiwiki internal functions.
-
   The default action when --setup is specified is to automatically generate
   wrappers for a wiki based on data in a setup file, and rebuild the wiki.
   If you only want to build any changed pages, you can use --refresh with
   --setup.
 
+* --changesetup setupfile
+
+  Reads the setup file, adds any configuration changes specified by other
+  options, and writes the new configuration back to the setup file. Also
+  updates any configured wrappers. In this mode, the wiki is not fully
+  rebuilt, unless you also add --rebuild.
+
+  Example, to enable some plugins:
+
+	ikiwiki --changesetup ~/ikiwiki.setup --plugin goodstuff --plugin calendar
+
 * --dumpsetup setupfile
 
   Causes ikiwiki to write to the specified setup file, dumping out
diff --git a/ikiwiki.in b/ikiwiki.in
index ac43044df..aa3337938 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -14,24 +14,32 @@ sub usage () {
 	    gettext("       ikiwiki --setup configfile"), "\n";
 }
 
+sub setup (@) {
+	require IkiWiki::Setup;
+	my $verbose=$config{verbose};
+	my $syslog=$config{syslog};
+	IkiWiki::Setup::load($_[1]);
+	$config{setupverbose}=$config{verbose};
+	$config{setupsyslog}=$config{syslog};
+	$config{verbose}=$verbose || $config{setupverbose};
+	$config{syslog}=$syslog;
+	$config{setup}=1;
+}
+
 sub getconfig () {
 	if (! exists $ENV{WRAPPED_OPTIONS}) {
 		%config=defaultconfig();
 		eval q{use Getopt::Long};
 		Getopt::Long::Configure('pass_through');
 		GetOptions(
-			"setup|s=s" => sub {
-				require IkiWiki::Setup;
-				my $verbose=$config{verbose};
-				my $syslog=$config{syslog};
-				IkiWiki::Setup::load($_[1]);
-				$config{setupverbose}=$config{verbose};
-				$config{setupsyslog}=$config{syslog};
-				$config{verbose}=$verbose || $config{setupverbose};
-				$config{syslog}=$syslog;
-				$config{setup}=1;
-			},
+			"setup|s=s" => \&setup,
 			"dumpsetup|s=s" => \$config{dumpsetup},
+			"changesetup|s=s" => sub {
+				$config{changesetup}=$_[1];
+				$config{genwrappers}=1;
+				$config{refresh}=1;
+				setup(@_);
+			},
 			"wikiname=s" => \$config{wikiname},
 			"verbose|v!" => \$config{verbose},
 			"syslog!" => \$config{syslog},
@@ -85,7 +93,8 @@ sub getconfig () {
 				$config{wrappermode}=possibly_foolish_untaint($_[1])
 			},
 			"plugin=s@" => sub {
-				push @{$config{add_plugins}}, $_[1];
+				push @{$config{add_plugins}}, $_[1]
+					unless grep { $_ eq $_[1] } @{$config{add_plugins}};
 			},
 			"disable-plugin=s@" => sub {
 				push @{$config{disable_plugins}}, $_[1];
@@ -181,6 +190,11 @@ sub main () {
 		}
 	}
 
+	if ($config{changesetup}) {
+		require IkiWiki::Setup;
+		IkiWiki::Setup::dump($config{changesetup});
+	}
+
 	if ($config{dumpsetup}) {
 		$config{srcdir}="" if ! defined $config{srcdir};
 		$config{destdir}="" if ! defined $config{destdir};
-- 
cgit v1.2.3


From b6f7906da6055ebefe9047a5e065829a8f8024a9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 8 Jul 2010 14:14:59 -0400
Subject: fix child process error propigation

$? holds the full exit status
---
 IkiWiki/Setup.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 5b77a6471..7af744f6a 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -75,7 +75,8 @@ sub dump ($) {
 	}
 	else {
 		waitpid $pid, 0;
-		exit $? if $?;
+		exit($? >> 8) if $? >> 8;
+		exit(1) if $?;
 	}
 }
 
-- 
cgit v1.2.3


From 99f4056b989acfacf3590dbaec9a505a31420f88 Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Fri, 9 Jul 2010 11:44:59 +0000
Subject: minor markup syntax

---
 doc/plugins/rst/discussion.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn
index 38fbed6d6..3c3b03275 100644
--- a/doc/plugins/rst/discussion.mdwn
+++ b/doc/plugins/rst/discussion.mdwn
@@ -61,8 +61,8 @@ but the backlinks don't show up.
 
 I converted one of my pages to rst:
 
-Before: http://kaizer.se/wiki/kupfer-mdwn  
-After: http://kaizer.se/wiki/kupfer-rst  
+Before: <http://kaizer.se/wiki/kupfer-mdwn>  
+After: <http://kaizer.se/wiki/kupfer-rst>  
 
 I need help on a couple of points
 
-- 
cgit v1.2.3


From 1a7be8d403d162469b26f7272db283daa4eb551c Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Fri, 9 Jul 2010 20:31:10 +0000
Subject:

---
 doc/forum/html_source_pages_in_version_3.20100704.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/html_source_pages_in_version_3.20100704.mdwn

diff --git a/doc/forum/html_source_pages_in_version_3.20100704.mdwn b/doc/forum/html_source_pages_in_version_3.20100704.mdwn
new file mode 100644
index 000000000..b8cbb0f4e
--- /dev/null
+++ b/doc/forum/html_source_pages_in_version_3.20100704.mdwn
@@ -0,0 +1 @@
+Is this different from using the html/rawhtml plugins?
-- 
cgit v1.2.3


From 8a08345f168d367b072ff119b57016b5ef4a1a75 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Sat, 10 Jul 2010 06:40:43 +0000
Subject:

---
 doc/forum/remove_css__63__.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/forum/remove_css__63__.mdwn

diff --git a/doc/forum/remove_css__63__.mdwn b/doc/forum/remove_css__63__.mdwn
new file mode 100644
index 000000000..da434e3a1
--- /dev/null
+++ b/doc/forum/remove_css__63__.mdwn
@@ -0,0 +1,3 @@
+I removed a local.css file and pushed the changes to git but the 'compiled' wiki still shows the same css.
+Is this a bug or you are supposed to remove the css by hand?
+
-- 
cgit v1.2.3


From 787b4ee0d283d99521e4ebc79ec091d5f4f3906a Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Sat, 10 Jul 2010 06:41:44 +0000
Subject:

---
 doc/forum/remove_css__63__.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/forum/remove_css__63__.mdwn b/doc/forum/remove_css__63__.mdwn
index da434e3a1..b90b3d864 100644
--- a/doc/forum/remove_css__63__.mdwn
+++ b/doc/forum/remove_css__63__.mdwn
@@ -1,3 +1,4 @@
-I removed a local.css file and pushed the changes to git but the 'compiled' wiki still shows the same css.
-Is this a bug or you are supposed to remove the css by hand?
+I removed a local.css file and pushed the changes to git but the 'compiled' wiki still shows the same css.  
+Is this a bug or you are supposed to remove the css by hand?  
+ikiwiki version 3.20100705
 
-- 
cgit v1.2.3


From 293e12bc0e5347d815da559142bf64dcb60cd7ab Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Sat, 10 Jul 2010 09:20:36 +0000
Subject: link to repolist plugin

---
 doc/plugins/getsource/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/getsource/discussion.mdwn b/doc/plugins/getsource/discussion.mdwn
index 45a1d62b5..3e985948b 100644
--- a/doc/plugins/getsource/discussion.mdwn
+++ b/doc/plugins/getsource/discussion.mdwn
@@ -1 +1,3 @@
 It would be very cool if this plugin was enabled by default.  One of the best ways to learn how to do various advanced things is to be able to "view source" on other wiki's which do things you like.  -- [[AdamShand]]
+
+This plugin requires the cgi plugin.  If you run a static site, you may check the [[repolist]] plugin.  -- [[weakish]]
-- 
cgit v1.2.3


From 3cc0c8b065b8d7051d42d694f7884284e3b5b361 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Sat, 10 Jul 2010 12:06:23 +0000
Subject:

---
 doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn

diff --git a/doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn
new file mode 100644
index 000000000..86ed70fd2
--- /dev/null
+++ b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn
@@ -0,0 +1,3 @@
+Is it possible to use php-markdown-extra with ikiwiki?
+
+Thanks.
-- 
cgit v1.2.3


From f7474a6e10d7b224764ad2038c128c7e5b448080 Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Sat, 10 Jul 2010 12:42:23 +0000
Subject: add my personal website

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 6a323ade0..d38b1208b 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -149,6 +149,7 @@ Personal sites and blogs
 * [Daniel Wayne Armstrong](http://circuidipity.com/)
 * [Mukund](https://www.mukund.org/)
 * [Nicolas Schodet](http://ni.fr.eu.org/)
+* [weakish](http://weakish.github.com)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 281d03f5ab166b556eec7419a81735baf732dc85 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sat, 10 Jul 2010 12:44:15 +0000
Subject: Added a comment: PHP != Perl

---
 .../comment_1_66d48218361caa4c07bd714b82ed0021._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_1_66d48218361caa4c07bd714b82ed0021._comment

diff --git a/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_1_66d48218361caa4c07bd714b82ed0021._comment b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_1_66d48218361caa4c07bd714b82ed0021._comment
new file mode 100644
index 000000000..af60ecbdb
--- /dev/null
+++ b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_1_66d48218361caa4c07bd714b82ed0021._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="60.241.8.244"
+ subject="PHP != Perl"
+ date="2010-07-10T12:44:15Z"
+ content="""
+Er, why?  IkiWiki is written in Perl.  Presumably php-markdown-extra is written in PHP, which is a completely different language.
+"""]]
-- 
cgit v1.2.3


From 470b33e6a643d07cdc2092481bfb8b7b8da5d0e8 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Sat, 10 Jul 2010 21:48:13 +0000
Subject: Added a comment

---
 .../comment_2_f2ee0a4dce571d329f795e52139084c0._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_2_f2ee0a4dce571d329f795e52139084c0._comment

diff --git a/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_2_f2ee0a4dce571d329f795e52139084c0._comment b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_2_f2ee0a4dce571d329f795e52139084c0._comment
new file mode 100644
index 000000000..ce60f4b3a
--- /dev/null
+++ b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_2_f2ee0a4dce571d329f795e52139084c0._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
+ nickname="Dário"
+ subject="comment 2"
+ date="2010-07-10T21:48:13Z"
+ content="""
+Because php-markdown-extra extends the basic markdown language (footnotes, etc.)
+"""]]
-- 
cgit v1.2.3


From 1bb9157f2ab94b8306e1e2fb1a5b3ac9bbfe5772 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 11 Jul 2010 07:18:35 +0000
Subject: Added a comment: I still don't get it

---
 .../comment_3_e388714f457ccb6ef73630179914558c._comment          | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_3_e388714f457ccb6ef73630179914558c._comment

diff --git a/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_3_e388714f457ccb6ef73630179914558c._comment b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_3_e388714f457ccb6ef73630179914558c._comment
new file mode 100644
index 000000000..72ce7bb6f
--- /dev/null
+++ b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_3_e388714f457ccb6ef73630179914558c._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="202.173.183.92"
+ subject="I still don't get it"
+ date="2010-07-11T07:18:35Z"
+ content="""
+But if you need the \"extra\" features of Markdown, all you have to do is turn on the \"multimarkdown\" option in your configuration.  It makes no sense to try to use PHP with Perl.
+
+"""]]
-- 
cgit v1.2.3


From 4a1cb092baabda6182fd291dfc9810f6c8efb17e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 11:00:43 +0200
Subject: Revert po vs. template kludges.

This reverts commits dcd57dd5c9f3265bb7a78a5696b90976698c43aa,
d4136aea8aa8968d2cd87b40e8d85301a3549323 and
d877b9644bcfbbfc5eaf3f7fc13cb96ecda946c9.
---
 IkiWiki.pm                 | 6 ++----
 IkiWiki/Plugin/editpage.pm | 2 +-
 IkiWiki/Plugin/inline.pm   | 4 ++--
 IkiWiki/Plugin/po.pm       | 6 ------
 IkiWiki/Plugin/sidebar.pm  | 2 +-
 IkiWiki/Render.pm          | 4 ++--
 doc/plugins/write.mdwn     | 4 +---
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index f9a30a202..cd9c40795 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1403,16 +1403,14 @@ sub preprocess ($$$;$$) {
 	return $content;
 }
 
-sub filter ($$$;$) {
+sub filter ($$$) {
 	my $page=shift;
 	my $destpage=shift;
 	my $content=shift;
-	my $fullpage=shift;
-	$fullpage = 0 unless defined $fullpage;
 
 	run_hooks(filter => sub {
 		$content=shift->(page => $page, destpage => $destpage, 
-			content => $content, fullpage => $fullpage);
+			content => $content);
 	});
 
 	return $content;
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 706630203..1a04a72b5 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -187,7 +187,7 @@ sub cgi_editpage ($$) {
 		my $preview=htmlize($page, $page, $type,
 			linkify($page, $page,
 			preprocess($page, $page,
-			filter($page, $page, $content, 'fullpage'), 0, 1)));
+			filter($page, $page, $content), 0, 1)));
 		run_hooks(format => sub {
 			$preview=shift->(
 				page => $page,
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a04dd6630..715a3d652 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -403,7 +403,7 @@ sub preprocess_inline (@) {
 					      linkify($page, $params{destpage},
 					      preprocess($page, $params{destpage},
 					      filter($page, $params{destpage},
-					      readfile(srcfile($file)), 'fullpage')));
+					      readfile(srcfile($file)))));
 				}
 				else {
 					$ret.="\n".
@@ -474,7 +474,7 @@ sub get_inline_content ($$) {
 		       linkify($page, $destpage,
 		       preprocess($page, $destpage,
 		       filter($page, $destpage,
-		       readfile(srcfile($file)), 'fullpage'))));
+		       readfile(srcfile($file))))));
 		$nested--;
 		if (isinternal($page)) {
 			# make inlined text of internal pages searchable
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index cadc13ba1..ecfbb6f78 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -259,12 +259,6 @@ sub filter (@) {
 	my $page = $params{page};
 	my $destpage = $params{destpage};
 	my $content = $params{content};
-	my $fullpage = $params{fullpage};
-
-	unless ($fullpage) {
-		return $content;
-	}
-
 	if (istranslation($page) && ! alreadyfiltered($page, $destpage)) {
 		$content = po_to_markup($page, $content);
 		setalreadyfiltered($page, $destpage);
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 100015cee..2d495db2c 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -89,7 +89,7 @@ sub sidebar_content ($) {
 		return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type,
 		       IkiWiki::linkify($sidebar_page, $page,
 		       IkiWiki::preprocess($sidebar_page, $page,
-		       IkiWiki::filter($sidebar_page, $page, $content, 'fullpage'))));
+		       IkiWiki::filter($sidebar_page, $page, $content))));
 	}
 
 }
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 233d093ed..a653ab2da 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -232,7 +232,7 @@ sub render ($$) {
 			linkify($page, $page,
 			preprocess($page, $page,
 			filter($page, $page,
-			readfile($srcfile), 'fullpage'))));
+			readfile($srcfile)))));
 		
 		my $output=htmlpage($page);
 		writefile($output, $config{destdir}, genpage($page, $content));
@@ -837,7 +837,7 @@ sub commandline_render () {
 	my $content=readfile($srcfile);
 	my $page=pagename($file);
 	$pagesources{$page}=$file;
-	$content=filter($page, $page, $content, 'fullpage');
+	$content=filter($page, $page, $content);
 	$content=preprocess($page, $page, $content);
 	$content=linkify($page, $page, $content);
 	$content=htmlize($page, $page, $type, $content);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 8071f323e..bb8012342 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -200,9 +200,7 @@ value is ignored.
 
 Runs on the raw source of a page, before anything else touches it, and can
 make arbitrary changes. The function is passed named parameters "page",
-"destpage", "content" and "fullpage". "fullpage" is a true value if,
-and only if, a full page's content is being filtered, e.g. as opposed
-to a directive parameter. It should return the filtered content.
+"destpage", and "content". It should return the filtered content.
 
 ### preprocess
 
-- 
cgit v1.2.3


From ea3926bd87c227ed654dc868e8e027029baed413 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 11:27:54 +0200
Subject: the filter-full branch works nicely

---
 doc/bugs/po_vs_templates.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index 7bc56676e..9fd0de694 100644
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -40,4 +40,9 @@ This has been fixed in my po branch.
 >> your po branch and remove your other workarounds so I can merge?
 >> --[[Joey]]
 
+>>> I merged your filter-full branch into my po branch and reverted my
+>>> other workarounds. According to my tests this works ok. I'm glad
+>>> you found this solution, as I didn't like changing the filter
+>>> prototype. I believe you can now merge this code. --[[intrigeri]]
+
 [[!tag patch]]
-- 
cgit v1.2.3


From ff8f6cd6b23f6b1e727649d5e5abaabea7bcf6c5 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 11:35:37 +0200
Subject: Make the rationale clearer.

---
 IkiWiki.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index cd9c40795..1dc989b39 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1082,6 +1082,8 @@ sub urlto ($$;$) {
 }
 
 sub isselflink ($$) {
+	# Plugins can override this function to support special types
+	# of selflinks.
 	my $page=shift;
 	my $link=shift;
 
-- 
cgit v1.2.3


From 1f4f13ce0b354c0950b5d13d0da32dbfce8880c3 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 11:37:48 +0200
Subject: reply. and now?

---
 doc/todo/Fix_selflink_in_po_plugin.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index 791c6c055..c4f6662ce 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -14,3 +14,8 @@ Fixed in my po branch. --[[intrigeri]]
 >> the triviality of the sub, which it would seem to be easy to 
 >> decide to refactor back into its one caller (which would reintroduce the
 >> bug). --[[Joey]] 
+
+>>> Well, I can hear and understand this. Apart of adding a comment to
+>>> the sub, explaining the rationale (which is now done in my po
+>>> branch), I don't know what I can do to make it not seem wrong.
+>>> --[[intrigeri]]
-- 
cgit v1.2.3


From 98cc9460ac67fee606437712882cfa1e5d259729 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 11:58:09 +0200
Subject: po: added an optional target percentage to needstranslation

---
 IkiWiki/Plugin/po.pm         | 17 +++++++++++++++--
 doc/ikiwiki/pagespec/po.mdwn |  5 ++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index ecfbb6f78..9cb047992 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -1287,16 +1287,29 @@ sub match_currentlang ($$;@) {
 
 sub match_needstranslation ($$;@) {
 	my $page=shift;
+	my $wanted=shift;
+
+	if (defined $wanted && $wanted ne "") {
+		if ($wanted !~ /^\d+$/) {
+			return IkiWiki::FailReason->new("parameter is not an integer");
+		}
+		elsif ($wanted > 100) {
+			return IkiWiki::FailReason->new("parameter is greater than 100");
+                }
+        }
+        else {
+		$wanted=100;
+        }
 
 	my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
 	if ($percenttranslated eq 'N/A') {
 		return IkiWiki::FailReason->new("file is not a translatable page");
 	}
-	elsif ($percenttranslated < 100) {
+	elsif ($percenttranslated < $wanted) {
 		return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
         }
 	else {
-		return IkiWiki::FailReason->new("file is fully translated");
+		return IkiWiki::FailReason->new("file is translated enough");
 	}
 }
 
diff --git a/doc/ikiwiki/pagespec/po.mdwn b/doc/ikiwiki/pagespec/po.mdwn
index f8b398575..f9956404c 100644
--- a/doc/ikiwiki/pagespec/po.mdwn
+++ b/doc/ikiwiki/pagespec/po.mdwn
@@ -12,7 +12,10 @@ wiki:
 * "`currentlang()`" - tests whether a page is written in the same
   language as the current page.
 * "`needstranslation()`" - tests whether a page needs translation
-  work. Only slave pages match this PageSpec.
+  work. Only slave pages match this PageSpec. A minimum target
+  translation percentage can optionally be passed as an integer
+  parameter: "`needstranslation(50)`" matches only pages less than 50%
+  translated.
 
 Note that every non-po page is considered to be written in
 `po_master_language`, as specified in `ikiwiki.setup`.
-- 
cgit v1.2.3


From cfb63bc6385d6fea4db6c91160656389945c385c Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 12:00:00 +0200
Subject: implemented, please merge

---
 doc/todo/po_needstranslation_pagespec.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/todo/po_needstranslation_pagespec.mdwn b/doc/todo/po_needstranslation_pagespec.mdwn
index 77449dc2b..9ead4ace6 100644
--- a/doc/todo/po_needstranslation_pagespec.mdwn
+++ b/doc/todo/po_needstranslation_pagespec.mdwn
@@ -6,4 +6,7 @@ Please review. --[[intrigeri]]
 > think of is that `needstranslation(50)` could match
 > only pages less than 50% translated. --[[Joey]] 
 
-[[!tag patch done]]
+>> This improvement has been implemented as 98cc946 in my po branch.
+>> --[[intrigeri]]
+
+[[!tag patch]]
-- 
cgit v1.2.3


From 4449a70214b561da14f8e566f2747517c941cb40 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 12:28:02 +0200
Subject: po: check validity of po_slave_languages array.

---
 IkiWiki/Plugin/po.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 9cb047992..43804a8f2 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -141,6 +141,9 @@ sub checkconfig () {
 
 	if (ref $config{po_slave_languages} eq 'ARRAY') {
 		my %slaves;
+		if (@{$config{po_slave_languages}} % 2 != 0) {
+			error(sprintf(gettext("The %s field is invalid."), 'po_slave_languages'));
+                }
 		for (my $i=0; $i<@{$config{po_slave_languages}}; $i = $i + 2) {
 			$slaves{$config{po_slave_languages}->[$i]} = $config{po_slave_languages}->[$i + 1];
 			push @slavelanguages, $config{po_slave_languages}->[$i];
-- 
cgit v1.2.3


From 51ac511369e7dd0d22f8e5056f6292d64b68a903 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 12:52:22 +0200
Subject: reply, proposed a few possible solutions.

---
 doc/plugins/po.mdwn | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index fe4d75748..2dc5ffdc8 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -274,6 +274,29 @@ to an array to support this. (If twere done, twere best done quickly.)
 >> up if it is not.. and the value is marked safe so websetup can be
 >> used to modify it and break that way too. --[[Joey]] 
 
+>>> I have added a sanity check for the even array problem. This was
+>>> the easy part.
+>>>
+>>> About the hash-like vs. dump and websetup issue,
+>>> I can think of a few solutions:
+>>>
+>>> - keep the current hash-like pairs and unmark this setting as safe
+>>>   for websetup: this does not solve the dump setup issue, though;
+>>> - replace the array of pairs with an array of
+>>>   "LANGUAGECODE|LANGUAGENAME" elements, using a pipe or whatever
+>>>   separator seems adequate;
+>>> - add support for ordered hashes to `$config`, websetup and
+>>>   dumpsetup, using Tie-IxHash or any similar module;
+>>> - replace the array of hash-like pairs with an array of real
+>>>   pairs, such as `[ ['de', 'Deutsch'], ['fr', 'Français'] ]`; this
+>>>   brings once again the need for `$config` to support arrays of
+>>>   arrays, which I have already implemented in my mirrorlist branch
+>>>   (see [[todo/mirrorlist_with_per-mirror_usedirs_settings]] for
+>>>   details).
+>>>
+>>> Joey, which of these solutions do you prefer? Or another one?
+>>> I tend to prefer the last one. --[[intrigeri]]
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From 8902deced2671fd7dc3be6f013082ee92fde9364 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 11 Jul 2010 13:34:17 -0400
Subject: response

---
 doc/forum/html_source_pages_in_version_3.20100704.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/forum/html_source_pages_in_version_3.20100704.mdwn b/doc/forum/html_source_pages_in_version_3.20100704.mdwn
index b8cbb0f4e..7a620fd57 100644
--- a/doc/forum/html_source_pages_in_version_3.20100704.mdwn
+++ b/doc/forum/html_source_pages_in_version_3.20100704.mdwn
@@ -1 +1,8 @@
 Is this different from using the html/rawhtml plugins?
+
+> I suppose you're talking about this:
+
+	* po: Added support for .html source pages. (intrigeri)
+
+> That means the [[plugins/po]] plugin is able to translate html pages
+> used by the [[plugins/html]] plugin. --[[Joey]] 
-- 
cgit v1.2.3


From 8ce1bea634a3e8cef7c12b76377ae5cdbb6eb4ea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 11 Jul 2010 13:35:11 -0400
Subject: response

---
 doc/forum/remove_css__63__.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/forum/remove_css__63__.mdwn b/doc/forum/remove_css__63__.mdwn
index b90b3d864..80da621d6 100644
--- a/doc/forum/remove_css__63__.mdwn
+++ b/doc/forum/remove_css__63__.mdwn
@@ -2,3 +2,4 @@ I removed a local.css file and pushed the changes to git but the 'compiled' wiki
 Is this a bug or you are supposed to remove the css by hand?  
 ikiwiki version 3.20100705
 
+> It's a [[bug|bugs/underlaydir_file_expose]]. --[[Joey]] 
-- 
cgit v1.2.3


From dbb63cb7fd60e7ad8fa09ef997724e1e7126b386 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 11 Jul 2010 13:38:37 -0400
Subject: openid: Fix handling of utf-8 nicknames.

---
 IkiWiki/Plugin/openid.pm | 3 ++-
 debian/changelog         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index b1a9a7a15..fae9fb77f 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -211,7 +211,8 @@ sub auth ($$) {
 				}
 			}
 			if (defined $nickname) {
-				$session->param(nickname => $nickname);
+				$session->param(nickname =>
+					Encode::decode_utf8($nickname));
 			}
 		}
 		else {
diff --git a/debian/changelog b/debian/changelog
index c340f8901..3a581cccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
     .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
   * Add --changesetup mode that allows easily changing options in a
     setup file.
+  * openid: Fix handling of utf-8 nicknames.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
-- 
cgit v1.2.3


From 9834b029467d1bfd6ef44ef26407b6fa2103e39f Mon Sep 17 00:00:00 2001
From: jeanm <jeanm@web>
Date: Mon, 12 Jul 2010 17:43:31 +0000
Subject: Added a comment

---
 .../comment_6_101183817ca4394890bd56a7694bedd9._comment        | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_6_101183817ca4394890bd56a7694bedd9._comment

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_6_101183817ca4394890bd56a7694bedd9._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_6_101183817ca4394890bd56a7694bedd9._comment
new file mode 100644
index 000000000..25a4e8bae
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_6_101183817ca4394890bd56a7694bedd9._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="jeanm"
+ ip="81.56.145.104"
+ subject="comment 6"
+ date="2010-07-12T17:43:31Z"
+ content="""
+I'm using apache and mostly firefox. 
+I've tried some changes in my config but still the same problem, then I fell ill and unable to try anything more. Now I seem to be better and I will go back to the problem soon.
+Thx
+"""]]
-- 
cgit v1.2.3


From 911c9b01f1f8f710944791e523323b3bd1600378 Mon Sep 17 00:00:00 2001
From: test <test@web>
Date: Mon, 12 Jul 2010 19:02:30 +0000
Subject:

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index f386adec4..32957f86c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,6 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-> This is a blockquote.
+> This is a blockerquote.
 >
 > This is the first level of quoting.
 >
-- 
cgit v1.2.3


From 0eee3fe2a210c0f4ef581259e5e45c49ad1dfada Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 12 Jul 2010 15:39:32 -0400
Subject: merged filter-full

---
 debian/changelog              | 7 +++++++
 doc/bugs/po_vs_templates.mdwn | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3a581cccb..699fae7fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,13 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * Add --changesetup mode that allows easily changing options in a
     setup file.
   * openid: Fix handling of utf-8 nicknames.
+  * Clarified what the filter hook should be passed: Only be the raw,
+    complete text of a page. Not a snippet, or data read in from an
+    unrelated file.
+  * template: Do not pass filled in template through filter hook.
+    Avoids causing breakage in po plugin.
+  * color, comments, conditional, cutpaste, more, sidebar, toggle: Also
+    avoid unnecessary calls to filter hook.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index 9fd0de694..d826546e6 100644
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -45,4 +45,4 @@ This has been fixed in my po branch.
 >>> you found this solution, as I didn't like changing the filter
 >>> prototype. I believe you can now merge this code. --[[intrigeri]]
 
-[[!tag patch]]
+[[!tag patch done]]
-- 
cgit v1.2.3


From 718d9413fb39db52cff4975dac1c09afc0ca8f79 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 11:58:09 +0200
Subject: po: added an optional target percentage to needstranslation (cherry
 picked from commit 98cc9460ac67fee606437712882cfa1e5d259729)

---
 IkiWiki/Plugin/po.pm         | 17 +++++++++++++++--
 doc/ikiwiki/pagespec/po.mdwn |  5 ++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 4e6eff94f..903a9500f 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -1249,16 +1249,29 @@ sub match_currentlang ($$;@) {
 
 sub match_needstranslation ($$;@) {
 	my $page=shift;
+	my $wanted=shift;
+
+	if (defined $wanted && $wanted ne "") {
+		if ($wanted !~ /^\d+$/) {
+			return IkiWiki::FailReason->new("parameter is not an integer");
+		}
+		elsif ($wanted > 100) {
+			return IkiWiki::FailReason->new("parameter is greater than 100");
+                }
+        }
+        else {
+		$wanted=100;
+        }
 
 	my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
 	if ($percenttranslated eq 'N/A') {
 		return IkiWiki::FailReason->new("file is not a translatable page");
 	}
-	elsif ($percenttranslated < 100) {
+	elsif ($percenttranslated < $wanted) {
 		return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
         }
 	else {
-		return IkiWiki::FailReason->new("file is fully translated");
+		return IkiWiki::FailReason->new("file is translated enough");
 	}
 }
 
diff --git a/doc/ikiwiki/pagespec/po.mdwn b/doc/ikiwiki/pagespec/po.mdwn
index f8b398575..f9956404c 100644
--- a/doc/ikiwiki/pagespec/po.mdwn
+++ b/doc/ikiwiki/pagespec/po.mdwn
@@ -12,7 +12,10 @@ wiki:
 * "`currentlang()`" - tests whether a page is written in the same
   language as the current page.
 * "`needstranslation()`" - tests whether a page needs translation
-  work. Only slave pages match this PageSpec.
+  work. Only slave pages match this PageSpec. A minimum target
+  translation percentage can optionally be passed as an integer
+  parameter: "`needstranslation(50)`" matches only pages less than 50%
+  translated.
 
 Note that every non-po page is considered to be written in
 `po_master_language`, as specified in `ikiwiki.setup`.
-- 
cgit v1.2.3


From c6ef898851637c78a591a968d3a41a0f38ad843f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 12 Jul 2010 15:42:30 -0400
Subject: changelog

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 699fae7fa..bdf6a6a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
     Avoids causing breakage in po plugin.
   * color, comments, conditional, cutpaste, more, sidebar, toggle: Also
     avoid unnecessary calls to filter hook.
+  * po: needstranslation() pagespec can have a percent specified.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
-- 
cgit v1.2.3


From 40b03990e0d637860872e4cd47e4ee435b23d613 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 12 Jul 2010 15:43:04 -0400
Subject: merged

---
 doc/todo/po_needstranslation_pagespec.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/po_needstranslation_pagespec.mdwn b/doc/todo/po_needstranslation_pagespec.mdwn
index 9ead4ace6..45b7377ea 100644
--- a/doc/todo/po_needstranslation_pagespec.mdwn
+++ b/doc/todo/po_needstranslation_pagespec.mdwn
@@ -9,4 +9,4 @@ Please review. --[[intrigeri]]
 >> This improvement has been implemented as 98cc946 in my po branch.
 >> --[[intrigeri]]
 
-[[!tag patch]]
+[[!tag patch done]]
-- 
cgit v1.2.3


From fd8bcb32eae53a70d0ac020489fda96fb868f8d4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 13 Jul 2010 15:23:44 -0400
Subject: add missing getsetup hook

---
 IkiWiki/Plugin/404.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
index 8adfd5dd9..42cfa9e8a 100644
--- a/IkiWiki/Plugin/404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -10,6 +10,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "cgi", id => '404',  call => \&cgi);
+	hook(type => "getsetup", id => '404',  call => \&getsetup);
 	IkiWiki::loadplugin("goto");
 }
 
-- 
cgit v1.2.3


From 4069bf2bf35676018cc3cb1cf4df3514f43f2658 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Wed, 14 Jul 2010 10:42:39 +0000
Subject:

---
 doc/forum/how_to_enable_multimarkdown__63__.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/forum/how_to_enable_multimarkdown__63__.mdwn

diff --git a/doc/forum/how_to_enable_multimarkdown__63__.mdwn b/doc/forum/how_to_enable_multimarkdown__63__.mdwn
new file mode 100644
index 000000000..8213716e4
--- /dev/null
+++ b/doc/forum/how_to_enable_multimarkdown__63__.mdwn
@@ -0,0 +1,5 @@
+I enabled multimarkdown in my setup file but I get this message 'remote: multimarkdown is enabled, but Text::MultiMarkdown is not installed'.
+I also installed multimarkdown-git for my distro (archlinux), which should take care of installing all required perl modules, I believe.
+What am I missing?
+
+Thanks.
-- 
cgit v1.2.3


From 37859c390f269d7a9629a7b583b2c08f94c56fab Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <hendry@web>
Date: Wed, 14 Jul 2010 14:23:18 +0000
Subject: finding unmoderated comments

---
 doc/plugins/comments.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index 14bd28a04..59f83441c 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -49,5 +49,6 @@ held for moderation. (Or with the [[moderatedcomments]] plugin, all
 comments will be held.) Wiki admins can access the comment moderation queue
 via a button on their Preferences page.
 
-The unmoderated comments are stored in the `srcdir` with a filename ending
-in "._comment_pending". They are not checked into revision control.
+To find unmoderated comments, `find /your/ikiwiki/srcdir -name '*._comment_pending'`
+
+They are not checked into revision control.
-- 
cgit v1.2.3


From 231886e851babcdd00e6243fd989c04628b6977a Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <hendry@web>
Date: Wed, 14 Jul 2010 14:25:10 +0000
Subject:

---
 doc/plugins/comments/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/comments/discussion.mdwn b/doc/plugins/comments/discussion.mdwn
index 396d1f6d4..7cc8a4b2a 100644
--- a/doc/plugins/comments/discussion.mdwn
+++ b/doc/plugins/comments/discussion.mdwn
@@ -1,3 +1,9 @@
+## Moderating comments from the CLI
+
+How do you do this, without using the UI in the Preferences?
+
+Please put this info on the page. Many thanks --[[Kai Hendry]]
+
 ## Why internal pages? (unresolved)
 
 Comments are saved as internal pages, so they can never be edited through the CGI,
-- 
cgit v1.2.3


From eda2357c3e1990df049264735e8751af8962ded5 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Wed, 14 Jul 2010 14:54:25 +0000
Subject:

---
 ...s_incorrect_html___40__interpreted_as_wikilinks__41____63__.html | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html

diff --git a/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
new file mode 100644
index 000000000..5ea0e1fac
--- /dev/null
+++ b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
@@ -0,0 +1,6 @@
+the following markdown code
+`foo [["bar"]]` generates the following output:
+
+foo <span class="createlink"><a href="http://euler/~dabd/wiki/ikiwiki.cgi?page=__34__bar__34__&amp;from=foo&amp;do=create" rel="nofollow">?</a>&#34;bar&#34;</span>
+
+Perhaps this is a bug in the markdown processor?
-- 
cgit v1.2.3


From 2d24281a3abcff8f122a5899c7dee4db29acb00a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Jul 2010 14:27:25 -0400
Subject: Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to
 have the caching problem that was added to work around). Closes: #588623

---
 debian/changelog    | 2 ++
 templates/page.tmpl | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bdf6a6a8e..bb9a43692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * color, comments, conditional, cutpaste, more, sidebar, toggle: Also
     avoid unnecessary calls to filter hook.
   * po: needstranslation() pagespec can have a percent specified.
+  * Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have
+    the caching problem that was added to work around). Closes: #588623
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index da8c2940f..703a6d8de 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -11,7 +11,6 @@
 </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 FAVICON>
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
-- 
cgit v1.2.3


From 2035697cef255b20e128948a39004440cf7a5188 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Jul 2010 14:29:57 -0400
Subject: respond

---
 doc/forum/how_to_enable_multimarkdown__63__.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/forum/how_to_enable_multimarkdown__63__.mdwn b/doc/forum/how_to_enable_multimarkdown__63__.mdwn
index 8213716e4..208aadcb0 100644
--- a/doc/forum/how_to_enable_multimarkdown__63__.mdwn
+++ b/doc/forum/how_to_enable_multimarkdown__63__.mdwn
@@ -3,3 +3,7 @@ I also installed multimarkdown-git for my distro (archlinux), which should take
 What am I missing?
 
 Thanks.
+
+> You are apparently still missing the [[!cpan Text::MultiMarkdown]]
+> perl module. Not being familiar with arch linux, I don't know what
+> multimarkdown-git is, so I can't say more than that.. --[[Joey]]
-- 
cgit v1.2.3


From dac8da27f30c784cc477de9456c4f8e900305f91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Jul 2010 14:32:16 -0400
Subject: more detail on manual moderation

---
 doc/plugins/comments.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index 59f83441c..48b6c6ae7 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -49,6 +49,7 @@ held for moderation. (Or with the [[moderatedcomments]] plugin, all
 comments will be held.) Wiki admins can access the comment moderation queue
 via a button on their Preferences page.
 
+Comments pending moderation are not checked into revision control.
 To find unmoderated comments, `find /your/ikiwiki/srcdir -name '*._comment_pending'`
-
-They are not checked into revision control.
+To manually moderate a comment, just rename the file, removing the
+"_pending" from the end, and check it into revision control.
-- 
cgit v1.2.3


From d47c63b47fd00834205a71f0e2922d0d432fb53b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Jul 2010 14:37:21 -0400
Subject: response

---
 ...ncorrect_html___40__interpreted_as_wikilinks__41____63__.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
index 5ea0e1fac..dd9a909a5 100644
--- a/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
+++ b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
@@ -4,3 +4,12 @@ the following markdown code
 foo <span class="createlink"><a href="http://euler/~dabd/wiki/ikiwiki.cgi?page=__34__bar__34__&amp;from=foo&amp;do=create" rel="nofollow">?</a>&#34;bar&#34;</span>
 
 Perhaps this is a bug in the markdown processor?
+
+<blockquote>
+This has nothing to do with markdown; wikilinks and directives
+are not part of markdown, and just get expanded to html before
+markdown processing.
+
+There is a bug open about this:
+[[bugs/wiki_links_still_processed_inside_code_blocks]] --[[Joey]] 
+</blockquote>
-- 
cgit v1.2.3


From ba4434d70bed55e175071b56b6dee588cbea47c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Jul 2010 14:38:25 -0400
Subject: escape example wikilink

---
 ...rates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
index dd9a909a5..2ba180465 100644
--- a/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
+++ b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
@@ -1,5 +1,5 @@
 the following markdown code
-`foo [["bar"]]` generates the following output:
+`foo \[["bar"]]` generates the following output:
 
 foo <span class="createlink"><a href="http://euler/~dabd/wiki/ikiwiki.cgi?page=__34__bar__34__&amp;from=foo&amp;do=create" rel="nofollow">?</a>&#34;bar&#34;</span>
 
-- 
cgit v1.2.3


From f54c1c5b95423062bd1206fd82b3acf84f1b52d1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Jul 2010 14:39:20 -0400
Subject: note on escaping

---
 ...s_incorrect_html___40__interpreted_as_wikilinks__41____63__.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
index 2ba180465..fe20a05b1 100644
--- a/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
+++ b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
@@ -11,5 +11,9 @@ are not part of markdown, and just get expanded to html before
 markdown processing.
 
 There is a bug open about this:
-[[bugs/wiki_links_still_processed_inside_code_blocks]] --[[Joey]] 
+[[bugs/wiki_links_still_processed_inside_code_blocks]]
+
+Note that escaping the wikilink with a slash will avoid it being expanded
+to html.
+--[[Joey]] 
 </blockquote>
-- 
cgit v1.2.3


From c4cee4cfc56713ceb5ce684b6a72b4b9ef54ebae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Jul 2010 14:44:40 -0400
Subject: add 2 more missing getsetup hooks

---
 IkiWiki/Plugin/goto.pm        | 1 +
 IkiWiki/Plugin/parentlinks.pm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 669211691..42d2425ca 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -7,6 +7,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "cgi", id => 'goto',  call => \&cgi);
+	hook(type => "getsetup", id => 'goto',  call => \&getsetup);
 }
 
 sub getsetup () {
diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index 432613ddf..bbd2c5752 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -9,6 +9,7 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
 	hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);
+	hook(type => "getsetup", id => "parentlinks", call => \&getsetup);
 }
 
 sub getsetup () {
-- 
cgit v1.2.3


From d420a4bdecddcc297eebb233dae8d69ba45c8e1a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Jul 2010 14:47:17 -0400
Subject: add section to getsetup info

---
 IkiWiki/Plugin/skeleton.pm.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index adffc91c9..c3a3b0c01 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -52,6 +52,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "misc",
 		},
 		skeleton => {
 			type => "boolean",
-- 
cgit v1.2.3


From 7a04e2d4161d2f23f92bc87e23349354c06e820b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Jul 2010 14:47:29 -0400
Subject: add getsetup hook

---
 IkiWiki/Plugin/filecheck.pm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 1549b82db..d00b6dfd3 100644
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -39,6 +39,19 @@ my %units=(		# size in bytes
 	#   -- Joey
 );
 
+sub import {
+	hook(type => "getsetup", id => "filecheck",  call => \&getsetup);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+			section => "misc",
+		},
+}
+
 sub parsesize ($) {
 	my $size=shift;
 
-- 
cgit v1.2.3


From 3b15f0a07b0fc8f4f08846a18a38f349e03bc050 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Thu, 15 Jul 2010 15:37:31 +0000
Subject: Added a comment

---
 .../comment_1_037f858c4d0bcbb708c3efd264379500._comment    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 doc/forum/how_to_enable_multimarkdown__63__/comment_1_037f858c4d0bcbb708c3efd264379500._comment

diff --git a/doc/forum/how_to_enable_multimarkdown__63__/comment_1_037f858c4d0bcbb708c3efd264379500._comment b/doc/forum/how_to_enable_multimarkdown__63__/comment_1_037f858c4d0bcbb708c3efd264379500._comment
new file mode 100644
index 000000000..6045a4a3f
--- /dev/null
+++ b/doc/forum/how_to_enable_multimarkdown__63__/comment_1_037f858c4d0bcbb708c3efd264379500._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
+ nickname="Dário"
+ subject="comment 1"
+ date="2010-07-15T15:37:31Z"
+ content="""
+multimarkdown-git is a package build that fetches the git version of multimarkdown.
+It should install Text::Markdown I believe.
+I tried to install it by hand on the cpan command line but it didn't work either:
+perl -MCPAN -e shell 
+install Text::MultiMarkdown
+
+says couldn't run make file or something.
+"""]]
-- 
cgit v1.2.3


From 39701647be7bd1a1aff05b7152a479a2d492a751 Mon Sep 17 00:00:00 2001
From: tkane <tkane@web>
Date: Fri, 16 Jul 2010 13:18:28 +0000
Subject:

---
 doc/ikiwikiusers.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index d38b1208b..6e5dcfb3f 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -54,6 +54,7 @@ Projects & Organizations
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
 * [Apua IT](http://apua.se/)
+* [PDFpirate Community](http://community.pdfpirate.org/)
 
 Personal sites and blogs
 ========================
@@ -150,6 +151,7 @@ Personal sites and blogs
 * [Mukund](https://www.mukund.org/)
 * [Nicolas Schodet](http://ni.fr.eu.org/)
 * [weakish](http://weakish.github.com)
+* [Thomas Kane](http://planetkane.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 296955ea37c36d3e5ed7bad7d2b04b88f7eb97e3 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 16 Jul 2010 19:52:06 +0200
Subject: Fix a couple of grammar errors.

---
 doc/templates.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 9eb12e819..bfb6a439a 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -29,7 +29,7 @@ pages in the wiki.
 
 The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can
 be used to make new pages default to containing text from a template
-page, which can be filled as out the page is edited.
+page, which can be filled out as the page is edited.
 """]]
 
 [[!if test="(enabled(template) or enabled(edittemplate))
@@ -56,7 +56,7 @@ html out of ikiwiki and in the templates.
 * `archivepage.tmpl` - Used for listing a page in a blog archive page.
 * `titlepage.tmpl` - Used for listing a page by title in a blog archive page.
 * `microblog.tmpl` - Used for showing a microblogging post inline.
-* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
+* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)
 * `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.
 * `aggregatepost.tmpl` - Used by the aggregate plugin to create
   a page for a post.
-- 
cgit v1.2.3


From 855cfd0ec741698326ae712b031a7aa28c832327 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <joey@web>
Date: Fri, 16 Jul 2010 19:44:55 +0000
Subject: Added a comment

---
 .../comment_2_b7d512a535490dabf8d6ce55439741c7._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/how_to_enable_multimarkdown__63__/comment_2_b7d512a535490dabf8d6ce55439741c7._comment

diff --git a/doc/forum/how_to_enable_multimarkdown__63__/comment_2_b7d512a535490dabf8d6ce55439741c7._comment b/doc/forum/how_to_enable_multimarkdown__63__/comment_2_b7d512a535490dabf8d6ce55439741c7._comment
new file mode 100644
index 000000000..804b71c67
--- /dev/null
+++ b/doc/forum/how_to_enable_multimarkdown__63__/comment_2_b7d512a535490dabf8d6ce55439741c7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 2"
+ date="2010-07-16T19:44:55Z"
+ content="""
+All I can tell you is that, if multimarkdown is correctly installed (ie, if `perl -e 'use Text::MultiMarkdown'` runs successfully), ikiwiki can use it. 
+"""]]
-- 
cgit v1.2.3


From 936dc6fc8ed7bbb05ad858c04894e317924fef8f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 16 Jul 2010 16:05:59 -0400
Subject: add test of file replace

---
 t/replace.t | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100755 t/replace.t

diff --git a/t/replace.t b/t/replace.t
new file mode 100755
index 000000000..7d91f772f
--- /dev/null
+++ b/t/replace.t
@@ -0,0 +1,34 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More 'no_plan';
+
+# setup
+my $srcdir="t/tmp/src";
+my $destdir="t/tmp/dest";
+ok(! system("make -s ikiwiki.out"));
+ok(! system("mkdir -p $srcdir"));
+
+# runs ikiwiki to build test site
+sub runiki {
+	ok(! system("perl -I. ./ikiwiki.out -plugin html -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates $srcdir $destdir @_"));
+}
+sub refreshiki {
+	runiki();
+}
+sub setupiki {
+	ok(! system("rm -rf $srcdir/.ikiwiki $destdir"));
+	runiki("--rebuild");
+}
+
+# At one point, changing the extension of the source file of a page caused
+# ikiwiki to fail.
+ok(! system("touch $srcdir/foo.mdwn"));
+setupiki();
+ok(! system("mv $srcdir/foo.mdwn $srcdir/foo.html"));
+refreshiki();
+
+# Changing a non-page file into a page could also cause ikiwiki to fail.
+
+# cleanup
+ok(! system("rm -rf t/tmp"));
-- 
cgit v1.2.3


From fd842e03e6a9d7b14bd161cc7ff6d9d48e8bf00c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 16 Jul 2010 16:10:44 -0400
Subject: add 2 failing test cases

---
 t/replace.t | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/t/replace.t b/t/replace.t
index 7d91f772f..04791d9f7 100755
--- a/t/replace.t
+++ b/t/replace.t
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# Tests for bugs relating to replacing/renaming files in the srcdir.
 use warnings;
 use strict;
 use Test::More 'no_plan';
@@ -7,7 +8,6 @@ use Test::More 'no_plan';
 my $srcdir="t/tmp/src";
 my $destdir="t/tmp/dest";
 ok(! system("make -s ikiwiki.out"));
-ok(! system("mkdir -p $srcdir"));
 
 # runs ikiwiki to build test site
 sub runiki {
@@ -20,15 +20,34 @@ sub setupiki {
 	ok(! system("rm -rf $srcdir/.ikiwiki $destdir"));
 	runiki("--rebuild");
 }
+sub newsrcdir {
+	ok(! system("rm -rf $srcdir $destdir"));
+	ok(! system("mkdir -p $srcdir"));
+}
 
 # At one point, changing the extension of the source file of a page caused
 # ikiwiki to fail.
+newsrcdir();
 ok(! system("touch $srcdir/foo.mdwn"));
 setupiki();
 ok(! system("mv $srcdir/foo.mdwn $srcdir/foo.html"));
 refreshiki();
+ok(! system("mv $srcdir/foo.html $srcdir/foo.mdwn"));
+refreshiki();
 
 # Changing a non-page file into a page could also cause ikiwiki to fail.
+newsrcdir();
+ok(! system("touch $srcdir/foo"));
+setupiki();
+ok(! system("mv $srcdir/foo $srcdir/foo.mdwn"));
+refreshiki();
+
+# Changing a page file into a non-page could also cause ikiwiki to fail.
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+setupiki();
+ok(! system("mv $srcdir/foo.mdwn $srcdir/foo"));
+refreshiki();
 
 # cleanup
 ok(! system("rm -rf t/tmp"));
-- 
cgit v1.2.3


From df925b72fefdcfdf975f4d0fe2e2a36916940704 Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Sat, 17 Jul 2010 11:56:40 +0000
Subject: Add Banu

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 6e5dcfb3f..efa111bae 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -55,6 +55,7 @@ Projects & Organizations
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
 * [Apua IT](http://apua.se/)
 * [PDFpirate Community](http://community.pdfpirate.org/)
+* [Banu](https://www.banu.com/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 41423084295f4b694cdb0ec208ea0a1807dc8a62 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Jul 2010 13:24:40 -0400
Subject: turning into complete source file conflict test suite

---
 t/conflicts.t | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 t/replace.t   | 53 --------------------------------------
 2 files changed, 81 insertions(+), 53 deletions(-)
 create mode 100755 t/conflicts.t
 delete mode 100755 t/replace.t

diff --git a/t/conflicts.t b/t/conflicts.t
new file mode 100755
index 000000000..7748c105f
--- /dev/null
+++ b/t/conflicts.t
@@ -0,0 +1,81 @@
+#!/usr/bin/perl
+# Tests for bugs relating to conflicting files in the srcdir
+use warnings;
+use strict;
+use Test::More 'no_plan';
+
+# setup
+my $srcdir="t/tmp/src";
+my $destdir="t/tmp/dest";
+ok(! system("make -s ikiwiki.out"));
+
+# runs ikiwiki to build test site
+sub runiki {
+	my $testdesc=shift;
+	ok((! system("perl -I. ./ikiwiki.out -plugin txt -plugin rawhtml -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates $srcdir $destdir @_")),
+		$testdesc);
+}
+sub refreshiki {
+	runiki(shift);
+}
+sub setupiki {
+	ok(! system("rm -rf $srcdir/.ikiwiki $destdir"));
+	runiki(shift, "--rebuild");
+}
+sub newsrcdir {
+	ok(! system("rm -rf $srcdir $destdir"));
+	ok(! system("mkdir -p $srcdir"));
+}
+
+# At one point, changing the extension of the source file of a page caused
+# ikiwiki to fail.
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+setupiki("initial setup");
+ok(! system("mv $srcdir/foo.mdwn $srcdir/foo.txt"));
+refreshiki("changed extension of source file of page");
+ok(! system("mv $srcdir/foo.txt $srcdir/foo.mdwn"));
+refreshiki("changed extension of source file of page 2");
+
+# Conflicting page sources is sorta undefined behavior,
+# but should not crash ikiwiki.
+# Added when refreshing
+ok(! system("touch $srcdir/foo.txt"));
+refreshiki("conflicting page sources in refresh");
+# Present during setup
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("touch $srcdir/foo.txt"));
+setupiki("conflicting page sources in setup");
+
+# Changing a page file into a non-page could also cause ikiwiki to fail.
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+setupiki("initial setup");
+ok(! system("mv $srcdir/foo.mdwn $srcdir/foo"));
+refreshiki("page file turned into non-page");
+
+# Changing a non-page file into a page could also cause ikiwiki to fail.
+newsrcdir();
+ok(! system("touch $srcdir/foo"));
+setupiki("initial setup");
+ok(! system("mv $srcdir/foo $srcdir/foo.mdwn"));
+refreshiki("non-page file turned into page");
+
+# What if a page renders to the same html file that a rawhtml file provides?
+# Added when refreshing
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+setupiki("initial setup");
+ok(! system("mkdir -p $srcdir/foo"));
+ok(! system("touch $srcdir/foo/index.html"));
+refreshiki("rawhtml file rendered same as existing page in refresh");
+# Present during setup
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("mkdir -p $srcdir/foo"));
+ok(! system("touch $srcdir/foo/index.html"));
+setupiki("rawhtml file rendered same as existing page in setup");
+
+# cleanup
+ok(! system("rm -rf t/tmp"));
diff --git a/t/replace.t b/t/replace.t
deleted file mode 100755
index 04791d9f7..000000000
--- a/t/replace.t
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/perl
-# Tests for bugs relating to replacing/renaming files in the srcdir.
-use warnings;
-use strict;
-use Test::More 'no_plan';
-
-# setup
-my $srcdir="t/tmp/src";
-my $destdir="t/tmp/dest";
-ok(! system("make -s ikiwiki.out"));
-
-# runs ikiwiki to build test site
-sub runiki {
-	ok(! system("perl -I. ./ikiwiki.out -plugin html -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates $srcdir $destdir @_"));
-}
-sub refreshiki {
-	runiki();
-}
-sub setupiki {
-	ok(! system("rm -rf $srcdir/.ikiwiki $destdir"));
-	runiki("--rebuild");
-}
-sub newsrcdir {
-	ok(! system("rm -rf $srcdir $destdir"));
-	ok(! system("mkdir -p $srcdir"));
-}
-
-# At one point, changing the extension of the source file of a page caused
-# ikiwiki to fail.
-newsrcdir();
-ok(! system("touch $srcdir/foo.mdwn"));
-setupiki();
-ok(! system("mv $srcdir/foo.mdwn $srcdir/foo.html"));
-refreshiki();
-ok(! system("mv $srcdir/foo.html $srcdir/foo.mdwn"));
-refreshiki();
-
-# Changing a non-page file into a page could also cause ikiwiki to fail.
-newsrcdir();
-ok(! system("touch $srcdir/foo"));
-setupiki();
-ok(! system("mv $srcdir/foo $srcdir/foo.mdwn"));
-refreshiki();
-
-# Changing a page file into a non-page could also cause ikiwiki to fail.
-newsrcdir();
-ok(! system("touch $srcdir/foo.mdwn"));
-setupiki();
-ok(! system("mv $srcdir/foo.mdwn $srcdir/foo"));
-refreshiki();
-
-# cleanup
-ok(! system("rm -rf t/tmp"));
-- 
cgit v1.2.3


From bfa4660df78aaae5f7c2b41caeccf6732ed4d74e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Jul 2010 13:30:08 -0400
Subject: update

---
 t/conflicts.t | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/t/conflicts.t b/t/conflicts.t
index 7748c105f..ac5f93b03 100755
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -2,7 +2,7 @@
 # Tests for bugs relating to conflicting files in the srcdir
 use warnings;
 use strict;
-use Test::More 'no_plan';
+use Test::More tests => 48;
 
 # setup
 my $srcdir="t/tmp/src";
@@ -70,6 +70,13 @@ setupiki("initial setup");
 ok(! system("mkdir -p $srcdir/foo"));
 ok(! system("touch $srcdir/foo/index.html"));
 refreshiki("rawhtml file rendered same as existing page in refresh");
+# Inverse added when refreshing
+newsrcdir();
+ok(! system("mkdir -p $srcdir/foo"));
+ok(! system("touch $srcdir/foo/index.html"));
+setupiki("initial setup");
+ok(! system("touch $srcdir/foo.mdwn"));
+refreshiki("page rendered same as existing rawhtml file in refresh");
 # Present during setup
 newsrcdir();
 ok(! system("touch $srcdir/foo.mdwn"));
-- 
cgit v1.2.3


From 709e934a2bae637ee9be48a5c00961bf97e01efc Mon Sep 17 00:00:00 2001
From: bento <bento@web>
Date: Sat, 17 Jul 2010 20:29:56 +0000
Subject: support-statement

---
 doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
index d0c09796f..189b46507 100644
--- a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
+++ b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
@@ -29,3 +29,5 @@ I've written a new plugin, sectiontemplate, available in the `page_tmpl` branch
 >>>
 >>> I do still think combining this with pagetemplate would be good.
 >>> --[[Joey]] 
+
+>>>> This is exactly what I was looking for and it took me a while to find it. I very much support the idea to provide this as a regular plugin, be it merged with pagetemplate or stand-alone. Thank you for your work and code! --[BenTo]]
-- 
cgit v1.2.3


From 7089c61b673076a4db41eeaa5606b3f6b07d101e Mon Sep 17 00:00:00 2001
From: bento <bento@web>
Date: Sat, 17 Jul 2010 20:30:54 +0000
Subject: typo

---
 doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
index 189b46507..b130f4ec5 100644
--- a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
+++ b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn
@@ -30,4 +30,4 @@ I've written a new plugin, sectiontemplate, available in the `page_tmpl` branch
 >>> I do still think combining this with pagetemplate would be good.
 >>> --[[Joey]] 
 
->>>> This is exactly what I was looking for and it took me a while to find it. I very much support the idea to provide this as a regular plugin, be it merged with pagetemplate or stand-alone. Thank you for your work and code! --[BenTo]]
+>>>> This is exactly what I was looking for and it took me a while to find it. I very much support the idea to provide this as a regular plugin, be it merged with pagetemplate or stand-alone. Thank you for your work and code! --BenTo
-- 
cgit v1.2.3


From 9ea48dd49bc37bca9c7efe9a35541360b67a51aa Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Sun, 18 Jul 2010 14:07:06 +0000
Subject: this plugin is different from the [[html]] plugin and it is safe in
 most cases.

---
 doc/plugins/rawhtml/discussion.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/rawhtml/discussion.mdwn b/doc/plugins/rawhtml/discussion.mdwn
index e63e4acb9..9ed8230ba 100644
--- a/doc/plugins/rawhtml/discussion.mdwn
+++ b/doc/plugins/rawhtml/discussion.mdwn
@@ -2,4 +2,6 @@ Is there anyway to allow this only on locked pages?  I'd like to be able to do r
 
 > Not at the moment. Long-term, ikiwiki needs some general permission mechanisms that encompass this sort of issue. --[[JoshTriplett]]
 
->> Thanks.  Bummer though, looking forward to when this is possible. :-) -- Adam.
\ No newline at end of file
+>> Thanks.  Bummer though, looking forward to when this is possible. :-) -- Adam.
+
+> Well, this plugin is different from the [[html]] plugin.  It **copies** html files.  So users cannot do raw HTML via cgi.  Thus it is safe in most cases.  -- weakish
-- 
cgit v1.2.3


From a291f24be6af3f08573efa72f8809868120cfab4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 13:50:06 -0400
Subject: some other (similar) failure cases

---
 t/conflicts.t | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/t/conflicts.t b/t/conflicts.t
index ac5f93b03..ac270e806 100755
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -48,6 +48,22 @@ ok(! system("touch $srcdir/foo.mdwn"));
 ok(! system("touch $srcdir/foo.txt"));
 setupiki("conflicting page sources in setup");
 
+# Page and non-page file with same pagename.
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("touch $srcdir/foo"));
+setupiki("conflicting page and non-page in setup");
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+setupiki("initial setup");
+ok(! system("touch $srcdir/foo"));
+refreshiki("conflicting page added (non-page already existing) in refresh");
+newsrcdir();
+ok(! system("touch $srcdir/foo"));
+setupiki("initial setup");
+ok(! system("touch $srcdir/foo.mdwn"));
+refreshiki("conflicting non-page added (page already existing) in refresh");
+
 # Changing a page file into a non-page could also cause ikiwiki to fail.
 newsrcdir();
 ok(! system("touch $srcdir/foo.mdwn"));
-- 
cgit v1.2.3


From 775fefeea72209cc4eae1bbe314bd94491bcb1b3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 13:52:03 -0400
Subject: class of bugs I am working on

---
 doc/bugs/conflicts.mdwn | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 doc/bugs/conflicts.mdwn

diff --git a/doc/bugs/conflicts.mdwn b/doc/bugs/conflicts.mdwn
new file mode 100644
index 000000000..a67450290
--- /dev/null
+++ b/doc/bugs/conflicts.mdwn
@@ -0,0 +1,30 @@
+The `conflicts` testcase has 4 failing test cases. The underlaying problem 
+is that there are multiple possible source files that can create the same
+destination files.
+
+1. `foo.mdwn` is in srcdir, rendered to destdir. Then
+   it is removed, and `foo` is added, which will be rendered
+   raw to destdir. Since the `foo/` directory still exists,
+   it fails.
+1. `foo` is added to srcdir, rendered raw to destdir.
+   Then it is removed from srcdir, and `foo.mdwn` is added.
+   The `foo` file is still present in the destdir, and mkdir
+   of the directory `foo/` fails.
+1. `foo.mdwn` renders to `foo/index.html`. Then `foo/index.html`
+   is added to the srcdir, using rawhtml. It renders to the same 
+   thing.
+1. `foo/index.html` in srcdir is rendered to same thing in destdir
+   using rawhtml. Then `foo.mdwn` is added; renders same thing.
+
+Note that another case, that of page `foo.mdwn` and page `foo.txt`, that
+both render to `foo/index.html`, used to cause problems, but no longer
+crashes ikiwiki. It now only complains in this situation, and which
+file "wins" is undefined. The fix for this relied on both pages being
+named `foo`; but in the above cases, the source files have different
+pagenames.
+
+One approach: Beef up checking in `will_render` to detect when the same
+destination file is rendered by multiple pages. Or when one page renders
+a file that is a parent directory of the rendered file of another page.
+It could warn, rather than erroring. The last page rendered would "win";
+generating the destdir file.
-- 
cgit v1.2.3


From 773db5a35e5b81fee3f1f8bf48dffc1dd4f3e2fe Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 16:28:39 -0400
Subject: avoid error if two source files render the same destination file

There are two sub-caces. If both source files still exist, the winner that
renders the destination file is undefined. If one source file is deleted
and the other added, in a refresh, the new file will take over the
destination file.
---
 IkiWiki.pm    | 14 +++++++++++++-
 t/conflicts.t |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 701f7137d..4acc5508a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -879,7 +879,19 @@ sub will_render ($$;$) {
 	# Important security check.
 	if (-e "$config{destdir}/$dest" && ! $config{rebuild} &&
 	    ! grep { $_ eq $dest } (@{$renderedfiles{$page}}, @{$oldrenderedfiles{$page}}, @{$wikistate{editpage}{previews}})) {
-		error("$config{destdir}/$dest independently created, not overwriting with version from $page");
+		my $from_other_page=0;
+		foreach my $p (keys %renderedfiles) {
+			if (grep {
+				$_ eq $dest ||
+				dirname($_) eq $dest
+			    } @{$renderedfiles{$p}}) {
+				$from_other_page=1;
+				last;
+			}
+		}
+
+		error("$config{destdir}/$dest independently created, not overwriting with version from $page")
+			unless $from_other_page;
 	}
 
 	if (! $clear || $cleared{$page}) {
diff --git a/t/conflicts.t b/t/conflicts.t
index ac270e806..81b2c12cb 100755
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -2,7 +2,7 @@
 # Tests for bugs relating to conflicting files in the srcdir
 use warnings;
 use strict;
-use Test::More tests => 48;
+use Test::More tests => 76;
 
 # setup
 my $srcdir="t/tmp/src";
-- 
cgit v1.2.3


From d6cb4436bd93d0c49f629f46eb0f0ada0fa0ef3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 16:45:44 -0400
Subject: 2 more cases

---
 t/conflicts.t | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/t/conflicts.t b/t/conflicts.t
index 81b2c12cb..4664e1b6e 100755
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -2,7 +2,7 @@
 # Tests for bugs relating to conflicting files in the srcdir
 use warnings;
 use strict;
-use Test::More tests => 76;
+use Test::More tests => 92;
 
 # setup
 my $srcdir="t/tmp/src";
@@ -86,6 +86,13 @@ setupiki("initial setup");
 ok(! system("mkdir -p $srcdir/foo"));
 ok(! system("touch $srcdir/foo/index.html"));
 refreshiki("rawhtml file rendered same as existing page in refresh");
+# Moved when refreshing
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+setupiki("initial setup");
+ok(! system("mkdir -p $srcdir/foo"));
+ok(! system("mv $srcdir/foo.mdwn $srcdir/foo/index.html"));
+refreshiki("existing page moved to rawhtml file in refresh");
 # Inverse added when refreshing
 newsrcdir();
 ok(! system("mkdir -p $srcdir/foo"));
@@ -93,6 +100,13 @@ ok(! system("touch $srcdir/foo/index.html"));
 setupiki("initial setup");
 ok(! system("touch $srcdir/foo.mdwn"));
 refreshiki("page rendered same as existing rawhtml file in refresh");
+# Inverse moved when refreshing
+newsrcdir();
+ok(! system("mkdir -p $srcdir/foo"));
+ok(! system("touch $srcdir/foo/index.html"));
+setupiki("initial setup");
+ok(! system("mv $srcdir/foo/index.html $srcdir/foo.mdwn"));
+refreshiki("rawhtml file moved to page in refresh");
 # Present during setup
 newsrcdir();
 ok(! system("touch $srcdir/foo.mdwn"));
-- 
cgit v1.2.3


From 2bf3a6edbbd32c66db8480d598c2c328d8a8a1b8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 16:47:52 -0400
Subject: check oldrenderedfiles too

Handles the case where foo.mdwn is moved too foo/index.html
---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 4acc5508a..85b542486 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -884,7 +884,7 @@ sub will_render ($$;$) {
 			if (grep {
 				$_ eq $dest ||
 				dirname($_) eq $dest
-			    } @{$renderedfiles{$p}}) {
+			    } @{$renderedfiles{$p}}, @{$oldrenderedfiles{$p}}) {
 				$from_other_page=1;
 				last;
 			}
-- 
cgit v1.2.3


From 1dbb2632ef5f7eaa1f5745d587b1373b45b09e56 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 17:16:39 -0400
Subject: another class of conflicts: subdir/file conflicts

---
 t/conflicts.t | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/t/conflicts.t b/t/conflicts.t
index 4664e1b6e..d7e04d3ae 100755
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -2,7 +2,7 @@
 # Tests for bugs relating to conflicting files in the srcdir
 use warnings;
 use strict;
-use Test::More tests => 92;
+use Test::More tests => 106;
 
 # setup
 my $srcdir="t/tmp/src";
@@ -64,6 +64,19 @@ setupiki("initial setup");
 ok(! system("touch $srcdir/foo.mdwn"));
 refreshiki("conflicting non-page added (page already existing) in refresh");
 
+# Page that renders to a file that is also a subdirectory holding another
+# file.
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("mkdir -p $srcdir/foo/index.html"));
+ok(! system("touch $srcdir/foo/index.html/bar.mdwn"));
+setupiki("conflicting page file and subdirectory");
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("mkdir -p $srcdir/foo/index.html"));
+ok(! system("touch $srcdir/foo/index.html/bar"));
+setupiki("conflicting page file and subdirectory 2");
+
 # Changing a page file into a non-page could also cause ikiwiki to fail.
 newsrcdir();
 ok(! system("touch $srcdir/foo.mdwn"));
-- 
cgit v1.2.3


From e674bb1445378ce43ae60720e42d6c418270001a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 17:30:46 -0400
Subject: fix other 2 cases of conflicting destdir files

Cleanly fixed case where destdir file failed to be written because there
was a directory with the same name. This can be detected with no extra
system calls, and dealt with by finding all pages that wrote files
inside the directory, and removing them and the directory.

The other, inverse case would be expensive to detect in will_render,
since it would need to check each parent directory of the file to see
if the directory is really a conflicting file. But prep_writefile
already does a similar scan for symlinks in the path, so I added code
there to remove the conflicting file. This fix assumes that the file
is written using writefile, and not some other means (but using other means
would be a security hole too, so hopefully nothing does).
---
 IkiWiki.pm              | 29 +++++++++++++++++++++++++++--
 debian/changelog        |  2 ++
 doc/bugs/conflicts.mdwn |  2 ++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 85b542486..fa49b2c34 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -823,6 +823,17 @@ sub prep_writefile ($$) {
 		if (-l "$destdir/$test") {
 			error("cannot write to a symlink ($test)");
 		}
+		if (-f _ && $test ne $file) {
+			# Remove conflicting file.
+			foreach my $p (keys %renderedfiles, keys %oldrenderedfiles) {
+				foreach my $f (@{$renderedfiles{$p}}, @{$oldrenderedfiles{$p}}) {
+					if ($f eq $test) {
+						unlink("$destdir/$test");
+						last;
+					}
+				}
+			}
+		}
 		$test=dirname($test);
 	}
 
@@ -876,11 +887,12 @@ sub will_render ($$;$) {
 	my $dest=shift;
 	my $clear=shift;
 
-	# Important security check.
+	# Important security check for independently created files.
 	if (-e "$config{destdir}/$dest" && ! $config{rebuild} &&
 	    ! grep { $_ eq $dest } (@{$renderedfiles{$page}}, @{$oldrenderedfiles{$page}}, @{$wikistate{editpage}{previews}})) {
 		my $from_other_page=0;
-		foreach my $p (keys %renderedfiles) {
+	    	# Expensive, but rarely runs.
+		foreach my $p (keys %renderedfiles, keys %oldrenderedfiles) {
 			if (grep {
 				$_ eq $dest ||
 				dirname($_) eq $dest
@@ -894,6 +906,19 @@ sub will_render ($$;$) {
 			unless $from_other_page;
 	}
 
+	# If $dest exists as a directory, remove conflicting files in it
+	# rendered from other pages.
+	if (-d _) {
+		foreach my $p (keys %renderedfiles, keys %oldrenderedfiles) {
+			foreach my $f (@{$renderedfiles{$p}}, @{$oldrenderedfiles{$p}}) {
+				if ($f eq dirname($dest) || dirname($f) eq $dest) {
+					unlink("$config{destdir}/$f");
+					rmdir(dirname("$config{destdir}/$f"));
+				}
+			}
+		}
+	}
+
 	if (! $clear || $cleared{$page}) {
 		$renderedfiles{$page}=[$dest, grep { $_ ne $dest } @{$renderedfiles{$page}}];
 	}
diff --git a/debian/changelog b/debian/changelog
index bb9a43692..21b5d01fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * po: needstranslation() pagespec can have a percent specified.
   * Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have
     the caching problem that was added to work around). Closes: #588623
+  * Made much more robust in cases where multiple source files produce
+    conflicting files/directories in the destdir.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/bugs/conflicts.mdwn b/doc/bugs/conflicts.mdwn
index a67450290..bef0f54cd 100644
--- a/doc/bugs/conflicts.mdwn
+++ b/doc/bugs/conflicts.mdwn
@@ -28,3 +28,5 @@ destination file is rendered by multiple pages. Or when one page renders
 a file that is a parent directory of the rendered file of another page.
 It could warn, rather than erroring. The last page rendered would "win";
 generating the destdir file.
+
+[[done]]
-- 
cgit v1.2.3


From eeb8e11d65ba5a8ea4db63beafa3cabebf0a7dc2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 17:47:36 -0400
Subject: remove dead case

---
 IkiWiki.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index fa49b2c34..2cf0ad819 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -911,7 +911,7 @@ sub will_render ($$;$) {
 	if (-d _) {
 		foreach my $p (keys %renderedfiles, keys %oldrenderedfiles) {
 			foreach my $f (@{$renderedfiles{$p}}, @{$oldrenderedfiles{$p}}) {
-				if ($f eq dirname($dest) || dirname($f) eq $dest) {
+				if (dirname($f) eq $dest) {
 					unlink("$config{destdir}/$f");
 					rmdir(dirname("$config{destdir}/$f"));
 				}
-- 
cgit v1.2.3


From ba36419b0fb43b12816fed24f9eacb70b04d2e7c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 17:56:58 -0400
Subject: update standards-version

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index bba89d82e..0562a4a99 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libfile-chdir-perl,
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
 Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki
-- 
cgit v1.2.3


From e041555e4fdb10723a1c311f6c9b31f995a973d8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 17:59:33 -0400
Subject: Updated French program translation from Philippe Batailler. Closes:
 #589423

---
 debian/changelog |   1 +
 po/fr.po         | 410 ++++++++++++++++++++++++-------------------------------
 2 files changed, 179 insertions(+), 232 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21b5d01fa..b7387a050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
     the caching problem that was added to work around). Closes: #588623
   * Made much more robust in cases where multiple source files produce
     conflicting files/directories in the destdir.
+  * Updated French program translation from Philippe Batailler. Closes: #589423
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/po/fr.po b/po/fr.po
index ec21d51ab..94e6d6b02 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,16 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 14:18-0400\n"
-"PO-Revision-Date: 2009-08-17 10:06+0200\n"
+"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"PO-Revision-Date: 2010-07-17 18:13+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:162
+#: ../IkiWiki/CGI.pm:116
+msgid "You need to log in first."
+msgstr "Vous devez d'abord vous identifier."
+
+#: ../IkiWiki/CGI.pm:149
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -26,35 +29,35 @@ msgstr ""
 "Erreur de configuration probable : sslcookie est positionné mais vous tentez "
 "de vous connecter avec http au lieu de https"
 
-#: ../IkiWiki/CGI.pm:165
+#: ../IkiWiki/CGI.pm:152
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Échec de l'identification, vous devez autoriser les cookies."
 
-#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
+#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
 msgid "Your login session has expired."
 msgstr "Session d'authentification expirée."
 
-#: ../IkiWiki/CGI.pm:205
+#: ../IkiWiki/CGI.pm:192
 msgid "Login"
 msgstr "S’identifier"
 
-#: ../IkiWiki/CGI.pm:206
+#: ../IkiWiki/CGI.pm:193
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../IkiWiki/CGI.pm:207
+#: ../IkiWiki/CGI.pm:194
 msgid "Admin"
 msgstr "Administrateur"
 
-#: ../IkiWiki/CGI.pm:247
+#: ../IkiWiki/CGI.pm:234
 msgid "Preferences saved."
 msgstr "Les préférences ont été enregistrées."
 
-#: ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:284
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
 msgid "Error"
 msgstr "Erreur"
 
@@ -135,7 +138,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "Suppression du compartiment S3 (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
 msgid "done"
 msgstr "Terminé"
 
@@ -173,7 +176,7 @@ msgstr "Nom de la pièce jointe incorrect"
 msgid "attachment upload"
 msgstr "Envoi de la pièce jointe"
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:105
 msgid "automatic index generation"
 msgstr "Génération de l'index automatique"
 
@@ -194,91 +197,80 @@ msgstr "%s sur %s"
 msgid "There are no broken links!"
 msgstr "Aucun lien cassé !"
 
-#: ../IkiWiki/Plugin/comments.pm:112
-#, fuzzy, perl-format
-msgid "this comment needs %s"
-msgstr "Faire un commentaire sur %s"
-
-#: ../IkiWiki/Plugin/comments.pm:115
-#, fuzzy
-msgid "moderation"
-msgstr "Modération du commentaire"
-
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Format de page non reconnu %s"
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:130
 msgid "comment must have content"
 msgstr "Un commentaire doit avoir un contenu."
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "Nom de page incorrect"
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:345
 #, perl-format
 msgid "commenting on %s"
 msgstr "Faire un commentaire sur %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "La page '%s' n'existe pas, commentaire impossible."
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Le commentaire pour la page '%s' est terminé."
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:467
 msgid "comment stored for moderation"
 msgstr "Le commentaire a été enregistré, en attente de « modération »"
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "Your comment will be posted after moderator review"
 msgstr "Votre commentaire sera publié après vérification par le modérateur"
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:482
 msgid "Added a comment"
 msgstr "Commentaire ajouté"
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:486
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
 msgid "you are not logged in as an admin"
 msgstr "Vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:579
 msgid "Comment moderation"
 msgstr "Modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:618
 msgid "comment moderation"
 msgstr "modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:789
-#, fuzzy, perl-format
+#: ../IkiWiki/Plugin/comments.pm:761
+#, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
-msgstr[0] "Commentaires"
-msgstr[1] "Commentaires"
+msgstr[0] "%i commentaire"
+msgstr[1] "%i commentaires"
 
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
-#, fuzzy
+#: ../IkiWiki/Plugin/comments.pm:771
 msgid "Comment"
-msgstr "Commentaires"
+msgstr "poster un commentaire"
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
 #: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
@@ -306,14 +298,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s"
 msgid "%s is not an editable page"
 msgstr "%s n'est pas une page éditable"
 
-#: ../IkiWiki/Plugin/editpage.pm:294
+#: ../IkiWiki/Plugin/editpage.pm:296
 #, perl-format
 msgid "creating %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:426
 #, perl-format
 msgid "editing %s"
 msgstr "Édition de %s"
@@ -331,11 +323,9 @@ msgstr "correspondance non indiquée"
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s enregistré pour %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "Échec du traitement :"
+#: ../IkiWiki/Plugin/edittemplate.pm:138
+msgid "failed to process"
+msgstr "Échec du traitement"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -345,11 +335,11 @@ msgstr "le format et le texte doivent être indiqués"
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
 msgid "missing page"
 msgstr "Page manquante"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La page %s n'existe pas."
@@ -363,22 +353,22 @@ msgstr "Ce n'est pas une page."
 msgid "%s is an attachment, not a page."
 msgstr "%s est une pièce jointe, pas une page."
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
+#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Vous n'êtes pas autorisé à modifier %s"
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:698
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:702
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -388,7 +378,7 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s."
 msgid "failed to run graphviz"
 msgstr "Échec du lancement de graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:95
 msgid "prog not a valid graphviz program"
 msgstr "Ce programme n'est pas un programme graphviz valable"
 
@@ -410,9 +400,8 @@ msgstr ""
 "Continuation malgré tout."
 
 #: ../IkiWiki/Plugin/htmltidy.pm:50
-#, fuzzy
 msgid "htmltidy failed to parse this html"
-msgstr "Aucun smiley n'a pu être analysé"
+msgstr "htmltidy n'a pas pu analyser cette page html"
 
 #: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
@@ -461,12 +450,12 @@ msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble."
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:342
+#: ../IkiWiki/Plugin/inline.pm:333
 #, perl-format
-msgid "template %s not found"
-msgstr "Modèle de page %s introuvable"
+msgid "nonexistant template %s"
+msgstr "Le modèle de page %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:625
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -477,7 +466,7 @@ msgstr "Échec du lancement de dot"
 
 #: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
-msgstr ""
+msgstr "linkmap"
 
 #: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
@@ -495,23 +484,18 @@ msgstr ""
 "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown "
 "(%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:162
 msgid "stylesheet not found"
 msgstr "Feuille de style introuvable "
 
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:200
 msgid "redir page not found"
 msgstr "Page de redirection introuvable"
 
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:214
 msgid "redir cycle is not allowed"
 msgstr "Redirection cyclique non autorisée"
 
-#: ../IkiWiki/Plugin/meta.pm:387
-#, fuzzy
-msgid "sort=meta requires a parameter"
-msgstr "les paramètres « from » et « to » sont nécessaires."
-
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Miroirs"
@@ -520,19 +504,25 @@ msgstr "Miroirs"
 msgid "Mirror"
 msgstr "Miroir"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:57
-#, fuzzy
+#: ../IkiWiki/Plugin/moderatedcomments.pm:42
 msgid "comment needs moderation"
-msgstr "modération du commentaire"
+msgstr "le commentaire doit passer par une instance de modération"
 
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "lire la suite"
 
-#: ../IkiWiki/Plugin/openid.pm:58
-#, fuzzy, perl-format
-msgid "failed to load openid module: "
-msgstr "Échec de la compilation de %s"
+#: ../IkiWiki/Plugin/norcs.pm:66
+msgid "getctime not implemented"
+msgstr "getctime n'est pas implémenté"
+
+#: ../IkiWiki/Plugin/openid.pm:62
+msgid "Log in with"
+msgstr "S'identifier en tant que"
+
+#: ../IkiWiki/Plugin/openid.pm:65
+msgid "Get an OpenID"
+msgstr "Obtenir un compte OpenID"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
@@ -542,43 +532,43 @@ msgstr "Toutes les pages sont liées à d'autres pages."
 msgid "bad or missing template"
 msgstr "Modèle de page incorrect ou manquant"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:231
+#: ../IkiWiki/Plugin/passwordauth.pm:229
 msgid "Your user page: "
-msgstr ""
+msgstr "Votre page d'utilisateur :"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:238
+#: ../IkiWiki/Plugin/passwordauth.pm:236
 msgid "Create your user page"
-msgstr ""
+msgstr "Création de votre page d'utilisateur"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:268
+#: ../IkiWiki/Plugin/passwordauth.pm:264
 msgid "Account creation successful. Now you can Login."
 msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:271
+#: ../IkiWiki/Plugin/passwordauth.pm:267
 msgid "Error creating account."
 msgstr "Erreur lors de la création du compte."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:278
+#: ../IkiWiki/Plugin/passwordauth.pm:274
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Aucune adresse indiquée. Impossible d'envoyer les instructions pour "
 "réinitialiser le mot de passe."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:312
+#: ../IkiWiki/Plugin/passwordauth.pm:308
 msgid "Failed to send mail"
 msgstr "Impossible d'envoyer un courriel"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:314
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Vous avez reçu un message contenant les instructions pour réinitialiser le "
 "mot de passe"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:349
+#: ../IkiWiki/Plugin/passwordauth.pm:345
 msgid "incorrect password reset url"
 msgstr "Adresse pour la réinitialisation du mot de passe incorrecte"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:352
+#: ../IkiWiki/Plugin/passwordauth.pm:348
 msgid "password reset denied"
 msgstr "réinitialisation du mot de passe refusée"
 
@@ -610,12 +600,12 @@ msgstr ""
 "Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
 "version 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:139
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un code de langue valable"
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:151
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -623,7 +613,7 @@ msgstr ""
 "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
 "défaut."
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:156
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -631,23 +621,23 @@ msgstr ""
 "po_link_to=negotiated nécessite que usedirs soit activé, retour à "
 "po_link_to=default."
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:386
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:428
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:452
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -655,7 +645,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:472
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -663,50 +653,50 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:871
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:885
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:894
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:900
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:936
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:949
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1033
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
+#: ../IkiWiki/Plugin/po.pm:1142
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1101
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1154
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -808,8 +798,7 @@ msgstr "pourcentage %s illégal"
 #: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
-"L'un des paramètres « percent », « totalpages » ou « donepages » est "
-"nécessaire."
+"L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire."
 
 #: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
@@ -830,16 +819,16 @@ msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé"
 msgid "%s is not a file"
 msgstr "%s n'est pas un fichier"
 
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:135
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "Suppression de %s confirmée"
 
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:172
 msgid "Please select the attachments to remove."
 msgstr "Veuillez choisir la pièce jointe à supprimer"
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:212
 msgid "removed"
 msgstr "supprimé"
 
@@ -852,64 +841,64 @@ msgstr "%s n'est pas dans srcdir. Impossible de le renommer"
 msgid "no change to the file name was specified"
 msgstr "Aucun changement dans le nom du fichier n'a été spécifié"
 
-#: ../IkiWiki/Plugin/rename.pm:68
+#: ../IkiWiki/Plugin/rename.pm:69
 #, perl-format
 msgid "illegal name"
 msgstr "Appellation interdite"
 
-#: ../IkiWiki/Plugin/rename.pm:73
+#: ../IkiWiki/Plugin/rename.pm:74
 #, perl-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: ../IkiWiki/Plugin/rename.pm:79
+#: ../IkiWiki/Plugin/rename.pm:80
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s existe déjà sur le disque"
 
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr "%s renommé"
 
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:162
 msgid "Also rename SubPages and attachments"
 msgstr "« SubPages » et attachements renommés."
 
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:249
 msgid "Only one attachment can be renamed at a time."
 msgstr "Modification de pièce jointe : une seule à la fois"
 
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:252
 msgid "Please select the attachment to rename."
 msgstr "Veuillez sélectionner la pièce jointe à renommer"
 
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:349
 #, perl-format
 msgid "rename %s to %s"
 msgstr "Renomme %s en %s"
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:573
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "mise à jour, suite au changement de %s en %s"
 
 #: ../IkiWiki/Plugin/rsync.pm:37
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to execute rsync_command: %s"
-msgstr "Impossible de lire %s"
+msgstr "Impossible d'exécuter la commande rsync : %s"
 
 #: ../IkiWiki/Plugin/rsync.pm:40
 #, perl-format
 msgid "rsync_command exited %d"
-msgstr ""
+msgstr "la commande rsync s'est terminée avec le code : %d"
 
-#: ../IkiWiki/Plugin/search.pm:194
+#: ../IkiWiki/Plugin/search.pm:183
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "Digest::SHA1 est nécessaire pour indexer %s"
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:218
 msgid "search"
 msgstr "recherche"
 
@@ -987,59 +976,58 @@ msgstr "Téléchargement direct des données"
 msgid "parse fail at line %d: %s"
 msgstr "Erreur d'analyse à la ligne %d : %s"
 
-#: ../IkiWiki/Plugin/tag.pm:83
-#, fuzzy, perl-format
-msgid "creating tag page %s"
-msgstr "Création de la nouvelle page %s"
-
-#: ../IkiWiki/Plugin/template.pm:33
+#: ../IkiWiki/Plugin/template.pm:34
 msgid "missing id parameter"
 msgstr "Paramètre d'identification manquant"
 
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "Flux introuvable "
+#: ../IkiWiki/Plugin/template.pm:41
+#, perl-format
+msgid "template %s not found"
+msgstr "Modèle de page %s introuvable"
+
+#: ../IkiWiki/Plugin/template.pm:60
+msgid "failed to process:"
+msgstr "Échec du traitement :"
 
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:71
 msgid "missing tex code"
 msgstr "Il manque le code TeX"
 
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:123
 msgid "failed to generate image from code"
 msgstr "Échec de la création de l'image à partir du code"
 
-#: ../IkiWiki/Plugin/websetup.pm:105
-#, fuzzy, perl-format
+#: ../IkiWiki/Plugin/websetup.pm:91
+#, perl-format
 msgid "%s plugin:"
-msgstr "greffon"
+msgstr "greffon %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:121
-#, fuzzy, perl-format
+#: ../IkiWiki/Plugin/websetup.pm:107
+#, perl-format
 msgid "%s plugins"
-msgstr "Greffons"
+msgstr "Greffons %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:135
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "enable %s?"
 msgstr "activer %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:260
 msgid "setup file for this wiki is not known"
 msgstr "Le fichier de configuration de ce wiki n'est pas connu"
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "main"
 msgstr "Partie principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:419
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Les changements de configuration ci-dessous nécessitent une recompilation du "
 "wiki pour prendre effet"
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:423
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1047,7 +1035,7 @@ msgstr ""
 "Pour que les changements de configuration ci-dessous prennent effet vous "
 "devez recompiler le wiki"
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:460
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées."
@@ -1063,12 +1051,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:158
+#: ../IkiWiki/Render.pm:153
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:280
+#: ../IkiWiki/Render.pm:274
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1077,84 +1065,69 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:308
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:413
 #, perl-format
-msgid "querying %s for file creation and modification times.."
-msgstr ""
-
-#: ../IkiWiki/Render.pm:431
-#, fuzzy, perl-format
-msgid "removing obsolete %s"
+msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:495
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:618
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:631
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:23
+#: ../IkiWiki/Setup.pm:19
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "Lecture impossible de %s : %s"
 
-#: ../IkiWiki/Setup.pm:34
-#, fuzzy, perl-format
-msgid "cannot load %s in safe mode"
-msgstr "Lecture impossible de %s : %s"
-
-#: ../IkiWiki/Setup.pm:46
-#, fuzzy, perl-format
-msgid "failed to parse %s"
-msgstr "Impossible de mettre à jour %s"
-
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Vous devez spécifier un nom de wiki (contenant des caractères "
 "alphanumériques)"
 
-#: ../IkiWiki/Setup/Automator.pm:89
+#: ../IkiWiki/Setup/Automator.pm:82
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "Système de contrôle de version non reconnu : %s"
 
-#: ../IkiWiki/Setup/Automator.pm:115
+#: ../IkiWiki/Setup/Automator.pm:108
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:134
+#: ../IkiWiki/Setup/Automator.pm:126
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1176,13 +1149,13 @@ msgid "wrapper filename not specified"
 msgstr "Le nom du fichier CGI n'a pas été indiqué"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:149
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Échec de la compilation de %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:169
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s a été créé avec succès"
@@ -1195,65 +1168,59 @@ msgstr "Syntaxe : ikiwiki [options] source destination"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup fichier de configuration"
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:92
 msgid "usage: --set var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:103
-#, fuzzy
-msgid "usage: --set-yaml var=value"
-msgstr "Syntaxe : -- set var=valeur"
-
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:142
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:205
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:208
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:232
+#: ../IkiWiki.pm:238
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:514
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:560
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:589
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1262
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:1877
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:2061
-#, fuzzy, perl-format
-msgid "invalid sort type %s"
-msgstr "Type de tri %s inconnu"
+#: ../IkiWiki.pm:2020
+msgid "Sort::Naturally needed for title_natural sort"
+msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2031
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2050
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
@@ -1278,27 +1245,6 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
-#~ msgid "You need to log in first."
-#~ msgstr "Vous devez d'abord vous identifier."
-
-#~ msgid "Log in with"
-#~ msgstr "S'identifier en tant que"
-
-#~ msgid "Get an OpenID"
-#~ msgstr "Obtenir un compte OpenID"
-
-#~ msgid "failed to process"
-#~ msgstr "Échec du traitement"
-
-#~ msgid "nonexistant template %s"
-#~ msgstr "Le modèle de page %s n'existe pas"
-
-#~ msgid "getctime not implemented"
-#~ msgstr "getctime n'est pas implémenté"
-
-#~ msgid "Sort::Naturally needed for title_natural sort"
-#~ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
-
 #~ msgid "failed to read %s"
 #~ msgstr "Impossible de lire %s"
 
@@ -1322,5 +1268,5 @@ msgstr "Nom de domaine du serveur HTTP :"
 
 #~ msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 #~ msgstr ""
-#~ "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero "
-#~ "(%s)"
+#~ "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero (%"
+#~ "s)"
-- 
cgit v1.2.3


From 626ad0411446ffc9c39e9cdee04111a8fad7f54a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 18:35:10 -0400
Subject: merge updated translations from l10n

This includes an (almost) up-to-date French basewiki translation.
---
 po/underlays/basewiki/ikiwiki.cs.po                |   7 +-
 po/underlays/basewiki/ikiwiki.da.po                |   7 +-
 po/underlays/basewiki/ikiwiki.de.po                |   6 +-
 po/underlays/basewiki/ikiwiki.es.po                |   6 +-
 po/underlays/basewiki/ikiwiki.fr.po                |   7 +-
 po/underlays/basewiki/ikiwiki/formatting.es.po     |   6 +-
 po/underlays/basewiki/ikiwiki/openid.cs.po         |  77 ++--
 po/underlays/basewiki/ikiwiki/openid.da.po         |  78 ++--
 po/underlays/basewiki/ikiwiki/openid.de.po         |  73 ++--
 po/underlays/basewiki/ikiwiki/openid.es.po         |  88 ++--
 po/underlays/basewiki/ikiwiki/openid.fr.po         |  78 ++--
 po/underlays/basewiki/ikiwiki/pagespec.cs.po       | 243 ++++++-----
 po/underlays/basewiki/ikiwiki/pagespec.da.po       | 250 ++++++-----
 po/underlays/basewiki/ikiwiki/pagespec.de.po       | 307 +++++++-------
 po/underlays/basewiki/ikiwiki/pagespec.es.po       | 302 ++++++++------
 po/underlays/basewiki/ikiwiki/pagespec.fr.po       | 271 +++++++-----
 .../basewiki/ikiwiki/pagespec/attachment.cs.po     |  20 +-
 .../basewiki/ikiwiki/pagespec/attachment.da.po     |  20 +-
 .../basewiki/ikiwiki/pagespec/attachment.de.po     |  44 +-
 .../basewiki/ikiwiki/pagespec/attachment.es.po     |  60 +--
 .../basewiki/ikiwiki/pagespec/attachment.fr.po     |  20 +-
 po/underlays/basewiki/ikiwiki/pagespec/po.cs.po    |  16 +-
 po/underlays/basewiki/ikiwiki/pagespec/po.da.po    |  16 +-
 po/underlays/basewiki/ikiwiki/pagespec/po.de.po    |  37 +-
 po/underlays/basewiki/ikiwiki/pagespec/po.es.po    |  37 +-
 po/underlays/basewiki/ikiwiki/pagespec/po.fr.po    |  22 +-
 po/underlays/basewiki/ikiwiki/subpage.cs.po        |  13 +-
 po/underlays/basewiki/ikiwiki/subpage.da.po        |  13 +-
 po/underlays/basewiki/ikiwiki/subpage.de.po        |  21 +-
 po/underlays/basewiki/ikiwiki/subpage.es.po        |  34 +-
 po/underlays/basewiki/ikiwiki/subpage.fr.po        |  13 +-
 po/underlays/basewiki/ikiwiki/wikilink.cs.po       |  61 +--
 po/underlays/basewiki/ikiwiki/wikilink.da.po       |  63 +--
 po/underlays/basewiki/ikiwiki/wikilink.de.po       |  94 +++--
 po/underlays/basewiki/ikiwiki/wikilink.es.po       |  91 ++--
 po/underlays/basewiki/ikiwiki/wikilink.fr.po       |  64 +--
 po/underlays/basewiki/shortcuts.cs.po              |  48 ++-
 po/underlays/basewiki/shortcuts.da.po              |  48 ++-
 po/underlays/basewiki/shortcuts.es.po              |  78 +++-
 po/underlays/basewiki/shortcuts.fr.po              |  52 ++-
 po/underlays/basewiki/templates.cs.po              | 437 ++++++++++++--------
 po/underlays/basewiki/templates.da.po              | 441 ++++++++++++--------
 po/underlays/basewiki/templates.de.po              | 460 ++++++++++++---------
 po/underlays/basewiki/templates.es.po              | 445 ++++++++++++--------
 po/underlays/basewiki/templates.fr.po              | 444 ++++++++++++--------
 po/underlays/basewiki/templates/note.cs.po         |  19 +-
 po/underlays/basewiki/templates/note.da.po         |  19 +-
 po/underlays/basewiki/templates/note.de.po         |  23 +-
 po/underlays/basewiki/templates/note.es.po         |  20 +-
 po/underlays/basewiki/templates/note.fr.po         |  19 +-
 po/underlays/basewiki/templates/popup.cs.po        |  24 +-
 po/underlays/basewiki/templates/popup.da.po        |  24 +-
 po/underlays/basewiki/templates/popup.de.po        |  49 ++-
 po/underlays/basewiki/templates/popup.es.po        |  25 +-
 po/underlays/basewiki/templates/popup.fr.po        |  24 +-
 .../directives/ikiwiki/directive/calendar.da.po    |  55 ++-
 .../directives/ikiwiki/directive/calendar.de.po    | 102 +++--
 .../directives/ikiwiki/directive/calendar.fr.po    | 150 +++++--
 .../directives/ikiwiki/directive/comment.da.po     |  11 +-
 .../directives/ikiwiki/directive/comment.de.po     |  29 +-
 .../directives/ikiwiki/directive/comment.fr.po     |  23 +-
 .../ikiwiki/directive/edittemplate.da.po           |   5 +-
 .../ikiwiki/directive/edittemplate.de.po           |  11 +-
 .../ikiwiki/directive/edittemplate.fr.po           |  31 +-
 .../directives/ikiwiki/directive/format.da.po      |   7 +-
 .../directives/ikiwiki/directive/format.fr.po      |  31 +-
 .../directives/ikiwiki/directive/img.da.po         |  19 +-
 .../directives/ikiwiki/directive/img.de.po         |  69 ++--
 .../directives/ikiwiki/directive/img.fr.po         |  27 +-
 .../directives/ikiwiki/directive/inline.da.po      |  12 +-
 .../directives/ikiwiki/directive/inline.fr.po      |  47 ++-
 .../directives/ikiwiki/directive/linkmap.da.po     |  24 +-
 .../directives/ikiwiki/directive/linkmap.fr.po     |  53 ++-
 .../directives/ikiwiki/directive/map.da.po         |   8 +-
 .../directives/ikiwiki/directive/map.fr.po         |  10 +-
 .../directives/ikiwiki/directive/meta.da.po        |  36 +-
 .../directives/ikiwiki/directive/meta.de.po        |  99 +++--
 .../directives/ikiwiki/directive/meta.fr.po        |  49 ++-
 .../directives/ikiwiki/directive/pagestats.da.po   |  46 ++-
 .../directives/ikiwiki/directive/pagestats.de.po   |  42 +-
 .../directives/ikiwiki/directive/pagestats.fr.po   |  72 +++-
 .../ikiwiki/directive/pagetemplate.da.po           |  17 +-
 .../ikiwiki/directive/pagetemplate.de.po           |  36 +-
 .../ikiwiki/directive/pagetemplate.fr.po           |  44 +-
 .../directives/ikiwiki/directive/table.da.po       |  22 +-
 .../directives/ikiwiki/directive/table.de.po       |  40 +-
 .../directives/ikiwiki/directive/table.fr.po       |  22 +-
 .../directives/ikiwiki/directive/tag.da.po         |  13 +-
 .../directives/ikiwiki/directive/tag.de.po         |  21 +-
 .../directives/ikiwiki/directive/tag.fr.po         |  19 +-
 .../directives/ikiwiki/directive/template.da.po    | 144 ++++++-
 .../directives/ikiwiki/directive/template.de.po    | 169 +++++++-
 .../directives/ikiwiki/directive/template.fr.po    | 173 +++++++-
 .../directives/ikiwiki/directive/toc.da.po         |  15 +-
 .../directives/ikiwiki/directive/toc.fr.po         |  29 +-
 95 files changed, 4619 insertions(+), 2477 deletions(-)

diff --git a/po/underlays/basewiki/ikiwiki.cs.po b/po/underlays/basewiki/ikiwiki.cs.po
index 2584af2a6..39bd065b7 100644
--- a/po/underlays/basewiki/ikiwiki.cs.po
+++ b/po/underlays/basewiki/ikiwiki.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-16 16:29+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,3 +68,7 @@ msgstr "[[ikiwiki/openid]]"
 #. type: Bullet: '* '
 msgid "[[ikiwiki/searching]]"
 msgstr "[[vyhledávání|ikiwiki/searching]]"
+
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki.da.po b/po/underlays/basewiki/ikiwiki.da.po
index 74f11980c..fb394aec3 100644
--- a/po/underlays/basewiki/ikiwiki.da.po
+++ b/po/underlays/basewiki/ikiwiki.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -72,3 +73,7 @@ msgstr "[[ikiwiki/openid]]"
 #. type: Bullet: '* '
 msgid "[[ikiwiki/searching]]"
 msgstr "[[søgning|ikiwiki/searching]]"
+
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki.de.po b/po/underlays/basewiki/ikiwiki.de.po
index 1eb8429f3..692800e39 100644
--- a/po/underlays/basewiki/ikiwiki.de.po
+++ b/po/underlays/basewiki/ikiwiki.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-12 09:37+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,3 +68,6 @@ msgstr "[[ikiwiki/openid]]"
 msgid "[[ikiwiki/searching]]"
 msgstr "[[Suchen|ikiwiki/searching]]"
 
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki.es.po b/po/underlays/basewiki/ikiwiki.es.po
index f6c1eb3c9..cec554808 100644
--- a/po/underlays/basewiki/ikiwiki.es.po
+++ b/po/underlays/basewiki/ikiwiki.es.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki \n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-16 20:19+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,3 +70,6 @@ msgstr "[[ikiwiki/openid]]"
 msgid "[[ikiwiki/searching]]"
 msgstr "[[Búsqueda|ikiwiki/searching]]"
 
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki.fr.po b/po/underlays/basewiki/ikiwiki.fr.po
index 6fceab6f2..5516a95e0 100644
--- a/po/underlays/basewiki/ikiwiki.fr.po
+++ b/po/underlays/basewiki/ikiwiki.fr.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-30 09:46+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,3 +68,7 @@ msgstr "[[ikiwiki/openid]]"
 #. type: Bullet: '* '
 msgid "[[ikiwiki/searching]]"
 msgstr "[[ikiwiki/searching]]"
+
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/formatting.es.po b/po/underlays/basewiki/ikiwiki/formatting.es.po
index e8efac5b5..5e2549b8c 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.es.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2009-12-10 22:00-0500\n"
 "PO-Revision-Date: 2009-08-18 20:20+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
@@ -41,9 +41,6 @@ msgid "Leave blank lines between paragraphs."
 msgstr "Deje líneas vacías entre párrafos."
 
 #. type: Plain text
-#| msgid ""
-#| "You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
-#| "placing it in single or double asterisks."
 msgid ""
 "You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
 "placing it in single or double asterisks."
@@ -296,4 +293,3 @@ msgstr "  Lista completa de [[directivas|directive]] activadas en este wiki:\n"
 #, no-wrap
 msgid "  [[!listdirectives ]]\n"
 msgstr "  [[!listdirectives ]]\n"
-
diff --git a/po/underlays/basewiki/ikiwiki/openid.cs.po b/po/underlays/basewiki/ikiwiki/openid.cs.po
index 6cc5f7126..d3de65d34 100644
--- a/po/underlays/basewiki/ikiwiki/openid.cs.po
+++ b/po/underlays/basewiki/ikiwiki/openid.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-22 09:00+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,46 +48,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"To sign up for an OpenID, visit one of the following identity providers:"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
-"Pro získání OpenID navštivte některého z následujících poskytovatelů identit:"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[Videntity](http://videntity.org/)"
-msgstr "[Videntity](http://videntity.org/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
-msgid ""
-"or any of the [many others out there](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
-msgstr ""
-"nebo některého [z mnoha dalších](http://openiddirectory.com/openid-providers-"
-"c-1.html)"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Vaše OpenID je URL, které jste získali, když jste se zaregistrovali.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -114,3 +84,38 @@ msgid ""
 msgstr ""
 "\t\\[[!meta openid=\"http://vase-id.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
+
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Pro získání OpenID navštivte některého z následujících poskytovatelů "
+#~ "identit:"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "nebo některého [z mnoha dalších](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Vaše OpenID je URL, které jste získali, když jste se zaregistrovali.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#~ msgid "[Videntity](http://videntity.org/)"
+#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/openid.da.po b/po/underlays/basewiki/ikiwiki/openid.da.po
index 7f030eef0..cb051192d 100644
--- a/po/underlays/basewiki/ikiwiki/openid.da.po
+++ b/po/underlays/basewiki/ikiwiki/openid.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,47 +53,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"To sign up for an OpenID, visit one of the following identity providers:"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
-"Du kan registrere en OpenID ved at besøge en af de følgende "
-"identitetsudbydere:"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[Videntity](http://videntity.org/)"
-msgstr "[Videntity](http://videntity.org/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
-msgid ""
-"or any of the [many others out there](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
-msgstr ""
-"eller enhver af de [mange andre derude](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Din OpenID er den URL som du får når du registrerer dig.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -121,3 +90,38 @@ msgid ""
 msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
+
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Du kan registrere en OpenID ved at besøge en af de følgende "
+#~ "identitetsudbydere:"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "eller enhver af de [mange andre derude](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Din OpenID er den URL som du får når du registrerer dig.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#~ msgid "[Videntity](http://videntity.org/)"
+#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/openid.de.po b/po/underlays/basewiki/ikiwiki/openid.de.po
index 27c74679a..9669a8706 100644
--- a/po/underlays/basewiki/ikiwiki/openid.de.po
+++ b/po/underlays/basewiki/ikiwiki/openid.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-12 22:29+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,43 +46,16 @@ msgstr ""
 "einer wachsenden Anzahl von Webseiten anzumelden."
 
 #. type: Plain text
-msgid "To sign up for an OpenID, visit one of the following identity providers:"
-msgstr ""
-"Eine OpenID kann man bei einem der folgenden Identitäts-Anbieter erhalten:"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
 msgid ""
-"or any of the [many others out "
-"there](http://openiddirectory.com/openid-providers-c-1.html)"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
-"oder einem der [vielen anderen](http://openiddirectory."
-"com/openid-providers-c-1.html)."
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Eine OpenID ist eine URL, die man bei der Anmeldung von seinem Anbieter "
-"erhält.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -99,9 +73,9 @@ msgid ""
 "It's also possible to make a page in the wiki usable as an OpenID url, by "
 "delegating it to an openid server. Here's an example of how to do that:"
 msgstr ""
-"Außerdem ist es möglich, eine Seite dieses Wikis als OpenID-URL verwendbar zu "
-"machen, indem sie an einen OpenID-Server weitergereicht wird. Hier ist ein "
-"Beispiel, wie dies gemacht wird:"
+"Außerdem ist es möglich, eine Seite dieses Wikis als OpenID-URL verwendbar "
+"zu machen, indem sie an einen OpenID-Server weitergereicht wird. Hier ist "
+"ein Beispiel, wie dies gemacht wird:"
 
 #. type: Plain text
 #, no-wrap
@@ -112,4 +86,33 @@ msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
 
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Eine OpenID kann man bei einem der folgenden Identitäts-Anbieter erhalten:"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "oder einem der [vielen anderen](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)."
 
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Eine OpenID ist eine URL, die man bei der Anmeldung von seinem Anbieter erhält.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
diff --git a/po/underlays/basewiki/ikiwiki/openid.es.po b/po/underlays/basewiki/ikiwiki/openid.es.po
index 4a2f19d60..57d48841b 100644
--- a/po/underlays/basewiki/ikiwiki/openid.es.po
+++ b/po/underlays/basewiki/ikiwiki/openid.es.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-19 18:53+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,50 +43,21 @@ msgid ""
 "allows you to have one login that you can use on a growing number of "
 "websites."
 msgstr ""
-"[OpenID](http://openid.net) es un mecanismo descentralizado de identificación que "
-"le permite tener un acceso («login») que puede usar en un número creciente de "
-"sitios web."
+"[OpenID](http://openid.net) es un mecanismo descentralizado de "
+"identificación que le permite tener un acceso («login») que puede usar en un "
+"número creciente de sitios web."
 
 #. type: Plain text
-msgid "To sign up for an OpenID, visit one of the following identity providers:"
-msgstr "Para solicitar un OpenID, visite a alguno de los proveedores de identidad siguientes:"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[Videntity](http://videntity.org/)"
-msgstr "[Videntity](http://videntity.org/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
 msgid ""
-"or any of the [many others out there](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
-"o cualquier de los [muchos otros que existen](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Su OpenID es el URL que se le proporciona al registrarse.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -93,10 +65,10 @@ msgid ""
 "the signin form. You do not need to give this wiki a password or go through "
 "any registration process when using OpenID."
 msgstr ""
-"Para identificarse en este wiki usando OpenID, simplemente introdúzcalo en el "
-"Campo OpenID del formulario de identificación. Si usa OpenID, no es necesario "
-"que proporcione ninguna contraseña a este wiki, ni que realice ningún proceso "
-"de registro."
+"Para identificarse en este wiki usando OpenID, simplemente introdúzcalo en "
+"el Campo OpenID del formulario de identificación. Si usa OpenID, no es "
+"necesario que proporcione ninguna contraseña a este wiki, ni que realice "
+"ningún proceso de registro."
 
 #. type: Plain text
 msgid ""
@@ -115,3 +87,37 @@ msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
 
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Para solicitar un OpenID, visite a alguno de los proveedores de identidad "
+#~ "siguientes:"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "o cualquier de los [muchos otros que existen](http://openiddirectory.com/"
+#~ "openid-providers-c-1.html)"
+
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Su OpenID es el URL que se le proporciona al registrarse.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#~ msgid "[Videntity](http://videntity.org/)"
+#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/openid.fr.po b/po/underlays/basewiki/ikiwiki/openid.fr.po
index 81d36e068..2f41cf76c 100644
--- a/po/underlays/basewiki/ikiwiki/openid.fr.po
+++ b/po/underlays/basewiki/ikiwiki/openid.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-25 09:52+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -46,47 +47,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"To sign up for an OpenID, visit one of the following identity providers:"
-msgstr ""
-"Pour obtenir un identifiant OpenID, visitez l'un des fournisseurs d'identité "
-"suivants :"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[Videntity](http://videntity.org/)"
-msgstr "[Videntity](http://videntity.org/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
-msgid ""
-"or any of the [many others out there](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
-msgstr ""
-"ou n'importe lequel des [nombreux autres fournisseurs existants](http://"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
 "openiddirectory.com/openid-providers-c-1.html)"
+msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Votre identifiant OpenID est l'URL qui vous est attribuée lorsque vous vous inscrivez.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -116,3 +85,38 @@ msgid ""
 msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
+
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Pour obtenir un identifiant OpenID, visitez l'un des fournisseurs "
+#~ "d'identité suivants :"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "ou n'importe lequel des [nombreux autres fournisseurs existants](http://"
+#~ "openiddirectory.com/openid-providers-c-1.html)"
+
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Votre identifiant OpenID est l'URL qui vous est attribuée lorsque vous vous inscrivez.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#~ msgid "[Videntity](http://videntity.org/)"
+#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.cs.po b/po/underlays/basewiki/ikiwiki/pagespec.cs.po
index d59e7dd28..0ed80b952 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.cs.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-26 14:14+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,113 +83,41 @@ msgid ""
 "functions:"
 msgstr "S komplikovanějšími výběry mohou pomoci následující funkce:"
 
-#. type: Bullet: '* '
-msgid ""
-"\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr ""
-"„`link(stránka)`“ - vybere stránky, které odkazují na danou stránku (resp. "
-"stránky, pokud použijete zástupné znaky)"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"„`tagged(štítek)`“ - vybere stránky, které obsahují daný štítek (resp. "
-"štítky, pokud použijete zástupné znaky), nebo na něj odkazují"
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"„`backlink(stránka)`“ - vybere pouze stránky, na které odkazuje daná stránka"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr ""
-"„`creation_month(měsíc)`“ - vybere pouze stránky vytvořené v daném měsíci"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr ""
-"„`creation_day(den_měsíce)`“ - vybere pouze stránky vytvořené daného dne v "
-"měsíci"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "„`creation_year(rok)`“ - vybere pouze stránky vytvořené v daném roce"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"„`created_after(stránka)`“ - vybere pouze stránky vytvořené po vytvoření "
-"dané stránky"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr ""
-"„`created_before(stránka)`“ - vybere pouze stránky vytvořené před vytvořením "
-"dané stránky"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"„`glob(vzor)`“ - vybere stránky, které odpovídají danému vzoru. Použití "
-"samotného vzoru je zkratkou za tuto funkci."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"„`internal(vzor)`“ - jako `glob()`, ale vybere i stránky pro interní "
-"potřebu, které glob() obvykle přeskočí."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
-"matching the specified glob."
-msgstr ""
-"„`title(vzor)`“, „`author(vzor)`“, „`authorurl(vzor)`“, „`license(vzor)`“, "
-"„`copyright(vzor)`“ - vybere stránky, které obsahují metadata odpovídající "
-"zadanému vzoru."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-"„`user(uživatelskéjméno)`“ - testuje, zda změnu provádí uživatel s daným "
-"uživatelským jménem. Je-li povoleno openid, můžete ho použít místo "
-"uživatelského jména."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr "„`admin()`“ - testuje, zda změnu provádí některý ze správců wiki."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr "„`ip(adresa)`“ - testuje, zda změnu provádí někdo z dané IP adresy."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"„`postcomment(vzor)`“ - shoduje se pouze pokud se komentáře ukládají do "
-"stránky odpovídající zadanému vzoru"
 
 #. type: Plain text
 msgid ""
@@ -245,3 +174,105 @@ msgstr ""
 "„a/b/něco“. Chcete-li vyhledávat relativně k adresáři stránky, která "
 "obsahuje PageSpec, můžete použít „./“. To znamená, že „./něco“ na stránce „a/"
 "b“ najde stránku „a/něco“."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "„`link(stránka)`“ - vybere stránky, které odkazují na danou stránku "
+#~ "(resp. stránky, pokud použijete zástupné znaky)"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "„`tagged(štítek)`“ - vybere stránky, které obsahují daný štítek (resp. "
+#~ "štítky, pokud použijete zástupné znaky), nebo na něj odkazují"
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "„`backlink(stránka)`“ - vybere pouze stránky, na které odkazuje daná "
+#~ "stránka"
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "„`creation_month(měsíc)`“ - vybere pouze stránky vytvořené v daném měsíci"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr ""
+#~ "„`creation_day(den_měsíce)`“ - vybere pouze stránky vytvořené daného dne "
+#~ "v měsíci"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr ""
+#~ "„`creation_year(rok)`“ - vybere pouze stránky vytvořené v daném roce"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "„`created_after(stránka)`“ - vybere pouze stránky vytvořené po vytvoření "
+#~ "dané stránky"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "„`created_before(stránka)`“ - vybere pouze stránky vytvořené před "
+#~ "vytvořením dané stránky"
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "„`glob(vzor)`“ - vybere stránky, které odpovídají danému vzoru. Použití "
+#~ "samotného vzoru je zkratkou za tuto funkci."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "„`internal(vzor)`“ - jako `glob()`, ale vybere i stránky pro interní "
+#~ "potřebu, které glob() obvykle přeskočí."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "„`title(vzor)`“, „`author(vzor)`“, „`authorurl(vzor)`“, „`license(vzor)"
+#~ "`“, „`copyright(vzor)`“ - vybere stránky, které obsahují metadata "
+#~ "odpovídající zadanému vzoru."
+
+#, fuzzy
+#~| msgid ""
+#~| "\"`user(username)`\" - tests whether a modification is being made by a "
+#~| "user with the specified username. If openid is enabled, an openid can "
+#~| "also be put here."
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "„`user(uživatelskéjméno)`“ - testuje, zda změnu provádí uživatel s daným "
+#~ "uživatelským jménem. Je-li povoleno openid, můžete ho použít místo "
+#~ "uživatelského jména."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr "„`admin()`“ - testuje, zda změnu provádí některý ze správců wiki."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr "„`ip(adresa)`“ - testuje, zda změnu provádí někdo z dané IP adresy."
+
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "„`postcomment(vzor)`“ - shoduje se pouze pokud se komentáře ukládají do "
+#~ "stránky odpovídající zadanému vzoru"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.da.po b/po/underlays/basewiki/ikiwiki/pagespec.da.po
index f3bfd572f..42d05c78d 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,8 +59,8 @@ msgid ""
 "does not match the SandBox itself:"
 msgstr ""
 "Mere hyppigt har du dog brug for at passe for sider med noget bestemt i "
-"deres navne. Dette kan du udtrykke med et \"glob-mønster\". \"`*`\" står "
-"for enhver del af et sidenavn, og \"`?`\" for ethvert enkeltbogstav i et "
+"deres navne. Dette kan du udtrykke med et \"glob-mønster\". \"`*`\" står for "
+"enhver del af et sidenavn, og \"`?`\" for ethvert enkeltbogstav i et "
 "sidenavn. Så dette passer for alle sider om musik, og alle [[UnderSider||"
 "SubPage]] til sandkassen, men ikke selve sandkasse-siden:"
 
@@ -86,115 +87,41 @@ msgid ""
 "functions:"
 msgstr "Resultaterne kan begrænses mere nuanceret med disse funktioner:"
 
-#. type: Bullet: '* '
-msgid ""
-"\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr ""
-"\"`link(side)`\" - passer kun for sider som henviser til en given side "
-"(eller glob)"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"\"`tagged(mærkat)`\" - passer for sider mærket af med eller som henviser til "
-"den givne mærkat (eller mærkater som passer for et glob)"
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"\"`backlink(side)`\" - passer kun for sider som en given side henviser til"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr ""
-"\"`creation_month(måned)`\" - passer kun for sider oprettet den givne måned"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr "\"`creation_day(månedsdag)`\" - eller dag på måneden"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "\"`creation_year(år)`\" - eller år"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"\"`created_after(side)`\" - passer kun for sider oprettet efter den givne "
-"side blev oprettet"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr ""
-"\"`created_before(side)`\" - passer kun for sider oprettet før den givne "
-"side blev oprettet"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"\"`glob(nogetglob)`\" - passer for sider som passer for det givne glob. Blot "
-"at skrive glob'et alene er faktisk en genvej til denne funktion."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"\"`internal(glob)`\" - lissom `glob()`, men passer også for internt anvendte "
-"sider som glob normalt ikke passer for."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
-"matching the specified glob."
-msgstr ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - passer for sider med de givne metadata, "
-"som passer for det angivne glob."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-"\"`user(brugernavn)`\" - tester hvorvidt en ændring foretages af en bruger "
-"med det angivne  brugernavn. Hvis openid er aktiveret, kan en openid også "
-"bruges her."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-"\"`admin()`\" - tester hvorvidt en ændring foretages af en af wiki-"
-"administratorerne."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr ""
-"\"`ip(adresse)`\" - tester hvorvidt en ændring foretages fra den angivne IP-"
-"adresse."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"\"`postcomment(glob)`\" - passer kun når kommentarer er blevet indsendt "
-"til en side som passer for det angivne glob"
 
 #. type: Plain text
 msgid ""
@@ -251,3 +178,106 @@ msgstr ""
 "passe for siderne navngivet \"a/foo\" eller \"a/b/foo\". For at afstemme "
 "relativt til samme mappe som siden der indeholder pagespec'et kan du bruge "
 "\"./\". Eksempelvis passer \"./foo\" på siden \"a/b\" for siden \"a/foo\"."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "\"`link(side)`\" - passer kun for sider som henviser til en given side "
+#~ "(eller glob)"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "\"`tagged(mærkat)`\" - passer for sider mærket af med eller som henviser "
+#~ "til den givne mærkat (eller mærkater som passer for et glob)"
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "\"`backlink(side)`\" - passer kun for sider som en given side henviser til"
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "\"`creation_month(måned)`\" - passer kun for sider oprettet den givne "
+#~ "måned"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr "\"`creation_day(månedsdag)`\" - eller dag på måneden"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr "\"`creation_year(år)`\" - eller år"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_after(side)`\" - passer kun for sider oprettet efter den givne "
+#~ "side blev oprettet"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_before(side)`\" - passer kun for sider oprettet før den givne "
+#~ "side blev oprettet"
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "\"`glob(nogetglob)`\" - passer for sider som passer for det givne glob. "
+#~ "Blot at skrive glob'et alene er faktisk en genvej til denne funktion."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "\"`internal(glob)`\" - lissom `glob()`, men passer også for internt "
+#~ "anvendte sider som glob normalt ikke passer for."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - passer for sider med de givne "
+#~ "metadata, som passer for det angivne glob."
+
+#, fuzzy
+#~| msgid ""
+#~| "\"`user(username)`\" - tests whether a modification is being made by a "
+#~| "user with the specified username. If openid is enabled, an openid can "
+#~| "also be put here."
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "\"`user(brugernavn)`\" - tester hvorvidt en ændring foretages af en "
+#~ "bruger med det angivne  brugernavn. Hvis openid er aktiveret, kan en "
+#~ "openid også bruges her."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr ""
+#~ "\"`admin()`\" - tester hvorvidt en ændring foretages af en af wiki-"
+#~ "administratorerne."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr ""
+#~ "\"`ip(adresse)`\" - tester hvorvidt en ændring foretages fra den angivne "
+#~ "IP-adresse."
+
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "\"`postcomment(glob)`\" - passer kun når kommentarer er blevet indsendt "
+#~ "til en side som passer for det angivne glob"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.de.po b/po/underlays/basewiki/ikiwiki/pagespec.de.po
index 401b4f4b7..4fd1da8e9 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 13:39+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,19 +25,18 @@ msgid ""
 "emails you want subscribe to, or pages to combine into a blog, the wiki uses "
 "a PageSpec. This is an expression that matches a set of pages."
 msgstr ""
-"Um eine Menge von Seiten auszuwählen (etwa Seiten, die gesperrt werden sollen, "
-"deren Einrechungs-Mails man abonnieren will, oder die man zu einem Blog "
-"kombinieren will), verwendet das Wiki eine PageSpec. Dies ist ein Ausdruck, "
-"der auf bestimmte Seiten passt."
+"Um eine Menge von Seiten auszuwählen (etwa Seiten, die gesperrt werden "
+"sollen, deren Einrechungs-Mails man abonnieren will, oder die man zu einem "
+"Blog kombinieren will), verwendet das Wiki eine PageSpec. Dies ist ein "
+"Ausdruck, der auf bestimmte Seiten passt."
 
 #. type: Plain text
 msgid ""
 "The simplest PageSpec is a simple list of pages. For example, this matches "
 "any of the three listed pages:"
 msgstr ""
-"Die einfachste PageSpec ist eine einfache Liste von Seiten. Zum Beispiel passt "
-"dies "
-"auf jede der drei aufgezählten Seiten:"
+"Die einfachste PageSpec ist eine einfache Liste von Seiten. Zum Beispiel "
+"passt dies auf jede der drei aufgezählten Seiten:"
 
 #. type: Plain text
 #, no-wrap
@@ -53,9 +53,10 @@ msgid ""
 msgstr ""
 "Häufiger wird es vorkommen, dass man Seiten erfassen will, deren Name etwas "
 "bestimmtes enthält. Man kann dies mit einem Muster tun: \"`*`\" steht für "
-"einen beliebigen Teil eines Seitennamens und \"`?`\" steht für einen beliebigen "
-"Buchstaben eines Seitennamens. Also passt dies alle Seiten über Musik, und alle "
-"[[Unterseiten|SubPage]] des Sandkastens, aber nicht auf den Sandkasten selbst:"
+"einen beliebigen Teil eines Seitennamens und \"`?`\" steht für einen "
+"beliebigen Buchstaben eines Seitennamens. Also passt dies alle Seiten über "
+"Musik, und alle [[Unterseiten|SubPage]] des Sandkastens, aber nicht auf den "
+"Sandkasten selbst:"
 
 #. type: Plain text
 #, no-wrap
@@ -68,8 +69,8 @@ msgid ""
 "match all pages except for Discussion pages and the SandBox:"
 msgstr ""
 "Man kann einem Eintrag ein \"`!`\" voranstellen, um die betreffenden Seiten "
-"auszuschließen. Auf diese Weise können alle Seiten außer Diskussionsseiten und "
-"Sandkasten erfasst werden:"
+"auszuschließen. Auf diese Weise können alle Seiten außer Diskussionsseiten "
+"und Sandkasten erfasst werden:"
 
 #. type: Bullet: '	* '
 msgid "and !SandBox and !*/Discussion"
@@ -83,127 +84,49 @@ msgstr ""
 "Einige weitergehende Einschränkungen können hinzugefügt werden, indem die "
 "folgenden Funktionen verwendet werden:"
 
-#. type: Bullet: '* '
-msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr ""
-"\"`link(page)`\" - passt nur auf Seiten, die einen Link auf die angegebene Seite "
-"(oder das angegebene Muster) enthalten"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"\"`tagged(tag)`\" - passt nur auf Seiten, die mit dem angegebenen Tag versehen "
-"sind oder auf diesen verweisen (auch hier kann ein Muster verwendet werden)"
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"\"`backlink(page)`\" - passt nur auf Seiten, auf die von der angegebenen Seite "
-"verwiesen wird"
-
-#. type: Bullet: '* '
-msgid "\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr ""
-"\"`creation_month(month)`\" - passt nur auf Seiten, die im angegebenen Monat "
-"erstellt wurden"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr "\"`creation_day(mday)`\" - genauso für einen Tag im Monat"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "\"`creation_year(year)`\" - der ein Jahr"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"\"`created_after(page)`\" - passt nur auf Seiten, die nach der angegebenen Seite "
-"angelegt wurden"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr ""
-"\"`created_before(page)`\" - passt nur auf Seiten, die vor der angegebenen Seite "
-"angelegt wurden."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"\"`glob(someglob)`\" - passt nur auf Seiten, auf die das angegebene Muster passt."
-" "
-"Das Muster direkt anzugeben ist eine Abkürzung für diese Funktion."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"\"`internal(glob)`\" - wie `glob()`, aber es werden auch intern verwendete "
-"Seiten "
-"erfasst, auf die normale Muster nicht passen."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", "
-"\"`license(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
-"metadata, matching the specified glob."
-msgstr ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", "
-"\"`license(glob)`\", \"`copyright(glob)`\" - passt auf Seiten, deren Metadaten "
-"auf die angegebenen Muster passen."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here. Glob patterns can be used in the username. For example, to match all "
-"openid users, use `user(*://*)`"
-msgstr ""
-"\"`user(username)`\" - prüft ob eine Änderung von einem Benutzer mit dem "
-"angegebenen Namen gemacht wird. Wenn OpenID aktiviert ist, kann auch eine "
-"OpenID angegeben werden. Muster können im Benutzernamen verwendet werden. "
-"zum Beispiel können alle OpenID-Nutzer mit `user(*://*)` erfasst werden."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-"\"`admin()`\" - prüft ob eine Änderung durch einen der Wiki-Administratoren "
-"gemacht wird."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr ""
-"\"`ip(address)`\" - prüft ob eine Änderung von der angegebenen IP-Adresse aus "
-"gemacht wird."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"\"`postcomment(glob)`\" - passt nur, wenn ein Kommentar zu einer durch das "
-"Muster angegebenen Seite gemacht wird"
 
 #. type: Plain text
 msgid ""
 "For example, to match all pages in a blog that link to the page about music "
 "and were written in 2005:"
 msgstr ""
-"Zum Beispiel können alle Seiten eines Blogs ausgewählt werden, die einen Link "
-"zu einer Seite über Musik enthalten und 2005 geschrieben wurden:"
+"Zum Beispiel können alle Seiten eines Blogs ausgewählt werden, die einen "
+"Link zu einer Seite über Musik enthalten und 2005 geschrieben wurden:"
 
 #. type: Plain text
 #, no-wrap
@@ -218,12 +141,11 @@ msgid ""
 "to match one expression. Note that it doesn't make sense to say \"index and "
 "SandBox\", since no page can match both expressions."
 msgstr ""
-"Beachte die Verwendung von `and` im obigen Beispiel: Dies bewirkt, dass "
-"nur die Seiten auf den gesamten Ausdruck passen, die auf alle drei "
-"Teilausdrücke passen. Verwende `and` um Ausdrücke so zu kombinieren "
-"und `or` wenn eine Seite nur auf einen der Ausdrücke passen soll. Beachte "
-"dass es sinnlos ist, `index and SandBox` zu sagen, da keine Seite auf beide "
-"Ausdrücke passen kann."
+"Beachte die Verwendung von `and` im obigen Beispiel: Dies bewirkt, dass nur "
+"die Seiten auf den gesamten Ausdruck passen, die auf alle drei Teilausdrücke "
+"passen. Verwende `and` um Ausdrücke so zu kombinieren und `or` wenn eine "
+"Seite nur auf einen der Ausdrücke passen soll. Beachte dass es sinnlos ist, "
+"`index and SandBox` zu sagen, da keine Seite auf beide Ausdrücke passen kann."
 
 #. type: Plain text
 msgid ""
@@ -231,10 +153,9 @@ msgid ""
 "grouping. For example, to match pages in a blog that are tagged with either "
 "of two tags, use:"
 msgstr ""
-"Es können auch komplexere Ausdrücke erstellt werden, indem Klammern "
-"zur Gruppierung verwendet werden. Zum Beispiel passt der folgende "
-"Ausdruck auf Blog-Seiten, die mit einem der beiden angegebenen Tags "
-"versehen sind:"
+"Es können auch komplexere Ausdrücke erstellt werden, indem Klammern zur "
+"Gruppierung verwendet werden. Zum Beispiel passt der folgende Ausdruck auf "
+"Blog-Seiten, die mit einem der beiden angegebenen Tags versehen sind:"
 
 #. type: Plain text
 #, no-wrap
@@ -249,10 +170,110 @@ msgid ""
 "directory of the page containing the pagespec, you can use \"./\". For "
 "example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
 msgstr ""
-"Beachte, dass Seitennamen in PageSpecs auf den absoluten Dateinamen "
-"der Seiten im Wiki passen müssen: Die PageSpec `foo` auf der Seite `a/b` "
-"wird weder auf `a/foo` noch auf `a/b/foo` passen. Um relative Pfade zum "
-"Verzeichnis der Seite, die die PageSpec enthält, zu verwenden, kannst du "
-"`./` verwenden. Zum Beispiel passt `./foo` auf der Seite `a/b` auf `a/foo`."
-
-
+"Beachte, dass Seitennamen in PageSpecs auf den absoluten Dateinamen der "
+"Seiten im Wiki passen müssen: Die PageSpec `foo` auf der Seite `a/b` wird "
+"weder auf `a/foo` noch auf `a/b/foo` passen. Um relative Pfade zum "
+"Verzeichnis der Seite, die die PageSpec enthält, zu verwenden, kannst du `./"
+"` verwenden. Zum Beispiel passt `./foo` auf der Seite `a/b` auf `a/foo`."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "\"`link(page)`\" - passt nur auf Seiten, die einen Link auf die "
+#~ "angegebene Seite (oder das angegebene Muster) enthalten"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "\"`tagged(tag)`\" - passt nur auf Seiten, die mit dem angegebenen Tag "
+#~ "versehen sind oder auf diesen verweisen (auch hier kann ein Muster "
+#~ "verwendet werden)"
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "\"`backlink(page)`\" - passt nur auf Seiten, auf die von der angegebenen "
+#~ "Seite verwiesen wird"
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "\"`creation_month(month)`\" - passt nur auf Seiten, die im angegebenen "
+#~ "Monat erstellt wurden"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr "\"`creation_day(mday)`\" - genauso für einen Tag im Monat"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr "\"`creation_year(year)`\" - der ein Jahr"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_after(page)`\" - passt nur auf Seiten, die nach der "
+#~ "angegebenen Seite angelegt wurden"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_before(page)`\" - passt nur auf Seiten, die vor der "
+#~ "angegebenen Seite angelegt wurden."
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "\"`glob(someglob)`\" - passt nur auf Seiten, auf die das angegebene "
+#~ "Muster passt. Das Muster direkt anzugeben ist eine Abkürzung für diese "
+#~ "Funktion."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "\"`internal(glob)`\" - wie `glob()`, aber es werden auch intern "
+#~ "verwendete Seiten erfasst, auf die normale Muster nicht passen."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - passt auf Seiten, deren Metadaten auf "
+#~ "die angegebenen Muster passen."
+
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "\"`user(username)`\" - prüft ob eine Änderung von einem Benutzer mit dem "
+#~ "angegebenen Namen gemacht wird. Wenn OpenID aktiviert ist, kann auch eine "
+#~ "OpenID angegeben werden. Muster können im Benutzernamen verwendet werden. "
+#~ "zum Beispiel können alle OpenID-Nutzer mit `user(*://*)` erfasst werden."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr ""
+#~ "\"`admin()`\" - prüft ob eine Änderung durch einen der Wiki-"
+#~ "Administratoren gemacht wird."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr ""
+#~ "\"`ip(address)`\" - prüft ob eine Änderung von der angegebenen IP-Adresse "
+#~ "aus gemacht wird."
+
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "\"`postcomment(glob)`\" - passt nur, wenn ein Kommentar zu einer durch "
+#~ "das Muster angegebenen Seite gemacht wird"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.es.po b/po/underlays/basewiki/ikiwiki/pagespec.es.po
index 124e3333c..535bd0dba 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.es.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.es.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-23 21:00+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,9 +28,9 @@ msgid ""
 "a PageSpec. This is an expression that matches a set of pages."
 msgstr ""
 "Para seleccionar un conjunto de páginas, como páginas que están bloqueadas, "
-"páginas a cuyo envío de correo electrónico quiere suscribirse, o páginas para combinar "
-"en un blog, el wiki utiliza una PageSpec. Ésta consiste en una expresión que se "
-"corresponde con un conjunto de páginas."
+"páginas a cuyo envío de correo electrónico quiere suscribirse, o páginas "
+"para combinar en un blog, el wiki utiliza una PageSpec. Ésta consiste en una "
+"expresión que se corresponde con un conjunto de páginas."
 
 #. type: Plain text
 msgid ""
@@ -53,10 +54,11 @@ msgid ""
 "does not match the SandBox itself:"
 msgstr ""
 "A menudo querrá seleccionar cualquier página que tenga alguna particularidad "
-"en su nombre. Puede hacerlo utilizando un patrón «glob». \"`*`\" representa cualquier "
-"parte del nombre de una página, y \"`?`\" cualquier letra del nombre de una página. "
-"Así, esto se corresponde con todas las páginas sobre música, y cualquier [[subpágina|SubPage]] "
-"de la [[zona de pruebas («SandBox»)|SandBox]], pero no con la zona de pruebas («SandBox») misma:"
+"en su nombre. Puede hacerlo utilizando un patrón «glob». \"`*`\" representa "
+"cualquier parte del nombre de una página, y \"`?`\" cualquier letra del "
+"nombre de una página. Así, esto se corresponde con todas las páginas sobre "
+"música, y cualquier [[subpágina|SubPage]] de la [[zona de pruebas "
+"(«SandBox»)|SandBox]], pero no con la zona de pruebas («SandBox») misma:"
 
 #. type: Plain text
 #, no-wrap
@@ -68,9 +70,10 @@ msgid ""
 "You can also prefix an item with \"`!`\" to skip pages that match it. So to "
 "match all pages except for Discussion pages and the SandBox:"
 msgstr ""
-"También puede utilizar \"`!`\" delante de un elemento para que no se incluyan "
-"las páginas que se correspondan con ese elemento. Así, para seleccionar todas "
-"las páginas excepto las de Discusión y la Zona de pruebas («SandBox»):"
+"También puede utilizar \"`!`\" delante de un elemento para que no se "
+"incluyan las páginas que se correspondan con ese elemento. Así, para "
+"seleccionar todas las páginas excepto las de Discusión y la Zona de pruebas "
+"(«SandBox»):"
 
 #. type: Bullet: '	* '
 msgid "and !SandBox and !*/Discussion"
@@ -84,121 +87,49 @@ msgstr ""
 "Se pueden añadir límites más elaborados para seleccionar páginas utilizando "
 "estas funciones:"
 
-#. type: Bullet: '* '
-msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr ""
-"\"`link(page)`\" - selecciona solamente páginas que enlazan a una determiada "
-"página (o patrón «glob»)"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"\"`tagged(tag)`\" - selecciona páginas que están etiquetadas con o enlazadas "
-"a la etiqueta dada (o etiquetas que se corresponden con un patrón «glob»)"
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"\"`backlink(page)`\" - selecciona solamente páginas a las que enlaza una "
-"página determinada"
-
-#. type: Bullet: '* '
-msgid "\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr "\"`creation_month(month)`\" - selecciona solamente páginas creadas en el mes dado"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr "\"`creation_day(mday)`\" - o en el día del mes"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "\"`creation_year(year)`\" - o en el año"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"\"`created_after(page)`\" - selecciona solamente páginas creadas después de que la "
-"página dada fuera creada"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr ""
-"\"`created_before(page)`\" - selecciona solamente páginas creadas antes de que la "
-"página dada fuera creada"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"\"`glob(someglob)`\" - selecciona solamente páginas que se corresponden con el «glob» "
-"dado. Escribir simplemente el «glob» mismo es una abreviatura para esta función."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"\"`internal(glob)`\" - como `glob()`, pero selecciona incluso páginas de uso "
-"interno, que los «globs» normalmente no seleccionan."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
-"matching the specified glob."
-msgstr ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - seleccionan páginas que contienen los metadatos "
-"dados, que se corresponden con el «glob» especificado."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-"\"`user(username)`\" - comprueba si se está haciendo una modificación por un "
-"usuario con el nombre de usuario especificado. Si openid está habilitado, también "
-"se puede usar aquí un openid."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-"\"`admin()`\" - comprueba si se está haciendo una modificación por uno de "
-"los administradores del wiki."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr ""
-"\"`ip(address)`\" - comprueba si se está haciendo una modificación desde "
-"la dirección IP especificada."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"\"`postcomment(glob)`\" - selecciona solamente cuando se están poniendo comentarios "
-"a una página que se corresponde con el «glob» especificado"
 
 #. type: Plain text
 msgid ""
 "For example, to match all pages in a blog that link to the page about music "
 "and were written in 2005:"
 msgstr ""
-"Por ejemplo, para seleccionar todas las páginas de un blog que enlazan a la página "
-"sobre música y que fueron escritas en 2005:"
+"Por ejemplo, para seleccionar todas las páginas de un blog que enlazan a la "
+"página sobre música y que fueron escritas en 2005:"
 
 #. type: Plain text
 #, no-wrap
@@ -213,12 +144,12 @@ msgid ""
 "to match one expression. Note that it doesn't make sense to say \"index and "
 "SandBox\", since no page can match both expressions."
 msgstr ""
-"Fíjese en el uso de \"and\" en el ejemplo anterior, que significa que sólo son seleccionadas "
-"las páginas que se corresponden con cada una de las tres expresiones. Utilice \"and\" "
-"cuando quiera combinar una expresión como ésa; utilice \"or\" cuando sea suficiente que una "
-"página se corresponda con una de las expresiones. Fíjese en que no tiene sentido decir "
-"\"index and SandBox\", puesto que ninguna página puede corresponderse con ambas "
-"expresiones."
+"Fíjese en el uso de \"and\" en el ejemplo anterior, que significa que sólo "
+"son seleccionadas las páginas que se corresponden con cada una de las tres "
+"expresiones. Utilice \"and\" cuando quiera combinar una expresión como ésa; "
+"utilice \"or\" cuando sea suficiente que una página se corresponda con una "
+"de las expresiones. Fíjese en que no tiene sentido decir \"index and SandBox"
+"\", puesto que ninguna página puede corresponderse con ambas expresiones."
 
 #. type: Plain text
 msgid ""
@@ -226,9 +157,9 @@ msgid ""
 "grouping. For example, to match pages in a blog that are tagged with either "
 "of two tags, use:"
 msgstr ""
-"También se pueden crear expresiones más complejas, utilizando paréntesis para "
-"agruparlas. Por ejemplo, para seleccionar páginas de un blog que están etiquetadas "
-"con alguna de dos etiquetas, utilice:"
+"También se pueden crear expresiones más complejas, utilizando paréntesis "
+"para agruparlas. Por ejemplo, para seleccionar páginas de un blog que están "
+"etiquetadas con alguna de dos etiquetas, utilice:"
 
 #. type: Plain text
 #, no-wrap
@@ -243,9 +174,116 @@ msgid ""
 "directory of the page containing the pagespec, you can use \"./\". For "
 "example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
 msgstr ""
-"Tenga en cuenta que los nombres de página en las PageSpecs se seleccionan según los "
-"nombre de archivo absolutos de las páginas del wiki, de tal modo que una «pagespec» "
-"\"foo\" utilizada en la página \"a/b\" no seleccionará una página llamada \"a/foo\" o \"a/b/foo\". "
-"Para seleccionar de manera relativa al directorio de la página que contiene la «pagespec», "
-"puede utilizar \"./\". Por ejemplo, \"./foo\" en la página \"a/b\" selecciona la página \"a/foo\"."
+"Tenga en cuenta que los nombres de página en las PageSpecs se seleccionan "
+"según los nombre de archivo absolutos de las páginas del wiki, de tal modo "
+"que una «pagespec» \"foo\" utilizada en la página \"a/b\" no seleccionará "
+"una página llamada \"a/foo\" o \"a/b/foo\". Para seleccionar de manera "
+"relativa al directorio de la página que contiene la «pagespec», puede "
+"utilizar \"./\". Por ejemplo, \"./foo\" en la página \"a/b\" selecciona la "
+"página \"a/foo\"."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "\"`link(page)`\" - selecciona solamente páginas que enlazan a una "
+#~ "determiada página (o patrón «glob»)"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "\"`tagged(tag)`\" - selecciona páginas que están etiquetadas con o "
+#~ "enlazadas a la etiqueta dada (o etiquetas que se corresponden con un "
+#~ "patrón «glob»)"
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "\"`backlink(page)`\" - selecciona solamente páginas a las que enlaza una "
+#~ "página determinada"
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "\"`creation_month(month)`\" - selecciona solamente páginas creadas en el "
+#~ "mes dado"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr "\"`creation_day(mday)`\" - o en el día del mes"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr "\"`creation_year(year)`\" - o en el año"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_after(page)`\" - selecciona solamente páginas creadas después "
+#~ "de que la página dada fuera creada"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_before(page)`\" - selecciona solamente páginas creadas antes "
+#~ "de que la página dada fuera creada"
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "\"`glob(someglob)`\" - selecciona solamente páginas que se corresponden "
+#~ "con el «glob» dado. Escribir simplemente el «glob» mismo es una "
+#~ "abreviatura para esta función."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "\"`internal(glob)`\" - como `glob()`, pero selecciona incluso páginas de "
+#~ "uso interno, que los «globs» normalmente no seleccionan."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - seleccionan páginas que contienen los "
+#~ "metadatos dados, que se corresponden con el «glob» especificado."
+
+#, fuzzy
+#~| msgid ""
+#~| "\"`user(username)`\" - tests whether a modification is being made by a "
+#~| "user with the specified username. If openid is enabled, an openid can "
+#~| "also be put here."
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "\"`user(username)`\" - comprueba si se está haciendo una modificación por "
+#~ "un usuario con el nombre de usuario especificado. Si openid está "
+#~ "habilitado, también se puede usar aquí un openid."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr ""
+#~ "\"`admin()`\" - comprueba si se está haciendo una modificación por uno de "
+#~ "los administradores del wiki."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr ""
+#~ "\"`ip(address)`\" - comprueba si se está haciendo una modificación desde "
+#~ "la dirección IP especificada."
 
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "\"`postcomment(glob)`\" - selecciona solamente cuando se están poniendo "
+#~ "comentarios a una página que se corresponde con el «glob» especificado"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.fr.po b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
index aeec3b95e..b95b818b1 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-02 17:42+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"PO-Revision-Date: 2010-07-16 10:47+0200\n"
 "Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +51,14 @@ msgid ""
 "part of a page name, and \"`?`\" for any single letter of a page name. So "
 "this matches all pages about music, and any [[SubPage]]s of the SandBox, but "
 "does not match the SandBox itself:"
-msgstr "La plupart du temps, vous voulez trouver les pages qui contiennent une expression particulière dans leur nom. Cela s'obtient en utilisant un motif (« glob pattern »). Le métacaractère « `*` » correspond à n'importe quelle partie du nom de la page et le métacaractère « `?` » à n'importe quelle lettre. Ainsi, l'expression suivante correspond à toutes les pages traitant de musique et à n'importe quelle sous-page [[SubPage]] de la *SandBox*, mais pas à la *SandBox* elle-même :"
+msgstr ""
+"La plupart du temps, vous voulez trouver les pages qui contiennent une "
+"expression particulière dans leur nom. Cela s'obtient en utilisant un motif "
+"(« glob pattern »). Le métacaractère « `*` » correspond à n'importe quelle "
+"partie du nom de la page et le métacaractère « `?` » à n'importe quelle "
+"lettre. Ainsi, l'expression suivante correspond à toutes les pages traitant "
+"de musique et à n'importe quelle sous-page [[SubPage]] de la *SandBox*, mais "
+"pas à la *SandBox* elle-même :"
 
 #. type: Plain text
 #, no-wrap
@@ -61,7 +69,10 @@ msgstr "\t*musique* or SandBox/*\n"
 msgid ""
 "You can also prefix an item with \"`!`\" to skip pages that match it. So to "
 "match all pages except for Discussion pages and the SandBox:"
-msgstr "Vous pouvez également préfixer un élément avec « `!` » pour ignorer les pages correspondantes. Ainsi pour trouver toutes les pages sauf les pages Discussion et la page *SandBox* :"
+msgstr ""
+"Vous pouvez également préfixer un élément avec « `!` » pour ignorer les "
+"pages correspondantes. Ainsi pour trouver toutes les pages sauf les pages "
+"Discussion et la page *SandBox* :"
 
 #. type: Bullet: '	* '
 msgid "and !SandBox and !*/Discussion"
@@ -75,107 +86,41 @@ msgstr ""
 "Des contraintes plus élaborées peuvent être ajoutées avec les fonctions "
 "suivantes :"
 
-#. type: Bullet: '* '
-msgid ""
-"\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr "« `link(page)` » - correspond aux pages ayant un lien vers cette page (ou motif)"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"« `tagged(tag)` » - correspond aux pages qui sont marquées ou qui sont liées "
-"à l'étiquette donnée (ou des étiquettes correspondant à un motif)."
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"« `backlink(page)` » - correspond seulement aux pages qui sont pointées "
-"(lien) par la page donnée."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr "« `creation_month(mois)` » - correspond aux pages créées durant ce mois"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr "« `creation_day(jour)` » - ou au jour de ce mois"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "« `creation_year(année)` » - ou année"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"« `created_after(page)` » - correspond aux pages créées après la page donnée"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr "« `created_before(page) » - correspond aux pages créées avant la page donnée"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"« `glob(motif)` » - correspond aux pages correspondantes au motif donné. "
-"N'écrire que le motif lui-même est un raccourci pour cette fonction."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"« `internal(motif)` » - pareil à `glob()`, mais correspond en plus aux pages "
-"à usage interne que la fonction glob ne trouve pas en général."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
-"matching the specified glob."
-msgstr ""
-"« `title(motif)`, `author(motif)`, `authorurl(motif)`, `license(motif)`, "
-"`copyright(motif)` » - renvoient les pages qui possèdent les métadonnées "
-"correspondant au motif donné."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-"« `user(identifiant)` » - teste si une modification est faite par "
-"l'identifiant donné. Si openid est activé, on peut aussi l'utiliser."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-"« `admin()` » - teste si une modification par un administrateur est en cours."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr ""
-"« `ip(adresse)` » - teste si une modification par l'IP donnée est en cours."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"« `postcomment(motif) » - ne correspond que si des commentaires sont postés "
-"vers une page correspondant au motif donné."
 
 #. type: Plain text
 msgid ""
@@ -199,10 +144,11 @@ msgid ""
 "SandBox\", since no page can match both expressions."
 msgstr ""
 "Veuillez noter l'utilisation du « and » dans l'exemple ci-dessus. Seules les "
-"pages dont les trois conditions sont vraies seront trouvées. Utilisez « and » "
-"pour ce genre d'expression combinée. « or » est utilisé quand une seule des "
-"trois conditions est suffisante. Veuillez noter que « index and SandBox » n'a "
-"pas de sens puisqu'aucune page ne peut correspondre aux deux expressions."
+"pages dont les trois conditions sont vraies seront trouvées. Utilisez "
+"« and » pour ce genre d'expression combinée. « or » est utilisé quand une "
+"seule des trois conditions est suffisante. Veuillez noter que « index and "
+"SandBox » n'a pas de sens puisqu'aucune page ne peut correspondre aux deux "
+"expressions."
 
 #. type: Plain text
 msgid ""
@@ -229,8 +175,111 @@ msgid ""
 msgstr ""
 "Veuillez noter que le nom d'une page dans une spécification de page "
 "correspond au nom absolu du fichier dans le wiki. Ainsi une expression "
-"« foo » utilisée sur une page « a/b » ne correspondra pas à une page nommée « a/"
-"foo » ni à une page « a/b/foo ». Pour une correspondance relative au "
+"« foo » utilisée sur une page « a/b » ne correspondra pas à une page nommée "
+"« a/foo » ni à une page « a/b/foo ». Pour une correspondance relative au "
 "répertoire de la page contenant la spécification, vous pouvez utiliser "
-"« ./ ». Par exemple, « ./foo » sur la page « a/b » correspondra à la page « a/"
-"foo »."
+"« ./ ». Par exemple, « ./foo » sur la page « a/b » correspondra à la page "
+"« a/foo »."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "« `link(page)` » - correspond aux pages ayant un lien vers cette page (ou "
+#~ "motif)"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "« `tagged(tag)` » - correspond aux pages qui sont marquées ou qui sont "
+#~ "liées à l'étiquette donnée (ou des étiquettes correspondant à un motif)."
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "« `backlink(page)` » - correspond seulement aux pages qui sont pointées "
+#~ "(lien) par la page donnée."
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "« `creation_month(mois)` » - correspond aux pages créées durant ce mois"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr "« `creation_day(jour)` » - ou au jour de ce mois"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr "« `creation_year(année)` » - ou année"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "« `created_after(page)` » - correspond aux pages créées après la page "
+#~ "donnée"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "« `created_before(page) » - correspond aux pages créées avant la page "
+#~ "donnée"
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "« `glob(motif)` » - correspond aux pages correspondantes au motif donné. "
+#~ "N'écrire que le motif lui-même est un raccourci pour cette fonction."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "« `internal(motif)` » - pareil à `glob()`, mais correspond en plus aux "
+#~ "pages à usage interne que la fonction glob ne trouve pas en général."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "« `title(motif)`, `author(motif)`, `authorurl(motif)`, `license(motif)`, "
+#~ "`copyright(motif)` » - renvoient les pages qui possèdent les métadonnées "
+#~ "correspondant au motif donné."
+
+#~| msgid ""
+#~| "\"`user(username)`\" - tests whether a modification is being made by a "
+#~| "user with the specified username. If openid is enabled, an openid can "
+#~| "also be put here."
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "« `user(identifiant)` » - teste si une modification est faite par "
+#~ "l'identifiant donné. Si openid est activé, on peut aussi l'utiliser. "
+#~ "L'identifiant peut contenir des expressions régulières. Par exemple, pour "
+#~ "obtenir tous les utilisateurs openid, utilisez l'expression `user(*://*)`."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr ""
+#~ "« `admin()` » - teste si une modification par un administrateur est en "
+#~ "cours."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr ""
+#~ "« `ip(adresse)` » - teste si une modification par l'IP donnée est en "
+#~ "cours."
+
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "« `postcomment(motif) » - ne correspond que si des commentaires sont "
+#~ "postés vers une page correspondant au motif donné."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po
index 2eb1493c8..3d12a009e 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-27 09:04+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,10 +41,16 @@ msgstr ""
 "`allowed_attachments` určovat, které typy příloh budou povoleny."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
 "Například pokud byste chtěli omezit všechny soubory na 50 kilobajtů s "
 "výjimkou větčích mp3 souborů nahraných uživatelem joey do specifického "
@@ -51,8 +58,9 @@ msgstr ""
 "virů, mohli byste použít něco jako:"
 
 #. type: Plain text
-#, no-wrap
-msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.da.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.da.po
index 6f3d28632..aa9e1434c 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,18 +47,25 @@ msgstr ""
 "`allowed_attachments`."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
 "Som eksempel, for at begrænse vilkårlige filer til 50 kilobytes, men tillade "
 "større mp3-filer at blive lagt op af joey til en bestemt mappe, og checke "
 "alle vedhæftninger for vira, kunne noget i stil med dette bruges:"
 
 #. type: Plain text
-#, no-wrap
-msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
index 1a20a5f0e..d0b2ba9cb 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 15:17+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,24 +43,27 @@ msgstr ""
 "`allowed_attachments` verändert."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
-"Zum Beispiel können beliebige Dateien auf 50 Kilobyte beschränkt, "
-"aber größere mp3-Dateien von joey in einem bestimmten Verzeichnis erlaubt, "
-"und alle Anhänge nach Viren durchsucht werden, indem etwas wie "
-"das Folgende verwendet wird:"
+"Zum Beispiel können beliebige Dateien auf 50 Kilobyte beschränkt, aber "
+"größere mp3-Dateien von joey in einem bestimmten Verzeichnis erlaubt, und "
+"alle Anhänge nach Viren durchsucht werden, indem etwas wie das Folgende "
+"verwendet wird:"
 
 #. type: Plain text
-#, no-wrap
-msgid ""
-"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) "
-"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
-msgstr ""
-"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) "
-"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
+msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
 msgid ""
@@ -72,12 +76,12 @@ msgstr ""
 #. type: Bullet: '* '
 msgid ""
 "\"`maxsize(size)`\" - tests whether the attachment is no larger than the "
-"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", "
-"\"gb\" etc can be used to specify the units."
+"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", \"gb"
+"\" etc can be used to specify the units."
 msgstr ""
 "\"`maxsize(size)`\" - prüft ob der Anhang nicht größer ist als angegeben. "
-"Die Größe wird standardmäßig in Bytes angegeben, aber `kb`, `mb`, "
-"`gb` und so weiter kann verwendet werden, um die Einheit anzugeben."
+"Die Größe wird standardmäßig in Bytes angegeben, aber `kb`, `mb`, `gb` und "
+"so weiter kann verwendet werden, um die Einheit anzugeben."
 
 #. type: Bullet: '* '
 msgid ""
@@ -118,5 +122,3 @@ msgstr ""
 #. type: Bullet: '* '
 msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
 msgstr "\"`virusfree()`\" - prüft den Anhang mit einem Virenscanner."
-
-
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po
index 201d87937..a2cdfc8dd 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-03 13:21+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,24 +38,31 @@ msgid ""
 "attachments will be accepted, via the `allowed_attachments` configuration "
 "setting."
 msgstr ""
-"Si los archivos adjuntos están activados, el administrador del wiki puede controlar "
-"qué tipos de archivos adjuntos serán aceptados a través de la opción de configuración "
-"`allowed_attachments`."
+"Si los archivos adjuntos están activados, el administrador del wiki puede "
+"controlar qué tipos de archivos adjuntos serán aceptados a través de la "
+"opción de configuración `allowed_attachments`."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
-"Por ejemplo, para limitar cualquier archivo a 50 kilobytes, pero permitir que "
-"joey envíe archivos mp3 más grandes a un directorio específico, y comprobar "
-"todos los archivos adjuntos en busca de virus, se podría utilizar algo como lo "
-"siguiente:"
+"Por ejemplo, para limitar cualquier archivo a 50 kilobytes, pero permitir "
+"que joey envíe archivos mp3 más grandes a un directorio específico, y "
+"comprobar todos los archivos adjuntos en busca de virus, se podría utilizar "
+"algo como lo siguiente:"
 
 #. type: Plain text
-#, no-wrap
-msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
@@ -62,8 +70,8 @@ msgid ""
 "The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
 "additional tests:"
 msgstr ""
-"La sintaxis normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones adicionales "
-"siguientes:"
+"La sintaxis normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones "
+"adicionales siguientes:"
 
 #. type: Bullet: '* '
 msgid ""
@@ -72,8 +80,8 @@ msgid ""
 "\" etc can be used to specify the units."
 msgstr ""
 "\"`maxsize(tamaño)`\" - comprueba que el archivo adjunto no sea más grande "
-"que el tamaño especificado. De manera predeterminada el tamaño se expresa "
-"en bytes, pero se puede utilizar «kb», «mb», «gb», etc., para especificar las "
+"que el tamaño especificado. De manera predeterminada el tamaño se expresa en "
+"bytes, pero se puede utilizar «kb», «mb», «gb», etc., para especificar las "
 "unidades."
 
 #. type: Bullet: '* '
@@ -81,8 +89,8 @@ msgid ""
 "\"`minsize(size)`\" - tests whether the attachment is no smaller than the "
 "specified size."
 msgstr ""
-"\"`minsize(tamaño)`\" - comprueba que el archivo adjunto no sea más pequeño que "
-"el tamaño especificado."
+"\"`minsize(tamaño)`\" - comprueba que el archivo adjunto no sea más pequeño "
+"que el tamaño especificado."
 
 #. type: Bullet: '* '
 msgid ""
@@ -90,9 +98,9 @@ msgid ""
 "a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other "
 "enabled page format)."
 msgstr ""
-"\"`ispage()`\" - comprueba si el archivo adjunto será tratado por ikiwiki como una "
-"página wiki. (Es decir, si tiene una extensión \".mdwn\", o la de cualquier otro "
-"formato de página activado)."
+"\"`ispage()`\" - comprueba si el archivo adjunto será tratado por ikiwiki "
+"como una página wiki. (Es decir, si tiene una extensión \".mdwn\", o la de "
+"cualquier otro formato de página activado)."
 
 #. type: Plain text
 #, no-wrap
@@ -110,10 +118,10 @@ msgid ""
 "\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can "
 "include a glob in the type, for example `mimetype(image/*)`."
 msgstr ""
-"\"`mimetype(foo/bar)`\" - comprueba el tipo MIME del archivo adjunto. Puede incluir "
-"un «glob» en el tipo, por ejemplo `mimetype(image/*)`."
+"\"`mimetype(foo/bar)`\" - comprueba el tipo MIME del archivo adjunto. Puede "
+"incluir un «glob» en el tipo, por ejemplo `mimetype(image/*)`."
 
 #. type: Bullet: '* '
 msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
-msgstr "\"`virusfree()`\" - comprueba el archivo adjunto con un programa antivirus."
-
+msgstr ""
+"\"`virusfree()`\" - comprueba el archivo adjunto con un programa antivirus."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
index 10f942033..9985f9ce5 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-26 14:46+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -40,10 +41,16 @@ msgstr ""
 "`allowed_attachments`."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
 "Par exemple, pour limiter tous les fichiers à 50 kilooctets mais permettre "
 "que des fichiers mp3 plus grands soient envoyés par joey dans un répertoire "
@@ -51,8 +58,9 @@ msgstr ""
 "peut utiliser quelque chose comme ça :"
 
 #. type: Plain text
-#, no-wrap
-msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po b/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po
index 6e09fa4e6..2cf84cf45 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-27 09:20+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,6 +52,14 @@ msgstr ""
 "„`currentlang()`“ - testuje, zda je stránka napsána ve stejném jazyce jako "
 "aktuální stránka."
 
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
+
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
@@ -59,3 +68,8 @@ msgstr ""
 "O každé stránce, která nepoužívá „po“ překlad, se předpokládá, že je napsaná "
 "v jazyce zadaném proměnnou `po_master_language` v konfiguračním souboru "
 "ikiwiki."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.da.po b/po/underlays/basewiki/ikiwiki/pagespec/po.da.po
index b719d25fe..9861d3c64 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 11:33+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-20 11:41+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,6 +57,14 @@ msgstr ""
 "\"`currentlang()`\" - tester hvorvidt en side er skrevet i samme sprog som "
 "den nuværende side."
 
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
+
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
@@ -63,3 +72,8 @@ msgid ""
 msgstr ""
 "Bemærk at enhver ikke-po side antages at være skrevet i "
 "`po_master_language`, som angivet i `ikiwiki.setup`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.de.po b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
index 785b16ffa..266e30875 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 13:55+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,15 +27,14 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular "
-"[[ikiwiki/PageSpec]] syntax is expanded with the following additional tests "
-"that can be used to improve user navigation in a multi-lingual wiki:"
+"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/"
+"PageSpec]] syntax is expanded with the following additional tests that can "
+"be used to improve user navigation in a multi-lingual wiki:"
 msgstr ""
 "Wenn die [[!iki plugins/po desc=po]]-Erweiterung aktiviert ist, ist die "
-"reguläre "
-"[[ikiwiki/PageSpec]]-Syntax um die folgenden zusätzlichen Tests erweitert, "
-"die zur Verbesserung der Benutzernavigation in mehrsprachigen Wikis "
-"verwendet werden kann:"
+"reguläre [[ikiwiki/PageSpec]]-Syntax um die folgenden zusätzlichen Tests "
+"erweitert, die zur Verbesserung der Benutzernavigation in mehrsprachigen "
+"Wikis verwendet werden kann:"
 
 #. type: Bullet: '* '
 msgid ""
@@ -42,8 +42,8 @@ msgid ""
 "as a ISO639-1 (two-letter) language code."
 msgstr ""
 "\"`lang(LL)`\" - prüft ob eine Seite in der angegebenen Sprache geschrieben "
-"ist. "
-"Die Sprache wird als (zweibuchstabiger) Sprachcode nach ISO639-1 angegeben."
+"ist. Die Sprache wird als (zweibuchstabiger) Sprachcode nach ISO639-1 "
+"angegeben."
 
 #. type: Bullet: '* '
 msgid ""
@@ -51,20 +51,25 @@ msgid ""
 "as the current page."
 msgstr ""
 "\"`currentlang()`\" - prüft, ob eine Seite in der gleichen Sprache "
-"geschrieben ist wie "
-"die aktuelle Seite."
+"geschrieben ist wie die aktuelle Seite."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
 
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
 "`po_master_language`, as specified in `ikiwiki.setup`."
 msgstr ""
-"Beachte, dass als Sprache jeder nicht-po-Seite `po_master_language` "
-" angenommen wird, wie in `ikiwiki.setup` angegeben."
+"Beachte, dass als Sprache jeder nicht-po-Seite `po_master_language`  "
+"angenommen wird, wie in `ikiwiki.setup` angegeben."
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.es.po b/po/underlays/basewiki/ikiwiki/pagespec/po.es.po
index 3a9d8d4a1..e44033056 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.es.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.es.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-03 13:48+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,33 +33,45 @@ msgid ""
 "PageSpec]] syntax is expanded with the following additional tests that can "
 "be used to improve user navigation in a multi-lingual wiki:"
 msgstr ""
-"Si el complemento («plugin») [[!iki plugins/po desc=po]] está activado, la sintaxis "
-"normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones adicionales "
-"siguientes, que se pueden utilizar  para mejorar la navegación del usuario en "
-"un wiki multilingüe:"
+"Si el complemento («plugin») [[!iki plugins/po desc=po]] está activado, la "
+"sintaxis normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones "
+"adicionales siguientes, que se pueden utilizar  para mejorar la navegación "
+"del usuario en un wiki multilingüe:"
 
 #. type: Bullet: '* '
 msgid ""
 "\"`lang(LL)`\" - tests whether a page is written in the language specified "
 "as a ISO639-1 (two-letter) language code."
 msgstr ""
-"\"`lang(LL)`\" - comprueba si una página está escrita en el idioma especificado según "
-"el código ISO639-1 (dos letras)."
+"\"`lang(LL)`\" - comprueba si una página está escrita en el idioma "
+"especificado según el código ISO639-1 (dos letras)."
 
 #. type: Bullet: '* '
 msgid ""
 "\"`currentlang()`\" - tests whether a page is written in the same language "
 "as the current page."
 msgstr ""
-"\"`currentlang()`\" - comprueba si una página está escrita en el mismo idioma "
-"que la página actual."
+"\"`currentlang()`\" - comprueba si una página está escrita en el mismo "
+"idioma que la página actual."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
 
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
 "`po_master_language`, as specified in `ikiwiki.setup`."
 msgstr ""
-"Tenga en cuenta que se considera que cualquier página que no "
-"sea de tipo «po» está escrita en `po_master_language`, según "
-"se especifica en `ikiwiki.setup`."
+"Tenga en cuenta que se considera que cualquier página que no sea de tipo "
+"«po» está escrita en `po_master_language`, según se especifica en `ikiwiki."
+"setup`."
 
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
index a771f6ef7..760e3cf24 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-30 09:37+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -29,7 +30,11 @@ msgid ""
 "If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/"
 "PageSpec]] syntax is expanded with the following additional tests that can "
 "be used to improve user navigation in a multi-lingual wiki:"
-msgstr "Si le greffon [[!iki plugins/po desc=po]] est activé, la syntaxe normale de [[ikiwiki/PageSpec]] est développée avec les tests supplémentaires suivants qui peuvent améliorer la navigation d'un utilisateur de wiki plurilinguistique :"
+msgstr ""
+"Si le greffon [[!iki plugins/po desc=po]] est activé, la syntaxe normale de "
+"[[ikiwiki/PageSpec]] est développée avec les tests supplémentaires suivants "
+"qui peuvent améliorer la navigation d'un utilisateur de wiki "
+"plurilinguistique :"
 
 #. type: Bullet: '* '
 msgid ""
@@ -47,6 +52,14 @@ msgstr ""
 "`currentlang()` - teste si une page est écrite dans la langue de la page "
 "donnée."
 
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
+
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
@@ -55,3 +68,8 @@ msgstr ""
 "Notez que chaque page qui n'est pas de type po est considérée comme une page "
 "écrite selon le `po_master_language`, tel que spécifié dans le fichier de "
 "configuration `ikiwiki.setup`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/subpage.cs.po b/po/underlays/basewiki/ikiwiki/subpage.cs.po
index 8a69549f9..2df8ad5a1 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.cs.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-26 17:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,10 +34,16 @@ msgstr ""
 "stránek."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
 "Pro přidání [[podstránky|SubPage]] jednoduše vytvořte podadresář a umístěte "
diff --git a/po/underlays/basewiki/ikiwiki/subpage.da.po b/po/underlays/basewiki/ikiwiki/subpage.da.po
index 09343501b..0b264895a 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.da.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,10 +39,16 @@ msgstr ""
 "sider."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
 "En [[UnderSide|SubPage]] oprettes ved blot at oprette undermappen og tilføje "
diff --git a/po/underlays/basewiki/ikiwiki/subpage.de.po b/po/underlays/basewiki/ikiwiki/subpage.de.po
index 184144ca0..68fb4e08f 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.de.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 15:19+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,9 +24,9 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "ikiwiki supports placing pages in a directory hierarchy. For example, this "
-"page, [[SubPage]] has some related pages placed under it, like "
-"[[SubPage/LinkingRules]]. This is a useful way to add some order to your "
-"wiki rather than just having a great big directory full of pages."
+"page, [[SubPage]] has some related pages placed under it, like [[SubPage/"
+"LinkingRules]]. This is a useful way to add some order to your wiki rather "
+"than just having a great big directory full of pages."
 msgstr ""
 "In ikiwiki werden Seiten in einem Verzeichnisbaum angeordnet. Zum Beispiel "
 "gibt es unterhalb dieser Seite, [[SubPage]], einige verwandte Seiten, etwa "
@@ -34,10 +35,16 @@ msgstr ""
 "haben."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
 "Um eine Unterseite hinzuzufügen, legt man einfach ein Unterverzeichnis an "
@@ -50,5 +57,3 @@ msgstr ""
 msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
 msgstr ""
 "Wie Links auf Unterseiten gesetzt werden, wird in [[LinkingRules]] erklärt."
-
-
diff --git a/po/underlays/basewiki/ikiwiki/subpage.es.po b/po/underlays/basewiki/ikiwiki/subpage.es.po
index 0b0c8453e..054a311e9 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.es.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.es.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-03 18:21+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,25 +28,32 @@ msgid ""
 "LinkingRules]]. This is a useful way to add some order to your wiki rather "
 "than just having a great big directory full of pages."
 msgstr ""
-"ikiwiki permite colocar páginas en una jerarquía de directorios. Por ejemplo, bajo "
-"esta página, [[SubPage]] («subpágina»), hay algunas páginas relacionadas, como [[SubPage/LinkingRules]]. Ésta es una manera práctica de poner un poco de orden "
-"en el wiki, en lugar de tener simplemente un gran directorio lleno de páginas."
+"ikiwiki permite colocar páginas en una jerarquía de directorios. Por "
+"ejemplo, bajo esta página, [[SubPage]] («subpágina»), hay algunas páginas "
+"relacionadas, como [[SubPage/LinkingRules]]. Ésta es una manera práctica de "
+"poner un poco de orden en el wiki, en lugar de tener simplemente un gran "
+"directorio lleno de páginas."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
-"Para añadir una subpágina, simplemente cree un subdirectorio y ponga páginas en "
-"él. Por ejemplo, esta página es «SubPage.mdwn» en las fuentes del wiki, y hay además "
-"un directorio «SubPage», que contiene «SubPage/LinkingRules.mdwn». Las subpáginas "
-"pueden anidarse tanto como desee."
+"Para añadir una subpágina, simplemente cree un subdirectorio y ponga páginas "
+"en él. Por ejemplo, esta página es «SubPage.mdwn» en las fuentes del wiki, y "
+"hay además un directorio «SubPage», que contiene «SubPage/LinkingRules."
+"mdwn». Las subpáginas pueden anidarse tanto como desee."
 
 #. type: Plain text
 msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
 msgstr ""
-"La creación de un enlace a y desde una subpágina se explica en [[LinkingRules]] "
-"(Reglas para la creación de enlaces)."
-
+"La creación de un enlace a y desde una subpágina se explica en "
+"[[LinkingRules]] (Reglas para la creación de enlaces)."
diff --git a/po/underlays/basewiki/ikiwiki/subpage.fr.po b/po/underlays/basewiki/ikiwiki/subpage.fr.po
index cf0e56cd9..61264b406 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.fr.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-25 10:31+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -32,10 +33,16 @@ msgstr ""
 "répertoire plein de pages."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
 "Pour ajouter une sous-page, faites simplement un sous-répertoire et mettez-y "
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.cs.po b/po/underlays/basewiki/ikiwiki/wikilink.cs.po
index 1ca35af2f..27515a519 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.cs.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-27 08:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,14 +48,6 @@ msgstr ""
 "Při odkazování mezi [[podstránkami|SubPage]] platí speciální [[pravidla "
 "vytváření odkazů|SubPage/LinkingRules]]."
 
-#. type: Plain text
-msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"Také pokud soubor odkazovaný pomocí wiki odkazu vypadá jako obrázek, bude "
-"zobrazen přímo ve stránce."
-
 #. type: Plain text
 msgid ""
 "WikiLinks are matched with page names in a case-insensitive manner, so you "
@@ -83,24 +76,40 @@ msgid ""
 msgstr ""
 "Pro odkaz na kotvu uvnitř stránky použijte něco jako `\\[[WikiLink#kotva]]`."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Direktivy a wiki odkazy"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Také pokud soubor odkazovaný pomocí wiki odkazu vypadá jako obrázek, bude "
+"zobrazen přímo ve stránce."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"ikiwiki používá pro [[direktivy|directive]] dva zápisy. Starší zápis používá "
-"pro rozlišení mezi direktivami a wiki odkazy mezery. To znamená, že ve wiki "
-"odkazech pak nemůžete použít mezery a musíte je nahradit podtržítky. Novější "
-"zápis, který se povoluje v konfiguračním souboru volbou `prefix_directives` "
-"vyžaduje, aby direktivy začínaly vykřičníkem a tím pádem nevylučuje odkazy s "
-"mezerami. Budoucí verze ikiwiki budou mít tuto volbu implicitně zapnutou."
+
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Direktivy a wiki odkazy"
+
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "ikiwiki používá pro [[direktivy|directive]] dva zápisy. Starší zápis "
+#~ "používá pro rozlišení mezi direktivami a wiki odkazy mezery. To znamená, "
+#~ "že ve wiki odkazech pak nemůžete použít mezery a musíte je nahradit "
+#~ "podtržítky. Novější zápis, který se povoluje v konfiguračním souboru "
+#~ "volbou `prefix_directives` vyžaduje, aby direktivy začínaly vykřičníkem a "
+#~ "tím pádem nevylučuje odkazy s mezerami. Budoucí verze ikiwiki budou mít "
+#~ "tuto volbu implicitně zapnutou."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.da.po b/po/underlays/basewiki/ikiwiki/wikilink.da.po
index 8c565844f..90fe53088 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.da.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,14 +51,6 @@ msgstr ""
 "Specielle [[henvisningsregler|SubPage/LinkingRules]] træder i kraft når der "
 "henvises på tværs af [[undersider|SubPage]]."
 
-#. type: Plain text
-msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"Desuden, hvis filen der henvises til med en WikiLink ligner et billede, vil "
-"det blive vist indlejret i siden."
-
 #. type: Plain text
 msgid ""
 "WikiLinks are matched with page names in a case-insensitive manner, so you "
@@ -86,25 +79,41 @@ msgstr ""
 "For at henvise til et anker inde på en side, kan du bruge noget i stil med `"
 "\\[[WikiLink#foo]]` ."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Direktiver og wikilinks"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Desuden, hvis filen der henvises til med en WikiLink ligner et billede, vil "
+"det blive vist indlejret i siden."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"ikiwiki har to syntakser til [[direktiver|directive]]. Den ældre syntaks "
-"brugte mellemrum til at skelne mellem direktiver og wikilinks; det medfører, "
-"at når den syntaks anvendes kan du ikke bruge mellemrum i WikiLinks, og må "
-"erstatte mellemrum med understregning. Den nyere syntaks, aktiveret med "
-"valget `prefix_directives` i en ikiwiki-opsætningsfil, sætter `!` foran "
-"direktiver, og forhindrer derfor ikke henvisninger med mellemrum. Fremtidige "
-"versioner af ikiwiki vil aktivere dette valg som standard."
+
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Direktiver og wikilinks"
+
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "ikiwiki har to syntakser til [[direktiver|directive]]. Den ældre syntaks "
+#~ "brugte mellemrum til at skelne mellem direktiver og wikilinks; det "
+#~ "medfører, at når den syntaks anvendes kan du ikke bruge mellemrum i "
+#~ "WikiLinks, og må erstatte mellemrum med understregning. Den nyere "
+#~ "syntaks, aktiveret med valget `prefix_directives` i en ikiwiki-"
+#~ "opsætningsfil, sætter `!` foran direktiver, og forhindrer derfor ikke "
+#~ "henvisninger med mellemrum. Fremtidige versioner af ikiwiki vil aktivere "
+#~ "dette valg som standard."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.de.po b/po/underlays/basewiki/ikiwiki/wikilink.de.po
index ccdd20303..ac6c02e36 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.de.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 13:41+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,17 @@ msgid ""
 "For example `\\[[WikiLink]]`."
 msgstr ""
 "WikiLinks ermöglichen es, auf einfache Weise Links zwischen Seiten im Wiki "
-"zu setzen. "
-"Um einen [[WikiLink]] zu erstellen, setze einfach den Namen der Zielseite in "
-"doppelte eckige Klammern, zum Beispiel `\\[[WikiLink]]`."
+"zu setzen. Um einen [[WikiLink]] zu erstellen, setze einfach den Namen der "
+"Zielseite in doppelte eckige Klammern, zum Beispiel `\\[[WikiLink]]`."
 
 #. type: Plain text
 msgid ""
 "If you ever need to write something like `\\[[WikiLink]]` without creating a "
 "wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
 msgstr ""
-"Wenn man irgendwann einmal etwas wie `\\[[WikiLink]]` schreiben will, "
-"ohne einen WikiLink zu erzeugen, stellt man einfach ein `\\` voran, wie in "
-"`\\\\[[WikiLink]]`."
+"Wenn man irgendwann einmal etwas wie `\\[[WikiLink]]` schreiben will, ohne "
+"einen WikiLink zu erzeugen, stellt man einfach ein `\\` voran, wie in `\\"
+"\\[[WikiLink]]`."
 
 #. type: Plain text
 msgid ""
@@ -46,23 +46,15 @@ msgstr ""
 "Es gibt einige spezielle [[Regeln für Links|SubPage/LinkingRules]], die beim "
 "setzen von Links zwischen [[Unterseiten|SubPage]] ins Spiel kommen."
 
-#. type: Plain text
-msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"Wenn das Ziel eines WikiLinks nach einem Bild aussieht, wird dieses "
-"innerhalb der Seite angezeigt."
-
 #. type: Plain text
 msgid ""
 "WikiLinks are matched with page names in a case-insensitive manner, so you "
 "don't need to worry about getting the case the same, and can capitalise "
 "links at the start of a sentence, and so on."
 msgstr ""
-"WikiLinks werden unabhängig von der Groß- und Kleinschreibung gefunden, "
-"man braucht sich also keine Gedanken über identische Schreibweise zu machen "
-"und kann zum Beispiel das erste Wort eines Satzes groß schreiben."
+"WikiLinks werden unabhängig von der Groß- und Kleinschreibung gefunden, man "
+"braucht sich also keine Gedanken über identische Schreibweise zu machen und "
+"kann zum Beispiel das erste Wort eines Satzes groß schreiben."
 
 #. type: Plain text
 msgid ""
@@ -71,41 +63,53 @@ msgid ""
 "SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
 msgstr ""
 "Es ist auch möglich einen WikiLink zu schreiben, der etwas anderes als den "
-"Seitennamen als Text für den Link verwendet. Zum Beispiel verweist "
-"`\\[[foo_bar|SandBox]]` auf die Sandkasten-Seite, aber der Link erscheint "
-"als [[foo_bar|SandBox]]."
+"Seitennamen als Text für den Link verwendet. Zum Beispiel verweist `"
+"\\[[foo_bar|SandBox]]` auf die Sandkasten-Seite, aber der Link erscheint als "
+"[[foo_bar|SandBox]]."
 
 #. type: Plain text
 msgid ""
-"To link to an anchor inside a page, you can use something like "
-"`\\[[WikiLink#foo]]` ."
+"To link to an anchor inside a page, you can use something like `"
+"\\[[WikiLink#foo]]` ."
 msgstr ""
-"Um auf ein Ziel innerhalb einer Seite zu verweisen, kann man etwas wie "
-"`\\[[WikiLink#foo]]` verwenden."
+"Um auf ein Ziel innerhalb einer Seite zu verweisen, kann man etwas wie `"
+"\\[[WikiLink#foo]]` verwenden."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Anweisungen und WikiLinks"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Wenn das Ziel eines WikiLinks nach einem Bild aussieht, wird dieses "
+"innerhalb der Seite angezeigt."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"Es gibt in ikiwiki zwei Syntaxen für [[Anweisungen|directive]]. Die ältere "
-"Syntax verwendete Leerzeichen, um zwischen Anweisungen und WikiLinks "
-"zu unterscheiden; mit dem Ergebnis, dass bei Verwendung dieser Syntax "
-"keine Leerzeichen in WikiLinks verwendet werden können und durch "
-"Unterstriche ersetzt werden müssen. Die neuere Syntax, aktiviert durch "
-"die Option `prefix_directives` in einer ikiwiki-Setup-Datei, stellt "
-"Anweisungen `!` voran und ermöglicht so Links mit Leerzeichen. "
-"Zukünftige Versionen von ikiwiki werden diese Option standardmäßig "
-"aktivieren."
 
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Anweisungen und WikiLinks"
 
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "Es gibt in ikiwiki zwei Syntaxen für [[Anweisungen|directive]]. Die "
+#~ "ältere Syntax verwendete Leerzeichen, um zwischen Anweisungen und "
+#~ "WikiLinks zu unterscheiden; mit dem Ergebnis, dass bei Verwendung dieser "
+#~ "Syntax keine Leerzeichen in WikiLinks verwendet werden können und durch "
+#~ "Unterstriche ersetzt werden müssen. Die neuere Syntax, aktiviert durch "
+#~ "die Option `prefix_directives` in einer ikiwiki-Setup-Datei, stellt "
+#~ "Anweisungen `!` voran und ermöglicht so Links mit Leerzeichen. Zukünftige "
+#~ "Versionen von ikiwiki werden diese Option standardmäßig aktivieren."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.es.po b/po/underlays/basewiki/ikiwiki/wikilink.es.po
index 252bc9984..2f547892a 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.es.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.es.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wikilink\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-12-06 17:57+0100\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: none\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,33 +27,26 @@ msgid ""
 "[[WikiLink]], just put the name of the page to link to in double brackets.  "
 "For example `\\[[WikiLink]]`."
 msgstr ""
-"Los WikiLinks proporcionan enlaces fáciles entre páginas del wiki. Para crear un "
-"[[WikiLink]], ponga simplemente el nombre de la página a enlazar entre corchetes "
-"dobles. Por ejemplo, `\\[[WikiLink]]`."
+"Los WikiLinks proporcionan enlaces fáciles entre páginas del wiki. Para "
+"crear un [[WikiLink]], ponga simplemente el nombre de la página a enlazar "
+"entre corchetes dobles. Por ejemplo, `\\[[WikiLink]]`."
 
 #. type: Plain text
 msgid ""
 "If you ever need to write something like `\\[[WikiLink]]` without creating a "
 "wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
 msgstr ""
-"Si necesita crea algo como `\\[[WikiLink]]` sin crear un link wiki, simplemente añada "
-"`\\` como prefijo, de la siguiente manera: `\\\\[[WikiLink]]`."
+"Si necesita crea algo como `\\[[WikiLink]]` sin crear un link wiki, "
+"simplemente añada `\\` como prefijo, de la siguiente manera: `\\"
+"\\[[WikiLink]]`."
 
 #. type: Plain text
 msgid ""
 "There are some special [[SubPage/LinkingRules]] that come into play when "
 "linking between [[SubPages|SubPage]]."
 msgstr ""
-"Hay algunas [[Reglas para la creación de enlaces|SubPage/LinkingRules]] especiales "
-"que entran en juego al enlazar [[Subpáginas|SubPage]]."
-
-#. type: Plain text
-msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"Además, si el archivo enlazado por un WikiLink parece una imagen, se mostrará "
-"como parte de la página."
+"Hay algunas [[Reglas para la creación de enlaces|SubPage/LinkingRules]] "
+"especiales que entran en juego al enlazar [[Subpáginas|SubPage]]."
 
 #. type: Plain text
 msgid ""
@@ -60,9 +54,10 @@ msgid ""
 "don't need to worry about getting the case the same, and can capitalise "
 "links at the start of a sentence, and so on."
 msgstr ""
-"Los WikiLinks se corresponden con nombres de página sin tener en cuenta si se "
-"usan letras mayúsculas o minúsculas, así que no tiene que preocuparse por esto, y "
-"puede por ejemplo utilizar mayúsculas en un enlace si se encuentra al principio de una frase."
+"Los WikiLinks se corresponden con nombres de página sin tener en cuenta si "
+"se usan letras mayúsculas o minúsculas, así que no tiene que preocuparse por "
+"esto, y puede por ejemplo utilizar mayúsculas en un enlace si se encuentra "
+"al principio de una frase."
 
 #. type: Plain text
 msgid ""
@@ -70,9 +65,10 @@ msgid ""
 "page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
 "SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
 msgstr ""
-"También es posible escribir un WikiLink que use otra cosa en lugar del nombre de la "
-"página como texto del enlace. Por ejemplo `\\[[foo_bar|SandBox]]` enlaza a la página "
-"de la zona de pruebas («SandBox»), pero el enlace aparece así: [[foo_bar|SandBox]]."
+"También es posible escribir un WikiLink que use otra cosa en lugar del "
+"nombre de la página como texto del enlace. Por ejemplo `\\[[foo_bar|SandBox]]"
+"` enlaza a la página de la zona de pruebas («SandBox»), pero el enlace "
+"aparece así: [[foo_bar|SandBox]]."
 
 #. type: Plain text
 msgid ""
@@ -82,26 +78,41 @@ msgstr ""
 "Para enlazar a un punto («anchor») dentro de una página, puede utilizar algo "
 "como `\\[[WikiLink#foo]]` ."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Directivas y WikiLinks"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Además, si el archivo enlazado por un WikiLink parece una imagen, se "
+"mostrará como parte de la página."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"ikiwiki tiene dos sintaxis para las [[directivas|directive]]. La sintaxis antigua "
-"utilizaba espacios para distinguir entre directivas y wikilinks; como resultado, "
-"al utilizar esa sintaxis, no podía utilizar espacios en los WikiLinks, y debía reemplazar "
-"los espacios con guiones bajos. La nueva sintaxis, activada con la opción `prefix_directives` "
-"en un archivo de configuración de ikiwiki, añade a las directivas el prefijo `!`, y así no "
-"impide enlaces con espacios. Futuras versiones de ikiwiki activarán esta opción de "
-"manera predeterminada."
 
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Directivas y WikiLinks"
+
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "ikiwiki tiene dos sintaxis para las [[directivas|directive]]. La sintaxis "
+#~ "antigua utilizaba espacios para distinguir entre directivas y wikilinks; "
+#~ "como resultado, al utilizar esa sintaxis, no podía utilizar espacios en "
+#~ "los WikiLinks, y debía reemplazar los espacios con guiones bajos. La "
+#~ "nueva sintaxis, activada con la opción `prefix_directives` en un archivo "
+#~ "de configuración de ikiwiki, añade a las directivas el prefijo `!`, y así "
+#~ "no impide enlaces con espacios. Futuras versiones de ikiwiki activarán "
+#~ "esta opción de manera predeterminada."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.fr.po b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
index ac464fb18..f527ef364 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.fr.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-28 16:05+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -45,14 +46,6 @@ msgstr ""
 "Quelques règles spéciales, [[SubPage/LinkingRules]], entrent en jeu pour "
 "lier des sous-pages, [[SubPages|SubPage]]."
 
-#. type: Plain text
-msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il "
-"est affiché au fil du texte sur la page."
-
 #. type: Plain text
 msgid ""
 "WikiLinks are matched with page names in a case-insensitive manner, so you "
@@ -82,26 +75,41 @@ msgstr ""
 "Pour pointer vers une ancre à l'intérieur d'une page, vous pouvez utiliser "
 "quelque chose comme `\\[[WikiLink#foo]]`."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Directives et WikiLinks"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il "
+"est affiché au fil du texte sur la page."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"Il existe deux syntaxes pour les [[directives|directive]]. L'ancienne "
-"syntaxe se sert d'espaces pour différencier les directives et les Wikilinks. "
-"Ainsi, avec cette syntaxe, vous ne pouvez pas utiliser d'espaces dans les "
-"WikiLinks et vous devez les remplacer par des tirets bas `_`. La nouvelle "
-"syntaxe, activée par l'option `prefix_directives` dans le fichier de "
-"configuration d'ikiwiki, préfixe les directives par un `!`, ce qui permet "
-"l'utilisation d'espaces dans les liens. Dans les futures versions d'ikiwiki, "
-"cette option sera activée par défaut."
+
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Directives et WikiLinks"
+
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "Il existe deux syntaxes pour les [[directives|directive]]. L'ancienne "
+#~ "syntaxe se sert d'espaces pour différencier les directives et les "
+#~ "Wikilinks. Ainsi, avec cette syntaxe, vous ne pouvez pas utiliser "
+#~ "d'espaces dans les WikiLinks et vous devez les remplacer par des tirets "
+#~ "bas `_`. La nouvelle syntaxe, activée par l'option `prefix_directives` "
+#~ "dans le fichier de configuration d'ikiwiki, préfixe les directives par un "
+#~ "`!`, ce qui permet l'utilisation d'espaces dans les liens. Dans les "
+#~ "futures versions d'ikiwiki, cette option sera activée par défaut."
diff --git a/po/underlays/basewiki/shortcuts.cs.po b/po/underlays/basewiki/shortcuts.cs.po
index 7ae43e31a..15d523011 100644
--- a/po/underlays/basewiki/shortcuts.cs.po
+++ b/po/underlays/basewiki/shortcuts.cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-08-28 11:20+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -76,8 +76,13 @@ msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
+#| "\"]]"
 msgid ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
 msgstr ""
 "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"chyba č. %s"
 "\"]]"
@@ -117,7 +122,42 @@ msgstr ""
 "\"]]"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
@@ -153,6 +193,8 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Použití: `\\[[!debss balík]]`, `\\[[!debss balík#verze]]` nebo `\\[[!debss balík/verze]]`. Podrobnosti na http://snapshot.debian.net.\n"
diff --git a/po/underlays/basewiki/shortcuts.da.po b/po/underlays/basewiki/shortcuts.da.po
index c342d12e1..b9498d997 100644
--- a/po/underlays/basewiki/shortcuts.da.po
+++ b/po/underlays/basewiki/shortcuts.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -80,8 +80,13 @@ msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
+#| "\"]]"
 msgid ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
 msgstr ""
 "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
 
@@ -120,7 +125,42 @@ msgstr ""
 "\"]]"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
@@ -156,6 +196,8 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Brug: `\\[[!debss package]]`, `\\[[!debss package#version]]`, eller `\\[[!debss package/version]]`.  Se http://snapshot.debian.net for detaljer.\n"
diff --git a/po/underlays/basewiki/shortcuts.es.po b/po/underlays/basewiki/shortcuts.es.po
index 8ac3759f5..10c26023f 100644
--- a/po/underlays/basewiki/shortcuts.es.po
+++ b/po/underlays/basewiki/shortcuts.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-08-17 01:02+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
@@ -61,7 +61,8 @@ msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
 
 #. type: Bullet: '* '
 msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
-msgstr "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgstr ""
+"[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
 
 #. type: Bullet: '* '
 msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
@@ -76,8 +77,15 @@ msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
-msgstr "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
+#| "\"]]"
+msgid ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
+msgstr ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""
@@ -100,8 +108,10 @@ msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
-msgstr "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgid ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgstr ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""
@@ -112,7 +122,42 @@ msgstr ""
 "\"]]"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
@@ -148,6 +193,8 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Uso: `\\[[!debss package]]`, `\\[[!debss package#version]]`, o `\\[[!debss package/version]]`. Para más detalles, vea http://snapshot.debian.net .\n"
@@ -185,11 +232,6 @@ msgstr ""
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 
 #. type: Plain text
-#| msgid ""
-#| "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the "
-#| "url, \"%s\" is replaced with the text passed to the named shortcut, after "
-#| "url-encoding it, and '%S' is replaced with the raw, non-encoded text. The "
-#| "optional `desc` parameter controls the description of the link."
 msgid ""
 "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
 "\"%s\" is replaced with the text passed to the named shortcut, after [[!"
@@ -198,9 +240,9 @@ msgid ""
 msgstr ""
 "Para añadir un nuevo atajo, utilice la [[directiva|ikiwiki/directive]] "
 "`shortcut`. En el url, «%s» se reemplaza con el texto que se pasa al atajo "
-"nombrado, después de codificarlo mediante el [[!wikipedia url_encoding]], y «%S» se "
-"reemplaza con el texto en bruto, no codificado. El parámetro opcional `desc` "
-"controla la descripción del enlace."
+"nombrado, después de codificarlo mediante el [[!wikipedia url_encoding]], y «%"
+"S» se reemplaza con el texto en bruto, no codificado. El parámetro opcional "
+"`desc` controla la descripción del enlace."
 
 #. type: Plain text
 msgid ""
@@ -215,11 +257,6 @@ msgstr ""
 "un parámetro `desc` que anulará la que se proporcione en la definición."
 
 #. type: Plain text
-#| msgid ""
-#| "If you come up with a shortcut that you think others might find useful, "
-#| "consider contributing it to the [shortcuts page on the ikiwiki ikiwiki]"
-#| "(http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki will "
-#| "include your shortcut in the standard underlay."
 msgid ""
 "If you come up with a shortcut that you think others might find useful, "
 "consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
@@ -230,4 +267,3 @@ msgstr ""
 "aportarlo a la [página de atajos en el wiki ikiwiki](http://ikiwiki.info/"
 "shortcuts/), de tal modo que futuras versiones de ikiwiki puedan incluir su "
 "atajo en la base estándar."
-
diff --git a/po/underlays/basewiki/shortcuts.fr.po b/po/underlays/basewiki/shortcuts.fr.po
index 3849918e4..b4755d4d7 100644
--- a/po/underlays/basewiki/shortcuts.fr.po
+++ b/po/underlays/basewiki/shortcuts.fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
-"PO-Revision-Date: 2009-08-26 21:17+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"PO-Revision-Date: 2010-07-16 10:39+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +75,13 @@ msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
+#| msgid ""
+#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
+#| "\"]]"
 msgid ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
-msgstr ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
+msgstr "[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"bug #%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""
@@ -116,6 +119,41 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
+#| msgid ""
+#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
@@ -151,6 +189,8 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 " * Usage : `\\[[!debss package]]`, `\\[[!debss package#version]]`, ou `\\[[!debss package/version]]`. Consultez http://snapshot.debian.net pour d'autres précisions.\n"
@@ -186,6 +226,8 @@ msgstr ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/basewiki/templates.cs.po b/po/underlays/basewiki/templates.cs.po
index c30f067aa..5ac5cdb89 100644
--- a/po/underlays/basewiki/templates.cs.po
+++ b/po/underlays/basewiki/templates.cs.po
@@ -6,233 +6,334 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-20 09:38+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+msgid ""
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
+msgstr ""
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"Tato wiki má šablony **povolené**.\"\n"
-"else=\"Tato wiki má šablony **vypnuté**.\"\n"
-"]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
 msgstr ""
-"Šablony jsou soubory, které je možno vyplnit a vložit do stránek ve wiki."
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Chcete-li vložit hodnotu proměnné bez dalších úprav (bez převodu na html), "
+"použijte `<TMPL_VAR raw_proměnná>`."
 
-#. type: Plain text
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"These templates are available for inclusion onto other pages in this wiki:"
-msgstr "V této wiki jsou k dispozici následující šablony:"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+"Chcete-li blok textu zobrazit pouze pokud je nastavena příslušná proměnná, "
+"použijte `<TMPL_IF NAME=\"proměnná\">text</TMPL_IF>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
-
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Používání šablon"
+"Chcete-li použít jeden blok textu v případě, že je proměnná nastavená, a "
+"jiný blok textu pokud nastavená není, použijte `<TMPL_IF NAME=\"proměnná"
+"\">text<TMPL_ELSE>jiný text</TMPL_IF>`."
 
 #. type: Plain text
-msgid "Using a template works like this:"
-msgstr "Použití šablony vypadá následovně:"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Plain text
+#. type: Title ##
 #, no-wrap
-msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
-msgstr "\t\\[[!template id=note text=\"\"\"Text pro vložení do poznámky.\"\"\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+msgid "template pages"
 msgstr ""
-"Tímto se v šabloně [[note]] vyplní pole `text` zadanou hodnotou a výsledek "
-"se vloží do stránky."
 
 #. type: Plain text
 msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"Hodnota může obsahovat libovolné značky, které jsou povoleny v běžné wiki "
-"stránce. Trojité uvozovky dokonce umožňují používat uvnitř hodnoty i běžné "
-"anglické uvozovky. V kombinaci s viceřádkovými hodnotami lze do šablony "
-"vložit poměrně velké kusy označkovaného textu:"
 
 #. type: Plain text
-#, no-wrap
-msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-msgstr "        \\[[!template id=foo name=\"Sally\" color=\"zelená\" age=8 notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "\\[[Charlieho|Charley]] sestra."
-
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Až vyrostu, chci být kosmonautem.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "Opravdu, 8 a půl."
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Vytvoření šablony"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Pro vytvoření šablony jednoduše přidejte do stránky direktivu template a "
-"stránka poskytne odkaz, který se dá použít pro vytvoření šablony. Šablona je "
-"běžná wiki stránka umístěná ve zdrojovém adresáři wiki v podadresáři "
-"`templates/`."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"Šablona používá stejnou syntaxi jako perlový modul [[!cpan HTML::Template]], "
-"což umožňuje provádět poměrně komplexní věci. Úplný popis syntaxe naleznete "
-"v dokumentaci modulu, ale ve skutečnosti stačí znát jen pár věcí:"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Každý parametr, který předáte direktivě template, vygeneruje proměnnou "
-"šablony. Existuje několik předdefinovaných proměnných jako PAGE a BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Pro vložení hodnoty proměnné použijte `<TMPL_VAR proměnná>`. Wiki značky v "
-"hodnotě budou nejprve převedeny na html."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Chcete-li vložit hodnotu proměnné bez dalších úprav (bez převodu na html), "
-"použijte `<TMPL_VAR raw_proměnná>`."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Používání šablon"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Chcete-li blok textu zobrazit pouze pokud je nastavena příslušná proměnná, "
-"použijte `<TMPL_IF NAME=\"proměnná\">text</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Chcete-li použít jeden blok textu v případě, že je proměnná nastavená, a "
-"jiný blok textu pokud nastavená není, použijte `<TMPL_IF NAME=\"proměnná"
-"\">text<TMPL_ELSE>jiný text</TMPL_IF>`."
-
-#. type: Plain text
-msgid "Here's a sample template:"
-msgstr "Ukázková šablona:"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"        <span class=\"infobox\">\n"
-"        Jméno: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Věk: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Oblíbená barva: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Žádná oblíbená barva.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"Vyplněná šablona bude formátována stejně jako zbytek stránky, do které je "
-"vložena, tudíž můžete v šabloně používat wiki linky a všechny obvyklé "
-"formátovací značky. Změnou je, že se wiki linky neobjeví jako zpětné odkazy "
-"na stránku, která šablonu použila."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a [[ikiwiki/"
-"WikiLink]]."
-msgstr ""
-"Všimněte si použití „raw_name“ uvnitř generátoru [[wiki odkazu|ikiwiki/"
-"WikiLink]]. Tímto se zajistí, že pokud by jméno obsahovalo něco, co by mohlo "
-"být považováno za formátovací wiki značku, nebude to převedeno na html před "
-"vytvořením [[wiki odkazu|ikiwiki/WikiLink]]."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"Tato wiki má šablony **povolené**.\"\n"
+#~ "else=\"Tato wiki má šablony **vypnuté**.\"\n"
+#~ "]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Šablony jsou soubory, které je možno vyplnit a vložit do stránek ve wiki."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr "V této wiki jsou k dispozici následující šablony:"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "Použití šablony vypadá následovně:"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Text pro vložení do poznámky.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Tímto se v šabloně [[note]] vyplní pole `text` zadanou hodnotou a "
+#~ "výsledek se vloží do stránky."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Hodnota může obsahovat libovolné značky, které jsou povoleny v běžné wiki "
+#~ "stránce. Trojité uvozovky dokonce umožňují používat uvnitř hodnoty i "
+#~ "běžné anglické uvozovky. V kombinaci s viceřádkovými hodnotami lze do "
+#~ "šablony vložit poměrně velké kusy označkovaného textu:"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Sally\" color=\"zelená\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "\\[[Charlieho|Charley]] sestra."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Až vyrostu, chci být kosmonautem.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "Opravdu, 8 a půl."
+
+#~ msgid "Creating a template"
+#~ msgstr "Vytvoření šablony"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Pro vytvoření šablony jednoduše přidejte do stránky direktivu template a "
+#~ "stránka poskytne odkaz, který se dá použít pro vytvoření šablony. Šablona "
+#~ "je běžná wiki stránka umístěná ve zdrojovém adresáři wiki v podadresáři "
+#~ "`templates/`."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "Šablona používá stejnou syntaxi jako perlový modul [[!cpan HTML::"
+#~ "Template]], což umožňuje provádět poměrně komplexní věci. Úplný popis "
+#~ "syntaxe naleznete v dokumentaci modulu, ale ve skutečnosti stačí znát jen "
+#~ "pár věcí:"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Každý parametr, který předáte direktivě template, vygeneruje proměnnou "
+#~ "šablony. Existuje několik předdefinovaných proměnných jako PAGE a "
+#~ "BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Pro vložení hodnoty proměnné použijte `<TMPL_VAR proměnná>`. Wiki značky "
+#~ "v hodnotě budou nejprve převedeny na html."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr "Ukázková šablona:"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Jméno: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Věk: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Oblíbená barva: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Žádná oblíbená barva.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "Vyplněná šablona bude formátována stejně jako zbytek stránky, do které je "
+#~ "vložena, tudíž můžete v šabloně používat wiki linky a všechny obvyklé "
+#~ "formátovací značky. Změnou je, že se wiki linky neobjeví jako zpětné "
+#~ "odkazy na stránku, která šablonu použila."
+
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Všimněte si použití „raw_name“ uvnitř generátoru [[wiki odkazu|ikiwiki/"
+#~ "WikiLink]]. Tímto se zajistí, že pokud by jméno obsahovalo něco, co by "
+#~ "mohlo být považováno za formátovací wiki značku, nebude to převedeno na "
+#~ "html před vytvořením [[wiki odkazu|ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates.da.po b/po/underlays/basewiki/templates.da.po
index 22f9500e8..533c582cc 100644
--- a/po/underlays/basewiki/templates.da.po
+++ b/po/underlays/basewiki/templates.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,225 +21,327 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+msgid ""
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
+msgstr ""
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"Denne wiki har skabeloner **aktiveret**.\"\n"
-"else=\"Denne wiki har skabeloner **deaktiveret**.\" ]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
-msgstr "Skabeloner er filer som kan blive udfyldt og indsat på sider i wikien."
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
+msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Brug `<TMPL_VAR raw_variabel>` til at indsætte den rå værdi af en variabel, "
+"med wiki-opmærkning endnu ikke konverteret til html."
 
-#. type: Plain text
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"These templates are available for inclusion onto other pages in this wiki:"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
 msgstr ""
-"Disse skabeloner er tilgængelige til indsættelse på andre sider i denne wiki:"
+"Gør en tekstblok betinget af at en variabel er i brug med `<TMPL_IF NAME="
+"\"variabel\">tekst</TMPL_IF>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
-
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Brug af skabelon"
+"Brug een tekstblok hvis en variabel er i brug, og en anden hvis ikke, med "
+"`<TMPL_IF NAME=\"variabel\">tekst<TMPL_ELSE>anden tekst</TMPL_IF>`"
 
 #. type: Plain text
-msgid "Using a template works like this:"
-msgstr "En skabelon bruges som her:"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Plain text
+#. type: Title ##
 #, no-wrap
-msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
-msgstr "\t\\[[!template id=note text=\"\"\"Her er teksten til at sætte ind i min note.\"\"\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+msgid "template pages"
 msgstr ""
-"Dette udfylder [[note]]-skabelonen, ved at erstatte `text`-feltet med den "
-"angivne værdi og indsætte resultatet på siden."
 
 #. type: Plain text
 msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"Generelt kan en værdi indeholde enhver opmærkning som ville være tilladt på "
-"wikisiden udenfor skabelonen. Trippel-citering af værdien tillader endda at "
-"bruge citering som del af værdien. Kombineret med flerlinje-citerede værdier "
-"tillader dette indlejring af store klumper af opmærket tekst i skabelonen:"
 
 #. type: Plain text
-#, no-wrap
-msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-msgstr "        \\[[!template id=foo name=\"Sally\" color=\"grøn\" age=8 notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "\\[[Charley]]'s søster."
-
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Jeg vil være en astronaut når jeg bliver stor.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "Egentligt 8 og et halvt."
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Oprettelse af skabelon"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Opret en skabelon ved simpelthen at tilføje skabelon-direktivet til en side, "
-"så vil siden vise en henvisning som kan bruges til at oprette skabelonen. "
-"Skabelonen er en normal wikiside, placeret i `templates/` undermappen indeni "
-"wikiens kildemappe."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"Skabelonen bruger samme syntax som perl-modulet [[!cpan HTML::Template]] som "
-"giver mulighed for at lave ret komplekse ting. Læs dokumentationen for den "
-"fulde syntaks, men alt hvad du reelt behøver at vide er nogle få ting:"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Ethvert parameter du angiver til skabelondirektivet vil danne en "
-"skabelonvariabel. Der er også nogle foruddefinerede variable som PAGE og "
-"BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Brug `<TMPL_VAR variabel>` til at indsætte værdien af en variabel. Wiki-"
-"opmærkning i værdien bliver først konverteret til html."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Brug `<TMPL_VAR raw_variabel>` til at indsætte den rå værdi af en variabel, "
-"med wiki-opmærkning endnu ikke konverteret til html."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Brug af skabelon"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Gør en tekstblok betinget af at en variabel er i brug med `<TMPL_IF NAME="
-"\"variabel\">tekst</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
-msgstr ""
-"Brug een tekstblok hvis en variabel er i brug, og en anden hvis ikke, med "
-"`<TMPL_IF NAME=\"variabel\">tekst<TMPL_ELSE>anden tekst</TMPL_IF>`"
-
-#. type: Plain text
-msgid "Here's a sample template:"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Her er et eksempel på en skabelon (det anbefales at bruge engelske "
-"variabelnavne for at undgå problemer med æøå og andre specialtegn):"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"        <span class=\"infobox\">\n"
-"        Navn: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Alder: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favoritfarve: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Ingen favoritfarve.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"Den udfyldte skabelon vil blive formateret som resten af siden den er "
-"inkluderet i, så du kan medtage WikiLinks og alle andre former for wiki- "
-"opmærkning i skabelonen. Bemærk dog at sådanne WikiLinks ikke vil dukke op "
-"som krydshenvisninger (backlinks) til den side som anvender skabelonen."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a [[ikiwiki/"
-"WikiLink]]."
-msgstr ""
-"Bemærk brugen af \"raw_name\" indeni [[ikiwiki/WikiLink]]-generatoren. Dette "
-"sikrer at hvor navnet indeholder noget som måske kan fejltolkes som wiki-"
-"opmærkning, bliver det ikke konverteret til html før det er blevet behandlet "
-"som en [[ikiwiki/WikiLink]]."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"Denne wiki har skabeloner **aktiveret**.\"\n"
+#~ "else=\"Denne wiki har skabeloner **deaktiveret**.\" ]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Skabeloner er filer som kan blive udfyldt og indsat på sider i wikien."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr ""
+#~ "Disse skabeloner er tilgængelige til indsættelse på andre sider i denne "
+#~ "wiki:"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "En skabelon bruges som her:"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Her er teksten til at sætte ind i min note.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Dette udfylder [[note]]-skabelonen, ved at erstatte `text`-feltet med den "
+#~ "angivne værdi og indsætte resultatet på siden."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Generelt kan en værdi indeholde enhver opmærkning som ville være tilladt "
+#~ "på wikisiden udenfor skabelonen. Trippel-citering af værdien tillader "
+#~ "endda at bruge citering som del af værdien. Kombineret med flerlinje-"
+#~ "citerede værdier tillader dette indlejring af store klumper af opmærket "
+#~ "tekst i skabelonen:"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Sally\" color=\"grøn\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "\\[[Charley]]'s søster."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Jeg vil være en astronaut når jeg bliver stor.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "Egentligt 8 og et halvt."
+
+#~ msgid "Creating a template"
+#~ msgstr "Oprettelse af skabelon"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Opret en skabelon ved simpelthen at tilføje skabelon-direktivet til en "
+#~ "side, så vil siden vise en henvisning som kan bruges til at oprette "
+#~ "skabelonen. Skabelonen er en normal wikiside, placeret i `templates/` "
+#~ "undermappen indeni wikiens kildemappe."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "Skabelonen bruger samme syntax som perl-modulet [[!cpan HTML::Template]] "
+#~ "som giver mulighed for at lave ret komplekse ting. Læs dokumentationen "
+#~ "for den fulde syntaks, men alt hvad du reelt behøver at vide er nogle få "
+#~ "ting:"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Ethvert parameter du angiver til skabelondirektivet vil danne en "
+#~ "skabelonvariabel. Der er også nogle foruddefinerede variable som PAGE og "
+#~ "BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Brug `<TMPL_VAR variabel>` til at indsætte værdien af en variabel. Wiki-"
+#~ "opmærkning i værdien bliver først konverteret til html."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr ""
+#~ "Her er et eksempel på en skabelon (det anbefales at bruge engelske "
+#~ "variabelnavne for at undgå problemer med æøå og andre specialtegn):"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Navn: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Alder: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favoritfarve: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Ingen favoritfarve.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "Den udfyldte skabelon vil blive formateret som resten af siden den er "
+#~ "inkluderet i, så du kan medtage WikiLinks og alle andre former for wiki- "
+#~ "opmærkning i skabelonen. Bemærk dog at sådanne WikiLinks ikke vil dukke "
+#~ "op som krydshenvisninger (backlinks) til den side som anvender skabelonen."
+
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Bemærk brugen af \"raw_name\" indeni [[ikiwiki/WikiLink]]-generatoren. "
+#~ "Dette sikrer at hvor navnet indeholder noget som måske kan fejltolkes som "
+#~ "wiki-opmærkning, bliver det ikke konverteret til html før det er blevet "
+#~ "behandlet som en [[ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates.de.po b/po/underlays/basewiki/templates.de.po
index beb92b49f..c31957002 100644
--- a/po/underlays/basewiki/templates.de.po
+++ b/po/underlays/basewiki/templates.de.po
@@ -4,253 +4,343 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 15:15+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-#. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
 msgstr ""
-"[[!meta title=\"Vorlagen\"]]\n"
-"[[!if test=\"enabled(template)\"\n"
-"then=\"In diesem Wiki sind Vorlagen **aktiviert**.\"\n"
-"else=\"In diesem Wiki sind Vorlagen **deaktiviert**.\"\n"
-"]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
-msgstr ""
-"Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden "
-"können."
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-
-#. type: Plain text
-msgid "These templates are available for inclusion onto other pages in this wiki:"
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"Diese Vorlagen sind verfügbar und können in andere Seiten dieses "
-"Wikis eingebettet werden:"
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
 
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Verwenden einer Vorlage"
-
-#. type: Plain text
-msgid "Using a template works like this:"
-msgstr "Eine Vorlage kann folgendermaßen verwendet werden:"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Um den unformatierten Wert einer Variable einzufügen, der die unveränderten "
+"Wiki-Formatierungsanweisungen enthält, verwende `<TMPL_VAR raw_Variable>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
-"note.\"\"\"]]\n"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
 msgstr ""
-"\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine "
-"Notiz eingefügt werden soll.\"\"\"]]\n"
+"Wenn ein Textblock nur dann angezeigt werden soll, wenn eine Variable "
+"gesetzt ist, verwende `<TMPL_IF NAME=\"Variable\">Text</TMPL_IF>`."
 
-#. type: Plain text
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
 msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
-"Dies verwendet die Vorlage [[note]], wobei das `text`-Feld mit dem "
-"angegebenen Wert gefüllt wird, und fügt das Ergebnis in die Seite ein."
+"Um einen Textblock anzuzeigen, wenn eine Variable gesetzt ist, und einen "
+"anderen, wenn sie es nicht ist, verwende `<TMPL_IF NAME=\"Variable"
+"\">Text<TMPL_ELSE>anderer Text</TMPL_IF>`."
 
 #. type: Plain text
-msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "template pages"
 msgstr ""
-"Ein Wert kann im allgemeinen beliebige Formatierungsanweisungen enthalten, "
-"die im Wiki außerhalb der Vorlage zulässig sind. Durch die Verwendung dreier "
-"Anführungszeichen können sogar Anführungszeichen enthalten sein. In Kombination "
-"mit mehrzeiligen Werten in Anführungszeichen können so große Mengen an "
-"zu formatierendem Text in die Vorlage eingefügt werden:"
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 "
-"notes=\"\"\"\n"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"        \\[[!template id=foo name=\"Anna\" color=\"grün\" age=8 "
-"notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "\\[[Thomas]] Schwester."
 
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Ich will ein Astronaut werden, wenn ich erwachsen bin.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "Wirklich achteinhalb."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Erstellen einer Vorlage"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Um eine Vorlage zu erstellen, füge einfach die Anweisung  `template` zu "
-"einer Seite hinzu. Diese Seite bietet dann einen Link zur Erstellung der "
-"Vorlage an. Die Vorlage ist eine normale Wiki-Seite, die im Unterverzeichnis "
-"`templates/` des Wiki-Quellverzeichnisses liegt."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"Die Vorlage verwendet die Syntax des Perl-Moduls [[!cpan HTML::Template]], "
-"das die Umsetzung auch komplexer Vorhaben ermöglicht. In seiner Dokumentation "
-"ist die vollständige Syntax beschrieben, zur Verwendung muss man aber nur "
-"das Folgende wirklich wissen:"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Jeder Parameter, der der template-Anweisung übergeben wird, erzeugt eine "
-"Variable, die in der Vorlage verwendet werden kann. Es gibt auch einige "
-"vordefinierte Variablen wie PAGE und BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Um den Wert einer Variable einzufügen, verwende `<TMPL_VAR Variable>`. "
-"Wiki-Formatierung im Wert wird zuvor zu HTML konvertiert werden."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Um den unformatierten Wert einer Variable einzufügen, der die unveränderten "
-"Wiki-Formatierungsanweisungen enthält, verwende `<TMPL_VAR raw_Variable>`."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Verwenden einer Vorlage"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Wenn ein Textblock nur dann angezeigt werden soll, wenn eine Variable gesetzt "
-"ist, "
-"verwende `<TMPL_IF NAME=\"Variable\">Text</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Um einen Textblock anzuzeigen, wenn eine Variable gesetzt ist, und einen "
-"anderen, wenn sie es nicht ist, verwende `<TMPL_IF "
-"NAME=\"Variable\">Text<TMPL_ELSE>anderer Text</TMPL_IF>`."
-
-#. type: Plain text
-msgid "Here's a sample template:"
-msgstr "Hier ist eine Beispiel-Vorlage:"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"   <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Alter: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Lieblingsfarbe: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Keine Lieblingsfarbe.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"Die ausgefüllte Vorlage wird genauso formatiert wie der Rest der Seite, die "
-"sie enthält, man kann also WikiLinks und alle anderen Arten von "
-"Wiki-Formatierung in der Vorlage verwenden. Zu beachten ist aber, dass "
-"solche WikiLinks nicht als Rückwärts-Links zu der Seite auftauchen, die "
-"die Vorlage verwendet."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a "
-"[[ikiwiki/WikiLink]]."
-msgstr ""
-"Beachte auch die Verwendung von `raw_name` innerhalb des Generators für "
-"den [[ikiwiki/WikiLink]]. Dies stellt sicher, dass der Name nicht nach HTML "
-"konvertiert wird, selbst wenn er etwas enthält, was für eine "
-"Wiki-Formatierungsanweisung gehalten werden könnte, bevor er als "
-"[[ikiwiki/WikiLink]] verarbeitet wird."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!meta title=\"Vorlagen\"]]\n"
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"In diesem Wiki sind Vorlagen **aktiviert**.\"\n"
+#~ "else=\"In diesem Wiki sind Vorlagen **deaktiviert**.\"\n"
+#~ "]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden "
+#~ "können."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr ""
+#~ "Diese Vorlagen sind verfügbar und können in andere Seiten dieses Wikis "
+#~ "eingebettet werden:"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "Eine Vorlage kann folgendermaßen verwendet werden:"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine Notiz eingefügt werden soll.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Dies verwendet die Vorlage [[note]], wobei das `text`-Feld mit dem "
+#~ "angegebenen Wert gefüllt wird, und fügt das Ergebnis in die Seite ein."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Ein Wert kann im allgemeinen beliebige Formatierungsanweisungen "
+#~ "enthalten, die im Wiki außerhalb der Vorlage zulässig sind. Durch die "
+#~ "Verwendung dreier Anführungszeichen können sogar Anführungszeichen "
+#~ "enthalten sein. In Kombination mit mehrzeiligen Werten in "
+#~ "Anführungszeichen können so große Mengen an zu formatierendem Text in die "
+#~ "Vorlage eingefügt werden:"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Anna\" color=\"grün\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "\\[[Thomas]] Schwester."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Ich will ein Astronaut werden, wenn ich erwachsen bin.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "Wirklich achteinhalb."
+
+#~ msgid "Creating a template"
+#~ msgstr "Erstellen einer Vorlage"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Um eine Vorlage zu erstellen, füge einfach die Anweisung  `template` zu "
+#~ "einer Seite hinzu. Diese Seite bietet dann einen Link zur Erstellung der "
+#~ "Vorlage an. Die Vorlage ist eine normale Wiki-Seite, die im "
+#~ "Unterverzeichnis `templates/` des Wiki-Quellverzeichnisses liegt."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "Die Vorlage verwendet die Syntax des Perl-Moduls [[!cpan HTML::"
+#~ "Template]], das die Umsetzung auch komplexer Vorhaben ermöglicht. In "
+#~ "seiner Dokumentation ist die vollständige Syntax beschrieben, zur "
+#~ "Verwendung muss man aber nur das Folgende wirklich wissen:"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Jeder Parameter, der der template-Anweisung übergeben wird, erzeugt eine "
+#~ "Variable, die in der Vorlage verwendet werden kann. Es gibt auch einige "
+#~ "vordefinierte Variablen wie PAGE und BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Um den Wert einer Variable einzufügen, verwende `<TMPL_VAR Variable>`. "
+#~ "Wiki-Formatierung im Wert wird zuvor zu HTML konvertiert werden."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr "Hier ist eine Beispiel-Vorlage:"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "   <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Alter: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Lieblingsfarbe: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Keine Lieblingsfarbe.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
 
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "Die ausgefüllte Vorlage wird genauso formatiert wie der Rest der Seite, "
+#~ "die sie enthält, man kann also WikiLinks und alle anderen Arten von Wiki-"
+#~ "Formatierung in der Vorlage verwenden. Zu beachten ist aber, dass solche "
+#~ "WikiLinks nicht als Rückwärts-Links zu der Seite auftauchen, die die "
+#~ "Vorlage verwendet."
 
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Beachte auch die Verwendung von `raw_name` innerhalb des Generators für "
+#~ "den [[ikiwiki/WikiLink]]. Dies stellt sicher, dass der Name nicht nach "
+#~ "HTML konvertiert wird, selbst wenn er etwas enthält, was für eine Wiki-"
+#~ "Formatierungsanweisung gehalten werden könnte, bevor er als [[ikiwiki/"
+#~ "WikiLink]] verarbeitet wird."
diff --git a/po/underlays/basewiki/templates.es.po b/po/underlays/basewiki/templates.es.po
index 21173d528..22042e318 100644
--- a/po/underlays/basewiki/templates.es.po
+++ b/po/underlays/basewiki/templates.es.po
@@ -6,237 +6,340 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-17 13:22+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-#. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
 msgstr ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"Este wiki tiene las plantillas **activadas**.\"\n"
-"else=\"Este wiki tiene las plantillas **desactivadas**.\"\n"
-"]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"Las plantillas son archivos que se pueden completar e insertar en páginas "
-"del wiki."
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid ""
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
+msgstr ""
 
-#. type: Plain text
-msgid "These templates are available for inclusion onto other pages in this wiki:"
-msgstr "Estas plantillas están disponibles en este wiki para ser incluidas en otras páginas:"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Para insertar el valor sin procesar de una variable, con el marcado wiki no "
+"convertido todavía a html, utilice `<TMPL_VAR raw_variable>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"Para que un bloque de texto dependa de que una variable haya sido "
+"establecida, utilice `<TMPL_IF NAME=\"variable\">texto</TMPL_IF>`."
 
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Uso de una plantilla"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+"Para utilizar un bloque de texto si se ha establecido una variable, y otro "
+"texto si no se ha establecido, utilice `<TMPL_IF NAME=\"variable"
+"\">texto<TMPL_ELSE>otro texto</TMPL_IF>`"
 
 #. type: Plain text
-msgid "Using a template works like this:"
-msgstr "El uso de una plantilla es así:"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Plain text
+#. type: Title ##
 #, no-wrap
-msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
-msgstr "\t\\[[!template id=note text=\"\"\"Éste es el texto que se insertará en mi nota.\"\"\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+msgid "template pages"
 msgstr ""
-"Esto rellena la plantilla [[note]] («nota»), completando el campo `text` "
-"(«texto») con el valor especificado, e inserta el resultado en la página."
 
 #. type: Plain text
 msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"Por lo general, un valor puede incluir cualquier marcado («markup») permitido "
-"en la página wiki fuera de la plantilla. La utilización de comillas triples permite "
-"incluso que se incluyan comillas. En combinación con valores entrecomillados "
-"en múltiples líneas, esto permite que se incluyan grandes fragmentos de texto "
-"marcado en una plantilla:"
 
 #. type: Plain text
-#, no-wrap
-msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "Hermana de \\[[Charley]]."
-
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Quiero ser astronauta cuando crezca.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "8 y medio en realidad."
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Creación de una plantilla"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Para crear una plantilla, simplemente añada una directiva de plantilla a una "
-"página, y ésta proporcionará un enlace que puede utilizarse para crear la "
-"plantilla. La plantilla es una página wiki normal, situada en el subdirectorio "
-"`templates/` dentro del directorio fuente del wiki."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"La plantilla utiliza la sintaxis usada por el módulo perl [[!cpan HTML::Template]], "
-"que permite hacer algunas cosas bastante complejas. Consulte su documentación "
-"para ver la sintaxis completa, pero todo lo que realmente necesita saber son unas "
-"pocas cosas:"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Cada parámetro que pase a la directiva de plantilla generará una variable de "
-"plantilla. También existen algunas variables predefinidas como PAGE y BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Para introducir el valor de una variable, utilice `<TMPL_VAR variable>`. El marcado "
-"(«markup») wiki en el valor será convertido primero a html."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Para insertar el valor sin procesar de una variable, con el marcado wiki no "
-"convertido todavía a html, utilice `<TMPL_VAR raw_variable>`."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Uso de una plantilla"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Para que un bloque de texto dependa de que una variable haya sido establecida, "
-"utilice `<TMPL_IF NAME=\"variable\">texto</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Para utilizar un bloque de texto si se ha establecido una variable, y otro texto "
-"si no se ha establecido, utilice "
-"`<TMPL_IF NAME=\"variable\">texto<TMPL_ELSE>otro texto</TMPL_IF>`"
-
-#. type: Plain text
-msgid "Here's a sample template:"
-msgstr "Esto es una plantilla de ejemplo:"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"        <span class=\"infobox\">\n"
-"        Nombre: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Edad: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Color favorito: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Ningún color favorito.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"La plantilla rellenada se formateará de la misma manera que el resto de la página "
-"que la contiene, así que puede incluir WikiLinks («enlaces wiki») y todas las otras "
-"formas de marcado wiki en la plantilla. Sin embargo, tenga en cuenta que estos "
-"WikiLinks no aparecerán como «backlinks» a la página que usa la plantilla."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a [[ikiwiki/"
-"WikiLink]]."
-msgstr ""
-"Tenga en cuenta el uso de «raw_name» dentro del generador de [[ikiwiki/WikiLink]]. "
-"Esto asegura que si el nombre contiene algo que pueda ser tomado equivocadamente "
-"como marcado wiki, no sea convertido a html antes de ser procesado como un "
-"[[ikiwiki/WikiLink]]."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"Este wiki tiene las plantillas **activadas**.\"\n"
+#~ "else=\"Este wiki tiene las plantillas **desactivadas**.\"\n"
+#~ "]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Las plantillas son archivos que se pueden completar e insertar en páginas "
+#~ "del wiki."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr ""
+#~ "Estas plantillas están disponibles en este wiki para ser incluidas en "
+#~ "otras páginas:"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "El uso de una plantilla es así:"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Éste es el texto que se insertará en mi nota.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Esto rellena la plantilla [[note]] («nota»), completando el campo `text` "
+#~ "(«texto») con el valor especificado, e inserta el resultado en la página."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Por lo general, un valor puede incluir cualquier marcado («markup») "
+#~ "permitido en la página wiki fuera de la plantilla. La utilización de "
+#~ "comillas triples permite incluso que se incluyan comillas. En combinación "
+#~ "con valores entrecomillados en múltiples líneas, esto permite que se "
+#~ "incluyan grandes fragmentos de texto marcado en una plantilla:"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "Hermana de \\[[Charley]]."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Quiero ser astronauta cuando crezca.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "8 y medio en realidad."
+
+#~ msgid "Creating a template"
+#~ msgstr "Creación de una plantilla"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Para crear una plantilla, simplemente añada una directiva de plantilla a "
+#~ "una página, y ésta proporcionará un enlace que puede utilizarse para "
+#~ "crear la plantilla. La plantilla es una página wiki normal, situada en el "
+#~ "subdirectorio `templates/` dentro del directorio fuente del wiki."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "La plantilla utiliza la sintaxis usada por el módulo perl [[!cpan HTML::"
+#~ "Template]], que permite hacer algunas cosas bastante complejas. Consulte "
+#~ "su documentación para ver la sintaxis completa, pero todo lo que "
+#~ "realmente necesita saber son unas pocas cosas:"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Cada parámetro que pase a la directiva de plantilla generará una variable "
+#~ "de plantilla. También existen algunas variables predefinidas como PAGE y "
+#~ "BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Para introducir el valor de una variable, utilice `<TMPL_VAR variable>`. "
+#~ "El marcado («markup») wiki en el valor será convertido primero a html."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr "Esto es una plantilla de ejemplo:"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Nombre: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Edad: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Color favorito: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Ningún color favorito.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "La plantilla rellenada se formateará de la misma manera que el resto de "
+#~ "la página que la contiene, así que puede incluir WikiLinks («enlaces "
+#~ "wiki») y todas las otras formas de marcado wiki en la plantilla. Sin "
+#~ "embargo, tenga en cuenta que estos WikiLinks no aparecerán como "
+#~ "«backlinks» a la página que usa la plantilla."
 
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Tenga en cuenta el uso de «raw_name» dentro del generador de [[ikiwiki/"
+#~ "WikiLink]]. Esto asegura que si el nombre contiene algo que pueda ser "
+#~ "tomado equivocadamente como marcado wiki, no sea convertido a html antes "
+#~ "de ser procesado como un [[ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po
index 37d578ec8..f7faadb15 100644
--- a/po/underlays/basewiki/templates.fr.po
+++ b/po/underlays/basewiki/templates.fr.po
@@ -5,235 +5,337 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-12 08:40+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+msgid ""
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
+msgstr ""
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"Les modèles sont **activés** dans ce wiki.\"\n"
-"else=\"Les modèles sont **désactivés** dans ce wiki.\"\n"
-"]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
 msgstr ""
-"Les modèles sont des fichiers pouvant être remplis et insérés dans les pages "
-"du wiki."
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Pour insérer la valeur brute d'une variable, sans que la syntaxe wiki soit "
+"convertie en html, utilisez `<TMPL_VAR raw_variable>`."
 
-#. type: Plain text
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"These templates are available for inclusion onto other pages in this wiki:"
-msgstr "Ces modèles peuvent être insérés dans d'autres pages de ce wiki :"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+"Pour écrire un bloc de texte si une variable est définie, utilisez `<TMPL_IF "
+"NAME=\"variable\">texte</TMPL_IF>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
-
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Utiliser un modèle"
+"Pour utiliser un bloc de texte si une variable est définie et un autre dans "
+"le cas contraire, utilisez `<TMPL_IF NAME=\"variable\">texte<TMPL_ELSE>autre "
+"texte</TMPL_IF>`"
 
 #. type: Plain text
-msgid "Using a template works like this:"
-msgstr "Voici comment fonctionne un modèle :"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Plain text
+#. type: Title ##
 #, no-wrap
-msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
-msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer dans ma note.\"\"\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
-msgstr "Cette expression remplit le modèle [[note]], remplaçant le champ `text` par la valeur spécifiée, et insérant le résultat dans la page."
+msgid "template pages"
+msgstr ""
 
 #. type: Plain text
 msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"Généralement, une valeur peut inclure n'importe quelle balise qui serait "
-"autorisée dans les pages du wiki. Tripler les guillemets autour de la valeur "
-"permet même d'y inclure des guillemets. Ainsi, avec des valeurs sur "
-"plusieurs lignes, de larges morceaux de texte mis en forme peuvent être "
-"intégrés dans un modèle :"
 
 #. type: Plain text
-#, no-wrap
-msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "soeur de \\[[Charley]]."
-
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Je veux devenir une astronaute lorsque je serai grande.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "Réellement 8 ans et demi."
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Créer un modèle"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Pour créer un modèle, ajoutez simplement une directive `template` à une "
-"page. La page fournira alors un lien qui peut être utilisé pour créer le "
-"modèle. Le modèle est une page de wiki régulière, enregistrée dans le sous-"
-"répertoire `templates/` du répertoire source du wiki."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"Le modèle utilise la syntaxe définie par le module perl [[!cpan HTML::"
-"Template]], qui permet de faire des choses plutôt complexes. Consultez sa "
-"documentation pour obtenir la syntaxe complète. Cependant, vous n'avez "
-"réellement besoin que de quelques informations :"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Chaque paramètre que vous donnez à la directive `template` générera une "
-"variable dans le modèle. Il y a en plus quelques variables prédéfinies comme "
-"PAGE et BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Pour insérer la valeur d'une variable, utilisez `<TMPL_VAR variable>`. La "
-"syntaxe wiki dans la valeur sera d'abord transformée en html."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Pour insérer la valeur brute d'une variable, sans que la syntaxe wiki soit "
-"convertie en html, utilisez `<TMPL_VAR raw_variable>`."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Utiliser un modèle"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Pour écrire un bloc de texte si une variable est définie, utilisez `<TMPL_IF "
-"NAME=\"variable\">texte</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Pour utiliser un bloc de texte si une variable est définie et un autre dans "
-"le cas contraire, utilisez `<TMPL_IF NAME=\"variable\">texte<TMPL_ELSE>autre "
-"texte</TMPL_IF>`"
-
-#. type: Plain text
-msgid "Here's a sample template:"
-msgstr "Voici un exemple de modèle :"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"        <span class=\"infobox\">\n"
-"        Nom : \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age : <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Couleur favorite : <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Pas de couleur favorite.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"Le modèle rempli sera mis en forme comme le reste de la page qui le "
-"contient. Vous pouvez donc inclure des WikiLinks et toutes les autres formes "
-"de balises wiki dans les modèles. Notez cependant que de tels WikiLinks "
-"n'apparaîtront pas dans les BackLinks de la page qui utilise le modèle."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a [[ikiwiki/"
-"WikiLink]]."
-msgstr ""
-"Notez l'utilisation de \"raw_name\" à l'intérieur du générateur de [[ikiwiki/"
-"WikiLink]]. Cela assure que si le nom contient quelque chose pouvant être "
-"confondu avec une balise wiki, alors il n'est pas converti en html avant "
-"d'être traité comme un [[ikiwiki/WikiLink]]."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"Les modèles sont **activés** dans ce wiki.\"\n"
+#~ "else=\"Les modèles sont **désactivés** dans ce wiki.\"\n"
+#~ "]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Les modèles sont des fichiers pouvant être remplis et insérés dans les "
+#~ "pages du wiki."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr "Ces modèles peuvent être insérés dans d'autres pages de ce wiki :"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "Voici comment fonctionne un modèle :"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer dans ma note.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Cette expression remplit le modèle [[note]], remplaçant le champ `text` "
+#~ "par la valeur spécifiée, et insérant le résultat dans la page."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Généralement, une valeur peut inclure n'importe quelle balise qui serait "
+#~ "autorisée dans les pages du wiki. Tripler les guillemets autour de la "
+#~ "valeur permet même d'y inclure des guillemets. Ainsi, avec des valeurs "
+#~ "sur plusieurs lignes, de larges morceaux de texte mis en forme peuvent "
+#~ "être intégrés dans un modèle :"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "soeur de \\[[Charley]]."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Je veux devenir une astronaute lorsque je serai grande.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "Réellement 8 ans et demi."
+
+#~ msgid "Creating a template"
+#~ msgstr "Créer un modèle"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Pour créer un modèle, ajoutez simplement une directive `template` à une "
+#~ "page. La page fournira alors un lien qui peut être utilisé pour créer le "
+#~ "modèle. Le modèle est une page de wiki régulière, enregistrée dans le "
+#~ "sous-répertoire `templates/` du répertoire source du wiki."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "Le modèle utilise la syntaxe définie par le module perl [[!cpan HTML::"
+#~ "Template]], qui permet de faire des choses plutôt complexes. Consultez sa "
+#~ "documentation pour obtenir la syntaxe complète. Cependant, vous n'avez "
+#~ "réellement besoin que de quelques informations :"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Chaque paramètre que vous donnez à la directive `template` générera une "
+#~ "variable dans le modèle. Il y a en plus quelques variables prédéfinies "
+#~ "comme PAGE et BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Pour insérer la valeur d'une variable, utilisez `<TMPL_VAR variable>`. La "
+#~ "syntaxe wiki dans la valeur sera d'abord transformée en html."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr "Voici un exemple de modèle :"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Nom : \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age : <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Couleur favorite : <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Pas de couleur favorite.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "Le modèle rempli sera mis en forme comme le reste de la page qui le "
+#~ "contient. Vous pouvez donc inclure des WikiLinks et toutes les autres "
+#~ "formes de balises wiki dans les modèles. Notez cependant que de tels "
+#~ "WikiLinks n'apparaîtront pas dans les BackLinks de la page qui utilise le "
+#~ "modèle."
+
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Notez l'utilisation de \"raw_name\" à l'intérieur du générateur de "
+#~ "[[ikiwiki/WikiLink]]. Cela assure que si le nom contient quelque chose "
+#~ "pouvant être confondu avec une balise wiki, alors il n'est pas converti "
+#~ "en html avant d'être traité comme un [[ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates/note.cs.po b/po/underlays/basewiki/templates/note.cs.po
index 74f66e9a0..3cf27acc5 100644
--- a/po/underlays/basewiki/templates/note.cs.po
+++ b/po/underlays/basewiki/templates/note.cs.po
@@ -6,21 +6,34 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-20 10:11+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
diff --git a/po/underlays/basewiki/templates/note.da.po b/po/underlays/basewiki/templates/note.da.po
index f748dbe4d..1e9cef84d 100644
--- a/po/underlays/basewiki/templates/note.da.po
+++ b/po/underlays/basewiki/templates/note.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,12 +21,24 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
diff --git a/po/underlays/basewiki/templates/note.de.po b/po/underlays/basewiki/templates/note.de.po
index c408d11a0..41e9909b0 100644
--- a/po/underlays/basewiki/templates/note.de.po
+++ b/po/underlays/basewiki/templates/note.de.po
@@ -4,22 +4,35 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-12 20:04+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
@@ -34,9 +47,7 @@ msgstr ""
 "<TMPL_UNLESS NAME=\"text\">\n"
 "Verwende diese Vorlage, um eine Notiz in eine Seite einzufügen. Die Notiz\n"
 "wird rechts vom restlichen Text der Seite schwebend angezeigt werden.\n"
-"Diese Vorlage hat einen Parameter:"
-"<ul>\n"
+"Diese Vorlage hat einen Parameter:<ul>\n"
 "<li>`text` - der Text, der in der Notiz angezeigt werden soll.\n"
 "</ul>\n"
 "</TMPL_UNLESS>\n"
-
diff --git a/po/underlays/basewiki/templates/note.es.po b/po/underlays/basewiki/templates/note.es.po
index de2c53f5f..186ae48dd 100644
--- a/po/underlays/basewiki/templates/note.es.po
+++ b/po/underlays/basewiki/templates/note.es.po
@@ -6,22 +6,35 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-17 13:48+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
@@ -41,4 +54,3 @@ msgstr ""
 "<li>`text` - el texto que aparecerá en la nota\n"
 "</ul>\n"
 "</TMPL_UNLESS>\n"
-
diff --git a/po/underlays/basewiki/templates/note.fr.po b/po/underlays/basewiki/templates/note.fr.po
index b02e62e3b..c9bfaa2ca 100644
--- a/po/underlays/basewiki/templates/note.fr.po
+++ b/po/underlays/basewiki/templates/note.fr.po
@@ -6,21 +6,34 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-24 00:18+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
diff --git a/po/underlays/basewiki/templates/popup.cs.po b/po/underlays/basewiki/templates/popup.cs.po
index 5951b0145..17d7342bf 100644
--- a/po/underlays/basewiki/templates/popup.cs.po
+++ b/po/underlays/basewiki/templates/popup.cs.po
@@ -6,18 +6,36 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-20 10:28+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
 "Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"
diff --git a/po/underlays/basewiki/templates/popup.da.po b/po/underlays/basewiki/templates/popup.da.po
index f7660152f..c4bd3badc 100644
--- a/po/underlays/basewiki/templates/popup.da.po
+++ b/po/underlays/basewiki/templates/popup.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,9 +21,26 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
 "Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"
diff --git a/po/underlays/basewiki/templates/popup.de.po b/po/underlays/basewiki/templates/popup.de.po
index c75b79d94..a17b9c611 100644
--- a/po/underlays/basewiki/templates/popup.de.po
+++ b/po/underlays/basewiki/templates/popup.de.po
@@ -4,21 +4,38 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-12 20:08+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
-"Use this template to create a popup window that is displayed when the "
-"mouse\n"
+"<TMPL_UNLESS mouseover>\n"
+"Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"
 "<li>`mouseover` - This is the text or other content that triggers the\n"
@@ -31,29 +48,21 @@ msgid ""
 "inline in the page, inside square brackets.\n"
 "</TMPL_UNLESS>\n"
 "<span class=\"popup\"><TMPL_VAR mouseover>\n"
-"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR "
-"popup></span><span class=\"paren\">]</span>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
 "</span>\n"
 msgstr ""
 "<TMPL_UNLESS NAME=\"mouseover\">\n"
-"Verwende diese Vorlage, um ein Popup-Fenster anzuzeigen, wenn sich die "
-"Maus\n"
+"Verwende diese Vorlage, um ein Popup-Fenster anzuzeigen, wenn sich die Maus\n"
 "über diesem Teil der Seite befindet. Dies Vorlage hat zwei Parameter:\n"
 "<ul>\n"
-"<li>`mouseover` - Dies ist der Text oder andere Inhalt, der das "
-"Popup-Fenster\n"
+"<li>`mouseover` - Dies ist der Text oder andere Inhalt, der das Popup-Fenster\n"
 "auslöst.\n"
-"<li>`popup` - Dies ist der Inhalt des Popup-Fensters. Er kann beliebig "
-"sein,\n"
-"sogar Bilder oder eine ganze kleine Wiki-Seite. Im Interesse guter "
-"Benutzbarkeit\n"
-"sollte er aber nicht zu groß sein."
-"</ul>\n"
+"<li>`popup` - Dies ist der Inhalt des Popup-Fensters. Er kann beliebig sein,\n"
+"sogar Bilder oder eine ganze kleine Wiki-Seite. Im Interesse guter Benutzbarkeit\n"
+"sollte er aber nicht zu groß sein.</ul>\n"
 "Beachte, dass Browser, die CSS nicht unterstützen, das Popup innerhalb\n"
 "der Seite anzeigen, eingerahmt durch eckige Klammern.\n"
 "</TMPL_UNLESS>\n"
 "<span class=\"popup\"><TMPL_VAR mouseover>\n"
-"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR "
-"popup></span><span class=\"paren\">]</span>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
 "</span>\n"
-
diff --git a/po/underlays/basewiki/templates/popup.es.po b/po/underlays/basewiki/templates/popup.es.po
index 10fddb8c0..09680004c 100644
--- a/po/underlays/basewiki/templates/popup.es.po
+++ b/po/underlays/basewiki/templates/popup.es.po
@@ -6,19 +6,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-17 14:06+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
 "Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"
@@ -51,4 +69,3 @@ msgstr ""
 "<span class=\"popup\"><TMPL_VAR mouseover>\n"
 "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
 "</span>\n"
-
diff --git a/po/underlays/basewiki/templates/popup.fr.po b/po/underlays/basewiki/templates/popup.fr.po
index d2cd29118..b104d3177 100644
--- a/po/underlays/basewiki/templates/popup.fr.po
+++ b/po/underlays/basewiki/templates/popup.fr.po
@@ -5,18 +5,36 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-24 10:27+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
 "Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.da.po b/po/underlays/directives/ikiwiki/directive/calendar.da.po
index 401c813a8..eedff18b6 100644
--- a/po/underlays/directives/ikiwiki/directive/calendar.da.po
+++ b/po/underlays/directives/ikiwiki/directive/calendar.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,8 +23,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The `calendar` directive is supplied by the [[!iki plugins/calendar "
-"desc=calendar]] plugin.  This plugin requires extra setup.  See the plugin "
-"documentation for details."
+"desc=calendar]] plugin."
 msgstr ""
 
 #. type: Plain text
@@ -52,21 +52,44 @@ msgstr "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n"
 msgid "\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and !*/Discussion\"]]\n"
 msgstr "\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and !*/Discussion\"]]\n"
 
+#. type: Title ##
+#, no-wrap
+msgid "setup"
+msgstr ""
+
 #. type: Plain text
 msgid ""
 "The calendar is essentially a fancy front end to archives of previous pages, "
 "usually used for blogs. It can produce a calendar for a given month, or a "
-"list of months for a given year."
+"list of months for a given year. The month format calendar simply links to "
+"any page posted on each day of the month. The year format calendar links to "
+"archive pages, with names like `archives/2007` (for all of 2007)  and "
+"`archives/2007/01` (for January, 2007)."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"While you can insert calendar directives anywhere on your wiki, including in "
+"the sidebar, you'll also need to create these archive pages. They typically "
+"use this directive to display a calendar, and also use [[inline]] to display "
+"or list pages created in the given time frame."
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"The month format calendar simply links to any page posted on each day of the "
-"month. The year format calendar links to archive pages, with names like "
-"`archives/2007` (for all of 2007)  and `archives/2007/01` (for January, "
-"2007). For this to work, you'll need to create these archive pages. They "
-"typically use [[inline]] to display or list pages created in the given time "
-"frame."
+"The `ikiwiki-calendar` command can be used to automatically generate the "
+"archive pages. It also refreshes the wiki, updating the calendars to "
+"highlight the current day. This command is typically run at midnight from "
+"cron. An example crontab:"
+msgstr ""
+
+#. type: Plain text
+msgid "An example crontab:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n"
 msgstr ""
 
 #. type: Title ##
@@ -88,22 +111,24 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"`archivebase` - Configures the base of the archives hierarchy. The default "
+"`archivebase` - Configures the base of the archives hierarchy.  The default "
 "is \"archives\". Note that this default can also be overridden for the whole "
-"wiki by setting `archivebase` in ikiwiki's setup file."
+"wiki by setting `archivebase` in ikiwiki's setup file.  Calendars link to "
+"pages under here, with names like \"2010/04\" and \"2010\". These pages can "
+"be automatically created using the `ikiwiki-calendar` program."
 msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
 "`year` - The year for which the calendar is requested. Defaults to the "
-"current year."
+"current year. Can also use -1 to refer to last year, and so on."
 msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
 "`month` - The numeric month for which the calendar is requested, in the "
 "range 1..12. Used only for the month view calendar, and defaults to the "
-"current month."
+"current month. Can also use -1 to refer to last month, and so on."
 msgstr ""
 
 #. type: Bullet: '* '
@@ -115,7 +140,7 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"`months_per_row` - In the annual calendar, number of months to place in each "
+"`months_per_row` - In the year calendar, number of months to place in each "
 "row. Defaults to 3."
 msgstr ""
 
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.de.po b/po/underlays/directives/ikiwiki/directive/calendar.de.po
index 56a8c7e7e..d406f6580 100644
--- a/po/underlays/directives/ikiwiki/directive/calendar.de.po
+++ b/po/underlays/directives/ikiwiki/directive/calendar.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 13:57+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,12 +47,8 @@ msgstr "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and "
-"!*/Discussion\"]]\n"
-msgstr ""
-"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and "
-"!*/Discussion\"]]\n"
+msgid "\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and !*/Discussion\"]]\n"
+msgstr "\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and !*/Discussion\"]]\n"
 
 #. type: Title ##
 #, no-wrap
@@ -67,12 +64,12 @@ msgid ""
 "archive pages, with names like `archives/2007` (for all of 2007)  and "
 "`archives/2007/01` (for January, 2007)."
 msgstr ""
-"Der Kalender ist im Wesentlichen eine schicke Schnittstelle zu einem Archiv mit "
-"früheren Seiten und wird normalerweise für Blogs verwendet. Er kann einen "
-"Kalender für einen angegebenen Monat erzeugen, oder eine Liste der Monate eines "
-"angegebenen Jahres. Der Kalender im Jahresformat enthält einfach Links zu den "
-"Archivseiten mit Namen wie `archiv/2007` (für ganz 2007) und `archiv/2007/01` "
-"(für Januar 2007)."
+"Der Kalender ist im Wesentlichen eine schicke Schnittstelle zu einem Archiv "
+"mit früheren Seiten und wird normalerweise für Blogs verwendet. Er kann "
+"einen Kalender für einen angegebenen Monat erzeugen, oder eine Liste der "
+"Monate eines angegebenen Jahres. Der Kalender im Jahresformat enthält "
+"einfach Links zu den Archivseiten mit Namen wie `archiv/2007` (für ganz "
+"2007) und `archiv/2007/01` (für Januar 2007)."
 
 #. type: Plain text
 msgid ""
@@ -81,10 +78,11 @@ msgid ""
 "use this directive to display a calendar, and also use [[inline]] to display "
 "or list pages created in the given time frame."
 msgstr ""
-"Während `calendar`-Anweisungen überall im Wiki verwendet werden können, auch in "
-"der Sidebar, muss man auch die Archiv-Seiten anlegen. Dort wird typischerweise "
-"diese Anweisung verwendet, um einen Kalender anzuzeigen, und außerdem die Seiten "
-"aus dem entsprechenden Zeitraum über [[inline]] eingebunden."
+"Während `calendar`-Anweisungen überall im Wiki verwendet werden können, auch "
+"in der Sidebar, muss man auch die Archiv-Seiten anlegen. Dort wird "
+"typischerweise diese Anweisung verwendet, um einen Kalender anzuzeigen, und "
+"außerdem die Seiten aus dem entsprechenden Zeitraum über [[inline]] "
+"eingebunden."
 
 #. type: Plain text
 msgid ""
@@ -94,9 +92,10 @@ msgid ""
 "cron. An example crontab:"
 msgstr ""
 "Der `ikiwiki-calendar`-Befehl kann verwendet werden, um die Archivseiten "
-"automatisch zu erzeugen. Es aktualisiert auch das Wiki und hebt in den Kalendern "
-"den aktuellen Tag hervor. Dieser Befehl wird typischerweise um Mitternacht von "
-"cron ausgeführt, beispielsweise durch folgenden crontab-Eintrag:"
+"automatisch zu erzeugen. Es aktualisiert auch das Wiki und hebt in den "
+"Kalendern den aktuellen Tag hervor. Dieser Befehl wird typischerweise um "
+"Mitternacht von cron ausgeführt, beispielsweise durch folgenden crontab-"
+"Eintrag:"
 
 #. type: Plain text
 msgid "An example crontab:"
@@ -105,8 +104,7 @@ msgstr "Ein Beispiel-Eintrag in crontab:"
 #. type: Plain text
 #, no-wrap
 msgid "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n"
-msgstr ""
-"\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n"
+msgstr "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n"
 
 #. type: Title ##
 #, no-wrap
@@ -115,8 +113,8 @@ msgstr "Verwendung"
 
 #. type: Bullet: '* '
 msgid ""
-"`type` - Used to specify the type of calendar wanted. Can be one of "
-"\"month\" or \"year\". The default is a month view calendar."
+"`type` - Used to specify the type of calendar wanted. Can be one of \"month"
+"\" or \"year\". The default is a month view calendar."
 msgstr ""
 "`type` - Hiermit wird die Art des zu erzeugenden Kalenders angegeben. Kann "
 "entweder \"month\" oder \"year\" sein. Vorgeingestellt ist die Monatsansicht."
@@ -130,32 +128,48 @@ msgstr ""
 "Monatskalender verwiesen werden soll. Voreingestellt ist \"*\"."
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`archivebase` - Configures the base of the archives hierarchy. The "
+#| "default is \"archives\". Note that this default can also be overridden "
+#| "for the whole wiki by setting `archivebase` in ikiwiki's setup file."
 msgid ""
-"`archivebase` - Configures the base of the archives hierarchy. The default "
+"`archivebase` - Configures the base of the archives hierarchy.  The default "
 "is \"archives\". Note that this default can also be overridden for the whole "
-"wiki by setting `archivebase` in ikiwiki's setup file."
+"wiki by setting `archivebase` in ikiwiki's setup file.  Calendars link to "
+"pages under here, with names like \"2010/04\" and \"2010\". These pages can "
+"be automatically created using the `ikiwiki-calendar` program."
 msgstr ""
-"`archivebase` - Konfiguriert die Basis der Archiv-Hierarchie. Voreingestellt ist "
-"\"archives\". Dies kann auch für das gesamte Wiki geändert werden, indem "
+"`archivebase` - Konfiguriert die Basis der Archiv-Hierarchie. Voreingestellt "
+"ist \"archives\". Dies kann auch für das gesamte Wiki geändert werden, indem "
 "`archivebase` in der Setup-Datei von ikiwiki gesetzt wird."
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`year` - The year for which the calendar is requested. Defaults to the "
+#| "current year."
 msgid ""
 "`year` - The year for which the calendar is requested. Defaults to the "
-"current year."
+"current year. Can also use -1 to refer to last year, and so on."
 msgstr ""
-"`year` - Das Jahr, für das der Kalender angezeigt werden soll. Voreingestellt ist "
-"das aktuelle Jahr."
+"`year` - Das Jahr, für das der Kalender angezeigt werden soll. "
+"Voreingestellt ist das aktuelle Jahr."
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`month` - The numeric month for which the calendar is requested, in the "
+#| "range 1..12. Used only for the month view calendar, and defaults to the "
+#| "current month."
 msgid ""
 "`month` - The numeric month for which the calendar is requested, in the "
 "range 1..12. Used only for the month view calendar, and defaults to the "
-"current month."
+"current month. Can also use -1 to refer to last month, and so on."
 msgstr ""
-"`month` - Der Monat, für den der Kalender angezeigt werden soll, als Zahl von 1 "
-"bis 12. Wird nur für Monatskalender verwendet. Voreingestellt ist der aktuelle "
-"Monat."
+"`month` - Der Monat, für den der Kalender angezeigt werden soll, als Zahl "
+"von 1 bis 12. Wird nur für Monatskalender verwendet. Voreingestellt ist der "
+"aktuelle Monat."
 
 #. type: Bullet: '* '
 msgid ""
@@ -163,21 +177,23 @@ msgid ""
 "the week that the month calendar starts with. 0 is Sunday, 1 is Monday, and "
 "so on. Defaults to 0, which is Sunday."
 msgstr ""
-"`week_start_day` - Eine Zahl aus dem Bereich 0 bis 6, die den Wochentag angibt, "
-"mit dem ein Monatskalender anfängt. 0 ist Sonntag, 1 ist Montag, und so weiter. "
-"Voreingestellt ist 0, also Sonntag."
+"`week_start_day` - Eine Zahl aus dem Bereich 0 bis 6, die den Wochentag "
+"angibt, mit dem ein Monatskalender anfängt. 0 ist Sonntag, 1 ist Montag, und "
+"so weiter. Voreingestellt ist 0, also Sonntag."
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`months_per_row` - In the annual calendar, number of months to place in "
+#| "each row. Defaults to 3."
 msgid ""
-"`months_per_row` - In the annual calendar, number of months to place in each "
+"`months_per_row` - In the year calendar, number of months to place in each "
 "row. Defaults to 3."
 msgstr ""
-"`months_per_row` - Anzahl der Monate, die in einem Jahreskalender in einer Zeile "
-"platziert werden. Voreingestellt ist 3."
+"`months_per_row` - Anzahl der Monate, die in einem Jahreskalender in einer "
+"Zeile platziert werden. Voreingestellt ist 3."
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.fr.po b/po/underlays/directives/ikiwiki/directive/calendar.fr.po
index 670c1db6f..71cf94c82 100644
--- a/po/underlays/directives/ikiwiki/directive/calendar.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/calendar.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-07 20:27+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"PO-Revision-Date: 2010-07-17 19:07+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -16,9 +17,10 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The `calendar` directive is supplied by the [[!iki plugins/calendar "
-"desc=calendar]] plugin.  This plugin requires extra setup.  See the plugin "
-"documentation for details."
-msgstr "La directive `calendar` est fournie par le module d'extension [[!iki plugins/calendar desc=calendar]]. Ce greffon exige une configuration particulière. Consultez sa documentation pour plus de précisions."
+"desc=calendar]] plugin."
+msgstr ""
+"La directive `calendar` est fournie par le module d'extension [[!iki plugins/"
+"calendar desc=calendar]]."
 
 #. type: Plain text
 msgid ""
@@ -48,31 +50,60 @@ msgstr "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n"
 msgid "\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and !*/Discussion\"]]\n"
 msgstr "\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and !*/Discussion\"]]\n"
 
+#. type: Title ##
+#, no-wrap
+msgid "setup"
+msgstr "configuration"
+
 #. type: Plain text
 msgid ""
 "The calendar is essentially a fancy front end to archives of previous pages, "
 "usually used for blogs. It can produce a calendar for a given month, or a "
-"list of months for a given year."
+"list of months for a given year. The month format calendar simply links to "
+"any page posted on each day of the month. The year format calendar links to "
+"archive pages, with names like `archives/2007` (for all of 2007)  and "
+"`archives/2007/01` (for January, 2007)."
 msgstr ""
-"L'agenda, qu'on trouve habituellement dans les blogs, est essentiellement "
-"une interface agréable pour l'archive de pages précédentes. Il peut afficher "
-"un calendrier pour un mois donné ou une liste de mois pour une année donnée."
+"L'agenda, habituellement trouvé dans les blogs, est essentiellement une "
+"interface agréable pour l'archive de pages précédentes. Il peut afficher un "
+"calendrier pour un mois donné ou une liste de mois pour une année donnée. Un "
+"calendrier mensuel lie à chaque jour du mois les pages publiées ce jour. Un "
+"calendrier annuel lie aux pages d'archive, avec des noms comme "
+"`archives/2007` (pour tout 2007) et `archives/2007/01` (pour janvier 2007)."
 
 #. type: Plain text
 msgid ""
-"The month format calendar simply links to any page posted on each day of the "
-"month. The year format calendar links to archive pages, with names like "
-"`archives/2007` (for all of 2007)  and `archives/2007/01` (for January, "
-"2007). For this to work, you'll need to create these archive pages. They "
-"typically use [[inline]] to display or list pages created in the given time "
-"frame."
+"While you can insert calendar directives anywhere on your wiki, including in "
+"the sidebar, you'll also need to create these archive pages. They typically "
+"use this directive to display a calendar, and also use [[inline]] to display "
+"or list pages created in the given time frame."
 msgstr ""
-"Le calendrier pour un mois est simplement l'ensemble des liens vers les "
-"pages écrites chaque jour du mois. Le calendrier pour une année est "
-"l'ensemble des liens vers les pages d'archives, comme `archives/2007` (tout "
-"2007) ou `archives/2007/01` (tout janvier 2007). Pour que cela fonctionne, "
-"il faut créer ces pages d'archive, qui comporteront une directive [[inline]] "
-"pour afficher ou lister les pages créées dans l'intervalle de temps donné."
+"Les directives calendar peuvent être insérées n'importe où dans le wiki, "
+"même dans la barre latérale. Vous devez cependant créer les pages "
+"d'archives. Celles-ci utilisent cette directive pour afficher un calendrier "
+"et aussi la directive [[inline]] pour afficher ou lister les pages créées "
+"dans l'espace de temps donné."
+
+#. type: Plain text
+msgid ""
+"The `ikiwiki-calendar` command can be used to automatically generate the "
+"archive pages. It also refreshes the wiki, updating the calendars to "
+"highlight the current day. This command is typically run at midnight from "
+"cron. An example crontab:"
+msgstr ""
+"La commande `ikiwiki-calendar` peut créer automatiquement les pages "
+"d'archives. Elle actualise aussi le wiki, mettant à jour les calendriers "
+"(date du jour en surbrillance). Cette commande est exécutée généralement à "
+"minuit par le programme cron."
+
+#. type: Plain text
+msgid "An example crontab:"
+msgstr "Une crontab possible :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n"
+msgstr "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n"
 
 #. type: Title ##
 #, no-wrap
@@ -83,48 +114,101 @@ msgstr "Usage"
 msgid ""
 "`type` - Used to specify the type of calendar wanted. Can be one of \"month"
 "\" or \"year\". The default is a month view calendar."
-msgstr "`type` - Ce paramètre indique le type du calendrier. C'est soit « month » soit « year », la valeur par défaut étant le calendrier mensuel."
+msgstr ""
+"`type` - Ce paramètre indique le type du calendrier. C'est soit « month » "
+"soit « year », la valeur par défaut étant le calendrier mensuel."
 
 #. type: Bullet: '* '
 msgid ""
 "`pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the "
 "month calendar. Defaults to \"*\"."
-msgstr "`pages` - Indique  une spécification [[ikiwiki/PageSpec]] pour les pages qui seront liées au calendrier. La valeur par défaut est « * »."
+msgstr ""
+"`pages` - Indique  une spécification [[ikiwiki/PageSpec]] pour les pages qui "
+"seront liées au calendrier. La valeur par défaut est « * »."
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`archivebase` - Configures the base of the archives hierarchy. The "
+#| "default is \"archives\". Note that this default can also be overridden "
+#| "for the whole wiki by setting `archivebase` in ikiwiki's setup file."
 msgid ""
-"`archivebase` - Configures the base of the archives hierarchy. The default "
+"`archivebase` - Configures the base of the archives hierarchy.  The default "
 "is \"archives\". Note that this default can also be overridden for the whole "
-"wiki by setting `archivebase` in ikiwiki's setup file."
-msgstr "`archivebase` - Indique la racine des répertoires d'archives, « archives » par défaut. On peut changer cette valeur en renseignant `archivebase` dans le fichier de configuration d'ikiwiki."
+"wiki by setting `archivebase` in ikiwiki's setup file.  Calendars link to "
+"pages under here, with names like \"2010/04\" and \"2010\". These pages can "
+"be automatically created using the `ikiwiki-calendar` program."
+msgstr ""
+"`archivebase` - Indique la racine des répertoires d'archives, « archives » "
+"par défaut. On peut changer cette valeur en renseignant `archivebase` dans "
+"le fichier de configuration d'ikiwiki."
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`year` - The year for which the calendar is requested. Defaults to the "
+#| "current year."
 msgid ""
 "`year` - The year for which the calendar is requested. Defaults to the "
-"current year."
-msgstr "`year` - Indique l'année pour le calendrier annuel. La valeur par défaut est l'année en cours."
+"current year. Can also use -1 to refer to last year, and so on."
+msgstr ""
+"`year` - Indique l'année pour le calendrier annuel. La valeur par défaut est "
+"l'année en cours."
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`month` - The numeric month for which the calendar is requested, in the "
+#| "range 1..12. Used only for the month view calendar, and defaults to the "
+#| "current month."
 msgid ""
 "`month` - The numeric month for which the calendar is requested, in the "
 "range 1..12. Used only for the month view calendar, and defaults to the "
-"current month."
-msgstr "`month` - Ce paramètre indique le chiffre du mois (1..12) pour le calendrier. Il n'est utilisé que pour le calendrier mensuel, et la valeur par défaut est le chiffre du mois en cours."
+"current month. Can also use -1 to refer to last month, and so on."
+msgstr ""
+"`month` - Ce paramètre indique le chiffre du mois (1..12) pour le "
+"calendrier. Il n'est utilisé que pour le calendrier mensuel, et la valeur "
+"par défaut est le chiffre du mois en cours."
 
 #. type: Bullet: '* '
 msgid ""
 "`week_start_day` - A number, in the range 0..6, which represents the day of "
 "the week that the month calendar starts with. 0 is Sunday, 1 is Monday, and "
 "so on. Defaults to 0, which is Sunday."
-msgstr "`week_start_day` - Indique le chiffre (1..6) qui représente le jour par lequel commence la semaine dans le calendrier. Dimanche, c'est 0, lundi, 1, etc. La valeur par défaut est 0, dimanche."
+msgstr ""
+"`week_start_day` - Indique le chiffre (0..6) qui représente le jour par "
+"lequel commence la semaine dans le calendrier. Dimanche, c'est 0, lundi, 1, "
+"etc. La valeur par défaut est 0, dimanche."
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`months_per_row` - In the annual calendar, number of months to place in "
+#| "each row. Defaults to 3."
 msgid ""
-"`months_per_row` - In the annual calendar, number of months to place in each "
+"`months_per_row` - In the year calendar, number of months to place in each "
 "row. Defaults to 3."
-msgstr "`months_per_row` - Ce paramètre indique, dans le calendrier annuel, le nombre de mois par ligne. La valeur par défaut est 3."
+msgstr ""
+"`months_per_row` - Ce paramètre indique, dans le calendrier annuel, le "
+"nombre de mois par ligne. La valeur par défaut est 3."
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#~ msgid ""
+#~ "The month format calendar simply links to any page posted on each day of "
+#~ "the month. The year format calendar links to archive pages, with names "
+#~ "like `archives/2007` (for all of 2007)  and `archives/2007/01` (for "
+#~ "January, 2007). For this to work, you'll need to create these archive "
+#~ "pages. They typically use [[inline]] to display or list pages created in "
+#~ "the given time frame."
+#~ msgstr ""
+#~ "Le calendrier pour un mois est simplement l'ensemble des liens vers les "
+#~ "pages écrites chaque jour du mois. Le calendrier pour une année est "
+#~ "l'ensemble des liens vers les pages d'archives, comme `archives/2007` "
+#~ "(tout 2007) ou `archives/2007/01` (tout janvier 2007). Pour que cela "
+#~ "fonctionne, il faut créer ces pages d'archive, qui comporteront une "
+#~ "directive [[inline]] pour afficher ou lister les pages créées dans "
+#~ "l'intervalle de temps donné."
diff --git a/po/underlays/directives/ikiwiki/directive/comment.da.po b/po/underlays/directives/ikiwiki/directive/comment.da.po
index 20cf29963..6afe75381 100644
--- a/po/underlays/directives/ikiwiki/directive/comment.da.po
+++ b/po/underlays/directives/ikiwiki/directive/comment.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,6 +99,12 @@ msgid ""
 "commenter."
 msgstr ""
 
+#. type: Bullet: '* '
+msgid ""
+"`nickname` - Name to display for a logged in commenter.  (Optional; used for "
+"OpenIDs.)"
+msgstr ""
+
 #. type: Bullet: '* '
 msgid ""
 "`ip` - Can be used to record the IP address of a commenter, if they posted "
@@ -106,7 +113,7 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"`claimedauthor` - Records the name that the user entered, if anonmous "
+"`claimedauthor` - Records the name that the user entered, if anonymous "
 "commenters are allowed to enter their (unverified)  name."
 msgstr ""
 
diff --git a/po/underlays/directives/ikiwiki/directive/comment.de.po b/po/underlays/directives/ikiwiki/directive/comment.de.po
index fed27cf75..e32df0f09 100644
--- a/po/underlays/directives/ikiwiki/directive/comment.de.po
+++ b/po/underlays/directives/ikiwiki/directive/comment.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 13:58+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,8 +23,8 @@ msgid ""
 msgstr ""
 "Die `comment`-Anweisung wird durch die [[!iki plugins/comments "
 "desc=comments]]-Erweiterung bereitgestellt, und wird zum Hinzufügen von "
-"Kommentaren zu einer Seite verwendet. Typischerweise ist diese Anweisung "
-"das Einzige auf einer Kommentarseite, und wird von der comment-Erweiterung "
+"Kommentaren zu einer Seite verwendet. Typischerweise ist diese Anweisung das "
+"Einzige auf einer Kommentarseite, und wird von der comment-Erweiterung "
 "ausgefüllt, wenn ein Benutzer einen Kommentar veröffentlicht."
 
 #. type: Plain text
@@ -74,9 +75,9 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"`content` - Text to display for the comment.  Note that "
-"[[directives|ikiwiki/directive]] may not be allowed, depending on the "
-"configuration of the comment plugin."
+"`content` - Text to display for the comment.  Note that [[directives|ikiwiki/"
+"directive]] may not be allowed, depending on the configuration of the "
+"comment plugin."
 msgstr ""
 "`content` - Text, der in diesem Kommentar angezeigt werden soll. "
 "[[Anweisungen|ikiwiki/directive]] sind hier unter Umständen nicht erlaubt, "
@@ -98,16 +99,22 @@ msgid ""
 "since it's parsed by [[!cpan TimeDate]]"
 msgstr ""
 "`date` - Datum, an dem der Kommentar veröffentlicht wurde. Kann in beinahe "
-"beliebigem Format angegeben werden, da es von [[!cpan TimeDate]] "
-"ausgewertet wird."
+"beliebigem Format angegeben werden, da es von [[!cpan TimeDate]] ausgewertet "
+"wird."
 
 #. type: Bullet: '* '
 msgid ""
 "`username` - Used to record the username (or OpenID)  of a logged in "
 "commenter."
 msgstr ""
-"`username` - Hier wird der Benutzername (oder die OpenID) eines "
-"angemeldeten Kommentators gespeichert."
+"`username` - Hier wird der Benutzername (oder die OpenID) eines angemeldeten "
+"Kommentators gespeichert."
+
+#. type: Bullet: '* '
+msgid ""
+"`nickname` - Name to display for a logged in commenter.  (Optional; used for "
+"OpenIDs.)"
+msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
@@ -129,5 +136,3 @@ msgstr ""
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-
diff --git a/po/underlays/directives/ikiwiki/directive/comment.fr.po b/po/underlays/directives/ikiwiki/directive/comment.fr.po
index 3c41c720a..74a6f7204 100644
--- a/po/underlays/directives/ikiwiki/directive/comment.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/comment.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-09 20:32+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"PO-Revision-Date: 2010-07-17 16:07+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -19,7 +20,11 @@ msgid ""
 "desc=comments]] plugin, and is used to add a comment to a page. Typically, "
 "the directive is the only thing on a comment page, and is filled out by the "
 "comment plugin when a user posts a comment."
-msgstr "La directive `comment` est fournie par le module d'extension [[!iki plugins/comments desc=comments]]. Elle permet l'ajout d'un commentaire sur une page. En général, la page ne comporte que la directive et c'est le greffon lui-même qui remplit la directive quand un utilisateur poste un commentaire "
+msgstr ""
+"La directive `comment` est fournie par le module d'extension [[!iki plugins/"
+"comments desc=comments]]. Elle permet l'ajout d'un commentaire sur une page. "
+"En général, la page ne comporte que la directive et c'est le greffon lui-"
+"même qui remplit la directive quand un utilisateur poste un commentaire."
 
 #. type: Plain text
 msgid "Example:"
@@ -89,7 +94,9 @@ msgstr "subject` - Sujet du commentaire."
 msgid ""
 "`date` - Date the comment was posted. Can be entered in nearly any format, "
 "since it's parsed by [[!cpan TimeDate]]"
-msgstr "`date` - Indique la date du commentaire. Cette date peut utiliser presque tous les formats, puisqu'elle est analysée par [[!cpan TimeDate]]."
+msgstr ""
+"`date` - Indique la date du commentaire. Cette date peut utiliser presque "
+"tous les formats, puisqu'elle est analysée par [[!cpan TimeDate]]."
 
 #. type: Bullet: '* '
 msgid ""
@@ -99,6 +106,12 @@ msgstr ""
 "`username` - Sert pour l'enregistrement du nom (ou OpenID) d'un commentateur "
 "présent."
 
+#. type: Bullet: '* '
+msgid ""
+"`nickname` - Name to display for a logged in commenter.  (Optional; used for "
+"OpenIDs.)"
+msgstr ""
+
 #. type: Bullet: '* '
 msgid ""
 "`ip` - Can be used to record the IP address of a commenter, if they posted "
@@ -109,7 +122,7 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"`claimedauthor` - Records the name that the user entered, if anonmous "
+"`claimedauthor` - Records the name that the user entered, if anonymous "
 "commenters are allowed to enter their (unverified)  name."
 msgstr ""
 "`claimedauthor` - Enregistre le nom donné par l'utilisateur, si les "
diff --git a/po/underlays/directives/ikiwiki/directive/edittemplate.da.po b/po/underlays/directives/ikiwiki/directive/edittemplate.da.po
index 41ca61bfe..610f2c891 100644
--- a/po/underlays/directives/ikiwiki/directive/edittemplate.da.po
+++ b/po/underlays/directives/ikiwiki/directive/edittemplate.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -70,7 +71,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "The template page can also contain [[!cpan HTML::Template]] directives,\n"
-"similar to other ikiwiki [[templates]]. Currently only one variable is\n"
+"like other ikiwiki [[templates]]. Currently only one variable is\n"
 "set: `<TMPL_VAR name>` is replaced with the name of the page being\n"
 "created.\n"
 msgstr ""
diff --git a/po/underlays/directives/ikiwiki/directive/edittemplate.de.po b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po
index d2ca0c29f..24eef518a 100644
--- a/po/underlays/directives/ikiwiki/directive/edittemplate.de.po
+++ b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 13:59+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,8 +31,8 @@ msgid ""
 msgstr ""
 "Diese Anweisung erlaubt es, Vorlagen-Seiten zu registrieren, die einen "
 "Standardinhalt für neue Seiten bereitstellen, die über das Webfrontend "
-"angelegt werden. Um eine Vorlage zu registrieren, fügt man eine "
-"[[ikiwiki/directive/template]]-Anweisung auf einer anderen Seite ein."
+"angelegt werden. Um eine Vorlage zu registrieren, fügt man eine [[ikiwiki/"
+"directive/template]]-Anweisung auf einer anderen Seite ein."
 
 #. type: Plain text
 #, no-wrap
@@ -77,7 +78,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "The template page can also contain [[!cpan HTML::Template]] directives,\n"
-"similar to other ikiwiki [[templates]]. Currently only one variable is\n"
+"like other ikiwiki [[templates]]. Currently only one variable is\n"
 "set: `<TMPL_VAR name>` is replaced with the name of the page being\n"
 "created.\n"
 msgstr ""
@@ -95,5 +96,3 @@ msgstr ""
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr ""
-
-
diff --git a/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po b/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po
index 53e2c67dd..fea04648d 100644
--- a/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-05 08:36+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -44,14 +45,21 @@ msgid ""
 "template to be used when any page named \"bugs/*\" is created. To avoid the "
 "directive displaying a note about the template being registered, add "
 "\"silent=yes\"."
-msgstr "Dans l'exemple ci-dessus, la page nommée « bugtemplate » est enregistrée comme modèle de page à utiliser pour toute page nommée « bugs/* » qui sera créée. Pour éviter que la directive n'affiche une note au sujet de l'enregistrement du modèle, il suffit d'activer le paramètre « silent=yes »."
+msgstr ""
+"Dans l'exemple ci-dessus, la page nommée « bugtemplate » est enregistrée "
+"comme modèle de page à utiliser pour toute page nommée « bugs/* » qui sera "
+"créée. Pour éviter que la directive n'affiche une note au sujet de "
+"l'enregistrement du modèle, il suffit d'activer le paramètre « silent=yes »."
 
 #. type: Plain text
 msgid ""
 "Often the template page contains a simple skeleton for a particular type of "
 "page. For the bug report pages in the above example, it might look something "
 "like:"
-msgstr "Souvent la page modèle contient le simple squelette d'une page particulière. Pour le modèle « rapport de bogue » dans l'exemple, ce squelette pourrait se présenter ainsi :"
+msgstr ""
+"Souvent la page modèle contient le simple squelette d'une page particulière. "
+"Pour le modèle « rapport de bogue » dans l'exemple, ce squelette pourrait se "
+"présenter ainsi :"
 
 #. type: Plain text
 #, no-wrap
@@ -67,10 +75,15 @@ msgstr ""
 "\tDétails : \n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "The template page can also contain [[!cpan HTML::Template]] directives,\n"
+#| "similar to other ikiwiki [[templates]]. Currently only one variable is\n"
+#| "set: `<TMPL_VAR name>` is replaced with the name of the page being\n"
+#| "created.\n"
 msgid ""
 "The template page can also contain [[!cpan HTML::Template]] directives,\n"
-"similar to other ikiwiki [[templates]]. Currently only one variable is\n"
+"like other ikiwiki [[templates]]. Currently only one variable is\n"
 "set: `<TMPL_VAR name>` is replaced with the name of the page being\n"
 "created.\n"
 msgstr "La page modèle peut aussi contenir des directives [[!cpan HTML::Template]], comparables aux autres modèles [[templates]]. Pour l'instant, une seule variable est définie : `<TMPL_VAR name>`. Elle est remplacée par le nom de la page qui est créée.\n"
@@ -82,7 +95,13 @@ msgid ""
 "the template on new pages, which would then in turn be registered as "
 "templates. If multiple pages are registered as templates for a new page, an "
 "arbitrary one is chosen, so that could get confusing."
-msgstr "Ce n'est pas une bonne idée de mettre la directive `edittemplate` dans la page modèle elle-même. En effet la directive serait alors incluse comme partie du modèle sur les nouvelles pages, qui seraient à leur tour enregistrées comme modèles. Si de nombreuses pages sont enregistrées comme modèles pour une page, un modèle est choisi au hasard et tout devient confus. "
+msgstr ""
+"Ce n'est pas une bonne idée de mettre la directive `edittemplate` dans la "
+"page modèle elle-même. En effet la directive serait alors incluse comme "
+"partie du modèle sur les nouvelles pages, qui seraient à leur tour "
+"enregistrées comme modèles. Si de nombreuses pages sont enregistrées comme "
+"modèles pour une page, un modèle est choisi au hasard et tout devient "
+"confus. "
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/format.da.po b/po/underlays/directives/ikiwiki/directive/format.da.po
index 20a7e7a46..ef5c67e84 100644
--- a/po/underlays/directives/ikiwiki/directive/format.da.po
+++ b/po/underlays/directives/ikiwiki/directive/format.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -69,8 +69,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#, no-wrap
-msgid "\t\\[[format perl \"\"\"\n"
+#, fuzzy, no-wrap
+#| msgid "\t\\[[format perl \"\"\"\n"
+msgid "\t\\[[!format perl \"\"\"\n"
 msgstr "\t\\[[format perl \"\"\"\n"
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/format.fr.po b/po/underlays/directives/ikiwiki/directive/format.fr.po
index 93f3d5c64..a16269ce2 100644
--- a/po/underlays/directives/ikiwiki/directive/format.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/format.fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-10 16:32+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"PO-Revision-Date: 2010-07-17 16:05+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,9 @@ msgstr ""
 msgid ""
 "The `format` directive is supplied by the [[!iki plugins/format "
 "desc=format]] plugin."
-msgstr "La directive `format` est fournie par le module d'extension [[!iki plugins/format desc=format]]."
+msgstr ""
+"La directive `format` est fournie par le module d'extension [[!iki plugins/"
+"format desc=format]]."
 
 #. type: Plain text
 msgid ""
@@ -25,13 +27,19 @@ msgid ""
 "format. It takes two parameters. First is the type of format to use, ie the "
 "extension that would be used for a standalone file of this type.  Second is "
 "the text to format."
-msgstr "Cette directive permet de formater un texte avec tout type de format disponible. Elle possède deux paramètres. Le premier est le format à utiliser, c'est-à-dire l'extension à donner à un fichier de ce type. Le second est le texte à formater."
+msgstr ""
+"Cette directive permet de formater un texte avec tout type de format "
+"disponible. Elle possède deux paramètres. Le premier est le format à "
+"utiliser, c'est-à-dire l'extension à donner à un fichier de ce type. Le "
+"second est le texte à formater."
 
 #. type: Plain text
 msgid ""
 "For example, this will embed an otl outline inside a page using mdwn or some "
 "other format:"
-msgstr "Par exemple, pour insérer un fichier outline (.otl) dans une page qui utilise mdwn ou un autre format :"
+msgstr ""
+"Par exemple, pour insérer un fichier outline (.otl) dans une page qui "
+"utilise mdwn ou un autre format :"
 
 #. type: Plain text
 #, no-wrap
@@ -54,17 +62,22 @@ msgstr ""
 "\tbar\n"
 "\t\t3\n"
 "\t\t4\n"
+
 #. type: Plain text
 msgid ""
 "Note that if the highlight plugin is enabled, this directive can also be "
 "used to display syntax highlighted code. Many languages and formats are "
 "supported. For example:"
-msgstr "Si le greffon highlight est activé, cette directive permet d'afficher un code dont la syntaxe est mise en évidence. Beaucoup de langages sont reconnus. Par exemple :"
+msgstr ""
+"Si le greffon highlight est activé, cette directive permet d'afficher un "
+"code dont la syntaxe est mise en évidence. Beaucoup de langages sont "
+"reconnus. Par exemple :"
 
 #. type: Plain text
-#, no-wrap
-msgid "\t\\[[format perl \"\"\"\n"
-msgstr "\t\\[[format perl \"\"\"\n"
+#, fuzzy, no-wrap
+#| msgid "\t\\[[format perl \"\"\"\n"
+msgid "\t\\[[!format perl \"\"\"\n"
+msgstr "\t\\[[!format perl \"\"\"\n"
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/img.da.po b/po/underlays/directives/ikiwiki/directive/img.da.po
index f6a950965..338843e2b 100644
--- a/po/underlays/directives/ikiwiki/directive/img.da.po
+++ b/po/underlays/directives/ikiwiki/directive/img.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,18 +60,18 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"You can also pass `alt`, `title`, `class`, `align` and `id` parameters.  "
-"These are passed through unchanged to the html img tag. If you include a "
-"`caption` parameter, the caption will be displayed centered beneath the "
-"image."
+"You can also pass `alt`, `title`, `class`, `align`, `id`, `hspace`, and "
+"`vspace` parameters.  These are passed through unchanged to the html img "
+"tag. If you include a `caption` parameter, the caption will be displayed "
+"centered beneath the image."
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"The `link` parameter is used to control whether the scaled down image links "
-"to the full size version. By default it does; set \"link=somepage\" to link "
-"to another page instead, or \"link=no\" to disable the link, or "
-"\"link=http://url\" to link to a given url."
+"The `link` parameter is used to control whether the scaled image links to "
+"the full size version. By default it does; set \"link=somepage\" to link to "
+"another page instead, or \"link=no\" to disable the link, or \"link=http://"
+"url\" to link to a given url."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/img.de.po b/po/underlays/directives/ikiwiki/directive/img.de.po
index 9ebdae5bc..336c3e8a5 100644
--- a/po/underlays/directives/ikiwiki/directive/img.de.po
+++ b/po/underlays/directives/ikiwiki/directive/img.de.po
@@ -4,32 +4,35 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 14:02+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
-msgid "The `img` directive is supplied by the [[!iki plugins/img desc=img]] plugin."
+msgid ""
+"The `img` directive is supplied by the [[!iki plugins/img desc=img]] plugin."
 msgstr ""
 "Die `img`-Anweisung wird durch die [[!iki plugins/img desc=img]]-Erweiterung "
 "bereitgestellt."
 
 #. type: Plain text
 msgid ""
-"This is an image handling directive.  While ikiwiki supports inlining "
-"full-size images by making a [[ikiwiki/WikiLink]] that points to the image, "
-"using this directive you can easily scale down an image for inclusion onto a "
-"page, providing a link to a full-size version."
+"This is an image handling directive.  While ikiwiki supports inlining full-"
+"size images by making a [[ikiwiki/WikiLink]] that points to the image, using "
+"this directive you can easily scale down an image for inclusion onto a page, "
+"providing a link to a full-size version."
 msgstr ""
-"Diese Anweisung verarbeitet Bilder. Während ikiwiki das Einbinden von Bildern in "
-"voller Größe durch einen [[ikiwiki/WikiLink]] auf das Bild unterstützt, kann man "
-"mit dieser Anweisung ein Bild einfach herunterskalieren, um es in eine Seite "
-"einzubinden, und einen Link auf das Bild in Originalgröße setzen."
+"Diese Anweisung verarbeitet Bilder. Während ikiwiki das Einbinden von "
+"Bildern in voller Größe durch einen [[ikiwiki/WikiLink]] auf das Bild "
+"unterstützt, kann man mit dieser Anweisung ein Bild einfach "
+"herunterskalieren, um es in eine Seite einzubinden, und einen Link auf das "
+"Bild in Originalgröße setzen."
 
 #. type: Title ##
 #, no-wrap
@@ -59,40 +62,48 @@ msgid ""
 msgstr ""
 "Der Parameter `size` ist optional, voreingestellt ist die volle Größe. Das "
 "Seitenverhältnis des Originalbildes wird immer bewahrt, auch wenn das Bild "
-"dadurch kleiner wird als angegeben. Man kann auch nur die Breite oder nur die "
-"Höhe angeben, dann wird der jeweils andere Wert automatisch berechnet: `200x`, "
-"`x200`."
+"dadurch kleiner wird als angegeben. Man kann auch nur die Breite oder nur "
+"die Höhe angeben, dann wird der jeweils andere Wert automatisch berechnet: "
+"`200x`, `x200`."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "You can also pass `alt`, `title`, `class`, `align` and `id` parameters.  "
+#| "These are passed through unchanged to the html img tag. If you include a "
+#| "`caption` parameter, the caption will be displayed centered beneath the "
+#| "image."
 msgid ""
-"You can also pass `alt`, `title`, `class`, `align` and `id` parameters.  "
-"These are passed through unchanged to the html img tag. If you include a "
-"`caption` parameter, the caption will be displayed centered beneath the "
-"image."
+"You can also pass `alt`, `title`, `class`, `align`, `id`, `hspace`, and "
+"`vspace` parameters.  These are passed through unchanged to the html img "
+"tag. If you include a `caption` parameter, the caption will be displayed "
+"centered beneath the image."
 msgstr ""
-"Man kann auch die Parameter `alt`, `title`, `class`, `align` und `id` übergeben. "
-"Diese werden an den img-Tag im erzeugten HTML-Code weitergereicht. Wird der "
-"Parameter `caption` angegeben, wird sein Wert unter dem Bild zentriert angezeigt."
+"Man kann auch die Parameter `alt`, `title`, `class`, `align` und `id` "
+"übergeben. Diese werden an den img-Tag im erzeugten HTML-Code "
+"weitergereicht. Wird der Parameter `caption` angegeben, wird sein Wert unter "
+"dem Bild zentriert angezeigt."
 
 #. type: Plain text
 msgid ""
 "The `link` parameter is used to control whether the scaled image links to "
 "the full size version. By default it does; set \"link=somepage\" to link to "
-"another page instead, or \"link=no\" to disable the link, or "
-"\"link=http://url\" to link to a given url."
+"another page instead, or \"link=no\" to disable the link, or \"link=http://"
+"url\" to link to a given url."
 msgstr ""
-"Der Parameter `link` steuert, ob herunterskalierte Bilder mit dem Originalbild "
-"verlinkt werden. In der Voreinstellung ist dies der Fall; mit `link=AndereSeite` "
-"zeigt der Link auf eine andere Seite, mit `link=no` wird der Link deaktiviert, "
-"mit `link=http://url` zeigt er auf die angegebene URL."
+"Der Parameter `link` steuert, ob herunterskalierte Bilder mit dem "
+"Originalbild verlinkt werden. In der Voreinstellung ist dies der Fall; mit "
+"`link=AndereSeite` zeigt der Link auf eine andere Seite, mit `link=no` wird "
+"der Link deaktiviert, mit `link=http://url` zeigt er auf die angegebene URL."
 
 #. type: Plain text
 msgid ""
 "You can also set default values that will be applied to all later images on "
 "the page, unless overridden. Useful when including many images on a page."
 msgstr ""
-"Man kann auch die Voreinstellung für die weiter unten auf der Seite eingebundenen "
-"Bilder verändern. Dies ist nützlich, wenn es auf einer Seite viele Bilder gibt."
+"Man kann auch die Voreinstellung für die weiter unten auf der Seite "
+"eingebundenen Bilder verändern. Dies ist nützlich, wenn es auf einer Seite "
+"viele Bilder gibt."
 
 #. type: Plain text
 #, no-wrap
@@ -111,5 +122,3 @@ msgstr ""
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-
diff --git a/po/underlays/directives/ikiwiki/directive/img.fr.po b/po/underlays/directives/ikiwiki/directive/img.fr.po
index b3c5b7ca6..17322b3f4 100644
--- a/po/underlays/directives/ikiwiki/directive/img.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/img.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-06 15:33+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"PO-Revision-Date: 2010-07-17 16:04+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -66,11 +67,17 @@ msgstr ""
 "calculée selon le format d'image, \"200x\", \"x200\"."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "You can also pass `alt`, `title`, `class`, `align` and `id` parameters.  "
+#| "These are passed through unchanged to the html img tag. If you include a "
+#| "`caption` parameter, the caption will be displayed centered beneath the "
+#| "image."
 msgid ""
-"You can also pass `alt`, `title`, `class`, `align` and `id` parameters.  "
-"These are passed through unchanged to the html img tag. If you include a "
-"`caption` parameter, the caption will be displayed centered beneath the "
-"image."
+"You can also pass `alt`, `title`, `class`, `align`, `id`, `hspace`, and "
+"`vspace` parameters.  These are passed through unchanged to the html img "
+"tag. If you include a `caption` parameter, the caption will be displayed "
+"centered beneath the image."
 msgstr ""
 "Vous pouvez aussi spécifier les paramètres `alt`, `title`, `class`, `align` "
 "et `id`. Ils sont passés inchangés à la balise HTML « img ». Si vous ajoutez "
@@ -78,10 +85,10 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"The `link` parameter is used to control whether the scaled down image links "
-"to the full size version. By default it does; set \"link=somepage\" to link "
-"to another page instead, or \"link=no\" to disable the link, or "
-"\"link=http://url\" to link to a given url."
+"The `link` parameter is used to control whether the scaled image links to "
+"the full size version. By default it does; set \"link=somepage\" to link to "
+"another page instead, or \"link=no\" to disable the link, or \"link=http://"
+"url\" to link to a given url."
 msgstr ""
 "Le paramètre `link` contrôle la liaison entre l'image réduite et l'image à "
 "taille réelle. Par défaut il les relie. Vous pouvez définir \"link=somepage"
diff --git a/po/underlays/directives/ikiwiki/directive/inline.da.po b/po/underlays/directives/ikiwiki/directive/inline.da.po
index 9d9d6829d..a5d29076e 100644
--- a/po/underlays/directives/ikiwiki/directive/inline.da.po
+++ b/po/underlays/directives/ikiwiki/directive/inline.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -213,12 +213,8 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"`sort` - Controls how inlined pages are sorted. The default, \"age\" is to "
-"sort newest created pages first. Setting it to \"title\" will sort pages by "
-"title, and \"mtime\" sorts most recently modified pages first. If [[!cpan "
-"Sort::Naturally]] is installed, `sort` can be set to \"title_natural\" to "
-"sort by title with numbers treated as such (\"1 2 9 10 20\" instead of \"1 "
-"10 2 20 9\")."
+"`sort` - Controls how inlined pages are [[sorted|pagespec/sorting]].  The "
+"default is to sort the newest created pages first."
 msgstr ""
 
 #. type: Bullet: '* '
@@ -240,7 +236,7 @@ msgstr ""
 #. type: Bullet: '* '
 msgid ""
 "`quick` - Build archives in quick mode, without reading page contents for "
-"metadata. By default, this also turns off generation of any feeds."
+"metadata. This also turns off generation of any feeds."
 msgstr ""
 
 #. type: Bullet: '* '
diff --git a/po/underlays/directives/ikiwiki/directive/inline.fr.po b/po/underlays/directives/ikiwiki/directive/inline.fr.po
index 4e0976735..4ee7684f7 100644
--- a/po/underlays/directives/ikiwiki/directive/inline.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/inline.fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
-"PO-Revision-Date: 2009-09-05 11:08+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"PO-Revision-Date: 2010-07-17 16:02+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -273,20 +273,9 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"`sort` - Controls how inlined pages are sorted. The default, \"age\" is to "
-"sort newest created pages first. Setting it to \"title\" will sort pages by "
-"title, and \"mtime\" sorts most recently modified pages first. If [[!cpan "
-"Sort::Naturally]] is installed, `sort` can be set to \"title_natural\" to "
-"sort by title with numbers treated as such (\"1 2 9 10 20\" instead of \"1 "
-"10 2 20 9\")."
-msgstr ""
-"`sort` - Ce paramètre contrôle la façon de trier les pages reliées. Avec le "
-"critère par défaut, \"age\", les pages les plus récentes sont classées en "
-"premier.  Avec le critère \"title\", les pages seront classées par titre. "
-"Avec le critère \"mtime\", les pages les plus récemment modifiées seront "
-"classées en premier. Si le module [[!cpan Sort::Naturally]] est installé, on "
-"peut utiliser le critère \"title_natural\" pour trier par titre avec nombres "
-"ordonnés numériquement (\"1 2 9 10 20\" au lieu de \"1 10 2 20 9\")."
+"`sort` - Controls how inlined pages are [[sorted|pagespec/sorting]].  The "
+"default is to sort the newest created pages first."
+msgstr "`sort` - permet d'indiquer comment les pages liées sont triées [[sorted|pagespec/sorting]]. Par défaut, les pages les plus récentes sont triées en premier."
 
 #. type: Bullet: '* '
 msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed."
@@ -310,12 +299,13 @@ msgstr ""
 "page."
 
 #. type: Bullet: '* '
+#| msgid ""
+#| "`quick` - Build archives in quick mode, without reading page contents for "
+#| "metadata. By default, this also turns off generation of any feeds."
 msgid ""
 "`quick` - Build archives in quick mode, without reading page contents for "
-"metadata. By default, this also turns off generation of any feeds."
-msgstr ""
-"`quick` - Construire l'archive en mode rapide, sans chercher les métadonnées "
-"dans le contenu des pages. Par défaut, cela désactive la création de flux."
+"metadata. This also turns off generation of any feeds."
+msgstr "`quick` - Construire l'archive en mode rapide, sans chercher les métadonnées dans le contenu des pages. Cela désactive la création de flux."
 
 #. type: Bullet: '* '
 msgid ""
@@ -389,3 +379,20 @@ msgstr ""
 "Une directive apparentée à cette directive est [[ikiwiki/directive/"
 "edittemplate]], qui permet d'indiquer un texte par défaut pour la nouvelle "
 "page."
+
+#~ msgid ""
+#~ "`sort` - Controls how inlined pages are sorted. The default, \"age\" is "
+#~ "to sort newest created pages first. Setting it to \"title\" will sort "
+#~ "pages by title, and \"mtime\" sorts most recently modified pages first. "
+#~ "If [[!cpan Sort::Naturally]] is installed, `sort` can be set to "
+#~ "\"title_natural\" to sort by title with numbers treated as such (\"1 2 9 "
+#~ "10 20\" instead of \"1 10 2 20 9\")."
+#~ msgstr ""
+#~ "`sort` - Ce paramètre contrôle la façon de trier les pages reliées. Avec "
+#~ "le critère par défaut, \"age\", les pages les plus récentes sont classées "
+#~ "en premier.  Avec le critère \"title\", les pages seront classées par "
+#~ "titre. Avec le critère \"mtime\", les pages les plus récemment modifiées "
+#~ "seront classées en premier. Si le module [[!cpan Sort::Naturally]] est "
+#~ "installé, on peut utiliser le critère \"title_natural\" pour trier par "
+#~ "titre avec nombres ordonnés numériquement (\"1 2 9 10 20\" au lieu de \"1 "
+#~ "10 2 20 9\")."
diff --git a/po/underlays/directives/ikiwiki/directive/linkmap.da.po b/po/underlays/directives/ikiwiki/directive/linkmap.da.po
index 4c6b02478..a55d73c6e 100644
--- a/po/underlays/directives/ikiwiki/directive/linkmap.da.po
+++ b/po/underlays/directives/ikiwiki/directive/linkmap.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -40,11 +40,7 @@ msgstr "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n"
 msgid ""
 "Only links between mapped pages will be shown; links pointing to or from "
 "unmapped pages will be omitted. If the pages to include are not specified, "
-"the links between all pages (and other files) in the wiki are mapped. For "
-"best results, only a small set of pages should be mapped, since otherwise "
-"the map can become very large, unwieldy, and complicated. Also, the map is "
-"rebuilt whenever one of the mapped pages is changed, which can make the wiki "
-"a bit slow."
+"the links between all pages (and other files) in the wiki are mapped."
 msgstr ""
 
 #. type: Plain text
@@ -64,6 +60,22 @@ msgid ""
 "the map's size is not limited."
 msgstr ""
 
+#. type: Bullet: '* '
+msgid ""
+"`connected` - Controls whether to include pages on the map that link to no "
+"other pages (connected=no, the default), or to only show pages that link to "
+"others (connected=yes)."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"For best results, only a small set of pages should be mapped, since "
+"otherwise the map can become very large, unwieldy, and complicated.  If too "
+"many pages are included, the map may get so large that graphviz cannot "
+"render it. Using the `connected` parameter is a good way to prune out pages "
+"that clutter the map."
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/linkmap.fr.po b/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
index 7d73de65b..a129121ff 100644
--- a/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-11 21:16+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"PO-Revision-Date: 2010-07-17 15:53+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,18 @@ msgstr ""
 msgid ""
 "The `linkmap` directive is supplied by the [[!iki plugins/linkmap "
 "desc=linkmap]] plugin."
-msgstr "\"La directive `linkmap` est fournie par le module d'extension [[!iki plugins/linkmap desc=linkmap]]."
+msgstr ""
+"\"La directive `linkmap` est fournie par le module d'extension [[!iki "
+"plugins/linkmap desc=linkmap]]."
 
 #. type: Plain text
 msgid ""
 "This directive uses [graphviz](http://www.graphviz.org/) to generate a graph "
 "showing the links between a set of pages in the wiki. Example usage:"
-msgstr "Cette directive utilise le programme [graphviz](http://www.graphviz.org/) pour créer un graphique montrant les liens existants entre certaines pages du wiki. Par exemple :"
+msgstr ""
+"Cette directive utilise le programme [graphviz](http://www.graphviz.org/) "
+"pour créer un graphique montrant les liens existants entre certaines pages "
+"du wiki. Par exemple :"
 
 #. type: Plain text
 #, no-wrap
@@ -31,15 +36,19 @@ msgid "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n"
 msgstr "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n"
 
 #. type: Plain text
+#| msgid ""
+#| "Only links between mapped pages will be shown; links pointing to or from "
+#| "unmapped pages will be omitted. If the pages to include are not "
+#| "specified, the links between all pages (and other files) in the wiki are "
+#| "mapped. For best results, only a small set of pages should be mapped, "
+#| "since otherwise the map can become very large, unwieldy, and complicated. "
+#| "Also, the map is rebuilt whenever one of the mapped pages is changed, "
+#| "which can make the wiki a bit slow."
 msgid ""
 "Only links between mapped pages will be shown; links pointing to or from "
 "unmapped pages will be omitted. If the pages to include are not specified, "
-"the links between all pages (and other files) in the wiki are mapped. For "
-"best results, only a small set of pages should be mapped, since otherwise "
-"the map can become very large, unwieldy, and complicated. Also, the map is "
-"rebuilt whenever one of the mapped pages is changed, which can make the wiki "
-"a bit slow."
-msgstr "Seuls les liens entre les pages recherchées sont montrés. Des liens existants entre des pages non recherchées sont ignorés. Si les pages à rechercher ne sont pas spécifiées, les liens entre toutes les pages (et tous les fichiers) du wiki seront affichés. Pour des résultats corrects, il vaut mieux définir l'ensemble des pages à rechercher. Sinon, le diagramme deviendra très grand, illisible et compliqué. De plus le diagramme est reconstruit à chaque modification d'une page faisant partie de l'ensemble, ce qui peut rendre le wiki un peu lent."
+"the links between all pages (and other files) in the wiki are mapped."
+msgstr "Seuls les liens entre les pages recherchées sont montrés. Des liens existants entre des pages non recherchées sont ignorés. Si les pages à rechercher ne sont pas spécifiées, les liens entre toutes les pages (et tous les fichiers) du wiki seront affichés."
 
 #. type: Plain text
 msgid ""
@@ -49,14 +58,34 @@ msgstr "Voici la description des paramètres de la directive `linkmap` :"
 
 #. type: Bullet: '* '
 msgid "`pages` - A [[ikiwiki/PageSpec]] of the pages to map."
-msgstr "`pages` - Une spécification [[ikiwiki/PageSpec]] des pages à rechercher."
+msgstr ""
+"`pages` - Une spécification [[ikiwiki/PageSpec]] des pages à rechercher."
 
 #. type: Bullet: '* '
 msgid ""
 "`height`, `width` - Limit the size of the map to a given height and width, "
 "in inches. Both must be specified for the limiting to take effect, otherwise "
 "the map's size is not limited."
-msgstr "`height`, `width` - Ces paramètres limitent la taille du diagramme, avec une hauteur et une largeur exprimées en pouce. Vous devez les indiquer tous les deux. Sinon le programme choisira une valeur sans limites."
+msgstr ""
+"`height`, `width` - Ces paramètres limitent la taille du diagramme, avec une "
+"hauteur et une largeur exprimées en pouce. Vous devez les indiquer tous les "
+"deux. Sinon le programme choisira une valeur sans limites."
+
+#. type: Bullet: '* '
+msgid ""
+"`connected` - Controls whether to include pages on the map that link to no "
+"other pages (connected=no, the default), or to only show pages that link to "
+"others (connected=yes)."
+msgstr " `connected` - permet d'indiquer si l'on inclut les pages sans lien à d'autres pages (connected=no, par défaut), ou si l'on ne montre que les pages liées à d'autres pages (connected=yes)."
+
+#. type: Plain text
+msgid ""
+"For best results, only a small set of pages should be mapped, since "
+"otherwise the map can become very large, unwieldy, and complicated.  If too "
+"many pages are included, the map may get so large that graphviz cannot "
+"render it. Using the `connected` parameter is a good way to prune out pages "
+"that clutter the map."
+msgstr "Pour des résultats corrects, il vaut mieux définir l'ensemble des pages à rechercher. Sinon, le diagramme deviendra très grand, illisible et compliqué. Si l'on inclut trop de pages, le diagramme deviendra si grand que graphviz ne pourra pas l'afficher. Le paramètre `connected` permet de se débarrasser des pages qui emcombrent le diagramme."
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/map.da.po b/po/underlays/directives/ikiwiki/directive/map.da.po
index 00caaeb97..cdecbde1a 100644
--- a/po/underlays/directives/ikiwiki/directive/map.da.po
+++ b/po/underlays/directives/ikiwiki/directive/map.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -52,6 +52,12 @@ msgstr ""
 msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
 msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
 
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n"
+msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
+
 #. type: Plain text
 msgid ""
 "Hint: To limit the map to displaying pages less than a certain level deep, "
diff --git a/po/underlays/directives/ikiwiki/directive/map.fr.po b/po/underlays/directives/ikiwiki/directive/map.fr.po
index d1f4ee0c1..4e0e4b88e 100644
--- a/po/underlays/directives/ikiwiki/directive/map.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/map.fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-06 09:09+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"PO-Revision-Date: 2010-07-17 15:27+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\\n\"\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -56,6 +56,12 @@ msgstr ""
 msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
 msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
 
+#. type: Plain text
+#, no-wrap
+#| msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n"
+msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n"
+
 #. type: Plain text
 msgid ""
 "Hint: To limit the map to displaying pages less than a certain level deep, "
diff --git a/po/underlays/directives/ikiwiki/directive/meta.da.po b/po/underlays/directives/ikiwiki/directive/meta.da.po
index 08fdc9c0a..294ff32e6 100644
--- a/po/underlays/directives/ikiwiki/directive/meta.da.po
+++ b/po/underlays/directives/ikiwiki/directive/meta.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -75,6 +76,23 @@ msgid ""
 "  differently in this case.\n"
 msgstr ""
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  An optional `sortas` parameter will be used preferentially when\n"
+"  [[ikiwiki/pagespec/sorting]] by `meta(title)`:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"The Beatles\" sortas=\"Beatles, The\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"David Bowie\" sortas=\"Bowie, David\"]]\n"
+msgstr ""
+
 #. type: Bullet: '* '
 msgid "license"
 msgstr "license"
@@ -106,6 +124,18 @@ msgstr "author"
 msgid "  Specifies the author of a page.\n"
 msgstr ""
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  An optional `sortas` parameter will be used preferentially when\n"
+"  [[ikiwiki/pagespec/sorting]] by `meta(author)`:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta author=\"Joey Hess\" sortas=\"Hess, Joey\"]]\n"
+msgstr ""
+
 #. type: Bullet: '* '
 msgid "authorurl"
 msgstr "authorurl"
@@ -122,8 +152,8 @@ msgstr "description"
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  Specifies a \"description\" of the page. You could use this to provide\n"
-"  a summary, for example, to be picked up by the [[map]] directive.\n"
+"  Specifies a short description for the page. This will be put in\n"
+"  the html header, and can also be displayed by eg, the [[map]] directive.\n"
 msgstr ""
 
 #. type: Bullet: '* '
diff --git a/po/underlays/directives/ikiwiki/directive/meta.de.po b/po/underlays/directives/ikiwiki/directive/meta.de.po
index 47415c306..214055096 100644
--- a/po/underlays/directives/ikiwiki/directive/meta.de.po
+++ b/po/underlays/directives/ikiwiki/directive/meta.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 14:04+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,8 +19,8 @@ msgid ""
 "The `meta` directive is supplied by the [[!iki plugins/meta desc=meta]] "
 "plugin."
 msgstr ""
-"Die `meta`-Anweisung wird durch die [[!iki plugins/meta desc=meta]]-Erweiterung "
-"bereitgestellt."
+"Die `meta`-Anweisung wird durch die [[!iki plugins/meta desc=meta]]-"
+"Erweiterung bereitgestellt."
 
 #. type: Plain text
 msgid ""
@@ -43,16 +44,17 @@ msgid ""
 "The first form sets a given field to a given value, while the second form "
 "also specifies some additional sub-parameters."
 msgstr ""
-"In der ersten Form wird das angegebene Feld auf den angegebenen Wert gesetzt. In "
-"der zweiten Form werden zusätzlich einige Unter-Parameter angegeben."
+"In der ersten Form wird das angegebene Feld auf den angegebenen Wert "
+"gesetzt. In der zweiten Form werden zusätzlich einige Unter-Parameter "
+"angegeben."
 
 #. type: Plain text
 msgid ""
 "The field values are treated as HTML entity-escaped text, so you can include "
 "a quote in the text by writing `&quot;` and so on."
 msgstr ""
-"Die Feldwerte können HTML-Entities enthalten, zum Beispiel kann durch `&quot;` "
-"ein Anführungszeichen eingefügt werden."
+"Die Feldwerte können HTML-Entities enthalten, zum Beispiel kann durch `&quot;"
+"` ein Anführungszeichen eingefügt werden."
 
 #. type: Plain text
 msgid "Supported fields:"
@@ -74,16 +76,31 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  Note that if the title is overridden, a \"title_overridden\" variable "
-"will\n"
-"  be set to a true value in the template; this can be used to format "
-"things\n"
+"  Note that if the title is overridden, a \"title_overridden\" variable will\n"
+"  be set to a true value in the template; this can be used to format things\n"
 "  differently in this case.\n"
 msgstr ""
 "  Wenn der Titel so überschrieben wird, wird die Template-Variable\n"
 "  `title_overridden` auf wahr gesetzt. Eine Vorlage kann in diesem\n"
 "  Fall eine andere Darstellung wählen.\n"
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  An optional `sortas` parameter will be used preferentially when\n"
+"  [[ikiwiki/pagespec/sorting]] by `meta(title)`:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"The Beatles\" sortas=\"Beatles, The\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"David Bowie\" sortas=\"Bowie, David\"]]\n"
+msgstr ""
+
 #. type: Bullet: '* '
 msgid "license"
 msgstr "`license`"
@@ -120,6 +137,18 @@ msgstr "`author`"
 msgid "  Specifies the author of a page.\n"
 msgstr "  Gibt den Autor der Seite an.\n"
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  An optional `sortas` parameter will be used preferentially when\n"
+"  [[ikiwiki/pagespec/sorting]] by `meta(author)`:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta author=\"Joey Hess\" sortas=\"Hess, Joey\"]]\n"
+msgstr ""
+
 #. type: Bullet: '* '
 msgid "authorurl"
 msgstr "`authorurl`"
@@ -254,8 +283,7 @@ msgstr "`link`"
 #, no-wrap
 msgid ""
 "  Specifies a link to another page. This can be used as a way to make the\n"
-"  wiki treat one page as linking to another without displaying a "
-"user-visible\n"
+"  wiki treat one page as linking to another without displaying a user-visible\n"
 "  [[ikiwiki/WikiLink]]:\n"
 msgstr ""
 "  Gibt einen Link zu einer anderen Seite an. Auf diese Weise kann das Wiki\n"
@@ -277,20 +305,14 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"       \\[[!meta link=\"http://joeyh.myopenid.com/\" "
-"rel=\"openid.delegate\"]]\n"
-msgstr ""
-"       \\[[!meta link=\"http://joeyh.myopenid.com/\" "
-"rel=\"openid.delegate\"]]\n"
+msgid "       \\[[!meta link=\"http://joeyh.myopenid.com/\" rel=\"openid.delegate\"]]\n"
+msgstr "       \\[[!meta link=\"http://joeyh.myopenid.com/\" rel=\"openid.delegate\"]]\n"
 
 #. type: Plain text
-#:
 #, no-wrap
 msgid ""
 "  However, this latter syntax won't be allowed if the \n"
-"  [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled, since "
-"it can be used to\n"
+"  [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled, since it can be used to\n"
 "  insert unsafe content.\n"
 msgstr ""
 "  Allerdings ist diese zweite Syntax nicht erlaubt, wenn die\n"
@@ -335,12 +357,12 @@ msgstr "  \t\\[[!meta redir=\"http://beispiel.de/\"]]\n"
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  For both cases, an anchor to jump to inside the destination page may also "
-"be\n"
+"  For both cases, an anchor to jump to inside the destination page may also be\n"
 "  specified using the common `#ANCHOR` syntax.\n"
 msgstr ""
 "  In beiden Fällen kann ein anzuspringender Anker auf der Zielseite\n"
-"  angegeben werden, indem die übliche `#ANKER`-Syntax verwendet wird.\n "
+"  angegeben werden, indem die übliche `#ANKER`-Syntax verwendet wird.\n"
+" "
 
 #. type: Bullet: '* '
 msgid "robots"
@@ -359,10 +381,8 @@ msgstr "        \\[[!meta robots=\"index, nofollow\"]]\n"
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  Valid values for the attribute are: \"index\", \"noindex\", \"follow\", "
-"and\n"
-"  \"nofollow\". Multiple comma-separated values are allowed, but obviously "
-"only\n"
+"  Valid values for the attribute are: \"index\", \"noindex\", \"follow\", and\n"
+"  \"nofollow\". Multiple comma-separated values are allowed, but obviously only\n"
 "  some combinations make sense. If there is no robots meta tag, \"index,\n"
 "  follow\" is used as the default.\n"
 msgstr ""
@@ -387,8 +407,7 @@ msgid ""
 "  Specifies a globally unique ID for a page. This guid should be a URI\n"
 "  (in particular, it can be `urn:uuid:` followed by a UUID, as per\n"
 "  [[!rfc 4122]]), and it will be used to identify the page's entry in RSS\n"
-"  and Atom feeds. If not given, the default is to use the page's URL as "
-"its\n"
+"  and Atom feeds. If not given, the default is to use the page's URL as its\n"
 "  guid.\n"
 msgstr ""
 "  Gibt eine global einmalige ID für die Seite an. Diese guid sollte eine\n"
@@ -418,10 +437,8 @@ msgstr "`updated`"
 msgid ""
 "  Specifies a fake modification time for a page, to be output into RSS and\n"
 "  Atom feeds. This is useful to avoid flooding aggregators that sort by\n"
-"  modification time, like Planet: for instance, when editing an old blog "
-"post\n"
-"  to add tags, you could set `updated` to be one second later than the "
-"original\n"
+"  modification time, like Planet: for instance, when editing an old blog post\n"
+"  to add tags, you could set `updated` to be one second later than the original\n"
 "  value. The date/time can be given in any format that\n"
 "  [[!cpan TimeDate]] can understand, just like the `date` field.\n"
 msgstr ""
@@ -441,15 +458,13 @@ msgid ""
 "won't be allowed if the [[!iki plugins/htmlscrubber desc=htmlscrubber]] "
 "plugin is enabled, since it can be used to insert unsafe content."
 msgstr ""
-"Wenn das Feld nicht eines der oben vordefinierten ist, werden die Metadaten als "
-"&lt;meta&gt;-Header in die generierte Seite geschrieben. Dies ist allerdings "
-"nicht erlaubt, wenn die [[!iki plugins/htmlscrubber "
-"desc=htmlscrubber]]-Erweiterung aktiv ist, da auf diese Weise unsichere Inhalte "
-"eingefügt werden können."
+"Wenn das Feld nicht eines der oben vordefinierten ist, werden die Metadaten "
+"als &lt;meta&gt;-Header in die generierte Seite geschrieben. Dies ist "
+"allerdings nicht erlaubt, wenn die [[!iki plugins/htmlscrubber "
+"desc=htmlscrubber]]-Erweiterung aktiv ist, da auf diese Weise unsichere "
+"Inhalte eingefügt werden können."
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-
diff --git a/po/underlays/directives/ikiwiki/directive/meta.fr.po b/po/underlays/directives/ikiwiki/directive/meta.fr.po
index a8039c04f..728955b24 100644
--- a/po/underlays/directives/ikiwiki/directive/meta.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/meta.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-06 08:44+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"PO-Revision-Date: 2010-07-17 15:30+0200\n"
 "Last-Translator:  Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -81,6 +82,23 @@ msgstr ""
 "  Si le titre est remplacé, une variable « title_overridden » est définie avec une valeur *true*\n"
 "  dans le modèle de page. On peut se servir de cette variable pour formater le texte différemment.\n"
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  An optional `sortas` parameter will be used preferentially when\n"
+"  [[ikiwiki/pagespec/sorting]] by `meta(title)`:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"The Beatles\" sortas=\"Beatles, The\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"David Bowie\" sortas=\"Bowie, David\"]]\n"
+msgstr ""
+
 #. type: Bullet: '* '
 msgid "license"
 msgstr "license"
@@ -116,6 +134,18 @@ msgstr "author"
 msgid "  Specifies the author of a page.\n"
 msgstr "  L'auteur de la page.\n"
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  An optional `sortas` parameter will be used preferentially when\n"
+"  [[ikiwiki/pagespec/sorting]] by `meta(author)`:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta author=\"Joey Hess\" sortas=\"Hess, Joey\"]]\n"
+msgstr ""
+
 #. type: Bullet: '* '
 msgid "authorurl"
 msgstr "authorurl"
@@ -132,11 +162,11 @@ msgstr "description"
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  Specifies a \"description\" of the page. You could use this to provide\n"
-"  a summary, for example, to be picked up by the [[map]] directive.\n"
+"  Specifies a short description for the page. This will be put in\n"
+"  the html header, and can also be displayed by eg, the [[map]] directive.\n"
 msgstr ""
-"  Donne une « description » de la page. On peut s'en servir pour donner un résumé,\n"
-"  qui sera utilisé par la directive [[map]].\n"
+"  Donne une courte description de la page qui sera placée dans l'en-tête html \n"
+"  et qui peut être affichée par la directive [[map]].\n"
 
 #. type: Bullet: '* '
 msgid "permalink"
@@ -404,7 +434,12 @@ msgid ""
 "written to the generated html page as a &lt;meta&gt; header. However, this "
 "won't be allowed if the [[!iki plugins/htmlscrubber desc=htmlscrubber]] "
 "plugin is enabled, since it can be used to insert unsafe content."
-msgstr "Si le paramètre n'est pas l'un de ceux définis précédemment, les metadonnées seront écrites sur la page HTML créée sous forme d' en-tête &lt;meta&gt;. Cependant cette expression ne sera pas permise si le greffon [[!iki plugins/htmlscrubber desc=htmlscrubber]] est activé, car il permet d'insérer des contenus non sécurisés."
+msgstr ""
+"Si le paramètre n'est pas l'un de ceux définis précédemment, les métadonnées "
+"seront écrites sur la page HTML créée sous forme d'en-tête &lt;meta&gt;. "
+"Cependant cette expression ne sera pas permise si le greffon [[!iki plugins/"
+"htmlscrubber desc=htmlscrubber]] est activé, car il permet d'insérer des "
+"contenus non sécurisés."
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.da.po b/po/underlays/directives/ikiwiki/directive/pagestats.da.po
index 6514e4e22..f84eb00eb 100644
--- a/po/underlays/directives/ikiwiki/directive/pagestats.da.po
+++ b/po/underlays/directives/ikiwiki/directive/pagestats.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 18:54-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-msgid "Here's how to use it to create a [[tag]] cloud:"
+msgid ""
+"Here's how to use it to create a [[tag]] cloud, with tags sized based on "
+"frequency of use:"
 msgstr ""
 
 #. type: Plain text
@@ -41,6 +44,18 @@ msgstr ""
 msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 
+#. type: Plain text
+msgid ""
+"Here's how to create a list of tags, sized by use as they would be in a "
+"cloud."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+msgid "\t\\[[!pagestats style=\"list\" pages=\"tags/*\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+
 #. type: Plain text
 msgid "And here's how to create a table of all the pages on the wiki:"
 msgstr "Og sådan her dannes en tabel over alle sider i wikien:"
@@ -52,9 +67,9 @@ msgstr "\t\\[[!pagestats style=\"table\"]]\n"
 
 #. type: Plain text
 msgid ""
-"The optional `among` parameter limits counting to pages that match a "
-"[[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog "
-"entries, you could use:"
+"The optional `among` parameter limits the pages whose outgoing links are "
+"considered. For instance, to display a cloud of tags used on blog entries, "
+"while ignoring other pages that use those tags, you could use:"
 msgstr ""
 
 #. type: Plain text
@@ -64,7 +79,7 @@ msgid "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n"
 msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 
 #. type: Plain text
-msgid "or to display a cloud of tags related to Linux, you could use:"
+msgid "Or to display a cloud of tags related to Linux, you could use:"
 msgstr ""
 
 #. type: Plain text
@@ -73,6 +88,25 @@ msgstr ""
 msgid "\t\\[[!pagestats pages=\"tags/* and not tags/linux\" among=\"tagged(linux)\"]]\n"
 msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 
+#. type: Plain text
+msgid ""
+"The optional `show` parameter limits display to the specified number of "
+"pages. For instance, to show a table of the top ten pages with the most "
+"links:"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\t\\[[!pagestats style=\"table\"]]\n"
+msgid "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
+msgstr "\t\\[[!pagestats style=\"table\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The optional `class` parameter can be used to control the class of the "
+"generated tag cloud `div` or page stats `table`."
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.de.po b/po/underlays/directives/ikiwiki/directive/pagestats.de.po
index 86ce00d9b..96c0507a4 100644
--- a/po/underlays/directives/ikiwiki/directive/pagestats.de.po
+++ b/po/underlays/directives/ikiwiki/directive/pagestats.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 14:05+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +33,11 @@ msgstr ""
 "den Häufigkeiten, wie oft auf die einzelnen Seiten verwiesen wurde."
 
 #. type: Plain text
-msgid "Here's how to use it to create a [[tag]] cloud:"
+#, fuzzy
+#| msgid "Here's how to use it to create a [[tag]] cloud:"
+msgid ""
+"Here's how to use it to create a [[tag]] cloud, with tags sized based on "
+"frequency of use:"
 msgstr "So kann eine [[tag]]-Wolke erzeugt werden:"
 
 #. type: Plain text
@@ -40,6 +45,18 @@ msgstr "So kann eine [[tag]]-Wolke erzeugt werden:"
 msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 
+#. type: Plain text
+msgid ""
+"Here's how to create a list of tags, sized by use as they would be in a "
+"cloud."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+msgid "\t\\[[!pagestats style=\"list\" pages=\"tags/*\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+
 #. type: Plain text
 msgid "And here's how to create a table of all the pages on the wiki:"
 msgstr "Und so kann eine Tabelle mit allen Seiten im Wiki erzeugt werden:"
@@ -70,12 +87,8 @@ msgstr "Oder um eine Wolke mit Tags anzuzeigen, die mit Linux verwandt sind:"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"\t\\[[!pagestats pages=\"tags/* and not tags/linux\" "
-"among=\"tagged(linux)\"]]\n"
-msgstr ""
-"\t\\[[!pagestats pages=\"tags/* and not tags/linux\" "
-"among=\"tagged(linux)\"]]\n"
+msgid "\t\\[[!pagestats pages=\"tags/* and not tags/linux\" among=\"tagged(linux)\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/* and not tags/linux\" among=\"tagged(linux)\"]]\n"
 
 #. type: Plain text
 msgid ""
@@ -83,17 +96,22 @@ msgid ""
 "pages. For instance, to show a table of the top ten pages with the most "
 "links:"
 msgstr ""
-"Der optionale Parameter `show` zeigt nur die angegebene Anzahl von Seiten an."
-" Zum Beispiel kann man eine Tabelle mit den zehn häufigsten Links anzeigen:"
+"Der optionale Parameter `show` zeigt nur die angegebene Anzahl von Seiten "
+"an. Zum Beispiel kann man eine Tabelle mit den zehn häufigsten Links "
+"anzeigen:"
 
 #. type: Plain text
 #, no-wrap
 msgid "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
 msgstr "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
 
+#. type: Plain text
+msgid ""
+"The optional `class` parameter can be used to control the class of the "
+"generated tag cloud `div` or page stats `table`."
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-
diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.fr.po b/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
index 11c3a0b8b..7201edc6e 100644
--- a/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-12 12:02+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"PO-Revision-Date: 2010-07-17 11:31+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -17,17 +18,26 @@ msgstr ""
 msgid ""
 "The `pagestats` directive is supplied by the [[!iki plugins/pagestats "
 "desc=pagestats]] plugin."
-msgstr "La directive `pagestats` est fournie par le module d'extension [[!iki plugins/pagestats desc=pagestats]]."
+msgstr ""
+"La directive `pagestats` est fournie par le module d'extension [[!iki "
+"plugins/pagestats desc=pagestats]]."
 
 #. type: Plain text
 msgid ""
 "This directive can generate stats about how pages link to each other. It can "
 "produce either a tag cloud, or a table counting the number of links to each "
 "page."
-msgstr "Cette directive permet de créer des statistiques sur les pages et la façon dont elles sont liées. Elle affiche soit un nuage d'étiquettes, soit un tableau montrant le nombre de liens de chaque page."
+msgstr ""
+"Cette directive permet de créer des statistiques sur les pages et la façon "
+"dont elles sont liées. Elle affiche soit un nuage d'étiquettes, soit un "
+"tableau montrant le nombre de liens de chaque page."
 
 #. type: Plain text
-msgid "Here's how to use it to create a [[tag]] cloud:"
+#, fuzzy
+#| msgid "Here's how to use it to create a [[tag]] cloud:"
+msgid ""
+"Here's how to use it to create a [[tag]] cloud, with tags sized based on "
+"frequency of use:"
 msgstr "Voici comment afficher un nuage d'étiquettes [[tag]] :"
 
 #. type: Plain text
@@ -35,9 +45,21 @@ msgstr "Voici comment afficher un nuage d'étiquettes [[tag]] :"
 msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 
+#. type: Plain text
+msgid ""
+"Here's how to create a list of tags, sized by use as they would be in a "
+"cloud."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+msgid "\t\\[[!pagestats style=\"list\" pages=\"tags/*\"]]\n"
+msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+
 #. type: Plain text
 msgid "And here's how to create a table of all the pages on the wiki:"
-msgstr "Et voici comment créer le tableau :"
+msgstr "Et voici comment créer un tableau de toutes les pages du wiki :"
 
 #. type: Plain text
 #, no-wrap
@@ -46,10 +68,14 @@ msgstr "\t\\[[!pagestats style=\"table\"]]\n"
 
 #. type: Plain text
 msgid ""
-"The optional `among` parameter limits counting to pages that match a "
-"[[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog "
-"entries, you could use:"
-msgstr "Le paramètre facultatif `among` permet d'utiliser une spécification [[ikiwiki/PageSpec]] pour limiter l'ensemble des pages à compter. Par exemple, pour afficher un nuage avec les étiquettes utilisées dans un blog, on peut écrire : "
+"The optional `among` parameter limits the pages whose outgoing links are "
+"considered. For instance, to display a cloud of tags used on blog entries, "
+"while ignoring other pages that use those tags, you could use:"
+msgstr ""
+"Le paramètre facultatif `among` permet de limiter l'ensemble des pages à "
+"considérer. Par exemple, pour afficher un nuage avec les étiquettes "
+"utilisées dans un blog, tout en ignorant les autres pages qui ont ces "
+"étiquettes, on peut écrire : "
 
 #. type: Plain text
 #, no-wrap
@@ -57,14 +83,36 @@ msgid "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n"
 msgstr "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n"
 
 #. type: Plain text
-msgid "or to display a cloud of tags related to Linux, you could use:"
-msgstr "Pour afficher un nuage avec les étiquettes consacrées à Linux, écrivez :"
+msgid "Or to display a cloud of tags related to Linux, you could use:"
+msgstr ""
+"Pour afficher un nuage avec les étiquettes consacrées à Linux, écrivez :"
 
 #. type: Plain text
 #, no-wrap
 msgid "\t\\[[!pagestats pages=\"tags/* and not tags/linux\" among=\"tagged(linux)\"]]\n"
 msgstr "\t\\[[!pagestats pages=\"tags/* and not tags/linux\" among=\"tagged(linux)\"]]\n"
 
+#. type: Plain text
+msgid ""
+"The optional `show` parameter limits display to the specified number of "
+"pages. For instance, to show a table of the top ten pages with the most "
+"links:"
+msgstr ""
+"Le paramètre optionnel `show` permet d'afficher un nombre déterminé de "
+"pages. Par exemple, pour afficher les dix premières pages en terme de nombre "
+"de liens : "
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
+msgstr "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The optional `class` parameter can be used to control the class of the "
+"generated tag cloud `div` or page stats `table`."
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/pagetemplate.da.po b/po/underlays/directives/ikiwiki/directive/pagetemplate.da.po
index 0db08355e..99a044fdf 100644
--- a/po/underlays/directives/ikiwiki/directive/pagetemplate.da.po
+++ b/po/underlays/directives/ikiwiki/directive/pagetemplate.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,18 +28,16 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"This directive allows a page to be created using a different wikitemplates.  "
-"The page text is inserted into the template, so the template controls the "
-"overall look and feel of the wiki page. This is in contrast to the [[ikiwiki/"
-"directive/template]] directive, which allows inserting templates _into_ the "
-"body of a page."
+"This directive allows a page to be displayed using a different [[template|"
+"templates]] than the default `page.tmpl` template."
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"This directive can only reference templates that are already installed by "
-"the system administrator, typically into the `/usr/share/ikiwiki/templates` "
-"directory. Example:"
+"The page text is inserted into the template, so the template controls the "
+"overall look and feel of the wiki page. This is in contrast to the [[ikiwiki/"
+"directive/template]] directive, which allows inserting templates _into_ the "
+"body of a page."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po
index 71ea68e81..11ed44e72 100644
--- a/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po
+++ b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 14:05+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,9 +23,13 @@ msgstr ""
 "desc=pagetemplate]]-Erweiterung bereitgestellt."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This directive allows a page to be displayed using a different template "
+#| "than the default `page.tmpl` template."
 msgid ""
-"This directive allows a page to be displayed using a different template than "
-"the default `page.tmpl` template."
+"This directive allows a page to be displayed using a different [[template|"
+"templates]] than the default `page.tmpl` template."
 msgstr ""
 "Diese Anweisung erlaubt es, für eine Seite eine andere als die "
 "voreingestellte Vorlage `page.tmpl` zu verwenden."
@@ -32,25 +37,15 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The page text is inserted into the template, so the template controls the "
-"overall look and feel of the wiki page. This is in contrast to the "
-"[[ikiwiki/directive/template]] directive, which allows inserting templates "
-"_into_ the body of a page."
+"overall look and feel of the wiki page. This is in contrast to the [[ikiwiki/"
+"directive/template]] directive, which allows inserting templates _into_ the "
+"body of a page."
 msgstr ""
 "Der Seiteninhalt wird in die Vorlage eingefügt, die Vorlage steuert also das "
 "allgemeine Erscheinungsbild der Seite. Im Gegensatz dazu erlaubt die "
 "[[ikiwiki/directive/template]]-Anweisung, Vorlagen _in_ den Text einer Seite "
 "einzufügen."
 
-#. type: Plain text
-msgid ""
-"This directive can only reference templates that are already installed by "
-"the system administrator, typically into the `/usr/share/ikiwiki/templates` "
-"directory. Example:"
-msgstr ""
-"Diese Anweisung kann nur auf Vorlagen zurückgreifen, die bereits durch den "
-"Systemadministrator installiert wurden, typischerweise im Verzeichnis "
-"`/usr/share/ikiwiki/templates`. Beispiel:"
-
 #. type: Plain text
 #, no-wrap
 msgid "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n"
@@ -61,4 +56,11 @@ msgstr "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n"
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-
+#~ msgid ""
+#~ "This directive can only reference templates that are already installed by "
+#~ "the system administrator, typically into the `/usr/share/ikiwiki/"
+#~ "templates` directory. Example:"
+#~ msgstr ""
+#~ "Diese Anweisung kann nur auf Vorlagen zurückgreifen, die bereits durch "
+#~ "den Systemadministrator installiert wurden, typischerweise im Verzeichnis "
+#~ "`/usr/share/ikiwiki/templates`. Beispiel:"
diff --git a/po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po b/po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po
index 34a516344..1b404771f 100644
--- a/po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-12 12:17+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"PO-Revision-Date: 2010-07-16 11:43+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -17,23 +18,33 @@ msgstr ""
 msgid ""
 "The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate "
 "desc=pagetemplate]] plugin."
-msgstr "La directive `pagetemplate` est fournie par le module d'extension [[!iki plugins/pagetemplate desc=pagetemplate]]."
+msgstr ""
+"La directive `pagetemplate` est fournie par le module d'extension [[!iki "
+"plugins/pagetemplate desc=pagetemplate]]."
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This directive allows a page to be displayed using a different template "
+#| "than the default `page.tmpl` template."
+msgid ""
+"This directive allows a page to be displayed using a different [[template|"
+"templates]] than the default `page.tmpl` template."
+msgstr ""
+"Cette directive permet de créer des pages avec un modèle de page différent "
+"de celui utilisé par défaut, `page.tmpl`."
 
 #. type: Plain text
 msgid ""
-"This directive allows a page to be created using a different wikitemplates.  "
 "The page text is inserted into the template, so the template controls the "
 "overall look and feel of the wiki page. This is in contrast to the [[ikiwiki/"
 "directive/template]] directive, which allows inserting templates _into_ the "
 "body of a page."
-msgstr "Cette directive permet de créer des pages avec un modèle de page différent. Le texte de la page est inséré dans le modèle. Ainsi le modèle commande l'allure générale de la page. Cette directive agit différemment de la directive [[ikiwiki/directive/template]] qui permet d'insérer des modèles _à l'intérieur_ du corps d'une page."
-
-#. type: Plain text
-msgid ""
-"This directive can only reference templates that are already installed by "
-"the system administrator, typically into the `/usr/share/ikiwiki/templates` "
-"directory. Example:"
-msgstr "Cette directive ne peut appeler que des modèles déjà installés par l'administrateur, en général dans le répertoire `/usr/share/ikiwiki/templates`. Exemple :"
+msgstr ""
+"Le texte de la page est inséré dans le modèle. Ainsi le modèle commande "
+"l'allure générale de la page. Cette directive agit différemment de la "
+"directive [[ikiwiki/directive/template]] qui permet d'insérer des modèles _à "
+"l'intérieur_ du corps d'une page."
 
 #. type: Plain text
 #, no-wrap
@@ -44,3 +55,12 @@ msgstr "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n"
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#~ msgid ""
+#~ "This directive can only reference templates that are already installed by "
+#~ "the system administrator, typically into the `/usr/share/ikiwiki/"
+#~ "templates` directory. Example:"
+#~ msgstr ""
+#~ "Cette directive ne peut appeler que des modèles déjà installés par "
+#~ "l'administrateur, en général dans le répertoire `/usr/share/ikiwiki/"
+#~ "templates`. Exemple :"
diff --git a/po/underlays/directives/ikiwiki/directive/table.da.po b/po/underlays/directives/ikiwiki/directive/table.da.po
index 174ce1125..083f0175e 100644
--- a/po/underlays/directives/ikiwiki/directive/table.da.po
+++ b/po/underlays/directives/ikiwiki/directive/table.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,10 +43,15 @@ msgid "\t\\[[!table data=\"\"\"\n"
 msgstr "\t\\[[!table data=\"\"\"\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\tCustomer|Amount\n"
+#| "\tFulanito|134,34\n"
+#| "\tMenganito|234,56\n"
+#| "\tMenganito|234,56\n"
 msgid ""
-"\tCustomer|Amount\n"
-"\tFulanito|134,34\n"
+"\tCustomer |Amount\n"
+"\tFulanito |134,34\n"
 "\tMenganito|234,56\n"
 "\tMenganito|234,56\n"
 msgstr ""
@@ -115,6 +121,14 @@ msgid ""
 "  \"column\" to make the first column be the header.\n"
 msgstr ""
 
+#. type: Plain text
+msgid ""
+"For tab-delimited tables (often obtained by copying and pasting from HTML or "
+"a spreadsheet), `delimiter` must be set to a literal tab character. These "
+"are difficult to type in most web browsers - copying and pasting one from "
+"the table data is likely to be the easiest way."
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/table.de.po b/po/underlays/directives/ikiwiki/directive/table.de.po
index 6aaeef79f..131ecd1ae 100644
--- a/po/underlays/directives/ikiwiki/directive/table.de.po
+++ b/po/underlays/directives/ikiwiki/directive/table.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 14:08+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,8 +19,8 @@ msgid ""
 "The `table` directive is supplied by the [[!iki plugins/table desc=table]] "
 "plugin."
 msgstr ""
-"Die `table`-Anweisung wird durch die [[!iki plugins/table "
-"desc=table]]-Erweiterung bereitgestellt."
+"Die `table`-Anweisung wird durch die [[!iki plugins/table desc=table]]-"
+"Erweiterung bereitgestellt."
 
 #. type: Plain text
 msgid ""
@@ -35,16 +36,20 @@ msgid "examples"
 msgstr "Beispiele"
 
 #. type: Plain text
-#:
 #, no-wrap
 msgid "\t\\[[!table data=\"\"\"\n"
 msgstr "\t\\[[!table data=\"\"\"\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\tCustomer|Amount\n"
+#| "\tFulanito|134,34\n"
+#| "\tMenganito|234,56\n"
+#| "\tMenganito|234,56\n"
 msgid ""
-"\tCustomer|Amount\n"
-"\tFulanito|134,34\n"
+"\tCustomer |Amount\n"
+"\tFulanito |134,34\n"
 "\tMenganito|234,56\n"
 "\tMenganito|234,56\n"
 msgstr ""
@@ -55,12 +60,8 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"\t\\[[!table class=\"book_record\" format=csv "
-"file=\"data/books/record1\"]]\n"
-msgstr ""
-"\t\\[[!table class=\"book_record\" format=csv "
-"file=\"data/books/record1\"]]\n"
+msgid "\t\\[[!table class=\"book_record\" format=csv file=\"data/books/record1\"]]\n"
+msgstr "\t\\[[!table class=\"book_record\" format=csv file=\"data/books/record1\"]]\n"
 
 #. type: Plain text
 msgid "In this second example the `record1` page should be similar to:"
@@ -126,8 +127,7 @@ msgid ""
 "   DSV format uses a pipe (`|`), and CSV uses a comma (`,`).\n"
 "* `class` - A CSS class for the table html element.\n"
 "* `header` - By default, or if set to \"row\", the first data line is used\n"
-"  as the table header. Set it to \"no\" to make a table without a header, "
-"or\n"
+"  as the table header. Set it to \"no\" to make a table without a header, or\n"
 "  \"column\" to make the first column be the header.\n"
 msgstr ""
 "* `delimiter` - Das Zeichen, durch das die Zellen getrennt werden.\n"
@@ -139,9 +139,15 @@ msgstr ""
 "  Mit `no` wird eine Tabelle ohne Überschrift erzeugt, mit `column`\n"
 "  wird die erste Spalte als Überschrift verwendet.\n"
 
+#. type: Plain text
+msgid ""
+"For tab-delimited tables (often obtained by copying and pasting from HTML or "
+"a spreadsheet), `delimiter` must be set to a literal tab character. These "
+"are difficult to type in most web browsers - copying and pasting one from "
+"the table data is likely to be the easiest way."
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-
diff --git a/po/underlays/directives/ikiwiki/directive/table.fr.po b/po/underlays/directives/ikiwiki/directive/table.fr.po
index 479da205b..af9ddb1da 100644
--- a/po/underlays/directives/ikiwiki/directive/table.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/table.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-12 09:25+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -40,10 +41,15 @@ msgid "\t\\[[!table data=\"\"\"\n"
 msgstr "\t\\[[!table data=\"\"\"\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\tCustomer|Amount\n"
+#| "\tFulanito|134,34\n"
+#| "\tMenganito|234,56\n"
+#| "\tMenganito|234,56\n"
 msgid ""
-"\tCustomer|Amount\n"
-"\tFulanito|134,34\n"
+"\tCustomer |Amount\n"
+"\tFulanito |134,34\n"
 "\tMenganito|234,56\n"
 "\tMenganito|234,56\n"
 msgstr ""
@@ -129,6 +135,14 @@ msgstr ""
 "   comme en-tête du tableau. Si la valeur est \"no\", le tableau n'a pas d'en-tête et si la valeur\n"
 "   est \"column\", la première colonne constitue l'en-tête.\n"
 
+#. type: Plain text
+msgid ""
+"For tab-delimited tables (often obtained by copying and pasting from HTML or "
+"a spreadsheet), `delimiter` must be set to a literal tab character. These "
+"are difficult to type in most web browsers - copying and pasting one from "
+"the table data is likely to be the easiest way."
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/tag.da.po b/po/underlays/directives/ikiwiki/directive/tag.da.po
index 1bff7965c..c925e51b8 100644
--- a/po/underlays/directives/ikiwiki/directive/tag.da.po
+++ b/po/underlays/directives/ikiwiki/directive/tag.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,7 +64,8 @@ msgid ""
 "Note that if the wiki is configured to use a tagbase, then the tags will be "
 "located under a base directory, such as \"tags/\". This is a useful way to "
 "avoid having to write the full path to tags, if you want to keep them "
-"grouped together out of the way."
+"grouped together out of the way. Also, since ikiwiki then knows where to put "
+"tags, it will automatically create tag pages when new tags are used."
 msgstr ""
 
 #. type: Plain text
@@ -80,9 +82,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\t\\[[!tag ./foo]]\n"
+#| "\t\\[[!taglink /foo]]\n"
 msgid ""
-"\t\\[[!tag ./foo]]\n"
+"\t\\[[!tag /foo]]\n"
 "\t\\[[!taglink /foo]]\n"
 msgstr ""
 "\t\\[[!tag ./foo]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/tag.de.po b/po/underlays/directives/ikiwiki/directive/tag.de.po
index b33c3bcb0..527502f30 100644
--- a/po/underlays/directives/ikiwiki/directive/tag.de.po
+++ b/po/underlays/directives/ikiwiki/directive/tag.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 14:08+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,11 +66,18 @@ msgstr ""
 "\t\\[[!taglink markiert_als_foo|foo]]\n"
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Note that if the wiki is configured to use a tagbase, then the tags will "
+#| "be located under a base directory, such as \"tags/\". This is a useful "
+#| "way to avoid having to write the full path to tags, if you want to keep "
+#| "them grouped together out of the way."
 msgid ""
 "Note that if the wiki is configured to use a tagbase, then the tags will be "
 "located under a base directory, such as \"tags/\". This is a useful way to "
 "avoid having to write the full path to tags, if you want to keep them "
-"grouped together out of the way."
+"grouped together out of the way. Also, since ikiwiki then knows where to put "
+"tags, it will automatically create tag pages when new tags are used."
 msgstr ""
 "Wenn im Wiki eine zu verwendende `tagbase` konfiguriert ist, tauchen die "
 "Markierungen unterhalb dieses Verzeichnisses auf, etwa unter \"tags/\". Auf "
@@ -96,9 +104,12 @@ msgstr ""
 "werden soll, kann etwas wie das Folgende verwendet werden:"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\t\\[[!tag ./foo]]\n"
+#| "\t\\[[!taglink /foo]]\n"
 msgid ""
-"\t\\[[!tag ./foo]]\n"
+"\t\\[[!tag /foo]]\n"
 "\t\\[[!taglink /foo]]\n"
 msgstr ""
 "\t\\[[!tag ./foo]]\n"
@@ -108,5 +119,3 @@ msgstr ""
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-
diff --git a/po/underlays/directives/ikiwiki/directive/tag.fr.po b/po/underlays/directives/ikiwiki/directive/tag.fr.po
index 2a798bb1b..08981c785 100644
--- a/po/underlays/directives/ikiwiki/directive/tag.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/tag.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-01 16:20+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -62,11 +63,18 @@ msgstr ""
 "\t\\[[!taglink tagged_as_foo|foo]]\n"
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Note that if the wiki is configured to use a tagbase, then the tags will "
+#| "be located under a base directory, such as \"tags/\". This is a useful "
+#| "way to avoid having to write the full path to tags, if you want to keep "
+#| "them grouped together out of the way."
 msgid ""
 "Note that if the wiki is configured to use a tagbase, then the tags will be "
 "located under a base directory, such as \"tags/\". This is a useful way to "
 "avoid having to write the full path to tags, if you want to keep them "
-"grouped together out of the way."
+"grouped together out of the way. Also, since ikiwiki then knows where to put "
+"tags, it will automatically create tag pages when new tags are used."
 msgstr ""
 "Si le wiki utilise un répertoire d'étiquettes, les étiquettes seront alors "
 "dans un répertoire, comme « tags/ ». C'est une façon pratique d'éviter "
@@ -93,9 +101,12 @@ msgstr ""
 "pouvez écrire quelque chose comme ça :"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\t\\[[!tag ./foo]]\n"
+#| "\t\\[[!taglink /foo]]\n"
 msgid ""
-"\t\\[[!tag ./foo]]\n"
+"\t\\[[!tag /foo]]\n"
 "\t\\[[!taglink /foo]]\n"
 msgstr ""
 "\t\\[[!tag ./foo]]\n"
diff --git a/po/underlays/directives/ikiwiki/directive/template.da.po b/po/underlays/directives/ikiwiki/directive/template.da.po
index 92e317793..25c541325 100644
--- a/po/underlays/directives/ikiwiki/directive/template.da.po
+++ b/po/underlays/directives/ikiwiki/directive/template.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,14 +28,22 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"[[Templates]] are files that can be filled out and inserted into pages in "
-"the wiki, by using the template directive. The directive has an `id` "
-"parameter that identifies the template to use. The remaining parameters are "
-"used to fill out the template."
+"The template directive allows wiki pages to be used as templates.  These "
+"templates can be filled out and inserted into other pages in the wiki using "
+"the directive. The [[templates]] page lists templates that can be used with "
+"this directive."
 msgstr ""
 
 #. type: Plain text
-msgid "Example:"
+msgid ""
+"The directive has an `id` parameter that identifies the template to use. The "
+"remaining parameters are used to fill out the template."
+msgstr ""
+
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Example:"
+msgid "Example"
 msgstr "Eksempel:"
 
 #. type: Plain text
@@ -50,10 +59,129 @@ msgstr ""
 "Dette udfylder `note`-skabelonen, med `text`-feltet udfyldt med den angivne "
 "værdi, og indsætter resultatet på siden."
 
+#. type: Title ##
+#, no-wrap
+msgid "Using a template"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "\\[[Charley]]'s sister."
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "Really 8 and a half."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Creating a template"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The template is a regular wiki page, located in the `templates/` "
+"subdirectory inside the source directory of the wiki."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"(Alternatively, templates can be stored in a directory outside the wiki, as "
+"files with the extension \".tmpl\".  By default, these are searched for in `/"
+"usr/share/ikiwiki/templates`; the `templatedir` setting can be used to make "
+"another directory be searched first.)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+
+#. type: Plain text
+msgid "Here's a sample template:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        <span class=\"infobox\">\n"
+"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Age: <TMPL_VAR age><br />\n"
+"        <TMPL_IF color>\n"
+"        Favorite color: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF notes>\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
+msgstr ""
+
 #. type: Plain text
 msgid ""
-"For a list of available templates, and details about how to create more, see "
-"the [[templates]] page."
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator in "
+"the example above. This ensures that if the name contains something that "
+"might be mistaken for wiki markup, it's not converted to html before being "
+"processed as a [[ikiwiki/WikiLink]]."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/template.de.po b/po/underlays/directives/ikiwiki/directive/template.de.po
index faa2be614..f7652349f 100644
--- a/po/underlays/directives/ikiwiki/directive/template.de.po
+++ b/po/underlays/directives/ikiwiki/directive/template.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 14:09+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,10 +24,22 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"[[Templates]] are files that can be filled out and inserted into pages in "
-"the wiki, by using the template directive. The directive has an `id` "
-"parameter that identifies the template to use. The remaining parameters are "
-"used to fill out the template."
+"The template directive allows wiki pages to be used as templates.  These "
+"templates can be filled out and inserted into other pages in the wiki using "
+"the directive. The [[templates]] page lists templates that can be used with "
+"this directive."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "[[Templates]] are files that can be filled out and inserted into pages in "
+#| "the wiki, by using the template directive. The directive has an `id` "
+#| "parameter that identifies the template to use. The remaining parameters "
+#| "are used to fill out the template."
+msgid ""
+"The directive has an `id` parameter that identifies the template to use. The "
+"remaining parameters are used to fill out the template."
 msgstr ""
 "[[Vorlagen|templates]] sind Dateien, die ausgefüllt und in Wiki-Seiten "
 "eingefügt werden können, indem die template-Anweisung verwendet wird. Die "
@@ -34,18 +47,16 @@ msgstr ""
 "identifiziert. Die restlichen Parameter werden verwendet, um die Vorlage "
 "auszufüllen."
 
-#. type: Plain text
-msgid "Example:"
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Example:"
+msgid "Example"
 msgstr "Beispiel:"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
-"note.\"\"\"]]\n"
-msgstr ""
-"\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine Notiz "
-"eingefügt werden soll.\"\"\"]]\n"
+msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+msgstr "\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine Notiz eingefügt werden soll.\"\"\"]]\n"
 
 #. type: Plain text
 msgid ""
@@ -55,17 +66,139 @@ msgstr ""
 "Dies füllt die Vorlage `note` aus, wobei das Feld `text` mit dem angegebenen "
 "Wert gefüllt wird, und fügt das Ergebnis in die Seite ein."
 
+#. type: Title ##
+#, no-wrap
+msgid "Using a template"
+msgstr ""
+
 #. type: Plain text
 msgid ""
-"For a list of available templates, and details about how to create more, see "
-"the [[templates]] page."
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "\\[[Charley]]'s sister."
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "Really 8 and a half."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Creating a template"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The template is a regular wiki page, located in the `templates/` "
+"subdirectory inside the source directory of the wiki."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"(Alternatively, templates can be stored in a directory outside the wiki, as "
+"files with the extension \".tmpl\".  By default, these are searched for in `/"
+"usr/share/ikiwiki/templates`; the `templatedir` setting can be used to make "
+"another directory be searched first.)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+
+#. type: Plain text
+msgid "Here's a sample template:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        <span class=\"infobox\">\n"
+"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Age: <TMPL_VAR age><br />\n"
+"        <TMPL_IF color>\n"
+"        Favorite color: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF notes>\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator in "
+"the example above. This ensures that if the name contains something that "
+"might be mistaken for wiki markup, it's not converted to html before being "
+"processed as a [[ikiwiki/WikiLink]]."
 msgstr ""
-"Auf der [[Vorlagen|templates]]-Seite gibt es eine Liste der verfügbaren "
-"Vorlagen und auch eine Anleitung, wie weitere angelegt werden können."
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-
+#~ msgid ""
+#~ "For a list of available templates, and details about how to create more, "
+#~ "see the [[templates]] page."
+#~ msgstr ""
+#~ "Auf der [[Vorlagen|templates]]-Seite gibt es eine Liste der verfügbaren "
+#~ "Vorlagen und auch eine Anleitung, wie weitere angelegt werden können."
diff --git a/po/underlays/directives/ikiwiki/directive/template.fr.po b/po/underlays/directives/ikiwiki/directive/template.fr.po
index 96a91ad23..2e6b2dbe4 100644
--- a/po/underlays/directives/ikiwiki/directive/template.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/template.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-12 08:39+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -17,18 +18,38 @@ msgstr ""
 msgid ""
 "The `template` directive is supplied by the [[!iki plugins/template "
 "desc=template]] plugin."
-msgstr "La directive `template` est fournie par le module d'extension [[!iki plugins/template desc=template]]."
+msgstr ""
+"La directive `template` est fournie par le module d'extension [[!iki plugins/"
+"template desc=template]]."
 
 #. type: Plain text
 msgid ""
-"[[Templates]] are files that can be filled out and inserted into pages in "
-"the wiki, by using the template directive. The directive has an `id` "
-"parameter that identifies the template to use. The remaining parameters are "
-"used to fill out the template."
-msgstr "Les modèles de page [[Templates]] sont des fichiers pouvant être remplis et insérés dans les pages du wiki, avec la directive template. Cette directive possède un paramètre `id` qui identifie le modèle à utiliser. Les autres paramètres servent à remplir le modèle."
+"The template directive allows wiki pages to be used as templates.  These "
+"templates can be filled out and inserted into other pages in the wiki using "
+"the directive. The [[templates]] page lists templates that can be used with "
+"this directive."
+msgstr ""
 
 #. type: Plain text
-msgid "Example:"
+#, fuzzy
+#| msgid ""
+#| "[[Templates]] are files that can be filled out and inserted into pages in "
+#| "the wiki, by using the template directive. The directive has an `id` "
+#| "parameter that identifies the template to use. The remaining parameters "
+#| "are used to fill out the template."
+msgid ""
+"The directive has an `id` parameter that identifies the template to use. The "
+"remaining parameters are used to fill out the template."
+msgstr ""
+"Les modèles de page [[Templates]] sont des fichiers pouvant être remplis et "
+"insérés dans les pages du wiki, avec la directive template. Cette directive "
+"possède un paramètre `id` qui identifie le modèle à utiliser. Les autres "
+"paramètres servent à remplir le modèle."
+
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Example:"
+msgid "Example"
 msgstr "Exemple :"
 
 #. type: Plain text
@@ -40,15 +61,143 @@ msgstr "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my no
 msgid ""
 "This fills out the `note` template, filling in the `text` field with the "
 "specified value, and inserts the result into the page."
-msgstr "Cette expression remplit le modèle `note`, remplaçant le champ `text` par la valeur spécifiée, et insérant le résultat dans la page."
+msgstr ""
+"Cette expression remplit le modèle `note`, remplaçant le champ `text` par la "
+"valeur spécifiée, et insérant le résultat dans la page."
+
+#. type: Title ##
+#, no-wrap
+msgid "Using a template"
+msgstr ""
 
 #. type: Plain text
 msgid ""
-"For a list of available templates, and details about how to create more, see "
-"the [[templates]] page."
-msgstr "Consultez la page [[templates]] pour connaître les modèles de page disponibles et la manière d'en créer d'autres."
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "\\[[Charley]]'s sister."
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "Really 8 and a half."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Creating a template"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The template is a regular wiki page, located in the `templates/` "
+"subdirectory inside the source directory of the wiki."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"(Alternatively, templates can be stored in a directory outside the wiki, as "
+"files with the extension \".tmpl\".  By default, these are searched for in `/"
+"usr/share/ikiwiki/templates`; the `templatedir` setting can be used to make "
+"another directory be searched first.)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+
+#. type: Plain text
+msgid "Here's a sample template:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"        <span class=\"infobox\">\n"
+"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Age: <TMPL_VAR age><br />\n"
+"        <TMPL_IF color>\n"
+"        Favorite color: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF notes>\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator in "
+"the example above. This ensures that if the name contains something that "
+"might be mistaken for wiki markup, it's not converted to html before being "
+"processed as a [[ikiwiki/WikiLink]]."
+msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#~ msgid ""
+#~ "For a list of available templates, and details about how to create more, "
+#~ "see the [[templates]] page."
+#~ msgstr ""
+#~ "Consultez la page [[templates]] pour connaître les modèles de page "
+#~ "disponibles et la manière d'en créer d'autres."
diff --git a/po/underlays/directives/ikiwiki/directive/toc.da.po b/po/underlays/directives/ikiwiki/directive/toc.da.po
index 5dcd5b5c3..edfd30dfa 100644
--- a/po/underlays/directives/ikiwiki/directive/toc.da.po
+++ b/po/underlays/directives/ikiwiki/directive/toc.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -52,6 +52,19 @@ msgid ""
 "level, even if there are higher levels seen later in the file."
 msgstr ""
 
+#. type: Plain text
+msgid ""
+"To create a table of contents that only shows headers starting with a given "
+"level, use the `startlevel` parameter. For example, to show only h2 and "
+"smaller headers:"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "\t\\[[!toc levels=2]]\n"
+msgid "\t\\[[!toc startlevel=2]]\n"
+msgstr "\t\\[[!toc levels=2]]\n"
+
 #. type: Plain text
 msgid ""
 "The table of contents will be created as an ordered list. If you want an "
diff --git a/po/underlays/directives/ikiwiki/directive/toc.fr.po b/po/underlays/directives/ikiwiki/directive/toc.fr.po
index 9391c7a7f..c832a93b7 100644
--- a/po/underlays/directives/ikiwiki/directive/toc.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/toc.fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-10 16:50+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"PO-Revision-Date: 2010-07-16 11:36+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,9 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The `toc` directive is supplied by the [[!iki plugins/toc desc=toc]] plugin."
-msgstr "La directive `toc` est fournie par le module d'extension [[!iki plugins/toc desc=toc]]."
+msgstr ""
+"La directive `toc` est fournie par le module d'extension [[!iki plugins/toc "
+"desc=toc]]."
 
 #. type: Plain text
 msgid "Add a table of contents to a page:"
@@ -33,7 +35,7 @@ msgid ""
 "of the page. By default only the largest headers present on the page will be "
 "shown; to control how many levels of headers are shown, use the `levels` "
 "parameter:"
-msgstr "La  table des matières sera automatiquement créée à partir des en-têtes de la page. Par défaut seuls les plus grands en-têtes présents sur la page sont affichés. Pour choisir un niveau d'en-tête, il faut utiliser le paramètre `levels` :"
+msgstr "La  table des matières sera automatiquement créée à partir des titres de la page. Par défaut seuls les plus grands titres présents sur la page sont affichés. Pour choisir un niveau de titre, il faut utiliser le paramètre `levels` :"
 
 #. type: Plain text
 #, no-wrap
@@ -44,14 +46,29 @@ msgstr "\t\\[[!toc levels=2]]\n"
 msgid ""
 "The toc directive will take the level of the first header as the topmost "
 "level, even if there are higher levels seen later in the file."
-msgstr "La directive `toc` choisit le niveau du premier en-tête comme le premier niveau, même si des niveaux plus élévés sont rencontrés plus tard dans le fichier."
+msgstr "La directive `toc` choisit le niveau du premier titre comme le premier niveau, même si des niveaux plus élévés sont rencontrés plus tard dans le fichier."
+
+#. type: Plain text
+msgid ""
+"To create a table of contents that only shows headers starting with a given "
+"level, use the `startlevel` parameter. For example, to show only h2 and "
+"smaller headers:"
+msgstr "Pour créer une table des matières qui ne liste que les titres d'un certain niveau, vous pouvez utiliser le paramètre `startlevel`. Par exemple, pour ne montrer que les titres h2 et plus petits :"
+
+#. type: Plain text
+#, no-wrap
+#| msgid "\t\\[[!toc levels=2]]\n"
+msgid "\t\\[[!toc startlevel=2]]\n"
+msgstr "\t\\[[!toc startlevel=2]]\n"
 
 #. type: Plain text
 msgid ""
 "The table of contents will be created as an ordered list. If you want an "
 "unordered list instead, you can change the list-style in your local style "
 "sheet."
-msgstr "La table des matières est une liste ordonnée. Si vous voulez une liste non numérotée, il faut changer le style de liste dans la feuille de style locale."
+msgstr ""
+"La table des matières est une liste ordonnée. Si vous voulez une liste non "
+"numérotée, il faut changer le style de liste dans la feuille de style locale."
 
 #. type: Plain text
 #, no-wrap
-- 
cgit v1.2.3


From 1f6d6b2a05a4008f3cb7299becc39e3e1b42965e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@finch.kitenet.net>
Date: Sun, 18 Jul 2010 18:50:14 -0400
Subject: remove dup sentence

---
 doc/ikiwiki/directive/calendar.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
index e9216e11f..cb40f884e 100644
--- a/doc/ikiwiki/directive/calendar.mdwn
+++ b/doc/ikiwiki/directive/calendar.mdwn
@@ -28,7 +28,7 @@ to display or list pages created in the given time frame.
 The `ikiwiki-calendar` command can be used to automatically generate the
 archive pages. It also refreshes the wiki, updating the calendars to
 highlight the current day. This command is typically run at midnight from
-cron. An example crontab:
+cron.
 
 An example crontab:
 
-- 
cgit v1.2.3


From 6d33160faf0d5bbe8f405b60f32893607a534d4c Mon Sep 17 00:00:00 2001
From: crest <crest@web>
Date: Sun, 18 Jul 2010 23:02:32 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 32957f86c..691f20ffe 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -15,6 +15,7 @@ Numbered list
 
 1. First item.
  1. Sub item.
+ 2. bar
 1. Another.
 1. And another..
  1. foo
-- 
cgit v1.2.3


From 4bcd6cc4ffffc2888b2907100ce1decc20e5fcde Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 19:33:10 -0400
Subject: noticed a bug in the po plugin

(I should probably put this in bugs/, but I am not sure if intregriti
watches there..)
---
 doc/plugins/po.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 2dc5ffdc8..4158d7547 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -351,6 +351,16 @@ update. --[[Joey]]
 > * The ENCODING\n part is due to an inconsistency in po4a, which
 >   I've just send a patch for. --[[intrigeri]]
 
+New pages not translatable
+--------------------------
+
+Today I added a new English page to l10n.ikiwiki.info. When I saved,
+the page did not have the translation links at the top. I waited until
+the po plugin had, in the background, created the po files, and refreshed;
+still did not see the translation links. Only when I touched the page
+source and refreshed did it finally add the translation links. 
+I can reproduce this bug in a test site. --[[Joey]]
+
 Ugly messages with empty files
 ------------------------------
 
-- 
cgit v1.2.3


From bfd896f5e59d7ac1e81e7ef315552273681c8bb4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 19:37:14 -0400
Subject: typo

---
 IkiWiki/Plugin/po.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 43804a8f2..dc73c73c3 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -28,7 +28,7 @@ use UNIVERSAL;
 my %translations;
 my @origneedsbuild;
 my %origsubs;
-my @slavelanguages; # orderer as in config po_slave_languages
+my @slavelanguages; # ordered as in config po_slave_languages
 
 memoize("istranslatable");
 memoize("_istranslation");
-- 
cgit v1.2.3


From 839fae0b2b85da690b5ec4bcb750fe071c58a53c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 19:42:06 -0400
Subject: response on po_slave_languages structure

---
 doc/plugins/po.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index babdc1886..d6f82912c 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -297,6 +297,10 @@ to an array to support this. (If twere done, twere best done quickly.)
 >>> Joey, which of these solutions do you prefer? Or another one?
 >>> I tend to prefer the last one. --[[intrigeri]]
 
+>>>> I prefer the pipe separator, I think. I'm concerned that there is 
+>>>> no way to really sanely represent complex data structures in web
+>>>> setup. --[[Joey]]
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From def97ec7fe5f84c0d1931ff2c0f8b33b78fed114 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 19:43:25 -0400
Subject: merge fix for selflink po problem

---
 debian/changelog                        | 1 +
 doc/todo/Fix_selflink_in_po_plugin.mdwn | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b7387a050..db828f580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * Made much more robust in cases where multiple source files produce
     conflicting files/directories in the destdir.
   * Updated French program translation from Philippe Batailler. Closes: #589423
+  * po: Fix selflink display on tranlsated pages. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index c4f6662ce..b276c075d 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -5,7 +5,7 @@ isn't. --[[intrigeri]]
 
 Fixed in my po branch. --[[intrigeri]]
 
-[[!tag patch]]
+[[!tag patch done]]
 
 > bump?
 
-- 
cgit v1.2.3


From 35c9956df0cb92a1088d763a45e863079bfd8e50 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 20:03:04 -0400
Subject: Revert "po_slave_languages can now be a hash, if order matters."

This reverts commit 4cf185e781a5f94373b30ec9a0e10dfb626b6d86.

That commit broke t/po.t (probably the test case only is testing too
close the the old implementation and needs correcting).

Also, we have not decided how to want to represent it yet, so I'm not
ready for this change.

Conflicts:

	IkiWiki/Plugin/po.pm
	doc/plugins/po.mdwn
---
 IkiWiki/Plugin/po.pm | 98 +++++++++++++++++++---------------------------------
 doc/plugins/po.mdwn  |  4 +--
 2 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index dc73c73c3..224412676 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -28,7 +28,6 @@ use UNIVERSAL;
 my %translations;
 my @origneedsbuild;
 my %origsubs;
-my @slavelanguages; # ordered as in config po_slave_languages
 
 memoize("istranslatable");
 memoize("_istranslation");
@@ -105,11 +104,11 @@ sub getsetup () {
 		},
 		po_slave_languages => {
 			type => "string",
-			example => [
+			example => {
 				'fr' => 'Français',
 				'es' => 'Español',
 				'de' => 'Deutsch'
-			],
+			},
 			description => "slave languages (PO files)",
 			safe => 1,
 			rebuild => 1,
@@ -138,24 +137,6 @@ sub checkconfig () {
 				      $field, 'po'));
 		}
 	}
-
-	if (ref $config{po_slave_languages} eq 'ARRAY') {
-		my %slaves;
-		if (@{$config{po_slave_languages}} % 2 != 0) {
-			error(sprintf(gettext("The %s field is invalid."), 'po_slave_languages'));
-                }
-		for (my $i=0; $i<@{$config{po_slave_languages}}; $i = $i + 2) {
-			$slaves{$config{po_slave_languages}->[$i]} = $config{po_slave_languages}->[$i + 1];
-			push @slavelanguages, $config{po_slave_languages}->[$i];
-                }
-		$config{po_slave_languages} = \%slaves;
-        }
-	elsif (ref $config{po_slave_languages} eq 'HASH') {
-		@slavelanguages = sort {
-			$config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b};
-		} keys %{$config{po_slave_languages}};
-        }
-
 	delete $config{po_slave_languages}{$config{po_master_language}{code}};;
 
 	map {
@@ -216,7 +197,7 @@ sub needsbuild () {
 
 	# make existing translations depend on the corresponding master page
 	foreach my $master (keys %translations) {
-		map add_depends($_, $master), values %{otherlanguages_pages($master)};
+		map add_depends($_, $master), values %{otherlanguages($master)};
 	}
 }
 
@@ -248,7 +229,7 @@ sub scan (@) {
 				# make sure any destpage's translations has
 				# $page in its backlinks
 				push @{$links{$page}},
-					values %{otherlanguages_pages($destpage)};
+					values %{otherlanguages($destpage)};
 			}
 		}
 	}
@@ -306,7 +287,7 @@ sub pagetemplate (@) {
 	}
 	if ($template->query(name => "otherlanguages")) {
 		$template->param(otherlanguages => [otherlanguagesloop($page)]);
-		map add_depends($page, $_), (values %{otherlanguages_pages($page)});
+		map add_depends($page, $_), (values %{otherlanguages($page)});
 	}
 	if ($config{discussion} && istranslation($page)) {
 		if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
@@ -359,12 +340,12 @@ sub renamepages (@) {
 	return () unless istranslatable($torename{src});
 
 	my @ret;
-	my %otherpages=%{otherlanguages_pages($torename{src})};
+	my %otherpages=%{otherlanguages($torename{src})};
 	while (my ($lang, $otherpage) = each %otherpages) {
 		push @ret, {
 			src => $otherpage,
 			srcfile => $pagesources{$otherpage},
-			dest => otherlanguage_page($torename{dest}, $lang),
+			dest => otherlanguage($torename{dest}, $lang),
 			destfile => $torename{dest}.".".$lang.".po",
 			required => 0,
 		};
@@ -831,7 +812,7 @@ sub islanguagecode ($) {
 	return $code =~ /^[a-z]{2}$/;
 }
 
-sub otherlanguage_page ($$) {
+sub otherlanguage ($$) {
 	my $page=shift;
 	my $code=shift;
 
@@ -839,31 +820,17 @@ sub otherlanguage_page ($$) {
 	return masterpage($page) . '.' . $code;
 }
 
-# Returns the list of other languages codes: the master language comes first,
-# then the codes are ordered the same way as in po_slave_languages, if it is
-# an array, or in the language name lexical order, if it is a hash.
-sub otherlanguages_codes ($) {
+sub otherlanguages ($) {
 	my $page=shift;
 
-	my @ret;
-	return \@ret unless istranslation($page) || istranslatable($page);
+	my %ret;
+	return \%ret unless istranslation($page) || istranslatable($page);
 	my $curlang=lang($page);
 	foreach my $lang
-		($config{po_master_language}{code}, @slavelanguages) {
+		($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) {
 		next if $lang eq $curlang;
-		push @ret, $lang;
+		$ret{$lang}=otherlanguage($page, $lang);
 	}
-	return \@ret;
-}
-
-sub otherlanguages_pages ($) {
-	my $page=shift;
-
-        my %ret;
-	map {
-		$ret{$_} = otherlanguage_page($page, $_)
-	} @{otherlanguages_codes($page)};
-
 	return \%ret;
 }
 
@@ -1014,25 +981,30 @@ sub otherlanguagesloop ($) {
 	my $page=shift;
 
 	my @ret;
-	if (istranslation($page)) {
-		push @ret, {
-			url => urlto_with_orig_beautiful_urlpath(masterpage($page), $page),
-			code => $config{po_master_language}{code},
-			language => $config{po_master_language}{name},
-			master => 1,
-		};
-	}
-	foreach my $lang (@{otherlanguages_codes($page)}) {
-		next if $lang eq $config{po_master_language}{code};
-		my $otherpage = otherlanguage_page($page, $lang);
-		push @ret, {
-			url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
-			code => $lang,
-			language => languagename($lang),
-			percent => percenttranslated($otherpage),
+	my %otherpages=%{otherlanguages($page)};
+	while (my ($lang, $otherpage) = each %otherpages) {
+		if (istranslation($page) && masterpage($page) eq $otherpage) {
+			push @ret, {
+				url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
+				code => $lang,
+				language => languagename($lang),
+				master => 1,
+			};
+		}
+		elsif (istranslation($otherpage)) {
+			push @ret, {
+				url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
+				code => $lang,
+				language => languagename($lang),
+				percent => percenttranslated($otherpage),
+			}
 		}
 	}
-	return @ret;
+	return sort {
+		return -1 if $a->{code} eq $config{po_master_language}{code};
+		return 1 if $b->{code} eq $config{po_master_language}{code};
+		return $a->{language} cmp $b->{language};
+	} @ret;
 }
 
 sub homepageurl (;$) {
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index d6f82912c..53327c1da 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -54,10 +54,10 @@ Supported languages
 `po_slave_languages` is used to set the list of supported "slave"
 languages, such as:
 
-        po_slave_languages => [ 'fr' => 'Français',
+        po_slave_languages => { 'fr' => 'Français',
                                 'es' => 'Español',
                                 'de' => 'Deutsch',
-        ]
+        }
 
 Decide which pages are translatable
 -----------------------------------
-- 
cgit v1.2.3


From 884daeec1bdc5de71eb121b593f1c20aff44ed15 Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Mon, 19 Jul 2010 04:24:15 +0000
Subject: update url

---
 doc/users/weakish.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/weakish.mdwn b/doc/users/weakish.mdwn
index 30a14d303..a5f252e75 100644
--- a/doc/users/weakish.mdwn
+++ b/doc/users/weakish.mdwn
@@ -1,3 +1,3 @@
 email: weakish@gmail.com
 
-openid: <http://weakish.pigro.net>
+website: <http://weakish.github.com>
-- 
cgit v1.2.3


From e71850f92de149dfa8aad84441faf6fb764efb20 Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Mon, 19 Jul 2010 04:28:55 +0000
Subject: remove lighttpd doc: lighttpd send 200 to dynamic error pages.  Thus
 this plugin doesn't work with it w/o modification.

---
 doc/plugins/404.mdwn | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/plugins/404.mdwn b/doc/plugins/404.mdwn
index 53dace3c9..bf033202a 100644
--- a/doc/plugins/404.mdwn
+++ b/doc/plugins/404.mdwn
@@ -13,8 +13,4 @@ file:
 (The path here needs to be whatever the path is to the ikiwiki.cgi from
 the root of your web server.)
 
-Or put something like this in the wiki's Lighttpd (>=1.4.17) configuration file:
-
-    server.error-handler-404 = "/ikiwiki.cgi"
-
 
-- 
cgit v1.2.3


From 47e2e673bcabf4fdcb03b51a65ac230b9f91aafa Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Mon, 19 Jul 2010 04:31:08 +0000
Subject: link to 404 plugin

---
 doc/bugs/404_plugin_and_lighttpd.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn
index ffbad8add..76b2cf877 100644
--- a/doc/bugs/404_plugin_and_lighttpd.mdwn
+++ b/doc/bugs/404_plugin_and_lighttpd.mdwn
@@ -1,4 +1,4 @@
-Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 page. This breaks the 404 plugin which checks this variable for 404 before processing the URI. It also doesn't seem to set REDIRECT_URL.
+Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 page. This breaks the [[404]] plugin which checks this variable for 404 before processing the URI. It also doesn't seem to set REDIRECT_URL.
 
 I was able to fix my server to check the REQUEST_URI for ikiwiki.cgi and to continue processing if it was not found, passing $ENV{SEVER_NAME} . $ENV{REQUEST_URI} as the first parameter to cgi_page_from_404. However, my perl is terrible and I just made it work rather than figuring out exactly what to do to get it to work on both lighttpd and apache.
 
-- 
cgit v1.2.3


From 0ddc89123ebfa6b3b763e1a918b6d38282cee625 Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Mon, 19 Jul 2010 04:33:37 +0000
Subject: fix link syntax

---
 doc/bugs/404_plugin_and_lighttpd.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn
index 76b2cf877..e478d98c3 100644
--- a/doc/bugs/404_plugin_and_lighttpd.mdwn
+++ b/doc/bugs/404_plugin_and_lighttpd.mdwn
@@ -1,4 +1,4 @@
-Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 page. This breaks the [[404]] plugin which checks this variable for 404 before processing the URI. It also doesn't seem to set REDIRECT_URL.
+Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 page. This breaks the [[plugins/404]] plugin which checks this variable for 404 before processing the URI. It also doesn't seem to set REDIRECT_URL.
 
 I was able to fix my server to check the REQUEST_URI for ikiwiki.cgi and to continue processing if it was not found, passing $ENV{SEVER_NAME} . $ENV{REQUEST_URI} as the first parameter to cgi_page_from_404. However, my perl is terrible and I just made it work rather than figuring out exactly what to do to get it to work on both lighttpd and apache.
 
-- 
cgit v1.2.3


From cfed58f2908886c222c7305b1be4044de800fc6d Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 19 Jul 2010 01:11:22 -0500
Subject: new syntax file for ikiwiki files in vim

---
 doc/forum/ikiwiki_vim_syntaxfile.mdwn                    |  5 +++++
 ...ation_of_wiki_pages_on_local_filesystem_with_vim.mdwn |  3 +++
 doc/tips/vim_syntax_highlighting.mdwn                    | 16 ++++++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/doc/forum/ikiwiki_vim_syntaxfile.mdwn b/doc/forum/ikiwiki_vim_syntaxfile.mdwn
index d0f8d259e..50ae9097e 100644
--- a/doc/forum/ikiwiki_vim_syntaxfile.mdwn
+++ b/doc/forum/ikiwiki_vim_syntaxfile.mdwn
@@ -1,3 +1,8 @@
+See the new syntax file [[here|tips/vim_syntax_highlighting]]. It fixed both of
+the problems reported below.
+
+----
+
 Hi all,
 
 I'm teaching myself how to write syntax files for vim by fixing several issues
diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 7bc032949..7bfcf3088 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -85,6 +85,9 @@ the plugin has, as of now, two problems:
 >>>>> plugin and putting it there, I'd be fine with that. I think it needs
 >>>>> some slight work to catch up with changes to ikiwiki's directives
 >>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]]
+
+<a id='syn-maintenance'>
+
 >>>>> 
 >>>>>> I don't really know too much about syntax definitions in vim. But I'll give it a stab. I know it fails when there are 2 \[[my text|link]] wikilinks in the same page.
 >>>>>> I'm not promising anything, though ;) --[[jerojasro]]
diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn
index 18b2f1c92..bf7104aec 100644
--- a/doc/tips/vim_syntax_highlighting.mdwn
+++ b/doc/tips/vim_syntax_highlighting.mdwn
@@ -1,7 +1,15 @@
-[[ikiwiki.vim]] is a vim syntax highlighting file for ikiwiki
-[[ikiwiki/markdown]] files.
-
-Installation instructions are at the top of the file.
+[ikiwiki-syntax](http://www.vim.org/scripts/script.php?script_id=3156) is a vim
+syntax highlighting file for ikiwiki [[ikiwiki/markdown]] files. It highlights
+directives and wikilinks. It only supports prefixed directives, i.e.,
+\[[!directive foo=bar baz]], not the old format with spaces.
 
 See also: [[follow_wikilinks_from_inside_vim]]
+
+------
+
+The previous syntax definition for ikiwiki links is at [[ikiwiki.vim]]; however,
+it seems to not be [[maintained
+anymore|forum/navigation_of_wiki_pages_on_local_filesystem_with_vim#syn-maintenance]],
+and it has some [[issues|forum/ikiwiki_vim_syntaxfile]].
+
 [[!tag vim]]
-- 
cgit v1.2.3


From bf9cc9e1314158cfbf7f4b781ebf5f9edd424095 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 19 Jul 2010 01:14:47 -0500
Subject: typo

---
 doc/forum/ikiwiki_vim_syntaxfile.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/forum/ikiwiki_vim_syntaxfile.mdwn b/doc/forum/ikiwiki_vim_syntaxfile.mdwn
index 50ae9097e..e6942cd2d 100644
--- a/doc/forum/ikiwiki_vim_syntaxfile.mdwn
+++ b/doc/forum/ikiwiki_vim_syntaxfile.mdwn
@@ -1,4 +1,4 @@
-See the new syntax file [[here|tips/vim_syntax_highlighting]]. It fixed both of
+See the new syntax file [[here|tips/vim_syntax_highlighting]]. It fixes both of
 the problems reported below.
 
 ----
-- 
cgit v1.2.3


From 1e01ec26fe6d6d179934bfa69a55eaaf1a184464 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <jeremiah@web>
Date: Mon, 19 Jul 2010 09:12:39 +0000
Subject: Added second question.

---
 doc/plugins/theme/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/plugins/theme/discussion.mdwn b/doc/plugins/theme/discussion.mdwn
index 091aa97c1..9331713db 100644
--- a/doc/plugins/theme/discussion.mdwn
+++ b/doc/plugins/theme/discussion.mdwn
@@ -16,3 +16,5 @@ lot of free CSS templates could be included, e. g. from
 > require obtrusive attributions links be included on every page of a
 > site using the theme. While probably DFSG, that adds a requirement
 > that ikiwiki itself does not require. --[[Joey]]
+
+### Once one has enabled the 'theme' plugin in the setup file, how does one use themes?
-- 
cgit v1.2.3


From c4d22bdb75a8a0c924f6fe8fba19bffd25ebf640 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <jeremiah@web>
Date: Mon, 19 Jul 2010 09:15:30 +0000
Subject: Added example

---
 doc/plugins/goodstuff/discussion.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/plugins/goodstuff/discussion.mdwn b/doc/plugins/goodstuff/discussion.mdwn
index 0ad95c00a..3ea5692a8 100644
--- a/doc/plugins/goodstuff/discussion.mdwn
+++ b/doc/plugins/goodstuff/discussion.mdwn
@@ -1 +1,6 @@
-What is the syntax for enabling plugins in the setup file?
+### What is the syntax for enabling plugins in the setup file?
+
+Here is an example snippet from a working setup file:
+
+ # plugins to add to the default configuration
+    add_plugins => ['goodstuff'],          
-- 
cgit v1.2.3


From 011fb0b2e537f6185bb640e5d761c924bf38a154 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <jeremiah@web>
Date: Mon, 19 Jul 2010 09:16:09 +0000
Subject:

---
 doc/plugins/goodstuff/discussion.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/goodstuff/discussion.mdwn b/doc/plugins/goodstuff/discussion.mdwn
index 3ea5692a8..dd4a41345 100644
--- a/doc/plugins/goodstuff/discussion.mdwn
+++ b/doc/plugins/goodstuff/discussion.mdwn
@@ -2,5 +2,6 @@
 
 Here is an example snippet from a working setup file:
 
- # plugins to add to the default configuration
-    add_plugins => ['goodstuff'],          
+ <pre># plugins to add to the default configuration
+    add_plugins => ['goodstuff'],     
+</pre>
-- 
cgit v1.2.3


From e50df5ea7601b6a1fc03994650ddff728aba7b57 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <jeremiah@web>
Date: Mon, 19 Jul 2010 09:16:32 +0000
Subject:

---
 doc/plugins/goodstuff/discussion.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/goodstuff/discussion.mdwn b/doc/plugins/goodstuff/discussion.mdwn
index dd4a41345..4ccea4ad4 100644
--- a/doc/plugins/goodstuff/discussion.mdwn
+++ b/doc/plugins/goodstuff/discussion.mdwn
@@ -2,6 +2,7 @@
 
 Here is an example snippet from a working setup file:
 
- <pre># plugins to add to the default configuration
-    add_plugins => ['goodstuff'],     
+ <pre>
+   # plugins to add to the default configuration
+   add_plugins => ['goodstuff'],     
 </pre>
-- 
cgit v1.2.3


From 862fc7c1ab1f7d709561bcb02fc8ede57b90a51b Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 20 Jul 2010 02:25:17 +0200
Subject: Support ordered po_slave_languages as discussed previously.

Backward compatibility is still supported.
---
 IkiWiki/Plugin/po.pm | 105 +++++++++++++++++++++++++++++++++------------------
 doc/plugins/po.mdwn  |   8 ++--
 2 files changed, 72 insertions(+), 41 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 224412676..1f3ff252e 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -28,6 +28,7 @@ use UNIVERSAL;
 my %translations;
 my @origneedsbuild;
 my %origsubs;
+my @slavelanguages; # languages codes ordered as in config po_slave_languages
 
 memoize("istranslatable");
 memoize("_istranslation");
@@ -104,11 +105,11 @@ sub getsetup () {
 		},
 		po_slave_languages => {
 			type => "string",
-			example => {
-				'fr' => 'Français',
-				'es' => 'Español',
-				'de' => 'Deutsch'
-			},
+			example => [
+				'fr|Français',
+				'es|Español',
+				'de|Deutsch'
+                            ],
 			description => "slave languages (PO files)",
 			safe => 1,
 			rebuild => 1,
@@ -137,6 +138,27 @@ sub checkconfig () {
 				      $field, 'po'));
 		}
 	}
+
+	if (ref $config{po_slave_languages} eq 'ARRAY') {
+		my %slaves;
+		foreach my $pair (@{$config{po_slave_languages}}) {
+			my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ );
+			if (!defined $code || !defined $name) {
+				error(sprintf(gettext("%s has invalid syntax: must use CODE|NAME"),
+				              $pair));
+                        }
+			$slaves{$code} = $name;
+			push @slavelanguages, $code;
+
+                }
+		$config{po_slave_languages} = \%slaves;
+        }
+	elsif (ref $config{po_slave_languages} eq 'HASH') {
+		@slavelanguages = sort {
+			$config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b};
+		} keys %{$config{po_slave_languages}};
+        }
+
 	delete $config{po_slave_languages}{$config{po_master_language}{code}};;
 
 	map {
@@ -197,7 +219,7 @@ sub needsbuild () {
 
 	# make existing translations depend on the corresponding master page
 	foreach my $master (keys %translations) {
-		map add_depends($_, $master), values %{otherlanguages($master)};
+		map add_depends($_, $master), values %{otherlanguages_pages($master)};
 	}
 }
 
@@ -229,7 +251,7 @@ sub scan (@) {
 				# make sure any destpage's translations has
 				# $page in its backlinks
 				push @{$links{$page}},
-					values %{otherlanguages($destpage)};
+					values %{otherlanguages_pages($destpage)};
 			}
 		}
 	}
@@ -287,7 +309,7 @@ sub pagetemplate (@) {
 	}
 	if ($template->query(name => "otherlanguages")) {
 		$template->param(otherlanguages => [otherlanguagesloop($page)]);
-		map add_depends($page, $_), (values %{otherlanguages($page)});
+		map add_depends($page, $_), (values %{otherlanguages_pages($page)});
 	}
 	if ($config{discussion} && istranslation($page)) {
 		if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
@@ -340,12 +362,12 @@ sub renamepages (@) {
 	return () unless istranslatable($torename{src});
 
 	my @ret;
-	my %otherpages=%{otherlanguages($torename{src})};
+	my %otherpages=%{otherlanguages_pages($torename{src})};
 	while (my ($lang, $otherpage) = each %otherpages) {
 		push @ret, {
 			src => $otherpage,
 			srcfile => $pagesources{$otherpage},
-			dest => otherlanguage($torename{dest}, $lang),
+			dest => otherlanguage_page($torename{dest}, $lang),
 			destfile => $torename{dest}.".".$lang.".po",
 			required => 0,
 		};
@@ -812,7 +834,7 @@ sub islanguagecode ($) {
 	return $code =~ /^[a-z]{2}$/;
 }
 
-sub otherlanguage ($$) {
+sub otherlanguage_page ($$) {
 	my $page=shift;
 	my $code=shift;
 
@@ -820,17 +842,31 @@ sub otherlanguage ($$) {
 	return masterpage($page) . '.' . $code;
 }
 
-sub otherlanguages ($) {
+# Returns the list of other languages codes: the master language comes first,
+# then the codes are ordered the same way as in po_slave_languages, if it is
+# an array, or in the language name lexical order, if it is a hash.
+sub otherlanguages_codes ($) {
 	my $page=shift;
 
-	my %ret;
-	return \%ret unless istranslation($page) || istranslatable($page);
+	my @ret;
+	return \@ret unless istranslation($page) || istranslatable($page);
 	my $curlang=lang($page);
 	foreach my $lang
 		($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) {
 		next if $lang eq $curlang;
-		$ret{$lang}=otherlanguage($page, $lang);
+		push @ret, $lang;
 	}
+	return \@ret;
+}
+
+sub otherlanguages_pages ($) {
+	my $page=shift;
+
+        my %ret;
+	map {
+		$ret{$_} = otherlanguage_page($page, $_)
+	} @{otherlanguages_codes($page)};
+
 	return \%ret;
 }
 
@@ -981,30 +1017,25 @@ sub otherlanguagesloop ($) {
 	my $page=shift;
 
 	my @ret;
-	my %otherpages=%{otherlanguages($page)};
-	while (my ($lang, $otherpage) = each %otherpages) {
-		if (istranslation($page) && masterpage($page) eq $otherpage) {
-			push @ret, {
-				url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
-				code => $lang,
-				language => languagename($lang),
-				master => 1,
-			};
-		}
-		elsif (istranslation($otherpage)) {
-			push @ret, {
-				url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
-				code => $lang,
-				language => languagename($lang),
-				percent => percenttranslated($otherpage),
-			}
+	if (istranslation($page)) {
+		push @ret, {
+			url => urlto_with_orig_beautiful_urlpath(masterpage($page), $page),
+			code => $config{po_master_language}{code},
+			language => $config{po_master_language}{name},
+			master => 1,
+		};
+	}
+	foreach my $lang (@{otherlanguages_codes($page)}) {
+		next if $lang eq $config{po_master_language}{code};
+		my $otherpage = otherlanguage_page($page, $lang);
+		push @ret, {
+			url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
+			code => $lang,
+			language => languagename($lang),
+			percent => percenttranslated($otherpage),
 		}
 	}
-	return sort {
-		return -1 if $a->{code} eq $config{po_master_language}{code};
-		return 1 if $b->{code} eq $config{po_master_language}{code};
-		return $a->{language} cmp $b->{language};
-	} @ret;
+	return @ret;
 }
 
 sub homepageurl (;$) {
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 53327c1da..c36414c8e 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -54,10 +54,10 @@ Supported languages
 `po_slave_languages` is used to set the list of supported "slave"
 languages, such as:
 
-        po_slave_languages => { 'fr' => 'Français',
-                                'es' => 'Español',
-                                'de' => 'Deutsch',
-        }
+        po_slave_languages => [ 'fr|Français',
+                                'es|Español',
+                                'de|Deutsch',
+        ]
 
 Decide which pages are translatable
 -----------------------------------
-- 
cgit v1.2.3


From bb22e8c4a6324f20eb8987e291541556d24783b1 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 20 Jul 2010 02:26:23 +0200
Subject: po: optimization

No need to use "keys %{$config{po_slave_languages}}" repeatedly:
the slave languages codes list is already cached in @slavelanguages.
---
 IkiWiki/Plugin/po.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 1f3ff252e..0af47aad5 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -164,7 +164,7 @@ sub checkconfig () {
 	map {
 		islanguagecode($_)
 			or error(sprintf(gettext("%s is not a valid language code"), $_));
-	} ($config{po_master_language}{code}, keys %{$config{po_slave_languages}});
+	} ($config{po_master_language}{code}, @slavelanguages);
 
 	if (! exists $config{po_translatable_pages} ||
 	    ! defined $config{po_translatable_pages}) {
@@ -193,7 +193,7 @@ sub checkconfig () {
 		next if $underlay=~/^locale\//;
 
 		# Underlays containing the po files for slave languages.
-		foreach my $ll (keys %{$config{po_slave_languages}}) {
+		foreach my $ll (@slavelanguages) {
 			add_underlay("po/$ll/$underlay")
 				if -d "$config{underlaydirbase}/po/$ll/$underlay";
 		}
@@ -615,7 +615,7 @@ sub mybeautify_urlpath ($) {
 		$res =~ s!/\Qindex.$config{htmlext}\E$!/!;
 		map {
 			$res =~ s!/\Qindex.$_.$config{htmlext}\E$!/!;
-		} (keys %{$config{po_slave_languages}});
+		} @slavelanguages;
 	}
 	return $res;
 }
@@ -852,7 +852,7 @@ sub otherlanguages_codes ($) {
 	return \@ret unless istranslation($page) || istranslatable($page);
 	my $curlang=lang($page);
 	foreach my $lang
-		($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) {
+		($config{po_master_language}{code}, @slavelanguages) {
 		next if $lang eq $curlang;
 		push @ret, $lang;
 	}
@@ -890,7 +890,7 @@ sub pofile ($$) {
 sub pofiles ($) {
 	my $masterfile=shift;
 
-	return map pofile($masterfile, $_), (keys %{$config{po_slave_languages}});
+	return map pofile($masterfile, $_), @slavelanguages;
 }
 
 sub refreshpot ($) {
@@ -1048,7 +1048,7 @@ sub ishomepage ($) {
 	my $page = shift;
 
 	return 1 if $page eq 'index';
-	map { return 1 if $page eq 'index.'.$_ } keys %{$config{po_slave_languages}};
+	map { return 1 if $page eq 'index.'.$_ } @slavelanguages;
 	return undef;
 }
 
@@ -1063,7 +1063,7 @@ sub deletetranslations ($) {
 		if (-e $absfile && ! -l $absfile && ! -d $absfile) {
 			push @todelete, $file;
 		}
-	} keys %{$config{po_slave_languages}};
+	} @slavelanguages;
 
 	map {
 		if ($config{rcs}) {
-- 
cgit v1.2.3


From 38014f0cad580c9f2468c1b72475b876209fb3e6 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 20 Jul 2010 13:24:25 +0200
Subject: Run checkconfig after loading the po plugin, else state is not
 populated.

The pofiles function relies on @slavelanguages to have been populated by po's
checkconfig hook.
---
 t/po.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/po.t b/t/po.t
index b6885a37e..495eef6b2 100755
--- a/t/po.t
+++ b/t/po.t
@@ -42,8 +42,8 @@ $config{po_slave_languages} = {
 $config{po_translatable_pages}='index or test1 or test2 or translatable';
 $config{po_link_to}='negotiated';
 IkiWiki::loadplugins();
-IkiWiki::checkconfig();
 ok(IkiWiki::loadplugin('po'), "po plugin loaded");
+IkiWiki::checkconfig();
 
 ### seed %pagesources and %pagecase
 $pagesources{'index'}='index.mdwn';
-- 
cgit v1.2.3


From c66fae8b16099fa8b0c3c86d38de0733b561d13f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 20 Jul 2010 13:39:47 +0200
Subject: Added tests for po::pofiles.

---
 t/po.t | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/t/po.t b/t/po.t
index 495eef6b2..de5ace3a0 100755
--- a/t/po.t
+++ b/t/po.t
@@ -17,7 +17,7 @@ BEGIN {
 	}
 }
 
-use Test::More tests => 65;
+use Test::More tests => 68;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -91,6 +91,13 @@ ok(! IkiWiki::Plugin::po::istranslatable('test3'), "test3 is not translatable");
 ok(! IkiWiki::Plugin::po::istranslation('test3'), "test3 is not a translation");
 }
 
+### pofiles
+
+my @pofiles = IkiWiki::Plugin::po::pofiles(srcfile("index.mdwn"));
+ok( @pofiles, "pofiles is defined");
+ok( @pofiles == 2, "pofiles has correct size");
+is_deeply(\@pofiles, ["$config{srcdir}/index.es.po", "$config{srcdir}/index.fr.po"], "pofiles content is correct");
+
 ### links
 require IkiWiki::Render;
 
-- 
cgit v1.2.3


From d98296d1db02febfa7cc4fbe7f304ca2a9858fef Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 20 Jul 2010 13:40:34 +0200
Subject: po.t: fix expected results

As index.{es,fr} don't exist, po::refreshpofiles copies them from the basewiki
underlay before running msgmerge. msgmerge marks as obsolete the translation
strings that came from the basewiki po files, but the link plugin
does not make the difference between obsolete and up-to-date links.

$links{'index.fr'} and $links{'index.es'} are therefore expected to contain
SandBox and ikiwiki.
---
 t/po.t | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/po.t b/t/po.t
index de5ace3a0..a52611935 100755
--- a/t/po.t
+++ b/t/po.t
@@ -118,8 +118,8 @@ $config{po_link_to}='negotiated';
 $msgprefix="links (po_link_to=negotiated)";
 refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn');
 is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index");
-is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable'], "$msgprefix index.es");
-is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable'], "$msgprefix index.fr");
+is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.es");
+is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.fr");
 is_deeply(\@{$links{'translatable'}}, ['nontranslatable'], "$msgprefix translatable");
 is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
 is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
@@ -129,8 +129,8 @@ $config{po_link_to}='current';
 $msgprefix="links (po_link_to=current)";
 refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn');
 is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index");
-is_deeply(\@{$links{'index.es'}}, [ map bestlink('index.es', $_), ('translatable.es', 'nontranslatable')], "$msgprefix index.es");
-is_deeply(\@{$links{'index.fr'}}, [ map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable')], "$msgprefix index.fr");
+is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.es");
+is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.fr");
 is_deeply(\@{$links{'translatable'}}, [bestlink('translatable', 'nontranslatable')], "$msgprefix translatable");
 is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
 is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
-- 
cgit v1.2.3


From 21fe996544f43ad5cfcdf36388015971b7fc56d1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Jul 2010 15:02:04 -0400
Subject: Avoid showing 'Add a comment' link at the bottom of the comment post
 form.

Since misctemplate is called with a page context, the comments plugin
thinks it should add that, as well as the comment link in the actionbar.
I kept the comment link because a quick link back to the comments to a page
is sorta useful.
---
 debian/changelog    | 1 +
 templates/page.tmpl | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index db828f580..8013e5cdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
     conflicting files/directories in the destdir.
   * Updated French program translation from Philippe Batailler. Closes: #589423
   * po: Fix selflink display on tranlsated pages. (intrigeri)
+  * Avoid showing 'Add a comment' link at the bottom of the comment post form.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 703a6d8de..8659018a0 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -117,6 +117,7 @@
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF COMMENTS>
 <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
 <TMPL_VAR COMMENTS>
@@ -129,6 +130,7 @@
 </TMPL_IF>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
+</TMPL_UNLESS>
 
 </div>
 
-- 
cgit v1.2.3


From 44b6101c3f563f6077e38f6843f0d4b41704f11a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Jul 2010 16:48:38 -0400
Subject: merge translation updates from l10n site

---
 po/underlays/basewiki/ikiwiki.fr.po                |   5 +-
 po/underlays/basewiki/ikiwiki/openid.fr.po         |   6 +-
 po/underlays/basewiki/ikiwiki/pagespec.fr.po       |  28 +++++-
 po/underlays/basewiki/ikiwiki/subpage.fr.po        |  10 +-
 po/underlays/basewiki/ikiwiki/wikilink.fr.po       |   9 +-
 po/underlays/basewiki/templates.fr.po              | 107 ++++++++++++++++-----
 .../directives/ikiwiki/directive/calendar.da.po    |   4 +-
 .../directives/ikiwiki/directive/calendar.de.po    |  10 +-
 .../directives/ikiwiki/directive/calendar.fr.po    |  39 +++-----
 .../directives/ikiwiki/directive/linkmap.fr.po     |   4 +-
 .../directives/ikiwiki/directive/pagestats.fr.po   |   9 +-
 .../directives/ikiwiki/directive/template.fr.po    |  72 ++++++++++----
 12 files changed, 203 insertions(+), 100 deletions(-)

diff --git a/po/underlays/basewiki/ikiwiki.fr.po b/po/underlays/basewiki/ikiwiki.fr.po
index 5516a95e0..2d5e03b88 100644
--- a/po/underlays/basewiki/ikiwiki.fr.po
+++ b/po/underlays/basewiki/ikiwiki.fr.po
@@ -2,12 +2,11 @@
 # Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
 # This file is distributed under the same license as the PACKAGE Ikiwiki.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-30 09:46+0200\n"
+"PO-Revision-Date: 2010-07-21 16:41+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -71,4 +70,4 @@ msgstr "[[ikiwiki/searching]]"
 
 #. type: Bullet: '* '
 msgid "[[templates]]"
-msgstr ""
+msgstr "[[templates]]"
diff --git a/po/underlays/basewiki/ikiwiki/openid.fr.po b/po/underlays/basewiki/ikiwiki/openid.fr.po
index 2f41cf76c..455c81467 100644
--- a/po/underlays/basewiki/ikiwiki/openid.fr.po
+++ b/po/underlays/basewiki/ikiwiki/openid.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-25 09:52+0200\n"
+"PO-Revision-Date: 2010-07-20 21:25+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -50,12 +50,12 @@ msgid ""
 "If you have an account with some of the larger web service providers, you "
 "might already have an OpenID.  [Directory of OpenID providers](http://"
 "openiddirectory.com/openid-providers-c-1.html)"
-msgstr ""
+msgstr "Si vous possédez un compte sur l'un des nombreux fournisseurs de services web, il se peut que vous ayez déjà un OpenID. [Répertoire des fournisseurs d'OpenID](http://openiddirectory.com/openid-providers-c-1.html)."
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-msgstr ""
+msgstr "[[!if test=\"enabled(openid)\" then=\"\"\n"
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.fr.po b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
index b95b818b1..aef5c74bf 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-16 10:47+0200\n"
+"PO-Revision-Date: 2010-07-21 17:21+0200\n"
 "Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -121,6 +121,32 @@ msgid ""
 "* \"`postcomment(glob)`\" - matches only when comments are being \n"
 "  posted to a page matching the specified glob\n"
 msgstr ""
+"* \"`glob(motif)`\" - recherche les pages et fichiers qui correspondent au motif.\n"
+"  N'écrire que le motif lui-même est un raccourci pour cette fonction.\n"
+"* \"`page(motif)`\" - comme `glob()`, mais ne recherche que des pages, pas des fichiers.\n"
+"* \"`link(page)`\" -  correspond aux pages ayant un lien vers cette page (ou motif)\n"
+"* \"`tagged(étiquette)`\" - correspond aux pages qui sont marquées ou qui sont\n"
+"  liées à l'étiquette donnée (ou des étiquettes correspondant à un motif).\n"
+"* \"`backlink(page)`\" -  correspond seulement aux pages qui sont pointées (lien) par la page donnée.\n"
+"* \"`creation_month(mois)`\" - correspond aux pages créées durant ce mois\n"
+"* \"`creation_day(jour)`\" - ou au jour de ce mois\n"
+"* \"`creation_year(année)`\" - ou année\n"
+"* \"`created_after(page)`\" - correspond aux fichiers créés après la création de la page donnée.\n"
+"* \"`created_before(page)`\\\" - correspond aux fichiers créés avant la création de la page donnée.\n"
+"* \"`internal(motif)`\" - comme `glob()`,  mais correspond en plus aux\n"
+"  pages à usage interne que la fonction glob ne trouve pas en général.\n"
+"* \"`title(motif)`\", \"`author(motif)`\", \"`authorurl(motif)`\",\n"
+"  \"`license(motif)`\", \"`copyright(motif)`\", \"`guid(motif)`\"\n"
+"  -  renvoient les pages qui possèdent les métadonnées correspondant au motif donné.\n"
+"* \"`user(username)`\" - teste si une modification est faite par l'identifiant donné.\n"
+"  Si openid est activé, on peut aussi l'utiliser. L'identifiant peut contenir des expressions régulières.\n"
+"  Par exemple, pour obtenir tous les utilisateurs openid, utilisez l'expression : `user(*://*)`.\n"
+"* \"`admin()`\" - teste si une modification par un administrateur du wiki est en cours.\n"
+"* \"`ip(adresse)`\" - teste si une modification par l'IP donnée est en cours.\n"
+"* \"`comment(motif)`\" - renvoient les commentaires d'une page correspondant au motif donné.\n"
+"* \"`comment_pending(motif)`\" - renvoient les commentaires non modérés, en attente.\n"
+"* \"`postcomment(motif)`\" -  ne correspond que si des commentaires sont postés\n"
+"  vers une page correspondant au motif donné.\n"
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/basewiki/ikiwiki/subpage.fr.po b/po/underlays/basewiki/ikiwiki/subpage.fr.po
index 61264b406..5df0b7176 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.fr.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-25 10:31+0200\n"
+"PO-Revision-Date: 2010-07-21 17:26+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -33,7 +33,6 @@ msgstr ""
 "répertoire plein de pages."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "To add a SubPage, just make a subdirectory and put pages in it. For "
 #| "example, this page is SubPage.mdwn in this wiki's source, and there is "
@@ -44,12 +43,7 @@ msgid ""
 "this page is subpage.mdwn in this wiki's source, and there is also a subpage "
 "subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
-msgstr ""
-"Pour ajouter une sous-page, faites simplement un sous-répertoire et mettez-y "
-"les pages. Par exemple, cette page est `subpage.mdwn` dans les sources de ce "
-"wiki et il y a également un sous-répertoire `subpage`, qui contient `subpage/"
-"linkingrules.mdwn`. Les sous-pages peuvent être emboîtées autant que vous le "
-"souhaitez."
+msgstr "Pour ajouter une sous-page, faites simplement un sous-répertoire et mettez-y les pages. Par exemple, cette page est `subpage.mdwn` dans les sources de ce wiki et il y a également un sous-répertoire subpage, qui contient `subpage/linkingrules.mdwn`. Les sous-pages peuvent être emboîtées autant que vous le souhaitez."
 
 #. type: Plain text
 msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.fr.po b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
index f527ef364..9998bbe54 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.fr.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-28 16:05+0200\n"
+"PO-Revision-Date: 2010-07-21 17:30+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -76,22 +76,19 @@ msgstr ""
 "quelque chose comme `\\[[WikiLink#foo]]`."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "Also, if the file linked to by a WikiLink looks like an image, it will be "
 #| "displayed inline on the page."
 msgid ""
 "If the file linked to by a WikiLink looks like an image, it will be "
 "displayed inline on the page."
-msgstr ""
-"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il "
-"est affiché au fil du texte sur la page."
+msgstr "Quand le fichier pointé par un WikiLink ressemble à une image, il est affiché au fil du texte sur la page."
 
 #. type: Plain text
 msgid ""
 "You can also put an url in a WikiLink, to link to an external page.  Email "
 "addresses can also be used to generate a mailto link."
-msgstr ""
+msgstr "Vous pouvez mettre une URL dans un WikiLink pour lier une page externe. Des adresses électroniques peuvent servir à créer des liens mailto."
 
 #~ msgid "Directives and WikiLinks"
 #~ msgstr "Directives et WikiLinks"
diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po
index f7faadb15..715ef92ff 100644
--- a/po/underlays/basewiki/templates.fr.po
+++ b/po/underlays/basewiki/templates.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-09-12 08:40+0200\n"
+"PO-Revision-Date: 2010-07-22 17:30+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -19,6 +19,8 @@ msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
 "you can fully customise this site."
 msgstr ""
+"[[Ikiwiki]] se sert de modèles dans beaucoup de cas. En modifiant ces "
+"modèles, vous pouvez « personnaliser » ce wiki."
 
 #. type: Plain text
 msgid ""
@@ -27,6 +29,10 @@ msgid ""
 "first. Customised templates can also be placed inside the \"templates/\" "
 "directory in your wiki's source."
 msgstr ""
+"Les modèles sont situés dans le répertoire `/usr/share/ikiwiki/templates`. "
+"Le paramètre `templatedir` peut être utilisé pour commencer la recherche "
+"dans un autre répertoire. Des modèles personnalisés peuvent être placés dans "
+"dans le sous-répertoire `templates/` du répertoire source du wiki."
 
 #. type: Plain text
 msgid ""
@@ -34,19 +40,20 @@ msgid ""
 "things like conditionals and loops in templates and is pretty easy to learn. "
 "All you really need to know to modify templates is this:"
 msgstr ""
+"Ikiwiki utilise le module HTML::Template pour créer ses modèles. Ce module, "
+"facile à étudier, permet l'utilisation de conditions et de boucles. Voici ce "
+"que vous avez besoin de savoir :"
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "To insert the raw value of a variable, with wiki markup not yet converted "
 #| "to html, use `<TMPL_VAR raw_variable>`."
 msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
 msgstr ""
-"Pour insérer la valeur brute d'une variable, sans que la syntaxe wiki soit "
-"convertie en html, utilisez `<TMPL_VAR raw_variable>`."
+"Pour insérer la valeur d'une variable, sans que la syntaxe wiki soit "
+"convertie en HTML, utilisez `<TMPL_VAR variable>`."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "To make a block of text conditional on a variable being set use `<TMPL_IF "
 #| "NAME=\"variable\">text</TMPL_IF>`."
@@ -55,10 +62,9 @@ msgid ""
 "variable>text</TMPL_IF>`."
 msgstr ""
 "Pour écrire un bloc de texte si une variable est définie, utilisez `<TMPL_IF "
-"NAME=\"variable\">texte</TMPL_IF>`."
+"variable>texte</TMPL_IF>`."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "To use one block of text if a variable is set and a second if it's not, "
 #| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
@@ -67,19 +73,19 @@ msgid ""
 "`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
 "Pour utiliser un bloc de texte si une variable est définie et un autre dans "
-"le cas contraire, utilisez `<TMPL_IF NAME=\"variable\">texte<TMPL_ELSE>autre "
-"texte</TMPL_IF>`"
+"le cas contraire, utilisez `<TMPL_IF variable>texte<TMPL_ELSE>autre texte</"
+"TMPL_IF>`"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
 msgid "template pages"
-msgstr ""
+msgstr "pages modèles"
 
 #. type: Plain text
 msgid ""
@@ -87,17 +93,20 @@ msgid ""
 "wiki pages to be used as templates, filled out and inserted into other pages "
 "in the wiki."
 msgstr ""
+"La directive [[!iki ikiwiki/directive/template desc=\"template\"]] permet "
+"d'utiliser des pages de wiki comme modèles. Ces modèles peuvent être remplis "
+"et insérés dans d'autres pages du wiki."
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
 msgid "default content for new pages"
-msgstr ""
+msgstr "contenu par défaut des nouvelles pages"
 
 #. type: Plain text
 msgid ""
@@ -105,17 +114,22 @@ msgid ""
 "can be used to make new pages default to containing text from a template "
 "page, which can be filled out as the page is edited."
 msgstr ""
+"La directive [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate\"]] "
+"permet que le contenu par défaut des nouvelles pages soit le texte d'une "
+"page modèle, qui peut être remplie en même temps que la page est modifiée."
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
 "[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
 "and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgstr ""
+"[[!if test=\"enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
 #| "sort=title template=titlepage]]\n"
@@ -124,26 +138,31 @@ msgid ""
 "feeds=no archive=yes sort=title template=titlepage\n"
 "rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Ajouter un nouveau modèle :\"]]\n"
 
 #. type: Title ##
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "Using a template"
 msgid "wiki templates"
-msgstr "Utiliser un modèle"
+msgstr "modèles du wiki"
 
 #. type: Plain text
 msgid ""
 "These templates are used to build the wiki. The aim is to keep almost all "
 "html out of ikiwiki and in the templates."
 msgstr ""
+"Ces modèles permettent la construction du wiki. Le but est de mettre presque "
+"tout le formatage HTML dans des modèles, hors de ikiwiki."
 
 #. type: Bullet: '* '
 msgid ""
 "`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
 "template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
+"`page.tmpl` - permet d'afficher toutes les pages normales du wiki. C'est le "
+"principal modèle à modifier. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 
 #. type: Plain text
 #, no-wrap
@@ -179,6 +198,34 @@ msgid ""
 "  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
 "  interface; do not normally need to be customised.\n"
 msgstr ""
+"  (La directive [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate\"]]\n"
+"  permet d'utiliser un modèle différent de `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - permet la création de flux RSS pour les blogs.\n"
+"* `rssitem.tmpl` - permet la création d'éléments individuels dans les flux RSS.\n"
+"* `atompage.tmpl` - permet la création de flux Atom pour les blogs.\n"
+"* `atomitem.tmpl` -  permet la création d'éléments individuels dans les flux Atom.\n"
+"* `inlinepage.tmpl` - permet l'affichage d'un message dans un blog.\n"
+"* `archivepage.tmpl` - permet de lister une page dans une page d'archive de blog.\n"
+"* `titlepage.tmpl` - permet de lister une page par son titre dans une page d'archive de blog.\n"
+"* `microblog.tmpl` - permet de montrer un message de microblog au fil du texte.\n"
+"* `blogpost.tmpl` - offre un formulaire pour ajouter un message dans un blog (avec des liens RSS/Atom)\n"
+"* `feedlink.tmpl` - permet d'ajouter des liens RSS/Atom quand `blogpost.tmpl` n'est pas utilisé.\n"
+"* `aggregatepost.tmpl` - modèle utilisé par le module aggregate pour créer une page de blog.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - modèles utilisés par les modules search et.\n"
+"  google pour ajouter un formulaire de recherche dans les pages de wiki.\n"
+"* `searchquery.tmpl` - C'est un modèle Omega, utilisé par le module search.\n"
+"* `comment.tmpl` - modèle utilisé par le module comments pour afficher un commentaire.\n"
+"* `change.tmpl` - permet la création d'une page décrivant une modification du wiki.\n"
+"* `recentchanges.tmpl` - permet de lister une modification sur la page RecentChanges.\n"
+"* `autoindex.tmpl` - modèle utilisé par le module autoindex pour créer des pages d'index.\n"
+"* `autotag.tmpl` - modèle utilisé par le module tag pour créer des pages avec étiquette.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - modèles utilisés par le module ikiwiki-calendar pour\n"
+"  créer les pages d'archives des agendas.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - modèles faisant partie de l'interface utilisateur\n"
+"  d'ikiwiki'. Il n'y a en général aucun besoin de les personnaliser.\n"
 
 #. type: Plain text
 #, no-wrap
@@ -210,8 +257,12 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ msgid "Using a template works like this:"
 #~ msgstr "Voici comment fonctionne un modèle :"
 
-#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
-#~ msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer dans ma note.\"\"\"]]\n"
+#~ msgid ""
+#~ "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
+#~ "note.\"\"\"]]\n"
+#~ msgstr ""
+#~ "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer dans "
+#~ "ma note.\"\"\"]]\n"
 
 #~ msgid ""
 #~ "This fills out the [[note]] template, filling in the `text` field with "
@@ -232,8 +283,12 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ "sur plusieurs lignes, de larges morceaux de texte mis en forme peuvent "
 #~ "être intégrés dans un modèle :"
 
-#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-#~ msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgid ""
+#~ "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes="
+#~ "\"\"\"\n"
+#~ msgstr ""
+#~ "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes="
+#~ "\"\"\"\n"
 
 #~ msgid "\\[[Charley]]'s sister."
 #~ msgstr "soeur de \\[[Charley]]."
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.da.po b/po/underlays/directives/ikiwiki/directive/calendar.da.po
index eedff18b6..e1e63e716 100644
--- a/po/underlays/directives/ikiwiki/directive/calendar.da.po
+++ b/po/underlays/directives/ikiwiki/directive/calendar.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2010-07-18 19:05-0300\n"
 "PO-Revision-Date: 2009-07-23 00:06+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -80,7 +80,7 @@ msgid ""
 "The `ikiwiki-calendar` command can be used to automatically generate the "
 "archive pages. It also refreshes the wiki, updating the calendars to "
 "highlight the current day. This command is typically run at midnight from "
-"cron. An example crontab:"
+"cron."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.de.po b/po/underlays/directives/ikiwiki/directive/calendar.de.po
index d406f6580..8506fbe20 100644
--- a/po/underlays/directives/ikiwiki/directive/calendar.de.po
+++ b/po/underlays/directives/ikiwiki/directive/calendar.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2010-07-18 19:05-0300\n"
 "PO-Revision-Date: 2010-03-14 13:57+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -85,11 +85,17 @@ msgstr ""
 "eingebunden."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "The `ikiwiki-calendar` command can be used to automatically generate the "
+#| "archive pages. It also refreshes the wiki, updating the calendars to "
+#| "highlight the current day. This command is typically run at midnight from "
+#| "cron. An example crontab:"
 msgid ""
 "The `ikiwiki-calendar` command can be used to automatically generate the "
 "archive pages. It also refreshes the wiki, updating the calendars to "
 "highlight the current day. This command is typically run at midnight from "
-"cron. An example crontab:"
+"cron."
 msgstr ""
 "Der `ikiwiki-calendar`-Befehl kann verwendet werden, um die Archivseiten "
 "automatisch zu erzeugen. Es aktualisiert auch das Wiki und hebt in den "
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.fr.po b/po/underlays/directives/ikiwiki/directive/calendar.fr.po
index 71cf94c82..0ec4e7f52 100644
--- a/po/underlays/directives/ikiwiki/directive/calendar.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/calendar.fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-17 19:07+0200\n"
+"POT-Creation-Date: 2010-07-18 19:05-0300\n"
+"PO-Revision-Date: 2010-07-20 21:54+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -18,17 +18,13 @@ msgstr ""
 msgid ""
 "The `calendar` directive is supplied by the [[!iki plugins/calendar "
 "desc=calendar]] plugin."
-msgstr ""
-"La directive `calendar` est fournie par le module d'extension [[!iki plugins/"
-"calendar desc=calendar]]."
+msgstr "La directive `calendar` est fournie par le module d'extension [[!iki plugins/calendar desc=calendar]]."
 
 #. type: Plain text
 msgid ""
 "This directive displays a calendar, similar to the typical calendars shown "
 "on some blogs."
-msgstr ""
-"Cette directive affiche un calendrier, comparable aux calendriers affichés "
-"par certains blogs."
+msgstr "Cette directive affiche un calendrier, comparable aux calendriers affichés par certains blogs."
 
 #. type: Title #
 #, no-wrap
@@ -85,11 +81,16 @@ msgstr ""
 "dans l'espace de temps donné."
 
 #. type: Plain text
+#| msgid ""
+#| "The `ikiwiki-calendar` command can be used to automatically generate the "
+#| "archive pages. It also refreshes the wiki, updating the calendars to "
+#| "highlight the current day. This command is typically run at midnight from "
+#| "cron. An example crontab:"
 msgid ""
 "The `ikiwiki-calendar` command can be used to automatically generate the "
 "archive pages. It also refreshes the wiki, updating the calendars to "
 "highlight the current day. This command is typically run at midnight from "
-"cron. An example crontab:"
+"cron."
 msgstr ""
 "La commande `ikiwiki-calendar` peut créer automatiquement les pages "
 "d'archives. Elle actualise aussi le wiki, mettant à jour les calendriers "
@@ -108,7 +109,7 @@ msgstr "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion
 #. type: Title ##
 #, no-wrap
 msgid "usage"
-msgstr "Usage"
+msgstr "utilisation"
 
 #. type: Bullet: '* '
 msgid ""
@@ -127,7 +128,6 @@ msgstr ""
 "seront liées au calendrier. La valeur par défaut est « * »."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "`archivebase` - Configures the base of the archives hierarchy. The "
 #| "default is \"archives\". Note that this default can also be overridden "
@@ -138,25 +138,18 @@ msgid ""
 "wiki by setting `archivebase` in ikiwiki's setup file.  Calendars link to "
 "pages under here, with names like \"2010/04\" and \"2010\". These pages can "
 "be automatically created using the `ikiwiki-calendar` program."
-msgstr ""
-"`archivebase` - Indique la racine des répertoires d'archives, « archives » "
-"par défaut. On peut changer cette valeur en renseignant `archivebase` dans "
-"le fichier de configuration d'ikiwiki."
+msgstr "`archivebase` - Indique la racine des répertoires d'archives, « archives » par défaut. On peut changer cette valeur en renseignant `archivebase` dans le fichier de configuration d'ikiwiki. Les calendriers se lient à des pages placées là, nommées \"2010/04\" ou \"2010\" par exemple. Ces pages peuvent être créées automatiquement par le programme `ikiwiki-calendar`."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "`year` - The year for which the calendar is requested. Defaults to the "
 #| "current year."
 msgid ""
 "`year` - The year for which the calendar is requested. Defaults to the "
 "current year. Can also use -1 to refer to last year, and so on."
-msgstr ""
-"`year` - Indique l'année pour le calendrier annuel. La valeur par défaut est "
-"l'année en cours."
+msgstr "`year` - Indique l'année pour le calendrier annuel. La valeur par défaut est l'année en cours. On peut aussi utiliser -1 pour se référer à l'année dernière, ainsi de suite."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "`month` - The numeric month for which the calendar is requested, in the "
 #| "range 1..12. Used only for the month view calendar, and defaults to the "
@@ -165,10 +158,7 @@ msgid ""
 "`month` - The numeric month for which the calendar is requested, in the "
 "range 1..12. Used only for the month view calendar, and defaults to the "
 "current month. Can also use -1 to refer to last month, and so on."
-msgstr ""
-"`month` - Ce paramètre indique le chiffre du mois (1..12) pour le "
-"calendrier. Il n'est utilisé que pour le calendrier mensuel, et la valeur "
-"par défaut est le chiffre du mois en cours."
+msgstr "`month` - Ce paramètre indique le chiffre du mois (1..12) pour le calendrier. Il n'est utilisé que pour le calendrier mensuel, et la valeur par défaut est le chiffre du mois en cours. On peut aussi utiliser -1 pour se référer au mois dernier, ainsi de suite."
 
 #. type: Bullet: '* '
 msgid ""
@@ -181,7 +171,6 @@ msgstr ""
 "etc. La valeur par défaut est 0, dimanche."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "`months_per_row` - In the annual calendar, number of months to place in "
 #| "each row. Defaults to 3."
diff --git a/po/underlays/directives/ikiwiki/directive/linkmap.fr.po b/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
index a129121ff..e0e18a3aa 100644
--- a/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/linkmap.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-03-14 22:09+0000\n"
-"PO-Revision-Date: 2010-07-17 15:53+0200\n"
+"PO-Revision-Date: 2010-07-18 10:24+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,7 @@ msgid ""
 "many pages are included, the map may get so large that graphviz cannot "
 "render it. Using the `connected` parameter is a good way to prune out pages "
 "that clutter the map."
-msgstr "Pour des résultats corrects, il vaut mieux définir l'ensemble des pages à rechercher. Sinon, le diagramme deviendra très grand, illisible et compliqué. Si l'on inclut trop de pages, le diagramme deviendra si grand que graphviz ne pourra pas l'afficher. Le paramètre `connected` permet de se débarrasser des pages qui emcombrent le diagramme."
+msgstr "Pour des résultats corrects, il vaut mieux définir l'ensemble des pages à rechercher. Sinon, le diagramme deviendra très grand, illisible et compliqué. Si l'on inclut trop de pages, le diagramme deviendra si grand que graphviz ne pourra pas l'afficher. Le paramètre `connected` permet de se débarrasser des pages qui encombrent le diagramme."
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.fr.po b/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
index 7201edc6e..f78bd9935 100644
--- a/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
@@ -38,7 +38,7 @@ msgstr ""
 msgid ""
 "Here's how to use it to create a [[tag]] cloud, with tags sized based on "
 "frequency of use:"
-msgstr "Voici comment afficher un nuage d'étiquettes [[tag]] :"
+msgstr "Voici comment afficher un nuage d'étiquettes [[tag]], avec la taille des étiquettes proportionnelle à la fréquence d'utilisation :"
 
 #. type: Plain text
 #, no-wrap
@@ -49,13 +49,13 @@ msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 msgid ""
 "Here's how to create a list of tags, sized by use as they would be in a "
 "cloud."
-msgstr ""
+msgstr "Voici comment afficher une liste d'étiquettes, avec la taille des étiquettes proportionnelle à la fréquence d'utilisation, comme pour un nuage :"
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 msgid "\t\\[[!pagestats style=\"list\" pages=\"tags/*\"]]\n"
-msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+msgstr "\t\\[[!pagestats style=\"list\" pages=\"tags/*\"]]\n"
 
 #. type: Plain text
 msgid "And here's how to create a table of all the pages on the wiki:"
@@ -108,10 +108,11 @@ msgid "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
 msgstr "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
 
 #. type: Plain text
+#, fuzzy
 msgid ""
 "The optional `class` parameter can be used to control the class of the "
 "generated tag cloud `div` or page stats `table`."
-msgstr ""
+msgstr "Le paramètre optionnel `class` permet de contrôler la classe de la `div` du nuage d'étiquettes ou du tableau `table` créée par pagestats. "
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/template.fr.po b/po/underlays/directives/ikiwiki/directive/template.fr.po
index 2e6b2dbe4..aebf31ace 100644
--- a/po/underlays/directives/ikiwiki/directive/template.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/template.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-09-12 08:39+0200\n"
+"PO-Revision-Date: 2010-07-21 18:19+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -29,9 +29,11 @@ msgid ""
 "the directive. The [[templates]] page lists templates that can be used with "
 "this directive."
 msgstr ""
+"Cette directive permet d'utiliser des pages de wiki comme modèles. Ces "
+"modèles peuvent être remplis et insérés dans d'autres pages du wiki. La page "
+"[[templates]] liste les modèles utilisables avec cette directive."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "[[Templates]] are files that can be filled out and inserted into pages in "
 #| "the wiki, by using the template directive. The directive has an `id` "
@@ -41,13 +43,11 @@ msgid ""
 "The directive has an `id` parameter that identifies the template to use. The "
 "remaining parameters are used to fill out the template."
 msgstr ""
-"Les modèles de page [[Templates]] sont des fichiers pouvant être remplis et "
-"insérés dans les pages du wiki, avec la directive template. Cette directive "
-"possède un paramètre `id` qui identifie le modèle à utiliser. Les autres "
-"paramètres servent à remplir le modèle."
+"Cette directive possède un paramètre `id` qui identifie le modèle à "
+"utiliser. Les autres paramètres servent à remplir le modèle."
 
 #. type: Title ##
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "Example:"
 msgid "Example"
 msgstr "Exemple :"
@@ -68,7 +68,7 @@ msgstr ""
 #. type: Title ##
 #, no-wrap
 msgid "Using a template"
-msgstr ""
+msgstr "Utilisation d'un modèle"
 
 #. type: Plain text
 msgid ""
@@ -77,34 +77,40 @@ msgid ""
 "included in it. Combined with multi-line quoted values, this allows for "
 "large chunks of marked up text to be embedded into a template:"
 msgstr ""
+"Une valeur peut contenir tout marquage autorisé dans une page de wiki "
+"externe au modèle. On peut même inclure des guillemets dans la valeur, en "
+"les triplant. Avec des valeurs sur plusieurs lignes entre guillemets, on "
+"peut ainsi insérer de longs passages de texte dans un modèle."
 
 #. type: Plain text
 #, no-wrap
 msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-msgstr ""
+msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
 
 #. type: Bullet: '        * '
 msgid "\\[[Charley]]'s sister."
-msgstr ""
+msgstr "\\[[Charley]]'s sister."
 
 #. type: Bullet: '        * '
 msgid "\"I want to be an astronaut when I grow up.\""
-msgstr ""
+msgstr "\"I want to be an astronaut when I grow up.\""
 
 #. type: Bullet: '        * '
 msgid "Really 8 and a half."
-msgstr ""
+msgstr "Really 8 and a half."
 
 #. type: Title ##
 #, no-wrap
 msgid "Creating a template"
-msgstr ""
+msgstr "Création d'un modèle"
 
 #. type: Plain text
 msgid ""
 "The template is a regular wiki page, located in the `templates/` "
 "subdirectory inside the source directory of the wiki."
 msgstr ""
+"Le modèle est une simple page de wiki, située dans le sous-répertoire "
+"`templates/` du répertoire source du wiki."
 
 #. type: Plain text
 msgid ""
@@ -113,6 +119,11 @@ msgid ""
 "usr/share/ikiwiki/templates`; the `templatedir` setting can be used to make "
 "another directory be searched first.)"
 msgstr ""
+"Il est aussi possible de conserver les modèles dans un répertoire extérieur "
+"au wiki, comme des fichiers avec l'extension \".tmpl\". Par défaut ces "
+"fichiers sont recherchés dans `/usr/share/ikiwiki/templates`. Le paramètre "
+"`templatedir` peut être utilisé pour commencer la recherche dans un autre "
+"répertoire."
 
 #. type: Plain text
 msgid ""
@@ -120,41 +131,45 @@ msgid ""
 "module, which allows for some fairly complex things to be done. Consult its "
 "documentation for the full syntax, but all you really need to know are a few "
 "things:"
-msgstr ""
+msgstr "Le modèle utilise la syntaxe du module Perl [[!cpan HTML::Template]] qui permet de faire des choses assez compliquées. Consultez la documentation mais vous n'avez besoin de connaître que peu de choses :"
 
 #. type: Bullet: '* '
 msgid ""
 "Each parameter you pass to the template directive will generate a template "
 "variable. There are also some pre-defined variables like PAGE and BASENAME."
 msgstr ""
+"Chaque paramètre passé à la directive template créera une variable pour le "
+"modèle. Certaines variables sont prédéfinies comme PAGE et BASENAME."
 
 #. type: Bullet: '* '
 msgid ""
 "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
 "the value will first be converted to html."
-msgstr ""
+msgstr "Pour insérer la valeur d'une variable, utilisez `<TMPL_VAR variable>`. Le marquage wiki dans la valeur sera d'abord converti en HTML."
 
 #. type: Bullet: '* '
 msgid ""
 "To insert the raw value of a variable, with wiki markup not yet converted to "
 "html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
+msgstr "Pour insérer la valeur brute d'une variable, sans conversion en HTML du marquage wiki, utilisez `<TMPL_VAR raw_variable>`."
 
 #. type: Bullet: '* '
 msgid ""
 "To make a block of text conditional on a variable being set use `<TMPL_IF "
 "variable>text</TMPL_IF>`."
 msgstr ""
+"Pour rendre un texte dépendant d'une variable, utilisez  `<TMPL_IF "
+"variable>text</TMPL_IF>`  "
 
 #. type: Bullet: '* '
 msgid ""
 "To use one block of text if a variable is set and a second if it's not, use "
 "`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
-msgstr ""
+msgstr "Pour utiliser un texte quand une variable est définie et un autre texte quand elle n'est pas définie, utilisez `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 
 #. type: Plain text
 msgid "Here's a sample template:"
-msgstr ""
+msgstr "Voici un exemple :"
 
 #. type: Plain text
 #, no-wrap
@@ -173,6 +188,19 @@ msgid ""
 "        </TMPL_IF>\n"
 "        </span>\n"
 msgstr ""
+"        <span class=\"infobox\">\n"
+"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+"        Age: <TMPL_VAR age><br />\n"
+"        <TMPL_IF color>\n"
+"        Favorite color: <TMPL_VAR color><br />\"\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF notes>\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
 
 #. type: Plain text
 msgid ""
@@ -181,6 +209,10 @@ msgid ""
 "markup in the template. Note though that such WikiLinks will not show up as "
 "backlinks to the page that uses the template."
 msgstr ""
+"Le modèle rempli sera formaté comme le reste de la page dans laquelle il se "
+"trouve. Vous pouvez donc inclure des WikiLinks ou d'autres marquages wiki "
+"dans le modèle. Cependant ces WikiLinks n'apparaîtront pas comme des "
+"rétroliens vers la page qui utilise ce modèle."
 
 #. type: Plain text
 msgid ""
@@ -189,6 +221,10 @@ msgid ""
 "might be mistaken for wiki markup, it's not converted to html before being "
 "processed as a [[ikiwiki/WikiLink]]."
 msgstr ""
+"Remarquez l'utilisation de \"raw_name\" dans [[ikiwiki/WikiLink]] de "
+"l'exemple ci-dessus. Ainsi, si le nom peut être confondu avec un marquage "
+"wiki, il n'est pas converti en html avant d'être créé en tant que [[ikiwiki/"
+"WikiLink]]."
 
 #. type: Plain text
 #, no-wrap
-- 
cgit v1.2.3


From c30f22fc83b78b8e99a220b46aa7717bbb9795b0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Jul 2010 16:59:11 -0400
Subject: releasing version 3.20100722

---
 debian/changelog |   6 +-
 ikiwiki.spec     |   2 +-
 po/bg.po         | 210 ++++++++++++++--------------
 po/cs.po         | 211 ++++++++++++++--------------
 po/da.po         | 211 ++++++++++++++--------------
 po/de.po         | 211 ++++++++++++++--------------
 po/es.po         | 211 ++++++++++++++--------------
 po/fr.po         | 414 +++++++++++++++++++++++++++++++------------------------
 po/gu.po         | 202 ++++++++++++++-------------
 po/ikiwiki.pot   | 130 ++++++++---------
 po/it.po         | 203 ++++++++++++++-------------
 po/pl.po         | 202 ++++++++++++++-------------
 po/sv.po         | 202 ++++++++++++++-------------
 po/tr.po         | 202 ++++++++++++++-------------
 po/vi.po         | 202 ++++++++++++++-------------
 15 files changed, 1464 insertions(+), 1355 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8013e5cdd..209b170eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100705) UNRELEASED; urgency=low
+ikiwiki (3.20100722) unstable; urgency=low
 
   * img: Add a margin around images displayed by this directive.
   * comments: Added commentmoderation directive for easy linking to the
@@ -20,11 +20,11 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
     the caching problem that was added to work around). Closes: #588623
   * Made much more robust in cases where multiple source files produce
     conflicting files/directories in the destdir.
-  * Updated French program translation from Philippe Batailler. Closes: #589423
+  * Updated French translation from Philippe Batailler. Closes: #589423
   * po: Fix selflink display on tranlsated pages. (intrigeri)
   * Avoid showing 'Add a comment' link at the bottom of the comment post form.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 22 Jul 2010 16:49:05 -0400
 
 ikiwiki (3.20100704) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 7c2c94376..43065b7f5 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100704
+Version: 3.20100722
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index 49dddee2b..c9fd77b8f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 14:18-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -52,7 +52,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Грешка"
 
@@ -81,51 +81,51 @@ msgstr "съобщения"
 msgid "new"
 msgstr "ново"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "премахване на „%s” (на %s дни)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "премахване на „%s”"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "проверка на източника „%s”"
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "не е намерен източник на адрес „%s”"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 #, fuzzy
 msgid "feed not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "данните от източника предизвикаха грешка в модула XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "създаване на нова страницa „%s”"
@@ -134,7 +134,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "готово"
 
@@ -167,19 +167,19 @@ msgstr ""
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -194,77 +194,81 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Няма „счупени” връзки!"
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+msgid "Comment Moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:822
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -274,7 +278,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:832
 msgid "Comment"
 msgstr ""
 
@@ -309,9 +313,9 @@ msgstr ""
 msgid "creating %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
@@ -326,12 +330,12 @@ msgstr "шаблонът „%s” не е намерен"
 msgid "match not specified"
 msgstr "не е указан файл на обвивката"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -345,12 +349,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "грешшка в приставката „fortune”"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 #, fuzzy
 msgid "missing page"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -365,22 +369,22 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -391,7 +395,7 @@ msgstr "При използване на приеставката „search” 
 msgid "failed to run graphviz"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -430,12 +434,12 @@ msgstr "грешка при запис на файла „%s”: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "грешка при запис на файла „%s”: %s"
@@ -536,7 +540,7 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "крешка при компилиране на файла %s"
@@ -613,94 +617,94 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -831,7 +835,7 @@ msgstr ""
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr ""
 
@@ -882,7 +886,7 @@ msgstr ""
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”"
@@ -1026,26 +1030,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1055,7 +1059,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
@@ -1072,47 +1076,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1129,7 +1133,7 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "cannot load %s in safe mode"
 msgstr "грешка при четене на „%s”: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "крешка при компилиране на файла %s"
@@ -1166,13 +1170,13 @@ msgid "wrapper filename not specified"
 msgstr "не е указан файл на обвивката"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "крешка при компилиране на файла %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "успешно генериране на %s"
@@ -1185,23 +1189,23 @@ msgstr "формат: ikiwiki [опции] източник местоназна
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
@@ -1209,41 +1213,41 @@ msgstr "осъвременяване на уики..."
 msgid "Discussion"
 msgstr "Дискусия"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2281
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
diff --git a/po/cs.po b/po/cs.po
index c3fb1f832..06e351841 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 14:18-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -52,7 +52,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Chyba"
 
@@ -81,50 +81,50 @@ msgstr "příspěvky"
 msgid "new"
 msgstr "nový"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "expiruji %s (stará %s dnů)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "expiruji %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr "poslední kontrola %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "kontroluji kanál %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "nemohu najít kanál na %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 msgid "feed not found"
 msgstr "kanál nebyl nalezen"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(neplatné UTF-8 bylo z kanálu odstraněno)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(entity byly v kanálu zakódovány)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "kanál shodil XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "vytvářím novou stránku %s"
@@ -133,7 +133,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr "mažu bucket..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "hotovo"
 
@@ -163,19 +163,19 @@ msgstr "stránka nazvaná %s již existuje"
 msgid "prohibited by allowed_attachments"
 msgstr "zakázáno proměnnou allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr "chybné jméno souboru s přílohou"
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr "příloha nahrána"
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr "automatické vytváření indexu"
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -192,78 +192,83 @@ msgstr "%s z %s"
 msgid "There are no broken links!"
 msgstr "Žádné porušené odkazy!"
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "komentář k %s"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 #, fuzzy
 msgid "moderation"
 msgstr "Schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nepodporovaný formát stránky %s"
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr "komentář musí mít obsah"
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+#, fuzzy
+msgid "Comment Moderation"
+msgstr "Schvalování komentářů"
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "chybný název stránky"
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, perl-format
 msgid "commenting on %s"
 msgstr "komentář k %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat"
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "komentáře na stránce „%s“ jsou uzamčeny"
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr "komentář uložen pro schválení"
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr "Váš komentář bude zobrazen po schválení moderátorem"
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr "Přidán komentář"
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Přidán komentář: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr "nejste přihlášeni jako správce"
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr "Schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr "schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:822
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -273,7 +278,7 @@ msgstr[1] "Komentáře"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:832
 #, fuzzy
 msgid "Comment"
 msgstr "Komentáře"
@@ -309,9 +314,9 @@ msgstr "%s není editovatelná stránka"
 msgid "creating %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
@@ -324,12 +329,12 @@ msgstr "nebyl zadán parametr template"
 msgid "match not specified"
 msgstr "nebyl zadán parametr match"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s byla zaregistrována pro %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -343,11 +348,11 @@ msgstr "musíte zadat formát a text"
 msgid "fortune failed"
 msgstr "fortune selhal"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 msgid "missing page"
 msgstr "chybějící stránka"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Stránka %s neexistuje."
@@ -361,22 +366,22 @@ msgstr "není stránkou"
 msgid "%s is an attachment, not a page."
 msgstr "%s není ani příloha, ani stránka."
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "nejste oprávněni měnit %s"
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -386,7 +391,7 @@ msgstr "%s musíte zadat při každém použití modulu %s"
 msgid "failed to run graphviz"
 msgstr "nepodařilo se spustit graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr "program není platným programem graphviz"
 
@@ -423,12 +428,12 @@ msgstr "nelze číst %s: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "chybné rozměry „%s“ (formát má být ŠxV)"
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "nelze určit velikost obrázku %s"
@@ -521,7 +526,7 @@ msgstr "schvalování komentářů"
 msgid "more"
 msgstr "více"
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "nelze zkompilovat %s"
@@ -596,40 +601,40 @@ msgstr "LWP nebyl nalezen, nepinkám"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není platným kódem jazyka"
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "sestavuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr "aktualizovány PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -637,7 +642,7 @@ msgstr ""
 "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
 "budou odstraněny také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -645,50 +650,50 @@ msgstr ""
 "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
 "budou přejmenovány také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT soubor (%s) neexistuje"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nepodařilo se zkopírovat PO soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, perl-format
 msgid "failed to update %s"
 msgstr "nepodařilo se aktualizovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nepodařilo se zkopírovat POT soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, perl-format
 msgid "failed to translate %s"
 msgstr "nepodařilo se přeložit %s"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr "odstraněny zastaralé PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, perl-format
 msgid "failed to write %s"
 msgstr "nepodařilo se zapsat %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 msgid "failed to translate"
 msgstr "překlad se nezdařil"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
@@ -819,7 +824,7 @@ msgstr "potvrďte odstranění %s"
 msgid "Please select the attachments to remove."
 msgstr "Vyberte prosím přílohy, které se mají odstranit."
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr "odstraněno"
 
@@ -869,7 +874,7 @@ msgstr "Vyberte přílohu, kterou chcete přejmenovat."
 msgid "rename %s to %s"
 msgstr "přejmenování %s na %s"
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizace pro přejmenování %s na %s"
@@ -1004,20 +1009,20 @@ msgstr "moduly"
 msgid "enable %s?"
 msgstr "povolit %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr "konfigurační soubor této wiki je neznámý"
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr "hlavní"
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1025,7 +1030,7 @@ msgstr ""
 "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset "
 "znovusestavit wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1037,7 +1042,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr "nemohu určit identitu nedůvěryhodného uživatele %s"
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, perl-format
 msgid "bad file name %s"
 msgstr "chybné jméno souboru %s"
@@ -1056,47 +1061,47 @@ msgstr ""
 "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-"
 "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s má několik možných zdrojových stránek"
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "sestavuji %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "odstraňuji %s, již není sestavována pomocí %s"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "sestavuji %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze sestavit %s"
@@ -1113,7 +1118,7 @@ msgstr "nemohu číst %s: %s"
 msgid "cannot load %s in safe mode"
 msgstr "nemohu číst %s: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "nepodařilo se aktualizovat %s"
@@ -1150,13 +1155,13 @@ msgid "wrapper filename not specified"
 msgstr "jméno souboru s obalem nebylo zadáno"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "nelze zkompilovat %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s byl úspěšně vytvořen"
@@ -1169,24 +1174,24 @@ msgstr "použití: ikiwiki [volby] zdroj cíl"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup konfigurační.soubor"
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr "použití: --set proměnná=hodnota"
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "použití: --set proměnná=hodnota"
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "znovusestavuji wiki..."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
@@ -1194,39 +1199,39 @@ msgstr "obnovuji wiki..."
 msgid "Discussion"
 msgstr "Diskuse"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr "nelze použít několik rcs modulů"
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2281
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
diff --git a/po/da.po b/po/da.po
index fb0ec754d..cb550fa4f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 14:18-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -56,7 +56,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Fejl"
 
@@ -85,50 +85,50 @@ msgstr "indlæg"
 msgid "new"
 msgstr "nyt"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "udløber %s (%s dage gammel)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "udløber %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr "senest undersøgt %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "undersøger fødning %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "kunne ikke finde fødning ved %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 msgid "feed not found"
 msgstr "fødning ikke fundet"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(defekt UTF-8 fjernet fra fødning)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(fødningselementer omgået (escaped))"
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "fødning fik XML::Feed til at bryde sammen!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "opretter ny side %s"
@@ -137,7 +137,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "færdig"
 
@@ -170,19 +170,19 @@ msgstr "der er allerede en side ved navn %s"
 msgid "prohibited by allowed_attachments"
 msgstr "forhindret af allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr "dårligt vedhæftningsfilnavn"
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr "vedhæftningsoplægning"
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr "automatisk indeks-dannelse"
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -199,78 +199,83 @@ msgstr "%s fra %s"
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "kommenterer på %s"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 #, fuzzy
 msgid "moderation"
 msgstr "Kommentarmoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Ikke-understøttet sideformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr "kommentar skal have indhold"
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+#, fuzzy
+msgid "Comment Moderation"
+msgstr "Kommentarmoderering"
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "dårligt sidenavn"
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommenterer på %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere"
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "kommentarer på side '%s' er lukket"
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr "kommentar gemt for moderering"
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn"
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr "Tilføjede en kommentar"
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr "Kommentarmoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr "kommentarkoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:822
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -280,7 +285,7 @@ msgstr[1] "Kommentarer"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:832
 #, fuzzy
 msgid "Comment"
 msgstr "Kommentarer"
@@ -316,9 +321,9 @@ msgstr "%s er ikke en redigérbar side"
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "redigerer %s"
@@ -331,12 +336,12 @@ msgstr "skabelon %s ikke angivet"
 msgid "match not specified"
 msgstr "sammenligning ikke angivet"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "redigeringsskabelon %s registreret for %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -350,11 +355,11 @@ msgstr "skal angive format og tekst"
 msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 msgid "missing page"
 msgstr "manglende side"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Siden %s eksisterer ikke."
@@ -369,22 +374,22 @@ msgstr "kan ikke få sider til at passe sammen: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Du har ikke lov til at ændre %s"
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "du kan ikke påvirke en fil med modus %s"
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -394,7 +399,7 @@ msgstr "Skal angive %s når udvidelsen %s bruges"
 msgid "failed to run graphviz"
 msgstr "graphviz-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr "prog er ikke et gyldigt graphviz-program"
 
@@ -434,12 +439,12 @@ msgstr "læsning af %s mislykkedes: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "forkert størrelsesformat \"%s\" (burde være WxH)"
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Ændring af størrelse mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Vurdering af billedstørrelse mislykkedes: %s"
@@ -534,7 +539,7 @@ msgstr "kommentarkoderering"
 msgid "more"
 msgstr "mere"
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "kompilering af %s mislykkedes"
@@ -610,12 +615,12 @@ msgstr "LWP ikke fundet, pinger ikke"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -623,7 +628,7 @@ msgstr ""
 "%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -631,21 +636,21 @@ msgstr ""
 "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -653,7 +658,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -661,50 +666,50 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -834,7 +839,7 @@ msgstr "bekræft at %s bliver fjernet"
 msgid "Please select the attachments to remove."
 msgstr "Vælg vedhæftning der skal slettes."
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr "fjernet"
 
@@ -884,7 +889,7 @@ msgstr "Vælg vedhæftningen som skal omdøbes."
 msgid "rename %s to %s"
 msgstr "omdøb %s til %s"
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "opdatering til omdøbning af %s til %s"
@@ -1019,22 +1024,22 @@ msgstr "udvidelser"
 msgid "enable %s?"
 msgstr "aktivér %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr "opsætningsfilen for denne wiki er ukendt"
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr "primær"
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i "
 "kraft."
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1042,7 +1047,7 @@ msgstr ""
 "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du "
 "muligvis genopbygge wikien."
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
@@ -1052,7 +1057,7 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
 msgid "cannot determine id of untrusted committer %s"
 msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, perl-format
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
@@ -1071,47 +1076,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1128,7 +1133,7 @@ msgstr "kan ikke læse %s: %s"
 msgid "cannot load %s in safe mode"
 msgstr "kan ikke læse %s: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "opdatering af %s mislykkedes"
@@ -1165,13 +1170,13 @@ msgid "wrapper filename not specified"
 msgstr "wrapper-navn ikke angivet"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "kompilering af %s mislykkedes"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "Korrekt bygget %s"
@@ -1184,24 +1189,24 @@ msgstr "brug: ikiwiki [valg] kilde mål"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup opsætningsfil"
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "bygger wrappers.."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
@@ -1209,40 +1214,40 @@ msgstr "genopfrisker wiki..."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2281
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
diff --git a/po/de.po b/po/de.po
index 1cfc57886..a47add580 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 14:18-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2010-03-14 16:09+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -53,7 +53,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Fehler"
 
@@ -82,50 +82,50 @@ msgstr "Beiträge"
 msgid "new"
 msgstr "neu"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "%s läuft aus (%s Tage alt)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "%s läuft aus"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr "zuletzt geprüft %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "überprüfe Vorlage (feed) %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "konnte Vorlage (feed) unter %s nicht finden"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 msgid "feed not found"
 msgstr "Vorlage (feed) nicht gefunden"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(ungültiges UTF-8 wurde aus der Vorlage (feed) entfernt)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(Einträge in der Vorlage (feed) wurden maskiert)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "erstelle neue Seite %s"
@@ -134,7 +134,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr "lösche Behälter (bucket)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "fertig"
 
@@ -165,19 +165,19 @@ msgstr "eine Seite mit dem Namen %s existiert bereits"
 msgid "prohibited by allowed_attachments"
 msgstr "durch allowed_attachements verboten"
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr "fehlerhafter Dateiname für Anhang"
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr "Anhang hochladen"
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr "automatische Index-Erstellung"
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -194,79 +194,84 @@ msgstr "%s von %s"
 msgid "There are no broken links!"
 msgstr "Es gibt keine ungültigen Verweise!"
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "kommentiere %s"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 #, fuzzy
 msgid "moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nicht unterstütztes Seitenformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr "ein Kommentar sollte Inhalt haben"
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+#, fuzzy
+msgid "Comment Moderation"
+msgstr "Kommentar-Moderation"
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "fehlerhafter Seitenname"
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommentiere %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 "Seite %s existiert nicht, Sie können sie deshalb auch nicht kommentieren"
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Kommentare zur Seite %s sind gesperrt"
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr "Der Kommentar wurde zur Moderation gespeichert"
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr "Ihr Kommentar wird nach Moderation verschickt"
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr "Kommentar hinzugefügt"
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Kommentar hinzugefügt: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr "Sie sind nicht als Administrator angemeldet"
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:822
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -276,7 +281,7 @@ msgstr[1] "%i Kommentare"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:832
 msgid "Comment"
 msgstr "Kommentieren"
 
@@ -311,9 +316,9 @@ msgstr "Seite %s kann nicht bearbeitet werden"
 msgid "creating %s"
 msgstr "erstelle %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "bearbeite %s"
@@ -326,12 +331,12 @@ msgstr "Vorlage nicht angegeben"
 msgid "match not specified"
 msgstr "Übereinstimmung nicht angegeben"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s für %s registriert"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -345,11 +350,11 @@ msgstr "Format und Text müssen spezifiziert werden"
 msgid "fortune failed"
 msgstr "fortune fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 msgid "missing page"
 msgstr "fehlende Seite"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Die Seite %s existiert nicht."
@@ -363,22 +368,22 @@ msgstr "Keine Seite"
 msgid "%s is an attachment, not a page."
 msgstr "Seite %s ist ein Anhang und keine Seite."
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Sie dürfen %s nicht verändern"
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -388,7 +393,7 @@ msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird"
 msgid "failed to run graphviz"
 msgstr "graphviz konnte nicht ausgeführt werden"
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr "prog ist kein gültiges graphviz-Programm"
 
@@ -427,12 +432,12 @@ msgstr "Lesen von %s fehlgeschlagen: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "falsches Format in \"%s\" für size (sollte BxH sein)"
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Größenänderung fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Größe des Bildes %s konnte nicht festgestellt werden."
@@ -529,7 +534,7 @@ msgstr "Kommentar muss moderiert werden"
 msgid "more"
 msgstr "mehr"
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "erzeugen von %s fehlgeschlagen"
@@ -606,12 +611,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35"
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist keine gültige Sprachkodierung"
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -619,7 +624,7 @@ msgstr ""
 "%s ist kein gültiger Wert für po_link_to, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -627,21 +632,21 @@ msgstr ""
 "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -649,7 +654,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -657,50 +662,50 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -833,7 +838,7 @@ msgstr "bestätigen Sie die Entfernung von %s"
 msgid "Please select the attachments to remove."
 msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus."
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr "entfernt"
 
@@ -883,7 +888,7 @@ msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll."
 msgid "rename %s to %s"
 msgstr "benenne %s in %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualisiert zum Umbenennen von %s nach %s"
@@ -1018,22 +1023,22 @@ msgstr "%s-Erweiterungen"
 msgid "enable %s?"
 msgstr "%s aktivieren?"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt"
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr "Hauptseite"
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des "
 "Wikis, um wirksam zu werden."
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1041,7 +1046,7 @@ msgstr ""
 "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam "
 "werden, kann es notwendig sein, das Wikis neu zu bauen."
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1054,7 +1059,7 @@ msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 "id des nicht vertrauenswürdigen Absenders %s konnte nicht feststellt werden"
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, perl-format
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
@@ -1073,47 +1078,47 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1130,7 +1135,7 @@ msgstr "kann %s nicht lesen: %s"
 msgid "cannot load %s in safe mode"
 msgstr "kann %s nicht lesen: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
@@ -1170,13 +1175,13 @@ msgid "wrapper filename not specified"
 msgstr "Dateiname des Wrappers nicht angegeben"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "erzeugen von %s fehlgeschlagen"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s wurde erfolgreich erstellt"
@@ -1189,24 +1194,24 @@ msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup Konfigurationsdatei"
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr "Aufruf: --set Variable=Wert"
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "Aufruf: --set Variable=Wert"
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper.."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
@@ -1214,42 +1219,42 @@ msgstr "aktualisiere Wiki.."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2281
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
diff --git a/po/es.po b/po/es.po
index 34c704238..d9155a921 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 14:18-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -57,7 +57,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Error"
 
@@ -87,50 +87,50 @@ msgstr "entradas"
 msgid "new"
 msgstr "nuevo"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "%s caducada (%s días de antigüedad)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "%s caducada"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr "última comprobación el %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "comprobando fuente de datos %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "no puedo encontrar la fuente de datos en %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 msgid "feed not found"
 msgstr "fuente de datos no encontrada"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(los caracteres especiales de la fuente de datos están exceptuados)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "creando nueva página %s"
@@ -139,7 +139,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "completado"
 
@@ -172,19 +172,19 @@ msgstr "ya existe una página de nombre %s"
 msgid "prohibited by allowed_attachments"
 msgstr "prohibido por la claúsula allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr "nombre de archivo adjunto erróneo"
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr "enviado el adjunto"
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr "creación de índice automática"
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -201,78 +201,83 @@ msgstr "%s desde la página %s"
 msgid "There are no broken links!"
 msgstr "¡ No hay enlaces rotos !"
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "creando comentarios en la página %s"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 #, fuzzy
 msgid "moderation"
 msgstr "Aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato de página %s no soportado"
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr "Un comentario debe tener algún contenido"
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+#, fuzzy
+msgid "Comment Moderation"
+msgstr "Aprobación de comentarios"
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nombre de página erróneo"
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, perl-format
 msgid "commenting on %s"
 msgstr "creando comentarios en la página %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "la página '%s' no existe, así que no se puede comentar sobre ella"
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "los comentarios para la página '%s' están cerrados"
 
-#: ../IkiWiki/Plugin/comments.pm:490
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr "comentario guardado a la espera de aprobación"
 
-#: ../IkiWiki/Plugin/comments.pm:492
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr "Su comentario será publicado después de que el moderador lo revise"
 
-#: ../IkiWiki/Plugin/comments.pm:505
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr "Añadir un comentario"
 
-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr "No está registrado como un administrador"
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr "Aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:640
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr "aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:789
+#: ../IkiWiki/Plugin/comments.pm:822
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -282,7 +287,7 @@ msgstr[1] "Comentarios"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:799
+#: ../IkiWiki/Plugin/comments.pm:832
 #, fuzzy
 msgid "Comment"
 msgstr "Comentarios"
@@ -318,9 +323,9 @@ msgstr "la página %s no es modificable"
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
-#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
-#: ../IkiWiki/Plugin/editpage.pm:424
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
@@ -333,12 +338,12 @@ msgstr "falta indicar la plantilla (template)"
 msgid "match not specified"
 msgstr "falta indicar la coincidencia de páginas (match)"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "plantilla de edición %s registrada para %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -352,11 +357,11 @@ msgstr "se deben especificar tanto el formato como el texto"
 msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 msgid "missing page"
 msgstr "página no encontrada"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "No existe la página %s."
@@ -371,22 +376,22 @@ msgstr "no encuentro páginas coincidentes: %s"
 msgid "%s is an attachment, not a page."
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No puede cambiar %s"
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "no puede actuar sobre un archivo con permisos %s"
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -396,7 +401,7 @@ msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda"
 msgid "failed to run graphviz"
 msgstr "no he podido ejecutar el programa graphviz "
 
-#: ../IkiWiki/Plugin/graphviz.pm:90
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr "prog no es un programa graphviz válido "
 
@@ -436,12 +441,12 @@ msgstr "no puedo leer de %s: %s "
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "no he podido determinar el tamaño de la imagen %s"
@@ -538,7 +543,7 @@ msgstr "aprobación de comentarios"
 msgid "more"
 msgstr "ver más"
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "ha fallado la compilación del programa %s"
@@ -618,94 +623,94 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -834,7 +839,7 @@ msgstr "confirme el borrado de %s"
 msgid "Please select the attachments to remove."
 msgstr "Por favor seleccione los adjuntos que serán borrados."
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr "borrado"
 
@@ -884,7 +889,7 @@ msgstr "Por favor, seleccione el adjunto al que cambiar el nombre."
 msgid "rename %s to %s"
 msgstr "%s cambia de nombre a %s"
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "actualizado el cambio de nombre de %s a %s"
@@ -1023,22 +1028,22 @@ msgstr "complementos"
 msgid "enable %s?"
 msgstr "¿ activar %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr "El archivo de configuración para este wiki es desconocido"
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr "principal"
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Los cambios en la configuración que se muestran más abajo precisan una "
 "reconstrucción del wiki para tener efecto."
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1046,7 +1051,7 @@ msgstr ""
 "Para que los cambios en la configuración mostrados más abajo tengan efecto, "
 "es posible que necesite reconstruir el wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1058,7 +1063,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, perl-format
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
@@ -1077,49 +1082,49 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1136,7 +1141,7 @@ msgstr "no puedo leer el archivo %s: %s"
 msgid "cannot load %s in safe mode"
 msgstr "no puedo leer el archivo %s: %s"
 
-#: ../IkiWiki/Setup.pm:46
+#: ../IkiWiki/Setup.pm:47
 #, fuzzy, perl-format
 msgid "failed to parse %s"
 msgstr "ha fallado la compilación del programa %s"
@@ -1175,13 +1180,13 @@ msgid "wrapper filename not specified"
 msgstr "el programa envoltorio no ha sido especificado"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "ha fallado la compilación del programa %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "creado con éxito el programa envoltorio %s"
@@ -1194,24 +1199,24 @@ msgstr "uso: ikiwiki [opciones] origen destino"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup archivo_de_configuración"
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
@@ -1219,43 +1224,43 @@ msgstr "actualizando el wiki.."
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:2061
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2082
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2218
+#: ../IkiWiki.pm:2281
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
diff --git a/po/fr.po b/po/fr.po
index 94e6d6b02..a080dcd34 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,19 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 22:18-0500\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2010-07-17 18:13+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:116
-msgid "You need to log in first."
-msgstr "Vous devez d'abord vous identifier."
-
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:162
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
@@ -29,35 +26,35 @@ msgstr ""
 "Erreur de configuration probable : sslcookie est positionné mais vous tentez "
 "de vous connecter avec http au lieu de https"
 
-#: ../IkiWiki/CGI.pm:152
+#: ../IkiWiki/CGI.pm:165
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Échec de l'identification, vous devez autoriser les cookies."
 
-#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
 msgid "Your login session has expired."
 msgstr "Session d'authentification expirée."
 
-#: ../IkiWiki/CGI.pm:192
+#: ../IkiWiki/CGI.pm:205
 msgid "Login"
 msgstr "S’identifier"
 
-#: ../IkiWiki/CGI.pm:193
+#: ../IkiWiki/CGI.pm:206
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../IkiWiki/CGI.pm:194
+#: ../IkiWiki/CGI.pm:207
 msgid "Admin"
 msgstr "Administrateur"
 
-#: ../IkiWiki/CGI.pm:234
+#: ../IkiWiki/CGI.pm:247
 msgid "Preferences saved."
 msgstr "Les préférences ont été enregistrées."
 
-#: ../IkiWiki/CGI.pm:284
+#: ../IkiWiki/CGI.pm:299
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Erreur"
 
@@ -86,50 +83,50 @@ msgstr "Articles"
 msgid "new"
 msgstr "Nouveau"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "Fin de validité de %s (date de %s jours)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "Fin de validité de %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr "dernière vérification : %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "Vérification du flux %s..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "Impossible de trouver de flux à %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 msgid "feed not found"
 msgstr "Flux introuvable "
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(chaîne UTF-8 non valable supprimée du flux)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(échappement des entités de flux)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "Plantage du flux XML::Feed !"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "Création de la nouvelle page %s"
@@ -138,7 +135,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "Suppression du compartiment S3 (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "Terminé"
 
@@ -168,19 +165,19 @@ msgstr "Il existe déjà une page nommée %s"
 msgid "prohibited by allowed_attachments"
 msgstr "Action interdite par allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr "Nom de la pièce jointe incorrect"
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr "Envoi de la pièce jointe"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr "Génération de l'index automatique"
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -197,68 +194,83 @@ msgstr "%s sur %s"
 msgid "There are no broken links!"
 msgstr "Aucun lien cassé !"
 
-#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:113
+#, fuzzy, perl-format
+msgid "this comment needs %s"
+msgstr "Faire un commentaire sur %s"
+
+#: ../IkiWiki/Plugin/comments.pm:116
+#, fuzzy
+msgid "moderation"
+msgstr "Modération du commentaire"
+
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Format de page non reconnu %s"
 
-#: ../IkiWiki/Plugin/comments.pm:130
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr "Un commentaire doit avoir un contenu."
 
-#: ../IkiWiki/Plugin/comments.pm:185
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+#, fuzzy
+msgid "Comment Moderation"
+msgstr "Modération du commentaire"
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "Nom de page incorrect"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:377
 #, perl-format
 msgid "commenting on %s"
 msgstr "Faire un commentaire sur %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "La page '%s' n'existe pas, commentaire impossible."
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Le commentaire pour la page '%s' est terminé."
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr "Le commentaire a été enregistré, en attente de « modération »"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr "Votre commentaire sera publié après vérification par le modérateur"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr "Commentaire ajouté"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr "Vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr "Modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr "modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:822
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -268,7 +280,7 @@ msgstr[1] "%i commentaires"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:832
 msgid "Comment"
 msgstr "poster un commentaire"
 
@@ -298,14 +310,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s"
 msgid "%s is not an editable page"
 msgstr "%s n'est pas une page éditable"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:294
 #, perl-format
 msgid "creating %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "Édition de %s"
@@ -318,14 +330,16 @@ msgstr "modèle (« template ») non indiqué"
 msgid "match not specified"
 msgstr "correspondance non indiquée"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s enregistré pour %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "Échec du traitement"
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "Échec du traitement :"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -335,11 +349,11 @@ msgstr "le format et le texte doivent être indiqués"
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 msgid "missing page"
 msgstr "Page manquante"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La page %s n'existe pas."
@@ -353,22 +367,22 @@ msgstr "Ce n'est pas une page."
 msgid "%s is an attachment, not a page."
 msgstr "%s est une pièce jointe, pas une page."
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Vous n'êtes pas autorisé à modifier %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -378,7 +392,7 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s."
 msgid "failed to run graphviz"
 msgstr "Échec du lancement de graphviz"
 
-#: ../IkiWiki/Plugin/graphviz.pm:95
+#: ../IkiWiki/Plugin/graphviz.pm:91
 msgid "prog not a valid graphviz program"
 msgstr "Ce programme n'est pas un programme graphviz valable"
 
@@ -417,12 +431,12 @@ msgstr "Échec de la lecture de %s : %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)"
 
-#: ../IkiWiki/Plugin/img.pm:125
+#: ../IkiWiki/Plugin/img.pm:122
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/img.pm:145
+#: ../IkiWiki/Plugin/img.pm:146
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Échec de la détermination de la taille de l'image : %s"
@@ -450,12 +464,12 @@ msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble."
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "Le modèle de page %s n'existe pas"
+msgid "template %s not found"
+msgstr "Modèle de page %s introuvable"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:633
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -484,18 +498,23 @@ msgstr ""
 "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown "
 "(%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "Feuille de style introuvable "
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "Page de redirection introuvable"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "Redirection cyclique non autorisée"
 
+#: ../IkiWiki/Plugin/meta.pm:387
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "les paramètres « from » et « to » sont nécessaires."
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Miroirs"
@@ -504,7 +523,7 @@ msgstr "Miroirs"
 msgid "Mirror"
 msgstr "Miroir"
 
-#: ../IkiWiki/Plugin/moderatedcomments.pm:42
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
 msgid "comment needs moderation"
 msgstr "le commentaire doit passer par une instance de modération"
 
@@ -512,17 +531,10 @@ msgstr "le commentaire doit passer par une instance de modération"
 msgid "more"
 msgstr "lire la suite"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime n'est pas implémenté"
-
-#: ../IkiWiki/Plugin/openid.pm:62
-msgid "Log in with"
-msgstr "S'identifier en tant que"
-
-#: ../IkiWiki/Plugin/openid.pm:65
-msgid "Get an OpenID"
-msgstr "Obtenir un compte OpenID"
+#: ../IkiWiki/Plugin/openid.pm:70
+#, fuzzy, perl-format
+msgid "failed to load openid module: "
+msgstr "Échec de la compilation de %s"
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
@@ -532,43 +544,43 @@ msgstr "Toutes les pages sont liées à d'autres pages."
 msgid "bad or missing template"
 msgstr "Modèle de page incorrect ou manquant"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr "Votre page d'utilisateur :"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr "Création de votre page d'utilisateur"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Erreur lors de la création du compte."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Aucune adresse indiquée. Impossible d'envoyer les instructions pour "
 "réinitialiser le mot de passe."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Impossible d'envoyer un courriel"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Vous avez reçu un message contenant les instructions pour réinitialiser le "
 "mot de passe"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "Adresse pour la réinitialisation du mot de passe incorrecte"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "réinitialisation du mot de passe refusée"
 
@@ -600,12 +612,12 @@ msgstr ""
 "Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
 "version 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un code de langue valable"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -613,7 +625,7 @@ msgstr ""
 "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
 "défaut."
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -621,23 +633,23 @@ msgstr ""
 "po_link_to=negotiated nécessite que usedirs soit activé, retour à "
 "po_link_to=default."
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -645,7 +657,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -653,50 +665,50 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:911
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:917
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:964
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1115
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -798,7 +810,8 @@ msgstr "pourcentage %s illégal"
 #: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
-"L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire."
+"L'un des paramètres « percent », « totalpages » ou « donepages » est "
+"nécessaire."
 
 #: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
@@ -819,16 +832,16 @@ msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé"
 msgid "%s is not a file"
 msgstr "%s n'est pas un fichier"
 
-#: ../IkiWiki/Plugin/remove.pm:135
+#: ../IkiWiki/Plugin/remove.pm:137
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "Suppression de %s confirmée"
 
-#: ../IkiWiki/Plugin/remove.pm:172
+#: ../IkiWiki/Plugin/remove.pm:174
 msgid "Please select the attachments to remove."
 msgstr "Veuillez choisir la pièce jointe à supprimer"
 
-#: ../IkiWiki/Plugin/remove.pm:212
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr "supprimé"
 
@@ -841,44 +854,44 @@ msgstr "%s n'est pas dans srcdir. Impossible de le renommer"
 msgid "no change to the file name was specified"
 msgstr "Aucun changement dans le nom du fichier n'a été spécifié"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "Appellation interdite"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s existe déjà sur le disque"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "%s renommé"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:163
 msgid "Also rename SubPages and attachments"
 msgstr "« SubPages » et attachements renommés."
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:250
 msgid "Only one attachment can be renamed at a time."
 msgstr "Modification de pièce jointe : une seule à la fois"
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:253
 msgid "Please select the attachment to rename."
 msgstr "Veuillez sélectionner la pièce jointe à renommer"
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:352
 #, perl-format
 msgid "rename %s to %s"
 msgstr "Renomme %s en %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:577
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "mise à jour, suite au changement de %s en %s"
@@ -893,12 +906,12 @@ msgstr "Impossible d'exécuter la commande rsync : %s"
 msgid "rsync_command exited %d"
 msgstr "la commande rsync s'est terminée avec le code : %d"
 
-#: ../IkiWiki/Plugin/search.pm:183
+#: ../IkiWiki/Plugin/search.pm:194
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr "Digest::SHA1 est nécessaire pour indexer %s"
 
-#: ../IkiWiki/Plugin/search.pm:218
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr "recherche"
 
@@ -976,58 +989,59 @@ msgstr "Téléchargement direct des données"
 msgid "parse fail at line %d: %s"
 msgstr "Erreur d'analyse à la ligne %d : %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "Création de la nouvelle page %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "Paramètre d'identification manquant"
 
-#: ../IkiWiki/Plugin/template.pm:41
-#, perl-format
-msgid "template %s not found"
-msgstr "Modèle de page %s introuvable"
-
-#: ../IkiWiki/Plugin/template.pm:60
-msgid "failed to process:"
-msgstr "Échec du traitement :"
+#: ../IkiWiki/Plugin/template.pm:47
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "Flux introuvable "
 
-#: ../IkiWiki/Plugin/teximg.pm:71
+#: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr "Il manque le code TeX"
 
-#: ../IkiWiki/Plugin/teximg.pm:123
+#: ../IkiWiki/Plugin/teximg.pm:124
 msgid "failed to generate image from code"
 msgstr "Échec de la création de l'image à partir du code"
 
-#: ../IkiWiki/Plugin/websetup.pm:91
+#: ../IkiWiki/Plugin/websetup.pm:105
 #, perl-format
 msgid "%s plugin:"
 msgstr "greffon %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:107
+#: ../IkiWiki/Plugin/websetup.pm:121
 #, perl-format
 msgid "%s plugins"
 msgstr "Greffons %s"
 
-#: ../IkiWiki/Plugin/websetup.pm:121
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr "activer %s ?"
 
-#: ../IkiWiki/Plugin/websetup.pm:260
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr "Le fichier de configuration de ce wiki n'est pas connu"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr "Partie principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:419
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Les changements de configuration ci-dessous nécessitent une recompilation du "
 "wiki pour prendre effet"
 
-#: ../IkiWiki/Plugin/websetup.pm:423
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1035,7 +1049,7 @@ msgstr ""
 "Pour que les changements de configuration ci-dessous prennent effet vous "
 "devez recompiler le wiki"
 
-#: ../IkiWiki/Plugin/websetup.pm:460
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées."
@@ -1046,17 +1060,17 @@ msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 "Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)"
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, perl-format
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:158
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:280
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1065,69 +1079,84 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:446
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:520
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:529
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:836
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr "Lecture impossible de %s : %s"
 
+#: ../IkiWiki/Setup.pm:34
+#, fuzzy, perl-format
+msgid "cannot load %s in safe mode"
+msgstr "Lecture impossible de %s : %s"
+
+#: ../IkiWiki/Setup.pm:47
+#, fuzzy, perl-format
+msgid "failed to parse %s"
+msgstr "Impossible de mettre à jour %s"
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 "Vous devez spécifier un nom de wiki (contenant des caractères "
 "alphanumériques)"
 
-#: ../IkiWiki/Setup/Automator.pm:82
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr "Système de contrôle de version non reconnu : %s"
 
-#: ../IkiWiki/Setup/Automator.pm:108
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 
-#: ../IkiWiki/Setup/Automator.pm:126
+#: ../IkiWiki/Setup/Automator.pm:134
 #, perl-format
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
@@ -1149,13 +1178,13 @@ msgid "wrapper filename not specified"
 msgstr "Le nom du fichier CGI n'a pas été indiqué"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:149
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Échec de la compilation de %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:169
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s a été créé avec succès"
@@ -1168,59 +1197,65 @@ msgstr "Syntaxe : ikiwiki [options] source destination"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup fichier de configuration"
 
-#: ../ikiwiki.in:92
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:142
+#: ../ikiwiki.in:112
+#, fuzzy
+msgid "usage: --set-yaml var=value"
+msgstr "Syntaxe : -- set var=valeur"
+
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:205
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:208
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:232
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:514
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:560
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:589
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1262
+#: ../IkiWiki.pm:1352
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1877
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:2020
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
+#: ../IkiWiki.pm:2124
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2031
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2050
+#: ../IkiWiki.pm:2281
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
@@ -1245,6 +1280,27 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "You need to log in first."
+#~ msgstr "Vous devez d'abord vous identifier."
+
+#~ msgid "failed to process"
+#~ msgstr "Échec du traitement"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "Le modèle de page %s n'existe pas"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime n'est pas implémenté"
+
+#~ msgid "Log in with"
+#~ msgstr "S'identifier en tant que"
+
+#~ msgid "Get an OpenID"
+#~ msgstr "Obtenir un compte OpenID"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
+
 #~ msgid "failed to read %s"
 #~ msgstr "Impossible de lire %s"
 
@@ -1268,5 +1324,5 @@ msgstr "Nom de domaine du serveur HTTP :"
 
 #~ msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 #~ msgstr ""
-#~ "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero (%"
-#~ "s)"
+#~ "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero "
+#~ "(%s)"
diff --git a/po/gu.po b/po/gu.po
index c0dfb145b..8e796f51f 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 15:02-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -51,7 +51,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -80,50 +80,50 @@ msgstr "પોસ્ટ"
 msgid "new"
 msgstr "નવું"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "જુનું કરે છે %s (%s દિવસો જુનું)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "જુનું કરે છે %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "ફીડ %s ચકાસે છે ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "%s પર ફીડ મળી શક્યું નહી"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 msgid "feed not found"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, fuzzy, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે"
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "ફીડ ભાંગી ગયું XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "નવું પાનું %s બનાવે છે"
@@ -132,7 +132,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -165,19 +165,19 @@ msgstr ""
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -192,77 +192,81 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "અહીં કોઇ તૂટેલ કડી નથી!"
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+msgid "Comment Moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:491
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:493
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:506
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:510
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:603
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:641
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:790
+#: ../IkiWiki/Plugin/comments.pm:822
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -272,7 +276,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:800
+#: ../IkiWiki/Plugin/comments.pm:832
 msgid "Comment"
 msgstr ""
 
@@ -307,9 +311,9 @@ msgstr "%s એ સુધારી શકાય તેવું પાનું 
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
-#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
-#: ../IkiWiki/Plugin/editpage.pm:429
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
@@ -324,12 +328,12 @@ msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 msgid "match not specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -343,12 +347,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 #, fuzzy
 msgid "missing page"
 msgstr "ખોવાયેલ કિંમતો"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -363,22 +367,22 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -526,7 +530,7 @@ msgstr ""
 msgid "more"
 msgstr "વધુ"
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
@@ -603,94 +607,94 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -821,7 +825,7 @@ msgstr ""
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr ""
 
@@ -872,7 +876,7 @@ msgstr ""
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "%s નો સુધારો %s નાં %s વડે"
@@ -1013,26 +1017,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1042,7 +1046,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
@@ -1059,47 +1063,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1153,13 +1157,13 @@ msgid "wrapper filename not specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
@@ -1172,23 +1176,23 @@ msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
@@ -1196,39 +1200,39 @@ msgstr "વીકીને તાજી કરે છે.."
 msgid "Discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1993
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2070
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2091
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2227
+#: ../IkiWiki.pm:2281
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index bb0d6e526..e42195ecb 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-04 16:46-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1324
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr ""
 
@@ -81,50 +81,50 @@ msgstr ""
 msgid "new"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 msgid "feed not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr ""
@@ -133,7 +133,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr ""
 
@@ -190,77 +190,81 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, perl-format
 msgid "this comment needs %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+msgid "Comment Moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:495
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:497
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:510
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:514
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:558 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:610
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:650
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:807
+#: ../IkiWiki/Plugin/comments.pm:822
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -270,7 +274,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:817
+#: ../IkiWiki/Plugin/comments.pm:832
 msgid "Comment"
 msgstr ""
 
@@ -338,11 +342,11 @@ msgstr ""
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -371,7 +375,7 @@ msgstr ""
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -588,93 +592,93 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:455
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:475
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:875
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:889
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:898
+#: ../IkiWiki/Plugin/po.pm:911
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:904
+#: ../IkiWiki/Plugin/po.pm:917
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:940
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:951
+#: ../IkiWiki/Plugin/po.pm:964
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1035
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1104
-#: ../IkiWiki/Plugin/po.pm:1143
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1102
+#: ../IkiWiki/Plugin/po.pm:1115
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1155
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -1147,23 +1151,23 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1184,26 +1188,26 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1306
+#: ../IkiWiki.pm:1352
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:2001
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2078
+#: ../IkiWiki.pm:2124
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2099
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2235
+#: ../IkiWiki.pm:2281
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index e6fd4b42f..8ebf695f4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 15:02-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -50,7 +50,7 @@ msgstr "Preferenze salvate."
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Errore"
 
@@ -80,50 +80,50 @@ msgstr "articoli"
 msgid "new"
 msgstr "nuovo"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "in scadenza %s (vecchio di %s giorni)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "in scadenza %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr "ultimo controllo %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "controllo notiziario %s..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "impossibile trovare il notiziario %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 msgid "feed not found"
 msgstr "notiziario non trovato"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(codifica UTF-8 non valida eliminata dal notiziario)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(entità del notiziario espanse con escape)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "il notiziario ha fatto andare in crash XML::Feed."
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "creazione nuova pagina %s"
@@ -132,7 +132,7 @@ msgstr "creazione nuova pagina %s"
 msgid "deleting bucket.."
 msgstr "eliminazione contenitore..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "fatto"
 
@@ -162,19 +162,19 @@ msgstr "esiste già una pagina chiamata %s"
 msgid "prohibited by allowed_attachments"
 msgstr "non permesso da allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr "nome file dell'allegato non valido"
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr "carica allegato"
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr "generazione automatica dell'indice"
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -191,78 +191,83 @@ msgstr "%s da %s"
 msgid "There are no broken links!"
 msgstr "Non ci sono collegamenti rotti."
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "commento su %s"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 #, fuzzy
 msgid "moderation"
 msgstr "Moderazione commenti"
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato pagina %s non supportato"
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr "i commenti devono avere un contenuto"
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+#, fuzzy
+msgid "Comment Moderation"
+msgstr "Moderazione commenti"
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nome pagina non valido"
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, perl-format
 msgid "commenting on %s"
 msgstr "commento su %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "la pagina «%s» non esiste, impossibile commentarla"
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "i commenti per la pagina «%s» sono chiusi"
 
-#: ../IkiWiki/Plugin/comments.pm:491
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr "commento trattenuto per moderazione"
 
-#: ../IkiWiki/Plugin/comments.pm:493
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr "Il commento sarà pubblicato dopo la verifica del moderatore"
 
-#: ../IkiWiki/Plugin/comments.pm:506
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr "Aggiunto commento"
 
-#: ../IkiWiki/Plugin/comments.pm:510
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Aggiunto commento: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr "non siete autenticati come amministratore"
 
-#: ../IkiWiki/Plugin/comments.pm:603
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr "Moderazione commenti"
 
-#: ../IkiWiki/Plugin/comments.pm:641
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr "moderazione commento"
 
-#: ../IkiWiki/Plugin/comments.pm:790
+#: ../IkiWiki/Plugin/comments.pm:822
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -272,7 +277,7 @@ msgstr[1] "Commenti"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:800
+#: ../IkiWiki/Plugin/comments.pm:832
 #, fuzzy
 msgid "Comment"
 msgstr "Commenti"
@@ -308,9 +313,9 @@ msgstr "%s non è una pagina modificabile"
 msgid "creating %s"
 msgstr "creazione %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
-#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
-#: ../IkiWiki/Plugin/editpage.pm:429
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "modifica %s"
@@ -323,12 +328,12 @@ msgstr "modello non specificato"
 msgid "match not specified"
 msgstr "corrispondenza non specificata"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s registrato per %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -342,11 +347,11 @@ msgstr "occorre specificare formato e testo"
 msgid "fortune failed"
 msgstr "errore nel fortune"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 msgid "missing page"
 msgstr "pagina mancante"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La pagina %s non esiste."
@@ -360,22 +365,22 @@ msgstr "non è una pagina"
 msgid "%s is an attachment, not a page."
 msgstr "%s è un allegato, non una pagina."
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "non è permesso modificare %s"
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "non è permesso lavorare su un file in modalità %s"
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -524,7 +529,7 @@ msgstr "moderazione commento"
 msgid "more"
 msgstr "altro"
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "errore nel compilare %s"
@@ -604,19 +609,19 @@ msgstr ""
 "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno "
 "alla versione 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s non è una codifica di lingua valida"
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -624,21 +629,21 @@ msgstr ""
 "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr "file PO aggiornati"
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -646,7 +651,7 @@ msgstr ""
 "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
 "stata eliminata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -654,50 +659,50 @@ msgstr ""
 "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
 "stata rinominata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Il file POT (%s) non esiste"
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "impossibile copiare il file PO di underlay in %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, perl-format
 msgid "failed to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "impossibile copiare il file POT in %s"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr "N/D"
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, perl-format
 msgid "failed to translate %s"
 msgstr "impossibile tradurre %s"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
@@ -830,7 +835,7 @@ msgstr "conferma rimozione di %s"
 msgid "Please select the attachments to remove."
 msgstr "Selezionare l'allegato da rimuovere."
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr "rimosso"
 
@@ -880,7 +885,7 @@ msgstr "Selezionare l'allegato da rinominare."
 msgid "rename %s to %s"
 msgstr "rinomina %s in %s"
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aggiornamento per rinomina di %s in %s"
@@ -1015,22 +1020,22 @@ msgstr "plugin"
 msgid "enable %s?"
 msgstr "abilitare %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr "il file di setup di questo wiki non è noto"
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr "principale"
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Le sottostanti modifiche alla configurazione richiedono la ricompilazione "
 "del wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1038,7 +1043,7 @@ msgstr ""
 "Affinché le sottostanti modifiche alla configurazione abbiano effetto, "
 "occorre ricostruire il wiki."
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
@@ -1048,7 +1053,7 @@ msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
 msgid "cannot determine id of untrusted committer %s"
 msgstr "impossibile determinare l'id del committer non fidato %s"
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, perl-format
 msgid "bad file name %s"
 msgstr "nome file %s scorretto"
@@ -1067,47 +1072,47 @@ msgstr ""
 "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare "
 "allow_symlinks_before_srcdir per abilitare questa configurazione"
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorato il file dal nome scorretto %s"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s ha diverse pagine sorgenti possibili"
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "rimozione della vecchia pagina %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "compilazione di %s, che è collegato a %s"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "rimozione di %s, non più richiesto da %s"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "compilazione di %s, che dipende da %s"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1162,13 +1167,13 @@ msgid "wrapper filename not specified"
 msgstr "nome del file del contenitore non specificato"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "errore nel compilare %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s generato con successo"
@@ -1181,24 +1186,24 @@ msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup configfile"
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr "utilizzo: --set var=valore"
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "utilizzo: --set var=valore"
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "generazione contenitori..."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "ricostruzione wiki..."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
@@ -1206,39 +1211,39 @@ msgstr "aggiornamento wiki..."
 msgid "Discussion"
 msgstr "Discussione"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr "impossibile usare più plugin rcs"
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1993
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:2070
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2091
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2227
+#: ../IkiWiki.pm:2281
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
diff --git a/po/pl.po b/po/pl.po
index 299c22e7f..7d2dc876b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 15:02-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -54,7 +54,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Błąd"
 
@@ -83,51 +83,51 @@ msgstr "wpisy"
 msgid "new"
 msgstr "nowy wpis"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "wygasający wpis %s (ma już %s dni)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "wygasający wpis %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "sprawdzanie kanału RSS %s..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "nie znaleziono kanału RSS pod adresem %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 #, fuzzy
 msgid "feed not found"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, fuzzy, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "Nieprawidłowe kodowanie UTF-8 usunięte z kanału RSS"
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "awaria kanału RSS w module XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "tworzenie nowej strony %s"
@@ -136,7 +136,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "gotowe"
 
@@ -169,19 +169,19 @@ msgstr ""
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -196,77 +196,81 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Wszystkie odnośniki są aktualne!"
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+msgid "Comment Moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:491
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:493
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:506
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:510
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:603
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:641
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:790
+#: ../IkiWiki/Plugin/comments.pm:822
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -276,7 +280,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:800
+#: ../IkiWiki/Plugin/comments.pm:832
 msgid "Comment"
 msgstr ""
 
@@ -311,9 +315,9 @@ msgstr "Strona %s nie może być edytowana"
 msgid "creating %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
-#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
-#: ../IkiWiki/Plugin/editpage.pm:429
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "edycja %s"
@@ -328,12 +332,12 @@ msgstr "nieznaleziony szablon %s"
 msgid "match not specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -347,12 +351,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "awaria fortunki"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 #, fuzzy
 msgid "missing page"
 msgstr "brakujące wartości"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -367,22 +371,22 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -539,7 +543,7 @@ msgstr ""
 msgid "more"
 msgstr "więcej"
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "awaria w trakcie kompilowania %s"
@@ -616,94 +620,94 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -836,7 +840,7 @@ msgstr ""
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr ""
 
@@ -887,7 +891,7 @@ msgstr ""
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s"
@@ -1034,26 +1038,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1063,7 +1067,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
@@ -1080,47 +1084,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1174,13 +1178,13 @@ msgid "wrapper filename not specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "awaria w trakcie kompilowania %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "pomyślnie utworzono %s"
@@ -1193,23 +1197,23 @@ msgstr "użycie: ikiwiki [parametry] źródło cel"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
@@ -1217,41 +1221,41 @@ msgstr "odświeżanie wiki..."
 msgid "Discussion"
 msgstr "Dyskusja"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1993
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2070
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2091
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2227
+#: ../IkiWiki.pm:2281
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 6288101e8..770a7e515 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 15:02-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -51,7 +51,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Fel"
 
@@ -80,51 +80,51 @@ msgstr "inlägg"
 msgid "new"
 msgstr "ny"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "låter %s gå ut (%s dagar gammal)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "låter %s gå ut"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "kontrollerar kanalen %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "kunde inte hitta kanalen på %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 #, fuzzy
 msgid "feed not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "kanalen kraschade XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "skapar nya sidan %s"
@@ -133,7 +133,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "klar"
 
@@ -166,19 +166,19 @@ msgstr ""
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -193,77 +193,81 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Det finns inga trasiga länkar!"
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+msgid "Comment Moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:491
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:493
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:506
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:510
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:603
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:641
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:790
+#: ../IkiWiki/Plugin/comments.pm:822
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -273,7 +277,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:800
+#: ../IkiWiki/Plugin/comments.pm:832
 msgid "Comment"
 msgstr ""
 
@@ -308,9 +312,9 @@ msgstr ""
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
-#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
-#: ../IkiWiki/Plugin/editpage.pm:429
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
@@ -325,12 +329,12 @@ msgstr "mallen %s hittades inte"
 msgid "match not specified"
 msgstr "filnamn för wrapper har inte angivits"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -344,12 +348,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "fortune misslyckades"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 #, fuzzy
 msgid "missing page"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -364,22 +368,22 @@ msgstr "kan inte läsa %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -532,7 +536,7 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "misslyckades med att kompilera %s"
@@ -609,94 +613,94 @@ msgstr "RPC::XML::Client hittades inte, pingar inte"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -826,7 +830,7 @@ msgstr ""
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr ""
 
@@ -877,7 +881,7 @@ msgstr ""
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "uppdatering av %s, %s av %s"
@@ -1021,26 +1025,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1050,7 +1054,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
@@ -1067,47 +1071,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1161,13 +1165,13 @@ msgid "wrapper filename not specified"
 msgstr "filnamn för wrapper har inte angivits"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "misslyckades med att kompilera %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "generering av %s lyckades"
@@ -1180,23 +1184,23 @@ msgstr "användning: ikiwiki [flaggor] källa mål"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
@@ -1204,39 +1208,39 @@ msgstr "uppdaterar wiki.."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1993
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2070
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2091
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2227
+#: ../IkiWiki.pm:2281
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
diff --git a/po/tr.po b/po/tr.po
index 165dfc59f..e68b77676 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 15:02-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -48,7 +48,7 @@ msgstr "Tercihler kaydedildi."
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Hata"
 
@@ -77,50 +77,50 @@ msgstr "gönderi"
 msgid "new"
 msgstr "yeni"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "%s için zaman aşımı (%s gün eski)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "%s için zaman aşımı"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr "son güncelleme: %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "%s özet akışı denetleniyor ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "%s özet akışı bulunamadı"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 msgid "feed not found"
 msgstr "özet akışı bulunamadı"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(geçersiz UTF-8 dizgisi özet akışından çıkarıldı)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(özet akışı girdileri işlendi)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "%s için yeni sayfa oluşturuluyor"
@@ -129,7 +129,7 @@ msgstr "%s için yeni sayfa oluşturuluyor"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr ""
 
@@ -159,19 +159,19 @@ msgstr ""
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -186,77 +186,81 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, perl-format
 msgid "this comment needs %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+msgid "Comment Moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:491
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:493
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:506
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:510
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:603
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:641
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:790
+#: ../IkiWiki/Plugin/comments.pm:822
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -266,7 +270,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:800
+#: ../IkiWiki/Plugin/comments.pm:832
 msgid "Comment"
 msgstr ""
 
@@ -301,9 +305,9 @@ msgstr ""
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
-#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
-#: ../IkiWiki/Plugin/editpage.pm:429
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -316,12 +320,12 @@ msgstr ""
 msgid "match not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 msgid "failed to process template:"
 msgstr ""
@@ -334,11 +338,11 @@ msgstr ""
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -352,22 +356,22 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -509,7 +513,7 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, perl-format
 msgid "failed to load openid module: "
 msgstr ""
@@ -584,93 +588,93 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -799,7 +803,7 @@ msgstr ""
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr ""
 
@@ -849,7 +853,7 @@ msgstr ""
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -984,26 +988,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1013,7 +1017,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, perl-format
 msgid "bad file name %s"
 msgstr ""
@@ -1030,47 +1034,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, perl-format
 msgid "removing obsolete %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1124,13 +1128,13 @@ msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -1143,23 +1147,23 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1167,39 +1171,39 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1993
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2070
+#: ../IkiWiki.pm:2124
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2091
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2227
+#: ../IkiWiki.pm:2281
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index a1aa8db55..c4422d95b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 15:02-0400\n"
+"POT-Creation-Date: 2010-07-22 16:50-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -52,7 +52,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
 msgid "Error"
 msgstr "Lỗi"
 
@@ -81,51 +81,51 @@ msgstr "bài"
 msgid "new"
 msgstr "mới"
 
-#: ../IkiWiki/Plugin/aggregate.pm:441
+#: ../IkiWiki/Plugin/aggregate.pm:455
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "đang mãn hạn %s (cũ %s ngày)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:448
+#: ../IkiWiki/Plugin/aggregate.pm:462
 #, perl-format
 msgid "expiring %s"
 msgstr "đang mãn hạn %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:475
+#: ../IkiWiki/Plugin/aggregate.pm:489
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:479
+#: ../IkiWiki/Plugin/aggregate.pm:493
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "đang kiểm tra nguồn tin %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:484
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "không tìm thấy nguồn tin ở %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:517
 #, fuzzy
 msgid "feed not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:514
+#: ../IkiWiki/Plugin/aggregate.pm:528
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:522
+#: ../IkiWiki/Plugin/aggregate.pm:536
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:544
 msgid "feed crashed XML::Feed!"
 msgstr "nguồn tin đã gây ra XML::Feed sụp đổ."
 
-#: ../IkiWiki/Plugin/aggregate.pm:616
+#: ../IkiWiki/Plugin/aggregate.pm:630
 #, perl-format
 msgid "creating new page %s"
 msgstr "đang tạo trang mới %s"
@@ -134,7 +134,7 @@ msgstr "đang tạo trang mới %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
 msgid "done"
 msgstr "xong"
 
@@ -167,19 +167,19 @@ msgstr ""
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -194,77 +194,81 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 
-#: ../IkiWiki/Plugin/comments.pm:112
+#: ../IkiWiki/Plugin/comments.pm:113
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/comments.pm:115
+#: ../IkiWiki/Plugin/comments.pm:116
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:141
+#: ../IkiWiki/Plugin/comments.pm:142
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:196
+#: ../IkiWiki/Plugin/comments.pm:195
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:256
+msgid "Comment Moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:362
+#: ../IkiWiki/Plugin/comments.pm:377
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/comments.pm:380
+#: ../IkiWiki/Plugin/comments.pm:395
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:387
+#: ../IkiWiki/Plugin/comments.pm:402
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:491
+#: ../IkiWiki/Plugin/comments.pm:510
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:493
+#: ../IkiWiki/Plugin/comments.pm:512
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:506
+#: ../IkiWiki/Plugin/comments.pm:525
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:510
+#: ../IkiWiki/Plugin/comments.pm:529
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:603
+#: ../IkiWiki/Plugin/comments.pm:625
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:641
+#: ../IkiWiki/Plugin/comments.pm:665
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:790
+#: ../IkiWiki/Plugin/comments.pm:822
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -273,7 +277,7 @@ msgstr[0] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:800
+#: ../IkiWiki/Plugin/comments.pm:832
 msgid "Comment"
 msgstr ""
 
@@ -308,9 +312,9 @@ msgstr ""
 msgid "creating %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
-#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
-#: ../IkiWiki/Plugin/editpage.pm:429
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
@@ -325,12 +329,12 @@ msgstr "không tìm thấy mẫu %s"
 msgid "match not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
 msgid "failed to process template:"
@@ -344,12 +348,12 @@ msgstr ""
 msgid "fortune failed"
 msgstr "fortune bị lỗi"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
 #, fuzzy
 msgid "missing page"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
@@ -364,22 +368,22 @@ msgstr "không thể đọc %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:780
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:784
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
 #: ../IkiWiki/Plugin/search.pm:37
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
@@ -532,7 +536,7 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, fuzzy, perl-format
 msgid "failed to load openid module: "
 msgstr "lỗi biên dịch %s"
@@ -609,94 +613,94 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:142
+#: ../IkiWiki/Plugin/po.pm:144
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:154
+#: ../IkiWiki/Plugin/po.pm:156
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:159
+#: ../IkiWiki/Plugin/po.pm:161
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390
+#: ../IkiWiki/Plugin/po.pm:392
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:432
+#: ../IkiWiki/Plugin/po.pm:434
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:457
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:477
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:888
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:911
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:917
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:953
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:964
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1048
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
-#: ../IkiWiki/Plugin/po.pm:1147
+#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
+#: ../IkiWiki/Plugin/po.pm:1156
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1106
+#: ../IkiWiki/Plugin/po.pm:1115
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1168
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -826,7 +830,7 @@ msgstr ""
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr ""
 
@@ -877,7 +881,7 @@ msgstr ""
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "cập nhật %2$s của %1$s bởi %3$s"
@@ -1021,26 +1025,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1050,7 +1054,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
@@ -1067,47 +1071,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
@@ -1161,13 +1165,13 @@ msgid "wrapper filename not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:160
+#: ../IkiWiki/Wrapper.pm:198
 #, perl-format
 msgid "failed to compile %s"
 msgstr "lỗi biên dịch %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:180
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s đã được tạo ra"
@@ -1180,23 +1184,23 @@ msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:96
+#: ../ikiwiki.in:105
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:103
+#: ../ikiwiki.in:112
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:157
+#: ../ikiwiki.in:166
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 
-#: ../ikiwiki.in:220
+#: ../ikiwiki.in:234
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
-#: ../ikiwiki.in:223
+#: ../ikiwiki.in:237
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
@@ -1204,40 +1208,40 @@ msgstr "đang làm tươi wiki.."
 msgid "Discussion"
 msgstr "Thảo luận"
 
-#: ../IkiWiki.pm:531
+#: ../IkiWiki.pm:538
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
-#: ../IkiWiki.pm:577
+#: ../IkiWiki.pm:584
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:614
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1352
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1993
+#: ../IkiWiki.pm:2047
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2070
+#: ../IkiWiki.pm:2124
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2091
+#: ../IkiWiki.pm:2145
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2227
+#: ../IkiWiki.pm:2281
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From 56ff8b16f2fff6fbe9fef5713e6840c4630b3995 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Jul 2010 16:59:40 -0400
Subject: add news item for ikiwiki 3.20100722

---
 doc/news/version_3.20100518.mdwn |  6 ------
 doc/news/version_3.20100722.mdwn | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)
 delete mode 100644 doc/news/version_3.20100518.mdwn
 create mode 100644 doc/news/version_3.20100722.mdwn

diff --git a/doc/news/version_3.20100518.mdwn b/doc/news/version_3.20100518.mdwn
deleted file mode 100644
index f622a4be9..000000000
--- a/doc/news/version_3.20100518.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-ikiwiki 3.20100518 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * page.tmpl: Accidentially broke po plugin's otherlanguages list styling
-     when modifying for html5; now fixed.
-   * Fix a bug that prevented matching deleted comments, and so did not update
-     pages that had contained them."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100722.mdwn b/doc/news/version_3.20100722.mdwn
new file mode 100644
index 000000000..27ed1fd4d
--- /dev/null
+++ b/doc/news/version_3.20100722.mdwn
@@ -0,0 +1,25 @@
+ikiwiki 3.20100722 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * img: Add a margin around images displayed by this directive.
+   * comments: Added commentmoderation directive for easy linking to the
+     comment moderation queue.
+   * aggregate: Write timestamp next aggregation can happen to
+     .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
+   * Add --changesetup mode that allows easily changing options in a
+     setup file.
+   * openid: Fix handling of utf-8 nicknames.
+   * Clarified what the filter hook should be passed: Only be the raw,
+     complete text of a page. Not a snippet, or data read in from an
+     unrelated file.
+   * template: Do not pass filled in template through filter hook.
+     Avoids causing breakage in po plugin.
+   * color, comments, conditional, cutpaste, more, sidebar, toggle: Also
+     avoid unnecessary calls to filter hook.
+   * po: needstranslation() pagespec can have a percent specified.
+   * Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have
+     the caching problem that was added to work around). Closes: #[588623](http://bugs.debian.org/588623)
+   * Made much more robust in cases where multiple source files produce
+     conflicting files/directories in the destdir.
+   * Updated French translation from Philippe Batailler. Closes: #[589423](http://bugs.debian.org/589423)
+   * po: Fix selflink display on tranlsated pages. (intrigeri)
+   * Avoid showing 'Add a comment' link at the bottom of the comment post form."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From ddecdbe85402e71ac5a07a46e301cc6ab512eeed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 12:49:34 -0400
Subject: add flattr button

---
 doc/tipjar.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index b725a2eff..ae612e129 100644
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -5,6 +5,9 @@ choose. If you'd like to fund development of a specific feature, see the
 
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=joey%40kitenet%2enet&item_name=ikiwiki&no_shipping=1&cn=Comments%3f&tax=0&currency_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8"><img src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" alt="donate with PayPal" /></a>
 
+<script type="text/javascript">var flattr_url = 'http://ikiwiki.info';</script>
+<script src="http://api.flattr.com/button/load.js" type="text/javascript"></script>
+
 Thanks to the following people for their kind contributions:
 
 * James Westby
-- 
cgit v1.2.3


From d78578f1b8e37045f47876ca3b21afb9b36215d0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 13:24:15 -0400
Subject: add tipjar link to sidebar

and flattr button, as an experiment
---
 doc/templates/links.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn
index 2b18bceb2..3ad043145 100644
--- a/doc/templates/links.mdwn
+++ b/doc/templates/links.mdwn
@@ -8,5 +8,9 @@
 <li>[[Users|IkiWikiUsers]]</li>
 <li>[[SiteMap]]</li>
 <li>[[Contact]]</li>
+<li>[[TipJar]]</li>
+<a href="http://flattr.com/thing/39811/ikiwiki" target="_blank">
+<img src="http://api.flattr.com/button/button-compact-static-100x17.png"
+alt="Flattr this" title="Flattr this" border="0" /></a>
 </ul>
 </div>
-- 
cgit v1.2.3


From 8ee3297b50e270523d9372be2eea61bd253e6e4d Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 20 Jul 2010 01:49:48 +0200
Subject: todo update

---
 doc/plugins/po.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 53327c1da..e3feb8843 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -351,7 +351,7 @@ and then committed again. The second commit makes this change:
 Same thing happens when a change to an existing page triggers a po file
 update. --[[Joey]] 
 
-> * The s/utf-8/UTF-8 part is fixed in my po branch.
+> * The s/utf-8/UTF-8 part has been fixed.
 > * The ENCODING\n part is due to an inconsistency in po4a, which
 >   I've just send a patch for. --[[intrigeri]]
 
-- 
cgit v1.2.3


From 081b43a8aec8c49fca0ffa4e4b72d41869050e89 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 20 Jul 2010 13:48:37 +0200
Subject: Implemented, please merge.

---
 doc/plugins/po.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index e3feb8843..fc7d1d502 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -301,6 +301,9 @@ to an array to support this. (If twere done, twere best done quickly.)
 >>>> no way to really sanely represent complex data structures in web
 >>>> setup. --[[Joey]]
 
+>>>>> Implemented using the pipe separator, fixed the po.t test suite
+>>>>> accordingly. Please have a look. --[[intrigeri]]
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From 1b0bef6d49722d37eca3e871e808e46b2a1461a3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 14:14:25 -0400
Subject: template: Fix dependency tracking. Broken in version 3.20100427.

template_depends was adding a dependency on the source filename,
instead of on the page name when a template is a page. Such a
dependency doesn't work.
---
 IkiWiki.pm       | 7 +++++--
 debian/changelog | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0c0b7bd4c..cfa4f5f03 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1730,12 +1730,15 @@ sub template_file ($) {
 	my $name=shift;
 	
 	my $tpage=($name =~ s/^\///) ? $name : "templates/$name";
+	my $template;
 	if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
-		$tpage=$pagesources{$tpage};
+		$template=srcfile($pagesources{$tpage}, 1);
 		$name.=".tmpl";
 	}
+	else {
+		$template=srcfile($tpage, 1);
+	}
 
-	my $template=srcfile($tpage, 1);
 	if (defined $template) {
 		return $template, $tpage, 1 if wantarray;
 		return $template;
diff --git a/debian/changelog b/debian/changelog
index 209b170eb..c27af5615 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100723) UNRELEASED; urgency=low
+
+  * template: Fix dependency tracking. Broken in version 3.20100427.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
+
 ikiwiki (3.20100722) unstable; urgency=low
 
   * img: Add a margin around images displayed by this directive.
-- 
cgit v1.2.3


From 055dfa00c6bf16af237731426caf2cdfa0bdcb90 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 14:16:22 -0400
Subject: html

---
 doc/templates/links.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn
index 3ad043145..3e21e8017 100644
--- a/doc/templates/links.mdwn
+++ b/doc/templates/links.mdwn
@@ -9,8 +9,8 @@
 <li>[[SiteMap]]</li>
 <li>[[Contact]]</li>
 <li>[[TipJar]]</li>
+</ul>
 <a href="http://flattr.com/thing/39811/ikiwiki" target="_blank">
 <img src="http://api.flattr.com/button/button-compact-static-100x17.png"
 alt="Flattr this" title="Flattr this" border="0" /></a>
-</ul>
 </div>
-- 
cgit v1.2.3


From e3004912dd64d28f7b9c1e6d63caeeb4e674d056 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 14:19:54 -0400
Subject: html

---
 doc/templates/links.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn
index 3e21e8017..c66720ffe 100644
--- a/doc/templates/links.mdwn
+++ b/doc/templates/links.mdwn
@@ -10,7 +10,7 @@
 <li>[[Contact]]</li>
 <li>[[TipJar]]</li>
 </ul>
-<a href="http://flattr.com/thing/39811/ikiwiki" target="_blank">
+<a href="http://flattr.com/thing/39811/ikiwiki">
 <img src="http://api.flattr.com/button/button-compact-static-100x17.png"
 alt="Flattr this" title="Flattr this" border="0" /></a>
 </div>
-- 
cgit v1.2.3


From ef8a74fbc30b7b49b717afc110e46f49a88cd77d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 14:22:18 -0400
Subject: html

---
 doc/templates/links.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn
index c66720ffe..b7c3028cd 100644
--- a/doc/templates/links.mdwn
+++ b/doc/templates/links.mdwn
@@ -12,5 +12,5 @@
 </ul>
 <a href="http://flattr.com/thing/39811/ikiwiki">
 <img src="http://api.flattr.com/button/button-compact-static-100x17.png"
-alt="Flattr this" title="Flattr this" border="0" /></a>
+alt="Flattr this" title="Flattr this" /></a>
 </div>
-- 
cgit v1.2.3


From b5bd92e77e9998a59adc9174195af1b46e0c4bca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 14:26:57 -0400
Subject: whitespace fixes and a typo

---
 IkiWiki/Plugin/po.pm | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 1f3ff252e..ad3fe9da8 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -28,7 +28,7 @@ use UNIVERSAL;
 my %translations;
 my @origneedsbuild;
 my %origsubs;
-my @slavelanguages; # languages codes ordered as in config po_slave_languages
+my @slavelanguages; # language codes ordered as in config po_slave_languages
 
 memoize("istranslatable");
 memoize("_istranslation");
@@ -109,7 +109,7 @@ sub getsetup () {
 				'fr|Français',
 				'es|Español',
 				'de|Deutsch'
-                            ],
+			],
 			description => "slave languages (PO files)",
 			safe => 1,
 			rebuild => 1,
@@ -146,18 +146,18 @@ sub checkconfig () {
 			if (!defined $code || !defined $name) {
 				error(sprintf(gettext("%s has invalid syntax: must use CODE|NAME"),
 				              $pair));
-                        }
+			}
 			$slaves{$code} = $name;
 			push @slavelanguages, $code;
 
-                }
+		}
 		$config{po_slave_languages} = \%slaves;
-        }
+	}
 	elsif (ref $config{po_slave_languages} eq 'HASH') {
 		@slavelanguages = sort {
 			$config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b};
 		} keys %{$config{po_slave_languages}};
-        }
+	}
 
 	delete $config{po_slave_languages}{$config{po_master_language}{code}};;
 
@@ -558,7 +558,7 @@ sub formbuilder (@) {
 	# This cannot be done in the formbuilder_setup hook as the list of types is
 	# computed later.
 	if ($form->field("do") eq "create") {
-	        foreach my $field ($form->field) {
+		foreach my $field ($form->field) {
 			next unless "$field" eq "type";
 			next unless $field->type eq 'select';
 			my $orig_value = $field->value;
@@ -706,7 +706,7 @@ sub myisselflink ($$) {
 	return 1 if $origsubs{'isselflink'}->($page, $link);
 	if (istranslation($page)) {
 		return $origsubs{'isselflink'}->(masterpage($page), $link);
-        }
+	}
 	return;
 }
 
@@ -862,7 +862,7 @@ sub otherlanguages_codes ($) {
 sub otherlanguages_pages ($) {
 	my $page=shift;
 
-        my %ret;
+	my %ret;
 	map {
 		$ret{$_} = otherlanguage_page($page, $_)
 	} @{otherlanguages_codes($page)};
@@ -1194,7 +1194,7 @@ sub isvalidpo ($) {
 	unlink $infile;
 
 	if ($res) {
-	    return IkiWiki::SuccessReason->new("valid gettext data");
+		return IkiWiki::SuccessReason->new("valid gettext data");
 	}
 	return IkiWiki::FailReason->new(gettext("invalid gettext data, go back ".
 					"to previous page to continue edit"));
@@ -1206,7 +1206,7 @@ sub po4a_type ($) {
 	my $pagetype = pagetype($file);
 	if ($pagetype eq 'html') {
 		return 'xhtml';
-        }
+	}
 	return 'text';
 }
 
@@ -1220,13 +1220,13 @@ sub po4a_options($) {
 		# how to disable options is not consistent across po4a modules
 		$options{includessi} = '';
 		$options{includeexternal} = 0;
-        }
+	}
 	elsif ($pagetype eq 'mdwn') {
 		$options{markdown} = 1;
-        }
-        else {
+	}
+	else {
 		$options{markdown} = 0;
-        }
+	}
 
 	return %options;
 }
@@ -1301,11 +1301,11 @@ sub match_needstranslation ($$;@) {
 		}
 		elsif ($wanted > 100) {
 			return IkiWiki::FailReason->new("parameter is greater than 100");
-                }
-        }
-        else {
+		}
+	}
+	else {
 		$wanted=100;
-        }
+	}
 
 	my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
 	if ($percenttranslated eq 'N/A') {
@@ -1313,7 +1313,7 @@ sub match_needstranslation ($$;@) {
 	}
 	elsif ($percenttranslated < $wanted) {
 		return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
-        }
+	}
 	else {
 		return IkiWiki::FailReason->new("file is translated enough");
 	}
-- 
cgit v1.2.3


From d2f56f7dea7252ce8c11b6c58049ecce515f155c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 14:29:17 -0400
Subject: merged; notes

---
 debian/changelog    | 2 ++
 doc/plugins/po.mdwn | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c27af5615..0f6a7c810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100723) UNRELEASED; urgency=low
 
   * template: Fix dependency tracking. Broken in version 3.20100427.
+  * po: The po_slave_languages setting is now a list, so the order of
+    translated languages can be controlled. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
 
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index ddaba86f0..d70247295 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -304,6 +304,10 @@ to an array to support this. (If twere done, twere best done quickly.)
 >>>>> Implemented using the pipe separator, fixed the po.t test suite
 >>>>> accordingly. Please have a look. --[[intrigeri]]
 
+>>>>>> Merged. I wonder if "ll: Lang" would be better than pipe? 
+>>>>>> Also, the compatability code for HASH is not really needed,
+>>>>>> ikiwiki has not been released using a hash for it. --[[Joey]] 
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From 855fad15e50217ea768768ad1a3a68bb9422eae1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 14:30:15 -0400
Subject: whitespace

---
 t/po.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/po.t b/t/po.t
index b6885a37e..0155b5303 100755
--- a/t/po.t
+++ b/t/po.t
@@ -61,7 +61,7 @@ $pagesources{'translatable.fr'}='translatable.fr.po';
 $pagesources{'translatable.es'}='translatable.es.po';
 $pagesources{'nontranslatable'}='nontranslatable.mdwn';
 foreach my $page (keys %pagesources) {
-    $IkiWiki::pagecase{lc $page}=$page;
+	$IkiWiki::pagecase{lc $page}=$page;
 }
 
 ### populate srcdir
-- 
cgit v1.2.3


From 11bd781a9dc8c04a005a04a99845ec339079b610 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 24 Jul 2010 11:18:57 +0200
Subject: answering joey

---
 doc/plugins/po.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index d70247295..9426ec9c5 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -305,9 +305,21 @@ to an array to support this. (If twere done, twere best done quickly.)
 >>>>> accordingly. Please have a look. --[[intrigeri]]
 
 >>>>>> Merged. I wonder if "ll: Lang" would be better than pipe? 
+
+>>>>>>> I've no clear opinion on this one. --[[intrigeri]]
+
 >>>>>> Also, the compatability code for HASH is not really needed,
 >>>>>> ikiwiki has not been released using a hash for it. --[[Joey]] 
 
+>>>>>>> The compatibility code is there to support the
+>>>>>>> `po_slave_languages => {fr => 'Français'}` format that has
+>>>>>>> been supported for ages. It's not there to support the
+>>>>>>> intermediate array of hash-like pairs I proposed in the
+>>>>>>> meantime.
+>>>>>>>
+>>>>>>> By the way, could you please have a look to the rest of my po
+>>>>>>> branch? (bb22e8c4a..d98296d1db0) --[[intrigeri]]
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From cab8a795682bcac2e937461d9a7d2c683cdc5ed0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Jul 2010 05:23:52 -0400
Subject: response

---
 doc/plugins/po.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 9426ec9c5..5088677c1 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -320,6 +320,9 @@ to an array to support this. (If twere done, twere best done quickly.)
 >>>>>>> By the way, could you please have a look to the rest of my po
 >>>>>>> branch? (bb22e8c4a..d98296d1db0) --[[intrigeri]]
 
+>>>>>>>> Thought I'd already merged everything; I've got those in now.
+>>>>>>>> --[[Joey]]
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From a7454c0e3220153a1f770df796e45ef1c1ee95ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Jul 2010 06:18:19 -0400
Subject: git: Fix gitweb historyurl examples so "diff to current" links work.
 (Thanks jrayhawk)

---
 IkiWiki/Plugin/git.pm | 2 +-
 debian/changelog      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index cb3437e18..899ac4a85 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -109,7 +109,7 @@ sub getsetup () {
 		},
 		historyurl => {
 			type => "string",
-			example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
+			example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=HEAD",
 			description => "gitweb url to show file history ([[file]] substituted)",
 			safe => 1,
 			rebuild => 1,
diff --git a/debian/changelog b/debian/changelog
index 0f6a7c810..b6a783787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
   * template: Fix dependency tracking. Broken in version 3.20100427.
   * po: The po_slave_languages setting is now a list, so the order of
     translated languages can be controlled. (intrigeri)
+  * git: Fix gitweb historyurl examples so "diff to current" links work.
+    (Thanks jrayhawk)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
 
-- 
cgit v1.2.3


From 84677e01f2fa6baee83a780d6dbc8686b88ac739 Mon Sep 17 00:00:00 2001
From: "http://sirireiter.dk/" <http://sirireiter.dk/@web>
Date: Sat, 24 Jul 2010 20:14:11 +0000
Subject: Single escape (not double escape) square bracket.

---
 doc/ikiwiki/directive/meta.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index 5a3919dea..1f5bde964 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -91,7 +91,7 @@ Supported fields:
 
   Example:
 
-	\\[[!meta openid="http://joeyh.myopenid.com/"
+	\[[!meta openid="http://joeyh.myopenid.com/"
 	server="http://www.myopenid.com/server"
 	xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]]
 
-- 
cgit v1.2.3


From 0aa621a833930795fd10c5a701b33b6a1705d03f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Jul 2010 17:33:59 -0400
Subject: move wrapper building loop into Wrapper.pm

---
 IkiWiki/Wrapper.pm | 20 ++++++++++++++++++++
 ikiwiki.in         | 18 +-----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index bd134c9a3..927368fae 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -8,6 +8,26 @@ use File::Spec;
 use Data::Dumper;
 use IkiWiki;
 
+sub gen_wrappers () {
+	debug(gettext("generating wrappers.."));
+	my %origconfig=(%config);
+	foreach my $wrapper (@{$config{wrappers}}) {
+		%config=(%origconfig, %{$wrapper});
+		$config{verbose}=$config{setupverbose}
+			if exists $config{setupverbose};
+		$config{syslog}=$config{setupsyslog}
+			if exists $config{setupsyslog};
+		delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
+		checkconfig();
+		if (! $config{cgi} && ! $config{post_commit} &&
+		    ! $config{test_receive}) {
+			$config{post_commit}=1;
+		}
+		gen_wrapper();
+	}
+	%config=(%origconfig);
+}
+
 sub gen_wrapper () {
 	$config{srcdir}=File::Spec->rel2abs($config{srcdir});
 	$config{destdir}=File::Spec->rel2abs($config{destdir});
diff --git a/ikiwiki.in b/ikiwiki.in
index aa3337938..bcda2469b 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -163,24 +163,8 @@ sub main () {
 		    ! $config{clean} &&
 		    ((! $config{refresh} && ! $config{post_commit})
 		     || $config{genwrappers})) {
-			debug(gettext("generating wrappers.."));
 			require IkiWiki::Wrapper;
-			my %origconfig=(%config);
-			foreach my $wrapper (@{$config{wrappers}}) {
-				%config=(%origconfig, %{$wrapper});
-				$config{verbose}=$config{setupverbose}
-					if exists $config{setupverbose};
-				$config{syslog}=$config{setupsyslog}
-					if exists $config{setupsyslog};
-				delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
-				checkconfig();
-				if (! $config{cgi} && ! $config{post_commit} &&
-				    ! $config{test_receive}) {
-					$config{post_commit}=1;
-				}
-				gen_wrapper();
-			}
-			%config=(%origconfig);
+			gen_wrappers();
 		}
 		
 		# setup implies a wiki rebuild by default
-- 
cgit v1.2.3


From f48500b47e73f0acebee7e46c19f040a8d26485b Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlYXeKSEBoSCzES7o5VYiSratG5RfNucL0"
 <@web>
Date: Sun, 25 Jul 2010 16:36:31 +0000
Subject:

---
 doc/index.mdwn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 06acc9cec..b047a97dd 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,8 +1,4 @@
-Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
-suitable for publishing on a website. Ikiwiki stores pages and history in a
-[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
-There are many other [[features]], including support for
-[[blogging|blog]], as well as a large array of [[plugins]].
+<p>test</p>
 
 [[!template id=links]]
 
-- 
cgit v1.2.3


From dc68dfed39e13b559b0590fa8e5d178f1079db7b Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlYXeKSEBoSCzES7o5VYiSratG5RfNucL0"
 <@web>
Date: Sun, 25 Jul 2010 16:38:19 +0000
Subject:

---
 doc/index.mdwn | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index b047a97dd..58d93dbd6 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,24 +1 @@
 <p>test</p>
-
-[[!template id=links]]
-
-## using ikiwiki
-
-[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
-[[man_page|usage]]. There are some [[examples]] of things you can do
-with ikiwiki, and some [[tips]].
-
-All wikis are supposed to have a [[SandBox]], so this one does too.
-
-This site generally runs the latest release of ikiwiki; currently, it runs
-ikiwiki [[!version ]].
-
-## developer resources
-
-The [[RoadMap]] describes where the project is going.
-The [[forum]] is open for discussions.
-[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
-can be submitted and tracked using this wiki.
-
-Ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]].
-- 
cgit v1.2.3


From b374530addca21bbd4cdbca5d9c4df408fc84a4f Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlYXeKSEBoSCzES7o5VYiSratG5RfNucL0"
 <@web>
Date: Sun, 25 Jul 2010 16:42:37 +0000
Subject:

---
 doc/index.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 58d93dbd6..82c11b58e 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1 +1,3 @@
-<p>test</p>
+"*Hello World!!"
+1. "a.HELLO"
+2. "b.WORlD"
-- 
cgit v1.2.3


From 2860a34dc42dd9ed28f50833a8da124b94d8596a Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlYXeKSEBoSCzES7o5VYiSratG5RfNucL0"
 <@web>
Date: Sun, 25 Jul 2010 16:53:17 +0000
Subject:

---
 doc/index.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 82c11b58e..5800497b8 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,3 +1,3 @@
-"*Hello World!!"
-1. "a.HELLO"
-2. "b.WORlD"
+**Hello World!!** <br>
+#HELLO
+##WORlD
-- 
cgit v1.2.3


From 80903dff493738bc66fd14b7f7ec52174af7311c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 25 Jul 2010 13:09:12 -0400
Subject: Revert refactment

---
 doc/index.mdwn | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 5800497b8..06acc9cec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,3 +1,28 @@
-**Hello World!!** <br>
-#HELLO
-##WORlD
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages and history in a
+[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
+There are many other [[features]], including support for
+[[blogging|blog]], as well as a large array of [[plugins]].
+
+[[!template id=links]]
+
+## using ikiwiki
+
+[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
+[[man_page|usage]]. There are some [[examples]] of things you can do
+with ikiwiki, and some [[tips]].
+
+All wikis are supposed to have a [[SandBox]], so this one does too.
+
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
+
+## developer resources
+
+The [[RoadMap]] describes where the project is going.
+The [[forum]] is open for discussions.
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
+can be submitted and tracked using this wiki.
+
+Ikiwiki is developed by [[Joey]] and many contributors,
+and is [[FreeSoftware]].
-- 
cgit v1.2.3


From dd9d117894952efb23c8b444ae27672571d6548a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 25 Jul 2010 20:18:02 -0400
Subject: meta: Allow syntax closer to html meta to be used.

The idea here is that <meta name="foo" description="bar">
can be written like [[!meta name="foo" description="bar">.
Of course, [[!meta foo=bar]] is still supported; this new feature
provides some DWIM when trying to directly convert a meta tag into
a meta directive.
---
 IkiWiki/Plugin/meta.pm | 14 +++++++++++---
 debian/changelog       |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 7d68a9b2d..d18585d3d 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -253,12 +253,20 @@ sub preprocess (@) {
 			' content="'.encode_entities($value).'" />';
 	}
 	elsif ($key eq 'description') {
-		push @{$metaheaders{$page}}, '<meta name="'.encode_entities($key).
+		push @{$metaheaders{$page}}, '<meta name="'.
+			encode_entities($key).
 			'" content="'.encode_entities($value).'" />';
 	}
+	elsif ($key eq 'name') {
+		push @{$metaheaders{$page}}, scrub('<meta '.$key.'="'.
+			encode_entities($value).
+			join(' ', map { "$_=\"$params{$_}\"" } keys %params).
+			' />', $destpage);
+	}
 	else {
-		push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).
-			'" content="'.encode_entities($value).'" />', $destpage);
+		push @{$metaheaders{$page}}, scrub('<meta name="'.
+			encode_entities($key).'" content="'.
+			encode_entities($value).'" />', $destpage);
 	}
 
 	return "";
diff --git a/debian/changelog b/debian/changelog
index b6a783787..167d02c6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
     translated languages can be controlled. (intrigeri)
   * git: Fix gitweb historyurl examples so "diff to current" links work.
     (Thanks jrayhawk)
+  * meta: Allow syntax closer to html meta to be used.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
 
-- 
cgit v1.2.3


From aa78c142b8fdc44e480f7cec0cc444680a1f2f46 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Jul 2010 13:30:45 -0400
Subject: avoid generating receive wrapper if there are no untrusted committers

The wrapper is pointless in that configuration. Also, the code for it
doesn't compile w/o untrusted commiters to test. :)
---
 IkiWiki/Plugin/git.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 899ac4a85..d342a7398 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -46,7 +46,9 @@ sub checkconfig () {
 	}
 
 	if (defined $config{git_test_receive_wrapper} &&
-	    length $config{git_test_receive_wrapper}) {
+	    length $config{git_test_receive_wrapper} &&
+	    defined $config{untrusted_committers} &&
+	    @{$config{untrusted_committers}}) {
 		push @{$config{wrappers}}, {
 			test_receive => 1,
 			wrapper => $config{git_test_receive_wrapper},
-- 
cgit v1.2.3


From b300bc9650a40885cd8c6e0a646436539aed95c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Jul 2010 16:23:10 -0400
Subject: use new disable hook

clean up xapian db when plugin is disabled
---
 IkiWiki/Plugin/search.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index ff5d0ccbe..1cf762fce 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -13,6 +13,7 @@ sub import {
 	hook(type => "indexhtml", id => "search", call => \&indexhtml);
 	hook(type => "delete", id => "search", call => \&delete);
 	hook(type => "cgi", id => "search", call => \&cgi);
+	hook(type => "disable", id => "search", call => \&disable);
 }
 
 sub getsetup () {
@@ -245,4 +246,10 @@ sub setupfiles () {
 }
 }
 
+sub disable () {
+	if (-d $config{wikistatedir}."/xapian") {
+		system("rm", "-rf", $config{wikistatedir}."/xapian");
+	}
+}
+
 1
-- 
cgit v1.2.3


From c401b6958af7e12c1c2c46f870691bfb0a998fd3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Jul 2010 16:24:17 -0400
Subject: Add new disable hook, allowing plugins to perform cleanup after they
 have been disabled.

---
 IkiWiki.pm                         | 17 ++++++++++-------
 IkiWiki/Plugin/skeleton.pm.example |  5 +++++
 IkiWiki/Setup.pm                   | 24 ++++++++++++++++++++++++
 debian/changelog                   |  2 ++
 doc/plugins/write.mdwn             |  7 +++++++
 5 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index cfa4f5f03..e08d02922 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1596,6 +1596,12 @@ sub loadindex () {
 	if (exists $index->{version} && ! ref $index->{version}) {
 		$pages=$index->{page};
 		%wikistate=%{$index->{state}};
+		# Handle plugins that got disabled by loading a new setup.
+		if (exists $config{setupfile}) {
+			require IkiWiki::Setup;
+			IkiWiki::Setup::disabled_plugins(
+				grep { ! $loaded_plugins{$_} } keys %wikistate);
+		}
 	}
 	else {
 		$pages=$index;
@@ -1663,11 +1669,7 @@ sub loadindex () {
 sub saveindex () {
 	run_hooks(savestate => sub { shift->() });
 
-	my %hookids;
-	foreach my $type (keys %hooks) {
-		$hookids{$_}=1 foreach keys %{$hooks{$type}};
-	}
-	my @hookids=keys %hookids;
+	my @plugins=keys %loaded_plugins;
 
 	if (! -d $config{wikistatedir}) {
 		mkdir($config{wikistatedir});
@@ -1701,7 +1703,7 @@ sub saveindex () {
 		}
 
 		if (exists $pagestate{$page}) {
-			foreach my $id (@hookids) {
+			foreach my $id (@plugins) {
 				foreach my $key (keys %{$pagestate{$page}{$id}}) {
 					$index{page}{$src}{state}{$id}{$key}=$pagestate{$page}{$id}{$key};
 				}
@@ -1710,7 +1712,8 @@ sub saveindex () {
 	}
 
 	$index{state}={};
-	foreach my $id (@hookids) {
+	foreach my $id (@plugins) {
+		$index{state}{$id}={}; # used to detect disabled plugins
 		foreach my $key (keys %{$wikistate{$id}}) {
 			$index{state}{$id}{$key}=$wikistate{$id}{$key};
 		}
diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index c3a3b0c01..a57a2c8fe 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -41,6 +41,7 @@ sub import {
 	hook(type => "rename", id => "skeleton", call => \&rename);
 	hook(type => "savestate", id => "skeleton", call => \&savestate);
 	hook(type => "genwrapper", id => "skeleton", call => \&genwrapper);
+	hook(type => "disable", id => "skeleton", call => \&disable);
 }
 
 sub getopt () {
@@ -254,4 +255,8 @@ sub genwrapper () {
 	debug("skeleton plugin running in genwrapper");
 }
 
+sub savestate () {
+	debug("skeleton plugin running in disable");
+}
+
 1
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 7af744f6a..f34571bcf 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -124,6 +124,28 @@ sub merge ($) {
 	}
 }
 
+sub disabled_plugins (@) {
+	# Handles running disable hooks of plugins that were enabled
+	# previously, but got disabled when a new setup file was loaded.
+	if (exists $config{setupfile} && @_) {
+		# Fork a child to load the disabled plugins.
+		my $pid=fork();
+		if ($pid == 0) {
+			foreach my $plugin (@_) {
+				print STDERR "** plugin $plugin disabled\n";
+				eval { IkiWiki::loadplugin($plugin, 1) };
+				if (exists $IkiWiki::hooks{disable}{$plugin}{call}) {
+					eval { $IkiWiki::hooks{disable}{$plugin}{call}->() };
+				}
+			}
+			exit(0);
+		}
+		else {
+			waitpid $pid, 0;
+		}
+	}
+}
+
 sub getsetup () {
 	# Gets all available setup data from all plugins. Returns an
 	# ordered list of [plugin, setup] pairs.
@@ -134,6 +156,7 @@ sub getsetup () {
         $config{syslog}=undef;
 
 	# Load all plugins, so that all setup options are available.
+	my %original_loaded_plugins=%IkiWiki::loaded_plugins;
 	my @plugins=IkiWiki::listplugins();
 	foreach my $plugin (@plugins) {
 		eval { IkiWiki::loadplugin($plugin, 1) };
@@ -141,6 +164,7 @@ sub getsetup () {
 			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
 		}
 	}
+	%IkiWiki::loaded_plugins=%original_loaded_plugins;
 	
 	my %sections;
 	foreach my $plugin (@plugins) {
diff --git a/debian/changelog b/debian/changelog
index 167d02c6f..5645b34d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
   * git: Fix gitweb historyurl examples so "diff to current" links work.
     (Thanks jrayhawk)
   * meta: Allow syntax closer to html meta to be used.
+  * Add new disable hook, allowing plugins to perform cleanup after they
+    have been disabled.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 2e3902388..10b4df835 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -600,6 +600,13 @@ function of the ikiwiki wrapper when it is being generated.
 The code runs before anything else -- in particular it runs before
 the suid wrapper has sanitized its environment.
 
+### disable
+
+	hook(type => "disable", id => "foo", call => \&disable);
+
+This hook is only run when a previously enabled plugin gets disabled
+during ikiwiki setup. Plugins can use this to perform cleanups.
+
 ## Exported variables
 
 Several variables are exported to your plugin when you `use IkiWiki;`
-- 
cgit v1.2.3


From d1a5d00156da7bf6f25f8e28969c280738d3281c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Jul 2010 17:53:06 -0400
Subject: remove debug code

---
 IkiWiki/Setup.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index f34571bcf..48f3d4634 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -132,7 +132,6 @@ sub disabled_plugins (@) {
 		my $pid=fork();
 		if ($pid == 0) {
 			foreach my $plugin (@_) {
-				print STDERR "** plugin $plugin disabled\n";
 				eval { IkiWiki::loadplugin($plugin, 1) };
 				if (exists $IkiWiki::hooks{disable}{$plugin}{call}) {
 					eval { $IkiWiki::hooks{disable}{$plugin}{call}->() };
-- 
cgit v1.2.3


From 1a3e6bf3e2eff84e6456b76a07568429473c4184 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 28 Jul 2010 19:08:47 +0200
Subject: po todo update: this has been fixed already.

---
 doc/plugins/po.mdwn | 69 -----------------------------------------------------
 1 file changed, 69 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 5088677c1..88c41aa76 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -254,75 +254,6 @@ once [[intrigeri]]'s `meta` branch is merged.
 An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
 and `meta` branches, and thus has this additional features.
 
-Language display order
-----------------------
-
-Jonas pointed out that one might want to control the order that links to
-other languages are listed, for various reasons. Currently, there is no
-order, as `po_slave_languages` is a hash. It would need to be converted
-to an array to support this. (If twere done, twere best done quickly.)
---[[Joey]] 
-
-> Done in my po branch, preserving backward compatibility. Please
-> review :) --[[intrigeri]]
-
->> Right, well my immediate concern is that using an array to hold
->> hash-like pairs is not very clear to the user. It will be displayed
->> in a confusing way by websetup; dumping a setup file will probably
->> also cause it to be formatted in a confusing way. And the code
->> seems to assume that the array length is even, and probably blows
->> up if it is not.. and the value is marked safe so websetup can be
->> used to modify it and break that way too. --[[Joey]] 
-
->>> I have added a sanity check for the even array problem. This was
->>> the easy part.
->>>
->>> About the hash-like vs. dump and websetup issue,
->>> I can think of a few solutions:
->>>
->>> - keep the current hash-like pairs and unmark this setting as safe
->>>   for websetup: this does not solve the dump setup issue, though;
->>> - replace the array of pairs with an array of
->>>   "LANGUAGECODE|LANGUAGENAME" elements, using a pipe or whatever
->>>   separator seems adequate;
->>> - add support for ordered hashes to `$config`, websetup and
->>>   dumpsetup, using Tie-IxHash or any similar module;
->>> - replace the array of hash-like pairs with an array of real
->>>   pairs, such as `[ ['de', 'Deutsch'], ['fr', 'Français'] ]`; this
->>>   brings once again the need for `$config` to support arrays of
->>>   arrays, which I have already implemented in my mirrorlist branch
->>>   (see [[todo/mirrorlist_with_per-mirror_usedirs_settings]] for
->>>   details).
->>>
->>> Joey, which of these solutions do you prefer? Or another one?
->>> I tend to prefer the last one. --[[intrigeri]]
-
->>>> I prefer the pipe separator, I think. I'm concerned that there is 
->>>> no way to really sanely represent complex data structures in web
->>>> setup. --[[Joey]]
-
->>>>> Implemented using the pipe separator, fixed the po.t test suite
->>>>> accordingly. Please have a look. --[[intrigeri]]
-
->>>>>> Merged. I wonder if "ll: Lang" would be better than pipe? 
-
->>>>>>> I've no clear opinion on this one. --[[intrigeri]]
-
->>>>>> Also, the compatability code for HASH is not really needed,
->>>>>> ikiwiki has not been released using a hash for it. --[[Joey]] 
-
->>>>>>> The compatibility code is there to support the
->>>>>>> `po_slave_languages => {fr => 'Français'}` format that has
->>>>>>> been supported for ages. It's not there to support the
->>>>>>> intermediate array of hash-like pairs I proposed in the
->>>>>>> meantime.
->>>>>>>
->>>>>>> By the way, could you please have a look to the rest of my po
->>>>>>> branch? (bb22e8c4a..d98296d1db0) --[[intrigeri]]
-
->>>>>>>> Thought I'd already merged everything; I've got those in now.
->>>>>>>> --[[Joey]]
-
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From 6d9026bf28f2850c15566ba0c8b9ee1a88151641 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 28 Jul 2010 19:13:57 +0200
Subject: reply

---
 doc/plugins/po.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 88c41aa76..5f713044f 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -264,6 +264,11 @@ and seems generally not wanted.
 (OTOH, you do want to match translated pages by
 default when locking pages.) --[[Joey]]
 
+> Seems hard to me to sort apart the pagespec whose matching pages
+> list must be restricted to pages in the master (or current?)
+> language, and the ones that should not. The only solution I can see
+> to this surprising behaviour is: documentation. --[[intrigeri]]
+
 Edit links on untranslated pages
 --------------------------------
 
-- 
cgit v1.2.3


From d1733089d05f4de0eee13e204236af8ed74632da Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 28 Jul 2010 19:23:24 +0200
Subject: currently unreproducible

---
 doc/plugins/po.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 5f713044f..484516364 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -323,6 +323,10 @@ still did not see the translation links. Only when I touched the page
 source and refreshed did it finally add the translation links. 
 I can reproduce this bug in a test site. --[[Joey]]
 
+> I could reproduce this bug at some point during the merge of a buggy
+> version of my ordered slave languages patch, but I cannot anymore.
+> Could you please try again? --[[intrigeri]]
+
 Ugly messages with empty files
 ------------------------------
 
-- 
cgit v1.2.3


From 0ceac714d54fb3ce77595dc263a75dc89f1c2133 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 28 Jul 2010 19:48:40 +0200
Subject: researched a bit the next po bug

---
 doc/plugins/po.mdwn | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 484516364..27d95ae29 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -269,8 +269,8 @@ default when locking pages.) --[[Joey]]
 > language, and the ones that should not. The only solution I can see
 > to this surprising behaviour is: documentation. --[[intrigeri]]
 
-Edit links on untranslated pages
---------------------------------
+Edit links on some slave pages
+------------------------------
 
 If a page is not translated yet, the "translated" version of it
 displays wikilinks to other, existing (but not yet translated?)
@@ -295,6 +295,20 @@ underlay, and the underlays lack translation to a given language.
 >> Compare with eg, the 100% translated Dansk version, where
 >> the WikiLink link links to the English WikiLink page. --[[Joey]] 
 
+>>> Seems not related to the page/string translation status: the 0%
+>>> translated Spanish version has the correct link, just like the
+>>> Dansk version => I'm changing the bug title accordingly.
+>>>
+>>> I tested forcing the sv html page to be rebuilt by translating a
+>>> string in it, it did not fix the bug. I did the same for the
+>>> Spanish page, it did not introduce the bug. So this is really
+>>> weird.
+>>>
+>>> The smiley underlay seems to be the only place where the wrong
+>>> thing happens: the basewiki underlay has similar examples
+>>> that do not exhibit this bug. An underlay linking to another might
+>>> be necessary to reproduce it. Going to dig deeper. --[[intrigeri]]
+
 Double commits of po files
 --------------------------
 
-- 
cgit v1.2.3


From ccf80cfa8a012325c375295630898267a5d28d64 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 28 Jul 2010 20:07:44 +0200
Subject: todo++ (?)

---
 doc/plugins/po.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 27d95ae29..6377a11be 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -349,6 +349,12 @@ If there are empty .mdwn files, the po plugin displays some ugly messages.
 > This is due to a bug in po4a (not checking definedness of a
 > variable). One-liner patch sent. --[[intrigeri]]
 
+Remove po/pot files when disabling the po plugin?
+-------------------------------------------------
+
+ikiwiki now has a `disable` hook. Should the po plugin remove the po
+files from the source repository when it has been disabled?
+
 Translation of directives
 -------------------------
 
-- 
cgit v1.2.3


From 4bc3839df8fa47affc114a37ce862e3171d3e922 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 29 Jul 2010 02:47:26 +0000
Subject: what approach to take for pagination?

---
 doc/forum/report_pagination.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/forum/report_pagination.mdwn

diff --git a/doc/forum/report_pagination.mdwn b/doc/forum/report_pagination.mdwn
new file mode 100644
index 000000000..d609fd502
--- /dev/null
+++ b/doc/forum/report_pagination.mdwn
@@ -0,0 +1,11 @@
+I am thinking of adding pagination to the [[plugins/contrib/report]] plugin, but I'm not sure which is the best approach to take. (By "pagination" I mean breaking up a report into multiple pages with N entries per page.)
+
+Approaches:
+
+1. generate additional HTML files on the fly which are placed in the sub-directory for the page the report is on.  These are not "pages", they are not under revision control, they aren't in the %pagesources hash etc. But using the `will_render` mechanism assures that they will be removed when they are no longer needed.
+
+2. create new pages which each have a report directive which shows a subset of the full result; add them to revision control, treat them as full pages.  Problems with this are: (a) trying to figure out when to create these new pages and when not to, (b) whether or not these pages can be deleted automatically.
+
+3. some other approach I haven't thought of.
+
+I'm afraid that whatever approach I take, it will end up being a kludge.
-- 
cgit v1.2.3


From 927558ee444a12774c579bc6acf76f8e040c5229 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 29 Jul 2010 16:18:59 +0200
Subject: found the root cause of the "bug"

---
 doc/plugins/po.mdwn | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 6377a11be..ab096b2ac 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -269,8 +269,8 @@ default when locking pages.) --[[Joey]]
 > language, and the ones that should not. The only solution I can see
 > to this surprising behaviour is: documentation. --[[intrigeri]]
 
-Edit links on some slave pages
-------------------------------
+l10n wiki misconfiguration
+--------------------------
 
 If a page is not translated yet, the "translated" version of it
 displays wikilinks to other, existing (but not yet translated?)
@@ -309,6 +309,22 @@ underlay, and the underlays lack translation to a given language.
 >>> that do not exhibit this bug. An underlay linking to another might
 >>> be necessary to reproduce it. Going to dig deeper. --[[intrigeri]]
 
+>>>> After a few hours lost in the Perl debugger, I think I have found
+>>>> the root cause of the problem: in l10n wiki's configured
+>>>> `underlaydir`, the basewiki is present in every slave language
+>>>> that is enabled for this wiki *but* Swedish. With such a
+>>>> configuration, the `ikiwiki/wikilink` page indeed does not exist
+>>>> in Swedish language: no `ikiwiki/wikilink.sv.po` can be found
+>>>> where ikiwiki is looking. Have a look to
+>>>> <http://l10n.ikiwiki.info/ikiwiki/>, the basewiki is not
+>>>> available in Swedish language on this wiki. So this is not a po
+>>>> bug, but a configuration or directories layout issue. This is
+>>>> solved by adding the Swedish basewiki to the underlay dir, which
+>>>> is I guess not a possibility in the l10n wiki context. I guess
+>>>> this could be solved by adding `SRCDIR/basewiki` as an underlay
+>>>> to your l10n wiki configuration, possibly using the
+>>>> `add_underlays` configuration directive. --[[intrigeri]]
+
 Double commits of po files
 --------------------------
 
-- 
cgit v1.2.3


From 6c4caf8211d09c144a0e22321e5bf8c0d3cd4cc1 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 29 Jul 2010 16:32:56 +0200
Subject: Move po todo/bugs to dedicated pages.

---
 doc/bugs/po:_double_commits_of_po_files.mdwn       |  14 +++
 doc/bugs/po:_new_pages_not_translatable.mdwn       |  10 ++
 doc/bugs/po:_ugly_messages_with_empty_files.mdwn   |   4 +
 doc/plugins/po.mdwn                                | 101 ++-------------------
 doc/todo/po:_better_documentation.mdwn             |   3 +
 doc/todo/po:_better_links.mdwn                     |  12 +++
 .../po:_remove_po_files_when_disabling_plugin.mdwn |   2 +
 doc/todo/po:_rethink_pagespecs.mdwn                |  11 +++
 doc/todo/po:_translation_of_directives.mdwn        |   8 ++
 9 files changed, 72 insertions(+), 93 deletions(-)
 create mode 100644 doc/bugs/po:_double_commits_of_po_files.mdwn
 create mode 100644 doc/bugs/po:_new_pages_not_translatable.mdwn
 create mode 100644 doc/bugs/po:_ugly_messages_with_empty_files.mdwn
 create mode 100644 doc/todo/po:_better_documentation.mdwn
 create mode 100644 doc/todo/po:_better_links.mdwn
 create mode 100644 doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
 create mode 100644 doc/todo/po:_rethink_pagespecs.mdwn
 create mode 100644 doc/todo/po:_translation_of_directives.mdwn

diff --git a/doc/bugs/po:_double_commits_of_po_files.mdwn b/doc/bugs/po:_double_commits_of_po_files.mdwn
new file mode 100644
index 000000000..008df68c3
--- /dev/null
+++ b/doc/bugs/po:_double_commits_of_po_files.mdwn
@@ -0,0 +1,14 @@
+When adding a new english page, the po files are created, committed,
+and then committed again. The second commit makes this change:
+
+	-"Content-Type: text/plain; charset=utf-8\n"
+	-"Content-Transfer-Encoding: ENCODING"
+	+"Content-Type: text/plain; charset=UTF-8\n"
+	+"Content-Transfer-Encoding: ENCODING\n"
+
+Same thing happens when a change to an existing page triggers a po file
+update. --[[Joey]] 
+
+> * The s/utf-8/UTF-8 part has been fixed.
+> * The ENCODING\n part is due to an inconsistency in po4a, which
+>   I've just send a patch for. --[[intrigeri]]
diff --git a/doc/bugs/po:_new_pages_not_translatable.mdwn b/doc/bugs/po:_new_pages_not_translatable.mdwn
new file mode 100644
index 000000000..84156bacc
--- /dev/null
+++ b/doc/bugs/po:_new_pages_not_translatable.mdwn
@@ -0,0 +1,10 @@
+Today I added a new English page to l10n.ikiwiki.info. When I saved,
+the page did not have the translation links at the top. I waited until
+the po plugin had, in the background, created the po files, and refreshed;
+still did not see the translation links. Only when I touched the page
+source and refreshed did it finally add the translation links. 
+I can reproduce this bug in a test site. --[[Joey]]
+
+> I could reproduce this bug at some point during the merge of a buggy
+> version of my ordered slave languages patch, but I cannot anymore.
+> Could you please try again? --[[intrigeri]]
diff --git a/doc/bugs/po:_ugly_messages_with_empty_files.mdwn b/doc/bugs/po:_ugly_messages_with_empty_files.mdwn
new file mode 100644
index 000000000..4e782605b
--- /dev/null
+++ b/doc/bugs/po:_ugly_messages_with_empty_files.mdwn
@@ -0,0 +1,4 @@
+If there are empty .mdwn files, the po plugin displays some ugly messages.
+
+> This is due to a bug in po4a (not checking definedness of a
+> variable). One-liner patch sent. --[[intrigeri]]
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index ab096b2ac..1a3917454 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -235,39 +235,19 @@ When using po4a older than 0.35, it is recommended to uninstall
 `Text::WrapI18N` (Debian package `libtext-wrapi18n-perl`), in order to
 avoid a potential denial of service.
 
-TODO
+BUGS
 ====
 
-Better links
-------------
-
-Once the fix to
-[[bugs/pagetitle_function_does_not_respect_meta_titles]] from
-[[intrigeri]]'s `meta` branch is merged into ikiwiki upstream, the
-generated links' text will be optionally based on the page titles set
-with the [[meta|plugins/meta]] plugin, and will thus be translatable.
-It will also allow displaying the translation status in links to slave
-pages. Both were implemented, and reverted in commit
-ea753782b222bf4ba2fb4683b6363afdd9055b64, which should be reverted
-once [[intrigeri]]'s `meta` branch is merged.
+[[!map pages="bugs/po:*"]]
 
-An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
-and `meta` branches, and thus has this additional features.
-
-Pagespecs
----------
+[[!inline pages="bugs/po:* and !bugs/done and !link(bugs/done) and !bugs/*/*"
+feeds=no actions=no archive=yes show=0]]
 
-I was suprised that, when using the map directive, a pagespec of "*"
-listed all the translated pages as well as regular pages. That can 
-make a big difference to an existing wiki when po is turned on,
-and seems generally not wanted.
-(OTOH, you do want to match translated pages by
-default when locking pages.) --[[Joey]]
+TODO
+====
 
-> Seems hard to me to sort apart the pagespec whose matching pages
-> list must be restricted to pages in the master (or current?)
-> language, and the ones that should not. The only solution I can see
-> to this surprising behaviour is: documentation. --[[intrigeri]]
+[[!inline pages="todo/po:* and !todo/done and !link(todo/done) and !todo/*/*"
+feeds=no actions=no archive=yes show=0]]
 
 l10n wiki misconfiguration
 --------------------------
@@ -324,68 +304,3 @@ underlay, and the underlays lack translation to a given language.
 >>>> this could be solved by adding `SRCDIR/basewiki` as an underlay
 >>>> to your l10n wiki configuration, possibly using the
 >>>> `add_underlays` configuration directive. --[[intrigeri]]
-
-Double commits of po files
---------------------------
-
-When adding a new english page, the po files are created, committed,
-and then committed again. The second commit makes this change:
-
-	-"Content-Type: text/plain; charset=utf-8\n"
-	-"Content-Transfer-Encoding: ENCODING"
-	+"Content-Type: text/plain; charset=UTF-8\n"
-	+"Content-Transfer-Encoding: ENCODING\n"
-
-Same thing happens when a change to an existing page triggers a po file
-update. --[[Joey]] 
-
-> * The s/utf-8/UTF-8 part has been fixed.
-> * The ENCODING\n part is due to an inconsistency in po4a, which
->   I've just send a patch for. --[[intrigeri]]
-
-New pages not translatable
---------------------------
-
-Today I added a new English page to l10n.ikiwiki.info. When I saved,
-the page did not have the translation links at the top. I waited until
-the po plugin had, in the background, created the po files, and refreshed;
-still did not see the translation links. Only when I touched the page
-source and refreshed did it finally add the translation links. 
-I can reproduce this bug in a test site. --[[Joey]]
-
-> I could reproduce this bug at some point during the merge of a buggy
-> version of my ordered slave languages patch, but I cannot anymore.
-> Could you please try again? --[[intrigeri]]
-
-Ugly messages with empty files
-------------------------------
-
-If there are empty .mdwn files, the po plugin displays some ugly messages.
-
-> This is due to a bug in po4a (not checking definedness of a
-> variable). One-liner patch sent. --[[intrigeri]]
-
-Remove po/pot files when disabling the po plugin?
--------------------------------------------------
-
-ikiwiki now has a `disable` hook. Should the po plugin remove the po
-files from the source repository when it has been disabled?
-
-Translation of directives
--------------------------
-
-If a translated page contains a directive, it may expand to some english
-text, or text in whatever single language ikiwiki is configured to "speak".
-
-Maybe there could be a way to switch ikiwiki to speaking another language
-when building a non-english page? Then the directives would get translated.
-
-(We also will need this in order to use translated templates, when they are
-available.)
-
-Documentation
--------------
-
-Maybe write separate documentation depending on the people it targets:
-translators, wiki administrators, hackers. This plugin may be complex
-enough to deserve this.
diff --git a/doc/todo/po:_better_documentation.mdwn b/doc/todo/po:_better_documentation.mdwn
new file mode 100644
index 000000000..6e9804df4
--- /dev/null
+++ b/doc/todo/po:_better_documentation.mdwn
@@ -0,0 +1,3 @@
+Maybe write separate documentation for the po plugin, depending on the
+people it targets:  translators, wiki administrators, hackers. This
+plugin may be complex enough to deserve this.
diff --git a/doc/todo/po:_better_links.mdwn b/doc/todo/po:_better_links.mdwn
new file mode 100644
index 000000000..af879a56a
--- /dev/null
+++ b/doc/todo/po:_better_links.mdwn
@@ -0,0 +1,12 @@
+Once the fix to
+[[bugs/pagetitle_function_does_not_respect_meta_titles]] from
+[[intrigeri]]'s `meta` branch is merged into ikiwiki upstream, the
+generated links' text will be optionally based on the page titles set
+with the [[meta|plugins/meta]] plugin, and will thus be translatable.
+It will also allow displaying the translation status in links to slave
+pages. Both were implemented, and reverted in commit
+ea753782b222bf4ba2fb4683b6363afdd9055b64, which should be reverted
+once [[intrigeri]]'s `meta` branch is merged.
+
+An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
+and `meta` branches, and thus has this additional features.
diff --git a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
new file mode 100644
index 000000000..4ddd0fa1e
--- /dev/null
+++ b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
@@ -0,0 +1,2 @@
+ikiwiki now has a `disable` hook. Should the po plugin remove the po
+files from the source repository when it has been disabled?
diff --git a/doc/todo/po:_rethink_pagespecs.mdwn b/doc/todo/po:_rethink_pagespecs.mdwn
new file mode 100644
index 000000000..50c10c5db
--- /dev/null
+++ b/doc/todo/po:_rethink_pagespecs.mdwn
@@ -0,0 +1,11 @@
+I was suprised that, when using the map directive, a pagespec of "*"
+listed all the translated pages as well as regular pages. That can 
+make a big difference to an existing wiki when po is turned on,
+and seems generally not wanted.
+(OTOH, you do want to match translated pages by
+default when locking pages.) --[[Joey]]
+
+> Seems hard to me to sort apart the pagespec whose matching pages
+> list must be restricted to pages in the master (or current?)
+> language, and the ones that should not. The only solution I can see
+> to this surprising behaviour is: documentation. --[[intrigeri]]
diff --git a/doc/todo/po:_translation_of_directives.mdwn b/doc/todo/po:_translation_of_directives.mdwn
new file mode 100644
index 000000000..89fc93620
--- /dev/null
+++ b/doc/todo/po:_translation_of_directives.mdwn
@@ -0,0 +1,8 @@
+If a translated page contains a directive, it may expand to some english
+text, or text in whatever single language ikiwiki is configured to "speak".
+
+Maybe there could be a way to switch ikiwiki to speaking another language
+when building a non-english page? Then the directives would get translated.
+
+(We also will need this in order to use translated templates, when they are
+available.)
-- 
cgit v1.2.3


From d3fc6d797bdb64caa6ddd49de154fc4442208901 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 29 Jul 2010 16:33:57 +0200
Subject: remove spurious map directive

---
 doc/plugins/po.mdwn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 1a3917454..3c50908e8 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -238,8 +238,6 @@ avoid a potential denial of service.
 BUGS
 ====
 
-[[!map pages="bugs/po:*"]]
-
 [[!inline pages="bugs/po:* and !bugs/done and !link(bugs/done) and !bugs/*/*"
 feeds=no actions=no archive=yes show=0]]
 
-- 
cgit v1.2.3


From ad2722399e8a6f6d6a311e6b673e8f2e3aa18a41 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 29 Jul 2010 16:34:57 +0200
Subject: fixed broken link

---
 doc/plugins/po.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 3c50908e8..ac2df2d18 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -198,7 +198,7 @@ enabled, "slave" pages therefore link to the "master" page's
 discussion page.
 
 Likewise, "slave" pages are not supposed to have sub-pages;
-[[WikiLinks|wikilink]] that appear on a "slave" page therefore link to
+[[WikiLinks|ikiwiki/wikilink]] that appear on a "slave" page therefore link to
 the master page's sub-pages.
 
 Translating
-- 
cgit v1.2.3


From b298fdd78c2eb01cd89979c886e1284e957705fe Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 29 Jul 2010 16:37:17 +0200
Subject: todo++

---
 doc/todo/po:_better_translation_interface.mdwn | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/todo/po:_better_translation_interface.mdwn

diff --git a/doc/todo/po:_better_translation_interface.mdwn b/doc/todo/po:_better_translation_interface.mdwn
new file mode 100644
index 000000000..e66a77b85
--- /dev/null
+++ b/doc/todo/po:_better_translation_interface.mdwn
@@ -0,0 +1,2 @@
+Add a message-by-message translation interface to the PO plugin,
+with automatic escaping of special chars.
-- 
cgit v1.2.3


From 5e716ca62a61cdaa565932d177f55d02af9cc78a Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 30 Jul 2010 12:55:28 +0200
Subject: fixed by the last po4a release

---
 doc/bugs/po:_ugly_messages_with_empty_files.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/po:_ugly_messages_with_empty_files.mdwn b/doc/bugs/po:_ugly_messages_with_empty_files.mdwn
index 4e782605b..d3992b6bc 100644
--- a/doc/bugs/po:_ugly_messages_with_empty_files.mdwn
+++ b/doc/bugs/po:_ugly_messages_with_empty_files.mdwn
@@ -2,3 +2,5 @@ If there are empty .mdwn files, the po plugin displays some ugly messages.
 
 > This is due to a bug in po4a (not checking definedness of a
 > variable). One-liner patch sent. --[[intrigeri]]
+
+>> This seems to be fixed in po4a 0.40 => [[done]]. --[[intrigeri]]
-- 
cgit v1.2.3


From 1fe87a0808ee4d19d97956d48447644c69334f8a Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 30 Jul 2010 13:15:33 +0200
Subject: resubmitted patch to po4a upstream

---
 doc/bugs/po:_double_commits_of_po_files.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bugs/po:_double_commits_of_po_files.mdwn b/doc/bugs/po:_double_commits_of_po_files.mdwn
index 008df68c3..a871785be 100644
--- a/doc/bugs/po:_double_commits_of_po_files.mdwn
+++ b/doc/bugs/po:_double_commits_of_po_files.mdwn
@@ -12,3 +12,8 @@ update. --[[Joey]]
 > * The s/utf-8/UTF-8 part has been fixed.
 > * The ENCODING\n part is due to an inconsistency in po4a, which
 >   I've just send a patch for. --[[intrigeri]]
+
+>> I resubmitted the patch to po4a upstream, sending it this time to
+>> their mailing-list:
+>> [post archive](http://lists.alioth.debian.org/pipermail/po4a-devel/2010-July/001897.html).
+>> --[[intrigeri]]
-- 
cgit v1.2.3


From 543bc7af8be315e44ccca575b788e566bc122db2 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 30 Jul 2010 16:19:50 +0200
Subject: eventually got rid of the double rebuild issue. please have a look.

---
 doc/plugins/po/discussion.mdwn                     | 22 ---------------
 .../po:_avoid_rebuilding_to_fix_meta_titles.mdwn   | 32 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn

diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index 73858c818..50998e822 100644
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -644,28 +644,6 @@ daring a timid "please pull"... or rather, please review again :)
 >>> need improvements to the deletion UI to de-confuse that. It's fine to
 >>> put that off until needed --[[Joey]] 
 >> 
-> * Re the meta title escaping issue worked around by `change`. 
->   I suppose this does not only affect meta, but other things
->   at scan time too. Also, handling it only on rebuild feels
->   suspicious -- a refresh could involve changes to multiple
->   pages and trigger the same problem, I think. Also, exposing
->   this rebuild to the user seems really ugly, not confidence inducing.
->   
->   So I wonder if there's a better way. Such as making po, at scan time,
->   re-run the scan hooks, passing them modified content (either converted
->   from po to mdwn or with the escaped stuff cheaply de-escaped). (Of
->   course the scan hook would need to avoid calling itself!)
-> 
->   (This doesn't need to block the merge, but I hope it can be addressed
->   eventually..)
->  
-> --[[Joey]] 
->> 
->> I'll think about it soon.
->> 
->> --[[intrigeri]]
->>
->>> Did you get a chance to? --[[Joey]] 
 
  * As discussed at [[todo/l10n]] the templates needs to be translatable too.  They
    should be treated properly by po4a using the markdown option - at least with my
diff --git a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
new file mode 100644
index 000000000..78e8e3ade
--- /dev/null
+++ b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
@@ -0,0 +1,32 @@
+Re the meta title escaping issue worked around by `change`. 
+
+>   I suppose this does not only affect meta, but other things
+>   at scan time too. Also, handling it only on rebuild feels
+>   suspicious -- a refresh could involve changes to multiple
+>   pages and trigger the same problem, I think. Also, exposing
+>   this rebuild to the user seems really ugly, not confidence inducing.
+>   
+>   So I wonder if there's a better way. Such as making po, at scan time,
+>   re-run the scan hooks, passing them modified content (either converted
+>   from po to mdwn or with the escaped stuff cheaply de-escaped). (Of
+>   course the scan hook would need to avoid calling itself!)
+> 
+>   (This doesn't need to block the merge, but I hope it can be addressed
+>   eventually..)
+>  
+> --[[Joey]] 
+>> 
+>> I'll think about it soon.
+>> 
+>> --[[intrigeri]]
+>>
+>>> Did you get a chance to? --[[Joey]] 
+
+>>>> I eventually did, and got rid of the ugly double rebuild of pages
+>>>> at build time. This involved adding a `rescan` hook. Rationale
+>>>> and details are in my po branch commit messages. I believe this
+>>>> new way of handling meta title escaping to be far more robust.
+>>>> Moreover this new implementation is more generic, feels more
+>>>> logical to me, and probably fixes other similar bugs outside the
+>>>> meta plugin scope. Please have a look when you can.
+>>>> --[[intrigeri]]
-- 
cgit v1.2.3


From fee00fdb7a4ebb52e90f739cca33def70497620e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 31 Jul 2010 15:54:25 -0400
Subject: Use Digest::SHA built into perl rather than external Digest::SHA1 to
 simplify dependencies. Closes: #591040

---
 Bundle/IkiWiki/Extras.pm    | 1 -
 IkiWiki/Plugin/graphviz.pm  | 4 ++--
 IkiWiki/Plugin/search.pm    | 6 +++---
 IkiWiki/Plugin/sparkline.pm | 4 ++--
 debian/changelog            | 2 ++
 debian/control              | 2 +-
 doc/plugins/graphviz.mdwn   | 2 +-
 doc/plugins/search.mdwn     | 2 +-
 doc/plugins/sparkline.mdwn  | 2 +-
 ikiwiki.spec                | 1 -
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm
index 5bbd7b8c6..64e907306 100644
--- a/Bundle/IkiWiki/Extras.pm
+++ b/Bundle/IkiWiki/Extras.pm
@@ -16,7 +16,6 @@ perl -MCPAN -e 'install Bundle::IkiWiki::Extras'
 
 =head1 CONTENTS
 
-Digest::SHA1
 Authen::Passphrase
 Search::Xapian
 RPC::XML
diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index dfd66a03e..4ed8b89f1 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -37,10 +37,10 @@ sub render_graph (\%) {
 	$src .= "}\n";
 
 	# Use the sha1 of the graphviz code as part of its filename.
-	eval q{use Digest::SHA1};
+	eval q{use Digest::SHA};
 	error($@) if $@;
 	my $dest=$params{page}."/graph-".
-		IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
+		IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)).
 		".png";
 	will_render($params{page}, $dest);
 
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 1cf762fce..8fb9dff0c 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -190,15 +190,15 @@ sub pageterm ($) {
 	# 240 is the number used by omindex to decide when to hash an
 	# overlong term. This does not use a compatible hash method though.
 	if (length $page > 240) {
-		eval q{use Digest::SHA1};
+		eval q{use Digest::SHA};
 		if ($@) {
-			debug("search: ".sprintf(gettext("need Digest::SHA1 to index %s"), $page)) if $@;
+			debug("search: ".sprintf(gettext("need Digest::SHA to index %s"), $page)) if $@;
 			return undef;
 		}
 
 		# Note no colon, therefore it's guaranteed to not overlap
 		# with a page with the same name as the hash..
-		return "U".lc(Digest::SHA1::sha1_hex($page));
+		return "U".lc(Digest::SHA::sha1_hex($page));
 	}
 	else {
 		return "U:".$page;
diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 1b1d04cba..e28d2605a 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -122,10 +122,10 @@ sub preprocess (@) {
 
 	# Use the sha1 of the php code that generates the sparkline as
 	# the base for its filename.
-	eval q{use Digest::SHA1};
+	eval q{use Digest::SHA};
         error($@) if $@;
 	my $fn=$params{page}."/sparkline-".
-		IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($php)).
+		IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($php)).
 		".png";
 	will_render($params{page}, $fn);
 
diff --git a/debian/changelog b/debian/changelog
index 5645b34d4..25123cecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
   * meta: Allow syntax closer to html meta to be used.
   * Add new disable hook, allowing plugins to perform cleanup after they
     have been disabled.
+  * Use Digest::SHA built into perl rather than external Digest::SHA1
+    to simplify dependencies. Closes: #591040
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
 
diff --git a/debian/control b/debian/control
index 0562a4a99..049a685b0 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
   libxml-feed-perl, libmailtools-perl, perlmagick,
   libfile-mimeinfo-perl, libcrypt-ssleay-perl,
   liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl,
-  libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl,
+  libtext-csv-perl, graphviz, libnet-amazon-s3-perl,
   libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
   libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
   po4a (>= 0.35-1), gettext, libyaml-perl
diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn
index 65130ae8c..d57d7dc94 100644
--- a/doc/plugins/graphviz.mdwn
+++ b/doc/plugins/graphviz.mdwn
@@ -22,4 +22,4 @@ Some example graphs:
 [[!graph src="a -- b -- c -- a;" prog="circo" type="graph"]]
 """]]
 
-This plugin uses the [[!cpan Digest::SHA1]] perl module.
+This plugin uses the [[!cpan Digest::SHA]] perl module.
diff --git a/doc/plugins/search.mdwn b/doc/plugins/search.mdwn
index 92cc5945a..e95739cf3 100644
--- a/doc/plugins/search.mdwn
+++ b/doc/plugins/search.mdwn
@@ -4,7 +4,7 @@
 This plugin adds full text search to ikiwiki, using the
 [xapian](http://xapian.org/) engine, its
 [omega](http://xapian.org/docs/omega/overview.html) frontend, and the
-[[!cpan Search::Xapian]], [[!cpan Digest::SHA1]], and [[!cpan HTML::Scrubber]]
+[[!cpan Search::Xapian]], [[!cpan Digest::SHA]], and [[!cpan HTML::Scrubber]]
 perl modules.
 
 The [[ikiwiki/searching]] page describes how to write search queries.
diff --git a/doc/plugins/sparkline.mdwn b/doc/plugins/sparkline.mdwn
index ee3928d7e..83e24a27d 100644
--- a/doc/plugins/sparkline.mdwn
+++ b/doc/plugins/sparkline.mdwn
@@ -16,7 +16,7 @@ to use the plugin, you will need:
   php can find it when `sparkline/Sparkline.php` is required.
 * The GD PHP module used by the Sparkline library.
 * A "php" program in the path, that can run standalone php programs.
-* [[!cpan Digest::SHA1]]
+* [[!cpan Digest::SHA]]
 
 On a Debian system, this can be accomplished by installing these packages:
 `libsparkline-php` `php5-gd` `php5-cli` `libdigest-sha1-perl`
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 43065b7f5..ca5794704 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -31,7 +31,6 @@ Requires:       perl(HTML::Scrubber)
 Requires:       perl(XML::Simple)
 Requires:       perl(CGI::FormBuilder)
 Requires:       perl(CGI::Session)
-Requires:       perl(Digest::SHA1)
 
 Requires:       python-docutils
 
-- 
cgit v1.2.3


From b2571bb50d58f296df3320519435c74bd1c1ea2f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 1 Aug 2010 12:18:57 -0400
Subject: close, cannot reproduce

---
 doc/bugs/po:_new_pages_not_translatable.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/po:_new_pages_not_translatable.mdwn b/doc/bugs/po:_new_pages_not_translatable.mdwn
index 84156bacc..c19f66594 100644
--- a/doc/bugs/po:_new_pages_not_translatable.mdwn
+++ b/doc/bugs/po:_new_pages_not_translatable.mdwn
@@ -8,3 +8,5 @@ I can reproduce this bug in a test site. --[[Joey]]
 > I could reproduce this bug at some point during the merge of a buggy
 > version of my ordered slave languages patch, but I cannot anymore.
 > Could you please try again? --[[intrigeri]]
+
+>> Cannot reproduce with 3.20100722, [[done]] I guess. --[[Joey]] 
-- 
cgit v1.2.3


From 9d62c6382a9947f4c7b13d1598b5d7436405e6ea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 1 Aug 2010 12:22:27 -0400
Subject: pot files maybe..

---
 doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
index 4ddd0fa1e..26b1964ba 100644
--- a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
+++ b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
@@ -1,2 +1,4 @@
 ikiwiki now has a `disable` hook. Should the po plugin remove the po
 files from the source repository when it has been disabled?
+
+> pot files, possibly, but the po files contain work, so no. --[[Joey]] 
-- 
cgit v1.2.3


From 2ab89b4462557e59e5ccaccf419e5bb3809a643a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 1 Aug 2010 12:25:35 -0400
Subject: response

---
 doc/plugins/po.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index ac2df2d18..154c4cbde 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -302,3 +302,7 @@ underlay, and the underlays lack translation to a given language.
 >>>> this could be solved by adding `SRCDIR/basewiki` as an underlay
 >>>> to your l10n wiki configuration, possibly using the
 >>>> `add_underlays` configuration directive. --[[intrigeri]]
+
+>>>>> There is no complete Swedish underlay translation yet, so it is not
+>>>>> shipped in ikiwiki. I don't think it's a misconfiguration to use
+>>>>> a language that doesn't have translated underlays. --[[Joey]] 
-- 
cgit v1.2.3


From 7a1d5632b8c762ad7b00e1e834b5678ec9299bda Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 1 Aug 2010 12:36:44 -0400
Subject: comment

---
 doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
index 78e8e3ade..86b0ccd72 100644
--- a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
+++ b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
@@ -30,3 +30,11 @@ Re the meta title escaping issue worked around by `change`.
 >>>> logical to me, and probably fixes other similar bugs outside the
 >>>> meta plugin scope. Please have a look when you can.
 >>>> --[[intrigeri]]
+
+>>>>> Glad you have tackled this. Looking at
+>>>>> 25447bccae0439ea56da7a788482a4807c7c459d,
+>>>>> I wonder how this rescan hook is different from a scan hook
+>>>>> with `last => 1` ? Ah, it comes *after* the preprocess hook
+>>>>> in scan mode. Hmm, I wonder if there's any reason to have 
+>>>>> the scan hook called before those as it does now. Reordering
+>>>>> those 2 lines could avoid adding a new hook. --[[Joey]]
-- 
cgit v1.2.3


From e083e4caa8175c4ccc45dd06e9b9cd784dcbbc94 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 2 Aug 2010 03:23:30 +0200
Subject: ack²
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/plugins/po.mdwn                                   | 13 +++++++++++--
 doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 154c4cbde..0f1d66d32 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -247,8 +247,8 @@ TODO
 [[!inline pages="todo/po:* and !todo/done and !link(todo/done) and !todo/*/*"
 feeds=no actions=no archive=yes show=0]]
 
-l10n wiki misconfiguration
---------------------------
+broken links to translatable basewiki pages that lack po files
+--------------------------------------------------------------
 
 If a page is not translated yet, the "translated" version of it
 displays wikilinks to other, existing (but not yet translated?)
@@ -306,3 +306,12 @@ underlay, and the underlays lack translation to a given language.
 >>>>> There is no complete Swedish underlay translation yet, so it is not
 >>>>> shipped in ikiwiki. I don't think it's a misconfiguration to use
 >>>>> a language that doesn't have translated underlays. --[[Joey]] 
+
+>>>>>> Ok. The problem is triggered when using a language that doesn't
+>>>>>> have translated underlays, *and* defining
+>>>>>> `po_translatable_pages` in a way that renders the base wiki
+>>>>>> pages translatable in po's view of things, which in turns makes
+>>>>>> the po plugin act as if the translation pages did exist,
+>>>>>> although they do not in this case. I still need to have a deep
+>>>>>> look at the underlays-related code you added to `po.pm` a while
+>>>>>> ago. Stay tuned. --[[intrigeri]]
diff --git a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
index 86b0ccd72..d4e1f743c 100644
--- a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
+++ b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
@@ -38,3 +38,6 @@ Re the meta title escaping issue worked around by `change`.
 >>>>> in scan mode. Hmm, I wonder if there's any reason to have 
 >>>>> the scan hook called before those as it does now. Reordering
 >>>>> those 2 lines could avoid adding a new hook. --[[Joey]]
+
+>>>>>> Sure. I was fearing to break other plugins if I did so, so I
+>>>>>> did not dare to. I'll try this. --[[intrigeri]]
-- 
cgit v1.2.3


From 97a706f73ce2cedc8fd8a9bbeea6d25783260b2e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 2 Aug 2010 15:14:33 +0200
Subject: both are now fixed in my po branch.

---
 doc/plugins/po.mdwn                                   | 3 +++
 doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 0f1d66d32..91273ba98 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -315,3 +315,6 @@ underlay, and the underlays lack translation to a given language.
 >>>>>> although they do not in this case. I still need to have a deep
 >>>>>> look at the underlays-related code you added to `po.pm` a while
 >>>>>> ago. Stay tuned. --[[intrigeri]]
+
+>>>>>>> Fixed in my po branch, along with other related small bugs that
+>>>>>>> happen in the very same situation only. --[[intrigeri]]
diff --git a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
index d4e1f743c..402f70b79 100644
--- a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
+++ b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
@@ -41,3 +41,5 @@ Re the meta title escaping issue worked around by `change`.
 
 >>>>>> Sure. I was fearing to break other plugins if I did so, so I
 >>>>>> did not dare to. I'll try this. --[[intrigeri]]
+
+>>>>>>> Done in my po branch, please have a look. --[[intrigeri]]
-- 
cgit v1.2.3


From c5b052cbbda14c5c33127890d4a9842b8dee826a Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 2 Aug 2010 16:00:37 +0200
Subject: explored possible ways to do it, got trapped.

---
 doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
index 26b1964ba..0801f7fcd 100644
--- a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
+++ b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
@@ -2,3 +2,10 @@ ikiwiki now has a `disable` hook. Should the po plugin remove the po
 files from the source repository when it has been disabled?
 
 > pot files, possibly, but the po files contain work, so no. --[[Joey]] 
+
+>> I tried to implement this in my `po-disable` branch, but AFAIK, the
+>> current rcs plugins interface provides no way to tell whether a
+>> given file (e.g. a POT file in my case) is under version control;
+>> in most cases, it is not, thanks to .gitignore or similar, but we
+>> can't be sure. So I just can't decide it is needed to call
+>> `rcs_remove` rather than a good old `unlink`. --[[intrigeri]]
-- 
cgit v1.2.3


From 06641bb8809775dae7ba7fb0817a45e067501ee2 Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <Lars_Wirzenius@web>
Date: Mon, 2 Aug 2010 18:35:07 +0000
Subject:

---
 .../__34__First_post__34___deletion_does_not_refresh_front_page.mdwn   | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn

diff --git a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
new file mode 100644
index 000000000..8d04ed18f
--- /dev/null
+++ b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
@@ -0,0 +1,3 @@
+When I created an ikiwiki site (on Branchable) using the blog template, it added a "First post", which was fine.
+Deleting that post removed it, but the front page did not get the re-generated, so it was still there.
+--[[liw]]
-- 
cgit v1.2.3


From d934cee673ee18cd814e658a86c607fe5a209476 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 2 Aug 2010 14:37:02 -0400
Subject: resp

---
 .../__34__First_post__34___deletion_does_not_refresh_front_page.mdwn   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
index 8d04ed18f..d605aa8d4 100644
--- a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
+++ b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
@@ -1,3 +1,6 @@
 When I created an ikiwiki site (on Branchable) using the blog template, it added a "First post", which was fine.
 Deleting that post removed it, but the front page did not get the re-generated, so it was still there.
 --[[liw]]
+
+> From a quick look, it seems that `depends_simple` does not contain pages
+> in the inline. Need to investigate further. --[[Joey]] 
-- 
cgit v1.2.3


From c2f2349de4507c8f7bb12926c3c49c917fcf2a06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 4 Aug 2010 08:09:11 -0400
Subject: bug isolated

---
 .../__34__First_post__34___deletion_does_not_refresh_front_page.mdwn  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
index d605aa8d4..78009da75 100644
--- a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
+++ b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
@@ -2,5 +2,5 @@ When I created an ikiwiki site (on Branchable) using the blog template, it added
 Deleting that post removed it, but the front page did not get the re-generated, so it was still there.
 --[[liw]]
 
-> From a quick look, it seems that `depends_simple` does not contain pages
-> in the inline. Need to investigate further. --[[Joey]] 
+> This is a bug involving the `page()` pagespec. Deleted
+> pages matching this pagespec are not noticed. --[[Joey]] 
-- 
cgit v1.2.3


From 5d88146861ac237ac89cbed2e90a985b9c3bfdc2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 4 Aug 2010 08:24:47 -0400
Subject: Fixes a bug that prevented matching deleted pages when using the
 page() PageSpec.

---
 IkiWiki.pm                                                | 15 +++++++++------
 debian/changelog                                          |  2 ++
 ...t_post__34___deletion_does_not_refresh_front_page.mdwn |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e08d02922..df8abe2c2 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2439,13 +2439,16 @@ sub match_internal ($$;@) {
 sub match_page ($$;@) {
 	my $page=shift;
 	my $match=match_glob($page, shift, @_);
-	if ($match && ! (exists $IkiWiki::pagesources{$page}
-	    && defined IkiWiki::pagetype($IkiWiki::pagesources{$page}))) {
-		return IkiWiki::FailReason->new("$page is not a page");
-	}
-	else {
-		return $match;
+	if ($match) {
+		my $source=exists $IkiWiki::pagesources{$page} ?
+			$IkiWiki::pagesources{$page} :
+			$IkiWiki::delpagesources{$page};
+		my $type=defined $source ? IkiWiki::pagetype($source) : undef;
+		if (! defined $type) {	
+			return IkiWiki::FailReason->new("$page is not a page");
+		}
 	}
+	return $match;
 }
 
 sub match_link ($$;@) {
diff --git a/debian/changelog b/debian/changelog
index 25123cecc..5c0064845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
     have been disabled.
   * Use Digest::SHA built into perl rather than external Digest::SHA1
     to simplify dependencies. Closes: #591040
+  * Fixes a bug that prevented matching deleted pages when using the page()
+    PageSpec.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
 
diff --git a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
index 78009da75..2367335a7 100644
--- a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
+++ b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn
@@ -3,4 +3,4 @@ Deleting that post removed it, but the front page did not get the re-generated,
 --[[liw]]
 
 > This is a bug involving the `page()` pagespec. Deleted
-> pages matching this pagespec are not noticed. --[[Joey]] 
+> pages matching this pagespec are not noticed. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 522f3d1d651892e7914ef43b9c33e7d062c9e0ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 4 Aug 2010 09:26:43 -0400
Subject: releasing version 3.20100804

---
 debian/changelog |  4 +--
 ikiwiki.spec     |  2 +-
 po/bg.po         | 95 ++++++++++++++++++++++++++++--------------------------
 po/cs.po         | 97 +++++++++++++++++++++++++++++---------------------------
 po/da.po         | 97 +++++++++++++++++++++++++++++---------------------------
 po/de.po         | 97 +++++++++++++++++++++++++++++---------------------------
 po/es.po         | 97 +++++++++++++++++++++++++++++---------------------------
 po/fr.po         | 97 +++++++++++++++++++++++++++++---------------------------
 po/gu.po         | 95 ++++++++++++++++++++++++++++--------------------------
 po/ikiwiki.pot   | 95 ++++++++++++++++++++++++++++--------------------------
 po/it.po         | 97 +++++++++++++++++++++++++++++---------------------------
 po/pl.po         | 95 ++++++++++++++++++++++++++++--------------------------
 po/sv.po         | 95 ++++++++++++++++++++++++++++--------------------------
 po/tr.po         | 95 ++++++++++++++++++++++++++++--------------------------
 po/vi.po         | 95 ++++++++++++++++++++++++++++--------------------------
 15 files changed, 659 insertions(+), 594 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c0064845..8223074f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100723) UNRELEASED; urgency=low
+ikiwiki (3.20100804) unstable; urgency=low
 
   * template: Fix dependency tracking. Broken in version 3.20100427.
   * po: The po_slave_languages setting is now a list, so the order of
@@ -13,7 +13,7 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
   * Fixes a bug that prevented matching deleted pages when using the page()
     PageSpec.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 04 Aug 2010 09:20:52 -0400
 
 ikiwiki (3.20100722) unstable; urgency=low
 
diff --git a/ikiwiki.spec b/ikiwiki.spec
index ca5794704..99de59fb8 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100722
+Version: 3.20100804
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index c9fd77b8f..8534c6d85 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -134,7 +134,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "готово"
 
@@ -369,23 +369,23 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "При използване на приеставката „search” е необходимо е да се укаже %s"
@@ -520,7 +520,7 @@ msgstr "шаблонът „%s” не е намерен"
 msgid "redir cycle is not allowed"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -617,94 +617,99 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -901,12 +906,12 @@ msgstr "грешка при запис на файла „%s”: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
+#: ../IkiWiki/Plugin/search.pm:195
 #, perl-format
-msgid "need Digest::SHA1 to index %s"
+msgid "need Digest::SHA to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr ""
 
@@ -1156,27 +1161,31 @@ msgstr ""
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "генериране на обвивки..."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "„%s” не е изпълним файл"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "не може да бъде създадена обвивка, която използва файл за настройки"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "не е указан файл на обвивката"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "крешка при компилиране на файла %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "успешно генериране на %s"
@@ -1197,15 +1206,11 @@ msgstr ""
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "генериране на обвивки..."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
@@ -1233,21 +1238,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
diff --git a/po/cs.po b/po/cs.po
index 06e351841..11f1d05ed 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -133,7 +133,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr "mažu bucket..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "hotovo"
 
@@ -366,23 +366,23 @@ msgstr "není stránkou"
 msgid "%s is an attachment, not a page."
 msgstr "%s není ani příloha, ani stránka."
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "nejste oprávněni měnit %s"
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "%s musíte zadat při každém použití modulu %s"
@@ -504,7 +504,7 @@ msgstr "stránka, na kterou vede přesměrování, nebyla nalezena"
 msgid "redir cycle is not allowed"
 msgstr "cykly nejsou v přesměrování povoleny"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "vyžaduje parametry „from“ a „to“"
@@ -601,40 +601,45 @@ msgstr "LWP nebyl nalezen, nepinkám"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není platným kódem jazyka"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "sestavuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr "aktualizovány PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -642,7 +647,7 @@ msgstr ""
 "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
 "budou odstraněny také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -650,50 +655,50 @@ msgstr ""
 "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
 "budou přejmenovány také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT soubor (%s) neexistuje"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nepodařilo se zkopírovat PO soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to update %s"
 msgstr "nepodařilo se aktualizovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nepodařilo se zkopírovat POT soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, perl-format
 msgid "failed to translate %s"
 msgstr "nepodařilo se přeložit %s"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr "odstraněny zastaralé PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, perl-format
 msgid "failed to write %s"
 msgstr "nepodařilo se zapsat %s"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 msgid "failed to translate"
 msgstr "překlad se nezdařil"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
@@ -889,12 +894,12 @@ msgstr "nepodařilo se přečíst %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
-#, perl-format
-msgid "need Digest::SHA1 to index %s"
+#: ../IkiWiki/Plugin/search.pm:195
+#, fuzzy, perl-format
+msgid "need Digest::SHA to index %s"
 msgstr "pro indexování %s je potřeba Digest::SHA1"
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr "hledání"
 
@@ -1141,27 +1146,31 @@ msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo"
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:"
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "generuji obaly..."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "%s není spustitelný soubor"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "nemohu vytvořit obal, který využívá soubor setup"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "jméno souboru s obalem nebylo zadáno"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "nelze zkompilovat %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s byl úspěšně vytvořen"
@@ -1183,15 +1192,11 @@ msgstr "použití: --set proměnná=hodnota"
 msgid "usage: --set-yaml var=value"
 msgstr "použití: --set proměnná=hodnota"
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "generuji obaly..."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "znovusestavuji wiki..."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
@@ -1217,21 +1222,21 @@ msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
diff --git a/po/da.po b/po/da.po
index cb550fa4f..c3178a7ea 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -137,7 +137,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "færdig"
 
@@ -374,23 +374,23 @@ msgstr "kan ikke få sider til at passe sammen: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Du har ikke lov til at ændre %s"
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "du kan ikke påvirke en fil med modus %s"
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Skal angive %s når udvidelsen %s bruges"
@@ -517,7 +517,7 @@ msgstr "henvisningsside ikke fundet"
 msgid "redir cycle is not allowed"
 msgstr "ring af henvisninger er ikke tilladt"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "kræver 'from'- og 'to'-parametre"
@@ -615,12 +615,17 @@ msgstr "LWP ikke fundet, pinger ikke"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -628,7 +633,7 @@ msgstr ""
 "%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -636,21 +641,21 @@ msgstr ""
 "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -658,7 +663,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -666,50 +671,50 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -904,12 +909,12 @@ msgstr "læsning af %s mislykkedes"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
-#, perl-format
-msgid "need Digest::SHA1 to index %s"
+#: ../IkiWiki/Plugin/search.pm:195
+#, fuzzy, perl-format
+msgid "need Digest::SHA to index %s"
 msgstr "behøver Digest::SHA1 til indeks %s"
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr "søg"
 
@@ -1156,27 +1161,31 @@ msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes"
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:"
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "bygger wrappers.."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "%s ser ikke ud til at kunne afvikles"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "kan ikke oprette en wrapper som bruger en opsætningsfil"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "wrapper-navn ikke angivet"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "kompilering af %s mislykkedes"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "Korrekt bygget %s"
@@ -1198,15 +1207,11 @@ msgstr "brug: --set var=værdi"
 msgid "usage: --set-yaml var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "bygger wrappers.."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
@@ -1233,21 +1238,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
diff --git a/po/de.po b/po/de.po
index a47add580..dc3f447f5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2010-03-14 16:09+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -134,7 +134,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr "lösche Behälter (bucket)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "fertig"
 
@@ -368,23 +368,23 @@ msgstr "Keine Seite"
 msgid "%s is an attachment, not a page."
 msgstr "Seite %s ist ein Anhang und keine Seite."
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Sie dürfen %s nicht verändern"
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird"
@@ -513,7 +513,7 @@ msgstr "Umleitungsseite nicht gefunden"
 msgid "redir cycle is not allowed"
 msgstr "Zyklische Umleitungen sind nicht erlaubt"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "erfordert die Parameter 'from' und 'to'"
@@ -611,12 +611,17 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35"
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist keine gültige Sprachkodierung"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -624,7 +629,7 @@ msgstr ""
 "%s ist kein gültiger Wert für po_link_to, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -632,21 +637,21 @@ msgstr ""
 "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -654,7 +659,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -662,50 +667,50 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -903,12 +908,12 @@ msgstr "konnte das rsync_command nicht ausführen: %s"
 msgid "rsync_command exited %d"
 msgstr "rsync_command gibt Fehler %d zurück"
 
-#: ../IkiWiki/Plugin/search.pm:194
-#, perl-format
-msgid "need Digest::SHA1 to index %s"
+#: ../IkiWiki/Plugin/search.pm:195
+#, fuzzy, perl-format
+msgid "need Digest::SHA to index %s"
 msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen"
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr "suchen"
 
@@ -1161,27 +1166,31 @@ msgstr ""
 "** Erweiterung %s wurde ausgeschaltet, weil sie mit der folgenden Meldung "
 "fehlgeschlagen ist:"
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "erzeuge Wrapper.."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "%s scheint nicht ausführbar zu sein"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "Kann keinen Wrapper erzeugen, der eine Einrichtungsdatei verwendet"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "Dateiname des Wrappers nicht angegeben"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "erzeugen von %s fehlgeschlagen"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s wurde erfolgreich erstellt"
@@ -1203,15 +1212,11 @@ msgstr "Aufruf: --set Variable=Wert"
 msgid "usage: --set-yaml var=value"
 msgstr "Aufruf: --set Variable=Wert"
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "erzeuge Wrapper.."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
@@ -1240,21 +1245,21 @@ msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
diff --git a/po/es.po b/po/es.po
index d9155a921..c7ec94678 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -139,7 +139,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "completado"
 
@@ -376,23 +376,23 @@ msgstr "no encuentro páginas coincidentes: %s"
 msgid "%s is an attachment, not a page."
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No puede cambiar %s"
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "no puede actuar sobre un archivo con permisos %s"
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda"
@@ -521,7 +521,7 @@ msgstr "falta la página a donde redirigir"
 msgid "redir cycle is not allowed"
 msgstr "ciclo de redirección no permitido"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "los parámetros 'from' y 'to' son obligatorios"
@@ -623,94 +623,99 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -904,12 +909,12 @@ msgstr "no puedo leer de %s: %s "
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
-#, perl-format
-msgid "need Digest::SHA1 to index %s"
+#: ../IkiWiki/Plugin/search.pm:195
+#, fuzzy, perl-format
+msgid "need Digest::SHA to index %s"
 msgstr "se necesita la instalación de Digest::SHA1 para indexar %s"
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr "buscar"
 
@@ -1165,28 +1170,32 @@ msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
 "** Desactivando el complemento %s dado que está fallando con este mensaje:"
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "generando programas auxiliares.."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "el programa %s no parece ser ejecutable"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr ""
 "no puedo crear un programa envoltorio que utiliza un archivo de configuración"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "el programa envoltorio no ha sido especificado"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "ha fallado la compilación del programa %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "creado con éxito el programa envoltorio %s"
@@ -1208,15 +1217,11 @@ msgstr "uso: --set variable=valor"
 msgid "usage: --set-yaml var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "generando programas auxiliares.."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
@@ -1246,21 +1251,21 @@ msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
diff --git a/po/fr.po b/po/fr.po
index a080dcd34..e961ba0fa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2010-07-17 18:13+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -135,7 +135,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "Suppression du compartiment S3 (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "Terminé"
 
@@ -367,23 +367,23 @@ msgstr "Ce n'est pas une page."
 msgid "%s is an attachment, not a page."
 msgstr "%s est une pièce jointe, pas une page."
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Vous n'êtes pas autorisé à modifier %s"
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s."
@@ -510,7 +510,7 @@ msgstr "Page de redirection introuvable"
 msgid "redir cycle is not allowed"
 msgstr "Redirection cyclique non autorisée"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "les paramètres « from » et « to » sont nécessaires."
@@ -612,12 +612,17 @@ msgstr ""
 "Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
 "version 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un code de langue valable"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -625,7 +630,7 @@ msgstr ""
 "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
 "défaut."
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -633,23 +638,23 @@ msgstr ""
 "po_link_to=negotiated nécessite que usedirs soit activé, retour à "
 "po_link_to=default."
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -657,7 +662,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -665,50 +670,50 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -906,12 +911,12 @@ msgstr "Impossible d'exécuter la commande rsync : %s"
 msgid "rsync_command exited %d"
 msgstr "la commande rsync s'est terminée avec le code : %d"
 
-#: ../IkiWiki/Plugin/search.pm:194
-#, perl-format
-msgid "need Digest::SHA1 to index %s"
+#: ../IkiWiki/Plugin/search.pm:195
+#, fuzzy, perl-format
+msgid "need Digest::SHA to index %s"
 msgstr "Digest::SHA1 est nécessaire pour indexer %s"
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr "recherche"
 
@@ -1163,28 +1168,32 @@ msgstr ""
 "** Désactivation du greffon %s, l'installation a échoué avec le message "
 "suivant :"
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "Création des fichiers CGI..."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "%s ne semble pas être exécutable"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr ""
 "Impossible de créer un fichier CGI utilisant un fichier de configuration"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "Le nom du fichier CGI n'a pas été indiqué"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Échec de la compilation de %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s a été créé avec succès"
@@ -1206,15 +1215,11 @@ msgstr "Syntaxe : -- set var=valeur"
 msgid "usage: --set-yaml var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "Création des fichiers CGI..."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
@@ -1241,21 +1246,21 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
diff --git a/po/gu.po b/po/gu.po
index 8e796f51f..fbeea1492 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -132,7 +132,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -367,23 +367,23 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે"
@@ -510,7 +510,7 @@ msgstr "ફીડ મળ્યું નહી"
 msgid "redir cycle is not allowed"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -607,94 +607,99 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -891,12 +896,12 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
+#: ../IkiWiki/Plugin/search.pm:195
 #, perl-format
-msgid "need Digest::SHA1 to index %s"
+msgid "need Digest::SHA to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr ""
 
@@ -1143,27 +1148,31 @@ msgstr ""
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "આવરણ બનાવે છે.."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "%s એ ચલાવી શકાય તેમ લાગતું નથી"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "ગોઠવણ ફાઇલનો ઉપયોગ કરે છે તેનું આવરણ બનાવી શકાતું નથી"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
@@ -1184,15 +1193,11 @@ msgstr ""
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "આવરણ બનાવે છે.."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
@@ -1218,21 +1223,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index e42195ecb..9d311a5ad 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -133,7 +133,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr ""
 
@@ -360,23 +360,23 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr ""
@@ -497,7 +497,7 @@ msgstr ""
 msgid "redir cycle is not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -592,93 +592,98 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -872,12 +877,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
+#: ../IkiWiki/Plugin/search.pm:195
 #, perl-format
-msgid "need Digest::SHA1 to index %s"
+msgid "need Digest::SHA to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr ""
 
@@ -1118,27 +1123,31 @@ msgstr ""
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr ""
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -1159,15 +1168,11 @@ msgstr ""
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr ""
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1193,21 +1198,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 8ebf695f4..3fda6d221 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -132,7 +132,7 @@ msgstr "creazione nuova pagina %s"
 msgid "deleting bucket.."
 msgstr "eliminazione contenitore..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "fatto"
 
@@ -365,23 +365,23 @@ msgstr "non è una pagina"
 msgid "%s is an attachment, not a page."
 msgstr "%s è un allegato, non una pagina."
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "non è permesso modificare %s"
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "non è permesso lavorare su un file in modalità %s"
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Occorre specificare %s quando si usa il plugin %s"
@@ -507,7 +507,7 @@ msgstr "pagina di reindirizzamento non trovata"
 msgid "redir cycle is not allowed"
 msgstr "ciclo di reindirizzamento non ammesso"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 #, fuzzy
 msgid "sort=meta requires a parameter"
 msgstr "sono richiesti i parametri \"to\" e \"from\""
@@ -609,19 +609,24 @@ msgstr ""
 "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno "
 "alla versione 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s non è una codifica di lingua valida"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -629,21 +634,21 @@ msgstr ""
 "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr "file PO aggiornati"
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -651,7 +656,7 @@ msgstr ""
 "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
 "stata eliminata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -659,50 +664,50 @@ msgstr ""
 "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
 "stata rinominata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Il file POT (%s) non esiste"
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "impossibile copiare il file PO di underlay in %s"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "impossibile copiare il file POT in %s"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr "N/D"
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, perl-format
 msgid "failed to translate %s"
 msgstr "impossibile tradurre %s"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
@@ -900,12 +905,12 @@ msgstr "impossibile leggere %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
-#, perl-format
-msgid "need Digest::SHA1 to index %s"
+#: ../IkiWiki/Plugin/search.pm:195
+#, fuzzy, perl-format
+msgid "need Digest::SHA to index %s"
 msgstr "è necessario Digest::SHA1 per l'indice di %s"
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr "cerca"
 
@@ -1153,27 +1158,31 @@ msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
 "** Plugin %s disabilitato, a causa della seguente segnalazione di errore:"
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "generazione contenitori..."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "%s non sembra essere eseguibile"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "impossibile creare un contenitore che utilizzi un file di setup"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "nome del file del contenitore non specificato"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "errore nel compilare %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s generato con successo"
@@ -1195,15 +1204,11 @@ msgstr "utilizzo: --set var=valore"
 msgid "usage: --set-yaml var=value"
 msgstr "utilizzo: --set var=valore"
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "generazione contenitori..."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "ricostruzione wiki..."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
@@ -1229,21 +1234,21 @@ msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
diff --git a/po/pl.po b/po/pl.po
index 7d2dc876b..e93753abd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -136,7 +136,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "gotowe"
 
@@ -371,23 +371,23 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
@@ -523,7 +523,7 @@ msgstr "nieznaleziony kanał RSS"
 msgid "redir cycle is not allowed"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -620,94 +620,99 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -906,12 +911,12 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
+#: ../IkiWiki/Plugin/search.pm:195
 #, perl-format
-msgid "need Digest::SHA1 to index %s"
+msgid "need Digest::SHA to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr ""
 
@@ -1164,27 +1169,31 @@ msgstr ""
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "tworzenie osłon..."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "osłona %s nie jest wykonywalna"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "awaria w trakcie tworzenia osłony używającej pliku konfiguracyjnego"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "awaria w trakcie kompilowania %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "pomyślnie utworzono %s"
@@ -1205,15 +1214,11 @@ msgstr ""
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "tworzenie osłon..."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
@@ -1241,21 +1246,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 770a7e515..fee2693e2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -133,7 +133,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "klar"
 
@@ -368,23 +368,23 @@ msgstr "kan inte läsa %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Måste ange %s när sökinsticket används"
@@ -516,7 +516,7 @@ msgstr "mallen %s hittades inte"
 msgid "redir cycle is not allowed"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -613,94 +613,99 @@ msgstr "RPC::XML::Client hittades inte, pingar inte"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -896,12 +901,12 @@ msgstr "misslyckades med att skriva %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
+#: ../IkiWiki/Plugin/search.pm:195
 #, perl-format
-msgid "need Digest::SHA1 to index %s"
+msgid "need Digest::SHA to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr ""
 
@@ -1151,27 +1156,31 @@ msgstr ""
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "genererar wrappers.."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "%s verkar inte vara körbar"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "kan inte skapa en wrapper som använder en konfigurationsfil"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "filnamn för wrapper har inte angivits"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "misslyckades med att kompilera %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "generering av %s lyckades"
@@ -1192,15 +1201,11 @@ msgstr ""
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "genererar wrappers.."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
@@ -1226,21 +1231,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
diff --git a/po/tr.po b/po/tr.po
index e68b77676..e1c5f03b5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20091031\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2009-11-08 03:04+0200\n"
 "Last-Translator: Recai Oktaş <roktas@debian.org>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -129,7 +129,7 @@ msgstr "%s için yeni sayfa oluşturuluyor"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr ""
 
@@ -356,23 +356,23 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr ""
@@ -493,7 +493,7 @@ msgstr ""
 msgid "redir cycle is not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -588,93 +588,98 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -868,12 +873,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
+#: ../IkiWiki/Plugin/search.pm:195
 #, perl-format
-msgid "need Digest::SHA1 to index %s"
+msgid "need Digest::SHA to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr ""
 
@@ -1114,27 +1119,31 @@ msgstr ""
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr ""
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -1155,15 +1164,11 @@ msgstr ""
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr ""
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1189,21 +1194,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index c4422d95b..b22f16418 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-22 16:50-0400\n"
+"POT-Creation-Date: 2010-08-04 09:22-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -134,7 +134,7 @@ msgstr "đang tạo trang mới %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
 msgid "done"
 msgstr "xong"
 
@@ -368,23 +368,23 @@ msgstr "không thể đọc %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758
+#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:780
+#: ../IkiWiki/Plugin/git.pm:782
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:784
+#: ../IkiWiki/Plugin/git.pm:786
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136
-#: ../IkiWiki/Plugin/search.pm:37
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
+#: ../IkiWiki/Plugin/search.pm:38
 #, fuzzy, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
@@ -516,7 +516,7 @@ msgstr "không tìm thấy mẫu %s"
 msgid "redir cycle is not allowed"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/meta.pm:387
+#: ../IkiWiki/Plugin/meta.pm:395
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -613,94 +613,99 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:144
+#: ../IkiWiki/Plugin/po.pm:147
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:166
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:161
+#: ../IkiWiki/Plugin/po.pm:183
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:392
+#: ../IkiWiki/Plugin/po.pm:414
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 
-#: ../IkiWiki/Plugin/po.pm:434
+#: ../IkiWiki/Plugin/po.pm:456
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:479
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:477
+#: ../IkiWiki/Plugin/po.pm:499
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:888
+#: ../IkiWiki/Plugin/po.pm:924
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:902
+#: ../IkiWiki/Plugin/po.pm:938
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:911
+#: ../IkiWiki/Plugin/po.pm:947
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:917
+#: ../IkiWiki/Plugin/po.pm:953
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:989
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:1000
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1048
+#: ../IkiWiki/Plugin/po.pm:1079
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117
-#: ../IkiWiki/Plugin/po.pm:1156
+#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
+#: ../IkiWiki/Plugin/po.pm:1187
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1115
+#: ../IkiWiki/Plugin/po.pm:1146
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1168
+#: ../IkiWiki/Plugin/po.pm:1199
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -896,12 +901,12 @@ msgstr "lỗi ghi %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:194
+#: ../IkiWiki/Plugin/search.pm:195
 #, perl-format
-msgid "need Digest::SHA1 to index %s"
+msgid "need Digest::SHA to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:231
+#: ../IkiWiki/Plugin/search.pm:232
 msgid "search"
 msgstr ""
 
@@ -1151,27 +1156,31 @@ msgstr ""
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr "đang tạo ra các bộ bao bọc.."
+
+#: ../IkiWiki/Wrapper.pm:36
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "có vẻ là %s không phải có khả năng thực hiện"
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:40
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "không thể tạo bộ bao bọc sử dụng tập tin thiết lập"
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:44
 msgid "wrapper filename not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:198
+#: ../IkiWiki/Wrapper.pm:218
 #, perl-format
 msgid "failed to compile %s"
 msgstr "lỗi biên dịch %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:238
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s đã được tạo ra"
@@ -1192,15 +1201,11 @@ msgstr ""
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:166
-msgid "generating wrappers.."
-msgstr "đang tạo ra các bộ bao bọc.."
-
-#: ../ikiwiki.in:234
+#: ../ikiwiki.in:218
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
-#: ../ikiwiki.in:237
+#: ../ikiwiki.in:221
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
@@ -1227,21 +1232,21 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:2047
+#: ../IkiWiki.pm:2053
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2124
+#: ../IkiWiki.pm:2130
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2145
+#: ../IkiWiki.pm:2151
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
-#: ../IkiWiki.pm:2281
+#: ../IkiWiki.pm:2287
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From c8d2ea67da5d27382ff49d5c3761a256de77047c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 4 Aug 2010 09:27:01 -0400
Subject: add news item for ikiwiki 3.20100804

---
 doc/news/version_3.20100518.2.mdwn |  3 ---
 doc/news/version_3.20100804.mdwn   | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 delete mode 100644 doc/news/version_3.20100518.2.mdwn
 create mode 100644 doc/news/version_3.20100804.mdwn

diff --git a/doc/news/version_3.20100518.2.mdwn b/doc/news/version_3.20100518.2.mdwn
deleted file mode 100644
index 64ce3f863..000000000
--- a/doc/news/version_3.20100518.2.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-ikiwiki 3.20100518.2 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Fix a typo in the last release."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100804.mdwn b/doc/news/version_3.20100804.mdwn
new file mode 100644
index 000000000..be85cb949
--- /dev/null
+++ b/doc/news/version_3.20100804.mdwn
@@ -0,0 +1,14 @@
+ikiwiki 3.20100804 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * template: Fix dependency tracking. Broken in version 3.20100427.
+   * po: The po\_slave\_languages setting is now a list, so the order of
+     translated languages can be controlled. (intrigeri)
+   * git: Fix gitweb historyurl examples so "diff to current" links work.
+     (Thanks jrayhawk)
+   * meta: Allow syntax closer to html meta to be used.
+   * Add new disable hook, allowing plugins to perform cleanup after they
+     have been disabled.
+   * Use Digest::SHA built into perl rather than external Digest::SHA1
+     to simplify dependencies. Closes: #[591040](http://bugs.debian.org/591040)
+   * Fixes a bug that prevented matching deleted pages when using the page()
+     PageSpec."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 6021b7a79202195fffd2a8f92ddd6e6c605f8d33 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawkuR0eo_HO1s1hs49h0Y_4Bzm08l9evMEc"
 <skye@web>
Date: Wed, 4 Aug 2010 14:39:25 +0000
Subject:

---
 doc/index.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 06acc9cec..d227df1c3 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -26,3 +26,5 @@ can be submitted and tracked using this wiki.
 
 Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
+
+[[payday loans|http://www.todayloan.co.uk]]
-- 
cgit v1.2.3


From 7bc5bf54f5b55144443d537ccc7f1124995ca061 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawkuR0eo_HO1s1hs49h0Y_4Bzm08l9evMEc"
 <skye@web>
Date: Wed, 4 Aug 2010 14:40:27 +0000
Subject:

---
 doc/index.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index d227df1c3..9563047db 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -18,6 +18,7 @@ This site generally runs the latest release of ikiwiki; currently, it runs
 ikiwiki [[!version ]].
 
 ## developer resources
+[[payday loans|http://www.hourpaydayloans.co.uk]]
 
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
-- 
cgit v1.2.3


From 9fd43faa13c9b87b5056b7cb2b6585b23050a010 Mon Sep 17 00:00:00 2001
From: Perry <Perry@web>
Date: Wed, 4 Aug 2010 14:54:28 +0000
Subject: Remove vandalism.

---
 doc/index.mdwn | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 9563047db..06acc9cec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -18,7 +18,6 @@ This site generally runs the latest release of ikiwiki; currently, it runs
 ikiwiki [[!version ]].
 
 ## developer resources
-[[payday loans|http://www.hourpaydayloans.co.uk]]
 
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
@@ -27,5 +26,3 @@ can be submitted and tracked using this wiki.
 
 Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
-
-[[payday loans|http://www.todayloan.co.uk]]
-- 
cgit v1.2.3


From 9943e270f8646fe01fa3d9feb49620f65467879c Mon Sep 17 00:00:00 2001
From: Perry <Perry@web>
Date: Thu, 5 Aug 2010 00:38:44 +0000
Subject: Note that the problem is not only for Brian May....

---
 ...avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 65b7cd96a..5f17e3ae0 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -26,4 +26,6 @@ which seems to do the right thing in page.tmpl, but not for change.tmpl. Where i
 
 > The use of an absolute baseurl in change.tmpl is a special case. --[[Joey]]
 
+So I'm facing this same issue. I have a wiki which needs to be accessed on three different URLs(!) and the hard coding of the URL from the setup file is becoming a problem for me. Is there anything I can do here? --[[Perry]]
+
 [[wishlist]]
-- 
cgit v1.2.3


From 69297da448452050823dd27ccb9c1a7d4b2dfe27 Mon Sep 17 00:00:00 2001
From: Perry <Perry@web>
Date: Thu, 5 Aug 2010 00:40:11 +0000
Subject:

---
 doc/users/Perry.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/Perry.mdwn

diff --git a/doc/users/Perry.mdwn b/doc/users/Perry.mdwn
new file mode 100644
index 000000000..d10b8621f
--- /dev/null
+++ b/doc/users/Perry.mdwn
@@ -0,0 +1 @@
+Just another IkiWiki user.
-- 
cgit v1.2.3


From 86dc710d9047faa87cc38b2f8e44f6ff9cc457a6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 5 Aug 2010 17:38:20 -0400
Subject: add Branchable, new ikiwiki hosting service run by me and liw

---
 doc/ikiwikiusers.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index efa111bae..e76d547cc 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -1,3 +1,8 @@
+Ikiwiki Hosting
+===============
+
+* [Branchable](http://branchable.com/)
+
 Projects & Organizations
 ========================
 
-- 
cgit v1.2.3


From 22ae98b2fa7d40adc2c883e81609e1dd5a68b78f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 5 Aug 2010 17:44:47 -0400
Subject: add new item for ikiwiki-hosting, the free ikiwiki management
 interface I developed for Branchable

---
 doc/news/ikiwiki-hosting.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 doc/news/ikiwiki-hosting.mdwn

diff --git a/doc/news/ikiwiki-hosting.mdwn b/doc/news/ikiwiki-hosting.mdwn
new file mode 100644
index 000000000..3496d3f72
--- /dev/null
+++ b/doc/news/ikiwiki-hosting.mdwn
@@ -0,0 +1,16 @@
+ikiwiki-hosting is an interface on top of Ikiwiki to allow easy management
+of lots of ikiwiki sites. I developed it for
+[Branchable](http://www.branchable.com/), an Ikiwiki hosting provider.
+It has a powerful, scriptable command-line interface, and also
+includes special-purpose ikiwiki plugins for things like a user control
+panel.
+
+To get a feel for it, here are some examples:
+
+	ikisite create foo.ikiwiki.net --admin http://joey.kitenet.net/
+	ikisite branch foo.ikiwiki.net bar.ikiwiki.net
+	ikisite backup bar.ikiwiki.net --stdout | ssh otherhost 'ikisite restore bar.ikiwiki.net' --stdin
+
+ikiwiki-hosting is free software, released under the AGPL. Its website:
+<http://ikiwiki-hosting.branchable.com/>
+--[[Joey]]
-- 
cgit v1.2.3


From 74d975ff4d883b7c2ed4e0517b6665abd2cfe6cc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 5 Aug 2010 17:46:14 -0400
Subject: typo

---
 doc/news/ikiwiki-hosting.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/news/ikiwiki-hosting.mdwn b/doc/news/ikiwiki-hosting.mdwn
index 3496d3f72..092530a14 100644
--- a/doc/news/ikiwiki-hosting.mdwn
+++ b/doc/news/ikiwiki-hosting.mdwn
@@ -9,7 +9,7 @@ To get a feel for it, here are some examples:
 
 	ikisite create foo.ikiwiki.net --admin http://joey.kitenet.net/
 	ikisite branch foo.ikiwiki.net bar.ikiwiki.net
-	ikisite backup bar.ikiwiki.net --stdout | ssh otherhost 'ikisite restore bar.ikiwiki.net' --stdin
+	ikisite backup bar.ikiwiki.net --stdout | ssh otherhost 'ikisite restore bar.ikiwiki.net --stdin'
 
 ikiwiki-hosting is free software, released under the AGPL. Its website:
 <http://ikiwiki-hosting.branchable.com/>
-- 
cgit v1.2.3


From 5bbbdbecbbe1e68b65baf35c3d8b8a371c9341b2 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 6 Aug 2010 08:12:11 +0000
Subject: update docs for new version

---
 doc/plugins/contrib/ymlfront.mdwn | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/doc/plugins/contrib/ymlfront.mdwn b/doc/plugins/contrib/ymlfront.mdwn
index 6dd8ed532..a2c649044 100644
--- a/doc/plugins/contrib/ymlfront.mdwn
+++ b/doc/plugins/contrib/ymlfront.mdwn
@@ -13,18 +13,21 @@ IkiWiki::Plugin::ymlfront - add YAML-format data to a page
 ## DESCRIPTION
 
 This plugin provides a way of adding arbitrary meta-data (data fields) to any
-page by prefixing the page with a YAML-format document.  This provides a way to
-create per-page structured data, where each page is treated like a record, and
-the structured data are fields in that record.  This can include the meta-data
-for that page, such as the page title.
+page by prefixing the page with a YAML-format document.  This also provides
+the [[ikiwiki/directive/ymlfront]] directive, which enables one to put
+YAML-formatted data inside a standard IkiWiki [[ikiwiki/directive]].
+
+This is a way to create per-page structured data, where each page is
+treated like a record, and the structured data are fields in that record.  This
+can include the meta-data for that page, such as the page title.
 
 This plugin is meant to be used in conjunction with the [[field]] plugin.
 
 ## DETAILS
 
-The YAML-format data in a page must be placed at the start of the page
-and delimited by lines containing precisely three dashes.  The "normal"
-content of the page then follows.
+If one is not using the ymlfront directive, the YAML-format data in a page
+must be placed at the start of the page and delimited by lines containing
+precisely three dashes.  The "normal" content of the page then follows.
 
 For example:
 
@@ -42,7 +45,7 @@ That will be htmlized using the page-type of the page-file.
 
 ### Accessing the Data
 
-There are a few ways to access the data given in the YAML section.
+There are a few ways to access the given YAML data.
 
 * [[getfield]] plugin
 
-- 
cgit v1.2.3


From f78357348a028fe97037429f4712d511d2921b14 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 6 Aug 2010 08:13:48 +0000
Subject: ymlfront now provides a ymlfront directive

---
 doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn

diff --git a/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn
new file mode 100644
index 000000000..bb4a58fc6
--- /dev/null
+++ b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn
@@ -0,0 +1,17 @@
+The `ymlfront` directive is supplied by the [[!iki plugins/contrib/ymlfront desc=ymlfront]] plugin.
+
+This directive allows the user to define arbitrary meta-data in YAML format.
+
+    \[[!ymlfront data="""
+     foo: fooness
+     bar: The Royal Pigeon
+     baz: 2
+     """]]
+
+There is one argument to this directive.
+
+* **data:**
+  The YAML-format data.  This should be enclosed inside triple-quotes to preserve the data correctly.
+
+If more than one ymlfront directive is given per page, the result is undefined.
+Likewise, it is inadvisable to try to mix the "---" ymlfront format with the directive form of the data.
-- 
cgit v1.2.3


From 0497b6379285df3c505c701ddfc9886922e85054 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 6 Aug 2010 08:19:06 +0000
Subject: Should I remove the old ymlfront format now that it recognises
 directives?

---
 doc/plugins/contrib/ymlfront/discussion.mdwn | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index b5c08fedd..3f7f0a337 100644
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -1,13 +1,5 @@
-My field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
-<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
-has some fixes for compatibility with old YAML modules, mostly done by imitating
-Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
+Now that I have implemented a \[[!ymlfront ...]] directive, I would like to remove support for the old "---" delimited format, because
+* it is fragile (easily breakable)
+* it is non-standard
 
-> I would if I could *find* it.  I checked out the "field-etc" branch, but I can't find the plugins in question under IkiWiki/Plugin; am I looking in the wrong place, or what?
-> --[[KathrynAndersen]]
-
->> Sorry, I accidentally removed `field-etc` by pushing with `--mirror` from a
->> different checkout. I've put it back; it's a branch from your `ikiplugins.git`,
->> so yes, the code should be in `IkiWiki/Plugin`. --[[smcv]]
-
->>> Done a while back, but now I've actually pushed to my repo. --[[KathrynAndersen]]
+Any objections?
-- 
cgit v1.2.3


From d2b50c37b44972e60d08854e9e780a09481872d5 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 6 Aug 2010 08:19:39 +0000
Subject: formatting

---
 doc/plugins/contrib/ymlfront/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index 3f7f0a337..b1fd65fff 100644
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -1,4 +1,5 @@
 Now that I have implemented a \[[!ymlfront ...]] directive, I would like to remove support for the old "---" delimited format, because
+
 * it is fragile (easily breakable)
 * it is non-standard
 
-- 
cgit v1.2.3


From 51d5e546974405741e08ed27d0bf89958fa7366b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 9 Aug 2010 13:18:59 -0400
Subject: filecheck: Fall back to using the file command if the freedesktop
 magic file cannot identify a file.

---
 IkiWiki/Plugin/filecheck.pm | 25 +++++++++++++++++++------
 debian/changelog            |  7 +++++++
 doc/plugins/filecheck.mdwn  |  3 ++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index d00b6dfd3..a78058ffe 100644
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -132,15 +132,28 @@ sub match_mimetype ($$;@) {
 		return IkiWiki::ErrorReason->new("file does not exist");
 	}
 
-	# Use ::magic to get the mime type, the idea is to only trust
-	# data obtained by examining the actual file contents.
+	# Get the mime type.
+	#
+	# First, try File::Mimeinfo. This is fast, but doesn't recognise
+	# all files.
 	eval q{use File::MimeInfo::Magic};
-	if ($@) {
-		return IkiWiki::ErrorReason->new("failed to load File::MimeInfo::Magic ($@); cannot check MIME type");
+	my $mimeinfo_ok=! $@;
+	my $mimetype;
+	if ($mimeinfo_ok) {
+		my $mimetype=File::MimeInfo::Magic::magic($file);
 	}
-	my $mimetype=File::MimeInfo::Magic::magic($file);
+
+	# Fall back to using file, which has a more complete
+	# magic database.
 	if (! defined $mimetype) {
-		$mimetype=File::MimeInfo::Magic::default($file);
+		open(my $file_h, "-|", "file", "-bi", $file);
+		$mimetype=<$file_h>;
+		close $file_h;
+	}
+	if (! defined $mimetype || $mimetype !~s /;.*//) {
+		# Fall back to default value.
+		$mimetype=File::MimeInfo::Magic::default($file)
+			if $mimeinfo_ok;
 		if (! defined $mimetype) {
 			$mimetype="unknown";
 		}
diff --git a/debian/changelog b/debian/changelog
index 8223074f3..440bee34f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100805) UNRELEASED; urgency=low
+
+  * filecheck: Fall back to using the file command if the freedesktop
+    magic file cannot identify a file.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Aug 2010 13:18:28 -0400
+
 ikiwiki (3.20100804) unstable; urgency=low
 
   * template: Fix dependency tracking. Broken in version 3.20100427.
diff --git a/doc/plugins/filecheck.mdwn b/doc/plugins/filecheck.mdwn
index e5f68b29c..b038bc433 100644
--- a/doc/plugins/filecheck.mdwn
+++ b/doc/plugins/filecheck.mdwn
@@ -7,7 +7,8 @@ status. These tests are mostly useful for the [[attachment]] plugin, and
 are documented [[here|ikiwiki/pagespec/attachment]].
 
 This plugin will use the [[!cpan File::MimeInfo::Magic]] perl module, if
-available, for mimetype checking.
+available, for mimetype checking. It falls back to using the `file` command
+if necessary for hard to detect files.
 
 The `virusfree` [[PageSpec|ikiwiki/pagespec/attachment]] requires that
 ikiwiki be configured with a virus scanner program via the `virus_checker`
-- 
cgit v1.2.3


From 801ed5c0c2b196a0b8bd21034074f7c8061fd3c1 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Wed, 11 Aug 2010 08:23:04 +0000
Subject: Question.

---
 doc/forum/cutpaste.pm_not_only_file-local.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/forum/cutpaste.pm_not_only_file-local.mdwn

diff --git a/doc/forum/cutpaste.pm_not_only_file-local.mdwn b/doc/forum/cutpaste.pm_not_only_file-local.mdwn
new file mode 100644
index 000000000..df7b502af
--- /dev/null
+++ b/doc/forum/cutpaste.pm_not_only_file-local.mdwn
@@ -0,0 +1,9 @@
+I'd like to use the cutpaste plugin, but not only on a file-local basis: fileA
+has \[[!cut id=foo text="foo"]], and fileB does \[[!absorb pagenames=fileA]],
+and can then use \[[!paste id=foo]].
+
+Therefore, I've written an [*absorb* directive /
+plugin](http://www.thomas.schwinge.homeip.net/tmp/absorb.pm), which is meant to
+absorb pages in order to get hold of their *cut* and *copy* directives'
+contents.  This does work as expected.  But it also absorbs page fileA's *meta*
+values, like a *meta title*, etc.  How to avoid / solve this?
-- 
cgit v1.2.3


From 95393e2fa0b779e27558c0c80814c1f0b0b651a9 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Wed, 11 Aug 2010 08:25:17 +0000
Subject: Alternative way?

---
 doc/forum/cutpaste.pm_not_only_file-local.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/forum/cutpaste.pm_not_only_file-local.mdwn b/doc/forum/cutpaste.pm_not_only_file-local.mdwn
index df7b502af..3563e3e01 100644
--- a/doc/forum/cutpaste.pm_not_only_file-local.mdwn
+++ b/doc/forum/cutpaste.pm_not_only_file-local.mdwn
@@ -7,3 +7,8 @@ plugin](http://www.thomas.schwinge.homeip.net/tmp/absorb.pm), which is meant to
 absorb pages in order to get hold of their *cut* and *copy* directives'
 contents.  This does work as expected.  But it also absorbs page fileA's *meta*
 values, like a *meta title*, etc.  How to avoid / solve this?
+
+Alternatively, do you have a better suggestion about how to achieve what I
+described in the first paragraph?
+
+--[[tschwinge]]
-- 
cgit v1.2.3


From 39ff7cf4fc02eb1929351a73e326711f3fb09d9a Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 12 Aug 2010 02:33:54 +0000
Subject: Added a comment: field and getfield and ymlfront

---
 .../comment_1_497c62f21fd1b87625b806407c72dbad._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/cutpaste.pm_not_only_file-local/comment_1_497c62f21fd1b87625b806407c72dbad._comment

diff --git a/doc/forum/cutpaste.pm_not_only_file-local/comment_1_497c62f21fd1b87625b806407c72dbad._comment b/doc/forum/cutpaste.pm_not_only_file-local/comment_1_497c62f21fd1b87625b806407c72dbad._comment
new file mode 100644
index 000000000..8cc724a72
--- /dev/null
+++ b/doc/forum/cutpaste.pm_not_only_file-local/comment_1_497c62f21fd1b87625b806407c72dbad._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="60.241.8.244"
+ subject="field and getfield and ymlfront"
+ date="2010-08-12T02:33:54Z"
+ content="""
+Have you considered trying the [[plugins/contrib/field]] plugin, and its associated plugins?  [[plugins/contrib/ymlfront]] can give you the source (\"cut\") and [[plugins/contrib/getfield]] and/or [[plugins/contrib/report]] can get you the value (\"paste\") including the values from other pages.
+"""]]
-- 
cgit v1.2.3


From 8853e4e79c725cc5a58bfc96c75785ae2f16b068 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawnbe6oB_ecFtNYII1JN3zSggwUPUdOb8jI"
 <William@web>
Date: Thu, 12 Aug 2010 14:13:05 +0000
Subject: Note about jsMath

---
 doc/todo/Add_nicer_math_formatting.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/todo/Add_nicer_math_formatting.mdwn

diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn
new file mode 100644
index 000000000..041eaee11
--- /dev/null
+++ b/doc/todo/Add_nicer_math_formatting.mdwn
@@ -0,0 +1,5 @@
+It would be nice to add nicer math formatting.  I currently use the [[plugins/teximg]] plugin, but I wonder if [jsMath](http://www.math.union.edu/~dpvc/jsMath/) wouldn't be a better option.
+
+[[Will]]
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From a68241838b37cd40eaedb917330412c19491ca70 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 12 Aug 2010 14:29:22 -0400
Subject: correct comment; javascript is put after <body>

---
 IkiWiki/Plugin/relativedate.pm | 2 +-
 IkiWiki/Plugin/toggle.pm       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index c9280ef14..7296889ab 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -27,7 +27,7 @@ sub format (@) {
         my %params=@_;
 
 	if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
-		# no </body> tag, probably in preview mode
+		# no <body> tag, probably in preview mode
 		$params{content}=include_javascript($params{page}, 1).$params{content};
 	}
 	return $params{content};
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 20967d3fd..1f93f87fe 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -69,7 +69,7 @@ sub format (@) {
 	if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
 		$params{content}=~s/<div class="toggleableend">//g;
 		if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
-			# no </body> tag, probably in preview mode
+			# no <body> tag, probably in preview mode
 			$params{content}=include_javascript($params{page}, 1).$params{content};
 		}
 	}
-- 
cgit v1.2.3


From 80102c042d0f2fd194222cd233a7bfd0e8bd467f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 12 Aug 2010 16:53:52 -0400
Subject: flattr: New plugin.

Thanks to jaywalk for the initial implementation at a flattr plugin!

This one is less configurable, but simpler.
---
 IkiWiki/Plugin/flattr.pm          | 97 +++++++++++++++++++++++++++++++++++++++
 debian/changelog                  |  2 +
 doc/ikiwiki/directive/flattr.mdwn | 45 ++++++++++++++++++
 doc/plugins/contrib/flattr.mdwn   |  3 ++
 doc/plugins/flattr.mdwn           |  9 ++++
 doc/style.css                     |  4 ++
 6 files changed, 160 insertions(+)
 create mode 100644 IkiWiki/Plugin/flattr.pm
 create mode 100644 doc/ikiwiki/directive/flattr.mdwn
 create mode 100644 doc/plugins/flattr.mdwn

diff --git a/IkiWiki/Plugin/flattr.pm b/IkiWiki/Plugin/flattr.pm
new file mode 100644
index 000000000..3aee1eb93
--- /dev/null
+++ b/IkiWiki/Plugin/flattr.pm
@@ -0,0 +1,97 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::flattr;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "flattr", call => \&getsetup);
+	hook(type => "preprocess", id => "flattr", call => \&preprocess);
+	hook(type => "format", id => "flattr", call => \&format);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+		flattr_userid => {
+			type => "string",
+			example => 'joeyh',
+			description => "userid or user name to use by default for Flattr buttons",
+			advanced => 0,
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+my %flattr_pages;
+
+sub preprocess (@) {
+	my %params=@_;
+
+	$flattr_pages{$params{destpage}}=1;
+
+	my $url=$params{url};
+	if (! defined $url) {
+		$url=urlto($params{page}, "", 1);
+	}
+
+	my @fields;
+	foreach my $field (qw{language uid button hidden category tags}) {
+		if (exists $params{$field}) {
+			push @fields, "$field:$params{$field}";
+		}
+	}
+	
+	return '<a class="FlattrButton" href="'.$url.'"'.
+       		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
+		' rev="flattr;'.join(';', @fields).';"'.
+		'>'.
+		(exists $params{description} ? $params{description} : '').
+		'</a>';
+}
+
+sub format (@) {
+	my %params=@_;
+
+	# Add flattr's javascript to pages with flattr buttons.
+	if ($flattr_pages{$params{page}}) {
+		if (! ($params{content}=~s!^(<body[^>]*>)!$1.flattrjs()!em)) {
+			# no <body> tag, probably in preview mode
+			$params{content}=flattrjs().$params{content};
+		}
+	}
+	return $params{content};
+}
+
+my $js_cached;
+sub flattrjs {
+	return $js_cached if defined $js_cached;
+
+	my $js_url='https://api.flattr.com/js/0.5.0/load.js?mode=auto';
+	if (defined $config{flattr_userid}) {
+		my $userid=$config{flattr_userid};
+		$userid=~s/[^-A-Za-z0-9_]//g; # sanitize for inclusion in javascript
+		$js_url.="&uid=$userid";
+	}
+
+	# This is Flattr's standard javascript snippet to include their
+	# external javascript file, asynchronously.
+	return $js_cached=<<"EOF";
+<script type="text/javascript">
+<!--//--><![CDATA[//><!--
+(function() {
+	var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+	s.type = 'text/javascript';
+	s.async = true;
+	s.src = '$js_url';
+	t.parentNode.insertBefore(s, t);
+})();//--><!]]>
+</script>
+EOF
+}
+
+1
diff --git a/debian/changelog b/debian/changelog
index 440bee34f..f90fd8855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20100805) UNRELEASED; urgency=low
 
   * filecheck: Fall back to using the file command if the freedesktop
     magic file cannot identify a file.
+  * flattr: New plugin. (Thanks to jaywalk for the initial implementation
+    at a flattr plugin! This one is less configurable, but simpler.)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 09 Aug 2010 13:18:28 -0400
 
diff --git a/doc/ikiwiki/directive/flattr.mdwn b/doc/ikiwiki/directive/flattr.mdwn
new file mode 100644
index 000000000..5083005ce
--- /dev/null
+++ b/doc/ikiwiki/directive/flattr.mdwn
@@ -0,0 +1,45 @@
+The `flattr` directive is supplied by the [[!iki plugins/flattr desc=flattr]] plugin.
+
+This directive allows easily inserting Flattr buttons onto wiki pages.
+
+Flattr supports both static buttons and javascript buttons. This directive
+only creates dynamic javascript buttons. If you want to insert a static
+Flattr button, you can simply copy the html code for it from Flattr, instead.
+Note that this directive inserts javascript code into the page, that
+loads more javascript code from Flattr.com. So only use it if you feel
+comfortable with that.
+
+The directive can be used to display a button for a thing you have already
+manually submitted to Flattr. In this mode, the only parameter you need to
+include is the exact url to the thing that was submitted to Flattr.
+(If the button is for the current page, you can leave that out.) For
+example, this is the Flattr button for ikiwiki. Feel free to add it to all
+your pages. ;)
+
+	\[[!flattr url="http://ikiwiki.info/" button=compact]]
+
+The directive can also be used to create a button that automatically
+submits a page to Flattr when a user clicks on it. In this mode you
+need to include parameters to specify your uid, and a title, category, tags,
+and description for the page. For example, this is a Flattr button for
+a blog post:
+	
+	\[[!flattr uid=25634 title="my new blog post" category=text
+	tags="blog,example" description="This is a post on my blog."]]
+
+Here are all possible parameters you can pass to the Flattr directive.
+
+* `button` - Set to "compact" for a small button.
+* `url` - The url to the thing to be Flattr'd. If omitted, defaults
+  to the url of the current page.
+* `uid` - Your numeric Flattr userid. Not needed if the flattr plugin
+  has been configured with a global `flattr_userid`.
+* `title` - A short title for the thing, to show on its Flattr page.
+* `description` - A description of the thing, to show on its Flattr
+  page.
+* `category` - One of: text, images, video, audio, software, rest.
+* `tags` - A list of tags separated by a comma.
+* `language` - A language code.
+* `hidden` - Set to 1 to hide the button from listings on Flattr.com.
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
index f8f005c31..e9b4bf857 100644
--- a/doc/plugins/contrib/flattr.mdwn
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -10,6 +10,9 @@ I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwik
 
 This plugin is licensed under [CC0](http://creativecommons.org/publicdomain/zero/1.0/) (public domain).
 
+Note that there is now a [[plugins/flattr]] plugin bundled with ikiwiki. It
+is less configurable, not supporting static buttons, but simpler to use.
+
 # Usage #
 
     # [[!flattr args]] where args are in the form of arg=value.
diff --git a/doc/plugins/flattr.mdwn b/doc/plugins/flattr.mdwn
new file mode 100644
index 000000000..5da279518
--- /dev/null
+++ b/doc/plugins/flattr.mdwn
@@ -0,0 +1,9 @@
+[[!template id=plugin name=flattr author="[[Joey]]"]]
+[[!tag type/web]]
+
+[Flattr](http://flattr.com/) is a social micropayment platform.
+This plugin allows easily adding Flattr buttons to pages,
+using the [[ikiwiki/directive/flattr]] directive.
+
+This plugin has a configuration setting. `flattr_userid` can be set
+to either your numeric flatter userid, or your flattr username.
diff --git a/doc/style.css b/doc/style.css
index 8dd3b1c15..66d962bd6 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -449,6 +449,10 @@ li.L8 { list-style: upper-alpha; }
 	background: #ff9900;
 }
 
+.FlattrButton {
+	display: none;
+}
+
 /* openid selector */
 #openid_choice {
 	display: none;
-- 
cgit v1.2.3


From 3ef8864122c2e665d41ed4d45baa50d4a5d21873 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 12 Aug 2010 17:19:20 -0400
Subject: insert flattr javascript via sanitize, not format hook

This makes the javascript be added to rss feeds, which allows the buttons
to be displayed by aggregators. At least, if the aggregator does not
sanitize javascript.
---
 IkiWiki/Plugin/flattr.pm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/flattr.pm b/IkiWiki/Plugin/flattr.pm
index 3aee1eb93..9cf9dfb13 100644
--- a/IkiWiki/Plugin/flattr.pm
+++ b/IkiWiki/Plugin/flattr.pm
@@ -8,7 +8,7 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "flattr", call => \&getsetup);
 	hook(type => "preprocess", id => "flattr", call => \&preprocess);
-	hook(type => "format", id => "flattr", call => \&format);
+	hook(type => "sanitize", id => "flattr", call => \&sanitize, last => 1);
 }
 
 sub getsetup () {
@@ -54,17 +54,16 @@ sub preprocess (@) {
 		'</a>';
 }
 
-sub format (@) {
+sub sanitize (@) {
 	my %params=@_;
 
 	# Add flattr's javascript to pages with flattr buttons.
 	if ($flattr_pages{$params{page}}) {
-		if (! ($params{content}=~s!^(<body[^>]*>)!$1.flattrjs()!em)) {
-			# no <body> tag, probably in preview mode
-			$params{content}=flattrjs().$params{content};
-		}
+		return flattrjs().$params{content};
+	}
+	else {
+		return $params{content};
 	}
-	return $params{content};
 }
 
 my $js_cached;
-- 
cgit v1.2.3


From efd8e93c5be79b1df0b92b2b5aee91308e4343dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 12 Aug 2010 18:18:35 -0400
Subject: Revert "insert flattr javascript via sanitize, not format hook"

This reverts commit 3ef8864122c2e665d41ed4d45baa50d4a5d21873.

Most aggregators block javascript and so it would display uglily.
Need to find a way to fallback to static buttons instead.
---
 IkiWiki/Plugin/flattr.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/flattr.pm b/IkiWiki/Plugin/flattr.pm
index 9cf9dfb13..3aee1eb93 100644
--- a/IkiWiki/Plugin/flattr.pm
+++ b/IkiWiki/Plugin/flattr.pm
@@ -8,7 +8,7 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "flattr", call => \&getsetup);
 	hook(type => "preprocess", id => "flattr", call => \&preprocess);
-	hook(type => "sanitize", id => "flattr", call => \&sanitize, last => 1);
+	hook(type => "format", id => "flattr", call => \&format);
 }
 
 sub getsetup () {
@@ -54,16 +54,17 @@ sub preprocess (@) {
 		'</a>';
 }
 
-sub sanitize (@) {
+sub format (@) {
 	my %params=@_;
 
 	# Add flattr's javascript to pages with flattr buttons.
 	if ($flattr_pages{$params{page}}) {
-		return flattrjs().$params{content};
-	}
-	else {
-		return $params{content};
+		if (! ($params{content}=~s!^(<body[^>]*>)!$1.flattrjs()!em)) {
+			# no <body> tag, probably in preview mode
+			$params{content}=flattrjs().$params{content};
+		}
 	}
+	return $params{content};
 }
 
 my $js_cached;
-- 
cgit v1.2.3


From 07e27bd082cf8ecd55908f6486a344bb74503de6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 12 Aug 2010 20:55:59 -0400
Subject: add a link to libravatar

---
 doc/todo/avatar.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn
index f0599e4ed..91f924fa1 100644
--- a/doc/todo/avatar.mdwn
+++ b/doc/todo/avatar.mdwn
@@ -58,3 +58,8 @@ The hash is calculated from the user's email address. If the user's email
 is not known, skip it. 
 
 End. :P
+
+---
+
+[libravatar](https://launchpad.net/libravatar) is a federated avatar
+system. Young but might be the right way to get avatars eventually.
-- 
cgit v1.2.3


From 8a0b2d07d3aa1a833e9b83ce9e2a9b2a6f76fb9b Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Fri, 13 Aug 2010 16:13:06 +0000
Subject: possible to use place holders?

---
 doc/plugins/rst/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn
index 3c3b03275..c84a6218e 100644
--- a/doc/plugins/rst/discussion.mdwn
+++ b/doc/plugins/rst/discussion.mdwn
@@ -71,3 +71,11 @@ I need help on a couple of points
 * Can we include this in ikiwiki's rst if it is not too hairy?
 
 --ulrik
+
+
+----
+
+> The main problem with more sophisticated RST support is that ikiwiki turns 
+preprocessor directives into raw HTML and reST hates inline HTML.
+
+Is it possible for ikiwiki to store preprocessor directives in memory, and replace them with place holders, then do the rst process.  After the rst processing, process the preprocessor directives and replace place holders.  --[[weakish]]
-- 
cgit v1.2.3


From 6e905e21a81223d64f759c9753f936e4b2a46064 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlAlJrRGUG_SY5lCIkWeO8muJTqRpRYz1E"
 <Stefan@web>
Date: Fri, 13 Aug 2010 20:05:38 +0000
Subject:

---
 doc/sandbox.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 691f20ffe..cbef5394e 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,10 +1,10 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-> This is a blockerquote.
+> This is a blockquote.
 >
 > This is the first level of quoting.
 >
-> > This is nested blockquote.
+> > This is a nested blockquote.
 >
 >> Without a space works too.
 >>> to three levels
-- 
cgit v1.2.3


From df5de5b967a1e6e14161fd1269efe5b17d33eec1 Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Fri, 13 Aug 2010 11:21:11 +0200
Subject: smiley: warn instead of error for missing smileys

A missing smileys.mdwn caused the plugin to error out interrupting the
building process. Instead, we check for the file presence and warn without
erroring out in case it's missing, in a similar fashion as it's
currently done for the shortcut plugin.
---
 IkiWiki/Plugin/smiley.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 0d77916d0..6f4f49d18 100644
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -25,7 +25,14 @@ sub getsetup () {
 }
 
 sub build_regexp () {
-	my $list=readfile(srcfile("smileys.mdwn"));
+	my $srcfile = srcfile("smileys.mdwn", 1);
+	if (! defined $srcfile) {
+		print STDERR sprintf(gettext("smiley plugin will not work without %s"),
+			"smileys.mdwn")."\n";
+		$smiley_regexp='';
+		return;
+	}
+	my $list=readfile($srcfile);
 	while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
 		my $smiley=$1;
 		my $file=$2;
-- 
cgit v1.2.3


From d03e691c506e18a2e93ca653e6821b2fa02caa9f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 13 Aug 2010 17:59:36 -0400
Subject: changelog

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index f90fd8855..834dbd265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (3.20100805) UNRELEASED; urgency=low
     magic file cannot identify a file.
   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
     at a flattr plugin! This one is less configurable, but simpler.)
+  * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 09 Aug 2010 13:18:28 -0400
 
-- 
cgit v1.2.3


From 8591fa48633375aab0e2ff4dbef940984dc7c381 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawndltpDNFSfEZBR_TIcjeDQRkuuyT1e_3o"
 <Boris@web>
Date: Sat, 14 Aug 2010 22:41:57 +0000
Subject:

---
 doc/plugins/filecheck/discussion.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/plugins/filecheck/discussion.mdwn b/doc/plugins/filecheck/discussion.mdwn
index f91950b7d..9a3bcddfc 100644
--- a/doc/plugins/filecheck/discussion.mdwn
+++ b/doc/plugins/filecheck/discussion.mdwn
@@ -15,3 +15,20 @@ if ::magic() returns undef?  --[[DavidBremner]]
 >> for ::default
 
 >>> Applied
+
+---
+
+At first I need to thank you for ikiwiki - it is what I was always looking for - coming from a whole bunch of wiki engines, this is the most intelligent and least bloated one.
+
+My question is about the [[plugins/attachment]] plugin in conjunction with [[plugins/filecheck]]: I am using soundmanger2 js-library for having attached media files of all sorts played inline a page. 
+
+To achieve this soundmanager2 asks for an id inside a ul-tag surrounding the a-tag. I was wondering if the Insert Link button could be provided with a more elegant solution than to have this code snippet to be filled in by hand every time you use it to insert links for attached media files. And in fact there apparently is a way in attachment.pm. 
+
+While I can see that it is not needed for everyone inserting links to attached media files to have ul- and li-tags surrounding the link itself as well as being supplied with an id fill in, for me it would be the most straight forward solution. Pitty is I don't have the time to wrap my head around perl to write a patch myself.  Is there any way to have this made an option which can be called via templates?
+
+For sure I would like to donate for such a patch as well as I will do it for ikiwiki anyway, because it is such a fine application.
+
+If you are not familiar with soundmanager2: It is a very straight forward solution to inline mediafiles, using the usual flash as well as html5 solutions (used by soundcloud.com, freesound.org and the like). Worth a look anyway [schillmania.com](http://www.schillmania.com/)
+
+Boris
+
-- 
cgit v1.2.3


From 52e3f698bc8fafdab4d911d925d214981ebd8d25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 14 Aug 2010 20:17:12 -0400
Subject: respond, open wishlist todo item with design

---
 doc/plugins/filecheck/discussion.mdwn | 49 ++++++++++++++++++++++++++++++-----
 doc/todo/generic_insert_links         | 24 +++++++++++++++++
 2 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 doc/todo/generic_insert_links

diff --git a/doc/plugins/filecheck/discussion.mdwn b/doc/plugins/filecheck/discussion.mdwn
index 9a3bcddfc..6ef780772 100644
--- a/doc/plugins/filecheck/discussion.mdwn
+++ b/doc/plugins/filecheck/discussion.mdwn
@@ -18,17 +18,54 @@ if ::magic() returns undef?  --[[DavidBremner]]
 
 ---
 
-At first I need to thank you for ikiwiki - it is what I was always looking for - coming from a whole bunch of wiki engines, this is the most intelligent and least bloated one.
+At first I need to thank you for ikiwiki - it is what I was always looking
+for - coming from a whole bunch of wiki engines, this is the most
+intelligent and least bloated one.
 
-My question is about the [[plugins/attachment]] plugin in conjunction with [[plugins/filecheck]]: I am using soundmanger2 js-library for having attached media files of all sorts played inline a page. 
+My question is about the [[plugins/attachment]] plugin in conjunction with
+[[plugins/filecheck]]: I am using soundmanger2 js-library for having
+attached media files of all sorts played inline a page. 
 
-To achieve this soundmanager2 asks for an id inside a ul-tag surrounding the a-tag. I was wondering if the Insert Link button could be provided with a more elegant solution than to have this code snippet to be filled in by hand every time you use it to insert links for attached media files. And in fact there apparently is a way in attachment.pm. 
+To achieve this soundmanager2 asks for an id inside a ul-tag surrounding
+the a-tag. I was wondering if the Insert Link button could be provided with
+a more elegant solution than to have this code snippet to be filled in by
+hand every time you use it to insert links for attached media files. And in
+fact there apparently is a way in attachment.pm. 
 
-While I can see that it is not needed for everyone inserting links to attached media files to have ul- and li-tags surrounding the link itself as well as being supplied with an id fill in, for me it would be the most straight forward solution. Pitty is I don't have the time to wrap my head around perl to write a patch myself.  Is there any way to have this made an option which can be called via templates?
+While I can see that it is not needed for everyone inserting links to
+attached media files to have ul- and li-tags surrounding the link itself as
+well as being supplied with an id fill in, for me it would be the most
+straight forward solution. Pitty is I don't have the time to wrap my head
+around perl to write a patch myself.  Is there any way to have this made an
+option which can be called via templates?
 
-For sure I would like to donate for such a patch as well as I will do it for ikiwiki anyway, because it is such a fine application.
+For sure I would like to donate for such a patch as well as I will do it
+for ikiwiki anyway, because it is such a fine application.
 
-If you are not familiar with soundmanager2: It is a very straight forward solution to inline mediafiles, using the usual flash as well as html5 solutions (used by soundcloud.com, freesound.org and the like). Worth a look anyway [schillmania.com](http://www.schillmania.com/)
+If you are not familiar with soundmanager2: It is a very straight forward
+solution to inline mediafiles, using the usual flash as well as html5
+solutions (used by soundcloud.com, freesound.org and the like). Worth a
+look anyway [schillmania.com](http://www.schillmania.com/)
 
 Boris
 
+> The behavior of "Insert Links" is currently hardcoded to support images
+> and has a fallback for other files. What you want is a 
+> [[todo/generic_insert_links]] that can insert a template directive.
+> Then you could make a template that generates the html needed for
+> soundmanager2. I've written down a design at
+> [[todo/generic_insert_links]]; I am currently very busy and not sure
+> when I will get around to writing it, but with it on the todo list
+> I shouldn't forget. --[[Joey]] 
+> 
+> You could make a [[ikiwiki/directive/template]] for soundmanager2
+> now, and manually insert the template directive for now
+> when you want to embed a sound file. Something like this:
+
+	\[[!template id=embed_mp3 file=your.mp3]]
+
+> Then in templates/embed_mp3.mdwn, something vaguely like this:
+
+	<ul id="foo">
+	<a href="<TMPL_VAR FILE>">mp3</a>
+	</ul>
diff --git a/doc/todo/generic_insert_links b/doc/todo/generic_insert_links
new file mode 100644
index 000000000..050f32ee7
--- /dev/null
+++ b/doc/todo/generic_insert_links
@@ -0,0 +1,24 @@
+The attachment plugin's Insert Links button currently only knows
+how to insert plain wikilinks and img directives (for images).
+
+[[wishlist]]: Generalize this, so a plugin can cause arbitrary text
+to be inserted for a particular file. --[[Joey]] 
+
+Design:
+
+Add an insertlinks hook. Each plugin using the hook would be called,
+and passed the filename of the attachment. If it knows how to handle
+the file type, it returns a the text that should be inserted on the page.
+If not, it returns undef, and the next plugin is tried.
+
+This would mean writing plugins in order to handle links for 
+special kinds of attachments. To avoid that for simple stuff,
+a fallback plugin could run last and look for a template
+named like `templates/embed_$extension`, and insert a directive like:
+
+	\[[!template id=embed_vp8 file=my_movie.vp8]]
+
+Then to handle a new file type, a user could just make a template
+that expands to some relevant html. In the example above,
+`templates/embed_vp8` could make a html5 video tag, possibly with some
+flash fallback code even.
-- 
cgit v1.2.3


From 68770930a72adc39f535210bceff171efcf205ac Mon Sep 17 00:00:00 2001
From: "http://jasonriedy.wordpress.com/" <Jason_Riedy@web>
Date: Sun, 15 Aug 2010 02:18:59 +0000
Subject: Add an XSLT style sheet for WP->iki conversion

---
 doc/tips/Importing_posts_from_Wordpress.mdwn | 85 ++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn
index af8e4005d..1ea82b862 100644
--- a/doc/tips/Importing_posts_from_Wordpress.mdwn
+++ b/doc/tips/Importing_posts_from_Wordpress.mdwn
@@ -15,3 +15,88 @@ I include a modified version of this script. This version includes the ability t
 -- [[users/simonraven]]
 
 [[ikiwiki-wordpress-import]]
+
+-----
+
+Perhaps slightly insane, but here's an XSLT style sheet that handles my pages.  It's basic, but sufficient to get started.
+Note that I had to break up the ikiwiki meta strings to post this.
+
+-- JasonRiedy
+
+	<?xml version="1.0" encoding="UTF-8"?>
+	<xsl:stylesheet version="2.0"
+	  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	  xmlns:content="http://purl.org/rss/1.0/modules/content/"
+	  xmlns:wp="http://wordpress.org/export/1.0/">
+	  
+	<xsl:output method="text"/>
+	<xsl:output method="text" name="txt"/>
+	
+	<xsl:variable name='newline'><xsl:text>
+	</xsl:text></xsl:variable>
+	
+	<xsl:template match="channel">
+	  <xsl:apply-templates select="item[wp:post_type = 'post']"/>
+	</xsl:template>
+	
+	<xsl:template match="item">
+	  <xsl:variable name="idnum" select="format-number(wp:post_id,'0000')" />
+	  <xsl:variable name="basename"
+			select="concat('wp-posts/post-',$idnum)" />
+	  <xsl:variable name="filename"
+			select="concat($basename, '.html')" />
+	  <xsl:text>Creating </xsl:text>
+	  <xsl:value-of select="concat($filename, $newline)" />
+	  <xsl:result-document href="{$filename}" format="txt">
+	    <xsl:text>[[</xsl:text><xsl:text>meta title="</xsl:text>
+	    <xsl:value-of select="replace(title, '&quot;', '&amp;ldquo;')"/>
+	    <xsl:text>"]]</xsl:text><xsl:value-of select="$newline"/>
+	    <xsl:text>[[</xsl:text><xsl:text>meta date="</xsl:text>
+	    <xsl:value-of select="pubDate"/>
+	    <xsl:text>"]]</xsl:text><xsl:value-of select="$newline"/>
+	    <xsl:text>[[</xsl:text><xsl:text>meta updated="</xsl:text>
+	    <xsl:value-of select="pubDate"/>
+	    <xsl:text>"]]</xsl:text> <xsl:value-of select="$newline"/>
+	    <xsl:value-of select="$newline"/>
+	    <xsl:value-of select="content:encoded"/>
+	    <xsl:text>
+	
+	</xsl:text>
+	    <xsl:apply-templates select="category[@domain='tag' and not(@nicename)]">
+	      <xsl:sort select="name()"/>
+	    </xsl:apply-templates>
+	  </xsl:result-document>
+	  <xsl:apply-templates select="wp:comment">
+	    <xsl:sort select="date"/>
+	    <xsl:with-param name="basename">$basename</xsl:with-param>
+	  </xsl:apply-templates>
+	</xsl:template>
+	
+	<xsl:template match="wp:comment">
+	  <xsl:param name="basename"/>
+	  <xsl:variable name="cnum" select="format-number(wp:comment_id, '000')" />
+	  <xsl:variable name="filename" select="concat($basename, '/comment_', $cnum, '._comment')"/>
+	  <xsl:variable name="nickname" select="concat(' nickname=&quot;', wp:comment_author, '&quot;')" />
+	  <xsl:variable name="username" select="concat(' username=&quot;', wp:comment_author_url, '&quot;')" />
+	  <xsl:variable name="ip" select="concat(' ip=&quot;', wp:comment_author_IP, '&quot;')" />
+	  <xsl:variable name="date" select="concat(' date=&quot;', wp:comment_date_gmt, '&quot;')" />
+	  <xsl:result-document href="{$filename}" format="txt">
+	    <xsl:text>[[</xsl:text><xsl:text>comment format=html</xsl:text><xsl:value-of select="$newline"/>
+	    <xsl:value-of select="$nickname"/>
+	    <xsl:value-of select="$username"/>
+	    <xsl:value-of select="$ip"/>
+	    <xsl:value-of select="$date"/>
+	    <xsl:text>subject=""</xsl:text><xsl:value-of select="$newline"/>
+	    <xsl:text>content="""</xsl:text><xsl:value-of select="$newline"/>
+	    <xsl:value-of select="wp:comment_content"/>
+	    <xsl:value-of select="$newline"/>
+	    <xsl:text>"""]]</xsl:text><xsl:value-of select="$newline"/>
+	  </xsl:result-document>
+	</xsl:template>
+	
+	<xsl:template match="category">
+	  <xsl:text>[</xsl:text><xsl:text>[</xsl:text><xsl:text>!tag "</xsl:text><xsl:value-of select="."/><xsl:text>"]]</xsl:text>
+	  <xsl:value-of select="$newline"/>
+	</xsl:template>
+	
+	</xsl:stylesheet>
-- 
cgit v1.2.3


From 4e8a695431489d2059907122a11089c0e45a165c Mon Sep 17 00:00:00 2001
From: philippe <philippe@web>
Date: Sun, 15 Aug 2010 08:58:52 +0000
Subject:

---
 doc/bugs/po:_po_files_instead_of_html_files.mdwn | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/bugs/po:_po_files_instead_of_html_files.mdwn

diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
new file mode 100644
index 000000000..4b08c7c70
--- /dev/null
+++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
@@ -0,0 +1,4 @@
+On the home page of my wiki, when i click on the link "ikiwiki", i get the english file instead of the french file.  
+At the bottom of this page, there is the "Links" line:  
+Links: index index.fr templates templates.fr  
+When i click on "templates.fr", i get the po.file instead of html.
-- 
cgit v1.2.3


From 7998f73ded64d3101bcd9cdf9a388f23e694653a Mon Sep 17 00:00:00 2001
From: "http://claimid.com/helios" <helios@web>
Date: Sun, 15 Aug 2010 11:11:21 +0000
Subject: question "creating multi domain setup possible?"

---
 doc/forum/multi_domain_setup_possible__63__.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/forum/multi_domain_setup_possible__63__.mdwn

diff --git a/doc/forum/multi_domain_setup_possible__63__.mdwn b/doc/forum/multi_domain_setup_possible__63__.mdwn
new file mode 100644
index 000000000..01b31aafb
--- /dev/null
+++ b/doc/forum/multi_domain_setup_possible__63__.mdwn
@@ -0,0 +1,15 @@
+Hi! I am searching for a replacement of my blog and webpages made off static HTML with just some custom PHP around it for years already. ikiwiki seems to be one of the hot candidates, since it uses a RCS.
+
+I would like to have a multi domain setup like this:
+
+- myname.private.de => more of a personal page
+- professional.de => more of my professional work related page
+- and possibly others
+
+Now when I write a blog entry about some Linux, Debian or KDE stuff, I possibly would like to have it shown on my private and my professional domain.
+
+And I might like to use some kind of inter wiki links now and then.
+
+Is such a setup possible? I thought about have a big wiki with Apache serving sub directories from it under different domains, but then wiki links like would not work.
+
+Maybe having the same blog entry, same content on several domains is not such a hot idea, but as long as I do not see a problem with it, I'd like to do it.
-- 
cgit v1.2.3


From 2297935fc5bd14d80d9618e1d17b8d3de990e6e6 Mon Sep 17 00:00:00 2001
From: "http://claimid.com/helios" <helios@web>
Date: Sun, 15 Aug 2010 11:12:51 +0000
Subject:

---
 doc/forum/multi_domain_setup_possible__63__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/forum/multi_domain_setup_possible__63__.mdwn b/doc/forum/multi_domain_setup_possible__63__.mdwn
index 01b31aafb..54946e346 100644
--- a/doc/forum/multi_domain_setup_possible__63__.mdwn
+++ b/doc/forum/multi_domain_setup_possible__63__.mdwn
@@ -13,3 +13,5 @@ And I might like to use some kind of inter wiki links now and then.
 Is such a setup possible? I thought about have a big wiki with Apache serving sub directories from it under different domains, but then wiki links like would not work.
 
 Maybe having the same blog entry, same content on several domains is not such a hot idea, but as long as I do not see a problem with it, I'd like to do it.
+
+--[[helios]]
-- 
cgit v1.2.3


From e0f1d657983d5bf612cf70f231bf166c0b6d67d5 Mon Sep 17 00:00:00 2001
From: "http://claimid.com/helios" <helios@web>
Date: Sun, 15 Aug 2010 11:13:29 +0000
Subject:

---
 doc/forum/multi_domain_setup_possible__63__.mdwn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/forum/multi_domain_setup_possible__63__.mdwn b/doc/forum/multi_domain_setup_possible__63__.mdwn
index 54946e346..01b31aafb 100644
--- a/doc/forum/multi_domain_setup_possible__63__.mdwn
+++ b/doc/forum/multi_domain_setup_possible__63__.mdwn
@@ -13,5 +13,3 @@ And I might like to use some kind of inter wiki links now and then.
 Is such a setup possible? I thought about have a big wiki with Apache serving sub directories from it under different domains, but then wiki links like would not work.
 
 Maybe having the same blog entry, same content on several domains is not such a hot idea, but as long as I do not see a problem with it, I'd like to do it.
-
---[[helios]]
-- 
cgit v1.2.3


From 5664401fbcd0694539ec8274d2df11b3e5db1e48 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Aug 2010 11:38:39 -0400
Subject: Fix po test suite to not assume ikiwiki's underlay is already
 installed. Closes: #593047

---
 debian/changelog |  2 ++
 t/po.t           | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 834dbd265..7f3ea7290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.20100805) UNRELEASED; urgency=low
   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
     at a flattr plugin! This one is less configurable, but simpler.)
   * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
+  * Fix po test suite to not assume ikiwiki's underlay is already installed.
+    Closes: #593047
 
  -- Joey Hess <joeyh@debian.org>  Mon, 09 Aug 2010 13:18:28 -0400
 
diff --git a/t/po.t b/t/po.t
index 444743cac..1cd18c317 100755
--- a/t/po.t
+++ b/t/po.t
@@ -31,6 +31,9 @@ my $dir = tempdir("ikiwiki-test-po.XXXXXXXXXX",
 %config=IkiWiki::defaultconfig();
 $config{srcdir} = "$dir/src";
 $config{destdir} = "$dir/dst";
+$config{destdir} = "$dir/dst";
+$config{underlaydirbase} = "/dev/null";
+$config{underlaydir} = "/dev/null";
 $config{discussion} = 0;
 $config{po_master_language} = { code => 'en',
 				name => 'English'
@@ -118,8 +121,8 @@ $config{po_link_to}='negotiated';
 $msgprefix="links (po_link_to=negotiated)";
 refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn');
 is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index");
-is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.es");
-is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.fr");
+is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable'], "$msgprefix index.es");
+is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable'], "$msgprefix index.fr");
 is_deeply(\@{$links{'translatable'}}, ['nontranslatable'], "$msgprefix translatable");
 is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
 is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
@@ -129,8 +132,8 @@ $config{po_link_to}='current';
 $msgprefix="links (po_link_to=current)";
 refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn');
 is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index");
-is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.es");
-is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.fr");
+is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable'))], "$msgprefix index.es");
+is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable'))], "$msgprefix index.fr");
 is_deeply(\@{$links{'translatable'}}, [bestlink('translatable', 'nontranslatable')], "$msgprefix translatable");
 is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
 is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
-- 
cgit v1.2.3


From b8fd31a2a3305aed41176f84377b108f679299fd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Aug 2010 11:43:21 -0400
Subject: Fix po test suite to not assume ikiwiki's underlay is already
 installed. Closes: #593047

(cherry picked from commit 5664401fbcd0694539ec8274d2df11b3e5db1e48)
---
 debian/changelog |  7 +++++++
 t/po.t           | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8223074f3..98d13376d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100815) unstable; urgency=medium
+
+  * Fix po test suite to not assume ikiwiki's underlay is already installed.
+    Closes: #593047
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:42:55 -0400
+
 ikiwiki (3.20100804) unstable; urgency=low
 
   * template: Fix dependency tracking. Broken in version 3.20100427.
diff --git a/t/po.t b/t/po.t
index 444743cac..1cd18c317 100755
--- a/t/po.t
+++ b/t/po.t
@@ -31,6 +31,9 @@ my $dir = tempdir("ikiwiki-test-po.XXXXXXXXXX",
 %config=IkiWiki::defaultconfig();
 $config{srcdir} = "$dir/src";
 $config{destdir} = "$dir/dst";
+$config{destdir} = "$dir/dst";
+$config{underlaydirbase} = "/dev/null";
+$config{underlaydir} = "/dev/null";
 $config{discussion} = 0;
 $config{po_master_language} = { code => 'en',
 				name => 'English'
@@ -118,8 +121,8 @@ $config{po_link_to}='negotiated';
 $msgprefix="links (po_link_to=negotiated)";
 refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn');
 is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index");
-is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.es");
-is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.fr");
+is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable'], "$msgprefix index.es");
+is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable'], "$msgprefix index.fr");
 is_deeply(\@{$links{'translatable'}}, ['nontranslatable'], "$msgprefix translatable");
 is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
 is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
@@ -129,8 +132,8 @@ $config{po_link_to}='current';
 $msgprefix="links (po_link_to=current)";
 refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn');
 is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index");
-is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.es");
-is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.fr");
+is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable'))], "$msgprefix index.es");
+is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable'))], "$msgprefix index.fr");
 is_deeply(\@{$links{'translatable'}}, [bestlink('translatable', 'nontranslatable')], "$msgprefix translatable");
 is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
 is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
-- 
cgit v1.2.3


From 67d0645e07b8bba3977a9a4edefacc54c652ca67 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Aug 2010 11:46:01 -0400
Subject: insert version that will be released from debian-testing branch

---
 debian/changelog | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f3ea7290..121cf8381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,19 @@
-ikiwiki (3.20100805) UNRELEASED; urgency=low
+ikiwiki (3.20100816) UNRELEASED; urgency=low
 
   * filecheck: Fall back to using the file command if the freedesktop
     magic file cannot identify a file.
   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
     at a flattr plugin! This one is less configurable, but simpler.)
   * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
+
+ikiwiki (3.20100815) unstable; urgency=medium
+
   * Fix po test suite to not assume ikiwiki's underlay is already installed.
     Closes: #593047
 
- -- Joey Hess <joeyh@debian.org>  Mon, 09 Aug 2010 13:18:28 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:40 -0400
 
 ikiwiki (3.20100804) unstable; urgency=low
 
-- 
cgit v1.2.3


From 02e5823f98a8adcbc3eed2ba69dd9429d407b61a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Aug 2010 11:53:37 -0400
Subject: releasing version 3.20100815

---
 ikiwiki.spec   | 2 +-
 po/ikiwiki.pot | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 99de59fb8..9250a67cf 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100804
+Version: 3.20100815
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 9d311a5ad..a8226f402 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-08-15 11:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
cgit v1.2.3


From 77aaf95d5d72149b31900048ee8ef4125ffa5548 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Aug 2010 11:58:00 -0400
Subject: add news item for ikiwiki 3.20100815

---
 doc/news/version_3.20100518.2.mdwn | 3 ---
 doc/news/version_3.20100815.mdwn   | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 doc/news/version_3.20100518.2.mdwn
 create mode 100644 doc/news/version_3.20100815.mdwn

diff --git a/doc/news/version_3.20100518.2.mdwn b/doc/news/version_3.20100518.2.mdwn
deleted file mode 100644
index 64ce3f863..000000000
--- a/doc/news/version_3.20100518.2.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-ikiwiki 3.20100518.2 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Fix a typo in the last release."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100815.mdwn b/doc/news/version_3.20100815.mdwn
new file mode 100644
index 000000000..1073933a1
--- /dev/null
+++ b/doc/news/version_3.20100815.mdwn
@@ -0,0 +1,4 @@
+ikiwiki 3.20100815 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix po test suite to not assume ikiwiki's underlay is already installed.
+     Closes: #[593047](http://bugs.debian.org/593047)"""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 0a4a7a70ba90963eec2cb2b35877c555d28e1eb7 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <joey@web>
Date: Sun, 15 Aug 2010 16:06:43 +0000
Subject: Added a comment: branches

---
 .../comment_1_43f5df30d09046ccc4f7c44703979a11._comment | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/forum/multi_domain_setup_possible__63__/comment_1_43f5df30d09046ccc4f7c44703979a11._comment

diff --git a/doc/forum/multi_domain_setup_possible__63__/comment_1_43f5df30d09046ccc4f7c44703979a11._comment b/doc/forum/multi_domain_setup_possible__63__/comment_1_43f5df30d09046ccc4f7c44703979a11._comment
new file mode 100644
index 000000000..5b00272b3
--- /dev/null
+++ b/doc/forum/multi_domain_setup_possible__63__/comment_1_43f5df30d09046ccc4f7c44703979a11._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="branches"
+ date="2010-08-15T16:06:43Z"
+ content="""
+This is where the git backend (or bzr if you prefer) shines. Make a site, and then branch it to a second site, and put your personal type stuff on the branch. cherry-pick or merge changes from one branch to another.
+
+The possibility to do this kind of thing is why our recently launched Ikiwiki hosting service is called
+[Branchable.com](http://branchable.com). It makes it easy to create branches of a Ikiwiki site hosted
+there: <http://www.branchable.com/tips/branching_an_existing_site/> 
+(Merging between branches need manual git, for now.)
+
+BTW, for links between the branched wikis you can just use the [[plugins/shortcut]] plugin.
+
+--[[Joey]]
+"""]]
-- 
cgit v1.2.3


From 09c8683c8e4c9f0c72b79f531194aa8c97d3290a Mon Sep 17 00:00:00 2001
From: "http://claimid.com/helios" <helios@web>
Date: Sun, 15 Aug 2010 16:18:35 +0000
Subject: Added a comment: branches

---
 .../comment_2_75d6581f81b71fb8acbe3561047ea759._comment  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 doc/forum/multi_domain_setup_possible__63__/comment_2_75d6581f81b71fb8acbe3561047ea759._comment

diff --git a/doc/forum/multi_domain_setup_possible__63__/comment_2_75d6581f81b71fb8acbe3561047ea759._comment b/doc/forum/multi_domain_setup_possible__63__/comment_2_75d6581f81b71fb8acbe3561047ea759._comment
new file mode 100644
index 000000000..473f52f5c
--- /dev/null
+++ b/doc/forum/multi_domain_setup_possible__63__/comment_2_75d6581f81b71fb8acbe3561047ea759._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="http://claimid.com/helios"
+ nickname="helios"
+ subject="branches"
+ date="2010-08-15T16:18:35Z"
+ content="""
+So I I just put a blog entry, which is just a file on both branches. Seems I have to learn cherry-picking and merging only some changes.
+
+Still I am duplicating files then and when I edit one file I have to think to also edit the other one or merge the change to it. I thought of a way to tag a blog entry on which site it should appear. And then I just have to edit one file and contents changes on all sites that share it.
+
+But then I possibly can do some master blog / shared content branch, so that shared content is only stored once. Then I need to find a way to automatically replicate the changes there to all sites it belongs too. But how do I store it.
+
+I also thought about just using symlinks for files. Can I have two sites in one repository and symlink shared files stuff around? I know bzr can version control symlinks.
+
+Hmmm, I think I better read more about branching, cherry-picking and merging before I proceed. I used bzr and git, but from the user interface side of things prefer bzr, which should be fast enough for this use case.
+"""]]
-- 
cgit v1.2.3


From 0ce0c86c298f1746fe1d7856bcaa5323c73d7b29 Mon Sep 17 00:00:00 2001
From: "http://claimid.com/helios" <helios@web>
Date: Sun, 15 Aug 2010 17:22:40 +0000
Subject:

---
 doc/forum/editing_a_comment.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/editing_a_comment.mdwn

diff --git a/doc/forum/editing_a_comment.mdwn b/doc/forum/editing_a_comment.mdwn
new file mode 100644
index 000000000..8bddab3fb
--- /dev/null
+++ b/doc/forum/editing_a_comment.mdwn
@@ -0,0 +1 @@
+Is it possible to edit a comment? I did not find any button for it.
-- 
cgit v1.2.3


From 949a1edac722577d2df9b99428d8fa1e04d37116 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawndltpDNFSfEZBR_TIcjeDQRkuuyT1e_3o"
 <Boris@web>
Date: Sun, 15 Aug 2010 21:39:27 +0000
Subject:

---
 doc/plugins/filecheck/discussion.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/plugins/filecheck/discussion.mdwn b/doc/plugins/filecheck/discussion.mdwn
index 6ef780772..f3f3c4ffd 100644
--- a/doc/plugins/filecheck/discussion.mdwn
+++ b/doc/plugins/filecheck/discussion.mdwn
@@ -69,3 +69,17 @@ Boris
 	<ul id="foo">
 	<a href="<TMPL_VAR FILE>">mp3</a>
 	</ul>
+
+>> Thanks a lot - looking forward to [[todo/generic_insert_links]] - I am using the [[ikiwiki/directive/template]] variant also adding a name vaiable, it looks like this and is working fine:
+
+        <ul class="playlist">
+        <li>
+        <a href="<TMPL_VAR FILE>"><TMPL_VAR NAME></a>
+        </li>
+        </ul>
+
+>> Calling it: 
+
+        \[[!template id=embedmedia.tmpl file=../Tinas_Gonna_Have_A_Baby.mp3 name="Tina's Gonna Have A Baby" ]]
+
+>> BTW your Flattr button doesn't seem to work properly - or it is Flattr itself that doesn't- clicking it won't let ikiwiki show up on my Dashboard.
-- 
cgit v1.2.3


From 40fcc3868c0521704e465fc22e44f4c71dd85b86 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <oblomov@web>
Date: Tue, 17 Aug 2010 07:35:18 +0000
Subject: patch to provide relative font sizes in default CSS

---
 doc/bugs/absolute_sizes_in_default_CSS.mdwn | 37 +++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 doc/bugs/absolute_sizes_in_default_CSS.mdwn

diff --git a/doc/bugs/absolute_sizes_in_default_CSS.mdwn b/doc/bugs/absolute_sizes_in_default_CSS.mdwn
new file mode 100644
index 000000000..e2d4e611c
--- /dev/null
+++ b/doc/bugs/absolute_sizes_in_default_CSS.mdwn
@@ -0,0 +1,37 @@
+While toying around with some font sizes on my persona ikiwiki I discovered that some font sizes in the default CSS are fixed rather than relative. Here's a git patch that replaces them with relative font sizes (assuming the default 12pt/16px base font size recommended by the W3C):
+
+<pre>
+From 01c14db255bbb727d8dd1e72c3f6f2f25f07e757 Mon Sep 17 00:00:00 2001
+From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
+Date: Tue, 17 Aug 2010 00:48:24 +0200
+Subject: [PATCH] Use relative font-sizes
+
+---
+ doc/style.css |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/style.css b/doc/style.css
+index 66d962b..fa4b2a3 100644
+--- a/doc/style.css
++++ b/doc/style.css
+@@ -14,7 +14,7 @@ nav {
+ 
+ .header {
+ 	margin: 0;
+-	font-size: 22px;
++	font-size: 140%;
+ 	font-weight: bold;
+ 	line-height: 1em;
+ 	display: block;
+@@ -22,7 +22,7 @@ nav {
+ 
+ .inlineheader .author {
+ 	margin: 0;
+-	font-size: 18px;
++	font-size: 112%;
+ 	font-weight: bold;
+ 	display: block;
+ }
+-- 
+1.7.2.rc0.231.gc73d
+</pre>
-- 
cgit v1.2.3


From ed80e02c06c0838dcf205378e1dcaa5f1076c278 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <oblomov@web>
Date: Tue, 17 Aug 2010 07:37:01 +0000
Subject: forgot to escape the <> chars in the format-patch output

---
 doc/bugs/absolute_sizes_in_default_CSS.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/absolute_sizes_in_default_CSS.mdwn b/doc/bugs/absolute_sizes_in_default_CSS.mdwn
index e2d4e611c..5cf70d6ee 100644
--- a/doc/bugs/absolute_sizes_in_default_CSS.mdwn
+++ b/doc/bugs/absolute_sizes_in_default_CSS.mdwn
@@ -2,7 +2,7 @@ While toying around with some font sizes on my persona ikiwiki I discovered that
 
 <pre>
 From 01c14db255bbb727d8dd1e72c3f6f2f25f07e757 Mon Sep 17 00:00:00 2001
-From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
+From: Giuseppe Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
 Date: Tue, 17 Aug 2010 00:48:24 +0200
 Subject: [PATCH] Use relative font-sizes
 
-- 
cgit v1.2.3


From 0506be0d6e489b3585233aa6d9d2a48e8da76ee7 Mon Sep 17 00:00:00 2001
From: Nick <Nick@web>
Date: Tue, 17 Aug 2010 11:09:40 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index cbef5394e..f6d8ac440 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -46,6 +46,7 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
+* <file:///tmp/test.html>
 
 ----
 
-- 
cgit v1.2.3


From 8b31418005a193af17a9b4315d3b8e5435eb90a7 Mon Sep 17 00:00:00 2001
From: Nick <Nick@web>
Date: Tue, 17 Aug 2010 11:10:16 +0000
Subject:

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index f6d8ac440..364e3d4de 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -46,7 +46,7 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
-* <file:///tmp/test.html>
+* <test.html>
 
 ----
 
-- 
cgit v1.2.3


From 93f2129072f6ee89907c97bb3ff761d51cdd49c2 Mon Sep 17 00:00:00 2001
From: Nick <Nick@web>
Date: Tue, 17 Aug 2010 11:10:54 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 364e3d4de..01308dae4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -48,6 +48,7 @@ Bulleted list
 * [GNU](http://www.gnu.org/)
 * <test.html>
 
+<google.de>
 ----
 
 This **SandBox** is also a [[blog]]!
-- 
cgit v1.2.3


From e9133cb2e605e4197856cb844cd7ed2272df43fd Mon Sep 17 00:00:00 2001
From: "http://jblevins.org/" <jrblevin@web>
Date: Tue, 17 Aug 2010 12:56:46 +0000
Subject: Update URL

---
 doc/todo/Option_to_make_title_an_h1__63__.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/todo/Option_to_make_title_an_h1__63__.mdwn b/doc/todo/Option_to_make_title_an_h1__63__.mdwn
index f4023d6dd..8345cd010 100644
--- a/doc/todo/Option_to_make_title_an_h1__63__.mdwn
+++ b/doc/todo/Option_to_make_title_an_h1__63__.mdwn
@@ -11,4 +11,4 @@ Currently, the page title (either the name of the page or the title specified wi
 > latter, making `#` (only when on the first line) set the page title, removing it from
 > the page body. --[[JasonBlevins]], October 22, 2008
 
- [h1title]: http://code.jblevins.org/ikiwiki/plugins.git/plain/h1title.pm
+ [h1title]: http://jblevins.org/git/ikiwiki/plugins.git/plain/h1title.pm
-- 
cgit v1.2.3


From 9744c11f806cc72436b1d7b813fc194136e60db0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 17 Aug 2010 16:05:17 -0400
Subject: openid: Syntax tweak to the javascript code to make it work with MSIE
 7 (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting the bug
 and providing access to debug it.

---
 debian/changelog                                          | 3 +++
 underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9b08050b..cbd7e7254 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
     at a flattr plugin! This one is less configurable, but simpler.)
   * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
+  * openid: Syntax tweak to the javascript code to make it work with MSIE 7
+    (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
+    the bug and providing access to debug it.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
 
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index f22f5776a..c59be1edc 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -21,7 +21,7 @@ var providers_large = {
 	icon: 'wikiicons/openidlogin-bg.gif',
         label: 'Enter your OpenID:',
         url: null
-    },
+    }
 };
 var providers_small = {
     livejournal: {
@@ -65,7 +65,7 @@ var providers_small = {
 	icon: 'http://verisign.com/favicon.ico',
         label: 'Enter your Verisign username:',
         url: 'http://{username}.pip.verisignlabs.com/'
-    },
+    }
 };
 var providers = $.extend({}, providers_large, providers_small);
 
-- 
cgit v1.2.3


From 20ecef4d024f751481645db3aa68d098e1251b19 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 17 Aug 2010 16:37:48 -0400
Subject: style.css: Use relative, not absolute font sizes. Thanks, Giuseppe
 Bilotta.

---
 debian/changelog                            | 1 +
 doc/bugs/absolute_sizes_in_default_CSS.mdwn | 2 ++
 doc/style.css                               | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbd7e7254..8fee36b98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
   * openid: Syntax tweak to the javascript code to make it work with MSIE 7
     (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
     the bug and providing access to debug it.
+  * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
 
diff --git a/doc/bugs/absolute_sizes_in_default_CSS.mdwn b/doc/bugs/absolute_sizes_in_default_CSS.mdwn
index 5cf70d6ee..bb3c0c7a0 100644
--- a/doc/bugs/absolute_sizes_in_default_CSS.mdwn
+++ b/doc/bugs/absolute_sizes_in_default_CSS.mdwn
@@ -1,5 +1,7 @@
 While toying around with some font sizes on my persona ikiwiki I discovered that some font sizes in the default CSS are fixed rather than relative. Here's a git patch that replaces them with relative font sizes (assuming the default 12pt/16px base font size recommended by the W3C):
 
+[[done]] --[[Joey]] 
+
 <pre>
 From 01c14db255bbb727d8dd1e72c3f6f2f25f07e757 Mon Sep 17 00:00:00 2001
 From: Giuseppe Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
diff --git a/doc/style.css b/doc/style.css
index 66d962bd6..fa4b2a38a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -14,7 +14,7 @@ nav {
 
 .header {
 	margin: 0;
-	font-size: 22px;
+	font-size: 140%;
 	font-weight: bold;
 	line-height: 1em;
 	display: block;
@@ -22,7 +22,7 @@ nav {
 
 .inlineheader .author {
 	margin: 0;
-	font-size: 18px;
+	font-size: 112%;
 	font-weight: bold;
 	display: block;
 }
-- 
cgit v1.2.3


From f15b34aeeda1955244f10b418d7e75f57235d734 Mon Sep 17 00:00:00 2001
From: philippe <philippe@web>
Date: Thu, 19 Aug 2010 15:02:14 +0000
Subject:

---
 doc/bugs/po:_po_files_instead_of_html_files.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
index 4b08c7c70..610a32540 100644
--- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn
+++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
@@ -1,4 +1,6 @@
 On the home page of my wiki, when i click on the link "ikiwiki", i get the english file instead of the french file.  
 At the bottom of this page, there is the "Links" line:  
 Links: index index.fr templates templates.fr  
-When i click on "templates.fr", i get the po.file instead of html.
+When i click on "templates.fr", i get the po.file instead of html.  
+   
+    Sorry for the noise! I set "po_master_language" to fr and all was ok.
-- 
cgit v1.2.3


From 2a31fb78de327432b8bf6ad5f4eed55eed0394bc Mon Sep 17 00:00:00 2001
From: philippe <philippe@web>
Date: Thu, 19 Aug 2010 15:45:31 +0000
Subject:

---
 doc/bugs/po:_po_files_instead_of_html_files.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
index 610a32540..933e348c4 100644
--- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn
+++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
@@ -3,4 +3,4 @@ At the bottom of this page, there is the "Links" line:
 Links: index index.fr templates templates.fr  
 When i click on "templates.fr", i get the po.file instead of html.  
    
-    Sorry for the noise! I set "po_master_language" to fr and all was ok.
+    Sorry for the noise! I set "po_master_language" to fr and all was ok. [[done]].
-- 
cgit v1.2.3


From 6e7ae22ed22e1dc94d41203de5ddda9fac75edac Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <oblomov@web>
Date: Thu, 19 Aug 2010 17:45:20 +0000
Subject: Report htmlscrubber/multimarkdown footnote misinteraction

---
 doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn

diff --git a/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn
new file mode 100644
index 000000000..a00ced4c5
--- /dev/null
+++ b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn
@@ -0,0 +1,13 @@
+I enabled multimarkdown to make use of footnotes in my file. I have the multimarkdown plugin,
+as well as the command-line program. If I write a document with footnotes:
+
+    This line has a footnote[^1]
+    
+    [^1]: this is the footnote
+
+and compile it from the cli, the reference becomes a link to the footnote and the footnote
+gets a backreferencing link appended. When compiled in ikiwiki with the goodstuff plugin
+enabled, the links are created but their hrefs are empty (so they do not actually act as links).
+Disabling the htmlscrubber plugin fixes this issue
+
+[[!tag multimarkdown htmlscrubber]]
-- 
cgit v1.2.3


From 9b9ecda62f893a2109ccdb6bcdb2358f217f7fef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 19 Aug 2010 13:59:31 -0400
Subject: htmlscrubber: Do not scrub url anchors that contain colons.

---
 IkiWiki/Plugin/htmlscrubber.pm                            | 2 +-
 debian/changelog                                          | 1 +
 doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 847518178..927792f79 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -32,7 +32,7 @@ sub import {
 	);
 	# data is a special case. Allow a few data:image/ types,
 	# but disallow data:text/javascript and everything else.
-	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i;
+	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?#]))|^#/i;
 }
 
 sub getsetup () {
diff --git a/debian/changelog b/debian/changelog
index 8fee36b98..fb445a3ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
     (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
     the bug and providing access to debug it.
   * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
+  * htmlscrubber: Do not scrub url anchors that contain colons.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
 
diff --git a/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn
index a00ced4c5..343037b45 100644
--- a/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn
+++ b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn
@@ -11,3 +11,8 @@ enabled, the links are created but their hrefs are empty (so they do not actuall
 Disabling the htmlscrubber plugin fixes this issue
 
 [[!tag multimarkdown htmlscrubber]]
+
+> href was of the form: #fnref:1 , scrubbed by overzealous protocol
+> scrubbing.
+
+[[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 7d29ba2fc77d1e2b902b3742de6671a87b4d31e2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 19 Aug 2010 14:04:55 -0400
Subject: add htmlscrubber colon in url cases to test suite

---
 t/htmlize.t | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/t/htmlize.t b/t/htmlize.t
index a7e7f8c39..a436748f9 100755
--- a/t/htmlize.t
+++ b/t/htmlize.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 26;
+use Test::More tests => 32;
 use Encode;
 
 BEGIN { use_ok("IkiWiki"); }
@@ -68,3 +68,21 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn",
 is(IkiWiki::htmlize("foo", "foo", "mdwn",
 	q{<span class="foo">bar</span>}),
 	q{<span class="foo">bar</span>}, "class attribute allowed");
+is(IkiWiki::htmlize("foo", "foo", "mdwn",
+	q{<a href="aaa#foo">}),
+	q{<a href="aaa#foo">}, "simple anchor allowed");
+is(IkiWiki::htmlize("foo", "foo", "mdwn",
+	q{<a href="aaa#foo:bar">}),
+	q{<a href="aaa#foo:bar">}, "colon allowed in anchor");
+is(IkiWiki::htmlize("foo", "foo", "mdwn",
+	q{<a href="aaa?foo:bar">}),
+	q{<a href="aaa?foo:bar">}, "colon allowed in query string");
+is(IkiWiki::htmlize("foo", "foo", "mdwn",
+	q{<a href="foo:bar">}),
+	q{<a>}, "unknown protocol blocked");
+is(IkiWiki::htmlize("foo", "foo", "mdwn",
+	q{<a href="#foo">}),
+	q{<a href="#foo">}, "simple relative anchor allowed");
+is(IkiWiki::htmlize("foo", "foo", "mdwn",
+	q{<a href="#foo:bar">}),
+	q{<a href="#foo:bar">}, "colon in simple relative anchor allowed");
-- 
cgit v1.2.3


From e65ab83d292c62f01740b68f4acdb5bf2d6d1f93 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <oblomov@web>
Date: Fri, 20 Aug 2010 08:19:27 +0000
Subject:

---
 doc/todo/support_link__40__.__41___in_pagespec.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/todo/support_link__40__.__41___in_pagespec.mdwn b/doc/todo/support_link__40__.__41___in_pagespec.mdwn
index da55bce67..79809662a 100644
--- a/doc/todo/support_link__40__.__41___in_pagespec.mdwn
+++ b/doc/todo/support_link__40__.__41___in_pagespec.mdwn
@@ -8,3 +8,6 @@ which uses !inline to list all posts with the tag.
 Joey said on IRC that "probably changing the derel() function in 
 IkiWiki.pm is the best way to do it".
 
+> I implemented this suggestion in the simplest possible way, [[!taglink patch]] available [[here|http://git.oblomov.eu/ikiwiki/patch/f4a52de556436fdee00fd92ca9a3b46e876450fa]].
+> An alternative approach, very similar, would be to make the empty page parameter mean current page (e.g. `link()` would mean pages linking here). The patch would be very similar.
+> -- GB
-- 
cgit v1.2.3


From 87acb9ad1c009c3a6570fad09b5286b5399d86bc Mon Sep 17 00:00:00 2001
From: "http://kostix.myopenid.com/" <http://kostix.myopenid.com/@web>
Date: Fri, 20 Aug 2010 16:00:24 +0000
Subject: Add a comment about adding of per-wiki or per-user setting for the
 edit box size

---
 doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
index 0c45f0c90..577c3dad8 100644
--- a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
+++ b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
@@ -38,3 +38,5 @@ have a small resize handle in a corner, that can be dragged around. No
 nasty javascript needed. IMHO, this is the right solution, and I hope other
 browsers emulate it. [[done]]
 --[[Joey]]
+
+Wouldn't it be possible to just implement an integer-valued setting for this, accessible via the "Setup" wiki page? This would require a wiki regen, but such a setting would not be changed frequently I suppose. Also, Mediawiki has this implemented as a per-user setting (two settings, actually, -- number of rows and columns of the edit area); such a per-user setting would be the best possible implementation, but I'm not sure if ikiwiki already supports per-user settings. Please consider implementing this as the current 20 rows is a great PITA for any non-trivial page.
-- 
cgit v1.2.3


From d44733d3bd80d4c5dd8cf60b7107a0004c5c3fa8 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Sun, 22 Aug 2010 09:42:20 +0000
Subject: no need for rebuild

---
 doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
index 577c3dad8..8721277aa 100644
--- a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
+++ b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
@@ -40,3 +40,5 @@ browsers emulate it. [[done]]
 --[[Joey]]
 
 Wouldn't it be possible to just implement an integer-valued setting for this, accessible via the "Setup" wiki page? This would require a wiki regen, but such a setting would not be changed frequently I suppose. Also, Mediawiki has this implemented as a per-user setting (two settings, actually, -- number of rows and columns of the edit area); such a per-user setting would be the best possible implementation, but I'm not sure if ikiwiki already supports per-user settings. Please consider implementing this as the current 20 rows is a great PITA for any non-trivial page.
+
+> I don't think it would need a wiki rebuild, as the textarea is generated dynamically by the CGI when you perform a CGI action, and (as far as I know) is not cooked into any static content. -- [[Jon]]
-- 
cgit v1.2.3


From ff73f44f88e294fc4b9d0cb0396457537fd4a7aa Mon Sep 17 00:00:00 2001
From: "http://thewordnerd.info/" <nolan@web>
Date: Sun, 22 Aug 2010 17:42:13 +0000
Subject:

---
 doc/forum/Can__39__t_get_comments_plugin_working.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/forum/Can__39__t_get_comments_plugin_working.mdwn

diff --git a/doc/forum/Can__39__t_get_comments_plugin_working.mdwn b/doc/forum/Can__39__t_get_comments_plugin_working.mdwn
new file mode 100644
index 000000000..06b7fdd84
--- /dev/null
+++ b/doc/forum/Can__39__t_get_comments_plugin_working.mdwn
@@ -0,0 +1,7 @@
+I feel like I must be missing something.
+
+My blog is based on Ikiwiki, and uses /yyyy/mm/dd/title/ for blog posts. Because I use the plugin that generates index pages for subdirectories, I have to use /????/??/??/* to identify posts and avoid missing the index pages for years, months and days.
+
+I've enabled the comments plugin, but no matter what I do, I can't seem to make the comment form appear on my posts. I've removed the entire site and have rebuilt. I've set the pagespec to /????/??/??/* and ./????/??/??/*, but neither seems to work. I don't see any output, or anything else to indicate that pages aren't working.
+
+Are there any other plugins that need to be enabled for this to work? I think I've locked things down such that anonymous users can't edit by enabling signinedit and setting a lock, but this may be blocking the ability to comment (though I don't recall seeing anything in the docs about needing additional plugins.)
-- 
cgit v1.2.3


From 5de07f59be82aeb7b4935fc134e023628eddb49c Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawnbe6oB_ecFtNYII1JN3zSggwUPUdOb8jI"
 <William@web>
Date: Mon, 23 Aug 2010 03:08:01 +0000
Subject: report hard coded paths.

---
 doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn

diff --git a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn
new file mode 100644
index 000000000..1b9cb2e2d
--- /dev/null
+++ b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn
@@ -0,0 +1 @@
+The [[plugins/highlight]] plugin hard codes some paths up the top of the plugin.  This means that you need to edit the ikiwiki source if you have highlight installed in a non-standard location (e.g. if you have done a user-level install of the highlight package).
-- 
cgit v1.2.3


From 018df1df824e440004b276129c2867b552a0ec4d Mon Sep 17 00:00:00 2001
From: "http://marcotmarcot.wordpress.com/" <marcotmarcot@web>
Date: Tue, 24 Aug 2010 10:32:29 +0000
Subject: darcs command

---
 doc/setup.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 266222cc3..83409228c 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -68,6 +68,7 @@ source. (Remember to replace "foo" with the real directory name.)
 	cvs -d `pwd`/foo get -P ikiwiki
 	bzr clone foo foo.src
 	hg clone foo foo.src
+	darcs get foo foo.src
 	# TODO monotone, tla
 
 Now to edit pages by hand, go into the directory you checked out (ie,
-- 
cgit v1.2.3


From 37f62dde2d9b752ba559b796cf6c1b3bc3dee9bd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 25 Aug 2010 14:57:45 -0400
Subject: response

---
 doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
index 8721277aa..77e46049f 100644
--- a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
+++ b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
@@ -42,3 +42,11 @@ browsers emulate it. [[done]]
 Wouldn't it be possible to just implement an integer-valued setting for this, accessible via the "Setup" wiki page? This would require a wiki regen, but such a setting would not be changed frequently I suppose. Also, Mediawiki has this implemented as a per-user setting (two settings, actually, -- number of rows and columns of the edit area); such a per-user setting would be the best possible implementation, but I'm not sure if ikiwiki already supports per-user settings. Please consider implementing this as the current 20 rows is a great PITA for any non-trivial page.
 
 > I don't think it would need a wiki rebuild, as the textarea is generated dynamically by the CGI when you perform a CGI action, and (as far as I know) is not cooked into any static content. -- [[Jon]]
+
+>> There is no need for a configuration setting for this -- to change
+>> the default height from 20 rows to something else, you can just put
+>> something like this in your `local.css`: --[[Joey]] 
+
+	#editcontent {
+		height: 50em;
+	}
-- 
cgit v1.2.3


From 612493567f946f333a73e4f55fae2ab157108fd9 Mon Sep 17 00:00:00 2001
From: "http://marcotmarcot.wordpress.com/" <marcotmarcot@web>
Date: Wed, 25 Aug 2010 20:20:39 +0000
Subject: Marco Sivla

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index e76d547cc..2f70c67b7 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -158,6 +158,7 @@ Personal sites and blogs
 * [Nicolas Schodet](http://ni.fr.eu.org/)
 * [weakish](http://weakish.github.com)
 * [Thomas Kane](http://planetkane.org/)
+* [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From e5c4b811369f271dc313741538adfe7cbf745be6 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/hakim.cassimally" <Hakim@web>
Date: Thu, 26 Aug 2010 07:35:47 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 01308dae4..137075ee7 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -49,6 +49,7 @@ Bulleted list
 * <test.html>
 
 <google.de>
+<http://www.perl.it>
 ----
 
 This **SandBox** is also a [[blog]]!
-- 
cgit v1.2.3


From 6d213a0c739d5b34357b01a616f99197eeba6ad9 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/hakim.cassimally" <Hakim@web>
Date: Thu, 26 Aug 2010 07:38:02 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 137075ee7..365cb3321 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -53,5 +53,6 @@ Bulleted list
 ----
 
 This **SandBox** is also a [[blog]]!
+[[!inline  pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-- 
cgit v1.2.3